pyegeria 5.4.7.6__py3-none-any.whl → 5.4.7.8__py3-none-any.whl

pyegeria/format_set_executor.py

@@ -151,7 +151,22 @@ async def _async_run_report(
             raise TypeError(
                 f"Resolved function '{method_name}'  not found in client class '{client_class.__name__}' is not callable."
             )
-        token = await egeria_client._async_create_egeria_bearer_token(user_name, user_pwd)
+        # Only (re)create a bearer token if one is not already set on the client.
+        try:
+            existing_token = None
+            if hasattr(egeria_client, "get_token"):
+                existing_token = egeria_client.get_token()
+            if not existing_token:
+                print("DEBUG: No existing bearer token; attempting async creation...", file=sys.stderr)
+                if user_name and user_pwd:
+                    await egeria_client._async_create_egeria_bearer_token(user_name, user_pwd)
+                else:
+                    print("DEBUG: Missing credentials; skipping token creation and relying on pre-initialized token.", file=sys.stderr)
+            else:
+                print("DEBUG: Using existing bearer token.", file=sys.stderr)
+        except Exception as auth_err:
+            # Do not fail the entire call if token refresh fails; downstream call may still work
+            print(f"DEBUG: Token creation/lookup issue: {auth_err}", file=sys.stderr)
         result = await func(**call_params)
 
         if not result or result == NO_ELEMENTS_FOUND:

pyegeria/mcp_server.py

@@ -141,11 +141,7 @@ def main() -> None:
                     params=params),
                 timeout=30  # Adjust timeout as needed
             )
-            # result = await _async_run_report_tool(
-            #     report=report_name,
-            #     egeria_client=egeria_client,
-            #     params=params
-            # )
+
             print("DEBUG: run_report completed successfully", file=sys.stderr)
             return _ok(result)
         except Exception as e:

pyegeria/mermaid_utilities.py

@@ -46,7 +46,7 @@ def load_mermaid():
     <script>
         document.addEventListener('DOMContentLoaded', function() {
             mermaid.initialize({startOnLoad: true},
-            {maxTextSize: 300000});
+            {maxTextSize: 300000}, {securityLevel: 'loose'});
         });
     </script>
 

pyegeria/output_formatter.py

@@ -18,12 +18,14 @@ This function and related data structures have been moved back to _output_format
 Please import select_output_format_set from pyegeria._output_formats instead of from this module.
 """
 
-Console = Console(width=settings.Environment.console_width)
+console = Console(width=settings.Environment.console_width)
 
 
 def _extract_referenceable_properties(element: dict[str, Any]) -> dict[str, Any]:
     # Get general header attributes
-    guid = element['elementHeader'].get("guid", None)
+    guid = element.get('elementHeader', {}).get("guid", None)
+    if guid is None:
+        return {}
     metadata_collection_id = element['elementHeader']['origin'].get("homeMetadataCollectionId", None)
     metadata_collection_name = element['elementHeader']['origin'].get("homeMetadataCollectionName", None)
     origin_category = element['elementHeader'].get("origin_category", None)
@@ -197,13 +199,13 @@ def make_md_attribute(attribute_name: str, attribute_value: str, output_type: st
         attribute_title = ""
 
     if output_type in ["FORM", "MD"]:
-        if attribute_name.lower() in [ "mermaid", "links", "implemented by", "sub_components"]:
+        if attribute_name.lower() in [ "mermaid", "solutionBlueprintMermaidGraph", "links", "implemented by", "sub_components"]:
             return '\n'
 
         output = f"## {attribute_title}\n{attribute_value}\n\n"
     elif output_type in ["REPORT", "MERMAID"]:
-        if attribute_title in ['Mermaid Graph', 'Mermaid']:
-            output = f"## Mermaid Graph\n\n```mermaid\n{attribute_value}\n```\n"
+        if attribute_title in ['Mermaid Graph', 'Mermaid', 'Solution Blueprint Mermaid Graph']:
+            output = f"## {attribute_title}\n\n```mermaid\n{attribute_value}\n```\n"
         elif attribute_value:
             output = f"## {attribute_title}\n{attribute_value}\n\n"
     return output
@@ -863,7 +865,7 @@ def extract_mermaid_only(elements: Union[Dict, List[Dict]]) -> Union[str, List[s
     result = []
     for element in elements:
         mer = element.get('mermaidGraph', "---")
-        mer_out = f"\n\n```mermaid\n{mer}\n\n```" if mer else "---"
+        mer_out = f"\n\n```mermaid\n{mer}\n```" if mer else "---"
         result.append(mer_out)
     return result