pyegeria 5.3.9.9.3__py3-none-any.whl → 5.5.3.3__py3-none-any.whl

commands/cat/{get_collection.py → get_collection_tree.py}

@@ -18,11 +18,9 @@ from rich.tree import Tree
 
 from pyegeria import (
     CollectionManager,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException, NO_ELEMENTS_FOUND,
-    )
-from pyegeria._exceptions import print_exception_response
+    NO_ELEMENTS_FOUND,
+    PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
+)
 
 disable_ssl_warnings = True
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -74,9 +72,9 @@ def collection_viewer(
                 )
                 text_guid = Text(f"* GUID: {member['guid']}", "green")
                 text_collection_type = Text(
-                    f"* Collection Type: {member['collectionType']}"
+                    f"* Collection Type: {member.get('typeName','')}"
                 )
-                text_description = Text(f"* Description: {member['description']}")
+                text_description = Text(f"* Description: {member.get('description','')}")
                 p = Panel.fit(
                     f"{text_collection_name}[green]\n{text_qualified_name}\n{text_guid}\n"
                     f"{text_collection_type}\n{text_description}"
@@ -94,9 +92,7 @@ def collection_viewer(
                     )
                     walk_collection_hierarchy(branch, collection_client, member["guid"])
         else:
-            tt = tree.add(
-                f"[bold magenta on black]No collections found in {root_collection_name}"
-            )
+            tt = tree.add("[bold magenta on black]No Members found")
 
     try:
         tree = Tree(f"[bold bright green]{root}", guide_style="bold bright_blue")
@@ -106,15 +102,11 @@ def collection_viewer(
         walk_collection_hierarchy(tree, c_client, None, root)
         print(tree)
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        if e.exception_error_message_parameters[1] == NO_ELEMENTS_FOUND:
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        if hasattr(e, 'exception_error_message_parameters') and len(e.exception_error_message_parameters) > 1 and e.exception_error_message_parameters[1] == NO_ELEMENTS_FOUND:
             print("The collection was not found.")
         else:
-            print_exception_response(e)
+            print_basic_exception(e)
     finally:
         c_client.close_session()
 
@@ -136,7 +128,7 @@ def main():
     try:
         root_collection = Prompt.ask(
             "Enter the Root Collection to start from:",
-            default="Digital Products Root",
+            default="GeoSpatial-Root",
         )
         collection_viewer(root_collection, server, url, userid, user_pass)
     except KeyboardInterrupt:

commands/cat/get_project_dependencies.py

@@ -10,6 +10,7 @@ A simple viewer for project dependencies - provide the root and we display the d
 import argparse
 import os
 
+from pydantic import ValidationError
 from rich import print
 from rich.console import Console
 from rich.markdown import Markdown
@@ -18,12 +19,11 @@ from rich.prompt import Prompt
 from rich.tree import Tree
 
 from pyegeria import (
-    InvalidParameterException,
     ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaAPIException, PyegeriaClientException,
+    print_basic_exception,
+    print_validation_error,
 )
-from pyegeria._exceptions import print_exception_response
 
 disable_ssl_warnings = True
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -72,7 +72,7 @@ def project_dependency_viewer(
             proj_type = proj_props.get("typeName", "---")
             proj_unique = proj_props.get("qualifiedName", "---")
             proj_identifier = proj_props.get("identifier", "---")
-            proj_name = proj_props.get("name", "---")
+            proj_name = proj_props.get("displayName", "---")
             proj_desc = proj_props.get("description", "---")
             proj_status = proj_props.get("projectStatus", "---")
             proj_priority = proj_props.get("priority", "---")
@@ -90,12 +90,12 @@ def project_dependency_viewer(
         else:
             return
 
-        team = project_client.get_project_team(proj_guid)
+        team = project_client.get_project_team(proj_guid,"")
         member_md = ""
         if type(team) is list:
             for member in team:
-                member_guid = member["member"]["guid"]
-                member_unique = member["member"]["uniqueName"]
+                member_guid = member["elementHeader"]["guid"]
+                member_unique = member["properties"]["qualifiedName"]
                 member_md += f"* Member Unique Name: {member_unique}\n* Member GUID: {member_guid}"
             proj_props_md += f"\n### Team Members\n {member_md}"
 
@@ -131,12 +131,12 @@ def project_dependency_viewer(
         walk_project_hierarchy(p_client, root, tree, root=True)
         print(tree)
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        print_exception_response(e)
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
+    except ValidationError as e:
+        print_validation_error(e)
+    except Exception as e:
+        print_basic_exception(e)
 
 
 def main():

commands/cat/get_project_structure.py

@@ -10,6 +10,7 @@ A simple viewer for project structure - provide the root and we display the hier
 import argparse
 import os
 
+from pydantic import ValidationError
 from rich import print
 from rich.console import Console
 from rich.markdown import Markdown
@@ -18,12 +19,9 @@ from rich.prompt import Prompt
 from rich.tree import Tree
 
 from pyegeria import (
-    InvalidParameterException,
     ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table, print_validation_error
 )
-from pyegeria._exceptions import print_exception_response
 
 disable_ssl_warnings = True
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -72,7 +70,7 @@ def project_structure_viewer(
             proj_type = proj_props.get("typeName", "---")
             proj_unique = proj_props.get("qualifiedName", "---")
             proj_identifier = proj_props.get("identifier", "---")
-            proj_name = proj_props.get("name", "---")
+            proj_name = proj_props.get("displayName", "---")
             proj_desc = proj_props.get("description", "---")
             proj_status = proj_props.get("projectStatus", "---")
             proj_priority = proj_props.get("priority", "---")
@@ -90,12 +88,12 @@ def project_structure_viewer(
         else:
             return
 
-        team = project_client.get_project_team(proj_guid)
+        team = project_client.get_project_team(proj_guid,"")
         member_md = ""
         if type(team) is list:
             for member in team:
-                member_guid = member["member"]["guid"]
-                member_unique = member["member"]["uniqueName"]
+                member_guid = member["elementHeader"]["guid"]
+                member_unique = member["properties"]["qualifiedName"]
                 member_md += f"* Member Unique Name: {member_unique}\n* Member GUID: {member_guid}"
             proj_props_md += f"\n### Team Members\n {member_md}"
 
@@ -131,12 +129,15 @@ def project_structure_viewer(
         walk_project_hierarchy(p_client, root, tree, root=True)
         print(tree)
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        print_exception_response(e)
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
+
+    except ValidationError as e:
+        print_validation_error(e)
+
+    except Exception as e:
+        console.print_exception()
+
 
 
 def main():

commands/cat/get_tech_type_elements.py

@@ -7,45 +7,22 @@ Display the status of cataloged platforms and servers.
 """
 import argparse
 import os
-import sys
-import time
 
-from rich import json, print
 from rich.console import Console
-from rich.live import Live
-from rich.markdown import Markdown
-from rich.panel import Panel
 from rich.prompt import Prompt
-from rich.table import Table
-from rich.text import Text
-from rich.tree import Tree
 
+from commands.cat.run_report import list_generic
 from pyegeria import (
-    AutomatedCuration,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    settings,
+    config_logging, print_basic_exception, PyegeriaAPIException, PyegeriaClientException
 )
 
-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("EGERIA_VIEW_SERVER", "view-server")
-EGERIA_VIEW_SERVER_URL = os.environ.get(
-    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
-)
-EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_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
-console = Console(width=200)
+app_config = settings.Environment
+config_logging()
+console = Console(width=app_config.console_width)
 
 guid_list = []
 
@@ -56,94 +33,17 @@ def tech_viewer(
     platform_url: str,
     user: str,
     user_pass: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
 ):
-    def build_classifications(classification: dict) -> Markdown:
-        class_md = "\n"
-        for c in classification:
-            c_type = c["classificationName"]
-            if c_type == "Anchors":
-                continue
-            class_md += f"* Classification: {c_type}\n"
-            class_props = c.get("classificationProperties", None)
-            if class_props is None:
-                continue
-            for prop in class_props.keys():
-                class_md += f"\t* {prop}: {class_props[prop]}\n"
-        if class_md == "-":
-            output = None
-        else:
-            output = class_md
-        return output
-
     try:
-        console = Console(width=width, force_terminal=not jupyter)
-
-        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=False
-        )
-        if type(tech_elements) is str:
-            console.print(f"No elements found for {tech_name}")
-            sys.exit(1)
-
-        tree = Tree(
-            f"Deployed Technology Type: {tech_name}",
-            style="bold bright_white on black",
-            guide_style="bold bright_blue",
-        )
-        note: str = " "
-        for element in tech_elements:
-            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"]
-            class_md = build_classifications(tech_classifications)
-
-            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"* Created 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"]
-                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")
-            t = tree.add(note_md)
-
-        print(tree)
+        list_generic(report_spec = "Tech-Type-Elements", output_format = "TABLE", view_server = server_name,
+                 view_url= platform_url, user = user, user_pass = user_pass, prompt_missing = True,
+                     params = {"filter": tech_name},
+                 render_table=True, table_caption="Tech Type Elements", use_pager=True, width=width, jupyter=jupyter)
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        print_exception_response(e)
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
 
 
 def main():
@@ -155,8 +55,8 @@ def main():
     parser.add_argument("--password", help="User Password")
     args = parser.parse_args()
 
-    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
-    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.egeria_view_server_url
     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: