pyegeria 0.5.8.15__tar.gz → 0.5.8.17__tar.gz

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.5.8.15
+Version: 0.5.8.17
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/catalog_user/get_asset_graph.py

@@ -21,6 +21,7 @@ from pyegeria import (
     UserNotAuthorizedException,
     AssetCatalog
 )
+
 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')
@@ -32,16 +33,18 @@ 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=200)
-
+console = Console(width=EGERIA_WIDTH, force_terminal=(not EGERIA_JUPYTER))
 
 guid_list = []
 
-def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, user_pass:str):
 
+def asset_viewer(asset_guid: str, server_name: str, platform_url: str, user: str, user_pass: str,
+                 jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
     def build_classifications(classification: dict) -> Markdown:
 
         class_md = ""
@@ -50,7 +53,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
             if c_type == "Anchors":
                 continue
             class_md += f"\n* Classification: {c_type}\n"
-            class_props = c.get("classificationProperties","---")
+            class_props = c.get("classificationProperties", "---")
             if type(class_props) is dict:
                 for prop in class_props.keys():
                     class_md += f"\t* {prop}: {class_props[prop]}\n"
@@ -72,7 +75,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
         ne_classifications = nested_element["classifications"]
         ne_class_md = build_classifications(ne_classifications)
         # ne_class_md = " " if ne_class_md is None else ne_class_md
-        ne_props = nested_element.get("properties","---")
+        ne_props = nested_element.get("properties", "---")
         ne_prop_md = "\n"
         if type(ne_props) is dict:
             for prop in ne_props.keys():
@@ -90,7 +93,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
     try:
 
         a_client = AssetCatalog(server_name, platform_url,
-                                     user_id=user)
+                                user_id=user)
 
         token = a_client.create_egeria_bearer_token(user, user_pass)
         # asset_info = a_client.find_assets_in_domain(asset_name)
@@ -109,7 +112,6 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
 
         # print(f"\n{json.dumps(asset_graph, indent =2)}\n")
 
-
         asset_name = asset_graph["displayName"]
         qualified_name = asset_graph["qualifiedName"]
         resource_name = asset_graph["resourceName"]
@@ -118,18 +120,17 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
         style = ""
 
         asset_type = asset_graph["type"]["typeName"]
-        asset_deployed_imp_type = asset_graph.get("deployedImplementationType","---")
+        asset_deployed_imp_type = asset_graph.get("deployedImplementationType", "---")
 
         asset_origin = asset_graph["origin"]["homeMetadataCollectionName"]
         asset_creation = asset_graph["versions"]["createTime"]
         asset_created_by = asset_graph["versions"]["createdBy"]
         asset_classifications = asset_graph["classifications"]
-        asset_nested_elements = asset_graph.get("anchoredElements","----")
+        asset_nested_elements = asset_graph.get("anchoredElements", "----")
         asset_relationships = asset_graph["relationships"]
         asset_class_md = build_classifications(asset_classifications)
 
-
-        asset_properties = asset_graph.get("extendedProperties",None)
+        asset_properties = asset_graph.get("extendedProperties", None)
         if asset_properties is not None:
             prop_md = "\n* Extended Properties:\n"
             for prop in asset_properties:
@@ -137,28 +138,28 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
         else:
             prop_md = ""
         core_md = (f"**Type: {asset_type}  Created by: {asset_created_by} on {asset_creation}**\n"
-               f"* Deployed Implementation Type: {asset_deployed_imp_type}\n"
-               f"* Qualified Name: {qualified_name}\n "
-               f"* Resource Name: {resource_name}\n"
-               f"* Display Name: {asset_name}\n"
-               f"* Asset Origin: {asset_origin}\n{prop_md}\n"
-               )
+                   f"* Deployed Implementation Type: {asset_deployed_imp_type}\n"
+                   f"* Qualified Name: {qualified_name}\n "
+                   f"* Resource Name: {resource_name}\n"
+                   f"* Display Name: {asset_name}\n"
+                   f"* Asset Origin: {asset_origin}\n{prop_md}\n"
+                   )
         core_md = Markdown(core_md)
 
-        p1 = Panel.fit(core_md, style = "bold bright_white")
+        p1 = Panel.fit(core_md, style="bold bright_white")
         l2 = tree.add(p1)
         if asset_class_md is not None:
