pyegeria 1.5.1.0.7__tar.gz → 1.5.1.0.9__tar.gz

{pyegeria-1.5.1.0.7 → pyegeria-1.5.1.0.9}/PKG-INFO

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

{pyegeria-1.5.1.0.7 → pyegeria-1.5.1.0.9}/commands/cat/list_deployed_catalogs.py

@@ -47,7 +47,7 @@ def check_if_template(header: dict) -> bool:
 
 
 def list_deployed_catalogs(
-    uc_server_name: str,
+    catalog_server: str,
     server: str,
     url: str,
     username: str,
@@ -79,9 +79,13 @@ def list_deployed_catalogs(
         table.add_column("Properties")
         table.add_column("Catalog Schemas")
 
-        om_type = "DeployedDatabaseSchema"
-
-        cats = c_client.get_elements_by_classification("Anchors", "Catalog")
+        if catalog_server in [None, "*"]:
+            cats = c_client.get_elements_by_classification("Anchors", "Catalog")
+        else:
+            server_guid = c_client.get_guid_for_name(catalog_server)
+            cats = c_client.get_elements_by_classification_with_property_value(
+                "Anchors", server_guid, ["anchorGUID"], "Catalog"
+            )
         if type(cats) is list:
             for cat in cats:
                 header = cat["elementHeader"]
@@ -165,7 +169,7 @@ def list_deployed_catalogs(
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--server", help="Name of the view server to use")
     parser.add_argument("--url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="Password")
@@ -178,10 +182,9 @@ def main():
     password = args.password if args.password is not None else EGERIA_USER_PASSWORD
 
     try:
-        # uc_server_name = Prompt.ask(
-        #     "Enter the name of a server to retrieve schemas for", default="*"
-        # )
-        uc_server_name = None
+        uc_server_name = Prompt.ask(
+            "Enter the name of a server to retrieve catalogs for", default="*"
+        )
         list_deployed_catalogs(uc_server_name, server, url, userid, password)
     except KeyboardInterrupt:
         pass

{pyegeria-1.5.1.0.7 → pyegeria-1.5.1.0.9}/commands/cat/list_deployed_database_schemas.py

@@ -137,29 +137,32 @@ def list_deployed_database_schemas(
                     el_props_md += f"* **{prop}**: {element['properties'][prop]}\n"
                 el_props_out = Markdown(el_props_md)
 
-                rel_elements = c_client.get_related_elements(
-                    el_guid, "RelationalDBSchemaType"
+                rel_elements = c_client.get_elements_by_property_value(
+                    el_guid, ["anchorGUID"]
                 )
                 schema_md = ""
                 count = 0
                 rel_el_out = ""
                 if type(rel_elements) is list:
-                    print(len(rel_elements))
+                    len_els = len(rel_elements)
+                    rel_el_md = ""
+                    spacer = "---\n"
                     for rel_element in rel_elements:
                         count += 1
-                        rel_type = rel_element["relatedElement"]["elementHeader"][
-                            "type"
-                        ]["typeName"]
-                        rel_guid = rel_element["relatedElement"]["elementHeader"][
-                            "guid"
-                        ]
-                        rel_props = rel_element["relatedElement"]["properties"]
+                        rel_type = rel_element["elementHeader"]["type"]["typeName"]
+                        rel_guid = rel_element["elementHeader"]["guid"]
+                        rel_props = rel_element["properties"]
                         props_md = ""
                         for key in rel_props.keys():
-                            props_md += f"* **{key}**: {rel_props[key]}\n"
-                        rel_el_md = f"* **{rel_type}**: {rel_guid}\n{props_md}"
-                        if count > 1:
-                            rel_el_md += "---\n"
+                            props_md += f"\t* **{key}**: {rel_props[key]}\n"
+                        rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
+                        # if count > 1 and count < len_els:
+                        #     spacer = "---\n"
+                        # elif count > len_els:
+                        #     spacer = ""
+                        rel_el_md = f"{rel_el_md}\n* **{rel_type}**:\n\t{rel_guid}\n{props_md}{spacer}"
+                        if count == len_els:
+                            rel_el_md = rel_el_md[:-4]
                     rel_el_out = Markdown(rel_el_md)
 
                 table.add_row(

{pyegeria-1.5.1.0.7 → pyegeria-1.5.1.0.9}/commands/cat/list_deployed_databases.py

@@ -111,6 +111,7 @@ def list_deployed_databases(
                 rel_elements = c_client.get_related_elements(el_guid)
                 schema_md = ""
                 count = 0
+                rel_cnt = len(rel_elements)
                 if type(rel_elements) is list:
                     for rel_element in rel_elements:
                         count += 1
@@ -124,9 +125,9 @@ def list_deployed_databases(
                         props_md = ""
                         for key in rel_props.keys():
                             props_md += f"* **{key}**: {rel_props[key]}\n"
-                        rel_el_md = f"* **{rel_type}**: {rel_guid}\n{props_md}"
-                        if count >= 1:
-                            rel_el_md += "---\n"
+                        rel_el_md = f"* **{rel_type}**: {rel_guid}\n{props_md}\n---\n"
+                        if count == rel_cnt:
+                            rel_el_md = rel_el_md[:-4]
                     rel_el_out = Markdown(rel_el_md)
 
                 table.add_row(

{pyegeria-1.5.1.0.7 → pyegeria-1.5.1.0.9}/commands/cli/egeria.py

@@ -34,6 +34,7 @@ from commands.my.monitor_my_todos import display_my_todos
 from commands.my.monitor_open_todos import display_todos
 from commands.cat.list_deployed_database_schemas import list_deployed_database_schemas
 from commands.cat.list_deployed_catalogs import list_deployed_catalogs
+from commands.cat.list_deployed_databases import list_deployed_databases
 from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
 from commands.my.todo_actions import (
     mark_todo_complete,
@@ -928,25 +929,37 @@ def list_deployed_schemas(search_string, ctx):
         c.view_server_url,
         c.userid,
         c.password,
-        None,
         c.jupyter,
         c.width,
     )
 
 
 @show.command("list-catalogs")
-# @click.option("--search-string", default="*", help="What database or catalog to search")
+@click.option("--search-string", default="*", help="Server to search for catalogs")
 @click.pass_context
-def list_catalogs(ctx):
+def list_catalogs(search_string, ctx):
     """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_deployed_catalogs(
-        " ",
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@click.pass_context
+def list_databases(ctx):
+    """Display a tree graph of information about an asset"""
+    c = ctx.obj
+    list_deployed_databases(
         c.view_server,
         c.view_server_url,
         c.userid,
         c.password,
-        None,
         c.jupyter,
         c.width,
     )

{pyegeria-1.5.1.0.7 → pyegeria-1.5.1.0.9}/commands/cli/egeria_cat.py

@@ -30,6 +30,7 @@ from commands.cat.list_archives import display_archive_list
 from commands.cat.list_deployed_database_schemas import list_deployed_database_schemas
 from commands.cat.list_deployed_catalogs import list_deployed_catalogs
 from commands.cat.glossary_actions import create_glossary, delete_glossary, create_term
+from commands.cat.list_deployed_databases import list_deployed_databases
 
 # from pyegeria import ServerOps
 from commands.cli.ops_config import Config
@@ -507,25 +508,37 @@ def list_deployed_schemas(search_string, ctx):
         c.view_server_url,
         c.userid,
         c.password,
-        None,
         c.jupyter,
         c.width,
     )
 
 
 @show.command("list-catalogs")
-# @click.option("--search-string", default="*", help="What database or catalog to search")
+@click.option("--search-string", default="*", help="Server to search for catalogs")
 @click.pass_context
-def list_catalogs(ctx):
+def list_catalogs(search_string, ctx):
     """Display a tree graph of information about an asset"""
     c = ctx.obj
     list_deployed_catalogs(
-        " ",
+        search_string,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
+
+
+@click.pass_context
+def list_databases(ctx):
+    """Display a tree graph of information about an asset"""
+    c = ctx.obj
+    list_deployed_databases(
         c.view_server,
         c.view_server_url,
         c.userid,
         c.password,
-        None,
         c.jupyter,
         c.width,
     )

{pyegeria-1.5.1.0.7 → pyegeria-1.5.1.0.9}/pyproject.toml

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