pyegeria 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

examples/widgets/catalog_user/README.md

@@ -0,0 +1,15 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the Egeria project. -->
+
+# Catalog User
+
+These widgets display different kinds of information useful to a typical catalog user. Widgets
+will continue to be added over time to cover more facets of catalog use.
+
+* list_assets.py - lists assets containing the user provided search string in the display name or qualified name. Search string must be a minimum of three characters.
+* view_asset_graph.py - shows a tree view of an asset with its nested elements and relationships.
+* view_collection.py - provides a tree view of a collection with all nested collections and items within the collection.
+* view_glossary.py - provides a simple glossary viewer showing terms and related information.
+----
+License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
+Copyright Contributors to the Egeria project.

examples/widgets/catalog_user/__init__.py

@@ -0,0 +1,10 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+catalog user widgets
+"""
+import list_assets
+import view_asset_graph
+import view_glossary
+import view_collection

{pyegeria-0.4.0.data/scripts → examples/widgets/catalog_user}/list_assets.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
@@ -79,7 +79,7 @@ def display_assets(search_string: str, guid: str=None, server: str = good_server
         table.add_column("Qualified Name")
 
 
-        assets = g_client.find_assets_in_domain(search_string, starts_with=False,
+        assets = g_client.find_assets_in_domain(search_string, starts_with=True,
                                              ends_with=False, ignore_case=True, page_size=10)
         if type(assets) is str:
             return table

{pyegeria-0.4.0.data/scripts → examples/widgets/catalog_user}/view_asset_graph.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
@@ -38,20 +38,21 @@ view_server = "view-server"
 
 guid_list = []
 
-def asset_viewer(asset_name: str, server_name:str, platform_url:str, user:str):
+def asset_viewer(asset_guid: str, server_name:str, platform_url:str, user:str):
 
-    def build_classifications(classification: dict) -> Markdown:
+    def build_classifications(classification: dict) -> str:
 
-        class_md = "-"
+        class_md = ""
         for c in classification:
             c_type = c["classificationName"]
             if c_type == "Anchors":
                 continue
             class_md += f"* Classification: {c_type}\n"
-            class_props = c["classificationProperties"]
-            for prop in class_props.keys():
-                class_md += f"* {prop}: {class_props[prop]}\n"
-        if class_md == "-":
+            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"
+        if class_md == "":
             output = None
         else:
             output = class_md
@@ -91,59 +92,66 @@ def asset_viewer(asset_name: str, server_name:str, platform_url:str, user:str):
                                      user_id=user)
 
         token = a_client.create_egeria_bearer_token(user, "secret")
-        asset_info = a_client.find_assets_in_domain(asset_name)
-        asset_guid = asset_info[0]['guid']
+        # asset_info = a_client.find_assets_in_domain(asset_name)
+        # if type(asset_info) is str:
+        #     print("\n No Assets Found - Exiting\n")
+        #     sys.exit(1)
+        #
+        # asset_guid = asset_info[0]['guid']
+
         guid_list.append(asset_guid)
 
         asset_graph = a_client.get_asset_graph(asset_guid)
         if type(asset_graph) is not dict:
-            print(f"\n No Asset found for {asset_name}")
+            print(f"\n No Asset found for {asset_guid}")
             sys.exit(1)
 
         # print(f"\n{json.dumps(asset_graph, indent =2)}\n")
-        tree = Tree(f"{asset_name} ({asset_guid})", style = "bold bright_white",guide_style="bold bright_blue")
-        style = ""
+
 
         asset_name = asset_graph["displayName"]
         qualified_name = asset_graph["qualifiedName"]
         resource_name = asset_graph["resourceName"]
 
+        tree = Tree(f"{asset_name} ({asset_guid})", style="bold bright_white", guide_style="bold bright_blue")
+        style = ""
+
         asset_type = asset_graph["type"]["typeName"]
         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["anchoredElements"]
+        asset_nested_elements = asset_graph.get("anchoredElements","----")
         asset_relationships = asset_graph["relationships"]
         asset_class_md = build_classifications(asset_classifications)
 
-
         asset_properties = asset_graph["extendedProperties"]
-        prop_md = ""
+        prop_md = "\n* Extended Properties:\n"
         for prop in asset_properties:
-            prop_md = f"{prop_md}* {prop}: {asset_properties[prop]}\n"
+            prop_md = f"{prop_md}\n\t* {prop}: {asset_properties[prop]}\n"
 
-        core_md = (f"**Type: {asset_type} Created by: {asset_created_by} on {asset_creation}**\n"
+        core_md = (f"**Type: {asset_type}  Created by: {asset_created_by} on {asset_creation}**\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}"
+               f"* Asset Origin: {asset_origin}\n{prop_md}\n"
                )
         core_md = Markdown(core_md)
         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")
+            p2 = Panel.fit(Markdown(asset_class_md), style = "bold bright_white", title = "Classifications")
             l2 = tree.add(p2)
 
         #
         # Nested Assets
         #
-        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")
-            l2.add(p3)
+        if type(asset_nested_elements) is list:
+            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")
+                l2.add(p3)
 
         #
         # Now work on the Relationships
@@ -168,7 +176,7 @@ def asset_viewer(asset_name: str, server_name:str, platform_url:str, user:str):
                 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"
@@ -181,31 +189,31 @@ def asset_viewer(asset_name: str, server_name:str, platform_url:str, user:str):
                     f"* Created by: {relationship_created_by} at time {relationship_creation_time}\n"
                 )
                 rel_end1_md = (
-                    f"* End1:\n"
-                    f"\t* Type: {rel_end1_type}\n"
+                    f"\n**End1:**\n"
+                    f"\n\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_md + rel_end1_class_md
+                # if rel_end1_class_md is not None:
+                #     rel_end1_md =  rel_end1_md + rel_end1_class_md
 
                 rel_end2_md = (
-                    f"* End1:\n"
-                    f"\t* Type: {rel_end2_type}\n"
+                    f"\n**End2:**\n"
+                    f"\n\t* Type: {rel_end2_type}\n"
                     f"\t* GUID: {rel_end2_guid}\n"
                     f"\t* Unique Name: {rel_end2_unique_name}\n"
                 )
 
-                if rel_end2_class_md is not None:
-                    rel_end1_md = rel_end2_md + rel_end2_class_md
+                # if rel_end2_class_md is not None:
+                #     rel_end1_md = rel_end1_md + rel_end2_class_md
                 #
                 # for prop in relationship_properties.keys():
                 #     relationship_md += f"* {prop}: {relationship_properties[prop]}\n"
 
                 relationship_md += rel_end1_md + rel_end2_md
 
-                relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white")
+                relationship_panel = Panel.fit(Markdown(relationship_md), style="bold bright_white", title = "Asset Relationships")
                 tree.add(relationship_panel)
 
 
@@ -232,5 +240,5 @@ if __name__ == "__main__":
     url = args.url if args.url is not None else "https://localhost:9443"
     userid = args.userid if args.userid is not None else 'erinoverview'
 
-    asset_name = Prompt.ask("Enter the Asset Name to view:", default="TransMorg-Clinical-Trials-Weeklies")
-    asset_viewer(asset_name,server, url, userid)
+    asset_guid = Prompt.ask("Enter the Asset GUID to view:", default="8e35b39e-6ee7-4d60-aff5-4b09406c5e79")
+    asset_viewer(asset_guid,server, url, userid)

{pyegeria-0.4.0.data/scripts → examples/widgets/catalog_user}/view_collection.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/catalog_user}/view_glossary.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

examples/widgets/developer/README.md

@@ -0,0 +1,24 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the Egeria project. -->
+
+# Developer
+
+These widgets display different kinds of information useful to developers. Widgets
+will continue to be added over time to cover more facets. Useful developer information
+can also be found on [Egeria Project](https://egeria-project.org) and in [Egeria Explorers](https://egeria-project.org/release-notes/june-2024/?h=brain#egeria-explorers).
+
+* get_guid_info.py - lists information about the metadata element specified by the Egeria guid.
+* get_tech_details.py - shows a tree view showing the Egeria support for a particular technology (e.g PostgreSQL Server).
+* list_asset_types.py - provides a tree view of a collection with all nested collections and items within the collection.
+* list_registered_services.py - lists the services available on an Egeria platform.
+* list_relationship_types.py - list the relationships details for a specified Egeria type.
+* list_tech_templates.py - list template details for technology types
+* list_tech_types.py - list the technology types that Egeria currently supports
+* list_valid_metadata_values.py - list valid metadata values for a particular property and category.
+
+
+
+
+----
+License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
+Copyright Contributors to the Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/developer}/get_guid_info.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-Lic
 ense-Identifier: Apache-2.0

{pyegeria-0.4.0.data/scripts → examples/widgets/developer}/get_tech_details.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/developer}/list_asset_types.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/developer}/list_registered_services.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/developer}/list_relationship_types.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-Lic
 ense-Identifier: Apache-2.0

{pyegeria-0.4.0.data/scripts → examples/widgets/developer}/list_tech_types.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/developer}/list_valid_metadata_values.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-Lic
 ense-Identifier: Apache-2.0

examples/widgets/operational/README.md

@@ -0,0 +1,24 @@
+<!-- SPDX-License-Identifier: CC-BY-4.0 -->
+<!-- Copyright Contributors to the Egeria project. -->
+
+# Operational
+
+These widgets display different kinds of information useful to monitor the status of different elements of an Egeria deployment.
+Widgets will continue to be added over time to cover more facets of catalog use.
+
+* get_eng_action_status.py - lists assets containing the user provided search string in the display name or qualified name. Search string must be a minimum of three characters.
+* get_tech_type_elements.py - shows a tree view for the details of a supported technology type.
+* get_tech_type_template.py - shows a tree view of the template associated with a supported technology type.
+* view_coco_status.py - provides a tree view of a collection with all nested collections and items within the collection.
+* view_eng_action_status.py - provides a live view of the status of engine actions.
+* view_gov_eng_status.py - provides a live view of a governance engine status.
+* view_integ_daemeon_status.py - provides a live view of an integration daemon status.
+* view_platform_status.py - provides a live status view of the known servers on known platforms.
+* view_server_list.py - provides a more detailed live status view of the servers on a single platform.
+* view_server_status.py - provides a minimal live status view of the servers on a single platform.
+* view_asset_changes.py - experiment in progress
+* view_asset_events.py - experiment in progress
+
+----
+License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/),
+Copyright Contributors to the Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/operational}/get_tech_type_elements.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/operational}/get_tech_type_template.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

examples/widgets/operational/view_asset_events.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Display the status of cataloged platforms and servers.
+"""
+import json
+import sys
+import time
+import argparse
+from confluent_kafka import Consumer, KafkaException
+from datetime import datetime
+from rich.prompt import Prompt
+from rich.table import Table
+from rich.live import Live
+from rich.console import Console
+from rich.markdown import Markdown
+
+from pyegeria import RuntimeManager
+
+disable_ssl_warnings = True
+console = Console(width=200)
+now = datetime.now()
+current_time = now.strftime("%H:%M:%S")
+
+from confluent_kafka import Consumer, KafkaException
+
+earliest_latest = Prompt.ask("Msgs from earliest or latest:", default="earliest")
+
+# Define the Kafka consumer configuration.
+config = {
+    'bootstrap.servers': 'localhost:9092',  # replace with your Kafka broker(s)
+    'group.id': f"view_asset_events:{current_time}",  # replace with your consumer group
+    'auto.offset.reset': earliest_latest  # can be set to 'earliest' or 'latest'
+}
+
+# Initialize a Kafka consumer.
+consumer = Consumer(config)
+
+# Subscribe to a Kafka topic.
+consumer.subscribe(['egeria.omag.server.active-metadata-store.omas.assetconsumer.outTopic'])  # replace with your Kafka topic
+
+try:
+    while True:
+        msg = consumer.poll(1.0)  # timeout set to 1 second
+
+        if msg is None:
+            continue
+        elif msg.error():
+            raise KafkaException(msg.error())
+        else:
+            event = json.loads(msg.value())
+            event_time = event["eventTime"]
+            event_type = event["eventType"]
+            guid = event["elementHeader"]["guid"]
+
+            type_name = event["elementHeader"]["type"]["typeName"]
+            origin = event["elementHeader"]["origin"]["sourceServer"]
+
+            element_properties = event["elementProperties"]
+            element_properties_keys = element_properties.keys()
+            props = " "
+            for key in element_properties_keys:
+                value = element_properties[key]
+                props += f"* {key}: {value}\n"
+            console.rule(style= "[bold red]")
+            console.rule(f"\tMessage TimeStamp: {event_time}\t eventType: {event_type}\t typeName: {type_name}\t guid: {guid}")
+            msg = (
+
+                      f"properties: \n{props}\n\n")
+            msg = Markdown(msg)
+
+            console.print(msg)
+finally:
+    # Close down consumer to commit final offsets.
+    consumer.close()

