pyegeria 0.7.29__py3-none-any.whl → 0.7.30__py3-none-any.whl

examples/widgets/cli/egeria.py

@@ -45,6 +45,7 @@ from examples.widgets.ops.integration_daemon_actions import (
 from examples.widgets.ops.list_catalog_targets import display_catalog_targets
 from examples.widgets.ops.load_archive import load_archive
 from examples.widgets.ops.monitor_engine_activity import display_engine_activity
+from examples.widgets.ops.monitor_engine_activity_c import display_engine_activity_c
 from examples.widgets.ops.monitor_gov_eng_status import display_gov_eng_status
 from examples.widgets.ops.monitor_integ_daemon_status import (
     display_integration_daemon_status,
@@ -988,19 +989,36 @@ def gov_eng_status(ctx, list):
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
+@click.option(
+    "--compressed",
+    type=bool,
+    default=True,
+    help="Compressed combines some attributes into a single column",
+)
 @click.pass_context
-def eng_activity_status(ctx, list):
+def eng_activity_status(ctx, list, compressed):
     """Show Governance Activity in engine-host"""
     c = ctx.obj
-    display_engine_activity(
-        c.view_server,
-        c.view_server_url,
-        c.admin_user,
-        c.admin_user_password,
-        list,
-        c.jupyter,
-        c.width,
-    )
+    if compressed:
+        display_engine_activity_c(
+            c.view_server,
+            c.view_server_url,
+            c.admin_user,
+            c.admin_user_password,
+            list,
+            c.jupyter,
+            c.width,
+        )
+    else:
+        display_engine_activity(
+            c.view_server,
+            c.view_server_url,
+            c.admin_user,
+            c.admin_user_password,
+            list,
+            c.jupyter,
+            c.width,
+        )
 
 
 @show.group("integrations")

examples/widgets/cli/egeria_ops.py

@@ -14,18 +14,32 @@ from trogon import tui
 
 # from pyegeria import ServerOps
 from examples.widgets.cli.ops_config import Config
-from examples.widgets.ops.engine_actions import start_daemon as start_engine_host, \
-    stop_daemon as stop_engine_host
-from examples.widgets.ops.integration_daemon_actions import (add_catalog_target, remove_catalog_target,
-                                                             update_catalog_target, stop_server, start_server)
+from examples.widgets.ops.engine_actions import (
+    start_daemon as start_engine_host,
+    stop_daemon as stop_engine_host,
+)
+from examples.widgets.ops.integration_daemon_actions import (
+    add_catalog_target,
+    remove_catalog_target,
+    update_catalog_target,
+    stop_server,
+    start_server,
+)
 from examples.widgets.ops.list_catalog_targets import display_catalog_targets
 from examples.widgets.ops.load_archive import load_archive
 from examples.widgets.ops.monitor_engine_activity import display_engine_activity
+from examples.widgets.ops.monitor_engine_activity_c import display_engine_activity_c
 from examples.widgets.ops.monitor_gov_eng_status import display_gov_eng_status
-from examples.widgets.ops.monitor_integ_daemon_status import display_integration_daemon_status
-from examples.widgets.ops.monitor_platform_status import display_status as p_display_status
+from examples.widgets.ops.monitor_integ_daemon_status import (
+    display_integration_daemon_status,
+)
+from examples.widgets.ops.monitor_platform_status import (
+    display_status as p_display_status,
+)
 from examples.widgets.ops.monitor_server_list import display_status as display_list
-from examples.widgets.ops.monitor_server_status import display_status as s_display_status
+from examples.widgets.ops.monitor_server_status import (
+    display_status as s_display_status,
+)
 from examples.widgets.ops.refresh_integration_daemon import refresh_connector
 from examples.widgets.ops.restart_integration_daemon import restart_connector
 
@@ -43,47 +57,142 @@ from examples.widgets.ops.restart_integration_daemon import restart_connector
 #
 # pass_config = click.make_pass_decorator(Config)
 
+
 @tui()
 # @tui('menu', 'menu', 'A textual command line interface')
 @click.version_option("0.0.1", prog_name="egeria_ops")
 @click.group()
-@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',
-              help='URL of Egeria metadata store platform to connect to')
-@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',
-              help='URL of Egeria integration daemon platform to connect to')
-@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',
-              help='URL of Egeria view server platform to connect to')
-@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',
-              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',
-              help='Egeria admin password')
-@click.option('--userid', default='erinoverview', 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(
+    "--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",
+    help="URL of Egeria metadata store platform to connect to",
+)
+@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",
+    help="URL of Egeria integration daemon platform to connect to",
+)
+@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",
+    help="URL of Egeria view server platform to connect to",
+)
+@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",
+    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",
+    help="Egeria admin password",
+)
+@click.option(
+    "--userid", default="erinoverview", 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.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, 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, jupyter, width)
+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,
+    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,
+        jupyter,
+        width,
+    )
     ctx.max_content_width = 200
     ctx.ensure_object(Config)
     if verbose:
