pyegeria 5.3.4.7.dev1__tar.gz → 5.3.4.7.dev3__tar.gz

{pyegeria-5.3.4.7.dev1 → pyegeria-5.3.4.7.dev3}/PKG-INFO

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

{pyegeria-5.3.4.7.dev1 → pyegeria-5.3.4.7.dev3}/pyegeria/mermaid_utilities.py

@@ -13,6 +13,7 @@ These functions have been tested in a Jupyter notebook - but may work in other e
 import html
 import os
 import time
+import uuid
 
 import nest_asyncio
 
@@ -231,7 +232,7 @@ def construct_mermaid_html(mermaid_str: str) -> str:
     """
     title_label, guid, mermaid_code = parse_mermaid_code(mermaid_str)
 
-    graph_id = title_label.replace(" ", "_")
+    graph_id = f"mermaid-graph-{guid}"
     escaped_header = html.escape(title_label) if title_label else ""  # Sanitize the header safely
     escaped_mermaid_code = html.escape(mermaid_code)
 
@@ -251,7 +252,6 @@ def construct_mermaid_html(mermaid_str: str) -> str:
          style="width: 90%; max-width: 800px; margin: auto; padding: 20px; 
                 background: white; border: 1px solid #ddd; 
                 border-radius: 12px; position: relative;">
-        {header_html}
         <div class="pan-zoom-container" 
              style="width: 100%; height: 500px; overflow: hidden; 
                     position: relative; background: #f9f9f9; 
@@ -262,27 +262,31 @@ def construct_mermaid_html(mermaid_str: str) -> str:
             </div>
         </div>
     </div>
-
     <script>
         (function() {{
-            // Check if Mermaid.js is already loaded; load if not
+            // Ensure Mermaid.js is 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();
+                script.onload = () => renderGraph();
                 document.head.appendChild(script);
             }} else {{
-                initializeMermaid();
+                renderGraph();
             }}
 
-            function initializeMermaid() {{
-                // Re-render the Mermaid chart
+            function renderGraph() {{
+                // Render the Mermaid graph
                 mermaid.initialize({{ startOnLoad: true }});
-                mermaid.init(undefined, document.querySelector("#pz-{graph_id}"));
+                mermaid.init(undefined, `#pz-{graph_id}`);
+
+                // Pan and Zoom Variables
+                const container = document.querySelector(`#{graph_id}-container .pan-zoom-container`);
+                const content = document.querySelector(`#{graph_id}-container .pan-zoom-content`);
 
-                // Add interactivity for pan and zoom
-                const container = document.querySelector('.pan-zoom-container');
-                const content = document.querySelector('.pan-zoom-content');
+                if (!container || !content) {{
+                    console.error("Pan/Zoom container or content not found");
+                    return;
+                }}
 
                 let scale = 1;  // Current zoom level
                 let panX = 0;   // X-axis pan
@@ -300,70 +304,61 @@ def construct_mermaid_html(mermaid_str: str) -> str:
                     const containerRect = container.getBoundingClientRect();
                     const rect = content.getBoundingClientRect();
 
+                    // Calculate scale
                     scale = Math.min(
                         containerRect.width / rect.width,
                         containerRect.height / rect.height
                     );
 
+                    // Set panning to center the diagram
                     panX = (containerRect.width - rect.width * scale) / 2;
                     panY = (containerRect.height - rect.height * scale) / 2;
 
                     applyTransform();
                 }};
 
-                setTimeout(centerAndFitDiagram, 200); // Allow rendering time
-
-                // Enable Mouse-Wheel Zoom
-                container.addEventListener('wheel', (event) => {{
-                    event.preventDefault();
-                    const zoomSpeed = 0.1;
-                    const previousScale = scale;
-
-                    if (event.deltaY < 0) {{
-                        scale = Math.min(scale + zoomSpeed, 4);
-                    }} else {{
-                        scale = Math.max(scale - zoomSpeed, 0.5);
-                    }}
+                // Delay centering to ensure rendering is complete
+                setTimeout(centerAndFitDiagram, 500);
 
-                    const zoomRatio = scale / previousScale;
-                    const clientRect = container.getBoundingClientRect();
-
-                    panX -= (event.clientX - clientRect.left) * (zoomRatio - 1);
-                    panY -= (event.clientY - clientRect.top) * (zoomRatio - 1);
-
-                    applyTransform();
-                }});
-
-                // Enable Drag-to-Pan
-                container.addEventListener('mousedown', (event) => {{
+                // Pan/Drag Logic
+                container.addEventListener("mousedown", (e) => {{
                     isDragging = true;
-                    startX = event.clientX - panX;
-                    startY = event.clientY - panY;
+                    startX = e.clientX - panX;
+                    startY = e.clientY - panY;
                     container.style.cursor = "grabbing";
                 }});
 
-                container.addEventListener('mousemove', (event) => {{
+                window.addEventListener("mousemove", (e) => {{
                     if (!isDragging) return;
-
-                    panX = event.clientX - startX;
-                    panY = event.clientY - startY;
-
+                    panX = e.clientX - startX;
+                    panY = e.clientY - startY;
                     applyTransform();
                 }});
 
-                container.addEventListener('mouseup', () => {{
+                window.addEventListener("mouseup", () => {{
                     isDragging = false;
                     container.style.cursor = "grab";
                 }});
 
-                container.addEventListener('mouseleave', () => {{
-                    isDragging = false;
-                    container.style.cursor = "grab";
+                // Scroll-Wheel Zoom Logic
+                container.addEventListener("wheel", (e) => {{
+                    e.preventDefault();
+                    const delta = -Math.sign(e.deltaY); // Dynamic zoom direction
+                    const zoomIntensity = 0.1; // Adjust zoom speed
+                    const zoomFactor = 1 + delta * zoomIntensity;
+                    
+                    scale *= zoomFactor;
+
+                    // Clamp the zoom level to a minimum and maximum level
+                    scale = Math.min(Math.max(scale, 0.5), 5); 
+                    
+                    applyTransform();
                 }});
             }}
         }})();
     </script>
 
+
     """
     return mermaid_html
     # mermaid_html = f"""

