pyegeria 5.4.0.28__py3-none-any.whl → 5.5.3.3__py3-none-any.whl

commands/my/monitor_my_todos.py

@@ -18,13 +18,7 @@ from rich.live import Live
 from rich.markdown import Markdown
 from rich.table import Table
 
-from pyegeria import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
-)
-from pyegeria.my_profile_omvs import MyProfile
+from pyegeria.omvs.my_profile import MyProfile
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")

commands/my/monitor_open_todos.py

@@ -20,13 +20,12 @@ from rich.markdown import Markdown
 from rich.table import Table
 
 from pyegeria import EgeriaTech
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+from pyegeria.core._exceptions import (
+    PyegeriaInvalidParameterException,
+    PyegeriaAPIException as PropertyServerException,
+    PyegeriaUnauthorizedException as UserNotAuthorizedException,
+    print_basic_exception as print_exception_response,
 )
-from pyegeria.my_profile_omvs import MyProfile
 
 disable_ssl_warnings = True
 
@@ -145,7 +144,7 @@ def display_todos(
                 live.console.pager()
 
     except (
-        InvalidParameterException,
+        PyegeriaInvalidParameterException,
         PropertyServerException,
         UserNotAuthorizedException,
     ) as e:

commands/my/todo_actions.py

@@ -15,10 +15,9 @@ from datetime import datetime
 import click
 
 from pyegeria import MyProfile
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    print_exception_response,
+from pyegeria.core._exceptions import (
+    PyegeriaAPIException as PropertyServerException,
+    print_basic_exception as print_exception_response,
 )
 
 erins_guid = "dcfd7e32-8074-4cdf-bdc5-9a6f28818a9d"
@@ -160,7 +159,7 @@ def delete_todo(server, url, userid, password, timeout, todo_guid):
 @click.option("--timeout", default=60, help="Number of seconds to wait")
 @click.option(
     "--new-status",
-    type=click.Choice(
+    type_name = click.Choice(
         ["OPEN", "IN_PROGRESS", "WAITING", "COMPLETE", "ABANDONED"],
         case_sensitive="False",
     ),

commands/ops/__init__.py

@@ -5,8 +5,6 @@ Copyright Contributors to the ODPi Egeria project.
 
 """
 from pyegeria import (
-    INTEGRATION_GUIDS,
-    TEMPLATE_GUIDS,
     default_time_out,
     disable_ssl_warnings,
     enable_ssl_check,

commands/ops/gov_server_actions.py

@@ -8,18 +8,13 @@ This script restarts an integration daemon.
 
 """
 
-import os
-
 import click
-from rich import print, print_json
-from rich.console import Console
-
-from pyegeria import INTEGRATION_GUIDS, AutomatedCuration, EgeriaTech
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+
+from pyegeria import AutomatedCuration, EgeriaTech
+from pyegeria.core._exceptions import (
+    PyegeriaInvalidParameterException as PyegeriaInvalidParameterException,
+    PyegeriaAPIException as PyegeriaAPIException,
+    print_basic_exception as print_exception_response,
 )
 
 
@@ -36,17 +31,18 @@ def add_catalog_target(
 ) -> str:
     """Add catalog targets to the specified integration connector"""
     try:
-        if integration_connector not in INTEGRATION_GUIDS.keys():
-            click.echo("Integration connector is not known")
-
         c = ctx.obj
         a_client = AutomatedCuration(
             c.view_server, c.view_server_url, c.userid, c.password
         )
         token = a_client.create_egeria_bearer_token()
 
+        integ_connector_guid = a_client.get_connector_guid(integration_connector)
+        if not integ_connector_guid or c.catalog_targets == 'No connector found':
+            raise PyegeriaInvalidParameterException('No Connector found')
+
         guid = a_client.add_catalog_target(
-            INTEGRATION_GUIDS[integration_connector],
+            integ_connector_guid,
             metadata_element_guid,
             catalog_target_name,
         )
@@ -55,7 +51,7 @@ def add_catalog_target(
             f"Added catalog target to {integration_connector} with a return guid of {guid}"
         )
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PyegeriaAPIException) as e:
         print_exception_response(e)
 
 
@@ -77,7 +73,7 @@ def remove_catalog_target(ctx, relationship_guid: str):
             f"Removed catalog target with relationship guid of {relationship_guid}"
         )
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PyegeriaAPIException) as e:
         print_exception_response(e)
 
 
@@ -101,7 +97,7 @@ def update_catalog_target(ctx, relationship_guid: str, catalog_target_name: str)
             f"{catalog_target_name} with a return guid of {guid}"
         )
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PyegeriaAPIException) as e:
         print_exception_response(e)
 
 
