pyegeria 1.5.1.1.56__tar.gz → 1.5.1.1.58__tar.gz

{pyegeria-1.5.1.1.56 → pyegeria-1.5.1.1.58}/PKG-INFO

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

{pyegeria-1.5.1.1.56 → pyegeria-1.5.1.1.58}/pyegeria/asset_catalog_omvs.py

@@ -302,7 +302,7 @@ class AssetCatalog(Client):
     # Engine Actions
     #
 
-    async def _async_find_assets_in_domain(
+    async def _async_find_in_asset_domain(
         self,
         search_string: str,
         start_from: int = 0,
@@ -367,7 +367,7 @@ class AssetCatalog(Client):
         response = await self._async_make_request("POST", url, body, time_out=time_out)
         return response.json().get("searchMatches", "no assets found")
 
-    def find_assets_in_domain(
+    def find_in_asset_domain(
         self,
         search_string: str,
         start_from: int = 0,
@@ -416,7 +416,7 @@ class AssetCatalog(Client):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_assets_in_domain(
+            self._async_find_in_asset_domain(
                 search_string,
                 start_from,
                 page_size,

{pyegeria-1.5.1.1.56 → pyegeria-1.5.1.1.58}/pyegeria/commands/cat/list_assets.py

@@ -24,35 +24,47 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    AssetCatalog
+    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')
-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_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'))
+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_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,
-                   jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
+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,
+):
     console = Console(width=width, force_terminal=not jupyter, soft_wrap=True)
     if (search_string is None) or (len(search_string) < 3):
-        raise ValueError("Invalid Search String - must be greater than four characters long")
+        raise ValueError(
+            "Invalid Search String - must be greater than four characters long"
+        )
     g_client = AssetCatalog(server, url, username)
     token = g_client.create_egeria_bearer_token(username, user_password)
 
-
-    def generate_table(search_string:str = None) -> Table:
+    def generate_table(search_string: str = None) -> Table:
         """Make a new table."""
         table = Table(
             title=f"Assets containing the string  {search_string} @ {time.asctime()}",
@@ -64,7 +76,7 @@ def display_assets(search_string: str, server: str, url: str, username: str, use
             show_lines=True,
             box=box.ROUNDED,
             caption=f"View Server '{server}' @ Platform - {url}",
-            expand=True
+            expand=True,
         )
         table.add_column("Display Name", max_width=15)
         table.add_column("Type Name")
@@ -73,21 +85,26 @@ def display_assets(search_string: str, server: str, url: str, username: str, use
         # table.add_column("Qualified Name",max_width=15)
         table.add_column("Matching Elements")
 
-
-        assets = g_client.find_assets_in_domain(search_string, starts_with=True,
-                                             ends_with=False, ignore_case=True, page_size=100, time_out=time_out)
+        assets = g_client.find_in_asset_domain(
+            search_string,
+            starts_with=True,
+            ends_with=False,
+            ignore_case=True,
+            page_size=100,
+            time_out=time_out,
+        )
         if type(assets) is str:
             return table
 
         for element in assets:
-            properties = element['properties']
-            header = element['elementHeader']
-            nested = element.get('matchingElements','---')
+            properties = element["properties"]
+            header = element["elementHeader"]
+            nested = element.get("matchingElements", "---")
 
-            display_name = properties.get("displayName",'---')
+            display_name = properties.get("displayName", "---")
             # qualified_name = properties["qualifiedName"] # we decided that qualified name wasn't useful
             type_name = header["type"]["typeName"]
-            tech_type = properties.get("deployedImplementationType",'---')
+            tech_type = properties.get("deployedImplementationType", "---")
             guid = header["guid"]
             #### We decided that path wasn't useful
             # path_name = element.get("extendedProperties", None)
@@ -103,20 +120,17 @@ def display_assets(search_string: str, server: str, url: str, username: str, use
             match_tab.add_column("Properties")
 
             for match_t in nested:
-                match = match_t['elementHeader']
-                match_type_name = match['type']['typeName']
-                matching_guid = match['guid']
-                match_props = match_t['properties']
+                match = match_t["elementHeader"]
+                match_type_name = match["type"]["typeName"]
+                matching_guid = match["guid"]
+                match_props = match_t["properties"]
                 match_details_md = ""
                 for key in match_props.keys():
                     match_details_md += f"* {key}: {match_props[key]}\n"
                 match_details_out = Markdown(match_details_md)
                 match_tab.add_row(match_type_name, matching_guid, match_details_out)
 
-
-            table.add_row(
-                display_name, type_name,guid, tech_type, match_tab
-            )
+            table.add_row(display_name, type_name, guid, tech_type, match_tab)
 
         g_client.close_session()
         return table
@@ -130,13 +144,18 @@ def display_assets(search_string: str, server: str, url: str, username: str, use
         with console.pager(styles=True):
             console.print(generate_table(search_string), soft_wrap=True)
 
-
-    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
         console.print_exception()
         sys.exit(1)
 
     except ValueError as e:
-        console.print(f"\n\n====> Invalid Search String - must be greater than four characters long")
+        console.print(
+            f"\n\n====> Invalid Search String - must be greater than four characters long"
+        )
         sys.exit(1)
 
 
@@ -158,7 +177,9 @@ def main():
     try:
         search_string = Prompt.ask("Enter an asset search string:", default="")
         display_assets(search_string, server, url, userid, user_pass, time_out)
-    except(KeyboardInterrupt):
+    except KeyboardInterrupt:
         pass
+
+
 if __name__ == "__main__":
-    main()
+    main()

{pyegeria-1.5.1.1.56 → pyegeria-1.5.1.1.58}/pyegeria/commands/cli/egeria.py

@@ -23,6 +23,8 @@ from pyegeria.commands.cat.list_assets import display_assets
 from pyegeria.commands.cat.list_cert_types import display_certifications
 from pyegeria.commands.cat.list_terms import display_glossary_terms
 from pyegeria.commands.cat.list_projects import display_project_list
+from pyegeria.commands.tech.list_element_graph import display_element_graph
+from pyegeria.commands.tech.list_elements_x import list_elements_x
 from pyegeria.commands.tech.list_relationships import list_relationships
 from pyegeria.commands.cat.list_tech_types import display_tech_types
 from pyegeria.commands.cat.list_todos import display_to_dos as list_todos
@@ -214,8 +216,6 @@ def cli(
     userid,
     password,
     timeout,
-    paging,
-    verbose,
     jupyter,
     width,
 ):
@@ -234,15 +234,11 @@ def cli(
         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}")
 
 
 #
@@ -388,6 +384,27 @@ def show_guid_infos(ctx, guid):
     display_guid(guid, c.server, c.url, c.userid, c.password, c.jupyter, c.width)
 
 
+@show_elements.command("element-graph")
+@click.pass_context
+@click.option("--search-string", help="value we are searching for")
+@click.option(
+    "--prop-list", default="anchorTypeName", help="List of properties we are searching"
+)
+def list_element_graph(ctx, search_string: str, prop_list: str):
+    """List elements with the specified properties"""
+    c = ctx.obj
+    display_element_graph(
+        search_string,
+        prop_list,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
 @show_elements.command("related-specifications")
 @click.pass_context
 @click.argument("element-guid")
@@ -670,19 +687,36 @@ def valid_metadata_values(ctx, property, type_name):
 
 @show_elements.command("elements")
 @click.pass_context
+@click.option(
+    "--extended",
+    is_flag=True,
+    default=False,
+    help="If True, feedback information is displayed",
+)
 @click.option("--om_type", default="Organization", help="Metadata type to query")
-def list_element_info(ctx, om_type):
-    """Display the valid metadata values for a property and type"""
+def list_element_info(ctx, om_type, extended):
+    """Display elements of a specific Open Metadata Type"""
     c = ctx.obj
-    list_elements(
-        om_type,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    if extended:
+        list_elements_x(
+            om_type,
+            c.view_server,
+            c.view_server_url,
+            c.userid,
+            c.password,
+            c.jupyter,
+            c.width,
+        )
+    else:
+        list_elements(
+            om_type,
+            c.view_server,
+            c.view_server_url,
+            c.userid,
+            c.password,
+            c.jupyter,
+            c.width,
+        )
 
 
 @show_tech_info.command("processes")
@@ -705,7 +739,7 @@ def list_element_info(ctx):
 @click.pass_context
 @click.option("--om_type", default="Project", help="Metadata type to query")
 def get_element_info(ctx, om_type):
-    """Display the elements for an Open Metadata Type"""
+    """Display a table of elements for an Open Metadata Type"""
     c = ctx.obj
     display_elements(
         om_type,
@@ -947,7 +981,7 @@ def show_certification_types(ctx, search_string):
 @show_cat_info.command("asset-types")
 @click.pass_context
 def show_asset_types(ctx):
-    """Display engine-host status information"""
+    """Display known asset types"""
     c = ctx.obj
     display_asset_types(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -1029,7 +1063,7 @@ def show_todos(ctx, search_string, status):
 @show_cat_info.command("user-ids")
 @click.pass_context
 def show_todos(ctx):
-    """Display a tree graph of information about an asset"""
+    """Display a list of known user ids"""
     c = ctx.obj
     list_user_ids(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -1051,6 +1085,7 @@ def deployed_data(ctx):
 )
 @click.pass_context
 def show_deployed_servers(ctx, search_string):
+    """Display deployed servers"""
     c = ctx.obj
     display_servers_by_dep_imp(
         search_string,
@@ -1067,7 +1102,7 @@ def show_deployed_servers(ctx, search_string):
 @click.option("--catalog", default="*", help="What database or catalog to search")
 @click.pass_context
 def deployed_schemas(ctx, catalog):
-    """Display a tree graph of information about an asset"""
+    """Display deployed schemas"""
     c = ctx.obj
     list_deployed_database_schemas(
         catalog,
@@ -1084,7 +1119,7 @@ def deployed_schemas(ctx, catalog):
 @click.option("--search_server", default="*", help="Server to search for catalogs")
 @click.pass_context
 def list_catalogs(ctx, search_server):
-    """Display a tree graph of information about an asset"""
+    """Display deployed catalogs"""
     c = ctx.obj
     list_deployed_catalogs(
         search_server,
@@ -1100,7 +1135,7 @@ def list_catalogs(ctx, search_server):
 @deployed_data.command("databases")
 @click.pass_context
 def list_databases(ctx):
-    """Display a tree graph of information about an asset"""
+    """Display deployed databases"""
     c = ctx.obj
     list_deployed_databases(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -1299,7 +1334,7 @@ def show_tech_type_elements(ctx, tech_type):
 )
 @click.pass_context
 def show_asset_graph(ctx, root_collection):
-    """Display a tree graph of information about an asset"""
+    """Display information about a collection"""
     c = ctx.obj
     collection_viewer(
         root_collection,
@@ -1360,8 +1395,8 @@ def show_todos(ctx, search_string, status):
 
 @show_cat_info.command("user-ids")
 @click.pass_context
-def show_todos(ctx):
-    """Display a tree graph of information about an asset"""
+def show_user_ids(ctx):
+    """Display table of known user ids"""
     c = ctx.obj
     list_user_ids(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width

{pyegeria-1.5.1.1.56 → pyegeria-1.5.1.1.58}/pyegeria/commands/cli/egeria_cat.py

@@ -140,13 +140,6 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
     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,
@@ -176,8 +169,6 @@ def cli(
     userid,
     password,
     timeout,
-    paging,
-    verbose,
     jupyter,
     width,
 ):
@@ -196,15 +187,11 @@ def cli(
         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")
@@ -341,7 +328,7 @@ def show_terms(ctx, search_string, glossary_guid, glossary_name):
 @click.option("--search_string", default="*", help="Name to search for glossaries")
 @click.pass_context
 def glossaries(ctx, search_string):
-    """Display a tree graph of information about an asset"""
+    """Display information about a collection"""
     c = ctx.obj
     display_glossaries(
         search_string,
@@ -504,8 +491,8 @@ def show_asset_types(ctx):
 
 @info.command("user-ids")
 @click.pass_context
-def show_todos(ctx):
-    """Display a tree graph of information about an asset"""
+def show_user_ids(ctx):
+    """Display a list of known user ids"""
     c = ctx.obj
     list_user_ids(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width
@@ -527,6 +514,7 @@ def deployed_data(ctx):
 )
 @click.pass_context
 def show_deployed_servers(ctx, search_string):
+    """Display deployed servers"""
     c = ctx.obj
     display_servers_by_dep_imp(
         search_string,
@@ -543,7 +531,7 @@ def show_deployed_servers(ctx, search_string):
 @click.option("--catalog", default="*", help="What database or catalog to search")
 @click.pass_context
 def deployed_schemas(ctx, catalog):
-    """Display a tree graph of information about an asset"""
+    """Display deployed schemas"""
     c = ctx.obj
     list_deployed_database_schemas(
         catalog,
@@ -560,7 +548,7 @@ def deployed_schemas(ctx, catalog):
 @click.option("--search_server", default="*", help="Server to search for catalogs")
 @click.pass_context
 def list_catalogs(ctx, search_server):
-    """Display a tree graph of information about an asset"""
+    """Display deployed catalogs"""
     c = ctx.obj
     list_deployed_catalogs(
         search_server,
@@ -576,7 +564,7 @@ def list_catalogs(ctx, search_server):
 @deployed_data.command("databases")
 @click.pass_context
 def list_databases(ctx):
-    """Display a tree graph of information about an asset"""
+    """Display deployed databases"""
     c = ctx.obj
     list_deployed_databases(
         c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width

{pyegeria-1.5.1.1.56 → pyegeria-1.5.1.1.58}/pyegeria/commands/cli/egeria_my.py

@@ -115,13 +115,6 @@ from pyegeria.commands.my.todo_actions import (
     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,
@@ -151,8 +144,6 @@ def cli(
     userid,
     password,
     timeout,
-    paging,
-    verbose,
     jupyter,
     width,
 ):
@@ -171,15 +162,11 @@ def cli(
         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")

{pyegeria-1.5.1.1.56 → pyegeria-1.5.1.1.58}/pyegeria/commands/cli/egeria_ops.py

@@ -129,13 +129,6 @@ from pyegeria.commands.ops.list_archives import display_archive_list
     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,
@@ -165,8 +158,6 @@ def cli(
     userid,
     password,
     timeout,
-    paging,
-    verbose,
     jupyter,
     width,
 ):
@@ -185,15 +176,11 @@ def cli(
         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")