pyegeria 5.3.4.14__tar.gz → 5.3.4.15__tar.gz

{pyegeria-5.3.4.14 → pyegeria-5.3.4.15}/PKG-INFO

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

{pyegeria-5.3.4.14 → pyegeria-5.3.4.15}/pyegeria/mermaid_utilities.py

@@ -236,18 +236,16 @@ def construct_mermaid_html(mermaid_str: str) -> str:
             """ if title_label else ""
 
     html_content = f"""
-        <style>
-        /* Style the diagram container */
+    <style>
         .diagram-container {{
             position: relative;
             width: 90%; /* Adjust container width */
             height: 500px; /* Fixed height */
-            margin: 0 auto;
+            margin: 20px auto;
             border: 1px solid #ccc;
             overflow: hidden; /* Prevents content overflow */
         }}
 
-        /* Style custom zoom controls */
         .svg-pan-zoom-controls {{
             position: absolute;
             top: 10px;
@@ -255,7 +253,7 @@ def construct_mermaid_html(mermaid_str: str) -> str:
             display: flex;
             flex-direction: column;
             gap: 5px;
-            z-index: 10; /* Ensures controls are above other elements */
+            z-index: 10;
         }}
 
         .svg-pan-zoom-controls button {{
@@ -273,23 +271,16 @@ def construct_mermaid_html(mermaid_str: str) -> str:
     </style>
 
     <div id="{graph_id}-container" class="diagram-container">
-        <!-- Title/Heading (optional; include as needed) -->
-        {header_html}
-        <!-- Mermaid rendering area -->
         <div id="{graph_id}" class="mermaid">
             {mermaid_code}
         </div>
     </div>
 
-    <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/svg-pan-zoom@3.6.1/dist/svg-pan-zoom.min.js"></script>
-
     <script>
         (function() {{
             const graph_id = "{graph_id}";
-            let panZoomInstance; // Store reference to the panZoom instance
+            let panZoomInstance; // Reference for svg-pan-zoom instance
 
-            // Function to initialize Mermaid
             function initializeMermaid(graph_id) {{
                 const container = document.getElementById(`${{graph_id}}-container`);
                 const diagram = document.getElementById(`${{graph_id}}`);
@@ -303,15 +294,16 @@ def construct_mermaid_html(mermaid_str: str) -> str:
                 mermaid.initialize({{ startOnLoad: false }});
                 mermaid.init(undefined, diagram);
 
-                // Set a small delay to allow Mermaid rendering to complete before initializing Pan-Zoom
+                // Set a small delay to allow Mermaid rendering to complete
                 setTimeout(() => {{
                     const svg = container.querySelector("svg");
+
                     if (!svg) {{
                         console.error(`SVG not found for graph ID "${{graph_id}}"`);
                         return;
                     }}
 
-                    // Force the SVG to fit the container by setting width, height, and viewBox
+                    // Force SVG to fit the container
                     svg.setAttribute("width", "100%");
                     svg.setAttribute("height", "100%");
                     svg.setAttribute("preserveAspectRatio", "xMidYMid meet");
@@ -322,10 +314,10 @@ def construct_mermaid_html(mermaid_str: str) -> str:
                         svg.setAttribute("viewBox", `0 0 ${{bbox.width}} ${{bbox.height}}`);
                     }}
 
-                    // Initialize Pan-Zoom functionality
+                    // Initialize Pan-Zoom
                     panZoomInstance = svgPanZoom(svg, {{
                         zoomEnabled: true,
-                        controlIconsEnabled: false, // Use custom controls
+                        controlIconsEnabled: false, // Custom controls
                         fit: true,
                         center: true,
                         contain: true,
@@ -333,7 +325,7 @@ def construct_mermaid_html(mermaid_str: str) -> str:
                         maxZoom: 10
                     }});
 
-                    // Add custom controls
+                    // Add controls
                     const controlsContainer = document.createElement("div");
                     controlsContainer.className = "svg-pan-zoom-controls";
                     controlsContainer.innerHTML = `
@@ -343,7 +335,7 @@ def construct_mermaid_html(mermaid_str: str) -> str:
                     `;
                     container.appendChild(controlsContainer);
 
-                    // Add event listeners for the controls
+                    // Attach control event listeners
                     document.getElementById(`${{graph_id}}-zoom-in`).addEventListener("click", () => {{
                         if (panZoomInstance) panZoomInstance.zoomIn();
                     }});
@@ -356,21 +348,46 @@ def construct_mermaid_html(mermaid_str: str) -> str:
                             panZoomInstance.center();
                         }}
                     }});
-                }}, 500); // Delay of 500ms for Mermaid and SVG rendering
+                }}, 500); // Delay for Mermaid and SVG rendering
             }}
 
-            // Load Mermaid.js if not already loaded
-            if (typeof mermaid === "undefined") {{
-                const script = document.createElement("script");
-                script.src = "https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js";
-                script.onload = () => initializeMermaid(graph_id);
-                document.head.appendChild(script);
+            // Check if Mermaid and SVG-Pan-Zoom are loaded
+            const loadMermaid = typeof mermaid === "undefined";
+            const loadSvgPanZoom = typeof svgPanZoom === "undefined";
+
+            if (loadMermaid || loadSvgPanZoom) {{
+                const promises = [];
+
+                // Load Mermaid.js if not already loaded
+                if (loadMermaid) {{
+                    promises.push(new Promise((resolve) => {{
+                        const script = document.createElement("script");
+                        script.src = "https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js";
+                        script.onload = resolve;
+                        document.head.appendChild(script);
+                    }}));
+                }}
+
+                // Load SVG-Pan-Zoom if not already loaded
+                if (loadSvgPanZoom) {{
+                    promises.push(new Promise((resolve) => {{
+                        const script = document.createElement("script");
+                        script.src = "https://cdn.jsdelivr.net/npm/svg-pan-zoom@3.6.1/dist/svg-pan-zoom.min.js";
+                        script.onload = resolve;
+                        document.head.appendChild(script);
+                    }}));
+                }}
+
+                Promise.all(promises).then(() => initializeMermaid(graph_id));
             }} else {{
                 initializeMermaid(graph_id);
             }}
         }})();
     </script>
-    """
+
+        """
+
+
 
 
     return html_content

{pyegeria-5.3.4.14 → pyegeria-5.3.4.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "5.3.4.14"
+version = "5.3.4.15"
 
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]