@@ -121,7 +117,7 @@ def refresh_gov_eng_config(ctx, engine_host_guid: str):
 
         click.echo(f"Refreshed server {c.engine_host}")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PyegeriaAPIException) as e:
         print_exception_response(e)
     finally:
         p_client.close_session()
@@ -142,7 +138,7 @@ def start_server(ctx, server):
 
         click.echo(f"Started server {server}")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PyegeriaAPIException) as e:
         print_exception_response(e)
     finally:
         p_client.close_session()
@@ -172,7 +168,7 @@ def stop_server(ctx, server):
     try:
         p_client.shutdown_server(None, server)
         click.echo(f"Stopped server {server}")
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PyegeriaAPIException) as e:
         print_exception_response(e)
     finally:
         p_client.close_session()

commands/ops/list_archives.py

@@ -22,40 +22,27 @@ from rich.table import Table
 
 from pyegeria import (
     ClassificationManager,
-    InvalidParameterException,
-    ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    PyegeriaException,
+    print_basic_exception,
+    settings,
+    config_logging
 )
 
-EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
-EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
-EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
-EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
-EGERIA_VIEW_SERVER_URL = os.environ.get(
-    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
-)
-EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
-EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
-    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
-)
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
-EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
-EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
 
+app_config = settings.Environment
+config_logging()
+console = Console(width = app_config.console_width)
 
 def display_archive_list(
     server: str,
     url: str,
     username: str,
     user_pass: str,
-    save_output: bool,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    save_output: bool = False,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width
 ) -> object:
     c_client = ClassificationManager(server, url, user_id=username)
     token = c_client.create_egeria_bearer_token(username, user_pass)
