pyegeria 1.5.1.0.8__py3-none-any.whl → 1.5.1.0.9__py3-none-any.whl

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

commands/cat/list_deployed_database_schemas.py

@@ -146,7 +146,7 @@ def list_deployed_database_schemas(
                 if type(rel_elements) is list:
                     len_els = len(rel_elements)
                     rel_el_md = ""
-                    spacer = ""
+                    spacer = "---\n"
                     for rel_element in rel_elements:
                         count += 1
                         rel_type = rel_element["elementHeader"]["type"]["typeName"]
@@ -156,10 +156,13 @@ def list_deployed_database_schemas(
                         for key in rel_props.keys():
                             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 = ""
+                        # 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(

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(

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,
     )

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.8.dist-info → pyegeria-1.5.1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 1.5.1.0.8
+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.8.dist-info → pyegeria-1.5.1.0.9.dist-info}/RECORD

@@ -10,9 +10,9 @@ commands/cat/glossary_actions.py,sha256=F5-NNiLvfHLbQKZ_RxS6XJ9HOAuXc75GMIAC5Xo0
 commands/cat/list_archives.py,sha256=83LhNeZWhzRiE-oU6veuIk9ob4XDtDWUoXdGGXaYeE8,5454
 commands/cat/list_assets.py,sha256=bNwSaBDz661hfnc2Rn4j4HPHAugKvz0XwN9L1m4FVQk,6529
 commands/cat/list_cert_types.py,sha256=mbCls_EqC5JKG5rvS4o69k7KgZ6aNXlcqoJ3DtHsTFA,7127
-commands/cat/list_deployed_catalogs.py,sha256=iMgJ_NEn1fLrUFMTnD752g-g5FAuwUtsD6o1uBnOYIo,6957
-commands/cat/list_deployed_database_schemas.py,sha256=Bgu4yUip6KZN74q8uVEZJjIvl_DvNkCL0oG8Q9XYigI,8312
-commands/cat/list_deployed_databases.py,sha256=qRt3-pDXRVm-bKznmYsisja4zA8KRT58-02Mvj8MjOc,6605
+commands/cat/list_deployed_catalogs.py,sha256=eG8K-d7BijD34el_yVx9yfnLJdfwTUiJVxd-gcGwo7k,7157
+commands/cat/list_deployed_database_schemas.py,sha256=8IZjeJjoHzcpj9RByd4PIbZQEX2822kfVmOhSjR9xV4,8529
+commands/cat/list_deployed_databases.py,sha256=TJWqpj3PhvEmTsXhVRk_SODZNjTA5OiyhEzWwQkD-zk,6668
 commands/cat/list_glossary.py,sha256=tUtQQoTGTlDLU-yFbfO3zjiJC9QyEJfg8NxnGCo2mnI,5811
 commands/cat/list_projects.py,sha256=Jzs-DtIpPhCH-gY4PYT6mnRBWnEf4m18TFfcw8UymNU,8011
 commands/cat/list_relationships.py,sha256=U9f78cOi4HyaacqNaFSMq_7rRxVcEczvwPv468GYw3Q,5869
@@ -20,8 +20,8 @@ commands/cat/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3SMm1RcgFo
 commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
 commands/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
 commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
-commands/cli/egeria.py,sha256=mKTlUkyO8B-zBwE7-lvvkesgKqWhoAkYf6ax0DialD8,30910
-commands/cli/egeria_cat.py,sha256=uaZvSibAAaoOx5O8__0dNUYVfNGKcYGT4WJZo5OCN08,14457
+commands/cli/egeria.py,sha256=b0TReNGFre6oE8fAT_5EQvE4LMmiuKA2BYkBioYss2Y,31256
+commands/cli/egeria_cat.py,sha256=UFL7mzzB-fanSaRW8QpuYJo-vUSHmkfOW5oawDkzCb4,14803
 commands/cli/egeria_my.py,sha256=9zIpUDLeA_R-0rgCSQfEZTtVmkxPcEAsYcCTn1wQFrE,6181
 commands/cli/egeria_ops.py,sha256=fxDXYWXRhexx06PdSLCp2FhgUtS13NdDpyg7ea775fc,11531
 commands/cli/egeria_tech.py,sha256=eTDHTHDVEYmr6gUPGfido_Uf7Fec0Nuyxlkhg4KAMAw,13160
@@ -101,8 +101,8 @@ pyegeria/server_operations.py,sha256=ciH890hYT85YQ6OpByn4w7s3a7TtvWZpIG5rkRqbcI0
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=tfCGXed5LLt59YA8uZNNtd9UJ-lRZfPU_uZxK31Yux0,65069
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-1.5.1.0.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.0.8.dist-info/METADATA,sha256=nzILP7w0hRi0UicwTi4tVLpTDNgNpASdfo8dCeuPfqM,2997
-pyegeria-1.5.1.0.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.0.8.dist-info/entry_points.txt,sha256=Pc5kHnxv-vbRpwVMxSSWl66vmf7EZjgzf7nZzz1ow3M,4002
-pyegeria-1.5.1.0.8.dist-info/RECORD,,
+pyegeria-1.5.1.0.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.0.9.dist-info/METADATA,sha256=b0VYU6zpTes5IhJKhypyC10fLQDE7zehSQvdQEuwmD0,2997
+pyegeria-1.5.1.0.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.0.9.dist-info/entry_points.txt,sha256=Pc5kHnxv-vbRpwVMxSSWl66vmf7EZjgzf7nZzz1ow3M,4002
+pyegeria-1.5.1.0.9.dist-info/RECORD,,