pyegeria 0.5.8.16__py3-none-any.whl → 0.5.8.19__py3-none-any.whl

examples/widgets/catalog_user/get_asset_graph.py

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

examples/widgets/catalog_user/get_collection.py

@@ -31,9 +31,11 @@ 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 collection_viewer(root: str, server_name: str, platform_url: str, user: str, user_password: str):
+def collection_viewer(root: str, server_name: str, platform_url: str, user: str, user_password: str,
+                      jupyter:bool=EGERIA_JUPYTER, width:int = EGERIA_WIDTH):
     """ A simple collection viewer"""
     def walk_collection_hierarchy(collection_client: CollectionManager, root_collection_name: str, tree: Tree) -> None:
         """Recursively build a Tree with collection contents."""

examples/widgets/catalog_user/get_tech_type_elements.py

@@ -40,13 +40,17 @@ 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)
 
 guid_list = []
 
-def tech_viewer(tech_name: str, server_name:str, platform_url:str, user:str, user_pass:str):
+def tech_viewer(tech_name: str, server_name:str, platform_url:str, user:str, user_pass:str,
+    jupyter:bool=EGERIA_JUPYTER, width:int=EGERIA_WIDTH):
 
     def build_classifications(classification: dict) -> Markdown:
 
@@ -69,7 +73,8 @@ def tech_viewer(tech_name: str, server_name:str, platform_url:str, user:str, use
 
     try:
 
-        console = Console()
+        console = Console(width=width, force_terminal=not jupyter)
+
 
         a_client = AutomatedCuration(server_name, platform_url,
                                      user_id=user)

examples/widgets/catalog_user/get_tech_type_template.py

@@ -33,13 +33,17 @@ 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)
 
 guid_list = []
 