-            p2 = Panel.fit(Markdown(asset_class_md), style = "bold bright_white", title = "Classifications")
+            p2 = Panel.fit(Markdown(asset_class_md), style="bold bright_white", title="Classifications")
             l2 = tree.add(p2)
 
         #
         # Nested Assets
         #
         if type(asset_nested_elements) is list:
-            l2 = tree.add("Nested Elements", style = "bold white")
+            l2 = tree.add("Nested Elements", style="bold white")
             for el in asset_nested_elements:
                 asset_ne_md = build_nested_elements(el)
-                p3 = Panel.fit(asset_ne_md, style = "bold bright_white", title="Nested Elements")
+                p3 = Panel.fit(asset_ne_md, style="bold bright_white", title="Nested Elements")
                 l2.add(p3)
 
         #
@@ -169,7 +170,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
             rel_end1 = relationship["end1"]
             rel_end1_type = rel_end1["type"]["typeName"]
             rel_end1_guid = rel_end1["guid"]
-            rel_end1_unique_name = rel_end1.get("uniqueName","---")
+            rel_end1_unique_name = rel_end1.get("uniqueName", "---")
 
             rel_end2 = relationship["end2"]
             rel_end2_type = rel_end2["type"]["typeName"]
@@ -184,13 +185,12 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
                 relationship_type = relationship["type"]["typeName"]
                 relationship_created_by = relationship["versions"]["createdBy"]
                 relationship_creation_time = relationship["versions"]["createTime"]
-                relationship_properties = relationship.get("properties","--- ")
+                relationship_properties = relationship.get("properties", "--- ")
                 relationship_md = (f"Relationship Type {relationship_type}\n"
                                    f"* GUID: {relationship_guid}\n* Created by: {relationship_created_by} \n"
                                    f"* Creation Time: {relationship_creation_time}\n"
                                    f"* Properties: {relationship_properties}\n")
 
-
                 rel_md = (
                     f"* Relationship Type: {relationship_type}\n"
                     f"* Relationship GUID: {relationship_guid}\n"
@@ -201,7 +201,7 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
                     f"\t* Type: {rel_end1_type}\n"
                     f"\t* GUID: {rel_end1_guid}\n"
                     f"\t* Unique Name: {rel_end1_unique_name}\n"
-                    )
+                )
 
                 # if rel_end1_class_md is not None:
                 #     rel_end1_md = rel_end1_class_md + rel_end1_md
@@ -221,7 +221,8 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
 
                 relationship_md += rel_end1_md + rel_end2_md
 
-                relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white", title = "Asset Relationships")
+                relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white",
+                                               title="Asset Relationships")
                 tree.add(relationship_panel)
 
         with console.screen():
@@ -229,13 +230,14 @@ def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str, u
             print(tree)
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException
+            InvalidParameterException,
+            PropertyServerException,
+            UserNotAuthorizedException
     ) as e:
         console.print_exception()
         console.print("\n\n ======> Most likely the GUID you provided is either incorrect or not an asset\n[red bold]")
 
+
 def main():
     parser = argparse.ArgumentParser()
 
@@ -251,10 +253,11 @@ def main():
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     try:
         asset_guid = Prompt.ask("Enter the Asset GUID to view:", default="")
-        asset_viewer(asset_guid,server, url, userid, user_pass)
+        asset_viewer(asset_guid, server, url, userid, user_pass)
     except (KeyboardInterrupt) as e:
         # console.print_exception()
         pass
 
+
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/cli/egeria_ops.py

