pyegeria 5.4.2.3__py3-none-any.whl → 5.4.3.1__py3-none-any.whl

md_processing/md_processing_utils/common_md_proc_utils.py

@@ -70,6 +70,9 @@ def parse_upsert_command(egeria_client: EgeriaTech, object_type: str, object_act
     labels = {}
 
     command_spec = get_command_spec(f"Create {object_type}")
+    if command_spec is None:
+        logger.error("Command not found in command spec")
+        raise Exception("Command not found in command spec")
     attributes = command_spec.get('Attributes', [])
     command_display_name = command_spec.get('display_name', None)
     command_qn_prefix = command_spec.get('qn_prefix', None)
@@ -378,20 +381,20 @@ def parse_view_command(egeria_client: EgeriaTech, object_type: str, object_actio
 
                 parsed_output['guid'] = parsed_attributes[key].get('guid', None)
                 parsed_output['qualified_name'] = parsed_attributes[key].get('qualified_name', None)
-                parsed_output['exists'] = parsed_attributes[key]['exists']
-                if parsed_attributes[key]['valid'] is False:
+                parsed_output['exists'] = parsed_attributes.get(key,{}).get('exists',None)
+                if parsed_attributes.get(key,{}).get('valid',None) is False:
                     parsed_output['valid'] = False
-                    parsed_output['reason'] += parsed_attributes[key]['reason']
+                    parsed_output['reason'] += parsed_attributes.get(key,{}).get('reason',None)
 
             elif style == 'Reference Name':
                 parsed_attributes[key] = proc_ids(egeria_client, key, labels, txt, object_action, if_missing)
                 if ((if_missing == ERROR) and parsed_attributes[key].get("value", None) is None):
-                    msg = f"Required parameter `{parsed_attributes[key]['value']}` is missing"
+                    msg = f"Required parameter `{parsed_attributes.get(key,{}).get('value',None)}` is missing"
                     logger.error(msg)
                     parsed_output['valid'] = False
                     parsed_output['reason'] += msg
-                elif parsed_attributes[key]['value'] and parsed_attributes[key]['exists'] is False:
-                    msg = f"Reference Name `{parsed_attributes[key]['value']}` is specified but does not exist"
+                elif parsed_attributes.get(key,{}).get('value',None) and parsed_attributes.get(key,{}).get('exists',None) is False:
+                    msg = f"Reference Name `{parsed_attributes.get(key,{}).get('value',None)}` is specified but does not exist"
                     logger.error(msg)
                     parsed_output['valid'] = False
                     parsed_output['reason'] += msg

md_processing/md_processing_utils/common_md_utils.py

@@ -55,16 +55,6 @@ ALL_GOVERNANCE_DEFINITIONS = GENERAL_GOVERNANCE_DEFINITIONS + GOVERNANCE_CONTROL
 debug_level = DEBUG_LEVEL
 global COMMAND_DEFINITIONS
 
-# def setup_log():
-#     logger.remove()
-#     logger.add(sys.stderr, level="SUCCESS", format=CONSOLE_LOG_FORMAT, colorize=True)
-#     full_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_INBOX_PATH, "data_designer_debug.log")
-#     # logger.add(full_file_path, rotation="1 day", retention="1 week", compression="zip", level="TRACE", format=log_format,
-#     #            colorize=True)
-#     logger.add("debug_log", rotation="1 day", retention="1 week", compression="zip", level="INFO", format=LOG_FORMAT,
-#                colorize=True)
-
-
 def split_tb_string(input: str)-> [Any]:
     """Split the string and trim the items"""
     l = [item.strip() for item in re.split(r'[;,\n]+',input)] if input is not None else None
@@ -294,9 +284,21 @@ def set_update_body(object_type: str, attributes: dict)->dict:
       "mergeUpdate": attributes.get('Merge Update', {}).get('value', True),
       "properties": "",
     }
+def set_rel_prop_body(object_type: str, attributes: dict)->dict:
+    prop_name = object_type.replace(" ", "")
+    display_name = attributes.get('Display Name', {}).get('value', None)
 
-def set_prop_body(object_type: str, qualified_name: str, attributes: dict)->dict:
+    return {
+        "class": prop_name + "Properties",
+        "description": attributes['Description'].get('value', None),
+        "label": attributes.get('Label', {}).get('value', None),
+        "typeName" : attributes.get('Type Name', {}).get('value', None),
+        "effectiveFrom": attributes.get('Effective From', {}).get('value', None),
+        "effectiveTo": attributes.get('Effective To', {}).get('value', None),
+        "extendedProperties": attributes.get('Extended Properties', {}).get('value', None),
+        }
 
+def set_element_prop_body(object_type: str, qualified_name: str, attributes: dict)->dict:
     prop_name = object_type.replace(" ", "")
     display_name = attributes.get('Display Name', {}).get('value', None)
 
@@ -318,7 +320,7 @@ def set_prop_body(object_type: str, qualified_name: str, attributes: dict)->dict
         }
 
 def set_product_body(object_type: str, qualified_name: str, attributes: dict)->dict:
