pyegeria 1.5.1.1.40__py3-none-any.whl → 1.5.1.1.41__py3-none-any.whl

pyegeria/commands/__init__.py

@@ -13,6 +13,7 @@ from .ops.table_integ_daemon_status import (
     display_integration_daemon_status as table_integ_daemon_status,
 )
 from .ops.monitor_engine_activity_c import display_engine_activity_c
+from .ops.list_catalog_targets import display_catalog_targets
 
 from .cat.list_glossaries import display_glossaries
 from .cat.list_terms import display_glossary_terms

pyegeria/commands/ops/list_catalog_targets.py

@@ -24,27 +24,58 @@ from pyegeria import (
     UserNotAuthorizedException,
     print_exception_response,
     AutomatedCuration,
-    INTEGRATION_GUIDS
+    INTEGRATION_GUIDS,
 )
 
 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'))
-
-
-
-def display_catalog_targets(connector: str, server: str, url: str, username: str, user_password: str,
-                            jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
+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"))
+
+
+def display_catalog_targets(
+    connector: str,
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
+    paging: bool = True,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    """Display catalog targets for the specified connector as a table.
+
+    Parameters
+    ----------
+    connector : str
+        The connector to retrieve catalog targets for.
+    view_server : str
+        The Egeria view server name.
+    view_url : str
+        The URL for the Egeria view server.
+    user : str
+        The user name for authenticating with the Egeria server.
+    user_pass : str
+        The user password for authenticating with the Egeria server.
+    paging : bool, default is True
+        Whether to enable paging mode when displaying the table.
+    jupyter : bool
+        Indicates if the environment is a Jupyter notebook.
+    width : int
+        The width of the console for table printing.
+    """
     console = Console(force_terminal=not jupyter, width=width, soft_wrap=True)
+
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
@@ -55,60 +86,67 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
             title_style="bold white on black",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"Catalog Targets for '{server}' @ Platform - {url}",
-            expand=True
+            caption=f"Catalog Targets for '{view_server}' @ Platform - {view_url}",
+            expand=True,
         )
         table.add_column("Name of Target")
         table.add_column("Catalog Target")
 
         # table.add_column("Relationship GUID", no_wrap=True)
-        table.add_column('Configuration Properties')
-        table.add_column('Template Properties')
+        table.add_column("Configuration Properties")
+        table.add_column("Template Properties")
         table.add_column("Operational Instructions", max_width=20)
         # table.add_column("Delete Method")
 
         if type(cat_targets) is list:
             for target in cat_targets:
-                target_name = target.get('catalogTargetName', '---')
-                target_source = target.get('metadataSourceQualifiedName', '---')
-                target_rel = target.get('relationshipGUID', '---')
-                target_sync = target.get('permittedSynchronization')
-                target_delete = target.get('deleteMethod', '---')
+                target_name = target.get("catalogTargetName", "---")
+                target_source = target.get("metadataSourceQualifiedName", "---")
+                target_rel = target.get("relationshipGUID", "---")
+                target_sync = target.get("permittedSynchronization")
+                target_delete = target.get("deleteMethod", "---")
                 op_instruct = f"* {target_sync}\n* {target_delete}"
                 op_instruct_out = Markdown(op_instruct)
                 # target_guid = target['catalogTargetElement']['guid']
-                connector_unique = target['catalogTargetElement']['uniqueName']
+                connector_unique = target["catalogTargetElement"]["uniqueName"]
 
-                cat_target_out = Markdown(f"* Target Name: {target_name}\n* Target Source: {target_source}\n"
-                                          f"* Relationship Guid: {target_rel}")
+                cat_target_out = Markdown(
+                    f"* Target Name: {target_name}\n* Target Source: {target_source}\n"
+                    f"* Relationship Guid: {target_rel}"
+                )
 
-                config_props = target.get('configurationProperties', '---')
+                config_props = target.get("configurationProperties", "---")
                 if type(config_props) is dict:
-                    config_props_md = ''
+                    config_props_md = ""
                     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 = '---'
+                    config_props_out = "---"
 
-                template_props = target.get('templateProperties', '---')
+                template_props = target.get("templateProperties", "---")
                 if type(template_props) is dict:
-                    template_props_md = ''
+                    template_props_md = ""
                     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 = '---'
+                    template_props_out = "---"
 
                 table.add_row(
-                    connector_unique, cat_target_out,
-                    config_props_out, template_props_out, op_instruct_out)
+                    connector_unique,
+                    cat_target_out,
+                    config_props_out,
+                    template_props_out,
+                    op_instruct_out,
+                )
 
         return table
 
     try:
-        a_client = AutomatedCuration(server, url, username)
-        token = a_client.create_egeria_bearer_token(username, user_password)
+        a_client = AutomatedCuration(view_server, view_url, user)
+        token = a_client.create_egeria_bearer_token(user, user_pass)
+        connector = connector.strip()
         if connector not in INTEGRATION_GUIDS.keys():
             raise Exception
 