@@ -11,20 +11,22 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 """
 import click
 from trogon import tui
+
 # from pyegeria import ServerOps
 from examples.widgets.cli.ops_config import Config
+from examples.widgets.operational.integration_daemon_actions import (add_catalog_target, remove_catalog_target,
+                                                                     update_catalog_target, stop_server, start_server)
+from examples.widgets.operational.list_catalog_targets import display_catalog_targets
+from examples.widgets.operational.monitor_engine_activity import display_engine_activity
 from examples.widgets.operational.monitor_gov_eng_status import display_gov_eng_status
-from examples.widgets.operational.monitor_server_status import display_status as s_display_status
-from examples.widgets.operational.monitor_server_list import display_status as display_list
 from examples.widgets.operational.monitor_integ_daemon_status import display_integration_daemon_status
 from examples.widgets.operational.monitor_platform_status import display_status as p_display_status
-from examples.widgets.operational.monitor_engine_activity import display_engine_activity
+from examples.widgets.operational.monitor_server_list import display_status as display_list
+from examples.widgets.operational.monitor_server_status import display_status as s_display_status
 from examples.widgets.operational.refresh_integration_daemon import refresh_connector
 from examples.widgets.operational.restart_integration_daemon import restart_connector
-from examples.widgets.operational.integration_daemon_actions import (add_catalog_target,remove_catalog_target,
-                                                                     update_catalog_target, stop_server, start_server)
 
-from examples.widgets.operational.list_catalog_targets import display_catalog_targets
+
 # class Config(object):
 #     def __init__(self, server: str = None, url: str = None, userid:str = None, password:str = None,
 #                  timeout:int = 30, paging: bool = False):
@@ -42,34 +44,34 @@ from examples.widgets.operational.list_catalog_targets import display_catalog_ta
 @tui()
 @click.version_option("0.0.1", prog_name="egeria_ops")
 @click.group()
-@click.option('--server', default = 'active-metadata-store', envvar = 'EGERIA_METADATA_STORE',
+@click.option('--server', default='active-metadata-store', envvar='EGERIA_METADATA_STORE',
               help='Egeria metadata store to work with')
-@click.option('--url', default = 'https://localhost:9443', envvar= 'EGERIA_PLATFORM_URL',
+@click.option('--url', default='https://localhost:9443', envvar='EGERIA_PLATFORM_URL',
               help='URL of Egeria metadata store platform to connect to')
-@click.option('--integration-daemon', default = 'integration-daemon', envvar = 'EGERIA_INTEGRATION_DAEMON',
+@click.option('--integration-daemon', default='integration-daemon', envvar='EGERIA_INTEGRATION_DAEMON',
               help='Egeria integration daemon to work with')
-@click.option('--integration_daemon_url', default = 'https://localhost:9443', envvar= 'EGERIA_INTEGRATION_DAEMON_URL',
+@click.option('--integration_daemon_url', default='https://localhost:9443', envvar='EGERIA_INTEGRATION_DAEMON_URL',
               help='URL of Egeria integration daemon platform to connect to')
-@click.option('--view_server', default = 'view-server', envvar = 'EGERIA_VIEW_SERVER',
+@click.option('--view_server', default='view-server', envvar='EGERIA_VIEW_SERVER',
               help='Egeria view server to work with')
-@click.option('--view_server_url', default = 'https://localhost:9443', envvar= 'EGERIA_VIEW_SERVER_URL',
+@click.option('--view_server_url', default='https://localhost:9443', envvar='EGERIA_VIEW_SERVER_URL',
               help='URL of Egeria view server platform to connect to')
-@click.option('--engine_host', default = 'engine-host', envvar = 'EGERIA_ENGINE_HOST',
+@click.option('--engine_host', default='engine-host', envvar='EGERIA_ENGINE_HOST',
               help='Egeria engine host to work with')
-@click.option('--engine_host_url', default = 'https://localhost:9443', envvar= 'EGERIA_ENGINE_HOST_URL',
+@click.option('--engine_host_url', default='https://localhost:9443', envvar='EGERIA_ENGINE_HOST_URL',
               help='URL of Egeria engine host platform to connect to')
-@click.option('--admin_user', default = 'garygeeke', envvar = 'EGERIA_ADMIN_USER', help='Egeria admin user')
-@click.option('--admin_user_password', default = 'secret', envvar = 'EGERIA_ADMIN_PASSWORD',
+@click.option('--admin_user', default='garygeeke', envvar='EGERIA_ADMIN_USER', help='Egeria admin user')
+@click.option('--admin_user_password', default='secret', envvar='EGERIA_ADMIN_PASSWORD',
               help='Egeria admin password')
-@click.option('--userid', default = 'garygeeke', envvar = 'EGERIA_USER', help='Egeria user')
-@click.option('--password', default = 'secret', envvar = 'EGERIA_PASSWORD',
+@click.option('--userid', default='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
               help='Egeria user password')
-@click.option('--timeout', default = 60, help = 'Number of seconds to wait')
-@click.option('--verbose', is_flag = True, default = False, help = 'Enable verbose mode')
-@click.option('--paging', is_flag = True, default = False, help = 'Enable paging snapshots vs live updates')
-@click.option('--jupyter', is_flag = True, default = False, envvar = 'EGERIA_JUPYTER', help = 'Enable for rendering in a Jupyter terminal')
-@click.option('--width', default=200, envvar='EGERIA_WIDTH', help = 'Screen width, in characters, to use')
-
+@click.option('--timeout', default=60, help='Number of seconds to wait')
+@click.option('--verbose', is_flag=True, default=False, help='Enable verbose mode')
+@click.option('--paging', is_flag=True, default=False, help='Enable paging snapshots vs live updates')
+@click.option('--jupyter', is_flag=True, default=False, envvar='EGERIA_JUPYTER',
+              help='Enable for rendering in a Jupyter terminal')
+@click.option('--width', default=200, envvar='EGERIA_WIDTH', help='Screen width, in characters, to use')
 @click.pass_context
 def cli(ctx, server, url, view_server, view_server_url, integration_daemon, integration_daemon_url,
         engine_host, engine_host_url, admin_user, admin_user_password, userid, password, timeout, paging,
@@ -77,7 +79,7 @@ def cli(ctx, server, url, view_server, view_server_url, integration_daemon, inte
     """An Egeria Command Line interface for Operations """
     ctx.obj = Config(server, url, view_server, view_server_url, integration_daemon,
                      integration_daemon_url, engine_host, engine_host_url,
-                     admin_user, admin_user_password,userid, password,
+                     admin_user, admin_user_password, userid, password,
                      timeout, paging, verbose, jupyter, width)
     ctx.max_content_width = 200
     ctx.ensure_object(Config)
@@ -91,19 +93,21 @@ def show(ctx):
     """Display an Egeria Object"""
     pass
 
+
 @show.group('platforms')
 @click.pass_context
 def show_platform(ctx):
     """Group of commands to show information about Egeria platforms"""
     pass
 
+
 @show_platform.command('status')
 @click.pass_context
 def show_platform_status(ctx):
     """Display a live status view of known platforms"""
     c = ctx.obj
-    p_display_status(c.view_server,c.view_server_url,
-                                           c.admin_user,c.admin_user_password)
+    p_display_status(c.view_server, c.view_server_url,
+                     c.admin_user, c.admin_user_password)
 
 
 @show.group("servers")
@@ -112,16 +116,19 @@ def show_server(ctx):
     """Group of commands to show information about Egeria servers"""
     pass
 
+
 @show_server.command('status')
-@click.option('--full', is_flag=True, default = False, help='If True, full server descriptions will be shown')
+@click.option('--full', is_flag=True, default=False, help='If True, full server descriptions will be shown')
 @click.pass_context
 def show_server_status(ctx, full):
     """Display a live status view of Egeria servers for the specified Egeria platform"""
     c = ctx.obj
     if full:
-        display_list(c.metadata_store, c.metadata_store_url, c.admin_user,c.admin_user_password)
+        display_list(c.metadata_store, c.metadata_store_url, c.admin_user, c.admin_user_password, c.jupyter, c.width)
     else:
-        s_display_status(c.metadata_store, c.metadata_store_url, c.admin_user,c.admin_user_password)
+        s_display_status(c.metadata_store, c.metadata_store_url, c.admin_user, c.admin_user_password, c.jupyter,
+                         c.width)
+
 
 @show.group("engines")
 @click.pass_context
@@ -129,25 +136,27 @@ def engine_host(ctx):
     """Group of commands to show information about Egeria engines"""
     pass
 
+
 @engine_host.command("status")
-@click.option('--list', is_flag=True, default = False, help='If True, a paged list will be shown')
+@click.option('--list', is_flag=True, default=False, help='If True, a paged list will be shown')
 @click.pass_context
-def gov_eng_status(ctx,list):
+def gov_eng_status(ctx, list):
     """Display engine-host status information"""
     c = ctx.obj
     display_gov_eng_status(c.engine_host, c.engine_host_url,
-                                                                  c.userid, c.password,
-                                                  list)
+                           c.admin_user, c.admin_user_password,
+                           list, c.jupyter, c.width)
+
 
 @engine_host.command('activity')
-@click.option('--list', is_flag=True, default = False, help='If True, a paged list will be shown')
+@click.option('--list', is_flag=True, default=False, help='If True, a paged list will be shown')
 @click.pass_context
-def eng_activity_status(ctx,list):
+def eng_activity_status(ctx, list):
     """Show Governance Activity in engine-host"""
     c = ctx.obj
     display_engine_activity(c.view_server, c.view_server_url,
-                                                      c.userid, c.password,
-                                                      list)
+                            c.admin_user, c.admin_user_password,
+                            list, c.jupyter, c.width)
 
 
 @show.group('integrations')
@@ -156,24 +165,27 @@ def integrations(ctx):
     """Group of commands to show information about Egeria integrations"""
     pass
 
+
 @integrations.command("status")
-@click.option('--list', is_flag=True, default = False, help='If True, a paged list will be shown')
+@click.option('--list', is_flag=True, default=False, help='If True, a paged list will be shown')
 @click.pass_context
-def integrations_status(ctx,list):
+def integrations_status(ctx, list):
     """Display integration-daemon status information"""
     c = ctx.obj
     display_integration_daemon_status(c.integration_daemon, c.integration_daemon_url,
-                                                                      c.view_server, c.view_server_url,
-                                                                 c.userid, c.password, list)
+                                      c.view_server, c.view_server_url,
+                                      c.userid, c.password, list, c.jupyter, c.width)
+
 
 @integrations.command("targets")
 @click.pass_context
-@click.argument('connector',nargs=1)
-def integrations_status(ctx,connector):
+@click.argument('connector', nargs=1)
+def integrations_status(ctx, connector):
     """Display Catalog Targets for a connector"""
     c = ctx.obj
     display_catalog_targets(connector, c.view_server, c.view_server_url,
-                                                                      c.userid, c.password)
+                            c.userid, c.password, c.jupyter, c.width)
+
 
 #
 #  Tell
@@ -185,29 +197,32 @@ def tell(ctx):
     """Perform actions an Egeria Objects"""
     pass
 
+
 @tell.group('integration_daemon')
 @click.pass_context
 def integration_daemon(ctx):
     """Group of commands to an integration-daemon"""
     pass
 
+
 @integration_daemon.command('refresh')
 @click.pass_context
-@click.option('--connector', default = 'all', help="Name of connector to refresh or 'all' to refresh all")
-def refresh_connectors(ctx,connector):
+@click.option('--connector', default='all', help="Name of connector to refresh or 'all' to refresh all")
+def refresh_connectors(ctx, connector):
     """Refresh the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