-    prop_bod = set_prop_body(object_type, qualified_name, attributes)
+    prop_bod = set_element_prop_body(object_type, qualified_name, attributes)
     prop_bod["identifier"] = attributes.get('Identifier', {}).get('value', None)
     prop_bod["productName"] = attributes.get('Product Name', {}).get('value', None)
     prop_bod["maturity"] = attributes.get('Maturity', {}).get('value', None)
@@ -341,7 +343,7 @@ def set_update_status_body(object_type: str, attributes: dict)->dict:
 
 def set_gov_prop_body(object_type: str, qualified_name: str, attributes: dict)->dict:
     prop_name = object_type.replace(" ", "")
-    prop_bod = set_prop_body(object_type, qualified_name, attributes)
+    prop_bod = set_element_prop_body(object_type, qualified_name, attributes)
     prop_bod["domainIdentifier"] = attributes.get('Domain Identifier', {}).get('value', None)
     prop_bod["displayName"]= attributes.get('Display Name', {}).get('value', None)
     prop_bod['qualifiedName'] = qualified_name

md_processing/md_processing_utils/extraction_utils.py

@@ -92,11 +92,20 @@ def extract_attribute(text: str, labels: set) -> str | None:
     for label in labels:
         # Construct pattern for the current label
         # text = re.sub(r'\s+', ' ', text).strip() # just added
-        text = re.sub(r'\n\n+', '\n\n', text).strip()
+        # text = re.sub(r'\n\n+', '\n\n', text).strip()
 
-        label = label.strip()
-        pattern = rf"##\s*{re.escape(label)}\s*\n(?:\s*\n)*?(.*?)(?:#|___|$)"
+        # Replace multiple spaces or tabs with a single space
+        normalized = re.sub(r'\s+', ' ', text)
+        # Collapse multiple blank lines into a single one
+        normalized = re.sub(r'\n\s*\n', '\n', normalized).strip()
 
+        # label = label.strip()
+        # pattern = rf"##\s*{re.escape(label)}\s*\n(?:\s*\n)*?(.*?)(?:#|___|$)"
+        # Normalize the label
+        normalized_label = re.sub(r'\s+', ' ', label.strip())
+
+        # Construct the regex pattern
+        pattern = rf"##\s*{re.escape(normalized_label)}\s*\n(?:\s*\n)*?(.*?)(?:#|___|$)"
         # pattern = rf"##\s+{re.escape(label)}\n(.*?)(?:#|___|$)"  # modified from --- to enable embedded tables
         match = re.search(pattern, text, re.DOTALL)
         if match:

md_processing/md_processing_utils/md_processing_constants.py

@@ -144,8 +144,8 @@ command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term
                 "Link Information Supply Chain Peers", "Link Supply Chains", "Link Information Supply Chains",
                 "Unlink Information Supply Chain Peers", "Unlink Information Supply Chains", "Unlink Supply Chains",
                 "Create Solution Component", "Update Solution Component", "Link Solution Components", "Wire Solution Components",
-                "Detach Solution Components", "Unlink Solution Components", "Create Term-Term Relationship",
-                "Update Term-Term Relationship", "Create Data Spec", "Create Data Specification", "Update Data Spec",
+                "Detach Solution Components", "Unlink Solution Components", "Link Term-Term Relationship", "Link Terms", "Detach Terms",
+                "Detach Term-Term Relationship", "Create Data Spec", "Create Data Specification", "Update Data Spec",
                 "Update Data Specification", "Create Data Field", "Update Data Field", "Create Data Structure",
                 "Update Data Structure", "Create Data Dictionary", "Update Data Dictionary", "Create Data Dict",
                 "Update Data Dict",
@@ -251,7 +251,8 @@ def does_command_match(command: str, alt_names: list[str]) -> bool:
     for primary_verb, synonyms in verbs_synonyms.items():
         for synonym in synonyms:
             for alt_name in alt_names:
-                if f"{synonym} {alt_name}" == command:
+                tst = f"{synonym} {alt_name}"
+                if tst == command:
                     return True
     return False
 
@@ -266,7 +267,7 @@ def find_alternate_names(command: str) -> str | None:
             verb = command.split()[0] if command else ""
             normalized_command = " ".join(command.split())
             # normalized_alternates = (" ".join(s.split()) for s in v)
-            if (command in v):
+            if (normalized_command in v):
                 return key
             elif does_command_match(normalized_command, v):
                 return key

pyegeria/__init__.py

@@ -17,7 +17,7 @@ from ._globals import (INTEGRATION_GUIDS, TEMPLATE_GUIDS, default_time_out, disa
                        NO_CATALOGS_FOUND, NO_GLOSSARIES_FOUND, NO_TERMS_FOUND, NO_CATEGORIES_FOUND, NO_ELEMENT_FOUND,
                        NO_PROJECTS_FOUND, DEBUG_LEVEL, NO_COLLECTION_FOUND, NO_GUID_RETURNED)
 
-from ._output_formats import select_output_format_set
+
 
 if disable_ssl_warnings:
     from urllib3 import disable_warnings
@@ -67,6 +67,7 @@ from .valid_metadata_omvs import ValidMetadataManager
 from .x_action_author_omvs import ActionAuthor
 from .template_manager_omvs import TemplateManager
 from .data_designer import DataDesigner
+from ._output_formats import select_output_format_set
 #
 global template_guids, integration_guids