pyegeria 0.8.4.25__tar.gz → 0.8.4.27__tar.gz

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/PKG-INFO

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

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/cli/__init__.py

@@ -10,4 +10,4 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 
 """
 
-from .ops_config import Config
+from .ops_config import Config

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/cli/egeria.py

@@ -52,7 +52,6 @@ from commands.ops.monitor_integ_daemon_status import (
 from commands.ops.monitor_platform_status import (
     display_status as p_display_status,
 )
-from commands.ops.monitor_server_list import display_status as display_list
 from commands.ops.monitor_server_status import (
     display_status as s_display_status,
 )
@@ -839,7 +838,7 @@ def show_projects(ctx, search_string):
     "--status",
     type=click.Choice(
         ["OPEN", "IN_PROGRESS", "WAITING", "COMPLETE", "ABANDONED", "None"],
-        case_sensitive="False",
+        case_sensitive=False,
     ),
     help="Enter an optional status filter, default='OPEN'",
     required=False,
@@ -877,7 +876,13 @@ def list_archives(ctx):
     """Display a tree graph of information about an asset"""
     c = ctx.obj
     display_archive_list(
-        c.view_server, c.view_server_url, c.userid, c.password, None, c.jupyter, c.width
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        False,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -964,30 +969,21 @@ def show_server(ctx):
     "--full",
     is_flag=True,
     default=False,
-    help="If True, full server descriptions will be shown",
+    help="If set, 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,
-        )
-    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(
+        full,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
 
 
 @show.group("engines")
@@ -1001,12 +997,24 @@ def engine_host(ctx):
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
+@click.option(
+    "--engine-host",
+    default="engine-host",
+    help="Name of the Engine Host to get status for",
+)
 @click.pass_context
-def gov_eng_status(ctx, list):
+def gov_eng_status(ctx, engine_host, 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,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        list,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -1122,11 +1130,16 @@ def integration_daemon(ctx):
     default="all",
     help="Name of connector to refresh or 'all' to refresh all",
 )
-def refresh_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def refresh_connectors(ctx, server, 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
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
@@ -1137,11 +1150,16 @@ def refresh_connectors(ctx, connector):
     default="all",
     help="Name of connector to restart or 'all' to restart all",
 )
-def restart_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def restart_connectors(ctx, server, 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
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
@@ -1161,6 +1179,7 @@ def engine_host(ctx):
 
 engine_host.add_command(start_server)
 engine_host.add_command(stop_server)
+engine_host.add_command(refresh_gov_eng_config)
 
 
 @tell.group("repository")

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/cli/egeria_ops.py

@@ -34,7 +34,6 @@ from commands.ops.monitor_integ_daemon_status import (
 from commands.ops.monitor_platform_status import (
     display_status as p_display_status,
 )
-from commands.ops.monitor_server_list import display_status as display_list
 from commands.ops.monitor_server_status import (
     display_status as s_display_status,
 )
@@ -120,9 +119,7 @@ from commands.ops.restart_integration_daemon import restart_connector
     envvar="EGERIA_ADMIN_PASSWORD",
     help="Egeria admin password",
 )
-@click.option(
-    "--userid", default="erinoverview", envvar="EGERIA_USER", help="Egeria user"
-)
+@click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
 @click.option(
     "--password",
     default="secret",
@@ -233,30 +230,21 @@ def show_server(ctx):
     "--full",
     is_flag=True,
     default=False,
-    help="If True, full server descriptions will be shown",
+    help="If set, 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,
-        )
-    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(
+        full,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
 
 
 @show.group("engines")
@@ -267,15 +255,27 @@ def engine_host(ctx):
 
 
 @engine_host.command("status")
+@click.option(
+    "--engine-host",
+    default="engine-host",
+    help="Name of the Engine Host to get status for",
+)
 @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, engine_host, 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
+        c.engine_host,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        list,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -386,9 +386,6 @@ def servers(ctx):
 
 servers.add_command(start_server)
 servers.add_command(stop_server)
-servers.add_command(refresh_gov_eng_config)
-
-CONTEXT_SETTINGS = dict(default_map={"runserver": {"port": 5000}})
 
 
 @tell.group("integration-daemon")
@@ -405,11 +402,16 @@ def integration_daemon(ctx):
     default="all",
     help="Name of connector to refresh or 'all' to refresh all",
 )
-def refresh_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def refresh_connectors(ctx, server, 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
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
@@ -420,19 +422,22 @@ def refresh_connectors(ctx, connector):
     default="all",
     help="Name of connector to restart or 'all' to restart all",
 )
-def restart_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def restart_connectors(ctx, server, 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
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
 integration_daemon.add_command(add_catalog_target)
 integration_daemon.add_command(remove_catalog_target)
 integration_daemon.add_command(update_catalog_target)
-integration_daemon.add_command(start_server)
-integration_daemon.add_command(stop_server)
 
 
 @tell.group("engine-host")

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/cli/egeria_tech.py

@@ -112,7 +112,7 @@ from commands.tech.list_related_specification import (
     help="Egeria admin password",
 )
 @click.option(
-    "--userid", default="erinoverview", envvar="EGERIA_USER", help="Egeria user"
+    "--userid", default="peterprofile", envvar="EGERIA_USER", help="Egeria user"
 )
 @click.option(
     "--password",

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/ops/gov_server_actions.py

@@ -125,13 +125,11 @@ def refresh_gov_eng_config(ctx):
 
 @click.command("start")
 @click.pass_context
-@click.option("--server", default=None, help="OMAG Server to start")
+@click.option("--server", default="simple-metadata-store", help="OMAG Server to start")
 def start_server(ctx, server):
     """Start or restart an engine-host from its known configuration"""
     c = ctx.obj
-    if server is None:
-        click.echo(c.parent.info_name)
-        server = "simple-metadata-store"
+
     p_client = EgeriaTech(c.view_server, c.view_server_url, c.userid, c.password)
     token = p_client.create_egeria_bearer_token()
     try:

pyegeria-0.8.4.27/commands/ops/load_archive.py

@@ -0,0 +1,73 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+
+This script refreshed an integration daemon.
+
+"""
+
+import os
+import argparse
+import time
+import click
+from trogon import tui
+from pyegeria import AutomatedCuration, EgeriaTech
+from pyegeria._exceptions 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_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
+    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
+)
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+
+
+@click.command("load-archive")
+@click.option(
+    "--file",
+    prompt="Path on the Metadata Server of the archive file to load",
+    default="content-packs/CocoComboArchive.omarchive",
+    help="Full path on the Metadata Server to the archive file to load",
+)
+@click.option(
+    "--server", default=EGERIA_METADATA_STORE, help="Egeria metadata store to load"
+)
+@click.option(
+    "--url", default=EGERIA_PLATFORM_URL, help="URL of Egeria platform to connect to"
+)
+@click.option("--userid", default=EGERIA_ADMIN_USER, help="Egeria admin user")
+@click.option("--password", default=EGERIA_ADMIN_PASSWORD, help="Egeria admin password")
+@click.option("--timeout", default=60, help="Number of seconds to wait")
+def load_archive(file, server, view_server, url, userid, password, timeout):
+    """Load an Open Metadata Archive"""
+
+    try:
+        s_client = EgeriaTech(view_server, url, userid, password)
+        token = s_client.create_egeria_bearer_token()
+        server_guid = s_client.get_guid_for_name(server)
+        s_client.add_archive_file(file, server_guid, timeout=timeout)
+
+        click.echo(f"Loaded archive: {file}")
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+
+
+if __name__ == "__main__":
+    load_archive()

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/ops/monitor_gov_eng_status.py

