pyegeria 5.4.0.1__tar.gz → 5.4.0.3__tar.gz

{pyegeria-5.4.0.1 → pyegeria-5.4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.4.0.1
+Version: 5.4.0.3
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance
@@ -14,12 +14,14 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: click
 Requires-Dist: httpx
+Requires-Dist: inflect (>=7.5.0,<8.0.0)
 Requires-Dist: jupyter
 Requires-Dist: jupyter-notebook-parser (>=0.1.4,<0.2.0)
 Requires-Dist: loguru (>=0.7.3,<0.8.0)
 Requires-Dist: mermaid-py
 Requires-Dist: poetry-core (>=2.1.3,<3.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
+Requires-Dist: pydantic (>=2.11.7,<3.0.0)
 Requires-Dist: pytest (>=8.3.5,<9.0.0)
 Requires-Dist: requests
 Requires-Dist: rich

{pyegeria-5.4.0.1 → pyegeria-5.4.0.3}/commands/cat/__init__.py

@@ -2,6 +2,6 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 """
-from dr_egeria_md import process_markdown_file
+
 
 

{pyegeria-5.4.0.1 → pyegeria-5.4.0.3}/commands/cat/dr_egeria_md.py

@@ -28,9 +28,10 @@ from md_processing import (extract_command, process_glossary_upsert_command, pro
                            process_information_supply_chain_upsert_command,
                            process_information_supply_chain_link_unlink_command, process_sol_arch_list_command,
                            process_digital_product_upsert_command, process_agreement_upsert_command,
+                           process_collection_list_command, process_collection_upsert_command, process_link_agreement_item_command,
                            process_gov_definition_upsert_command, GOV_COM_LIST, GOV_LINK_LIST,
                            process_gov_def_link_detach_command, process_gov_definition_list_command,
-                           process_gov_def_context_command)
+                           process_gov_def_context_command, COLLECTIONS_LIST, SIMPLE_COLLECTIONS)
 from md_processing.md_commands.data_designer_commands import (process_data_spec_upsert_command,
                                                               process_data_dict_upsert_command,
                                                               process_data_collection_list_command,
@@ -190,14 +191,15 @@ def process_markdown_file(input_file: str, output_folder:str, directive: str, se
                 result = process_digital_product_upsert_command(client, current_block, directive)
             elif potential_command in ["Create Agreement", "Create Data Sharing Agreement", "Update Agreement", "Update Data Sharing Agreement"]:
                 result = process_agreement_upsert_command(client, current_block, directive)
+            elif potential_command in SIMPLE_COLLECTIONS:
+                result = process_collection_upsert_command(client, current_block, directive)
             elif potential_command in GOV_COM_LIST:
                 result = process_gov_definition_upsert_command(client, current_block, directive)
             elif potential_command in ['View Governance Definitions', 'List Governance Definitions',
                                        'View Gov Definitions', 'List Gov Definitions']:
                 result = process_gov_definition_list_command(client, current_block, directive)
-            elif potential_command in ['View Governance Definition Context', 'List Governance Definition Context',
-                                       'View Gov Definition Context', 'List Gov Definition Context']:
-                result = process_gov_def_context_command(client, current_block, directive)
+            elif potential_command in COLLECTIONS_LIST:
+                result = process_collection_list_command(client, current_block, directive)
 
 
 

{pyegeria-5.4.0.1 → pyegeria-5.4.0.3}/commands/cat/list_collections.py

@@ -18,43 +18,50 @@ from rich.table import Table
 from rich.text import Text
 
 from pyegeria import (
-    EgeriaTech,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response, NO_ELEMENTS_FOUND,
+    # EgeriaTech,
+    # InvalidParameterException,
+    # PropertyServerException,
+    # UserNotAuthorizedException,
+    CollectionManager,
+     NO_ELEMENTS_FOUND,config_logging, get_app_config
     )
+from pyegeria._exceptions_new import PyegeriaException, print_exception_response
 
-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", "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")
+
+
+# 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", "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"))
-EGERIA_GLOSSARY_PATH = os.environ.get("EGERIA_GLOSSARY_PATH", None)
-EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "../../")
-EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "md_processing/dr_egeria_inbox")
-EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "md_processing/dr_egeria_outbox")
+# EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
+# EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+# EGERIA_GLOSSARY_PATH = os.environ.get("EGERIA_GLOSSARY_PATH", None)
+# EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "../../")
+# EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "md_processing/dr_egeria_inbox")
+# EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "md_processing/dr_egeria_outbox")
+app_settings = get_app_config()
+app_config = app_settings["Environment"]
+config_logging()
 
 
 def display_collections(
     search_string: str = "*",
-    view_server: str = EGERIA_VIEW_SERVER,
-    view_url: str = EGERIA_VIEW_SERVER_URL,
+    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 = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config['Egeria Jupyter'],
+    width: int = app_config['Console Width'],
     output_format: str = "TABLE"
 ):
     """Display either a specified glossary or all collections if the search_string is '*'.
@@ -77,7 +84,7 @@ def display_collections(
     output_format : str, optional
         Format of the output. Default is TABLE.
     """
-    m_client = EgeriaTech(view_server, view_url, user_id=user, user_pwd=user_pass)
+    m_client = CollectionManager(view_server, view_url, user_id=user, user_pwd=user_pass)
     m_client.create_egeria_bearer_token()
     try:
 
@@ -93,7 +100,7 @@ def display_collections(
             action = "List"
 
         if output_format != "TABLE":
-            file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH)
+            file_path = os.path.join(app_config['Pyegeria Root'], app_config['Dr.Egeria Outbox'])
             if output_format == "HTML":
                 file_name = f"Collections-{time.strftime('%Y-%m-%d-%H-%M-%S')}-{action}.html"
             else:
@@ -144,6 +151,7 @@ def display_collections(
                 collections, key=lambda k: k["display_name"]
             )
             for collection in sorted_collection_list:
+
                 display_name = collection["display_name"]
                 qualified_name = collection["qualified_name"]
                 guid = collection["GUID"]
@@ -180,9 +188,7 @@ def display_collections(
             print("==> No collections with that name found")
 
     except (
-        InvalidParameterException,
-        UserNotAuthorizedException,
-        PropertyServerException,
+        PyegeriaException
     ) as e:
         print_exception_response(e)
     finally:
@@ -197,23 +203,28 @@ def main():
     parser.add_argument("--password", help="User Password")
 
     args = parser.parse_args()
+    app_settings = get_app_config()
+    app_config = app_settings["Environment"]
 
-    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:
         search_string = Prompt.ask(
-            "Enter the collection you are searching for or '*' for all:", default="*"
+            "Enter the collection you are looking for or '*' for all:", default="*"
         ).strip()
-        output_format = Prompt.ask("What output format do you want?", choices=["DICT", "TABLE", "FORM", "REPORT", "HTML", "LIST"], default="TABLE")
+        output_format = Prompt.ask("Which output format do you want?", choices=["DICT", "TABLE", "FORM", "REPORT", "HTML", "LIST"], default="TABLE")
 
         display_collections(search_string, server, url, userid, user_pass, output_format = output_format)
 
     except KeyboardInterrupt:
         pass
 
+    except PyegeriaException as e:
+        print_exception_response(e)
+
 
 if __name__ == "__main__":
     main()