pyegeria 5.4.9.5__tar.gz → 5.4.9.6__tar.gz

{pyegeria-5.4.9.5/pyegeria.egg-info → pyegeria-5.4.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyegeria
-Version: 5.4.9.5
+Version: 5.4.9.6
 Summary: A python client for Egeria
 Author-email: Dan Wolfson <dan.wolfson@pdr-associates.com>
 License-Expression: Apache-2.0

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/commands/cli/egeria.py

@@ -1020,15 +1020,7 @@ def list_solution_roles(ctx, search_string):
 def list_solution_components(ctx, search_string):
     """Display solution componentss"""
     c = ctx.obj
-    solution_component_list(
-        search_string,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    solution_component_list(search_string, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 #

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/commands/cli/egeria_tech.py

@@ -785,15 +785,7 @@ def list_solution_roles(ctx, search_string):
 def list_solution_components(ctx, search_string):
     """Display solution componentss"""
     c = ctx.obj
-    solution_component_list(
-        search_string,
-        c.view_server,
-        c.view_server_url,
-        c.userid,
-        c.password,
-        c.jupyter,
-        c.width,
-    )
+    solution_component_list(search_string, c.view_server, c.view_server_url, c.userid, c.password, c.jupyter, c.width)
 
 
 #

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/commands/tech/get_tech_type_template.py

@@ -3,7 +3,7 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-Display the status of cataloged platforms and servers.
+Display technology type information
 """
 import argparse
 import os
@@ -78,8 +78,8 @@ def template_viewer(
         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, output_format=JSON,
-                                                              report_spec=Tech - Type - Elements)
+        tech_elements = a_client.get_technology_type_elements(tech_name, get_templates=True, output_format="JSON",
+                                                              report_spec="Tech-Type-Elements")
         if (len(tech_elements) >= 1) and (type(tech_elements) is list):
             tree = Tree(
                 f"Deployed Technology Type: {tech_name}",
@@ -94,10 +94,10 @@ def template_viewer(
                 tech_created_by = header["versions"]["createdBy"]
                 tech_created_at = header["versions"]["createTime"]
                 tech_guid = header["guid"]
-                tech_classifications = header["classifications"]
+                tech_classifications = element.get("otherClassifications",{})
                 class_md = build_classifications(tech_classifications)
 
-                referenceables = element["referenceableProperties"]
+                referenceables = element["properties"]
                 tech_qualified_name = referenceables["qualifiedName"]
                 extended = referenceables["extendedProperties"]
                 ex_md: str = ""

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/commands/tech/list_solution_blueprints.py

@@ -34,14 +34,12 @@ from pyegeria import (
 
 app_config = settings.Environment
 config_path = os.path.join(app_config.pyegeria_config_directory, app_config.pyegeria_config_file)
-print(f"Loading config from {config_path}")
+
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_MERMAID_FOLDER = os.path.join(app_config.pyegeria_root, app_config.egeria_mermaid_folder)
 conf = load_app_config(config_path)
-
-print(EGERIA_MERMAID_FOLDER)
-exit(0)
+# print(f"Loading config from {config_path} and mermaid folder is {EGERIA_MERMAID_FOLDER}")
 console = Console(width = app_config.console_width)
 config_logging()
 
@@ -56,8 +54,10 @@ def blueprint_list(
     timeout: int = 30,
 ):
     """A Supply Chain viewer"""
+    print(user + ":" + user_password )
+    start_time = time.time()
     client = SolutionArchitect(server_name, platform_url, user, user_password)
-    token = client.create_egeria_bearer_token()
+    token = client.create_egeria_bearer_token(user,user_password)
 
     def generate_table() -> Table | str:
         table = Table(
@@ -164,6 +164,7 @@ 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:
         search_string = Prompt.ask("Enter a search string:", default="*")
         blueprint_list(search_string, server, url, userid, user_pass)

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/commands/tech/list_solution_components.py

@@ -21,32 +21,28 @@ from rich.text import Text
 from rich.tree import Tree
 
 from pyegeria import (
-    InvalidParameterException,
-    ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
+    print_basic_exception,
+    SolutionArchitect,
+    settings, load_app_config, pretty_print_config,
+    config_logging,
     save_mermaid_html,
 )
-from pyegeria._exceptions import print_exception_response
-from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
-from pyegeria.solution_architect import SolutionArchitect
 
-disable_ssl_warnings = True
-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", "qs-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")
+
+app_config = settings.Environment
+config_path = os.path.join(app_config.pyegeria_config_directory, app_config.pyegeria_config_file)
+
 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", "150"))
-EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
+EGERIA_MERMAID_FOLDER = os.path.join(app_config.pyegeria_root, app_config.egeria_mermaid_folder)
+conf = load_app_config(config_path)
+# print(f"Loading config from {config_path} and mermaid folder is {EGERIA_MERMAID_FOLDER}")
+console = Console(width = app_config.console_width)
+config_logging()
+
+
+disable_ssl_warnings = True
 
 
 def solution_component_list(
@@ -55,8 +51,8 @@ def solution_component_list(
     platform_url: str,
     user: str,
     user_password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
     timeout: int = 30,
 ):
     """A Solution Component viewer"""
@@ -153,11 +149,9 @@ def solution_component_list(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
 
 
 def main():
@@ -169,8 +163,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
 

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/commands/tech/list_solution_roles.py

@@ -18,35 +18,26 @@ 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 pyegeria import (
-    InvalidParameterException,
-    ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
+    print_basic_exception,
+    SolutionArchitect,
+    settings, load_app_config, pretty_print_config,
+    config_logging,
     save_mermaid_html,
 )
-from pyegeria._exceptions import print_exception_response
-from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
-from pyegeria.solution_architect import SolutionArchitect
-
-disable_ssl_warnings = True
-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", "qs-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")
+
+
+app_config = settings.Environment
+config_path = os.path.join(app_config.pyegeria_config_directory, app_config.pyegeria_config_file)
+
 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", "150"))
-EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
+EGERIA_MERMAID_FOLDER = os.path.join(app_config.pyegeria_root, app_config.egeria_mermaid_folder)
+conf = load_app_config(config_path)
+# print(f"Loading config from {config_path} and mermaid folder is {EGERIA_MERMAID_FOLDER}")
+console = Console(width = app_config.console_width)
+config_logging()
 
 
 def solution_role_list(
@@ -55,8 +46,8 @@ def solution_role_list(
     platform_url: str,
     user: str,
     user_password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
     timeout: int = 30,
 ):
     """A Supply Chain viewer"""
@@ -152,11 +143,9 @@ def solution_role_list(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
 
 
 def main():
@@ -168,8 +157,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
 

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/commands/tech/list_tech_templates.py

@@ -14,28 +14,26 @@ from rich.table import Table
 from textual.widgets import DataTable
 
 from pyegeria import (
+    PyegeriaException,
+    print_basic_exception,
+    SolutionArchitect,
+    settings, load_app_config, pretty_print_config,
+    config_logging,
     AutomatedCuration,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
 )
 
-console = Console()
-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")
+
+app_config = settings.Environment
+config_path = os.path.join(app_config.pyegeria_config_directory, app_config.pyegeria_config_file)
+
 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"))
+
+conf = load_app_config(config_path)
+# print(f"Loading config from {config_path} and mermaid folder is {EGERIA_MERMAID_FOLDER}")
+console = Console(width = app_config.console_width)
+config_logging()
+
 
 
 def list_templates(
@@ -52,33 +50,33 @@ def list_templates(
             if "deployedImplementationType" not in item["qualifiedName"]:
                 continue
 
-            details = a_client.get_tech_type_detail(item["name"])
-            entry = {details["name"]: {}}
+            details = a_client.get_tech_type_detail(item["displayName"])
+            entry = {details["displayName"]: {}}
             if type(details) is str:
                 tech_info_list.append(entry)
                 continue
             templates = details.get("catalogTemplates", "Not Found")
             if type(templates) is list:
                 t_list = []
-                entry = {details["name"]: {}}
+                entry = {details["displayName"]: {}}
                 for template in templates:
-                    t_list.append({"template": template["name"]})
-                entry[details["name"]] = t_list
+                    t_list.append({"template": template["displayName"]})
+                entry[details["displayName"]] = t_list
                 tech_info_list.append(entry)
     return tech_info_list
 
 
 def add_row(
     table: Union[Table, DataTable],
-    name: str,
+    displayName: str,
     template_name: str,
     template_guid: str,
     placeholder_table: Table,
 ) -> Table | DataTable:
     if isinstance(table, Table):
-        table.add_row(name, template_name, template_guid, placeholder_table)
+        table.add_row(displayName, template_name, template_guid, placeholder_table)
     elif isinstance(table, DataTable):
-        table.add_row(name, template_name, template_guid, placeholder_table)
+        table.add_row(displayName, template_name, template_guid, placeholder_table)
 
     return table
 
@@ -89,8 +87,8 @@ def display_templates_spec(
     url: str,
     username: str,
     password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
     data_table: bool = False,
 ) -> Table | DataTable:
     a_client = AutomatedCuration(server, url, username)
@@ -134,32 +132,32 @@ def display_templates_spec(
                 placeholder_table.add_column("Example", width=20)
                 placeholder_table.add_column("Description", width=40)
 
-                name = item.get("name", "none")
+                displayName = item.get("displayName", "none")
 
-                details = a_client.get_tech_type_detail(name)
+                details = a_client.get_tech_type_detail(displayName)
                 if type(details) is str:
-                    console.log(f"Missing details for - {name}: {details}")
+                    console.log(f"Missing details for - {displayName}: {details}")
                     continue
 
                 templates = details.get("catalogTemplates", "Not Found")
                 if type(templates) is not str:
                     for template in templates:
-                        template_name = template.get("name", None)
+                        template_name = template.get("displayName", None)
 
                         template_name = (
-                            f"{name}_Template"
+                            f"{displayName}_Template"
                             if template_name is None
                             else template_name
                         )
 
                         specification = template["specification"]["placeholderProperty"]
-                        template_guid = template["relatedElement"]["guid"]
+                        template_guid = template["relatedElement"]['elementHeader']["guid"]
 
                         for placeholder in specification:
                             placeholder_data_type = placeholder["dataType"]
                             placeholder_description = placeholder["description"]
-                            placeholder_name = placeholder["placeholderPropertyName"]
-                            placeholder_required = placeholder["required"]
+                            placeholder_name = placeholder["name"]
+                            placeholder_required = str(placeholder["required"])
                             placeholder_example = placeholder.get("example", None)
                             placeholder_table.add_row(
                                 placeholder_name,
@@ -169,9 +167,9 @@ def display_templates_spec(
                                 placeholder_description,
                             )
 
-                        # table.add_row(name, template_name, template_guid, placeholder_table)
+                        # table.add_row(displayName, template_name, template_guid, placeholder_table)
                         table = add_row(
-                            table, name, template_name, template_guid, placeholder_table
+                            table, displayName, template_name, template_guid, placeholder_table
                         )
 
             return table
@@ -189,12 +187,12 @@ def display_templates_spec(
                 console.print(generate_table(data_table))
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
         assert e.related_http_code != "200", "Invalid parameters"
+    except Exception as e:
+        console.print_exception(show_locals=True)
     finally:
         a_client.close_session()
 
@@ -208,8 +206,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
     password = args.password if args.password is not None else EGERIA_USER_PASSWORD
     guid = None
@@ -270,20 +268,20 @@ def main():
 #                 placeholder_table.add_column("Example", width=20)
 #                 placeholder_table.add_column("Description", width=40)
 #
-#                 name = item.get("name", "none")
+#                 displayName = item.get("displayName", "none")
 #
-#                 details = a_client.get_tech_type_detail(name)
+#                 details = a_client.get_tech_type_detail(displayName)
 #                 if type(details) is str:
-#                     console.log(f"Missing details for - {name}: {details}")
+#                     console.log(f"Missing details for - {displayName}: {details}")
 #                     continue
 #
 #                 templates = details.get("catalogTemplates", "Not Found")
 #                 if type(templates) is not str:
 #                     for template in templates:
-#                         template_name = template.get("name", None)
+#                         template_name = template.get("displayName", None)
 #
 #                         template_name = (
-#                             f"{name}_Template"
+#                             f"{displayName}_Template"
 #                             if template_name is None
 #                             else template_name
 #                         )
@@ -306,7 +304,7 @@ def main():
 #                             )
 #
 #                         table.add_row(
-#                             name, template_name, template_guid, placeholder_table
+#                             displayName, template_name, template_guid, placeholder_table
 #                         )
 #
 #             return table
@@ -356,5 +354,5 @@ def main():
 #         pass
 #
 #
-# if __name__ == "__main__":
-#     main()
+if __name__ == "__main__":
+    main()

{pyegeria-5.4.9.5 → pyegeria-5.4.9.6}/config/config.json

@@ -6,8 +6,8 @@
   },
   "Environment": {
     "Console Width": 201,
-    "Egeria Inbox": "inbox",
-    "Egeria Outbox": "outbox",
+    "Egeria Inbox": "egeria-inbox",
+    "Egeria Outbox": "egeria-outbox",
     "Dr.Egeria Inbox": "inbox/dr-egeria-inbox",
     "Dr.Egeria Outbox": "outbox/dr-egeria-outbox",
     "Egeria Engine Host": "qs-engine-host",
@@ -17,17 +17,17 @@
     "Egeria Integration Daemon URL": "https://localhost:9443",
     "Egeria Jupyter": true,
     "Egeria Kafka Endpoint": "localhost:9192",
-    "Egeria Mermaid Folder": "outbox/mermaid-graphs",
+    "Egeria Mermaid Folder": "egeria-outbox/mermaid-graphs",
     "Egeria Metadata Store": "qs-metadata-store",
     "Egeria Platform URL": "https://localhost:9443",
     "Egeria View Server": "qs-view-server2",
     "Egeria View Server URL": "https://localhost:9443",
     "Pyegeria Root": "/Users/dwolfson/localGit/egeria-python/sample-data",
-    "Pyegeria Config Directory": "/Users/dwolfson/localGit/egeria-python/egeria-python/config",
+    "Pyegeria Config Directory": "/Users/dwolfson/localGit/egeria-python/config",
     "Pyegeria Publishing Root": "http://localhost:8085/outbox",
-    "Pyegeria User Format Sets Dir": "/Users/dwolfson/localGit/egeria-python/egeria-python/config"
+    "Pyegeria User Report Specs Dir": "~/.pyegeria/report_specs"
   },
-  "feature_x_enabled": "foo",
+  "feature_x_enabled": false,
   "Logging": {
     "console_filter_levels": [
       "ERROR"