-    refresh_connector(connector,c.integration_daemon, c.integration_daemon_url,
-                                   c.userid, c.password)
+    refresh_connector(connector, c.integration_daemon, c.integration_daemon_url,
+                      c.userid, c.password)
+
 
 @integration_daemon.command('restart')
 @click.pass_context
-@click.option('--connector', default = 'all', help="Name of connector to restart or 'all' to restart all")
-def restart_connectors(ctx,connector):
+@click.option('--connector', default='all', help="Name of connector to restart or 'all' to restart all")
+def restart_connectors(ctx, connector):
     """Restart the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
-    restart_connector(connector,c.integration_daemon, c.integration_daemon_url,
-                                   c.userid, c.password)
+    restart_connector(connector, c.integration_daemon, c.integration_daemon_url,
+                      c.userid, c.password)
 
 
 integration_daemon.add_command(add_catalog_target)
@@ -216,6 +231,5 @@ integration_daemon.add_command(update_catalog_target)
 integration_daemon.add_command(stop_server)
 integration_daemon.add_command(start_server)
 
-
 if __name__ == '__main__':
-    cli()
+    cli()

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/operational/list_catalog_targets.py

@@ -37,8 +37,8 @@ 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_JUPYTER = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
+EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 
 def display_catalog_targets(connector: str, server: str, url: str, username: str, user_password: str,

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/operational/monitor_engine_activity.py

@@ -39,8 +39,8 @@ 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_JUPYTER = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
+EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
 
 disable_ssl_warnings = True
 

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/operational/monitor_gov_eng_status.py

@@ -37,8 +37,9 @@ 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_JUPYTER = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
+EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
+
 
 disable_ssl_warnings = True
 

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/operational/monitor_platform_status.py

@@ -6,21 +6,21 @@ Copyright Contributors to the ODPi Egeria project.
 Display the status of cataloged platforms and servers.
 """
 