{pyegeria-0.4.0.data/scripts → examples/widgets/operational}/view_coco_status.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
@@ -30,11 +30,9 @@ from pyegeria.server_operations import ServerOps
 disable_ssl_warnings = True
 
 
-def test_display_status(server: str, url: str, username: str):
+def display_status(server: str, url: str, username: str):
     layout = Layout()
-    print(layout)
 
-    print(layout)
     p_client1 = ServerOps("Core Catalog", "https://localhost:9443", username)
     p_client2 = ServerOps('Datalake Catalog', "https://localhost:9444", username)
     p_client3 = ServerOps('DevCatalog', "https://localhost:9445", username)
@@ -42,19 +40,18 @@ def test_display_status(server: str, url: str, username: str):
     def generate_table(p_client) -> Table:
         """Make a new table."""
         table = Table(
-            title=f"Server Status for Platform - {time.asctime()}",
+            title=f"Server Status for {p_client.server_name}- {time.asctime()}",
             # style = "black on grey66",
             header_style="white on dark_blue",
-            caption=f"Server Status for Platform - '{url}'",
+            caption=f"Server Status for Platform - '{p_client.platform_url}'",
             # show_lines=True,
         )
 
         table.add_column("Known Server")
         table.add_column("Status")
-
         known_server_list = p_client.get_known_servers()
         active_server_list = p_client.get_active_server_list()
