pyegeria 5.3.7.7__tar.gz → 5.3.7.8__tar.gz

{pyegeria-5.3.7.7 → pyegeria-5.3.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.3.7.7
+Version: 5.3.7.8
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance

{pyegeria-5.3.7.7 → pyegeria-5.3.7.8}/pyegeria/__init__.py

@@ -93,7 +93,8 @@ from .x_action_author_omvs import ActionAuthor
 from .md_processing_utils import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
                                   process_categories_upsert_command,
                                   get_current_datetime_string, process_per_proj_upsert_command, command_list,
-                                  render_markdown, process_provenance_command, process_blueprint_upsert_command)
+                                  render_markdown, process_provenance_command, process_blueprint_upsert_command,
+                                  process_solution_component_upsert_command)
 
 #
 # The following assignments were generated by the `create_tech_guid_lists.py` utility that uses the pyegeria functions

{pyegeria-5.3.7.7 → pyegeria-5.3.7.8}/pyegeria/_client.py

@@ -770,7 +770,8 @@ class Client:
         )
         return result
 
-    def __create_qualified_name__(self, type: str, display_name: str, local_qualifier: str = None) -> str:
+    def __create_qualified_name__(self, type: str, display_name: str, local_qualifier: str = None,
+                                  version_identifier: str = None) -> str:
         """Helper function to create a qualified name for a given type and display name.
            If present, the local qualifier will be prepended to the qualified name."""
         EGERIA_LOCAL_QUALIFIER = os.environ.get("EGERIA_LOCAL_QUALIFIER", local_qualifier)
@@ -778,6 +779,8 @@ class Client:
         q_name = f"{type}:{display_name}"
         if EGERIA_LOCAL_QUALIFIER:
             q_name = f"{EGERIA_LOCAL_QUALIFIER}:{q_name}"
+        if version_identifier:
+            q_name = f"{q_name}:{version_identifier}"
         return q_name
 
 if __name__ == "__main__":

{pyegeria-5.3.7.7 → pyegeria-5.3.7.8}/pyegeria/commands/cat/dr_egeria_md.py

@@ -13,11 +13,11 @@ import click
 from pyegeria import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
                       process_categories_upsert_command, process_provenance_command,
                       get_current_datetime_string, process_per_proj_upsert_command, command_list,EgeriaTech,
-                      process_blueprint_upsert_command
+                      process_blueprint_upsert_command, process_solution_component_upsert_command,
+                      shared_state
                       )
 from datetime import datetime
 
-
 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")