-import time
 import argparse
 import os
+import time
+
+from rich.console import Console
+from rich.live import Live
+from rich.table import Table
 
+from pyegeria import RuntimeManager
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
 )
-from rich.table import Table
-from rich.live import Live
-from rich.console import Console
-
-from pyegeria import RuntimeManager
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get('KAFKA_ENDPOINT', 'localhost:9092')
@@ -33,13 +33,18 @@ 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=200)
 
-def display_status(server: str, url: str, username: str, user_pass:str):
+
+def display_status(server: str, url: str, username: str, user_pass: str, jupyter: bool = EGERIA_JUPYTER,
+                   width: int = EGERIA_WIDTH):
     r_client = RuntimeManager(server, url, username)
     token = r_client.create_egeria_bearer_token(username, user_pass)
+
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
@@ -63,9 +68,9 @@ def display_status(server: str, url: str, username: str, user_pass:str):
 
         server_types = {
             "Metadata Access Store": "Store",
-            "View Server" : "View",
-            "Engine Host Server" : "EngineHost",
-            "Integration Daemon" : "Integration"
+            "View Server": "View",
+            "Engine Host Server": "EngineHost",
+            "Integration Daemon": "Integration"
         }
 
         platform_list = r_client.get_platforms_by_type()
@@ -76,18 +81,18 @@ def display_status(server: str, url: str, username: str, user_pass:str):
             server_list = ""
             try:
                 platform_report = r_client.get_platform_report(platform_guid)
