pyegeria 0.5.8.13__tar.gz → 0.5.8.16__tar.gz

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/PKG-INFO

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

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/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,39 +44,43 @@ 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('--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, verbose):
+        engine_host, engine_host_url, admin_user, admin_user_password, userid, password, timeout, paging,
+        verbose, jupyter, width):
     """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,
-                     timeout, paging, verbose)
+                     admin_user, admin_user_password, userid, password,
+                     timeout, paging, verbose, jupyter, width)
     ctx.max_content_width = 200
     ctx.ensure_object(Config)
     if verbose:
@@ -87,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")
@@ -108,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
@@ -125,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.userid, c.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.userid, c.password,
+                            list, c.jupyter, c.width)
 
 
 @show.group('integrations')
@@ -152,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
@@ -181,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)
@@ -212,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.13 → pyegeria-0.5.8.16}/examples/widgets/cli/ops_config.py

@@ -8,7 +8,7 @@ class Config(object):
                  engine_host: str = 'engine-host', engine_host_url: str = 'https://localhost:9443',
                  admin_user: str = 'garygeeke', admin_user_password: str = 'secret',
                  userid: str = None, password: str = None,
-                 timeout: int = 30, paging: bool = False, verbose: bool = False):
+                 timeout: int = 30, paging: bool = False, verbose: bool = False, jupyter: bool = False, width:int = 200):
         self.metadata_store = server
         self.metadata_store_url = url
         self.view_server = view_server
@@ -24,6 +24,8 @@ class Config(object):
         self.timeout = timeout
         self.paging = paging
         self.verbose = verbose
+        self.jupyter = jupyter
+        self.width = width
 
 
 pass_config = click.make_pass_decorator(Config)

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/examples/widgets/operational/list_catalog_targets.py

@@ -8,15 +8,15 @@ Unit tests for the Utils helper functions using the Pytest framework.
 
 List catalog targets
 """
-import os
 import argparse
+import os
 import time
 
 from rich import box
 from rich.console import Console
-from rich.table import Table
-from rich.prompt import Prompt
 from rich.markdown import Markdown