@@ -78,12 +65,10 @@ def display_archive_list(
         # table.add_column("Creator")
         # table.add_column("Description")
 
-        open_metadata_type_name = None
+        metadata_element_type_name = None
         property_value = "omarchive"
         property_names = ["fileExtension"]
-        archives = c_client.get_elements_by_property_value(
-            property_value, property_names, open_metadata_type_name
-        )
+        archives = c_client.get_elements_by_property_value(property_value, property_names, metadata_element_type_name)
 
         if type(archives) != list:
             raise ValueError("--> No archives found")
@@ -93,7 +78,7 @@ def display_archive_list(
             )
 
             for archive in sorted_archives:
-                name = archive["properties"].get("name", "---")
+                name = archive["properties"].get("displayName", "---")
                 path_name = archive["properties"].get("pathName", "---")
                 description = archive["properties"].get("description", "---")
                 creation_date_epoch = (
@@ -107,10 +92,6 @@ def display_archive_list(
         return table
 
     try:
-        # with Live(generate_table(), refresh_per_second=4, screen=True) as live:
-        #     while True:
-        #         time.sleep(2)
-        #         live.update(generate_table())
         console = Console(
             record=True, width=width, force_terminal=not jupyter, soft_wrap=True
         )
@@ -120,15 +101,13 @@ def display_archive_list(
             console.save_html("archives.html")
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException,
         ValueError,
     ) as e:
         if type(e) is str:
             print(e)
         else:
-            print_exception_response(e)
+            console.print_exception(show_locals=True)
     except KeyboardInterrupt:
         pass
     finally:
@@ -145,8 +124,8 @@ def main():
     # parser.add_argument("--sponsor", help="Name of sponsor to search")
     args = parser.parse_args()
 
-    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
-    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.egeria_view_server_url
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
 

commands/ops/list_catalog_targets.py

@@ -10,6 +10,7 @@ List catalog targets
 """
 import argparse
 import os
+import sys
 import time
 
 from rich import box
@@ -18,40 +19,32 @@ from rich.markdown import Markdown
 from rich.prompt import Prompt
 from rich.table import Table
 
+
 from pyegeria import (
-    INTEGRATION_GUIDS,
-    AutomatedCuration,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    EgeriaTech,
+    PyegeriaException,
+    print_basic_exception,
+    settings,
+    config_logging
 )
 
-EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
-EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
-EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
-EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
-EGERIA_VIEW_SERVER_URL = os.environ.get(
-    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
-)
-EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
-EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
-EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+
+app_config = settings.Environment
+config_logging()
+console = Console(width = app_config.console_width)
 
 
 def display_catalog_targets(
     connector: str,
-    view_server: str = EGERIA_VIEW_SERVER,
-    view_url: str = EGERIA_VIEW_SERVER_URL,
+    view_server: str = app_config.egeria_view_server,
+    view_url: str = app_config.egeria_view_server_url,
     user: str = EGERIA_USER,
     user_pass: str = EGERIA_USER_PASSWORD,
     paging: bool = True,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
 ):
     """Display catalog targets for the specified connector as a table.
 
@@ -100,7 +93,7 @@ def display_catalog_targets(
 
         if type(cat_targets) is list:
             for target in cat_targets:
-                target_name = target.get("catalogTargetName", "---")
+                target_name = target['properties'].get("catalogTargetName", "---")
                 target_source = target.get("metadataSourceQualifiedName", "---")
                 target_rel = target.get("relationshipGUID", "---")
                 target_sync = target.get("permittedSynchronization")
@@ -144,26 +137,28 @@ def display_catalog_targets(
         return table
 
     try:
-        a_client = AutomatedCuration(view_server, view_url, user)
+        a_client = EgeriaTech(view_server, view_url, user)
         token = a_client.create_egeria_bearer_token(user, user_pass)
         connector = connector.strip()
-        if connector not in INTEGRATION_GUIDS.keys():
-            raise Exception
 
-        connector_guid = INTEGRATION_GUIDS[connector]
+
+        connector_guid = a_client.get_connector_guid(connector)
+        if connector_guid is None or connector_guid == "No connector found":
+            console.print(f"\n\n===> No connector found with name '{connector}'\n\n")
+            sys.exit(1)
+
         cat_targets = a_client.get_catalog_targets(connector_guid)
         console = Console(force_terminal=not jupyter, width=width, soft_wrap=True)
         with console.pager(styles=True):
             console.print(generate_table(), soft_wrap=True)
 
+
+    except PyegeriaException as e:
+        print(f"\n\n===> Perhaps integration connector {connector} is not known?\n\n")
+        print_basic_exception(e)
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        Exception
     ) as e:
-        print_exception_response(e)
-    except Exception as e:
-        print(f"\n\n===> Perhaps integration connector {connector} is not known?\n\n")
         console.print_exception()
     finally:
         a_client.close_session()
@@ -180,20 +175,18 @@ def main():
 
     args = parser.parse_args()
 
-    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
-    url = args.url if args.url is not None else EGERIA_VIEW_SERVER_URL
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.egeria_view_server_url
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
-    jupyter = args.jupyter if args.jupyter is not None else EGERIA_JUPYTER
-    width = args.width if args.width is not None else EGERIA_WIDTH
+    jupyter = args.jupyter if args.jupyter is not None else app_config.egeria_jupyter
+    width = args.width if args.width is not None else app_config.console_width
 
     try:
         connector = Prompt.ask(
             "Enter the Integration Connector to list catalog targets for"
         ).strip()
-        display_catalog_targets(
-            connector, server, url, userid, user_pass, jupyter, width=width
-        )
+        display_catalog_targets(connector, server, url, userid, user_pass, jupyter, width=width)
 
     except KeyboardInterrupt:
         pass

commands/ops/load_archive.py

@@ -9,14 +9,14 @@ This script refreshed an integration daemon.
 """
 
 import os
+import sys
 
 import click
-from loguru import logger
-from pyegeria import AutomatedCuration, EgeriaTech
-from pyegeria.config import settings
-from pyegeria.logging_configuration import config_logging
-from pyegeria._exceptions_new import (
-PyegeriaException, print_exception_response, print_basic_exception
+from pyegeria import EgeriaTech, PyegeriaAPIException
+from pyegeria.core.config import settings
+from pyegeria.core.logging_configuration import config_logging
+from pyegeria.core._exceptions import (
+    PyegeriaException, print_basic_exception
 )
 
 # EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -39,7 +39,6 @@ app_settings = settings
 app_config = app_settings.Environment
 config_logging()
 
-print(f"Console width is {app_config.console_width}")
 
 @click.command("load-archive")
 @click.option(
@@ -65,16 +64,20 @@ def load_archive(file_name, server_name, view_server, url, userid, password, tim
     try:
         s_client = EgeriaTech(view_server, url, userid, password)
         token = s_client.create_egeria_bearer_token()
-        server_guid = None
+        server_guid = s_client.__get_guid__(display_name = server_name, property_name = "resourceName", tech_type = "MetadataStore")
         file_name = file_name.strip()
+        if server_guid == "No elements found":
+            print("Didn't find the metadata store")
+            sys.exit(0)
+
         s_client.add_archive_file(file_name, server_guid, server_name, time_out=timeout)
 
         click.echo(f"Loaded archive: {file_name}")
 
-    except (PyegeriaException) as e:
+    except (PyegeriaException, PyegeriaAPIException) as e:
         print(
-            f"Perhaps there was a timeout? If so, the command will complete despite the exception\n"
-            f"===> You can check by rerunning the command in a few minutes"
+            "Perhaps there was a timeout? If so, the command will complete despite the exception\n" 
+            "===> You can check by rerunning the command in a few minutes"
         )
         print_basic_exception(e)