pyegeria 5.3.4.12__tar.gz → 5.3.4.13__tar.gz

{pyegeria-5.3.4.12 → pyegeria-5.3.4.13}/PKG-INFO

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

{pyegeria-5.3.4.12 → pyegeria-5.3.4.13}/pyegeria/mermaid_utilities.py

@@ -232,7 +232,7 @@ def construct_mermaid_html(mermaid_str: str) -> str:
     /* Style for the diagram container */
     .diagram-container {{
         position: relative;
-        width: 90%; /* Adjust the diagram container width */
+        width: 100%; /* Adjust the diagram container width */
         height: 500px; /* Set a fixed height for the container */
         margin: 0 auto;
         border: 1px solid #ccc; /* Optional border for visualization */
@@ -262,100 +262,85 @@ def construct_mermaid_html(mermaid_str: str) -> str:
     }}
 </style>
 
-<script src="https://cdn.jsdelivr.net/npm/svg-pan-zoom@3.6.1/dist/svg-pan-zoom.min.js"></script>
-<script>
-    document.addEventListener("DOMContentLoaded", () => {{
-        // Define graph ID dynamically passed via Python
-        const graph_id = "{graph_id}";
-
-        // Function to load external scripts dynamically
-        function loadScript(url, callback) {{
-            const script = document.createElement('script');
-            script.src = url;
-            script.async = true;
-            script.onload = callback;
-            script.onerror = () => console.error("Error loading script:", url);
-            document.head.appendChild(script);
-        }}
-
-        // Initialize Mermaid
-        function initializeMermaid(graph_id) {{
-            // Look for the container
-            const containerElement = document.getElementById(`${{graph_id}}-container`);
-            if (!containerElement) {{
-                console.error(`Container with ID "${{graph_id}}-container" not found.`);
-                return;
-            }}
-
-            // Configure Mermaid
-            mermaid.initialize({{ startOnLoad: false, logLevel: "debug" }});
-            mermaid.init(undefined, `#${{graph_id}}`);
-
-            setTimeout(() => {{
-                const svg = containerElement.querySelector("svg");
-
-                // Ensure SVG exists
-                if (!svg) {{
-                    console.error(`SVG not rendered for ID "${{graph_id}}".`);
-                    return;
-                }}
-
-                // Set initial size for SVG
-                svg.setAttribute("width", "100%");
-                svg.setAttribute("height", "100%");
-
-                // Ensure the container fits the diagram properly
-                containerElement.style.overflow = "hidden";
-
-                // Initialize Pan-Zoom
-                const panZoom = svgPanZoom(svg, {{
-                    zoomEnabled: true,
-                    controlIconsEnabled: false, // Disable default controls
-                    fit: true,
-                    center: true,
-                    minZoom: 0.5,
-                    maxZoom: 10,
-                    contain: true // Ensure diagram stays within view
-                }});
-
-                // Add custom controls
-                const controlsContainer = document.createElement("div");
-                controlsContainer.className = "svg-pan-zoom_controls";
-                controlsContainer.innerHTML = `
-                    <button id="${{graph_id}}-zoom-in">+</button>
-                    <button id="${{graph_id}}-zoom-out">-</button>
-                    <button id="${{graph_id}}-reset">Reset</button>
-                `;
-                containerElement.appendChild(controlsContainer);
-
-                // Handle controls
-                document.getElementById(`${{graph_id}}-zoom-in`).addEventListener("click", () => panZoom.zoomIn());
-                document.getElementById(`${{graph_id}}-zoom-out`).addEventListener("click", () => panZoom.zoomOut());
-                document.getElementById(`${{graph_id}}-reset`).addEventListener("click", () => {{
-                    panZoom.resetZoom();
-                    panZoom.center();
-                }});
-            }}, 500); // Delay to ensure Mermaid finishes rendering
-        }}
-
-        // Load Mermaid.js externally or initialize
-        if (typeof mermaid === "undefined") {{
-            loadScript("https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js", () => {{
-                console.log("Mermaid.js loaded successfully");
-                initializeMermaid(graph_id);
-            }});
-        }} else {{
-            initializeMermaid(graph_id);
-        }}
-    }});
-</script>
-
 <div id="{graph_id}-container" class="diagram-container">
     <!-- Mermaid diagram will be dynamically rendered here -->
     <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>