@@ -9,7 +9,6 @@ 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
 
@@ -23,7 +22,7 @@ from pyegeria import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
-    print_exception_response,
+    EgeriaTech,
 )
 from pyegeria.server_operations import ServerOps
 
@@ -53,7 +52,8 @@ disable_ssl_warnings = True
 
 
 def display_gov_eng_status(
-    server: str,
+    engine_host: str,
+    view_server: str,
     url: str,
     username: str,
     user_pass: str,
@@ -62,8 +62,9 @@ def display_gov_eng_status(
     width: int = EGERIA_WIDTH,
 ):
     console = Console(width=EGERIA_WIDTH)
-    server_name = server
-    s_client = ServerOps(server_name, url, username, user_pass)
+
+    s_client = EgeriaTech(view_server, url, username, user_pass)
+    token = s_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -76,7 +77,7 @@ def display_gov_eng_status(
             caption_style="white on black",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"Server: '{server_name}' running on {url}",
+            caption=f"Server: '{engine_host}' running on {url}",
             expand=True,
         )
         # table.footer: f"Server {view_server} on Platform {good_platform1_url}"
@@ -86,9 +87,11 @@ def display_gov_eng_status(
         table.add_column("Engine Status")
         table.add_column("Request Types")
 
-        gov_eng_status = s_client.get_governance_engine_summaries()
+        eng_host_guid = s_client.get_guid_for_name(engine_host)
+        gov_eng_status = s_client.get_server_report(eng_host_guid)
+        eng_summaries = gov_eng_status["governanceEngineSummaries"]
         sorted_gov_eng_status = sorted(
-            gov_eng_status, key=lambda k: k.get("governanceEngineName", " ")
+            eng_summaries, key=lambda k: k.get("governanceEngineName", " ")
         )
         for engine in sorted_gov_eng_status:
             gov_eng = engine["governanceEngineName"]
@@ -113,7 +116,7 @@ def display_gov_eng_status(
 
             table.add_row(gov_eng, eng_type, eng_desc, eng_status, eng_req_type_out)
 
-        table.caption = f"Server {server_name} running on {url}"
+        table.caption = f"Server {engine_host} running on {url}"
         return table
 
     try:
@@ -165,19 +168,27 @@ def main_live():
 
 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(
+        "--engine_host", help="Name of the engine host to display status for"
+    )
+    parser.add_argument("--view_server", help="Name of the view server to use")
+    parser.add_argument("--url", help="URL of 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_ENGINE_HOST
-    url = args.url if args.url is not None else EGERIA_ENGINE_HOST_URL
+    engine_host = (
+        args.engine_host if args.engine_host is not None else EGERIA_ENGINE_HOST
+    )
+    view_server = (
+        args.view_server if args.view_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_gov_eng_status(
-        server=server, url=url, username=userid, user_pass=user_pass, paging=True
+        engine_host, view_server, url, userid, user_pass, paging=True
     )
 
 

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/ops/monitor_integ_daemon_status.py

@@ -17,7 +17,7 @@ from rich.console import Console
 from rich.live import Live
 from rich.table import Table
 
-from pyegeria import ServerOps, AutomatedCuration
+from pyegeria import EgeriaTech, AutomatedCuration
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,
@@ -36,8 +36,6 @@ EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-da
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
@@ -58,9 +56,9 @@ def display_integration_daemon_status(
     width: int = EGERIA_WIDTH,
     sort: bool = True,
 ):
-    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()
+    s_client = EgeriaTech(view_server, view_url, user, user_pass)
+    token = s_client.create_egeria_bearer_token()
+    server_guid = s_client.get_guid_for_name(integ_server)
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -84,7 +82,7 @@ def display_integration_daemon_status(
         table.add_column("Target Element", min_width=20)
         table.add_column("Exception Message", min_width=10)
 
-        daemon_status = s_client.get_integration_daemon_status()
+        daemon_status = s_client.get_server_report(server_guid)
 
         reports = daemon_status["integrationConnectorReports"]
         if sort is True:
@@ -102,7 +100,7 @@ def display_integration_daemon_status(
             refresh_interval = str(connector.get("minMinutesBetweenRefresh", "---"))
             exception_msg = " "
             if connector_guid != "---":
-                targets = a_client.get_catalog_targets(connector_guid)
+                targets = s_client.get_catalog_targets(connector_guid)
                 tgt_tab = Table()
                 tgt_tab.add_column("Target")
                 tgt_tab.add_column("UniqueName")
@@ -172,7 +170,6 @@ def display_integration_daemon_status(
 
     finally:
         s_client.close_session()
-        a_client.close_session()
 
 
 def main_live():

{pyegeria-0.8.4.25 → pyegeria-0.8.4.27}/commands/ops/monitor_platform_status.py

@@ -114,7 +114,7 @@ def display_status(
                             server_status = "UNKNOWN"
                             status_flag = "[bright yellow]"
 
-                        server_list = (
+                        server_list += (
                             f"{status_flag}{server_types[server_type]}: {server_name}\n"
                         )
                         # server_list = server_list + serv