-                platform_url = platform_report.get('platformURLRoot'," ")
-                platform_origin = platform_report.get("platformOrigin"," ")
-                platform_started = platform_report.get("platformStartTime"," ")
+                platform_url = platform_report.get('platformURLRoot', " ")
+                platform_origin = platform_report.get("platformOrigin", " ")
+                platform_started = platform_report.get("platformStartTime", " ")
 
-                servers = platform_report.get("omagservers",None)
+                servers = platform_report.get("omagservers", None)
 
                 if servers is not None:
                     for server in servers:
-                        server_name = server.get("serverName"," ")
-                        server_type = server.get("serverType"," ")
-                        server_status = server.get("serverActiveStatus","UNKNOWN")
-                        if server_status in("RUNNING", "STARTING"):
+                        server_name = server.get("serverName", " ")
+                        server_type = server.get("serverType", " ")
+                        server_status = server.get("serverActiveStatus", "UNKNOWN")
+                        if server_status in ("RUNNING", "STARTING"):
                             status_flag = "[bright green]"
                         elif server_status in ("INACTIVE", "STOPPING"):
                             status_flag = "[bright red]"
@@ -99,17 +104,15 @@ def display_status(server: str, url: str, username: str, user_pass:str):
                         server_list = server_list + serv
 
                 table.add_row(platform_name, platform_url, platform_origin, platform_desc,
-                              platform_started, server_list, style = "bold white on black")
+                              platform_started, server_list, style="bold white on black")
             except (Exception) as e:
                 # console.print_exception(e)
                 platform_url = " "
                 platform_origin = " "
                 platform_started = " "
 
-
         return table
 
-
     try:
         with Live(generate_table(), refresh_per_second=4, screen=True) as live:
             while True:
@@ -142,4 +145,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/operational/monitor_server_list.py