@@ -97,20 +206,21 @@ def show(ctx):
     pass
 
 
-@show.group('platforms')
+@show.group("platforms")
 @click.pass_context
 def show_platform(ctx):
     """Group of commands to show information about Egeria platforms"""
     pass
 
 
-@show_platform.command('status')
+@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")
@@ -120,17 +230,35 @@ def show_server(ctx):
     pass
 
 
-@show_server.command('status')
-@click.option('--full', is_flag=True, default=False, help='If True, full server descriptions will be shown')
+@show_server.command("status")
+@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, c.jupyter, c.width)
+        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, c.jupyter,
-                         c.width)
+        s_display_status(
+            c.metadata_store,
+            c.metadata_store_url,
+            c.admin_user,
+            c.admin_user_password,
+            c.jupyter,
+            c.width,
+        )
 
 
 @show.group("engines")
@@ -141,28 +269,55 @@ def engine_host(ctx):
 
 
 @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):
     """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.jupyter, c.width)
-
-
-@engine_host.command('activity')
-@click.option('--list', is_flag=True, default=False, help='If True, a paged list will be shown')
+    display_gov_eng_status(
+        c.engine_host, c.engine_host_url, c.userid, c.password, list, c.jupyter, c.width
+    )
+
+
+@engine_host.command("activity")
+@click.option(
+    "--compressed",
+    type=bool,
+    default=True,
+    help="Compressed combines some attributes into a single column",
+)
+@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, compressed):
     """Show Governance Activity in engine-host"""
     c = ctx.obj
-    display_engine_activity(c.view_server, c.view_server_url,
-                            c.admin_user, c.admin_user_password,
-                            list, c.jupyter, c.width)
-
-
-@show.group('integrations')
+    if compressed:
+        display_engine_activity_c(
+            c.view_server,
+            c.view_server_url,
+            c.admin_user,
+            c.admin_user_password,
+            list,
+            c.jupyter,
+            c.width,
+        )
+    else:
+        display_engine_activity(
+            c.view_server,
+            c.view_server_url,
+            c.admin_user,
+            c.admin_user_password,
+            list,
+            c.jupyter,
+            c.width,
+        )
+
+
+@show.group("integrations")
 @click.pass_context
 def integrations(ctx):
     """Group of commands to show information about Egeria integrations"""
@@ -170,62 +325,90 @@ def integrations(ctx):
 
 
 @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):
     """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.jupyter, c.width)
+    display_integration_daemon_status(
+        c.integration_daemon,
+        c.integration_daemon_url,
+        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)
+@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.jupyter, c.width)
+    display_catalog_targets(
+        connector,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
 
 
 #
 #  Tell
 #
 
-@cli.group('tell')
+
+@cli.group("tell")
 @click.pass_context
 def tell(ctx):
     """Perform actions an Egeria Objects"""
     pass
 
 
-@tell.group('integration-daemon')
+@tell.group("integration-daemon")
 @click.pass_context
 def integration_daemon(ctx):
     """Group of commands to an integration-daemon"""
     pass
 
 
-@integration_daemon.command('refresh')
+@integration_daemon.command("refresh")
 @click.pass_context
-@click.option('--connector', default='all', help="Name of connector to refresh or 'all' to refresh all")
+@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')
+@integration_daemon.command("restart")
 @click.pass_context
-@click.option('--connector', default='all', help="Name of connector to restart or 'all' to restart all")
+@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)
@@ -235,7 +418,7 @@ integration_daemon.add_command(stop_server)
 integration_daemon.add_command(start_server)
 
 
