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

commands/cat/list_deployed_servers.py

@@ -23,41 +23,24 @@ from rich.table import Table
 from rich.text import Text
 
 from pyegeria import (
-    InvalidParameterException,
-    PropertyServerException,
+    PyegeriaAPIException, PyegeriaClientException,
     RuntimeManager,
-    UserNotAuthorizedException,
-    print_exception_response,
+    print_basic_exception,
+    settings,
+    config_logging, PyegeriaException
 )
 
-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_INTEGRATION_DAEMON_URL = os.environ.get(
-    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
-)
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
-EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
-EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
-
-
-def display_servers_by_dep_imp(
-    filter: str = "*",
-    view_server: str = EGERIA_VIEW_SERVER,
-    view_url: str = EGERIA_VIEW_SERVER_URL,
-    user: str = EGERIA_USER,
-    user_pass: str = EGERIA_USER_PASSWORD,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
-):
+app_config = settings.Environment
+# config_logging()
+
+
+def display_servers_by_dep_imp(search_string: str = "*", view_server: str = app_config.egeria_view_server,
+                               view_url: str = app_config.egeria_view_server_url, user: str = EGERIA_USER,
+                               user_pass: str = EGERIA_USER_PASSWORD, jupyter: bool = app_config.egeria_jupyter,
+                               width: int = app_config.console_width):
     p_client = RuntimeManager(view_server, view_url, user, user_pass)
     token = p_client.create_egeria_bearer_token()
 