-def tech_viewer(tech_name: str, server_name:str, platform_url:str, user:str, user_pass:str):
+def template_viewer(tech_name: str, server_name:str, platform_url:str, user:str, user_pass:str,
+                jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
 
     def build_classifications(classification: dict) -> Markdown:
 
@@ -62,7 +66,7 @@ def tech_viewer(tech_name: str, server_name:str, platform_url:str, user:str, use
 
     try:
 
-        console = Console()
+        console = Console(width=width, force_terminal=not jupyter)
 
         a_client = AutomatedCuration(server_name, platform_url,
                                      user_id=user)
@@ -137,7 +141,7 @@ def main():
 
     try:
         tech_name = Prompt.ask("Enter the Asset Name to view:", default="Apache Kafka Server")
-        tech_viewer(tech_name,server, url, userid, user_pass)
+        template_viewer(tech_name,server, url, userid, user_pass)
     except(KeyboardInterrupt):
         pass
 

examples/widgets/catalog_user/list_assets.py

@@ -35,10 +35,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_assets(search_string: str, server: str, url: str, username: str, user_password: str, time_out: int = 60):
+def display_assets(search_string: str, server: str, url: str, username: str, user_password: str, time_out: int = 60,
+                   jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
 
     g_client = AssetCatalog(server, url, username)
     token = g_client.create_egeria_bearer_token(username, user_password)
@@ -114,7 +118,7 @@ def display_assets(search_string: str, server: str, url: str, username: str, use
         #     while True:
         #         time.sleep(2)
         #         live.update(generate_table())
-        console = Console()
+        console = Console(width=width, force_terminal=not jupyter)
         with console.pager(styles=True):
             console.print(generate_table(search_string))
 

examples/widgets/catalog_user/list_glossary.py

@@ -42,9 +42,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_glossary_terms(search_string: str, guid: str, server: str, url: str, username: str, user_password: str):
+def display_glossary_terms(search_string: str, guid: str, server: str, url: str, username: str, user_password: str,
+                           jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH ):
 
     g_client = GlossaryBrowser(server, url)
     token = g_client.create_egeria_bearer_token(username, user_password)
@@ -99,7 +102,7 @@ def display_glossary_terms(search_string: str, guid: str, server: str, url: str,
         #     while True:
         #         time.sleep(2)
         #         live.update(generate_table(search_string))
-        console = Console(style="bold white on black")
+        console = Console(style="bold white on black", width=width, force_terminal=not jupyter)
         with console.pager(styles=True):
             console.print(generate_table(search_string))
 

examples/widgets/{developer → catalog_user}/list_tech_types.py

@@ -36,11 +36,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
 
 
-def display_tech_types(search_string:str, server: str, url: str, username: str, user_pass: str):
+def display_tech_types(search_string:str, server: str, url: str, username: str, user_pass: str,
+                       jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
     a_client = AutomatedCuration(server, url, username)
     token = a_client.create_egeria_bearer_token(username, user_pass)
     tech_list = a_client.find_technology_types(search_string, page_size=0)
@@ -88,7 +92,7 @@ def display_tech_types(search_string:str, server: str, url: str, username: str,
             sys.exit(1)
 
     try:
-        console = Console()
+        console = Console(width=width, force_terminal=not jupyter)
         with console.pager(styles=True):
             console.print(generate_table())
 

examples/widgets/cli/egeria_cat.py

@@ -0,0 +1,198 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+A command line interface for Egeria Catalog User functions
+
+This is an emerging capability based on the **click** package. Feedback welcome!
+
+"""
+import click
+from trogon import tui
+
+from examples.widgets.catalog_user.get_asset_graph import asset_viewer
+from examples.widgets.catalog_user.get_collection import collection_viewer
+from examples.widgets.catalog_user.get_tech_type_elements import tech_viewer
+from examples.widgets.catalog_user.get_tech_type_template import template_viewer
+from examples.widgets.catalog_user.list_assets import display_assets
+from examples.widgets.catalog_user.list_glossary import display_glossary_terms
+from examples.widgets.catalog_user.list_tech_types import display_tech_types
+# from pyegeria import ServerOps
+from examples.widgets.cli.ops_config import Config
+
+
+# class Config(object):
+#     def __init__(self, server: str = None, url: str = None, userid:str = None, password:str = None,
+#                  timeout:int = 30, paging: bool = False):
+#         self.server = server
+#         self.url = url
+#         self.userid = userid
+#         self.password = password
+#         self.timeout = timeout
+#         self.paging = paging
+#
+#
+# pass_config = click.make_pass_decorator(Config)
+
+# @tui
+@tui()
+@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='garygeeke', envvar='EGERIA_USER', help='Egeria user')
+@click.option('--password', default='secret', envvar='EGERIA_PASSWORD',
+              help='Egeria user password')
+@click.option('--timeout', default=60, help='Number of seconds to wait')
+@click.option('--verbose', is_flag=True, default=False, help='Enable verbose mode')
+@click.option('--paging', is_flag=True, default=False, help='Enable paging snapshots vs live updates')
+@click.option('--jupyter', is_flag=True, default=False, envvar='EGERIA_JUPYTER',
+              help='Enable for rendering in a Jupyter terminal')
+@click.option('--width', default=200, envvar='EGERIA_WIDTH', help='Screen width, in characters, to use')
+@click.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)
+    ctx.max_content_width = 200
+    ctx.ensure_object(Config)
+    if verbose:
+        click.echo(f"we are in verbose mode - server is {server}")
+
+
+@cli.group("show")
+@click.pass_context
+def show(ctx):
+    """Display an Egeria Object"""
+    pass
+
+
+@show.command('tech_types')
+@click.option('--tech_type', default='*', help='Tech type to search for')
+@click.pass_context
+def show_tech_types(ctx, tech_type):
+    """List deployed technology types"""
+    c = ctx.obj
+    display_tech_types(tech_type, c.view_server, c.view_server_url,
+                       c.userid, c.password)
+
+
+@show.command('tech_type_elements')
+@click.option('--tech_type', default='PostgreSQL Server', help='Specific tech type to get elements for')
+@click.pass_context
+def show_tech_type_elements(ctx, tech_type):
+    """List technology type elements"""
+    c = ctx.obj
+    tech_viewer(tech_type, c.view_server, c.view_server_url,
+                c.userid, c.password)
+
+
+@show.command('tech_type_templates')
+@click.option('--tech_type', default='PostgreSQL Server', help='Specific tech type to get elements for')
+@click.pass_context
+def show_tech_type_templates(ctx, tech_type):
+    """List technology type templates"""
+    c = ctx.obj
+    template_viewer(tech_type, c.view_server, c.view_server_url, c.userid,
+                    c.password, c.jupyter, c.width)
+
+
+@show.command('assets')
+@click.option('--search_string', help='List assets similar to search string - minimum of 4 characters')
+@click.pass_context
+def show_assets(ctx, search_string):
+    """Find and display assets"""
+    c = ctx.obj
+    display_assets(search_string, c.view_server, c.view_server_url, c.userid,
+                   c.password, c.jupyter, c.width)
+
+
+@show.command('glossary_terms')
+@click.option('--search_string', default='*',
+              help='List glossary terms similar to search string - minimum of 4 characters')
+@click.option('--glossary_guid', default=None, help='Optionally restrict search to glossary with the specified guid')
+@click.pass_context
+def show_terms(ctx, search_string, glossary_guid):
+    """Find and display glossary terms"""
+    c = ctx.obj
+    display_glossary_terms(search_string, glossary_guid, c.view_server, c.view_server_url, c.userid,
+                           c.password, c.jupyter, c.width)
+
+
+@show.command('asset_graph')
+@click.argument('asset_guid', nargs=1)
+@click.pass_context
+def show_asset_graph(ctx, asset_guid):
+    """Display a tree graph of information about an asset """
+    c = ctx.obj
+    asset_viewer(asset_guid, c.view_server, c.view_server_url, c.userid,
+                 c.password, c.jupyter, c.width)
+
+
+@show.command('collection')
+@click.option('--root_collection', default='Root Sustainability Collection',
+              help='View of tree of collections from a given root')
+@click.pass_context
+def show_asset_graph(ctx, root_collection):
+    """Display a tree graph of information about an asset """
+    c = ctx.obj
+    collection_viewer(root_collection, c.view_server, c.view_server_url, c.userid,
+                      c.password, c.jupyter, c.width)
+
+
+#
+#  Tell
+#
+
+@cli.group('tell')
+@click.pass_context
+def tell(ctx):
+    """Perform actions an Egeria Objects"""
+    pass
+
+
+@tell.group('survey')
+@click.pass_context
+def survey(ctx):
+    """Refresh the specified integration connector or ALL connectors if not specified"""
+    c = ctx.obj
+    pass
+
+
+@survey.command('survey_uc_server')
+@click.pass_context
+@click.option('--uc_endpoint', default='https://localhost:8080',
+              help="Endpoint of the Unity Catalog Server to Survey")
+def survey_uc_server(ctx, uc_endpoint):
+    """Survey the Unity Catalog server at the given endpoint"""
+    c = ctx.obj
+    pass
+    # restart_connector(connector, c.integration_daemon, c.integration_daemon_url,
+    #                   c.userid, c.password)
+
+
+if __name__ == '__main__':
+    cli()

examples/widgets/cli/egeria_ops.py

@@ -144,7 +144,7 @@ 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,
+                           c.admin_user, c.admin_user_password,
                            list, c.jupyter, c.width)
 
 
@@ -155,7 +155,7 @@ 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,
+                            c.admin_user, c.admin_user_password,
                             list, c.jupyter, c.width)
 
 

examples/widgets/operational/list_catalog_targets.py

@@ -84,6 +84,8 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
                     for prop in config_props:
                         config_props_md += f"* {prop}: {config_props[prop]}\n"
                     config_props_out = Markdown(config_props_md)
+                else:
+                    config_props_out = '---'
 
                 template_props = target.get('templateProperties', '---')
                 if type(template_props) is dict:
@@ -91,6 +93,8 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
                     for prop in template_props:
                         template_props_md += f"* {prop}: {template_props[prop]}\n"
                     template_props_out = Markdown(template_props_md)
+                else:
+                    template_props_out = '---'
 
                 table.add_row(
                     connector_unique, target_name, target_source, target_rel,
@@ -112,8 +116,9 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
 
     except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
         print_exception_response(e)
-    except Exception:
+    except Exception as e:
         print(f"\n\n===> Perhaps integration connector {connector} is not known?\n\n")
+        console.print_exception()
     finally:
         a_client.close_session()
 
@@ -130,7 +135,7 @@ def main():
     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_PLATFORM_URL
+    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
     jupyter = args.jupyter if args.jupyter is not None else EGERIA_JUPYTER
@@ -138,7 +143,7 @@ def main():
 
     try:
         connector = Prompt.ask("Enter the Integration Connector to list catalog targets for")
-        display_catalog_targets(connector, server, url, userid, user_pass, jupyter)
+        display_catalog_targets(connector, server, url, userid, user_pass, jupyter, width=width)
 
     except KeyboardInterrupt:
         pass

examples/widgets/operational/monitor_engine_activity.py

@@ -34,6 +34,7 @@ EGERIA_PLATFORM_URL = os.environ.get('EGERIA_PLATFORM_URL', 'https://localhost:9
 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')
@@ -150,7 +151,7 @@ def main_live():
     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_PLATFORM_URL
+    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
 
@@ -167,7 +168,7 @@ def main_paging():
     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_PLATFORM_URL
+    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
 

examples/widgets/operational/monitor_gov_eng_status.py

@@ -33,6 +33,7 @@ EGERIA_VIEW_SERVER = os.environ.get('VIEW_SERVER', 'view-server')
 EGERIA_VIEW_SERVER_URL = os.environ.get('EGERIA_VIEW_SERVER_URL', 'https://localhost:9443')
 EGERIA_INTEGRATION_DAEMON = os.environ.get('INTEGRATION_DAEMON', 'integration-daemon')
 EGERIA_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_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')
@@ -122,7 +123,7 @@ def main_live():
     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_PLATFORM_URL
+    url = args.url if args.url is not None else EGERIA_ENGINE_HOST_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=False)
@@ -137,7 +138,7 @@ def main_paging():
     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_PLATFORM_URL
+    url = args.url if args.url is not None else EGERIA_ENGINE_HOST_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)

{pyegeria-0.5.8.16.dist-info → pyegeria-0.5.8.19.dist-info}/METADATA

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

{pyegeria-0.5.8.16.dist-info → pyegeria-0.5.8.19.dist-info}/RECORD

@@ -2,14 +2,16 @@ examples/doc_samples/Create_Collection_Sample.py,sha256=D8nhc4qLXIzAqVdJQjmFIS-j
 examples/doc_samples/Create_Sustainability_Collection_Sample.py,sha256=iLBm1LwRLi42Gayyb-wcWZ5NySQ6sc4kVSmwIAzP2Po,5049
 examples/widgets/catalog_user/README.md,sha256=aCCVo7iqyE-XGEvmoYXnkIGM0VskF95JTj6Egzec7LM,883
 examples/widgets/catalog_user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-examples/widgets/catalog_user/get_asset_graph.py,sha256=YgdB9bgWBEGAADS54vMGVKG6SVJuIDI_vegsWFFtzYE,10642
-examples/widgets/catalog_user/get_collection.py,sha256=YexVIXm0fsG9ODYCrdjiH5j8s0jDg1SBXTLpohoEE-A,4414
-examples/widgets/catalog_user/get_tech_type_elements.py,sha256=h7tEr0KGio9R6XL_GLxOxAGEOqpXY5qbgnPas7pF8Uw,5908
-examples/widgets/catalog_user/get_tech_type_template.py,sha256=2bGRMIcXqlMFwNGRdobK-QtHW2TLM2kq0gxKgS_XzaM,5928
-examples/widgets/catalog_user/list_assets.py,sha256=MRWha0yS3JPQEZNXqAktbEWYiU3kxdcmu4mV7YravQQ,5668
-examples/widgets/catalog_user/list_glossary.py,sha256=abw3iBFEPHcSpucq2Jqh6UEOILyzx2IfBWS9gPl968k,5176
+examples/widgets/catalog_user/get_asset_graph.py,sha256=EM4J0kG-2dZKLvgEETqRnszPsoDr5OIGekjy9p38Pm8,11044
+examples/widgets/catalog_user/get_collection.py,sha256=DBZ5-XkoYsz4WmMSPz0Ao0wz3DlAUQve89KI26-44nc,4613
+examples/widgets/catalog_user/get_tech_type_elements.py,sha256=SvnDWfBIA1NzpkKZj4-ZapIeM2SEhe5jJt7rTkvTzaA,6129
+examples/widgets/catalog_user/get_tech_type_template.py,sha256=gMFVcgCIm09GQu1Vsc5ZUVH9XLhItAG1eVGZJrcnHeQ,6174
+examples/widgets/catalog_user/list_assets.py,sha256=y569wLu2hkaIpeDnXpJAbA9Tg9xKIliYIzewFcjFMBI,5909
+examples/widgets/catalog_user/list_glossary.py,sha256=TDmOgUjr_pR9oaW5vhK-Tq5SLpz0FeYaKh0CL79s6zk,5427
+examples/widgets/catalog_user/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3SMm1RcgFoh0,4609
 examples/widgets/cli/__init__.py,sha256=ReG7mIcm5c512S_z1UZIpMtE67zlO_zj-1HhHWYS4fI,30
-examples/widgets/cli/egeria_ops.py,sha256=DAXqBV3aK5mKNIMAzFfKBMu5VxM8-5qjTe3DFkPPrxw,9604
+examples/widgets/cli/egeria_cat.py,sha256=ifuDk1AP_QZpcTnNA2G6hYFd4PObUcADNhSkz6HYeZA,8127
+examples/widgets/cli/egeria_ops.py,sha256=Zsexe-dMY8wS_UHASmqmRg507wL947cQThkYz8BZkc8,9634
 examples/widgets/cli/ops_config.py,sha256=BPfiU2mZA61aA1p1DHRA5eLWH8qaAwgWNoRmazzAlM4,1398
 examples/widgets/developer/README.md,sha256=nxDnfr3BCiGgW5G1VxWxiwUWJXIe5wreNuUeRyIt_hY,1343
 examples/widgets/developer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,18 +21,17 @@ examples/widgets/developer/list_asset_types.py,sha256=aHueMCVHmvrn331kgFrEzvTOxB
 examples/widgets/developer/list_registered_services.py,sha256=AV6CfSt05RYfSPZT-jms3r10Q72r3ly4Ihu_y4YXKL8,6108
 examples/widgets/developer/list_relationship_types.py,sha256=uRiLTy4Gk1Cryxvqj5Bo8f-Ll55SMC_XEzm8TsH0JqQ,5340
 examples/widgets/developer/list_tech_templates.py,sha256=d1YARxPaRWG5Ri2I5m8OjBna4y0HxeWNyll8SiWLIaM,5943
-examples/widgets/developer/list_tech_types.py,sha256=L12F7JP1-HXXQpzmPMzsTfP-Xy0tfsiKIwIh31aWPn0,4364
 examples/widgets/developer/list_valid_metadata_values.py,sha256=jbJsqELH1MlsKTBR4zbuRnzCCd412I_atlrR0kkhBCs,5785
 examples/widgets/operational/README.md,sha256=PJsSDcvMv6E6og6y-cwvxFX5lhCII0UCwgKiM1T17MQ,1595
 examples/widgets/operational/__init__.py,sha256=SCfzF3-aMx8EpqLWmH7JQf13gTmMAtHRbg69oseLvi8,480
 examples/widgets/operational/engine_actions.py,sha256=j4OL-Gpo4n8CAqcwdCRI8nnAm0F7NOEpX6Bp6FB-Pmg,3064
 examples/widgets/operational/integration_daemon_actions.py,sha256=SacZaweJWYIUKgEu2B1y0iQXg0Aj4zeJjX4Jhs93TpM,3942
-examples/widgets/operational/list_catalog_targets.py,sha256=Wonf0R8rFmUvG75MtPekRraAbyTQLdkzjQKoNuVntvg,6335
+examples/widgets/operational/list_catalog_targets.py,sha256=VAWnT5lhteIgX5rKAWnFzFST2RVT3WMVv5E5nOdUkcw,6526
 examples/widgets/operational/load_archive.py,sha256=j9K4uPpUzvqEyvsUMZoY0-1NVuljAwqcMg8Lhin_p1E,2280
 examples/widgets/operational/monitor_asset_events.py,sha256=cjdlVqE0XYnoRW3aorNbsVkjByDXefPBnllaZLelGls,3838
 examples/widgets/operational/monitor_coco_status.py,sha256=ERz3OJ0TXImNKHGD4gJvgT3pl2gS23ewAdUuYVLUhEE,3299
-examples/widgets/operational/monitor_engine_activity.py,sha256=bA-8JX37AiVpxBAECq7PPP5Ej-IBoyQQqEdzGWmufo0,7179
-examples/widgets/operational/monitor_gov_eng_status.py,sha256=yJakTA5NSUTXQlO1Cnq803bgocQiHnxiHHdu_g9rn2U,5809
+examples/widgets/operational/monitor_engine_activity.py,sha256=5ceNWogsJqKTxerBRWK68T4Qr5OcqnqZF1ERqFnYbGk,7282
+examples/widgets/operational/monitor_gov_eng_status.py,sha256=cVRtA1Ub9uGf4fic1FnMwmzCwNEnU7joCqsjsiAZ7bg,5912
 examples/widgets/operational/monitor_integ_daemon_status.py,sha256=IeRQ72Eh-PR13-lLxe7QeSqxei3LWiilXRT1lDs6vlc,8751
 examples/widgets/operational/monitor_platform_status.py,sha256=pQEWt8Vy-5whF5aVC1IFLYsHLoCNUKtTz1DfOIWOBfw,5948
 examples/widgets/operational/monitor_server_list.py,sha256=eHSeM5dW7Wyjp2zR_AD6_FalFnZ2dBaZKxtob2kva9I,4483
@@ -69,8 +70,8 @@ pyegeria/runtime_manager_omvs.py,sha256=WekK7Yeyn6Qu9YmbSDo3m57MN0xOsIm9M8kGHfRO
 pyegeria/server_operations.py,sha256=ZX7FlJRrAC7RK4bq4wHWepEsYbbWlqkUZdsJrTplVVU,16534
 pyegeria/utils.py,sha256=pkVmS3RrbjaS9yz7FtOCwaOfV5FMqz-__Rt5koCnd9c,5374
 pyegeria/valid_metadata_omvs.py,sha256=aisdRodIwJSkyArAzfm_sEnBELh69xE8k4Nea-vHu8M,36745
-pyegeria-0.5.8.16.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-0.5.8.16.dist-info/METADATA,sha256=B0L1BnjFI3pE0P6h5ldv6xm_tL8EZeUTGUjOwIZoPaI,2689
-pyegeria-0.5.8.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-0.5.8.16.dist-info/entry_points.txt,sha256=5aexqWL8P1vQZrEK4bQLfelOnFfZtXFmWYS0pLa4NmE,2772
-pyegeria-0.5.8.16.dist-info/RECORD,,
+pyegeria-0.5.8.19.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-0.5.8.19.dist-info/METADATA,sha256=Ztx6zjaJ-qDagV-xGmxoZ2VpEIc8TqL6B-iw8qBZxHQ,2689
+pyegeria-0.5.8.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-0.5.8.19.dist-info/entry_points.txt,sha256=f0Y00CKCkY9k2_p5mV_ce0InCNKAzI7kPPJ9A2x-Q4A,2867
+pyegeria-0.5.8.19.dist-info/RECORD,,

{pyegeria-0.5.8.16.dist-info → pyegeria-0.5.8.19.dist-info}/entry_points.txt

@@ -1,16 +1,18 @@
 [console_scripts]
+egeria_cat=examples.widgets.cli.egeria_cat:cli
+egeria_cat_tui=examples.widgets.cli.egeria_cat:tui
 egeria_ops=examples.widgets.cli.egeria_ops:cli
 egeria_ops_tui=examples.widgets.cli.egeria_ops:tui
 get_asset_graph=examples.widgets.catalog_user.get_asset_graph:main
 get_collection=examples.widgets.catalog_user.get_collection:main
 get_guid_info=examples.widgets.developer.get_guid_info:main
 get_tech_details=examples.widgets.developer.get_tech_details:main
-get_tech_type_elements=examples.widgets.operational.get_tech_type_elements:main
-get_tech_type_template=examples.widgets.operational.get_tech_type_template:main
+get_tech_type_elements=examples.widgets.catalog_user.get_tech_type_elements:main
+get_tech_type_template=examples.widgets.catalog_user.get_tech_type_template:main
 list_asset_types=examples.widgets.developer.list_asset_types:main
 list_assets=examples.widgets.catalog_user.list_assets:main
 list_catalog_targets=examples.widgets.operational.list_catalog_targets:main
-list_eng_action_status=examples.widgets.operational.monitor_eng_action_status:main_paging
+list_engine_activity=examples.widgets.operational.monitor_engine_activity:main_paging
 list_glossary=examples.widgets.catalog_user.list_glossary:main
 list_gov_eng_status=examples.widgets.operational.monitor_gov_eng_status:main_paging
 list_integ_daemon_status=examples.widgets.operational.monitor_integ_daemon_status:main_paging
@@ -19,14 +21,14 @@ list_projects=examples.widgets.personal_organizer.list_projects:main
 list_registered_services=examples.widgets.developer.list_registered_services:main
 list_relationship_types=examples.widgets.developer.list_relationship_types:main
 list_tech_templates=examples.widgets.developer.list_tech_templates:main
-list_tech_types=examples.widgets.developer.list_tech_types:main
+list_tech_types=examples.widgets.catalog_user.list_tech_types:main
 list_todos=examples.widgets.personal_organizer.list_todos:main
 list_valid_metadata_values=examples.widgets.developer.list_valid_metadata_values:main
 load_archive=examples.widgets.operational.load_archive:load_archive
 load_archive_tui=examples.widgets.operational.load_archive:tui
 monitor_asset_events=examples.widgets.operational.monitor_asset_events:main
 monitor_coco_status=examples.widgets.operational.monitor_coco_status:main
-monitor_eng_action_status=examples.widgets.operational.monitor_eng_action_status:main_live
+monitor_engine_activity=examples.widgets.operational.monitor_engine_activity:main_live
 monitor_gov_eng_status=examples.widgets.operational.monitor_gov_eng_status:main_live
 monitor_integ_daemon_status=examples.widgets.operational.monitor_integ_daemon_status:main_live
 monitor_my_todos=examples.widgets.personal_organizer.monitor_my_todos:main