+from rich.prompt import Prompt
+from rich.table import Table
 
 from pyegeria import (
     InvalidParameterException,
@@ -37,11 +37,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_catalog_targets(connector:str, server: str, url: str, username: str, user_password: str):
-
-
+def display_catalog_targets(connector: str, server: str, url: str, username: str, user_password: str,
+                            jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
@@ -65,27 +66,26 @@ def display_catalog_targets(connector:str, server: str, url: str, username: str,
         table.add_column("Operational Instructions", max_width=15)
         # table.add_column("Delete Method")
 
-
         if type(cat_targets) is list:
             for target in cat_targets:
-                target_name = target.get('catalogTargetName','---')
+                target_name = target.get('catalogTargetName', '---')
                 target_source = target.get('metadataSourceQualifiedName', '---')
-                target_rel = target.get('relationshipGUID','---')
+                target_rel = target.get('relationshipGUID', '---')
                 target_sync = target.get('permittedSynchronization')
-                target_delete = target.get('deleteMethod','---')
+                target_delete = target.get('deleteMethod', '---')
                 op_instruct = f"* {target_sync}\n* {target_delete}"
                 op_instruct_out = Markdown(op_instruct)
                 # target_guid = target['catalogTargetElement']['guid']
                 connector_unique = target['catalogTargetElement']['uniqueName']
 
-                config_props = target.get('configurationProperties','---')
+                config_props = target.get('configurationProperties', '---')
                 if type(config_props) is dict:
                     config_props_md = ''
                     for prop in config_props:
                         config_props_md += f"* {prop}: {config_props[prop]}\n"
                     config_props_out = Markdown(config_props_md)
 
-                template_props = target.get('templateProperties','---')
+                template_props = target.get('templateProperties', '---')
                 if type(template_props) is dict:
                     template_props_md = ''
                     for prop in template_props:
@@ -106,7 +106,7 @@ def display_catalog_targets(connector:str, server: str, url: str, username: str,
 
         connector_guid = INTEGRATION_GUIDS[connector]
         cat_targets = a_client.get_catalog_targets(connector_guid)
-        console = Console(force_terminal=False, width=250)
+        console = Console(force_terminal=not jupyter, width=width)
         with console.pager(styles=True):
             console.print(generate_table())
 
@@ -124,6 +124,8 @@ def main():
     parser.add_argument("--url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
+    parser.add_argument("--jupyter", help="Enable for Jupyter terminal compatibility")
+    parser.add_argument("--width", help="Screen width, in characters, to use")
 
     args = parser.parse_args()
 
@@ -131,13 +133,16 @@ def main():
     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
     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
 
     try:
         connector = Prompt.ask("Enter the Integration Connector to list catalog targets for")
-        display_catalog_targets(connector, server, url, userid, user_pass)
+        display_catalog_targets(connector, server, url, userid, user_pass, jupyter)
 
     except KeyboardInterrupt:
         pass
 
+
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/examples/widgets/operational/monitor_asset_events.py

@@ -27,7 +27,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)
 
 def main(ep: str = EGERIA_KAFKA_ENDPOINT):
 

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/examples/widgets/operational/monitor_engine_activity.py

@@ -14,11 +14,11 @@ import json
 import os
 import sys
 import time
-from rich import box
 
+from rich import box
+from rich.console import Console
 from rich.live import Live
 from rich.table import Table
-from rich.console import Console
 
 from pyegeria import AutomatedCuration
 from pyegeria import (
@@ -39,11 +39,14 @@ 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
 
 
-def display_engine_activity(server: str, url: str, user: str, user_pass:str, paging: bool):
+def display_engine_activity(server: str, url: str, user: str, user_pass: str, paging: bool,
+                            jupyter: bool = EGERIA_JUPYTER, width=EGERIA_WIDTH):
     g_client = AutomatedCuration(server, url, user, user_pwd=user_pass)
 
     def generate_table() -> Table:
@@ -99,7 +102,7 @@ def display_engine_activity(server: str, url: str, user: str, user_pass:str, pag
                 else:
                     action_status = f"[red]{action['actionStatus']}"
 
-                target= action.get("actionTargetElements", "Empty")
+                target = action.get("actionTargetElements", "Empty")
                 if type(target) is list:
                     target_element = json.dumps(target[0]["targetElement"]["elementProperties"]["propertiesAsStrings"])
                 else:
@@ -109,7 +112,7 @@ def display_engine_activity(server: str, url: str, user: str, user_pass:str, pag
                 completion_message = action.get("completionMessage", " ")
 
                 table.add_row(
-                    requested_time, start_time, action_guid,engine_name, request_type,
+                    requested_time, start_time, action_guid, engine_name, request_type,
                     action_status, target_element, completion_time, process_name, completion_message
                 )
         else:
@@ -120,7 +123,7 @@ def display_engine_activity(server: str, url: str, user: str, user_pass:str, pag
 
     try:
         if paging is True:
-            console = Console()
+            console = Console(width=width, force_terminal=not jupyter)
             with console.pager():
                 console.print(generate_table())
         else:
@@ -153,6 +156,7 @@ def main_live():
 
     display_engine_activity(server=server, url=url, user=userid, user_pass=user_pass, paging=False)
 
+
 def main_paging():
     parser = argparse.ArgumentParser()
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -169,8 +173,9 @@ def main_paging():
 
     display_engine_activity(server=server, url=url, user=userid, user_pass=user_pass, paging=True)
 
+
 if __name__ == "__main__":
     main_live()
 
 if __name__ == "__main_paging__":
-    main_paging()
+    main_paging()

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/examples/widgets/operational/monitor_gov_eng_status.py

@@ -8,11 +8,15 @@ Unit tests for the Utils helper functions using the Pytest framework.
 
 A simple status display for Governance Actions
 """
+import argparse
+import json
 import os
 import time
-import json
-import argparse
 
+from rich import box
+from rich.console import Console
+from rich.live import Live
+from rich.table import Table
 
 from pyegeria import (
     InvalidParameterException,
@@ -20,13 +24,8 @@ from pyegeria import (
     UserNotAuthorizedException,
     print_exception_response,
 )
-from rich.table import Table
-from rich.live import Live
-from rich import box
-from rich.console import Console
-
-
 from pyegeria.server_operations import 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')
@@ -38,12 +37,15 @@ 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
 
+disable_ssl_warnings = True
 
 
-def display_gov_eng_status(server: str , url: str, username: str, user_pass:str, paging:bool):
+def display_gov_eng_status(server: str, url: str, username: str, user_pass: str, paging: bool,
+                           jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
     server_name = server
     s_client = ServerOps(server_name, url, username, user_pass)
 
@@ -74,16 +76,17 @@ def display_gov_eng_status(server: str , url: str, username: str, user_pass:str,
             eng_type = engine["governanceEngineTypeName"]
 
             eng_desc = engine["governanceEngineDescription"]
-            eng_req_type = json.dumps(engine["governanceRequestTypes"], indent = 2)
+            eng_req_type = json.dumps(engine["governanceRequestTypes"], indent=2)
             status = engine["governanceEngineStatus"]
             if status in ("RUNNING"):
                 eng_status = f"[green]{status}"
             elif status in ("FAILED"):
                 eng_status = f"[red]{status}"
-            else: eng_status = f"[yellow]{status}"
+            else:
+                eng_status = f"[yellow]{status}"
 
             table.add_row(
-                gov_eng, eng_type, eng_desc, eng_status,eng_req_type
+                gov_eng, eng_type, eng_desc, eng_status, eng_req_type
             )
 
         table.caption = f"Server {server_name} running on {url}"
@@ -91,7 +94,7 @@ def display_gov_eng_status(server: str , url: str, username: str, user_pass:str,
 
     try:
         if paging is True:
-            console = Console()
+            console = Console(width=width, force_terminal=not jupyter)
             with console.pager():
                 console.print(generate_table())
         else:
@@ -124,6 +127,7 @@ def main_live():
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     display_gov_eng_status(server=server, url=url, username=userid, user_pass=user_pass, paging=False)
 
+
 def main_paging():
     parser = argparse.ArgumentParser()
     parser.add_argument("--server", help="Name of the server to display status for")
@@ -139,10 +143,8 @@ def main_paging():
     display_gov_eng_status(server=server, url=url, username=userid, user_pass=user_pass, paging=True)
 
 
-
 if __name__ == "__main__":
     main_live()
 
-
 if __name__ == "__main_paging__":
-    main_paging()
+    main_paging()

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/examples/widgets/operational/monitor_integ_daemon_status.py

@@ -8,10 +8,9 @@ A simple status display for the Integration Daemon.
 
 
 """
-import os
 import argparse
+import os
 import time
-from datetime import datetime
 
 from rich import box
 from rich.console import Console
@@ -25,6 +24,7 @@ from pyegeria._exceptions import (
     UserNotAuthorizedException,
     print_exception_response,
 )
+
 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')
@@ -36,12 +36,16 @@ 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)
 
 disable_ssl_warnings = True
 
 
 def display_integration_daemon_status(integ_server: str, integ_url: str,
-                                      view_server:str, view_url: str, user: str, user_pass:str, paging: bool):
+                                      view_server: str, view_url: str, user: str, user_pass: str, paging: bool,
+                                      jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH
+                                      ):
     s_client = ServerOps(integ_server, integ_url, user)
     a_client = AutomatedCuration(view_server, view_url, user, user_pass)
     token = a_client.create_egeria_bearer_token()
@@ -50,8 +54,8 @@ def display_integration_daemon_status(integ_server: str, integ_url: str,
         """Make a new table."""
         table = Table(
             title=f"Integration Daemon Status @ {time.asctime()}",
-            style = "bold white on black",
-            row_styles = ["bold white on black"],
+            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",
@@ -60,20 +64,20 @@ def display_integration_daemon_status(integ_server: str, integ_url: str,
             caption=f"Integration Daemon Status for Server '{integ_server}' @ Platform - {integ_url}",
             expand=True
         )
-        table.add_column("Connector Name", min_width = 15)
+        table.add_column("Connector Name", min_width=15)
         table.add_column("Status", max_width=6)
 
-        table.add_column("Last Refresh Time", min_width = 12)
+        table.add_column("Last Refresh Time", min_width=12)
         table.add_column("Min Refresh (mins)", max_width=6)
         table.add_column("Target Element", min_width=20)
-        table.add_column("Exception Message",min_width=10)
+        table.add_column("Exception Message", min_width=10)
 
         daemon_status = s_client.get_integration_daemon_status()
         connector_reports = daemon_status["integrationConnectorReports"]
         for connector in connector_reports:
             connector_name = connector.get("connectorName", "---")
             connector_status = connector.get("connectorStatus", "---")
-            connector_guid = connector.get("connectorGUID","---")
+            connector_guid = connector.get("connectorGUID", "---")
             last_refresh_time = connector.get("lastRefreshTime", "---")[:-10]
             refresh_interval = str(connector.get("minMinutesBetweenRefresh", "---"))
             exception_msg = " "
@@ -92,7 +96,7 @@ def display_integration_daemon_status(integ_server: str, integ_url: str,
                         t_unique_name = target["catalogTargetElement"]["uniqueName"]
                         t_rel_guid = target["relationshipGUID"]
                         # targets_m += f"* Target Name: __{t_name}__\n* Sync: {t_sync}\n* Unique Name: {t_unique_name}\n\n"
-                        tgt_tab.add_row(t_name,t_unique_name, t_rel_guid)
+                        tgt_tab.add_row(t_name, t_unique_name, t_rel_guid)
                     # targets_md = Markdown(targets_m)
                 else:
                     targets_md = False
@@ -118,7 +122,7 @@ def display_integration_daemon_status(integ_server: str, integ_url: str,
 
     try:
         if paging is True:
-            console = Console()
+            console = Console(width=width, force_terminal=not jupyter)
             with console.pager():
                 console.print(generate_table())
         else:
@@ -156,8 +160,9 @@ def main_live():
     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
     display_integration_daemon_status(integ_server=integ_server, integ_url=integ_url,
-                                      view_server = view_server, view_url = view_url,
-                                      user=userid, user_pass = user_pass, paging = False)
+                                      view_server=view_server, view_url=view_url,
+                                      user=userid, user_pass=user_pass, paging=False)
+
 
 def main_paging():
     parser = argparse.ArgumentParser()
@@ -176,12 +181,12 @@ def main_paging():
     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
     display_integration_daemon_status(integ_server=integ_server, integ_url=integ_url,
-                                      view_server = view_server, view_url = view_url,
-                                      user=userid, user_pass = user_pass, paging = True)
+                                      view_server=view_server, view_url=view_url,
+                                      user=userid, user_pass=user_pass, paging=True)
 
 
 if __name__ == "__main__":
     main_live()
 
 if __name__ == "__main_paging__":
-    main_paging()
+    main_paging()

{pyegeria-0.5.8.13 → pyegeria-0.5.8.16}/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.13 → pyegeria-0.5.8.16}/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.13 → pyegeria-0.5.8.16}/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.13 → pyegeria-0.5.8.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.5.8.13"
+version = "0.5.8.16"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"