@@ -8,21 +8,17 @@ Unit tests for the Utils helper functions using the Pytest framework.
 
 A simple server status display
 """
+import argparse
 import os
 import time
-import argparse
 
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
-)
-from rich.table import Table
 from rich.live import Live
+from rich.table import Table
 
-from pyegeria.server_operations import ServerOps
+from pyegeria._exceptions import (InvalidParameterException, PropertyServerException, UserNotAuthorizedException,
+                                  print_exception_response, )
 from pyegeria.core_omag_server_config import CoreServerConfig
+from pyegeria.server_operations import ServerOps
 
 disable_ssl_warnings = True
 
@@ -37,24 +33,23 @@ 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):
+
+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)
     c_client = CoreServerConfig(server, url, username, user_pass)
 
     def generate_table() -> Table:
         """Make a new table."""
-        table = Table(
-            title=f"Server Status for Platform - {time.asctime()}",
-            style="bold white on black",
-            row_styles=["bold white on black"],
-            header_style="white on dark_blue",
-            title_style="bold white on black",
-            caption_style="white on black",
-            caption=f"Server Status for Platform - '{url}'",
-            show_lines=True,
-            # expand=True
-        )
+        table = Table(title=f"Server Status for Platform - {time.asctime()}", style="bold white on black",
+                      row_styles=["bold white on black"], header_style="white on dark_blue",
+                      title_style="bold white on black",
+                      caption_style="white on black", caption=f"Server Status for Platform - '{url}'", show_lines=True,
+                      # expand=True
+                      )
 
         table.add_column("Known Server")
         table.add_column("Status")
@@ -73,9 +68,8 @@ def display_status(server: str, url: str, username: str, user_pass:str):
             server_type = c_client.get_server_type_classification(server)["serverTypeName"]
             description = c_client.get_basic_server_properties(server).get("localServerDescription", " ")
 
-            table.add_row(server,
-                          "[red]Inactive" if status == "Inactive" else "[green]Active",
-                          server_type, description)
+            table.add_row(server, "[red]Inactive" if status == "Inactive" else "[green]Active", server_type,
+                          description)
 
         return table
 
@@ -110,5 +104,6 @@ def main():
 
     display_status(server, url, userid, user_pass)
 
+
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/examples/widgets/operational/monitor_server_status.py

@@ -8,9 +8,12 @@ Unit tests for the Utils helper functions using the Pytest framework.
 
 A simple server status display
 """
+import argparse
 import os
 import time
-import argparse
+
+from rich.live import Live
+from rich.table import Table
 
 from pyegeria import (
     InvalidParameterException,
@@ -19,8 +22,6 @@ from pyegeria import (
     print_exception_response,
     ServerOps
 )
-from rich.table import Table
-from rich.live import Live
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get('KAFKA_ENDPOINT', 'localhost:9092')
@@ -33,8 +34,12 @@ 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):
+
+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:
@@ -75,10 +80,6 @@ def display_status(server: str, url: str , username: str , user_pass:str):
             while True:
                 time.sleep(2)
                 live.update(generate_table())
-                # services = p_client.get_server_status(server)['serverStatus']['services']
-                # for service in services:
-                #     service_name = service['serviceName']
-                #     service_status = service['serviceStatus']
 
     except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         print_exception_response(e)
@@ -103,5 +104,6 @@ def main():
 
     display_status(server, url, userid, user_pass)
 
+
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-0.5.8.15 → pyegeria-0.5.8.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.5.8.15"
+version = "0.5.8.17"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -54,13 +54,13 @@ pytest = "^8.2.2"
     get_asset_graph = "examples.widgets.catalog_user.get_asset_graph:main"
     get_collection = "examples.widgets.catalog_user.get_collection:main"
     list_glossary = "examples.widgets.catalog_user.list_glossary:main"
+    get_tech_type_elements = "examples.widgets.catalog_user.get_tech_type_elements:main"
+    get_tech_type_template = "examples.widgets.catalog_user.get_tech_type_template:main"
 
-    get_tech_type_elements = "examples.widgets.operational.get_tech_type_elements:main"
-    get_tech_type_template = "examples.widgets.operational.get_tech_type_template:main"
     monitor_asset_events = "examples.widgets.operational.monitor_asset_events:main"
     monitor_coco_status = "examples.widgets.operational.monitor_coco_status:main"
-    monitor_eng_action_status = "examples.widgets.operational.monitor_eng_action_status:main_live"
-    list_eng_action_status = "examples.widgets.operational.monitor_eng_action_status:main_paging "
+    monitor_engine_activity = "examples.widgets.operational.monitor_engine_activity:main_live"
+    list_engine_activity = "examples.widgets.operational.monitor_engine_activity:main_paging "
     monitor_gov_eng_status = "examples.widgets.operational.monitor_gov_eng_status:main_live"
     list_gov_eng_status = "examples.widgets.operational.monitor_gov_eng_status:main_paging"
     monitor_integ_daemon_status = "examples.widgets.operational.monitor_integ_daemon_status:main_live"