@@ -86,11 +86,11 @@ def process_markdown_file(
     h1_blocks = []
     current_block = ""
     in_h1_block = False
-    element_dictionary = {}
+
 
     # Helper function to process the current block
     def process_current_block(current_block):
-        nonlocal updated, final_output, prov_found, prov_output, h1_blocks, in_h1_block, element_dictionary
+        nonlocal updated, final_output, prov_found, prov_output, h1_blocks, in_h1_block
 
         if not current_block:
             return  # No block to process
@@ -103,26 +103,30 @@ def process_markdown_file(
                 prov_found = True
 
             elif potential_command in ["Create Glossary", "Update Glossary"]:
-                result = process_glossary_upsert_command(client, element_dictionary, current_block, directive)
+                result = process_glossary_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
             elif potential_command in ["Create Category", "Update Category"]:
-                result = process_categories_upsert_command(client, element_dictionary, current_block, directive)
+                result = process_categories_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
             elif potential_command in ["Create Term", "Update Term"]:
-                result = process_term_upsert_command(client, element_dictionary, current_block, directive)
+                result = process_term_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
             elif potential_command in ["Create Personal Project", "Update Personal Project"]:
-                result = process_per_proj_upsert_command(client, element_dictionary, current_block, directive)
+                result = process_per_proj_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
             elif potential_command in ["Create Blueprint", "Update Blueprint", "Create Solution Blueprint", "Update Solution Blueprint"]:
-                result = process_blueprint_upsert_command(client, element_dictionary, current_block, directive)
+                result = process_blueprint_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
+            elif potential_command in ["Create Solution Component", "Update Solution Component"]:
+                result = process_solution_component_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
+
+
             else:
                 # If command is not recognized, keep the block as-is
                 result = None
-
+            print(json.dumps(shared_state.get_element_dictionary(), indent=4))
             if result:
                 if directive == "process":
                     updated = True
                     final_output.append(result)
-                    # print(json.dumps(element_dictionary, indent=4))
+                    print(json.dumps(shared_state.get_element_dictionary(), indent=4))
                 elif directive == "validate":
-                    print(json.dumps(element_dictionary, indent=4))
+                    print(json.dumps(shared_state.get_element_dictionary(), indent=4))
             elif directive == "process":
                 # Handle errors (skip this block but notify the user)
                 print(f"\n==>\tErrors found while processing command: \'{potential_command}\'\n"

{pyegeria-5.3.7.7 → pyegeria-5.3.7.8}/pyegeria/commands/cat/get_project_dependencies.py

@@ -109,7 +109,7 @@ def project_dependency_viewer(
                 child_md = ""
                 child_guid = proj["elementHeader"]["guid"]
                 child_name = proj["properties"]["name"]
-                relationship = proj["relatedElement"]["relationshipHeader"]["type"][
+                relationship = proj["startingElement"]["relationshipHeader"]["type"][
                     "typeName"
                 ]
                 if relationship != "ProjectDependency":

{pyegeria-5.3.7.7 → pyegeria-5.3.7.8}/pyegeria/commands/cat/get_project_structure.py

@@ -109,7 +109,7 @@ def project_structure_viewer(
                 child_md = ""
                 child_guid = proj["elementHeader"]["guid"]
                 child_name = proj["properties"]["name"]
-                relationship = proj["relatedElement"]["relationshipHeader"]["type"][
+                relationship = proj["startingElement"]["relationshipHeader"]["type"][
                     "typeName"
                 ]
                 if relationship != "ProjectHierarchy":

{pyegeria-5.3.7.7 → pyegeria-5.3.7.8}/pyegeria/glossary_manager_omvs.py

@@ -936,7 +936,7 @@ class GlossaryManager(GlossaryBrowser):
                             continue
 
                 # Add the term
-                term_qualified_name = self.__create_qualified_name__("Term", display_name),
+                term_qualified_name = self.__create_qualified_name__("Term", term_name)
 
                 body = {
                     "class": "ReferenceableRequestBody",

pyegeria-5.3.7.8/pyegeria/md_processing_helpers.py

@@ -0,0 +1,58 @@
+#
+# from typing import List, Optional
+#
+# import os
+# import re
+#
+# from rich import box, print
+# from rich.console import Console
+# from rich.markdown import Markdown
+#
+# from pyegeria import body_slimmer
+# from pyegeria._globals import NO_TERMS_FOUND, NO_GLOSSARIES_FOUND, NO_TERMS_FOUND, NO_ELEMENTS_FOUND, NO_PROJECTS_FOUND, NO_CATEGORIES_FOUND
+# from pyegeria.egeria_tech_client import EgeriaTech
+# from pyegeria.md_processing_utils import extract_attribute, get_element_by_name, process_element_identifiers
+# from pyegeria.project_manager_omvs import ProjectManager
+# from pyegeria.glossary_manager_omvs import GlossaryManager
+# ERROR = "ERROR-> "
+# INFO = "INFO- "
+# WARNING = "WARNING-> "
+# pre_command = "\n---\n==> Processing command:"
+#
+#
+#
+# def process_q_name_list(egeria_client: EgeriaTech, element_type:str, txt:str )-> tuple[str | None,list | None,str | None,bool,bool]:
+#     msg = ""
+#     known_guid = None
+#     valid = True
+#     exists = False
+#     elements = ""
+#     new_element_list = []
+#
+#     elements_txt = extract_attribute(txt, [element_type])
+#
+#     if elements_txt is None:
+#         msg += f"* {INFO}No {element_type}s found\n"
+#
+#     else:
+#         element_list = re.split(r'[,\n]+', elements_txt)
+#
+#         for element in element_list:
+#             element_el = element.strip()
+#
+#                 # Get the element using the generalized function
+#             known_q_name, known_guid, status_msg, el_valid, el_exists = get_element_by_name(
+#                 egeria_client, element_type,txt)
+#             msg += status_msg
+#             if exists and valid:
+#                 elements = f"{element_el}, {elements}" # list of the input names
+#                 new_element_list.append(known_q_name) # list of qualified names
+#             valid = valid and el_valid
+#             exists = exists and el_exists
+#
+#         if elements:
+#             elements += "\n"
+#             msg += f"* {INFO}Found {element_type}s: {elements}"
+#         else:
+#             msg += f"* {INFO}List contains one or more invalid elements.\n"
+#         return elements,new_element_list, msg, valid, exists