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

commands/ops/{monitor_gov_eng_status.py → monitor_engine_status.py}

@@ -21,9 +21,12 @@ from rich.table import Table
 
 from pyegeria import (
     EgeriaTech,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
+)
+from pyegeria.core._exceptions import (
+    PyegeriaInvalidParameterException,
+    PyegeriaAPIException,
+    PyegeriaUnauthorizedException,
+    print_basic_exception,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -185,11 +188,11 @@ def display_gov_eng_status(
                     live.update(generate_table(search_list))
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaInvalidParameterException,
+        PyegeriaAPIException,
+        PyegeriaUnauthorizedException,
     ) as e:
-        console.print_exception(show_locals=True)
+        print_basic_exception(e)
 
     except KeyboardInterrupt:
         pass

commands/ops/monitor_platform_status.py

@@ -16,45 +16,34 @@ from rich.live import Live
 from rich.markdown import Markdown
 from rich.table import Table
 
-from pyegeria import RuntimeManager
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+from pyegeria import (
+RuntimeManager,
+    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_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"))
 
-disable_ssl_warnings = True
-console = Console(width=EGERIA_WIDTH)
+app_config = settings.Environment
+console = Console(width = app_config.console_width)
+config_logging()
 
 
 def display_status(
-    view_server: str = EGERIA_VIEW_SERVER,
-    view_url: str = EGERIA_VIEW_SERVER_URL,
-    user: str = EGERIA_USER,
-    user_pass: str = EGERIA_USER_PASSWORD,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+        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,
+        jupyter: bool = app_config.egeria_jupyter,
+        width: int = app_config.console_width,
 ):
-    r_client = RuntimeManager(view_server, view_url, user)
+    r_client = RuntimeManager(view_server, view_url, user, user_pass)
     token = r_client.create_egeria_bearer_token(user, user_pass)
 
     def generate_table() -> Table:
@@ -70,10 +59,10 @@ def display_status(
             show_lines=True,
             # expand=True
         )
-        table.add_column("Platform Name & GUID")
+        table.add_column("Platform Name & GUID", width = 36)
         # table.add_column("Platform GUID")
-        table.add_column("Platform URL")
-        table.add_column("Platform Origin")
+        # table.add_column("Platform URL")
+        # table.add_column("Platform Origin")
         table.add_column("Description")
         table.add_column("Platform Started")
         table.add_column("Servers")
@@ -91,15 +80,15 @@ def display_status(
                 sys.exit(1)
 
             for platform in platform_list:
-                platform_name = platform["properties"].get("displayName", "---")
-                platform_guid = platform["elementHeader"]["guid"]
-                platform_desc = platform["properties"].get("resourceDescription", "---")
+                platform_name = platform.get("display_name", platform.get("properties", {}).get("displayName", "---"))
+                platform_guid = platform.get("guid", platform.get("elementHeader", {}).get("guid"))
+                platform_desc = platform.get("description", platform.get("properties", {}).get("description", "---"))
                 server_list = ""
 
                 platform_report = r_client.get_platform_report(platform_guid)
-                platform_url = platform_report.get("platformURLRoot", " ")
-                platform_origin = platform_report.get("platformOrigin", " ")
-                platform_build = platform_report.get("platformBuildProperties", " ")
+                platform_url = platform_report.get("platform_url_root", platform_report.get("platformURLRoot", " "))
+                platform_origin = platform_report.get("platform_origin", platform_report.get("platformOrigin", " "))
+                platform_build = platform_report.get("platform_build_properties", platform_report.get("platformBuildProperties", " "))
                 platform_build_md = ""
                 if type(platform_build) is dict:
                     for prop in platform_build:
@@ -109,9 +98,9 @@ def display_status(
                     platform_build_out = Markdown(platform_build_md)
                 else:
                     platform_build_out = platform_origin
-                platform_desc = f"{platform_desc}\n\n\t\t&\n\n{platform_build}"
+                platform_desc = f"{platform_desc}\n\n\t\t---\n\n{platform_build_md}"
                 platform_started = platform_report.get("platformStartTime", " ")
-                platform_id = f"{platform_name}\n\n\t\t&\n\n{platform_guid}"
+                platform_id = f"{platform_name}\n\n\t\t---\n\n{platform_guid}\n\n\t\t---\n\n{platform_url}"
 
                 servers = platform_report.get("omagservers", None)
 
@@ -134,8 +123,8 @@ def display_status(
 
                     table.add_row(
                         platform_id,
-                        platform_url,
-                        platform_build_out,
+                        # platform_url,
+                        # platform_build_out,
                         platform_desc,
                         platform_started,
                         server_list,
@@ -147,7 +136,7 @@ def display_status(
             platform_url = " "
             platform_origin = " "
             platform_started = " "
-        token = r_client.refresh_egeria_bearer_token()
+        r_client.refresh_egeria_bearer_token()
         return table
 
     try:
@@ -157,11 +146,10 @@ def display_status(
                 live.update(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        # print_basic_exception(e)
+        console.print_exception()
 
     except KeyboardInterrupt:
         pass
@@ -177,8 +165,8 @@ def main():
     parser.add_argument("--password", help="User Password")
     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/monitor_server_startup.py

@@ -16,11 +16,8 @@ from rich.live import Live
 from rich.table import Table
 
 from pyegeria import (
-    InvalidParameterException,
-    PropertyServerException,
     ServerOps,
-    UserNotAuthorizedException,
-    print_exception_response,
+    PyegeriaException, print_basic_exception,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -31,8 +28,7 @@ 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"))
@@ -42,12 +38,13 @@ EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "220"))
 def display_startup_status(
     server: str,
     url: str,
-    username: str,
+    username: str = EGERIA_USER,
     password: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
     p_client = ServerOps(server, url, username)
+    token = p_client.create_egeria_bearer_token(username, password)
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -91,11 +88,9 @@ def display_startup_status(
                 #     service_status = service['serviceStatus']
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
         assert e.related_http_code != "200", "Invalid parameters"
 
 

commands/ops/monitor_server_status.py

@@ -22,11 +22,9 @@ from rich.live import Live
 from rich.table import Table
 
 from pyegeria import (
-    InvalidParameterException,
-    PropertyServerException,
+    PyegeriaException, print_basic_exception,
     RuntimeManager,
-    UserNotAuthorizedException,
-    print_exception_response,
+    print_exception_table,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -88,9 +86,9 @@ def display_status(
             sys.exit(1)
 
         for platform in platform_list:
-            platform_name = platform["properties"].get("displayName", "---")
-            platform_guid = platform["elementHeader"]["guid"]
-            platform_desc = platform["properties"].get("resourceDescription", "---")
+            platform_name = platform.get("display_name", platform.get("properties", {}).get("displayName", "---"))
+            platform_guid = platform.get("guid", platform.get("elementHeader", {}).get("guid"))
+            platform_desc = platform.get("description", platform.get("properties", {}).get("resourceDescription", "---"))
             p_server_list = ""
 
             platform_report = p_client.get_platform_report(platform_guid)
@@ -154,11 +152,9 @@ def display_status(
                 live.update(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
     except KeyboardInterrupt:
         pass
     finally:

commands/ops/orig_monitor_server_list.py

@@ -15,14 +15,14 @@ import time
 from rich.live import Live
 from rich.table import Table
 
-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.core_omag_server_config import CoreServerConfig
-from pyegeria.server_operations import ServerOps
+from pyegeria.omvs.core_omag_server_config import CoreServerConfig
+from pyegeria.omvs.server_operations import ServerOps
 
 disable_ssl_warnings = True
 
@@ -107,7 +107,7 @@ def display_status(
                 live.update(generate_table())
 
     except (
-        InvalidParameterException,
+        PyegeriaInvalidParameterException,
         PropertyServerException,
         UserNotAuthorizedException,
     ) as e:

commands/ops/orig_monitor_server_status.py

@@ -16,11 +16,7 @@ from rich.live import Live
 from rich.table import Table
 
 from pyegeria import (
-    InvalidParameterException,
-    PropertyServerException,
-    ServerOps,
-    UserNotAuthorizedException,
-    print_exception_response,
+PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table    ServerOps
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")

commands/ops/refresh_integration_daemon.py

@@ -12,10 +12,10 @@ import argparse
 import os
 
 from pyegeria import EgeriaTech
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    print_exception_response,
+from pyegeria.core._exceptions import (
+    PyegeriaInvalidParameterException,
+    PyegeriaAPIException as PropertyServerException,
+    print_basic_exception as print_exception_response,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store")
@@ -52,7 +52,7 @@ def refresh_connector(
 
         print(f"\n===> Integration Daemon '{server}' refreshed {statement}.")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
 
 

commands/ops/restart_integration_daemon.py

@@ -12,10 +12,10 @@ import argparse
 import os
 
 from pyegeria import EgeriaTech
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    print_exception_response,
+from pyegeria.core._exceptions import (
+    PyegeriaInvalidParameterException,
+    PyegeriaAPIException as PropertyServerException,
+    print_basic_exception as print_exception_response,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store")
@@ -51,7 +51,7 @@ def restart_connector(
 
         print(f"\n===> Integration Daemon '{server}' restarted {statement}.")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
 
 

commands/ops/table_integ_daemon_status.py

@@ -18,11 +18,11 @@ from rich.table import Table
 from textual.widgets import DataTable
 
 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,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store")
@@ -224,7 +224,7 @@ def display_integration_daemon_status(
         return generate_table()
 
     except (
-        InvalidParameterException,
+        PyegeriaInvalidParameterException,
         PropertyServerException,
         UserNotAuthorizedException,
     ) as e:

commands/ops/x_engine_actions.py

@@ -12,10 +12,10 @@ import click
 
 # from ops_config import Config, pass_config
 from pyegeria import EgeriaTech
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    print_exception_response,
+from pyegeria.core._exceptions import (
+    PyegeriaInvalidParameterException,
+    PyegeriaAPIException as PropertyServerException,
+    print_basic_exception as print_exception_response,
 )
 
 
@@ -32,7 +32,7 @@ def stop_server(ctx, server):
 
         p_client.shutdown_server(server_guid)
         click.echo(f"Stopped server {server}")
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
     finally:
         p_client.close_session()
@@ -51,7 +51,7 @@ def start_server(ctx, server):
 
         click.echo(f"Started server {server}")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
     finally:
         p_client.close_session()
@@ -70,7 +70,7 @@ def refresh(ctx):
 
         click.echo(f"Refreshed server {c.engine_host}")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
     finally:
         p_client.close_session()

commands/tech/__init__.py

@@ -4,8 +4,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/tech/{generic_actions.py → element_actions.py}

@@ -8,21 +8,16 @@ Execute Generic actions.
 
 """
 
-import csv
-import json
 import os
-import sys
-import time
-from datetime import datetime
 
 import click
 
 
-from pyegeria import EgeriaTech, body_slimmer
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    print_exception_response,
+from pyegeria import EgeriaTech
+from pyegeria.core._exceptions import (
+    PyegeriaInvalidParameterException,
+    PyegeriaAPIException as PropertyServerException,
+    print_basic_exception as print_exception_response,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -66,7 +61,7 @@ def delete_element(cascade, server, url, userid, password, timeout, element_guid
 
         click.echo(f"Deleted element: {element_guid}")
 
-    except (InvalidParameterException, PropertyServerException) as e:
+    except (PyegeriaInvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
     finally:
         m_client.close_session()

commands/tech/get_element_info.py

@@ -22,26 +22,18 @@ from rich.tree import Tree
 
 from pyegeria import (
     ClassificationManager,
-    Client,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
+    print_basic_exception,
+    settings,
+    config_logging, PyegeriaAPIException, print_exception_table
 )
 
-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_elements(
@@ -50,8 +42,8 @@ def display_elements(
     url: str,
     username: str,
     user_password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
 ):
     c = ClassificationManager(server, url, user_id=username, user_pwd=user_password)
 
@@ -101,17 +93,16 @@ def display_elements(
 
         c.close_session()
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-        ValueError,
-    ) as e:
-        if type(e) is str:
-            console.print_exception()
+    except PyegeriaAPIException as e:
+        if e.response_egeria_msg_id == "OMAG-COMMON-400-018":
+            console.print(f"\n ===> Looks like the type {om_type} isn't known...\n")
         else:
-            # console.print_exception(show_locals=True)
+            print_basic_exception(e)
+    except PyegeriaException as e:
+        if e.response_egeria_msg_id == "OMAG-COMMON-400-018":
             console.print(f"\n ===> Looks like the type {om_type} isn't known...\n")
+        else:
+            print_basic_exception(e)
 
 
 def main():
@@ -124,8 +115,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_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