@@ -118,7 +156,11 @@ def display_catalog_targets(connector: str, server: str, url: str, username: str
         with console.pager(styles=True):
             console.print(generate_table(), soft_wrap=True)
 
-    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
         print_exception_response(e)
     except Exception as e:
         print(f"\n\n===> Perhaps integration connector {connector} is not known?\n\n")
@@ -146,8 +188,12 @@ def main():
     width = args.width if args.width is not None else EGERIA_WIDTH
 
     try:
-        connector = Prompt.ask("Enter the Integration Connector to list catalog targets for")
-        display_catalog_targets(connector, server, url, userid, user_pass, jupyter, width=width)
+        connector = Prompt.ask(
+            "Enter the Integration Connector to list catalog targets for"
+        ).strip()
+        display_catalog_targets(
+            connector, server, url, userid, user_pass, jupyter, width=width
+        )
 
     except KeyboardInterrupt:
         pass

{pyegeria-1.5.1.1.40.dist-info → pyegeria-1.5.1.1.41.dist-info}/METADATA

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

{pyegeria-1.5.1.1.40.dist-info → pyegeria-1.5.1.1.41.dist-info}/RECORD

@@ -10,7 +10,7 @@ pyegeria/automated_curation_omvs.py,sha256=BwNuF7XQJAV-POvzaWwFh0TS5yRnHZZPhlayv
 pyegeria/classification_manager_omvs.py,sha256=3yInuRy7Cf43oSFZ8BuzcIgtGSm5BfvlKYqtWKRMlPU,186678
 pyegeria/collection_manager_omvs.py,sha256=kye2kjthNnmwxMZhHQKV0xoHbxcNPWjNzRAYOItj_gY,99201
 pyegeria/commands/README.md,sha256=zNfWZppDxoKqTJeRtcewzku9z1m6_hKacCyQUQw1iq4,1974
-pyegeria/commands/__init__.py,sha256=dVtdNVBwR_n04rMwDPFmND4fZyuywAoucYeT7hJtIq4,782
+pyegeria/commands/__init__.py,sha256=IBYAvBbuGneZ06YSFjZsU-Zxx-b-Qo4ZV_Vd4zz4AI0,844
 pyegeria/commands/cat/README.md,sha256=-aaAnIT2fcfU63vajgB-RzQk4l4yFdhkyVfSaTPiqRY,967
 pyegeria/commands/cat/__init__.py,sha256=3LHTWeyxLdFGDhWVTBzgJ6Y_9b2pM5CO2-kbsUASv4M,300
 pyegeria/commands/cat/get_asset_graph.py,sha256=4AO4KlCgb7vbMihJK7W_GAnrd4J9sKwc4kXxa2ZrRW4,12447
@@ -51,7 +51,7 @@ pyegeria/commands/my/todo_actions.py,sha256=iazoRhsQ9aecCwJk6r4lWRP-mPD2t-YGU_Gm
 pyegeria/commands/ops/README.md,sha256=PJsSDcvMv6E6og6y-cwvxFX5lhCII0UCwgKiM1T17MQ,1595
 pyegeria/commands/ops/__init__.py,sha256=GyDGBYodxuJ-7k87z2farDs9vhR__RNrYeAe94HWGPM,764
 pyegeria/commands/ops/gov_server_actions.py,sha256=zdawX-yfPFakc3Xf5V6j7e-csMbRLzJ-tdt_FkIhG34,5689
-pyegeria/commands/ops/list_catalog_targets.py,sha256=0FIZqZu7DSh7tnrme6EOhNiVvK8wyvN1iTZKEDuwTmw,6620
+pyegeria/commands/ops/list_catalog_targets.py,sha256=9DgHbPmUInWPjdEp98aQjfcZbDjs40ml0NQt9PG94y0,7688
 pyegeria/commands/ops/load_archive.py,sha256=ZsJmQ-2cywsiO5RYHQXFF72wrlBK18jvAkyQ8N-nSp4,2744
 pyegeria/commands/ops/monitor_asset_events.py,sha256=cjdlVqE0XYnoRW3aorNbsVkjByDXefPBnllaZLelGls,3838
 pyegeria/commands/ops/monitor_engine_activity.py,sha256=8RX-3znYx-4oWsI8nGFwODkWZ5Fc4qPttam_twymcjs,9856
@@ -108,8 +108,8 @@ pyegeria/template_manager_omvs.py,sha256=heqbKeum5hPCHap4r1RUZU8YB3QaQlxVNbq4GZi
 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.1.40.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.1.40.dist-info/METADATA,sha256=Ymh71f7ljmDnFRMLvHTU5udmuyWfIYcefAcNd05n6mU,2998
-pyegeria-1.5.1.1.40.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.1.40.dist-info/entry_points.txt,sha256=2aD67PkxIfXQqrZfgEwEYdfohKG9zmE5LmuDGURaIDw,5051
-pyegeria-1.5.1.1.40.dist-info/RECORD,,
+pyegeria-1.5.1.1.41.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.1.41.dist-info/METADATA,sha256=2lAWE0yxT09ZUzU9l43_gmnpXWeAFkohHyPdLGPjkY8,2998
+pyegeria-1.5.1.1.41.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.1.41.dist-info/entry_points.txt,sha256=2aD67PkxIfXQqrZfgEwEYdfohKG9zmE5LmuDGURaIDw,5051
+pyegeria-1.5.1.1.41.dist-info/RECORD,,