@@ -81,7 +64,7 @@ def display_servers_by_dep_imp(
         table.add_column("Description")
         table.add_column("Qualified Name & GUID", no_wrap=True)
 
-        unsorted_server_list = p_client.get_servers_by_dep_impl_type(filter)
+        unsorted_server_list = p_client.get_servers_by_dep_impl_type(search_string)
         if type(unsorted_server_list) is str:
             print("No matching Software Servers found?")
             sys.exit(1)
@@ -95,21 +78,21 @@ def display_servers_by_dep_imp(
             qualified_name = server["properties"].get("qualifiedName", "---")
             classifications = server["elementHeader"].get("classifications", None)
             zones = ""
-            if classifications:
-                for clas in classifications:
-                    if clas["classificationName"] == "AssetZoneMembership":
-                        classification_props = clas["classificationProperties"]
-                        zone_membership = classification_props.get(
-                            "zoneMembership", None
-                        )
-                        if zone_membership:
-                            for z in zone_membership.keys():
-                                zones += f"{zone_membership[z]}, "
-                            zones = zones[:-2]
+            # if classifications:
+            #     for clas in classifications:
+            #         if clas["classificationName"] == "AssetZoneMembership":
+            #             classification_props = clas["classificationProperties"]
+            #             zone_membership = classification_props.get(
+            #                 "zoneMembership", None
+            #             )
+            #             if zone_membership:
+            #                 for z in zone_membership.keys():
+            #                     zones += f"{zone_membership[z]}, "
+            #                 zones = zones[:-2]
 
             impl_type = server["properties"].get("deployedImplementationType", "---")
             server_guid = server["elementHeader"]["guid"]
-            server_desc = server["properties"].get("resourceDescription", "---")
+            server_desc = server["properties"].get("description", "---")
 
             server_id = Text(f"{qualified_name}\n&\n{server_guid}", justify="center")
 
@@ -124,11 +107,9 @@ def display_servers_by_dep_imp(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
     except KeyboardInterrupt:
         pass
     finally:
@@ -138,20 +119,20 @@ def display_servers_by_dep_imp(
 def main():
     parser = argparse.ArgumentParser()
 
-    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--server", help="Name of the view server")
     parser.add_argument("--url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     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
-    userid = args.userid if args.userid is not None else EGERIA_ADMIN_USER
+    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
-    filter = Prompt.ask(
-        "Filter deployed for deployed implementation type by search string", default="*"
+    filter_string = Prompt.ask(
+        "Name of deployed server type", default="View Server"
     )
-    display_servers_by_dep_imp(filter, server, url, userid, user_pass)
+    display_servers_by_dep_imp(filter_string, server, url, userid, user_pass)
 
 
 if __name__ == "__main__":

commands/cat/list_glossaries.py

@@ -10,7 +10,6 @@ A simple display for glossary terms
 """
 import argparse
 import os
-import sys
 import time
 
 from rich import box
@@ -22,10 +21,7 @@ from rich.text import Text
 
 from pyegeria import (
     EgeriaTech,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
 )
 
 disable_ssl_warnings = True
@@ -134,30 +130,35 @@ def display_glossaries(
         glossaries = m_client.find_glossaries(search_string)
         if type(glossaries) is list:
             sorted_glossary_list = sorted(
-                glossaries, key=lambda k: k["glossaryProperties"]["displayName"]
+                glossaries,
+                key=lambda k: k.get("properties", {}).get("displayName",
+                                                          k.get("properties", {}).get("qualifiedName", ""))
+
             )
             for glossary in sorted_glossary_list:
-                display_name = glossary["glossaryProperties"].get("displayName",'---')
-                qualified_name = glossary["glossaryProperties"]["qualifiedName"]
+                display_name = glossary["properties"].get("displayName",'---')
+                qualified_name = glossary["properties"]["qualifiedName"]
                 guid = glossary["elementHeader"]["guid"]
                 q_name = Text(f"{qualified_name}\n&\n{guid}", justify="center")
-                language = glossary["glossaryProperties"].get("language",'---')
-                description = glossary["glossaryProperties"].get("description",'---')
-                usage = glossary["glossaryProperties"].get("usage",'---')
+                language = glossary["properties"].get("language",'---')
+                description = glossary["properties"].get("description",'---')
+                usage = glossary["properties"].get("usage",'---')
 
-                categories = m_client.get_categories_for_glossary(guid)
+                members = glossary.get("collectionMembers", [])
                 cat_md = ''
-                if type(categories) is list:
-                    for category in categories:
-                        cat_md += f"* {category['glossaryCategoryProperties'][('displayName')]}\n"
+                if type(members) is list:
+                    for member in members:
+                        if member['relatedElement'
+                        ]["elementHeader"]["type"]['typeName'] == "CollectionFolder":
+                            cat_md += f'* {member.get("relatedElement",{}).get("properties",{}).get("qualifiedName","")}\n'
                     cat_md = cat_md.strip()
 
                 table.add_row(display_name, q_name, language, description, usage, Markdown(cat_md))
 
             console.print(table)
 
-    except (InvalidParameterException, PropertyServerException) as e:
-        print_exception_response(e)
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
     finally:
         m_client.close_session()
 

commands/cat/list_projects.py

@@ -21,11 +21,9 @@ from rich.table import Table
 
 from pyegeria import (
     ClassificationManager,
-    InvalidParameterException,
     ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    PyegeriaAPIException, PyegeriaClientException,
+    print_basic_exception, print_validation_error,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -100,7 +98,8 @@ def display_project_list(
             end = " "
             description = " "
         elif type(projects) == str:
-            raise ValueError("-->This is not a known project")
+            print("-->This is not a known project")
+            exit(0)
         else:
             sorted_projects = sorted(
                 projects, key=lambda k: k["properties"].get("name", "---")
@@ -110,7 +109,7 @@ def display_project_list(
                 classification = ""
                 guid = project["elementHeader"]["guid"]
                 props = project["properties"]
-                name = props.get("name", "None")
+                name = props.get("displayName", "---")
                 p_class = project["elementHeader"].get("classifications")
                 if p_class:
                     for classif in p_class:
@@ -141,9 +140,10 @@ def display_project_list(
                         if type(certified) is list:
                             for rel_elem in certified:
                                 p_name = rel_elem["relatedElement"]["properties"][
-                                    "name"
+                                    "displayName"
                                 ]
                                 certified_partner += f"* {p_name}\n"
+
                 else:
                     certified_partner = "---"
 
@@ -178,15 +178,13 @@ def display_project_list(
             console.save_html("projects.html")
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-        ValueError,
+        PyegeriaException,
     ) as e:
         if type(e) is str:
             print(e)
         else:
-            print_exception_response(e)
+            print_basic_exception(e)
+
     except KeyboardInterrupt:
         pass
     finally:

commands/cat/list_tech_type_elements.py

@@ -20,33 +20,17 @@ from rich.table import Table
 
 from pyegeria import (
     AutomatedCuration,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    PyegeriaAPIException, PyegeriaClientException,
+    print_basic_exception,
+    settings,
+    config_logging
 )
 
-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)
-
-guid_list = []
 
+app_config = settings.Environment
+config_logging()
 
 def list_tech_elements(
     tech_name: str,
@@ -54,8 +38,8 @@ def list_tech_elements(
     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,
 ):
     console = Console(width=width, force_terminal=not jupyter)
 
@@ -99,9 +83,8 @@ def list_tech_elements(
         table.add_column("Properties", width=40)
         table.add_column("Classifications", width=50)
 
-        tech_elements = a_client.get_technology_type_elements(
-            tech_name, get_templates=False
-        )
+        tech_elements = a_client.get_technology_type_elements(tech_name, get_templates=False, output_format="JSON",
+                                                              report_spec="Tech-Type-Elements")
         if type(tech_elements) is str:
             console.print(f"No elements found for {tech_name}")
             sys.exit(1)
@@ -114,10 +97,10 @@ def list_tech_elements(
             tech_created_by = header["versions"]["createdBy"]
             tech_created_at = header["versions"]["createTime"]
             tech_guid = header["guid"]
-            tech_classifications = header["classifications"]
+            tech_classifications = header["otherClassifications"]
             class_md = build_classifications(tech_classifications)
 
-            referenceables = element["referenceableProperties"]
+            referenceables = element["properties"]
             tech_qualified_name = referenceables["qualifiedName"]
             extended = referenceables["extendedProperties"]
             ex_md: str = ""
@@ -153,13 +136,12 @@ def list_tech_elements(
         with console.pager(styles=True):
             console.print(generate_table())
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        print_exception_response(e)
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
         print("\n\nPerhaps the type name isn't known")
+    except Exception as e:
+        console.print(e)
+
     finally:
         a_client.close_session()
 
@@ -173,8 +155,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:
@@ -184,6 +166,8 @@ def main():
         list_tech_elements(tech_name, server, url, userid, user_pass)
     except KeyboardInterrupt:
         pass
+    except Exception as e:
+        print(f"An error occurred: {e}")
 
 
 if __name__ == "__main__":

commands/cat/list_tech_types.py

@@ -20,26 +20,16 @@ from rich.table import Table
 
 from pyegeria import (
     AutomatedCuration,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    settings,
+    PyegeriaAPIException, PyegeriaClientException,
+    print_basic_exception
 )
 
-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"))
+app_config = settings.Environment
+# config_logging()
 
 
 disable_ssl_warnings = True
@@ -51,8 +41,8 @@ def display_tech_types(
     url: str,
     username: str,
     user_pass: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+        width: int = app_config.console_width,
 ):
     a_client = AutomatedCuration(server, url, username)
     token = a_client.create_egeria_bearer_token(username, user_pass)
@@ -87,7 +77,7 @@ def display_tech_types(
                 if "deployedImplementationType" not in item["qualifiedName"]:
                     continue
                 qualified_name = item.get("qualifiedName", " ")
-                name = item.get("name", "none")
+                name = item.get("displayName", "none")
                 category = item.get("category", "none")
                 description = item.get("description", "none")
 
@@ -103,11 +93,9 @@ def display_tech_types(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException,
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
         assert e.related_http_code != "200", "Invalid parameters"
     finally:
         a_client.close_session()
@@ -122,8 +110,8 @@ def main():
 
     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