pyegeria 5.3.4.7.dev3__py3-none-any.whl → 5.3.4.9__py3-none-any.whl

pyegeria/__init__.py

@@ -19,6 +19,14 @@ from ._globals import (
     enable_ssl_check,
     is_debug,
     max_paging_size,
+    NO_ELEMENTS_FOUND,
+    NO_ASSETS_FOUND,
+    NO_SERVERS_FOUND,
+    NO_CATALOGS_FOUND,
+    NO_GLOSSARIES_FOUND,
+    NO_TERMS_FOUND,
+    NO_CATEGORIES_FOUND,
+    NO_ELEMENT_FOUND,
 )
 
 if disable_ssl_warnings:

pyegeria/_client.py

@@ -23,7 +23,7 @@ from pyegeria._exceptions import (
     PropertyServerException,
     UserNotAuthorizedException,
 )
-from pyegeria._globals import enable_ssl_check, max_paging_size
+from pyegeria._globals import enable_ssl_check, max_paging_size, NO_ELEMENTS_FOUND
 from pyegeria._validators import (
     is_json,
     validate_name,
@@ -693,7 +693,7 @@ class Client:
             )
 
             result = await self._async_make_request("POST", url, body_slimmer(body))
-            return result.json().get("guid", "No elements found")
+            return result.json().get("guid", NO_ELEMENTS_FOUND)
 
         try:
             view_server = self.view_server
@@ -717,7 +717,7 @@ class Client:
                 )
 
                 result = await self._async_make_request("POST", url, body_slimmer(body))
-                return result.json().get("guid", "No elements found")
+                return result.json().get("guid", NO_ELEMENTS_FOUND)
             else:
                 body = {
                     "class": "NameRequestBody",
@@ -733,7 +733,7 @@ class Client:
                 )
 
                 result = await self._async_make_request("POST", url, body_slimmer(body))
-                return result.json().get("guid", "No elements found")
+                return result.json().get("guid", NO_ELEMENTS_FOUND)
         else:
             raise InvalidParameterException(
                 "Neither server_guid nor server_name were provided - please provide."

pyegeria/_globals.py

@@ -34,3 +34,12 @@ star_ratings = (
 
 TEMPLATE_GUIDS: dict = {}
 INTEGRATION_GUIDS: dict = {}
+
+NO_ELEMENTS_FOUND = "No elements found"
+NO_ASSETS_FOUND = "No assets found"
+NO_SERVERS_FOUND = "No servers found"
+NO_CATALOGS_FOUND = "No catalogs found"
+NO_GLOSSARIES_FOUND = "No glossaries found"
+NO_TERMS_FOUND = "No terms found"
+NO_CATEGORIES_FOUND = "No categories found"
+NO_ELEMENT_FOUND = "No element found"

pyegeria/asset_catalog_omvs.py

@@ -17,7 +17,7 @@ from pyegeria.utils import body_slimmer
 from pyegeria._client import Client
 from pyegeria import TEMPLATE_GUIDS, max_paging_size
 from pyegeria._exceptions import InvalidParameterException
-
+from pyegeria._globals import NO_ELEMENTS_FOUND, NO_ASSETS_FOUND
 from ._validators import validate_search_string
 
 
@@ -366,7 +366,7 @@ class AssetCatalog(Client):
         )
         body = {"filter": search_string}
         response = await self._async_make_request("POST", url, body, time_out=time_out)
-        return response.json().get("searchMatches", "no assets found")
+        return response.json().get("searchMatches", "NO_ASSETS_FOUND")
 
     def find_in_asset_domain(
         self,
@@ -700,7 +700,7 @@ class AssetCatalog(Client):
         body = {"filter": type_name, "effectiveTime": effective_time}
         body_s = body_slimmer(body)
         response = await self._async_make_request("POST", url, body_s)
-        return response.json().get("assets", "no assets found")
+        return response.json().get("assets", "NO_ASSETS_FOUND")
 
     def get_assets_by_metadata_collection_id(
         self,
@@ -778,7 +778,7 @@ class AssetCatalog(Client):
 
         response = await self._async_make_request("GET", url)
 
-        return response.json().get("types", "No assets found")
+        return response.json().get("types", "NO_ASSETS_FOUND")
 
     def get_asset_catalog_types(self) -> str | dict:
         """Return all the elements that are anchored to an asset plus relationships between these elements and to

pyegeria/automated_curation_omvs.py

@@ -12,6 +12,7 @@ import datetime
 from httpx import Response
 
 from pyegeria.utils import body_slimmer
+from pyegeria._globals import NO_ELEMENTS_FOUND
 from pyegeria._client import Client
 from pyegeria import TEMPLATE_GUIDS, max_paging_size
 from pyegeria._exceptions import (

pyegeria/classification_manager_omvs.py

@@ -13,7 +13,7 @@ from pyegeria.utils import body_slimmer
 
 # import json
 from pyegeria._client import Client, max_paging_size
-from pyegeria._globals import default_time_out
+from pyegeria._globals import default_time_out, NO_ELEMENTS_FOUND
 
 
 def query_seperator(current_string):
@@ -155,10 +155,10 @@ class ClassificationManager(Client):
         response: Response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def get_elements(
@@ -304,10 +304,10 @@ class ClassificationManager(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def get_elements_by_property_value(
@@ -462,10 +462,10 @@ class ClassificationManager(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def find_elements_by_property_value(
@@ -602,7 +602,7 @@ class ClassificationManager(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        elements = response.json().get("element", "No elements found")
+        elements = response.json().get("element", NO_ELEMENTS_FOUND)
 
         return elements
 
@@ -740,7 +740,7 @@ class ClassificationManager(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        return response.json().get("element", "No elements found")
+        return response.json().get("element", NO_ELEMENTS_FOUND)
 
     def get_element_by_unique_name(
         self,
@@ -870,7 +870,7 @@ class ClassificationManager(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        return response.json().get("guid", "No elements found")
+        return response.json().get("guid", NO_ELEMENTS_FOUND)
 
     def get_element_guid_by_unique_name(
         self,
@@ -968,7 +968,7 @@ class ClassificationManager(Client):
 
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
             elif len(elements) > 1:
                 raise Exception("Multiple elements found for supplied name!")
             elif len(elements) == 1:
@@ -1090,10 +1090,10 @@ class ClassificationManager(Client):
         response: Response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def find_elements_by_property_value(
@@ -1248,10 +1248,10 @@ class ClassificationManager(Client):
         response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def get_elements_by_classification(
@@ -1407,10 +1407,10 @@ class ClassificationManager(Client):
         response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def get_elements_by_classification_with_property_value(
@@ -1549,7 +1549,7 @@ class ClassificationManager(Client):
         UserNotAuthorizedException
             the requesting user is not authorized to issue this request.
         """
-        if property_value is "*":
+        if property_value == "*":
             property_value = None
 
         possible_query_params = query_string(
@@ -1576,10 +1576,10 @@ class ClassificationManager(Client):
         response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def find_elements_by_classification_with_property_value(
@@ -1755,10 +1755,10 @@ class ClassificationManager(Client):
         response: Response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def get_related_elements(
@@ -1931,10 +1931,10 @@ class ClassificationManager(Client):
         response: Response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def get_related_elements_with_property_value(
@@ -2117,10 +2117,10 @@ class ClassificationManager(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        elements = response.json().get("elements", "No elements found")
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is list:
             if len(elements) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return elements
 
     def find_related_elements_with_property_value(
@@ -2282,7 +2282,7 @@ class ClassificationManager(Client):
 
         if type(rels) is list:
             if len(rels) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return rels
 
     def get_relationships(
@@ -2426,10 +2426,10 @@ class ClassificationManager(Client):
         response: Response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        rels = response.json().get("relationships", "No elements found")
+        rels = response.json().get("relationships", NO_ELEMENTS_FOUND)
         if type(rels) is list:
             if len(rels) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return rels
 
     def get_relationships_with_property_value(
@@ -2582,10 +2582,10 @@ class ClassificationManager(Client):
             "POST", url, body_slimmer(body), time_out=time_out
         )
 
-        rels = response.json().get("relationships", "No elements found")
+        rels = response.json().get("relationships", NO_ELEMENTS_FOUND)
         if type(rels) is list:
             if len(rels) == 0:
-                return "No elements found"
+                return NO_ELEMENTS_FOUND
         return rels
 
     def find_relationships_with_property_value(
@@ -2723,7 +2723,7 @@ class ClassificationManager(Client):
         response: Response = await self._async_make_request(
             "POST", url, body_slimmer(body), time_out=time_out
         )
-        element = response.json().get("element", "No elements found")
+        element = response.json().get("element", NO_ELEMENTS_FOUND)
         return element
 
     def retrieve_instance_for_guid(

pyegeria/collection_manager_omvs.py

@@ -13,7 +13,7 @@ import time
 from pyegeria._client import Client
 from pyegeria._validators import validate_guid, validate_search_string
 from pyegeria.utils import body_slimmer
-
+from pyegeria._globals import NO_ELEMENTS_FOUND
 
 class CollectionManager(Client):
     """
@@ -202,7 +202,7 @@ class CollectionManager(Client):
         )
 
         resp = await self._async_make_request("POST", url, body)
-        # result = resp.json().get("elements","No elements found")
+        # result = resp.json().get("elements",NO_ELEMENTS_FOUND)
         result = resp.json().get("elements", "No Elements to return")
         return result
 
@@ -325,7 +325,7 @@ class CollectionManager(Client):
         )
 
         resp = await self._async_make_request("POST", url, body_s)
-        return resp.json().get("elements", "No elements found")
+        return resp.json().get("elements", NO_ELEMENTS_FOUND)
 
     def find_collections(
         self,
@@ -450,7 +450,7 @@ class CollectionManager(Client):
         )
 
         resp = await self._async_make_request("POST", url, body_s)
-        return resp.json().get("elements", "No elements found")
+        return resp.json().get("elements", NO_ELEMENTS_FOUND)
 
     def get_collections_by_name(
         self,
@@ -564,7 +564,7 @@ class CollectionManager(Client):
         )
 
         resp = await self._async_make_request("POST", url, body_s)
-        return resp.json().get("elements", "No elements found")
+        return resp.json().get("elements", NO_ELEMENTS_FOUND)
 
     def get_collections_by_type(
         self,
@@ -2239,7 +2239,7 @@ class CollectionManager(Client):
         )
 
         resp = await self._async_make_request("GET", url)
-        return resp.json().get("elements", "No elements found")
+        return resp.json().get("elements", NO_ELEMENTS_FOUND)
 
     def get_collection_members(
         self,

pyegeria/commands/cat/__init__.py

@@ -1 +1,22 @@
-"""Placeholder"""
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+"""
+from pyegeria import (
+    INTEGRATION_GUIDS,
+    TEMPLATE_GUIDS,
+    default_time_out,
+    disable_ssl_warnings,
+    enable_ssl_check,
+    is_debug,
+    max_paging_size,
+    NO_ELEMENTS_FOUND,
+    NO_ASSETS_FOUND,
+    NO_SERVERS_FOUND,
+    NO_CATALOGS_FOUND,
+    NO_GLOSSARIES_FOUND,
+    NO_TERMS_FOUND,
+    NO_CATEGORIES_FOUND,
+    NO_ELEMENT_FOUND,
+)
+

pyegeria/commands/cat/get_collection.py

@@ -111,7 +111,7 @@ def collection_viewer(
         PropertyServerException,
         UserNotAuthorizedException,
     ) as e:
-        if e.exception_error_message_parameters[1] == "No elements found":
+        if e.exception_error_message_parameters[1] == NO_ELEMENTS_FOUND:
             print("The collection was not found.")
         else:
             print_exception_response(e)

pyegeria/commands/cat/list_terms.py

@@ -98,6 +98,8 @@ def display_glossary_terms(
                 f"\nThe glossary name {glossary_name} was not found. Please try using the glossary guid"
             )
             sys.exit(1)
+    elif (glossary_guid is not None) and (len(glossary_guid) < 10):
+            glossary_guid = None
 
     def generate_table(search_string: str, glossary_guid: str) -> Table:
         """Make a new table."""

pyegeria/commands/my/__init__.py

@@ -0,0 +1,22 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+"""
+from pyegeria import (
+    INTEGRATION_GUIDS,
+    TEMPLATE_GUIDS,
+    default_time_out,
+    disable_ssl_warnings,
+    enable_ssl_check,
+    is_debug,
+    max_paging_size,
+    NO_ELEMENTS_FOUND,
+    NO_ASSETS_FOUND,
+    NO_SERVERS_FOUND,
+    NO_CATALOGS_FOUND,
+    NO_GLOSSARIES_FOUND,
+    NO_TERMS_FOUND,
+    NO_CATEGORIES_FOUND,
+    NO_ELEMENT_FOUND,
+)

pyegeria/commands/my/list_my_profile.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.
-
 
 A simple display for my profile
 """

pyegeria/commands/ops/__init__.py

@@ -4,20 +4,20 @@ Copyright Contributors to the ODPi Egeria project.
 
 
 """
-
-#
-# from .monitor_integ_daemon_status import display_integration_daemon_status
-# from .monitor_gov_eng_status import display_gov_eng_status
-# from .monitor_platform_status import display_status as display_platform_status
-# from .monitor_server_status import display_status as display_server_status
-# from .monitor_engine_activity_c import display_engine_activity_c
-
-# import monitor_server_status
-# import monitor_server_list
-# import monitor_integ_daemon_status
-# import monitor_platform_status
-# import monitor_engine_activity
-# import refresh_integration_daemon
-# import restart_integration_daemon
-# import integration_daemon_actions
-# import list_catalog_targets
+from pyegeria import (
+    INTEGRATION_GUIDS,
+    TEMPLATE_GUIDS,
+    default_time_out,
+    disable_ssl_warnings,
+    enable_ssl_check,
+    is_debug,
+    max_paging_size,
+    NO_ELEMENTS_FOUND,
+    NO_ASSETS_FOUND,
+    NO_SERVERS_FOUND,
+    NO_CATALOGS_FOUND,
+    NO_GLOSSARIES_FOUND,
+    NO_TERMS_FOUND,
+    NO_CATEGORIES_FOUND,
+    NO_ELEMENT_FOUND,
+)

pyegeria/commands/tech/__init__.py

@@ -0,0 +1,22 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+"""
+from pyegeria import (
+    INTEGRATION_GUIDS,
+    TEMPLATE_GUIDS,
+    default_time_out,
+    disable_ssl_warnings,
+    enable_ssl_check,
+    is_debug,
+    max_paging_size,
+    NO_ELEMENTS_FOUND,
+    NO_ASSETS_FOUND,
+    NO_SERVERS_FOUND,
+    NO_CATALOGS_FOUND,
+    NO_GLOSSARIES_FOUND,
+    NO_TERMS_FOUND,
+    NO_CATEGORIES_FOUND,
+    NO_ELEMENT_FOUND,
+)

pyegeria/commands/tech/list_information_supply_chains.py

@@ -75,10 +75,11 @@ def supply_chain_viewer(
             expand=True,
         )
         table.add_column("Supply Chain Name")
-        table.add_column("Qualified Name \n/\n GUID", width=38, no_wrap=False)
+        table.add_column("Qualified Name \n/\n GUID", justify = 'center', width=38, no_wrap=False)
         table.add_column("Purposes")
-        table.add_column("Scope\n/\n Mermaid Link")
-        table.add_column("Description")
+        table.add_column("Scope\n/\n Mermaid Link", justify = 'center')
+        table.add_column("Description", justify = 'center')
+        table.add_column("Segments", justify = 'center')
 
         supply_chains = client.find_information_supply_chains(search_string)
         if isinstance(supply_chains, list) is False:
@@ -101,13 +102,28 @@ def supply_chain_viewer(
                 link = save_mermaid_html(
                     sc_name, sc_mermaid, f"{EGERIA_MERMAID_FOLDER}/supply-chains"
                 )
-                sc_mermaid_link = f"file://:{link}"
-                # print("Visit my [link=https://www.willmcgugan.com]blog[/link]!")
-                # sc_scope = Text(f"{sc_scope}\n\t\t/\n{sc_mermaid_link}")
-                sc_scope = f"{sc_scope}\n\t\t/\n![{sc_mermaid_link}]({sc_mermaid_link})"
-                # sc_scope.stylize("link =" + sc_mermaid_link)
+                sc_mermaid_link = Text(f"file://:{link}", style="blue link " + link)
+                sc_scope = Text(f"{sc_scope}\n\n/\n\n{sc_mermaid_link}",  justify = "center")
+
+
+            sc_segments = sc.get("segments", "---")
+            if sc_segments != "---":
+                first_segment = True
+                sc_segments_md = ""
+                for segment in sc_segments:
+                    seg_prop = segment['properties']
+                    if first_segment:
+                        first_segment = False
+                    else:
+                        sc_segments_md += "----\n\n"  # add a seperator from previous segment
+
+                    for key in seg_prop.keys():
+                        sc_segments_md += f"* **{key}**: {seg_prop[key]}\n"
+                sc_segments_md = Markdown(sc_segments_md)
+            else:
+                sc_segments_md = "---"
 
-            table.add_row(sc_name, sc_unique_name, sc_purpose_str, sc_scope, sc_desc)
+            table.add_row(sc_name, sc_unique_name, sc_purpose_str, sc_scope, sc_desc, sc_segments_md)
 
         return table
 

pyegeria/commands/tech/list_solution_blueprints.py

@@ -120,20 +120,21 @@ def blueprint_list(
                 )
                 comp_type = comp_props.get("solutionComponentType", "---")
 
-                comp_actors = comp_props.get("actors", [])
-                comp_actors_list = ""
+                comp_actors = comp.get("actors", [])
+                comp_actors_list = f"{len(comp_actors)}\n"
                 for actor in comp_actors:
                     comp_actor_role = actor["relationshipProperties"].get("role", "---")
                     comp_actor_props = actor["relatedElement"].get("properties", {})
-                    comp_actor_props_md = f"* Role: {comp_actor_role}\n"
+                    comp_actor_props_md = f"\n\t* Role: {comp_actor_role}\n"
                     for prop in comp_actor_props.keys():
-                        comp_actor_props_md += f"* {prop}: {comp_actor_props[prop]}\n"
+                        comp_actor_props_md += f"\n\t\t* {prop}: {comp_actor_props[prop]}"
                     comp_actors_list += comp_actor_props_md
                 if first_comp:
                     first_comp = False
                 else:
                     comp_md += "\n\n---\n\n"
-                comp_md = f"Solution Component {comp_name}\n\n"
+                comp_md += f"Solution Component {comp_name}\n\n"
+                comp_md += f"* Type: {comp_type}\n"
                 comp_md += f"* Description: {comp_description}\n"
                 comp_md += f"* Planned Deployment: {comp_planned}\n"
                 comp_md += f"* Actors: {comp_actors_list}\n"

pyegeria/commands/tech/list_solution_components.py

@@ -97,7 +97,7 @@ def solution_component_list(
                 .get("extendedProperties", {})
                 .get("plannedDeployedImplementationType", "---")
             )
-            component_info = f"Type: {component_type}\n\n--\n\nPlanned Deployment Type: {planned_deployment_type}"
+            component_info = f"Type: {component_type}\n\n--\n\nPlanned Deployment Type: \n{planned_deployment_type}"
 
             component_qname = component["properties"].get("qualifiedName", "---")
             component_guid = component["elementHeader"]["guid"]

pyegeria/commands/tech/list_solution_roles.py

@@ -121,18 +121,19 @@ def solution_role_list(
             comp_props_md = ""
             first_comp = True
             for component in role_components:
+                if first_comp:
+                    first_comp = False
+                else:
+                    comp_props_md += "\n\n---\n\n"
                 comp = component.get("relatedElement", "")
                 if isinstance(comp, dict) is False:
                     continue
                 comp_props = comp.get("properties", {})
-                comp_props_md = ""
+
                 for prop in comp_props.keys():
                     comp_props_md += f"* **{prop}**: {comp_props[prop]}\n"
 
-                if first_comp:
-                    first_comp = False
-                else:
-                    comp_props_md += "\n\n---\n\n"
+
 
             comp_props_out = Markdown(comp_props_md)
             table.add_row(