+        document.addEventListener("DOMContentLoaded", () => {{
+            // Initialize Mermaid and Pan-Zoom functionality
+            const graph_id = "{graph_id}";
+
+            function initializeMermaid(graph_id) {{
+                const containerElement = document.getElementById(`${{graph_id}}-container`);
+                
+                if (!containerElement) {{
+                    console.error(`Container with ID "${{graph_id}}-container" not found.`);
+                    return;
+                }}
+
+                // Configure Mermaid
+                mermaid.initialize({{ startOnLoad: false, logLevel: "debug" }});
+                mermaid.init(undefined, `#${{graph_id}}`);
+
+                setTimeout(() => {{
+                    const svg = containerElement.querySelector("svg");
+                    if (!svg) {{
+                        console.error(`SVG not rendered for ID "${{graph_id}}".`);
+                        return;
+                    }}
+
+                    // Set initial size
+                    svg.setAttribute("width", "100%");
+                    svg.setAttribute("height", "100%");
+
+                    // Initialize Pan-Zoom
+                    const panZoom = svgPanZoom(svg, {{
+                        zoomEnabled: true,
+                        controlIconsEnabled: false,
+                        fit: true,
+                        center: true,
+                        minZoom: 0.5,
+                        maxZoom: 10,
+                        contain: true
+                    }});
+
+                    // Add custom controls
+                    const controlsContainer = document.createElement("div");
+                    controlsContainer.className = "svg-pan-zoom_controls";
+                    controlsContainer.innerHTML = `
+                        <button id="${{graph_id}}-zoom-in">+</button>
+                        <button id="${{graph_id}}-zoom-out">-</button>
+                        <button id="${{graph_id}}-reset">Reset</button>
+                    `;
+                    containerElement.appendChild(controlsContainer);
+
+                    // Handle controls
+                    document.getElementById(`${{graph_id}}-zoom-in`).addEventListener("click", () => panZoom.zoomIn());
+                    document.getElementById(`${{graph_id}}-zoom-out`).addEventListener("click", () => panZoom.zoomOut());
+                    document.getElementById(`${{graph_id}}-reset`).addEventListener("click", () => {{
+                        panZoom.resetZoom();
+                        panZoom.center();
+                    }});
+                }}, 500);
+            }}
+
+            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);
+            }} else {{
+                initializeMermaid(graph_id);
+            }}
+        }});
+    </script>
+
 """
 
     return html_content

{pyegeria-5.3.4.12 → pyegeria-5.3.4.13}/pyegeria/test_m.html

@@ -3,7 +3,7 @@
     /* Style for the diagram container */
     .diagram-container {
         position: relative;
-        width: 90%; /* Adjust the diagram container width */
+        width: 100%; /* Adjust the diagram container width */
         height: 500px; /* Set a fixed height for the container */
         margin: 0 auto;
         border: 1px solid #ccc; /* Optional border for visualization */
@@ -33,94 +33,6 @@
     }
 </style>
 
-<script src="https://cdn.jsdelivr.net/npm/svg-pan-zoom@3.6.1/dist/svg-pan-zoom.min.js"></script>
-<script>
-    document.addEventListener("DOMContentLoaded", () => {
-        // Define graph ID dynamically passed via Python
-        const graph_id = "mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef";
-
-        // Function to load external scripts dynamically
-        function loadScript(url, callback) {
-            const script = document.createElement('script');
-            script.src = url;
-            script.async = true;
-            script.onload = callback;
-            script.onerror = () => console.error("Error loading script:", url);
-            document.head.appendChild(script);
-        }
-
-        // Initialize Mermaid
-        function initializeMermaid(graph_id) {
-            // Look for the container
-            const containerElement = document.getElementById(`${graph_id}-container`);
-            if (!containerElement) {
-                console.error(`Container with ID "${graph_id}-container" not found.`);
-                return;
-            }
-
-            // Configure Mermaid
-            mermaid.initialize({ startOnLoad: false, logLevel: "debug" });
-            mermaid.init(undefined, `#${graph_id}`);
-
-            setTimeout(() => {
-                const svg = containerElement.querySelector("svg");
-
-                // Ensure SVG exists
-                if (!svg) {
-                    console.error(`SVG not rendered for ID "${graph_id}".`);
-                    return;
-                }
-
-                // Set initial size for SVG
-                svg.setAttribute("width", "100%");
-                svg.setAttribute("height", "100%");
-
-                // Ensure the container fits the diagram properly
-                containerElement.style.overflow = "hidden";
-
-                // Initialize Pan-Zoom
-                const panZoom = svgPanZoom(svg, {
-                    zoomEnabled: true,
-                    controlIconsEnabled: false, // Disable default controls
-                    fit: true,
-                    center: true,
-                    minZoom: 0.5,
-                    maxZoom: 10,
-                    contain: true // Ensure diagram stays within view
-                });
-
-                // Add custom controls
-                const controlsContainer = document.createElement("div");
-                controlsContainer.className = "svg-pan-zoom_controls";
-                controlsContainer.innerHTML = `
-                    <button id="${graph_id}-zoom-in">+</button>
-                    <button id="${graph_id}-zoom-out">-</button>
-                    <button id="${graph_id}-reset">Reset</button>
-                `;
-                containerElement.appendChild(controlsContainer);
-
-                // Handle controls
-                document.getElementById(`${graph_id}-zoom-in`).addEventListener("click", () => panZoom.zoomIn());
-                document.getElementById(`${graph_id}-zoom-out`).addEventListener("click", () => panZoom.zoomOut());
-                document.getElementById(`${graph_id}-reset`).addEventListener("click", () => {
-                    panZoom.resetZoom();
-                    panZoom.center();
-                });
-            }, 500); // Delay to ensure Mermaid finishes rendering
-        }
-
-        // Load Mermaid.js externally or initialize
-        if (typeof mermaid === "undefined") {
-            loadScript("https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js", () => {
-                console.log("Mermaid.js loaded successfully");
-                initializeMermaid(graph_id);
-            });
-        } else {
-            initializeMermaid(graph_id);
-        }
-    });
-</script>
-
 <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-container" class="diagram-container">
     <!-- Mermaid diagram will be dynamically rendered here -->
     <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef" class="mermaid">
@@ -227,3 +139,76 @@ style f37f3735-28a1-4e03-9ff5-3fe2f137f661 color:#FFFFFF, fill:#AA00FF, stroke:#
 style fb32bef2-e79f-4893-b500-2e547f24d482 color:#FFFFFF, fill:#838cc7, stroke:#3079ab 
     </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>
+        document.addEventListener("DOMContentLoaded", () => {
+            // Initialize Mermaid and Pan-Zoom functionality
+            const graph_id = "mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef";
+
+            function initializeMermaid(graph_id) {
+                const containerElement = document.getElementById(`${graph_id}-container`);
+                
+                if (!containerElement) {
+                    console.error(`Container with ID "${graph_id}-container" not found.`);
+                    return;
+                }
+
+                // Configure Mermaid
+                mermaid.initialize({ startOnLoad: false, logLevel: "debug" });
+                mermaid.init(undefined, `#${graph_id}`);
+
+                setTimeout(() => {
+                    const svg = containerElement.querySelector("svg");
+                    if (!svg) {
+                        console.error(`SVG not rendered for ID "${graph_id}".`);
+                        return;
+                    }
+
+                    // Set initial size
+                    svg.setAttribute("width", "100%");
+                    svg.setAttribute("height", "100%");
+
+                    // Initialize Pan-Zoom
+                    const panZoom = svgPanZoom(svg, {
+                        zoomEnabled: true,
+                        controlIconsEnabled: false,
+                        fit: true,
+                        center: true,
+                        minZoom: 0.5,
+                        maxZoom: 10,
+                        contain: true
+                    });
+
+                    // Add custom controls
+                    const controlsContainer = document.createElement("div");
+                    controlsContainer.className = "svg-pan-zoom_controls";
+                    controlsContainer.innerHTML = `
+                        <button id="${graph_id}-zoom-in">+</button>
+                        <button id="${graph_id}-zoom-out">-</button>
+                        <button id="${graph_id}-reset">Reset</button>
+                    `;
+                    containerElement.appendChild(controlsContainer);
+
+                    // Handle controls
+                    document.getElementById(`${graph_id}-zoom-in`).addEventListener("click", () => panZoom.zoomIn());
+                    document.getElementById(`${graph_id}-zoom-out`).addEventListener("click", () => panZoom.zoomOut());
+                    document.getElementById(`${graph_id}-reset`).addEventListener("click", () => {
+                        panZoom.resetZoom();
+                        panZoom.center();
+                    });
+                }, 500);
+            }
+
+            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);
+            } else {
+                initializeMermaid(graph_id);
+            }
+        });
+    </script>
+

{pyegeria-5.3.4.12 → pyegeria-5.3.4.13}/pyproject.toml

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