{pyegeria-5.3.4.7.dev1 → pyegeria-5.3.4.7.dev3}/pyegeria/test_m.html

@@ -1,18 +1,13 @@
 
-    <div id="Component_for_Solution_Blueprint_-_Clinical_Trial_Management_Solution_Blueprint_-container" class="diagram-container" 
+    <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-container" class="diagram-container" 
          style="width: 90%; max-width: 800px; margin: auto; padding: 20px; 
                 background: white; border: 1px solid #ddd; 
                 border-radius: 12px; position: relative;">
-        
-        <h2 style="text-align: center; color: #007acc; margin-bottom: 16px;">
-            Component for Solution Blueprint - Clinical Trial Management Solution Blueprint 
-        </h2>
-        
         <div class="pan-zoom-container" 
              style="width: 100%; height: 500px; overflow: hidden; 
                     position: relative; background: #f9f9f9; 
                     border: 1px solid #ccc; cursor: grab;">
-            <div id="Component_for_Solution_Blueprint_-_Clinical_Trial_Management_Solution_Blueprint_" class="mermaid pan-zoom-content" 
+            <div id="pz-mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef" class="mermaid pan-zoom-content" 
                  style="position: absolute; transform-origin: 0 0;">
                 flowchart TD
 %%{init: {&quot;flowchart&quot;: {&quot;htmlLabels&quot;: false}} }%%
@@ -118,27 +113,31 @@ style fb32bef2-e79f-4893-b500-2e547f24d482 color:#FFFFFF, fill:#838cc7, stroke:#
             </div>
         </div>
     </div>