-@tell.group('engine-host')
+@tell.group("engine-host")
 @click.pass_context
 def engine_host(ctx):
     """Group of commands to an engine-host"""
@@ -245,14 +428,16 @@ def engine_host(ctx):
 engine_host.add_command(start_engine_host)
 engine_host.add_command(stop_engine_host)
 
-@tell.group('repository')
+
+@tell.group("repository")
 @click.pass_context
 def repository(ctx):
     """Group of commands to a repository"""
     pass
 
+
 repository.add_command(load_archive)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     cli()

examples/widgets/ops/monitor_engine_activity.py

@@ -89,7 +89,9 @@ def display_engine_activity(
         token = g_client.create_egeria_bearer_token()
         action_status = g_client.get_engine_actions()
         sorted_action_status = sorted(
-            action_status, key=lambda i: i["requestedTime"], reverse=True
+            action_status,
+            key=lambda i: i("requestedTime", time.asctime()),
+            reverse=True,
         )
         if type(action_status) is str:
             requested_time = " "

examples/widgets/ops/monitor_engine_activity_c.py

@@ -0,0 +1,237 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Unit tests for the Utils helper functions using the Pytest framework.
+
+
+A simple status display for Engine Actions
+"""
+
+import argparse
+import json
+import os
+import sys
+import time
+
+from rich import box
+from rich.console import Console
+from rich.live import Live
+from rich.markdown import Markdown
+from rich.table import Table
+
+from pyegeria import AutomatedCuration
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    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")
+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_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_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_c(
+    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:
+        """Make a new table."""
+        table = Table(
+            title=f"Engine Action Status for Platform {url} @ {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",
+            show_lines=True,
+            box=box.ROUNDED,
+            caption=f"Engine Status for Server '{server}' @ Platform - {url}",
+            expand=True,
+        )
+        table.add_column("Requested Time")
+        table.add_column("Core Info")
+
+        # table.add_column("Request Type")
+        table.add_column("Action Status")
+        table.add_column("Target Element")
+        table.add_column("Completion Time")
+        table.add_column("Process Name")
+        table.add_column("Completion Message")
+
+        token = g_client.create_egeria_bearer_token()
+        action_status = g_client.get_engine_actions()
+        sorted_action_status = sorted(
+            action_status,
+            key=lambda i: i.get("requestedTime", time.asctime()),
+            reverse=True,
+        )
+        if type(action_status) is str:
+            requested_time = " "
+            start_time = " "
+            completion_time = " "
+            engine_name = " "
+            request_type = " "
+            action_status = " "
+            target_element = " "
+            process_name = " "
+            completion_message = " "
+        elif type(action_status) is list:
+            for action in sorted_action_status:
+                requested_time = action.get("requestedTime", " ")
+                start_time = action.get("startTime", " ")
+                completion_time = action.get("completionTime", " ")
+
+                engine_name = action["governanceEngineName"]
+                request_type = action["requestType"]
+                action_guid = action["elementHeader"]["guid"]
+                if action["actionStatus"] in (
+                    "REQUESTED",
+                    "APPROVED",
+                    "WAITING",
+                    "ACTIVATING",
+                ):
+                    action_status = f"[yellow]{action['actionStatus']}"
+                elif action["actionStatus"] in ("IN_PROGRESS", "ACTIONED"):
+                    action_status = f"[green]{action['actionStatus']}"
+                else:
+                    action_status = f"[red]{action['actionStatus']}"
+
+                targets = action.get("actionTargetElements", "Empty")
+                if type(targets) is list:
+                    tgt_tab = Table()
+                    tgt_tab.add_column("name")
+                    tgt_tab.add_column("guid", no_wrap=True)
+                    tgt_tab.add_column("type_name")
+                    targets_md = ""
+                    for target in targets:
+                        t_name = target["actionTargetName"]
+                        t_guid = target["actionTargetGUID"]
+                        t_type = target["targetElement"]["type"]["typeName"]
+                        tgt_tab.add_row(t_name, t_guid, t_type)
+                    # target_element = json.dumps(target[0]["targetElement"]["elementProperties"]["propertiesAsStrings"])
+                    target_element = tgt_tab
+                else:
+                    target_element = " "
+
+                process_name = action.get("processName", " ")
+                completion_message = action.get("completionMessage", " ")
+
+                core_info_md = (
+                    f"* Start Time: {start_time}\n* Engine Name: {engine_name}\n* GUID: {action_guid}\n"
+                    f"* Request TYpe: {request_type}"
+                )
+                core_info_out = Markdown(core_info_md)
+                table.add_row(
+                    requested_time,
+                    core_info_out,
+                    action_status,
+                    target_element,
+                    completion_time,
+                    process_name,
+                    completion_message,
+                )
+        else:
+            print("Egeria integration daemon not running")
+            sys.exit()
+
+        return table
+
+    try:
+        if paging is True:
+            console = Console(width=width, force_terminal=not jupyter)
+            with console.pager():
+                console.print(generate_table())
+        else:
+            with Live(
+                generate_table(),
+                refresh_per_second=1,
+                screen=True,
+                vertical_overflow="visible",
+            ) as live:
+                while True:
+                    time.sleep(2)
+                    live.update(generate_table())
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+    except KeyboardInterrupt:
+        pass
+    finally:
+        g_client.close_session()
+
+
+def main_live():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_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
+
+    display_engine_activity_c(
+        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")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_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
+
+    display_engine_activity_c(
+        server=server, url=url, user=userid, user_pass=user_pass, paging=True
+    )
+
+
+if __name__ == "__main__":
+    main_live()
+
+if __name__ == "__main_paging__":
+    main_paging()

examples/widgets/ops/monitor_integ_daemon_status.py

@@ -88,7 +88,9 @@ def display_integration_daemon_status(
 
         reports = daemon_status["integrationConnectorReports"]
         if sort is True:
-            connector_reports = sorted(reports, key=lambda x: x["connectorName"])
+            connector_reports = sorted(
+                reports, key=lambda x: x.get("connectorName", "---")
+            )
         else:
             connector_reports = reports
 

{pyegeria-0.7.29.dist-info → pyegeria-0.7.30.dist-info}/METADATA

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

{pyegeria-0.7.29.dist-info → pyegeria-0.7.30.dist-info}/RECORD

@@ -17,10 +17,10 @@ examples/widgets/cat/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3S
 examples/widgets/cat/list_todos.py,sha256=_Pe3h74doX_cOoe0Z5_FvZtETBk3tkw2evfRpRgai5E,6283
 examples/widgets/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
 examples/widgets/cli/__init__.py,sha256=6d_R0KZBNnJy9EBz9J2xvGFlx-3j_ZPqPCxKgdvYeDQ,291
-examples/widgets/cli/egeria.py,sha256=LbF6ZsjhAsr-DBJCewdrBiVmD9D0tkn7KuaCXZFRP78,27490
+examples/widgets/cli/egeria.py,sha256=7XqRhtHtWq2vfH4MCNpxqnNsYEsbKIRHW7GFE2AYjkg,28017
 examples/widgets/cli/egeria_cat.py,sha256=h029HG863NFocEYiy6hCmIBGdOiLEJQx6WACNXNLUBE,11964
 examples/widgets/cli/egeria_my.py,sha256=cGehUFrJKwNQ49CQ-rEX0M-6yjviRSb9KQjAcKD7Mq4,5993
-examples/widgets/cli/egeria_ops.py,sha256=az3P2GkHc-DfkFdD92ulw7TZ0XjwWPWP0pGBMc2RYQY,10139
+examples/widgets/cli/egeria_ops.py,sha256=u0GLBbDuM7eHRdfKCyqGH3icWDclvkfofbfZoq6ObHA,11116
 examples/widgets/cli/egeria_tech.py,sha256=AA2PNDKebdDObtrmjF6BHaSuSpNVeQgB61CSX1cBvsg,10255
 examples/widgets/cli/ops_config.py,sha256=m4AfPjf-fR4EBTx8Dc2mcgrfWwAxb30YGeV-v79bg4U,1450
 examples/widgets/my/README.md,sha256=ZheFhj_VoPMhcWjW3pGchHB0vH_A9PklSmrSkzKdrcQ,844
@@ -39,9 +39,10 @@ examples/widgets/ops/list_catalog_targets.py,sha256=0FIZqZu7DSh7tnrme6EOhNiVvK8w
 examples/widgets/ops/load_archive.py,sha256=duf3wq2ANRBiOj9KTFsw8TseEkJLKdzITAeTCjsMvI0,2453
 examples/widgets/ops/monitor_asset_events.py,sha256=cjdlVqE0XYnoRW3aorNbsVkjByDXefPBnllaZLelGls,3838
 examples/widgets/ops/monitor_coco_status.py,sha256=ERz3OJ0TXImNKHGD4gJvgT3pl2gS23ewAdUuYVLUhEE,3299
-examples/widgets/ops/monitor_engine_activity.py,sha256=qMtthJKCYck0palkgacwSApyQOAaEiK2ZA8L0a2qfQc,8413
+examples/widgets/ops/monitor_engine_activity.py,sha256=OkGoUYsJA4SWQl9xB0iOMSd2hoAv7TxnuiWylq3MO4U,8454
+examples/widgets/ops/monitor_engine_activity_c.py,sha256=VOX3E_FaSAmDNGtyY7tOhxX_MF0LJ67n3G9ZWhMtqC8,8575
 examples/widgets/ops/monitor_gov_eng_status.py,sha256=QwSIzXDn81gJr36jTgJ-3JR0iAV6BPDfP1b7K9eCZlE,6162
-examples/widgets/ops/monitor_integ_daemon_status.py,sha256=NqviLqgykr45Fmf1CePeIqRTCn4gvSa6aykjvH9Gy0A,9183
+examples/widgets/ops/monitor_integ_daemon_status.py,sha256=u15-tvGveO7_yV7JJmYkxiEDnq5KBk8J4hkw0id_LFA,9224
 examples/widgets/ops/monitor_platform_status.py,sha256=mgEeRjv2mIRBUxusHqeQGeoOp8Ehlk2IX-t3qtLKFqs,6123
 examples/widgets/ops/monitor_server_list.py,sha256=eHSeM5dW7Wyjp2zR_AD6_FalFnZ2dBaZKxtob2kva9I,4483
 examples/widgets/ops/monitor_server_status.py,sha256=A-8hMDfbscdcq-b1OD4wKn0tphumX8WIK-Hz8uPoFkc,3974
@@ -88,8 +89,8 @@ pyegeria/runtime_manager_omvs.py,sha256=oSVFeG_yBGXIvQR0EClLZqTZ6C5z5ReZzwm8cce8
 pyegeria/server_operations.py,sha256=1z2wZLdrNZG6HlswY_Eh8qI1mlcjsQ59zO-AMy9XbUU,16605
 pyegeria/utils.py,sha256=pkVmS3RrbjaS9yz7FtOCwaOfV5FMqz-__Rt5koCnd9c,5374
 pyegeria/valid_metadata_omvs.py,sha256=aisdRodIwJSkyArAzfm_sEnBELh69xE8k4Nea-vHu8M,36745
-pyegeria-0.7.29.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-0.7.29.dist-info/METADATA,sha256=OxtFFPY5YsJetc3--FO-SFeHZlDsuhq-jdAphAcTvP4,2818
-pyegeria-0.7.29.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-0.7.29.dist-info/entry_points.txt,sha256=22oy5-EM37ldb_-MPtiJygwXU217h8vb2_zT-7vn-yc,3571
-pyegeria-0.7.29.dist-info/RECORD,,
+pyegeria-0.7.30.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-0.7.30.dist-info/METADATA,sha256=GUv23ihEaAeJlNKti02n5h3QumwbjBKoYQN5SEl3V98,2818
+pyegeria-0.7.30.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-0.7.30.dist-info/entry_points.txt,sha256=22oy5-EM37ldb_-MPtiJygwXU217h8vb2_zT-7vn-yc,3571
+pyegeria-0.7.30.dist-info/RECORD,,