pyegeria 5.2.0.20__py3-none-any.whl → 5.2.0.42.2__py3-none-any.whl

pyegeria/commands/my/list_my_profile.py

@@ -36,7 +36,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/my/list_my_roles.py

@@ -33,7 +33,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/my/monitor_my_todos.py

@@ -14,6 +14,7 @@ import time
 
 from rich import box
 from rich.live import Live
+from rich.markdown import Markdown
 from rich.table import Table
 from rich.console import Console
 
@@ -32,7 +33,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -65,7 +66,7 @@ def display_my_todos(
             return
 
         for item in todo_items:
-            assigned_actors = [" "]
+            assigned_actors = ''
             if todo_items is None:
                 name = " "
                 type_name = " "
@@ -88,7 +89,8 @@ def display_my_todos(
                 status = props.get("toDoStatus")
 
                 for actor in item["assignedActors"]:
-                    assigned_actors.append(actor.get("uniqueName", "NoOne"))
+                    assigned_actors+=f"{actor.get("uniqueName", "NoOne")}\n"
+                assigned_actors_out = Markdown(assigned_actors)
                 if status in ("WAITING", "OPEN"):
                     status = f"[yellow]{status}"
                 elif status in ("INPROGRESS", "COMPLETE"):
@@ -106,7 +108,7 @@ def display_my_todos(
                 due,
                 completed,
                 status,
-                str(assigned_actors),
+                assigned_actors_out,
             )
 
     def generate_table() -> Table:
@@ -137,9 +139,19 @@ def display_my_todos(
         my_title = my_profile["profileProperties"].get("jobTitle", "No Title")
         user_ids = []
         for id in my_ids:
-            user_ids.append(id["userIdentity"]["properties"].get("userId", "NoOne"))
+            user_ids.append(id["userIdentity"]["properties"].get("userid", "NoOne"))
+            add_rows(
+                table,
+                id["userIdentity"]["elementHeader"]["guid"],
+                id["userIdentity"]["properties"]["userId"],
+            )
+
         add_rows(table, my_guid, user_ids)
 
+        # user_id_guid = my_profile["userIdentity"]["guid"]
+        # user_id_name = my_profile["userIdentity"]["properties"]["userid"]
+        # add_rows(table, user_id_guid, user_id_name)
+
         my_roles = my_profile["roles"]
         if type(my_roles) is list:
             for role in my_roles:
@@ -179,7 +191,7 @@ def main():
 
     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
-    userid = args.userid if args.userid is not None else EGERIA_USER
+    userid = args.userid if args.userid is not None else "peterprofile"
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
 
     try:

pyegeria/commands/my/monitor_open_todos.py

@@ -37,7 +37,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -114,7 +114,7 @@ def display_todos(
                 if type(assigned_actors) is list:
                     for actor in assigned_actors:
                         actor_guid = actor["guid"]
-                        assigned += f"* {m_client.get_actor_for_guid(actor_guid)} "
+                        assigned += f"{m_client.get_actor_for_guid(actor_guid)} \n ({actor_guid}"
                 assigned_out = Markdown(assigned)
 
                 if status in ("WAITING", "OPEN"):

pyegeria/commands/my/todo_actions.py

@@ -31,7 +31,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/ops/list_archives.py

@@ -35,7 +35,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/ops/list_catalog_targets.py

@@ -34,7 +34,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("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")

pyegeria/commands/ops/load_archive.py

@@ -25,7 +25,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/ops/monitor_asset_events.py

@@ -18,20 +18,22 @@ from rich.markdown import Markdown
 from confluent_kafka import Consumer, KafkaException
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
-EGERIA_KAFKA_ENDPOINT = os.environ.get('KAFKA_ENDPOINT', 'localhost:9192')
-EGERIA_PLATFORM_URL = os.environ.get('EGERIA_PLATFORM_URL', 'https://localhost:9443')
-EGERIA_VIEW_SERVER = os.environ.get('VIEW_SERVER', 'view-server')
-EGERIA_VIEW_SERVER_URL = os.environ.get('EGERIA_VIEW_SERVER_URL', 'https://localhost:9443')
-EGERIA_INTEGRATION_DAEMON = os.environ.get('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 = os.environ.get('EGERIA_JUPYTER', False)
-EGERIA_WIDTH = os.environ.get('EGERIA_WIDTH', 200)
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9192")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("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 = os.environ.get("EGERIA_JUPYTER", False)
+EGERIA_WIDTH = os.environ.get("EGERIA_WIDTH", 200)
 
-def main(ep: str = EGERIA_KAFKA_ENDPOINT):
 
+def main(ep: str = EGERIA_KAFKA_ENDPOINT):
     disable_ssl_warnings = True
     console = Console(width=200)
     now = datetime.now()
@@ -41,16 +43,18 @@ def main(ep: str = EGERIA_KAFKA_ENDPOINT):
 
     # Define the Kafka consumer configuration.
     config = {
-        'bootstrap.servers': ep,  # replace with your Kafka broker(s)
-        'group.id': f"view_asset_events:{current_time}",  # replace with your consumer group
-        'auto.offset.reset': earliest_latest  # can be set to 'earliest' or 'latest'
+        "bootstrap.servers": ep,  # replace with your Kafka broker(s)
+        "group.id": f"view_asset_events:{current_time}",  # replace with your consumer group
+        "auto.offset.reset": earliest_latest,  # can be set to 'earliest' or 'latest'
     }
     print(f"Kafka config is {json.dumps(config)}")
     # Initialize a Kafka consumer.
     consumer = Consumer(config)
 
     # Subscribe to a Kafka topic.
-    consumer.subscribe(['egeria.omag.server.active-metadata-store.omas.assetconsumer.outTopic'])  # replace with your Kafka topic
+    consumer.subscribe(
+        ["egeria.omag.server.active-metadata-store.omas.assetconsumer.outTopic"]
+    )  # replace with your Kafka topic
 
     try:
         while True:
@@ -75,11 +79,11 @@ def main(ep: str = EGERIA_KAFKA_ENDPOINT):
                 for key in element_properties_keys:
                     value = element_properties[key]
                     props += f"* {key}: {value}\n"
-                console.rule(style= "[bold red]")
-                console.rule(f"\tMessage TimeStamp: {event_time}\t eventType: {event_type}\t typeName: {type_name}\t guid: {guid}")
-                msg = (
-
-                          f"properties: \n[bright white on black]{props}\n\n")
+                console.rule(style="[bold red]")
+                console.rule(
+                    f"\tMessage TimeStamp: {event_time}\t eventType: {event_type}\t typeName: {type_name}\t guid: {guid}"
+                )
+                msg = f"properties: \n[bright white on black]{props}\n\n"
                 msg = Markdown(msg)
 
                 console.print(msg)
@@ -91,6 +95,7 @@ def main(ep: str = EGERIA_KAFKA_ENDPOINT):
         # Close down consumer to commit final offsets.
         consumer.close()
 
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
 
@@ -99,4 +104,4 @@ if __name__ == "__main__":
 
     ep = args.ep if args.ep is not None else EGERIA_KAFKA_ENDPOINT
 
-    main(ep)
+    main(ep)

pyegeria/commands/ops/monitor_engine_activity.py

@@ -39,7 +39,7 @@ EGERIA_ENGINE_HOST = os.environ.get("INTEGRATION_ENGINE_HOST", "engine-host")
 EGERIA_ENGINE_HOST_URL = os.environ.get(
     "INTEGRATION_ENGINE_HOST_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("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")

pyegeria/commands/ops/monitor_engine_activity_c.py

@@ -41,7 +41,7 @@ EGERIA_ENGINE_HOST_URL = os.environ.get(
     "EGERIA_ENGINE_HOST_URL", "https://localhost:9443"
 )
 EGERIA_INTEGRATION_DAEMON = os.environ.get(
-    "EGERIA_INTEGRATION_DAEMON", "integration-daemon"
+    "EGERIA_INTEGRATION_DAEMON", "integration_daemon"
 )
 EGERIA_ADMIN_USER = os.environ.get("EGERIA_ADMIN_USER", "garygeeke")
 EGERIA_ADMIN_PASSWORD = os.environ.get("EGERIA_ADMIN_PASSWORD", "secret")

pyegeria/commands/ops/monitor_gov_eng_status.py

@@ -34,7 +34,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_INTEGRATION_DAEMON", "integration_daemon"
 )
 EGERIA_ENGINE_HOST = os.environ.get("EGERIA_ENGINE_HOST", "engine-host")
 EGERIA_ENGINE_HOST_URL = os.environ.get(
@@ -53,6 +53,7 @@ disable_ssl_warnings = True
 
 def display_gov_eng_status(
     search_list: list[str] = ["*"],
+    status_filter=["*"],
     engine_host: str = EGERIA_ENGINE_HOST,
     view_server: str = EGERIA_VIEW_SERVER,
     url: str = EGERIA_VIEW_SERVER_URL,
@@ -67,8 +68,11 @@ def display_gov_eng_status(
 
     Parameters
     ----------
+
     search_list : list of str
         List of governance engine names to search for. Defaults to ["*"] which returns all governance engines.
+    status_filter: list of str, default is all
+        List of status values to filter by.
     engine_host : str
         The host name of the governance engine.
     view_server : str
@@ -150,6 +154,8 @@ def display_gov_eng_status(
             else:
                 eng_req_type_out = " "
             status = engine["governanceEngineStatus"]
+            if (status not in status_filter) and (status_filter != ["*"]):
+                continue
             if status in ("RUNNING"):
                 eng_status = f"[green]{status}"
             elif status in ("FAILED"):
@@ -218,8 +224,19 @@ def main_live():
         "Enter the list of engines you are interested in or ['*'] for all",
         default=["*"],
     )
+    status_filter = Prompt.ask(
+        "Enter a list of status values to filter for or ['*'] for all",
+        default=["*"],
+    )
     display_gov_eng_status(
-        search_list, engine_host, view_server, url, userid, user_pass, paging
+        search_list,
+        engine_host=engine_host,
+        view_server=view_server,
+        url=url,
+        username=userid,
+        user_pass=user_pass,
+        paging=paging,
+        status_filter=status_filter,
     )
 
 
@@ -248,9 +265,19 @@ def main_paging():
         "Enter the list of engines you are interested in or ['*'] for all",
         default=["*"],
     )
-
+    status_filter = Prompt.ask(
+        "Enter a list of status values to filter for or ['*'] for all",
+        default=["*"],
+    )
     display_gov_eng_status(
-        search_list, engine_host, view_server, url, userid, user_pass, paging
+        search_list,
+        engine_host=engine_host,
+        view_server=view_server,
+        url=url,
+        username=userid,
+        user_pass=user_pass,
+        paging=paging,
+        status_filter=status_filter,
     )
 
 

pyegeria/commands/ops/monitor_integ_daemon_status.py

@@ -36,7 +36,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -56,7 +56,7 @@ def display_integration_daemon_status(
     view_url: str = EGERIA_VIEW_SERVER_URL,
     user: str = EGERIA_USER,
     user_pass: str = EGERIA_USER_PASSWORD,
-    paging: bool = True,
+    paging: bool = False,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
     sort: bool = True,
@@ -225,7 +225,7 @@ def display_integration_daemon_status(
         s_client.close_session()
 
 
-def main_live():
+def main_live(paging: bool = False) -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--integ_server", help="Name of the integration server to display status for"
@@ -235,6 +235,7 @@ def main_live():
     parser.add_argument("--view_url", help="view server URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
+
     args = parser.parse_args()
 
     integ_server = (
@@ -251,6 +252,7 @@ def main_live():
     view_url = args.view_url if args.view_url is not None else 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
+
     search_list = Prompt.ask(
         "Enter the list of connectors you are interested in or ['*'] for all",
         default=["*"],
@@ -263,11 +265,11 @@ def main_live():
         view_url=view_url,
         user=userid,
         user_pass=user_pass,
-        paging=False,
+        paging=paging,
     )
 
 
-def main_paging():
+def main_paging(paging: bool = True) -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--integ_server", help="Name of the integration server to display status for"
@@ -277,6 +279,7 @@ def main_paging():
     parser.add_argument("--view_url", help="view server URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
+
     args = parser.parse_args()
 
     integ_server = (
@@ -295,7 +298,7 @@ def main_paging():
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     search_list = Prompt.ask(
         "Enter the list of connectors you are interested in or ['*'] for all",
-        default="[*]",
+        default=["*"],
     )
     display_integration_daemon_status(
         search_list=search_list,
@@ -310,7 +313,7 @@ def main_paging():
 
 
 if __name__ == "__main__":
-    main_live()
+    main_live(paging=False)
 
 if __name__ == "__main_paging__":
-    main_paging()
+    main_paging(paging=True)

pyegeria/commands/ops/monitor_platform_status.py

@@ -30,7 +30,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -42,7 +42,7 @@ 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=200)
+console = Console(width=EGERIA_WIDTH)
 
 
 def display_status(

pyegeria/commands/ops/monitor_server_startup.py

@@ -30,7 +30,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("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")

pyegeria/commands/ops/monitor_server_status.py

@@ -36,7 +36,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/ops/orig_monitor_server_list.py

@@ -33,7 +33,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/ops/orig_monitor_server_status.py

@@ -20,26 +20,36 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    ServerOps
+    ServerOps,
 )
 
 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('VIEW_SERVER', 'view-server')
-EGERIA_VIEW_SERVER_URL = os.environ.get('EGERIA_VIEW_SERVER_URL', 'https://localhost:9443')
-EGERIA_INTEGRATION_DAEMON = os.environ.get('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'))
-
-
-def display_status(server: str, url: str, username: str, user_pass: str, jupyter: bool = EGERIA_JUPYTER,
-                   width: int = EGERIA_WIDTH):
+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("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("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"))
+
+
+def display_status(
+    server: str,
+    url: str,
+    username: str,
+    user_pass: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
     p_client = ServerOps(server, url, username, user_pass)
 
     def generate_table() -> Table:
@@ -69,9 +79,10 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
             else:
                 status = "Inactive"
 
-            table.add_row(server,
-                          "[red]Inactive" if status == "Inactive" else "[green]Active",
-                          )
+            table.add_row(
+                server,
+                "[red]Inactive" if status == "Inactive" else "[green]Active",
+            )
         # p_client.close_session()
         return table
 
@@ -81,7 +92,11 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
                 time.sleep(2)
                 live.update(generate_table())
 
-    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
         print_exception_response(e)
     except KeyboardInterrupt:
         pass

pyegeria/commands/ops/refresh_integration_daemon.py

@@ -25,7 +25,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -44,7 +44,7 @@ def refresh_connector(
             statement = "ALL connectors"
         else:
             statement = f"the {connector} "
-        server = "integration-daemon" if server is None else server
+        server = "integration_daemon" if server is None else server
 
         s_client.refresh_integration_connectors(
             connector_name=connector, server_guid=None, display_name=server

pyegeria/commands/ops/restart_integration_daemon.py

@@ -25,7 +25,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -45,7 +45,7 @@ def restart_connector(
             statement = "ALL connectors"
         else:
             statement = f"the {connector} "
-        server = "integration-daemon" if server is None else server
+        server = "integration_daemon" if server is None else server
 
         s_client.restart_integration_connectors(connector, None, server)
 

pyegeria/commands/ops/table_integ_daemon_status.py

@@ -32,7 +32,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration_daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/tech/get_element_info.py

@@ -37,7 +37,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("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")

pyegeria/commands/tech/get_guid_info.py

@@ -36,7 +36,7 @@ EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("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")