-
     <script>
         (function() {
-            // Check if Mermaid.js is already loaded; load if not
+            // Ensure Mermaid.js is 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();
+                script.onload = () => renderGraph();
                 document.head.appendChild(script);
             } else {
-                initializeMermaid();
+                renderGraph();
             }
 
-            function initializeMermaid() {
-                // Re-render the Mermaid chart
+            function renderGraph() {
+                // Render the Mermaid graph
                 mermaid.initialize({ startOnLoad: true });
-                mermaid.init(undefined, document.querySelector("#Component_for_Solution_Blueprint_-_Clinical_Trial_Management_Solution_Blueprint_"));
+                mermaid.init(undefined, `#pz-mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef`);
+
+                // Pan and Zoom Variables
+                const container = document.querySelector(`#mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-container .pan-zoom-container`);
+                const content = document.querySelector(`#mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-container .pan-zoom-content`);
 
-                // Add interactivity for pan and zoom
-                const container = document.querySelector('.pan-zoom-container');
-                const content = document.querySelector('.pan-zoom-content');
+                if (!container || !content) {
+                    console.error("Pan/Zoom container or content not found");
+                    return;
+                }
 
                 let scale = 1;  // Current zoom level
                 let panX = 0;   // X-axis pan
@@ -156,68 +155,59 @@ style fb32bef2-e79f-4893-b500-2e547f24d482 color:#FFFFFF, fill:#838cc7, stroke:#
                     const containerRect = container.getBoundingClientRect();
                     const rect = content.getBoundingClientRect();
 
+                    // Calculate scale
                     scale = Math.min(
                         containerRect.width / rect.width,
                         containerRect.height / rect.height
                     );
 
+                    // Set panning to center the diagram
                     panX = (containerRect.width - rect.width * scale) / 2;
                     panY = (containerRect.height - rect.height * scale) / 2;
 
                     applyTransform();
                 };
 
-                setTimeout(centerAndFitDiagram, 200); // Allow rendering time
-
-                // Enable Mouse-Wheel Zoom
-                container.addEventListener('wheel', (event) => {
-                    event.preventDefault();
-                    const zoomSpeed = 0.1;
-                    const previousScale = scale;
-
-                    if (event.deltaY < 0) {
-                        scale = Math.min(scale + zoomSpeed, 4);
-                    } else {
-                        scale = Math.max(scale - zoomSpeed, 0.5);
-                    }
+                // Delay centering to ensure rendering is complete
+                setTimeout(centerAndFitDiagram, 500);
 
-                    const zoomRatio = scale / previousScale;
-                    const clientRect = container.getBoundingClientRect();
-
-                    panX -= (event.clientX - clientRect.left) * (zoomRatio - 1);
-                    panY -= (event.clientY - clientRect.top) * (zoomRatio - 1);
-
-                    applyTransform();
-                });
-
-                // Enable Drag-to-Pan
-                container.addEventListener('mousedown', (event) => {
+                // Pan/Drag Logic
+                container.addEventListener("mousedown", (e) => {
                     isDragging = true;
-                    startX = event.clientX - panX;
-                    startY = event.clientY - panY;
+                    startX = e.clientX - panX;
+                    startY = e.clientY - panY;
                     container.style.cursor = "grabbing";
                 });
 
-                container.addEventListener('mousemove', (event) => {
+                window.addEventListener("mousemove", (e) => {
                     if (!isDragging) return;
-
-                    panX = event.clientX - startX;
-                    panY = event.clientY - startY;
-
+                    panX = e.clientX - startX;
+                    panY = e.clientY - startY;
                     applyTransform();
                 });
 
-                container.addEventListener('mouseup', () => {
+                window.addEventListener("mouseup", () => {
                     isDragging = false;
                     container.style.cursor = "grab";
                 });
 
-                container.addEventListener('mouseleave', () => {
-                    isDragging = false;
-                    container.style.cursor = "grab";
+                // Scroll-Wheel Zoom Logic
+                container.addEventListener("wheel", (e) => {
+                    e.preventDefault();
+                    const delta = -Math.sign(e.deltaY); // Dynamic zoom direction
+                    const zoomIntensity = 0.1; // Adjust zoom speed
+                    const zoomFactor = 1 + delta * zoomIntensity;
+                    
+                    scale *= zoomFactor;
+
+                    // Clamp the zoom level to a minimum and maximum level
+                    scale = Math.min(Math.max(scale, 0.5), 5); 
+                    
+                    applyTransform();
                 });
             }
         })();
     </script>
 
+
     

{pyegeria-5.3.4.7.dev1 → pyegeria-5.3.4.7.dev3}/pyproject.toml

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