pyegeria 5.2.0.13__py3-none-any.whl → 5.2.0.42.2__py3-none-any.whl

pyegeria/commands/tech/get_tech_details.py

@@ -17,47 +17,63 @@ from rich.prompt import Prompt
 from rich.text import Text
 from rich.tree import Tree
 
-from pyegeria import (UserNotAuthorizedException, PropertyServerException,
-                      InvalidParameterException, AutomatedCuration)
+from pyegeria import (
+    UserNotAuthorizedException,
+    PropertyServerException,
+    InvalidParameterException,
+    AutomatedCuration,
+)
 from pyegeria._exceptions import (
     print_exception_response,
 )
 
 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"))
 
 # nest_asyncio.apply()
 
 disable_ssl_warnings = True
 
 
-def tech_details_viewer(tech: str, server_name: str, platform_url: str, user: str, user_password: str,
-                        jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
+def tech_details_viewer(
+    tech: str,
+    server_name: str,
+    platform_url: str,
+    user: str,
+    user_password: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
     console = Console(width=width, force_terminal=not jupyter)
+
     # print(f"tech is {tech} of type {type(tech)}")
     # sys.exit(0)
-    def view_tech_details(a_client: AutomatedCuration, root_collection_name: str, tree: Tree) -> Tree:
+    def view_tech_details(
+        a_client: AutomatedCuration, root_collection_name: str, tree: Tree
+    ) -> Tree:
         l2: Tree = None
         tech_details = a_client.get_technology_type_detail(tech)
         if (type(tech_details) is dict) and (len(tech_details) > 0):
-            name = tech_details.get('name', '---')
-            qualified_name = tech_details.get('qualifiedName', "---")
-            category = tech_details.get('category', '---')
-            description = tech_details.get('description', '---')
+            name = tech_details.get("name", "---")
+            qualified_name = tech_details.get("qualifiedName", "---")
+            category = tech_details.get("category", "---")
+            description = tech_details.get("description", "---")
 
             style = "bold bright_white on black"
 
-            bas_md =  f"* **Name**: {name}\n"
+            bas_md = f"* **Name**: {name}\n"
             bas_md += f"* **QualifiedName**: {qualified_name}\n"
             bas_md += f"* **Category**: {category}\n"
             bas_md += f"* **Technology Description**: {description}\n"
@@ -65,49 +81,68 @@ def tech_details_viewer(tech: str, server_name: str, platform_url: str, user: st
             bas_out = Markdown(bas_md)
 
             l2 = tree.add(Panel(bas_out))
-            ext_ref = tech_details.get('externalReferences', None)
+            ext_ref = tech_details.get("externalReferences", None)
 
             if ext_ref is not None:
                 uri = ext_ref[0]["properties"].get("uri", "---")
                 # console.print(f" {type(ext_ref)}, {len(ext_ref)}")
-                l2 = tree.add(Panel(Markdown(f'* URI: {uri}', style)))
+                l2 = tree.add(Panel(Markdown(f"* URI: {uri}", style)))
 
-            resource_list = tech_details.get('resourceList', None)
+            resource_list = tech_details.get("resourceList", None)
             if resource_list:
                 t_r = tree.add(Panel("Resource List[bold red]"))
                 for resource in resource_list:
-                    resource_use = Text(f"[bold bright_white]{resource.get('resourceUse', '---')}")
-                    resource_use_description = Text(f"[bold bright_white]{resource.get('resourceUseDescription', '---')}")
-                    type_name = Text(f"[bold bright_white]{resource['relatedElement']['type'].get('typeName', '---')}")
-                    unique_name = Text(f"[bold bright_white]{resource['relatedElement'].get('uniqueName', '---')}")
-                    related_guid = Text(f"[bold bright_white]{resource['relatedElement'].get('guid', '---')}")
-                    resource_text = (f"[bold red]Resource\n"
-                                     f"[white]Resource use: {resource_use}[white]\nDescription: "
-                                     f"{resource_use_description}\n[white]Type Name: {type_name}\n"
-                                     f"[white]Unique Name: {unique_name}\n[white]Related GUID: {related_guid}\n")
+                    resource_use = Text(
+                        f"[bold bright_white]{resource.get('resourceUse', '---')}"
+                    )
+                    resource_use_description = Text(
+                        f"[bold bright_white]{resource.get('resourceUseDescription', '---')}"
+                    )
+                    type_name = Text(
+                        f"[bold bright_white]{resource['relatedElement']['type'].get('typeName', '---')}"
+                    )
+                    unique_name = Text(
+                        f"[bold bright_white]{resource['relatedElement'].get('uniqueName', '---')}"
+                    )
+                    related_guid = Text(
+                        f"[bold bright_white]{resource['relatedElement'].get('guid', '---')}"
+                    )
+                    resource_text = (
+                        f"[bold red]Resource\n"
+                        f"[white]Resource use: {resource_use}[white]\nDescription: "
+                        f"{resource_use_description}\n[white]Type Name: {type_name}\n"
+                        f"[white]Unique Name: {unique_name}\n[white]Related GUID: {related_guid}\n"
+                    )
                     p = Panel.fit(resource_text)
                     tt = t_r.add(p, style=style)
             else:
                 tt = tree.add(Panel(f"Resource details for {tech} where not found"))
 
         else:
-            tt = tree.add(Panel(f"Tech type {tech} was not found - please check the tech type name"))
+            tt = tree.add(
+                Panel(
+                    f"Tech type {tech} was not found - please check the tech type name"
+                )
+            )
 
         return tt
 
     try:
-        tree = Tree(f"{tech}", style="bold bright_white on black", guide_style="bold bright_blue")
-        a_client = AutomatedCuration(server_name, platform_url,
-                                     user_id=user)
+        tree = Tree(
+            f"{tech}",
+            style="bold bright_white on black",
+            guide_style="bold bright_blue",
+        )
+        a_client = AutomatedCuration(server_name, platform_url, user_id=user)
 
         token = a_client.create_egeria_bearer_token(user, user_password)
         view_tech_details(a_client, tech, tree)
         print(tree)
 
     except (
-            InvalidParameterException,
-            PropertyServerException,
-            UserNotAuthorizedException
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
     ) as e:
         print_exception_response(e)
 
@@ -126,9 +161,11 @@ def main():
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
     try:
-        tech = Prompt.ask("Enter the Technology to start from:", default="PostgreSQL Server")
+        tech = Prompt.ask(
+            "Enter the Technology to start from:", default="PostgreSQL Server"
+        )
         tech_details_viewer(tech, server, url, userid, user_pass)
-    except(KeyboardInterrupt):
+    except KeyboardInterrupt:
         pass
 
 

pyegeria/commands/tech/get_tech_type_template.py

@@ -20,21 +20,23 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    AutomatedCuration
+    AutomatedCuration,
 )
 
 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
@@ -42,12 +44,18 @@ console = Console(width=200)
 
 guid_list = []
 
-def template_viewer(tech_name: str, server_name:str, platform_url:str, user:str, user_pass:str,
-                jupyter: bool = EGERIA_JUPYTER, width: int = EGERIA_WIDTH):
 
+def template_viewer(
+    tech_name: str,
+    server_name: str,
+    platform_url: str,
+    user: str,
+    user_pass: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
     def build_classifications(classification: dict) -> Markdown:
-
-        class_md = ("\n")
+        class_md = "\n"
         for c in classification:
             c_type = c["classificationName"]
             if c_type == "Anchors":
@@ -65,53 +73,59 @@ def template_viewer(tech_name: str, server_name:str, platform_url:str, user:str,
         return output
 
     try:
-
         console = Console(width=width, force_terminal=not jupyter)
 
-        a_client = AutomatedCuration(server_name, platform_url,
-                                     user_id=user)
+        a_client = AutomatedCuration(server_name, platform_url, user_id=user)
 
         token = a_client.create_egeria_bearer_token(user, user_pass)
-        tech_elements = a_client.get_technology_type_elements(tech_name, get_templates=True)
+        tech_elements = a_client.get_technology_type_elements(
+            tech_name, get_templates=True
+        )
         if (len(tech_elements) >= 1) and (type(tech_elements) is list):
-            tree = Tree(f"Deployed Technology Type: {tech_name}", style="bold bright_white", guide_style="bold bright_blue")
-            note: str =" "
+            tree = Tree(
+                f"Deployed Technology Type: {tech_name}",
+                style="bold bright_white",
+                guide_style="bold bright_blue",
+            )
+            note: str = " "
             for element in tech_elements:
-                header = element['elementHeader']
+                header = element["elementHeader"]
                 tech_type = header["type"]["typeName"]
-                tech_collection = header["origin"]['homeMetadataCollectionName']
-                tech_created_by = header['versions']['createdBy']
-                tech_created_at = header['versions']['createTime']
-                tech_guid = header['guid']
-                tech_classifications = header['classifications']
+                tech_collection = header["origin"]["homeMetadataCollectionName"]
+                tech_created_by = header["versions"]["createdBy"]
+                tech_created_at = header["versions"]["createTime"]
+                tech_guid = header["guid"]
+                tech_classifications = header["classifications"]
                 class_md = build_classifications(tech_classifications)
 
-                referenceables = element['referenceableProperties']
-                tech_qualified_name = referenceables['qualifiedName']
-                extended = referenceables['extendedProperties']
-                ex_md:str = ""
+                referenceables = element["referenceableProperties"]
+                tech_qualified_name = referenceables["qualifiedName"]
+                extended = referenceables["extendedProperties"]
+                ex_md: str = ""
                 for key, value in extended.items():
                     ex_md += f"* {key}: {value}\n"
 
-                note = (f"* Qualified Name: {tech_qualified_name}\n"
-                              f"* GUID: {tech_guid}\n"
-                              f"* Createdy by: {tech_created_by}\n"
-                              f"* Created at: {tech_created_at}\n"
-                              f"* Home Collection: {tech_collection}\n"
-                              f"{class_md}\n"
-                              f"{ex_md}\n"
-                              )
-
-                interfaces = extended.get('connectorInterfaces', None)
+                note = (
+                    f"* Qualified Name: {tech_qualified_name}\n"
+                    f"* GUID: {tech_guid}\n"
+                    f"* Createdy by: {tech_created_by}\n"
+                    f"* Created at: {tech_created_at}\n"
+                    f"* Home Collection: {tech_collection}\n"
+                    f"{class_md}\n"
+                    f"{ex_md}\n"
+                )
+
+                interfaces = extended.get("connectorInterfaces", None)
                 if interfaces is not None:
-                    interface_type_name = interfaces['typeName']
-                    interface_array_cnt = interfaces['arrayCount']
+                    interface_type_name = interfaces["typeName"]
+                    interface_array_cnt = interfaces["arrayCount"]
                     note += f"* Interface Type: {interface_type_name}\n"
                     for i in range(0, int(interface_array_cnt)):
-                        note += (f"\t* Type: {interfaces['arrayValues']['propertyValueMap'][str(i)]['typeName']}"
-                                f"\tName: {interfaces['arrayValues']['propertiesAsStrings'][str(i)]}\n"
-                                )
-                note_md = Panel.fit(Markdown(note), style = 'bold bright_white on black')
+                        note += (
+                            f"\t* Type: {interfaces['arrayValues']['propertyValueMap'][str(i)]['typeName']}"
+                            f"\tName: {interfaces['arrayValues']['propertiesAsStrings'][str(i)]}\n"
+                        )
+                note_md = Panel.fit(Markdown(note), style="bold bright_white on black")
                 t = tree.add(note_md)
 
         else:
@@ -120,7 +134,7 @@ def template_viewer(tech_name: str, server_name:str, platform_url:str, user:str,
     except (
         InvalidParameterException,
         PropertyServerException,
-        UserNotAuthorizedException
+        UserNotAuthorizedException,
     ) as e:
         print_exception_response(e)
 
@@ -140,11 +154,13 @@ def main():
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
 
     try:
-        tech_name = Prompt.ask("Enter the Asset Name to view:", default="Apache Kafka Server")
-        template_viewer(tech_name,server, url, userid, user_pass)
-    except(KeyboardInterrupt):
+        tech_name = Prompt.ask(
+            "Enter the Asset Name to view:", default="Apache Kafka Server"
+        )
+        template_viewer(tech_name, server, url, userid, user_pass)
+    except KeyboardInterrupt:
         pass
 
 
 if __name__ == "__main__":
-    main()
+    main()

pyegeria/commands/tech/list_anchored_elements.py

@@ -3,8 +3,6 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-Unit tests for the Utils helper functions using the Pytest framework.
-
 
 Retrieve elements based on a search of a specified properties.
 """
@@ -34,7 +32,7 @@ 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_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")
@@ -48,7 +46,7 @@ disable_ssl_warnings = True
 
 def display_anchored_elements(
     search_string: str,
-    prop_list: [str],
+    prop_list: list[str],
     server: str,
     url: str,
     username: str,
@@ -59,16 +57,18 @@ def display_anchored_elements(
 ):
     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"
+        print(
+            "\nError --> Invalid Search String - must be greater than four characters long"
         )
+        sys.exit(3)
     g_client = EgeriaTech(server, url, username, user_password)
     token = g_client.create_egeria_bearer_token()
+    print(f"search string is {search_string} and prop_list is {prop_list}\n")
 
     def generate_table(search_string: str, prop_list: [str]) -> Table:
         """Make a new table."""
         table = Table(
-            title=f"Assets containing the string  {search_string} @ {time.asctime()}",
+            title=f"Elements containing the string  {search_string} @ {time.asctime()}",
             header_style="white on dark_blue",
             style="bold white on black",
             row_styles=["bold white on black"],
@@ -89,6 +89,7 @@ def display_anchored_elements(
         classification = "Anchors"
         open_type_name = None
         property_value = search_string
+
         property_names = prop_list
 
         elements = g_client.find_elements_by_classification_with_property_value(
@@ -148,11 +149,6 @@ def display_anchored_elements(
         return table
 
     try:
-        # with Live(generate_table(), refresh_per_second=4, screen=True) as live:
-        #     while True:
-        #         time.sleep(2)
-        #         live.update(generate_table())
-
         with console.pager(styles=True):
             console.print(generate_table(search_string, prop_list), soft_wrap=True)
 
@@ -164,7 +160,7 @@ def display_anchored_elements(
         console.print_exception()
         sys.exit(1)
 
-    except ValueError as e:
+    except Exception as e:
         console.print(
             f"\n\n====> Invalid Search String - must be greater than four characters long"
         )
@@ -191,9 +187,16 @@ def main():
         prop_list = Prompt.ask(
             "Enter the list of properties to search", default="anchorTypeName"
         )
-        display_anchored_elements(
-            search_string, [prop_list], server, url, userid, user_pass, time_out
-        )
+        if search_string == "":
+            print("\nError --> Search string can't be empty")
+            sys.exit(1)
+        elif len(search_string) <= 4:
+            print("\nError --> Search string must be greater than four characters long")
+            sys.exit(2)
+        else:
+            display_anchored_elements(
+                search_string, [prop_list], server, url, userid, user_pass, time_out
+            )
     except KeyboardInterrupt:
         pass
 

pyegeria/commands/tech/list_asset_types.py

@@ -31,7 +31,7 @@ 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_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")

pyegeria/commands/tech/list_elements.py

@@ -26,7 +26,7 @@ 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_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")

pyegeria/commands/tech/list_elements_for_classification.py

@@ -26,7 +26,7 @@ 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_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")

pyegeria/commands/tech/list_elements_x.py

@@ -28,7 +28,7 @@ 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_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")
@@ -102,13 +102,13 @@ def list_elements_x(
                 if type(tags) is list:
                     for tag in tags:
                         tags_md += (
-                            f"* tag: {tag.get('name','---')}\n"
+                            f"* tag: {tag.get('name','')}\n"
                             f"\t description: {tag.get('description','---')}\n"
                             f"\t assigned by: {tag.get('user','---')}\n"
                         )
 
                 else:
-                    tags_md = "---"
+                    tags_md = ""
 
                 likes = c_client.get_attached_likes(el_guid)
                 likes_md = "Likes:\b"
@@ -122,9 +122,12 @@ def list_elements_x(
                         )
 
                 else:
-                    likes_md = "---"
+                    likes_md = ""
 
-                feedback_out = f"{tags_md}\n --- \n{likes_md}"
+                if len(tags_md) > 0 and len(likes_md) > 0:
+                    feedback_out = f"{tags_md}\n --- \n{likes_md}"
+                else:
+                    feedback_out = ""
 
                 comments_out = " "
 

pyegeria/commands/tech/list_gov_action_processes.py

@@ -34,7 +34,7 @@ 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_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")

pyegeria/commands/tech/list_registered_services.py

@@ -31,7 +31,7 @@ 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_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")
@@ -71,7 +71,7 @@ def display_registered_svcs(
     def generate_table(svc_list) -> Table:
         """Make a new table."""
         table = Table(
-            title=f"Technology Types for: {url} @ {time.asctime()}",
+            title=f"Services for: {url} @ {time.asctime()}",
             style="bold bright_white on black",
             row_styles=["bold bright_white on black"],
             header_style="white on dark_blue",

pyegeria/commands/tech/list_related_elements.py

@@ -26,7 +26,7 @@ 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_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")

pyegeria/commands/tech/list_related_specification.py

@@ -34,7 +34,7 @@ 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_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")