-        if len(known_server_list) == 0:
+        if type(known_server_list) is str:
             return table
 
         for server in known_server_list:
@@ -83,6 +80,10 @@ def test_display_status(server: str, url: str, username: str):
         print_exception_response(e)
         assert e.related_http_code != "200", "Invalid parameters"
 
+    finally:
+        p_client1.close_session()
+        p_client2.close_session()
+        p_client3.close_session()
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
@@ -92,7 +93,7 @@ if __name__ == "__main__":
     args = parser.parse_args()
 
     server = args.server if args.server is not None else "active-metadata-store"
-    url = args.url if args.url is not None else "https://cray.local:9443"
+    url = args.url if args.url is not None else "https://localhost:9443"
     userid = args.userid if args.userid is not None else 'garygeeke'
 
-    test_display_status(server, url, userid)
+    display_status(server, url, userid)

{pyegeria-0.4.0.data/scripts → examples/widgets/operational}/view_eng_action_status.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/operational}/view_gov_eng_status.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.

{pyegeria-0.4.0.data/scripts → examples/widgets/operational}/view_integ_daemon_status.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/env python3
 """
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
@@ -19,6 +19,7 @@ from rich import box
 from rich.live import Live
 from rich.markdown import Markdown
 from rich.table import Table
+from rich.text import Text
 
 from pyegeria import ServerOps, AutomatedCuration
 from pyegeria._exceptions import (
@@ -31,9 +32,10 @@ from pyegeria._exceptions import (
 disable_ssl_warnings = True
 
 
-def display_integration_daemon_status(server: str, url: str, user: str):
-    s_client = ServerOps(server, url, user)
-    a_client = AutomatedCuration("view-server", url, user, "secret")
+def display_integration_daemon_status(integ_server: str, integ_url: str,
+                                      view_server:str, view_url: str, user: str):
+    s_client = ServerOps(integ_server, integ_url, user)
+    a_client = AutomatedCuration(view_server, view_url, user, "secret")
     token = a_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
@@ -44,14 +46,14 @@ def display_integration_daemon_status(server: str, url: str, user: str):
             header_style="white on dark_blue",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"Integration Daemon Status for Server '{server}' @ Platform - {url}",
+            caption=f"Integration Daemon Status for Server '{integ_server}' @ Platform - {integ_url}",
             expand=True
         )
         table.add_column("Connector Name")
         table.add_column("Connector Status")
 
         table.add_column("Last Refresh Time")
-        table.add_column("Minimum Refresh Interval (min)")
+        table.add_column("Min Refresh (min)")
         table.add_column("Target Element")
         table.add_column("Exception Message")
 
@@ -60,22 +62,35 @@ def display_integration_daemon_status(server: str, url: str, user: str):
         for connector in connector_reports:
             connector_name = connector.get("connectorName", "---")
             connector_status = connector.get("connectorStatus", "---")
-            connector_guid = connector["connectorGUID"]
+            connector_guid = connector.get("connectorGUID","---")
             last_refresh_time = connector.get("lastRefreshTime", "---")
             refresh_interval = str(connector.get("minMinutesBetweenRefresh", "---"))
             exception_msg = " "
-
-            targets = a_client.get_catalog_targets(connector_guid)
-            if type(targets) == list:
-                targets_m = "\n"
-                for target in targets:
-                    t_name = target["catalogTargetName"]
-                    t_sync = target["permittedSynchronization"]
-                    t_unique_name = target["catalogTargetElement"]["uniqueName"]
-                    targets_m += f"* Target Name: __{t_name}__\n* Sync: {t_sync}\n* Unique Name: {t_unique_name}\n\n"
-                targets_md = Markdown(targets_m)
+            if connector_guid != '---':
+                targets = a_client.get_catalog_targets(connector_guid)
+                tgt_tab = Table()
+                tgt_tab.add_column("Target")
+                tgt_tab.add_column("UniqueName")
+                tgt_tab.add_column("Relationship GUID", no_wrap=True)
+
+                if type(targets) == list:
+                    targets_md = True
+                    for target in targets:
+                        t_name = target["catalogTargetName"]
+                        # t_sync = target["permittedSynchronization"]
+                        t_unique_name = target["catalogTargetElement"]["uniqueName"]
+                        t_rel_guid = target["relationshipGUID"]
+                        # targets_m += f"* Target Name: __{t_name}__\n* Sync: {t_sync}\n* Unique Name: {t_unique_name}\n\n"
+                        tgt_tab.add_row(t_name,t_unique_name, t_rel_guid)
+                    # targets_md = Markdown(targets_m)
+                else:
+                    targets_md = False
+            else:
+                targets_md = False
+            if targets_md is False:
+                targets_out = ""
             else:
-                targets_md = " "
+                targets_out = tgt_tab
 
             if connector_status in ("RUNNING", "REFRESHING", "WAITING"):
                 connector_status = f"[green]{connector_status}"
@@ -86,7 +101,7 @@ def display_integration_daemon_status(server: str, url: str, user: str):
 
             table.add_row(
                 connector_name, connector_status, last_refresh_time, refresh_interval,
-                targets_md, exception_msg
+                targets_out, exception_msg
             )
         return table
 
@@ -103,16 +118,23 @@ def display_integration_daemon_status(server: str, url: str, user: str):
 
     finally:
         s_client.close_session()
+        a_client.close_session()
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument("--server", help="Name of the integration server to display status for")
-    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--integ_server", help="Name of the integration server to display status for")
+    parser.add_argument("--integ_url", help="URL Platform to connect to")
+    parser.add_argument("--view_server", help="Name of the integration server to display status for")
+    parser.add_argument("--view_url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     args = parser.parse_args()
 
-    server = args.server if args.server is not None else "integration-daemon"
-    url = args.url if args.url is not None else "https://localhost:9443"
+    integ_server = args.integ_server if args.integ_server is not None else "integration-daemon"
+    integ_url = args.integ_url if args.integ_url is not None else "https://localhost:9443"
+    view_server = args.view_server if args.view_server is not None else "view-server"
+    view_url = args.view_url if args.view_url is not None else "https://localhost:9443"
     userid = args.userid if args.userid is not None else 'garygeeke'
-    display_integration_daemon_status(server=server, url=url, user=userid)
+    display_integration_daemon_status(integ_server=integ_server, integ_url=integ_url,
+                                      view_server = view_server, view_url = view_url,
+                                      user=userid)