pyegeria 5.3.4.18__tar.gz → 5.3.4.20__tar.gz

{pyegeria-5.3.4.18 → pyegeria-5.3.4.20}/PKG-INFO

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

{pyegeria-5.3.4.18 → pyegeria-5.3.4.20}/pyegeria/__init__.py

@@ -69,7 +69,8 @@ from .full_omag_server_config import FullServerConfig
 from .glossary_browser_omvs import GlossaryBrowser
 from .glossary_manager_omvs import GlossaryManager
 from .mermaid_utilities import (
-    construct_mermaid_html,
+    construct_mermaid_web,
+    construct_mermaid_jup,
     generate_process_graph,
     load_mermaid,
     parse_mermaid_code,

{pyegeria-5.3.4.18 → pyegeria-5.3.4.20}/pyegeria/m_test.py

@@ -1,4 +1,4 @@
-from pyegeria.mermaid_utilities import construct_mermaid_html
+from pyegeria.mermaid_utilities import construct_mermaid_web, construct_mermaid_jup
 
 m = """
 ---
@@ -107,7 +107,12 @@ style f37f3735-28a1-4e03-9ff5-3fe2f137f661 color:#FFFFFF, fill:#AA00FF, stroke:#
 style fb32bef2-e79f-4893-b500-2e547f24d482 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
 """
 
-h = construct_mermaid_html(m)
+h = construct_mermaid_web(m)
 print(h)
-with open("test_m.html", "w") as f:
+with open("test_w.html", "w") as f:
     f.write(h)
+
+h = construct_mermaid_jup(m)
+print(h)
+with open("test_j.html", "w") as f:
+    f.write(h)

{pyegeria-5.3.4.18 → pyegeria-5.3.4.20}/pyegeria/mermaid_utilities.py

@@ -63,7 +63,7 @@ def load_mermaid():
 
 
 def render_mermaid(mermaid_code):
-    return display(HTML(construct_mermaid_html(mermaid_code)))
+    return display(HTML(construct_mermaid_jup(mermaid_code)))
 
 
 def parse_mermaid_code(mermaid_code):
@@ -85,7 +85,7 @@ def parse_mermaid_code(mermaid_code):
     return title, guid, mermaid_code
 
 
-def old_construct_mermaid_html(mermaid_str: str) -> str:
+def construct_mermaid_web(mermaid_str: str) -> str:
     """Function to display a HTML code in a Jupyter notebook"""
     title_label, guid, mermaid_code = parse_mermaid_code(mermaid_str)
 
@@ -209,8 +209,151 @@ def old_construct_mermaid_html(mermaid_str: str) -> str:
 
     return html_section1 + html_section2 + html_section3 + mermaid_code + html_section4
 
+def construct_mermaid_jup(mermaid_str: str) -> str:
+    """Function to display a HTML code in a Jupyter notebook
+
+    Constructs HTML for a single Mermaid graph with pan and zoom support.
+    Each call overwrites the previous graph.
+
+    :param mermaid_code: The Mermaid code for the graph.
+    :param graph_id: An optional unique graph ID (default is 'mermaid-graph').
+    :return: The HTML content for the Mermaid graph with pan and zoom enabled.
+
+    """
+    title_label, guid, mermaid_code = parse_mermaid_code(mermaid_str)
+
+    graph_id = f"mermaid-graph-{guid}-{str(uuid.uuid4())[:4]}"
+    escaped_header = html.escape(title_label) if title_label else ""  # Sanitize the header safely
+    escaped_mermaid_code = html.escape(mermaid_code)
+    header_html = f"""
+                <h3 id="{graph_id}-heading" style="margin: 20px 0; font-size: 1.5em; text-align: center;">
+                    {escaped_header}
+                </h3>
+                <p id="{graph_id}-subheading" style="margin: 0; padding: 5px; font-size: 1em; text-align: center; color: gray; flex: 0 0 auto;">
+                    GUID: {guid}
+                </p>
+                """ if title_label else ""
+
+    html_content = f"""
+            <style>
+        /* Style for the diagram container */
+        .diagram-container {{
+            position: relative;
+            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 */
+            overflow: hidden; /* Prevent content overflow outside the container */
+        }}
+
+        /* Style for zoom controls */
+        .svg-pan-zoom_controls {{
+            position: absolute;
+            top: 10px;
+            right: 10px;
+            display: flex;
+            flex-direction: column;
+            gap: 5px;
+        }}
+        .svg-pan-zoom_controls button {{
+            background-color: #007bff;
+            color: white;
+            border: none;
+            padding: 5px 10px;
+            border-radius: 3px;
+            cursor: pointer;
+            font-size: 14px;
+        }}
+        .svg-pan-zoom_controls button:hover {{
+            background-color: #0056b3;
+        }}
+    </style>
+
+    <div id="{graph_id}-container" class="diagram-container">
+        <!-- Mermaid diagram will be dynamically rendered here -->
+        {header_html}
+        <div id="{graph_id}" class="mermaid">
+            {escaped_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
+
 
-def construct_mermaid_html(mermaid_str: str) -> str:
+def not_working_construct_mermaid_html(mermaid_str: str) -> str:
     """Function to display a HTML code in a Jupyter notebook
 
     Constructs HTML for a single Mermaid graph with pan and zoom support.
@@ -947,7 +1090,7 @@ def save_mermaid_html(
         os.makedirs(folder)
     mermaid_file = os.path.join(folder, title + ".html")
 
-    payload = construct_mermaid_html(mermaid_str)
+    payload = construct_mermaid_web(mermaid_str)
 
     with open(mermaid_file, "w") as f:
         f.write(payload)

pyegeria-5.3.4.18/pyegeria/test_m.html → pyegeria-5.3.4.20/pyegeria/test_j.html

@@ -1,50 +1,50 @@
 
-        <style>
-    /* Style for the diagram container */
-    .diagram-container {
-        position: relative;
-        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 */
-        overflow: hidden; /* Prevent content overflow outside the container */
-    }
+            <style>
+        /* Style for the diagram container */
+        .diagram-container {
+            position: relative;
+            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 */
+            overflow: hidden; /* Prevent content overflow outside the container */
+        }
 
-    /* Style for zoom controls */
-    .svg-pan-zoom_controls {
-        position: absolute;
-        top: 10px;
-        right: 10px;
-        display: flex;
-        flex-direction: column;
-        gap: 5px;
-    }
-    .svg-pan-zoom_controls button {
-        background-color: #007bff;
-        color: white;
-        border: none;
-        padding: 5px 10px;
-        border-radius: 3px;
-        cursor: pointer;
-        font-size: 14px;
-    }
-    .svg-pan-zoom_controls button:hover {
-        background-color: #0056b3;
-    }
-</style>
+        /* Style for zoom controls */
+        .svg-pan-zoom_controls {
+            position: absolute;
+            top: 10px;
+            right: 10px;
+            display: flex;
+            flex-direction: column;
+            gap: 5px;
+        }
+        .svg-pan-zoom_controls button {
+            background-color: #007bff;
+            color: white;
+            border: none;
+            padding: 5px 10px;
+            border-radius: 3px;
+            cursor: pointer;
+            font-size: 14px;
+        }
+        .svg-pan-zoom_controls button:hover {
+            background-color: #0056b3;
+        }
+    </style>
 
-<div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-2bd0-container" class="diagram-container">
-    <!-- Mermaid diagram will be dynamically rendered here -->
-    
-            <h3 id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-2bd0-heading" style="margin: 20px 0; font-size: 1.5em; text-align: center;">
-                Component for Solution Blueprint - Clinical Trial Management Solution Blueprint 
-            </h3>
-            <p id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-2bd0-subheading" style="margin: 0; padding: 5px; font-size: 1em; text-align: center; color: gray; flex: 0 0 auto;">
-                GUID: c4f8d707-7c85-4125-b5fd-c3257a2ef2ef
-            </p>
-            
-    <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-2bd0" class="mermaid">
-        flowchart TD
+    <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-54cd-container" class="diagram-container">
+        <!-- Mermaid diagram will be dynamically rendered here -->
+        
+                <h3 id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-54cd-heading" style="margin: 20px 0; font-size: 1.5em; text-align: center;">
+                    Component for Solution Blueprint - Clinical Trial Management Solution Blueprint 
+                </h3>
+                <p id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-54cd-subheading" style="margin: 0; padding: 5px; font-size: 1em; text-align: center; color: gray; flex: 0 0 auto;">
+                    GUID: c4f8d707-7c85-4125-b5fd-c3257a2ef2ef
+                </p>
+                
+        <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-54cd" class="mermaid">
+            flowchart TD
 %%{init: {&quot;flowchart&quot;: {&quot;htmlLabels&quot;: false}} }%%
 
 subgraph c4f8d707-7c85-4125-b5fd-c3257a2ef2ef [Components and Actors]
@@ -145,78 +145,79 @@ style f6bc847b-868d-43cc-b767-41f5fe3e47d1 color:#FFFFFF, fill:#AA00FF, stroke:#
 style d48f579f-76d3-4c49-b1b4-575f5645a9d0 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
 style f37f3735-28a1-4e03-9ff5-3fe2f137f661 color:#FFFFFF, fill:#AA00FF, stroke:#E1D5E7
 style fb32bef2-e79f-4893-b500-2e547f24d482 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
+        </div>
     </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-2bd0";
+    <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-54cd";
 
-            function initializeMermaid(graph_id) {
-                const containerElement = document.getElementById(`${graph_id}-container`);
+                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}".`);
+                    if (!containerElement) {
+                        console.error(`Container with ID "${graph_id}-container" not found.`);
                         return;
                     }
 
-                    // Set initial size
-                    svg.setAttribute("width", "100%");
-                    svg.setAttribute("height", "100%");
+                    // 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;
+                        }
 
-                    // Initialize Pan-Zoom
-                    const panZoom = svgPanZoom(svg, {
-                        zoomEnabled: true,
-                        controlIconsEnabled: false,
-                        fit: true,
-                        center: true,
-                        minZoom: 0.5,
-                        maxZoom: 10,
-                        contain: true
-                    });
+                        // Set initial size
+                        svg.setAttribute("width", "100%");
+                        svg.setAttribute("height", "100%");
 
-                    // 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);
+                        // Initialize Pan-Zoom
+                        const panZoom = svgPanZoom(svg, {
+                            zoomEnabled: true,
+                            controlIconsEnabled: false,
+                            fit: true,
+                            center: true,
+                            minZoom: 0.5,
+                            maxZoom: 10,
+                            contain: true
+                        });
 
-                    // 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);
-            }
+                        // 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);
 
-            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>
+                        // 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>
 
+