pyegeria 5.3.9.9.7__py3-none-any.whl → 5.4.0.dev2__py3-none-any.whl

pyegeria/output_formatter.py

@@ -26,11 +26,12 @@ def make_preamble(obj_type: str, search_string: str, output_format: str = 'MD')
             - A string or None indicating the action description for the elements,
               depending on the output format.
     """
-    search_string = search_string if search_string else "All Elements"
+    # search_string = search_string if search_string else "All Elements"
     elements_action = "Update " + obj_type
     if output_format == "FORM":
-        preamble = (f"\n# Update {obj_type} Form - created at {datetime.now().strftime('%Y-%m-%d %H:%M')}\n"
-                    f"\t {obj_type} found from the search string:  `{search_string}`\n\n")
+        preamble = f"\n# Update {obj_type} Form - created at {datetime.now().strftime('%Y-%m-%d %H:%M')}\n"
+        if search_string:
+            preamble +=  f"\t {obj_type} found from the search string:  `{search_string}`\n\n"
         return preamble, elements_action
     elif output_format == "REPORT":
         elements_md = (f"# {obj_type} Report - created at {datetime.now().strftime('%Y-%m-%d %H:%M')}\n"
@@ -53,12 +54,15 @@ def make_md_attribute(attribute_name: str, attribute_value: str, output_type: st
         str: Formatted markdown for the attribute
     """
     output = ""
-    attribute_value = attribute_value.strip() if attribute_value else ""
+    if isinstance(attribute_value,str):
+        attribute_value = attribute_value.strip() if attribute_value else ""
     attribute_title = attribute_name.title() if attribute_name else ""
     if output_type in ["FORM", "MD"]:
         output = f"## {attribute_title}\n{attribute_value}\n\n"
     elif output_type == "REPORT":
-        if attribute_value:
+        if attribute_title == 'Mermaid Graph':
+            output = f"## Mermaid Graph\n```mermaid\n{attribute_value}\n```\n"
+        elif attribute_value:
             output = f"## {attribute_title}\n{attribute_value}\n\n"
     return output
 
@@ -101,6 +105,8 @@ def generate_entity_md(elements: List[Dict],
     elements_md = ""
 
     for element in elements:
+        if element is None:
+            continue
         props = extract_properties_func(element)
 
         # Get additional properties if function is provided
@@ -227,6 +233,8 @@ def generate_entity_dict(elements: List[Dict],
     result = []
 
     for element in elements:
+        if element is None:
+            continue
         props = extract_properties_func(element)
 
         # Get additional properties if function is provided
@@ -289,10 +297,12 @@ def extract_basic_dict(elements: Union[Dict, List[Dict]]) -> Union[Dict, List[Di
         # Add classifications if present
         classifications = elements['elementHeader'].get('classifications', [])
         if classifications:
-            classification_names = ""
+            classification_names = "["
             for classification in classifications:
-                classification_names += f"* {classification['classificationName']}\n"
-            body['classification_names'] = classification_names
+                if len(classification_names) > 1:
+                    classification_names += ", "
+                classification_names += f"{classification['classificationName']}"
+            body['classification_names'] = classification_names + ']'
 
         return body
 
@@ -305,10 +315,12 @@ def extract_basic_dict(elements: Union[Dict, List[Dict]]) -> Union[Dict, List[Di
         # Add classifications if present
         classifications = element['elementHeader'].get('classifications', [])
         if classifications:
-            classification_names = ""
+            classification_names = "["
             for classification in classifications:
-                classification_names += f"* {classification['classificationName']}\n"
-            body['classifications'] = classification_names
+                if len(classification_names) > 1:
+                    classification_names += ", "
+                classification_names += f"{classification['classificationName']}"
+            body['classifications'] = classification_names + ']'
 
         result.append(body)
     return result
@@ -370,7 +382,7 @@ def generate_output(elements: Union[Dict, List[Dict]],
             output_format=output_format
         )
 
-    else:  # MD, FORM, REPORT
+    else:  #  MD, FORM, REPORT
         elements_md, elements_action = make_preamble(
             obj_type=entity_type,
             search_string=search_string,