pyegeria 5.3.4.20__tar.gz → 5.3.4.22__tar.gz

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

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

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

@@ -1,4 +1,4 @@
-from pyegeria.mermaid_utilities import construct_mermaid_web, construct_mermaid_jup
+from pyegeria.mermaid_utilities import construct_mermaid_web, construct_mermaid_jup, render_mermaid
 
 m = """
 ---
@@ -112,7 +112,7 @@ print(h)
 with open("test_w.html", "w") as f:
     f.write(h)
 
-h = construct_mermaid_jup(m)
+h = render_mermaid(m)
 print(h)
 with open("test_j.html", "w") as f:
     f.write(h)

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

@@ -63,8 +63,36 @@ def load_mermaid():
 
 
 def render_mermaid(mermaid_code):
-    return display(HTML(construct_mermaid_jup(mermaid_code)))
+    title_label, guid, mermaid_code = parse_mermaid_code(mermaid_code)
+    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 ""
+
+    mermaid_html = f"""
+    <div>{header_html}</div>
+    <div class="mermaid">
+        {escaped_mermaid_code}
+    </div>
+    <script type="text/javascript">
+        if (window.mermaid) {{
+    mermaid.initialize({{startOnLoad: true}});
+    mermaid.contentLoaded();
+    }}
+    </script>
+    """
+    display(HTML(mermaid_html))
+
 
+def render_mermaid_adv(mermaid_code):
+    return display(HTML(construct_mermaid_web(mermaid_code)),)
 
 def parse_mermaid_code(mermaid_code):
     parts = mermaid_code.split("---", maxsplit=3)
@@ -353,6 +381,8 @@ def construct_mermaid_jup(mermaid_str: str) -> str:
     return html_content
 
 
+
+
 def not_working_construct_mermaid_html(mermaid_str: str) -> str:
     """Function to display a HTML code in a Jupyter notebook
 

{pyegeria-5.3.4.20 → pyegeria-5.3.4.22}/pyproject.toml

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

pyegeria-5.3.4.20/pyegeria/test_j.html

@@ -1,223 +0,0 @@
-
-            <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="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]
-fc2de77f-7320-48ea-8750-d434c6e870db@{ shape: text, label: &quot;*Description*
-**A description of how a clinical trial is managed in Coco Pharmaceuticals.**&quot;}
-37b8560d-84d4-434b-9b0d-105420fcc924@{ shape: subproc, label: &quot;*Solution Component*
-**Certify Hospital**&quot;}
-f37f3735-28a1-4e03-9ff5-3fe2f137f661@{ shape: trap-t, label: &quot;*Solution Actor Role*
-**Clinical Trial Manager**&quot;}
-f37f3735-28a1-4e03-9ff5-3fe2f137f661--&gt;|&quot;Certifier&quot;|37b8560d-84d4-434b-9b0d-105420fcc924
-72a86eec-9734-4bc0-babb-4fec0aa7c9ff@{ shape: docs, label: &quot;*Solution Component*
-**Assemble Treatment Assessment Report**&quot;}
-48bc201e-3d4e-4beb-bdb2-0fd9d134f6d5@{ shape: rect, label: &quot;*Solution Component*
-**Treatment Efficacy Evidence**&quot;}
-48bc201e-3d4e-4beb-bdb2-0fd9d134f6d5--&gt;|&quot;Solution Linking Wire&quot;|72a86eec-9734-4bc0-babb-4fec0aa7c9ff
-f37f3735-28a1-4e03-9ff5-3fe2f137f661--&gt;|&quot;Author&quot;|72a86eec-9734-4bc0-babb-4fec0aa7c9ff
-b5c8da4c-f925-4cf1-8294-e43cd2c1a584@{ shape: rect, label: &quot;*Solution Component*
-**Analyse Patient Data**&quot;}
-b5c8da4c-f925-4cf1-8294-e43cd2c1a584--&gt;|&quot;Solution Linking Wire&quot;|48bc201e-3d4e-4beb-bdb2-0fd9d134f6d5
-7f5dca65-50b4-4103-9ac7-3a406a09047a@{ shape: subproc, label: &quot;*Solution Component*
-**Weekly Measurements Onboarding Pipeline**&quot;}
-07705e15-efff-4f80-8992-f04ac85e0ef1@{ shape: rect, label: &quot;*Solution Component*
-**Landing Folder Cataloguer**&quot;}
-07705e15-efff-4f80-8992-f04ac85e0ef1--&gt;|&quot;Solution Linking Wire&quot;|7f5dca65-50b4-4103-9ac7-3a406a09047a
-f37f3735-28a1-4e03-9ff5-3fe2f137f661--&gt;|&quot;Steward&quot;|7f5dca65-50b4-4103-9ac7-3a406a09047a
-b0290339-c96c-4b05-904f-12fc98e54e14@{ shape: trap-t, label: &quot;*Solution Actor Role*
-**Certified Data Engineer**&quot;}
-b0290339-c96c-4b05-904f-12fc98e54e14--&gt;|&quot;Steward&quot;|7f5dca65-50b4-4103-9ac7-3a406a09047a
-d48f579f-76d3-4c49-b1b4-575f5645a9d0@{ shape: lin-cyl, label: &quot;*Solution Component*
-**Treatment Validation Sandbox**&quot;}
-26c07ca4-3b8e-484b-812b-36c1ace4b275@{ shape: rect, label: &quot;*Solution Component*
-**Populate Sandbox**&quot;}
-26c07ca4-3b8e-484b-812b-36c1ace4b275--&gt;|&quot;Solution Linking Wire&quot;|d48f579f-76d3-4c49-b1b4-575f5645a9d0
-ee2bb773-e630-4cf9-bdf1-7c2dd64fe4ec@{ shape: processes, label: &quot;*Solution Component*
-**Hospital Processes**&quot;}
-a8bd84ca-0aae-4534-b0e8-87e8659467a6@{ shape: trap-t, label: &quot;*Solution Actor Role*
-**Clinical Trial Participating Hospital Coordinator**&quot;}
-a8bd84ca-0aae-4534-b0e8-87e8659467a6--&gt;|&quot;Coordinator on behalf of hospital&quot;|ee2bb773-e630-4cf9-bdf1-7c2dd64fe4ec
-30adaab5-8870-47a8-8ae9-facbf84cb05a@{ shape: trap-t, label: &quot;*Solution Actor Role*
-**Clinical Trial Participating Hospital**&quot;}
-30adaab5-8870-47a8-8ae9-facbf84cb05a--&gt;|&quot;Owner&quot;|ee2bb773-e630-4cf9-bdf1-7c2dd64fe4ec
-d48f579f-76d3-4c49-b1b4-575f5645a9d0--&gt;|&quot;Solution Linking Wire&quot;|b5c8da4c-f925-4cf1-8294-e43cd2c1a584
-ece17806-836c-4756-b3a2-2d12dde215f6@{ shape: trap-t, label: &quot;*Solution Actor Role*
-**New Treatment Data Scientist**&quot;}
-ece17806-836c-4756-b3a2-2d12dde215f6--&gt;|&quot;Data Analyser&quot;|b5c8da4c-f925-4cf1-8294-e43cd2c1a584
-0c757e35-8a42-4d5f-b01b-c72a6cea65cc@{ shape: trap-t, label: &quot;*Solution Actor Role*
-**New Treatment Researcher.**&quot;}
-0c757e35-8a42-4d5f-b01b-c72a6cea65cc--&gt;|&quot;Results Interpreter&quot;|b5c8da4c-f925-4cf1-8294-e43cd2c1a584
-e9c2f911-ffcb-40c6-aeee-8c4d43811576@{ shape: subproc, label: &quot;*Solution Component*
-**Onboard Hospital**&quot;}
-b0290339-c96c-4b05-904f-12fc98e54e14--&gt;|&quot;Initiator&quot;|e9c2f911-ffcb-40c6-aeee-8c4d43811576
-849b0b42-f465-452b-813c-477d6398e082@{ shape: subproc, label: &quot;*Solution Component*
-**Set up clinical trial**&quot;}
-f37f3735-28a1-4e03-9ff5-3fe2f137f661--&gt;|&quot;Initiator&quot;|849b0b42-f465-452b-813c-477d6398e082
-a5d4d638-6836-47e5-99d0-fdcde637e13f@{ shape: lin-cyl, label: &quot;*Solution Component*
-**Weekly Measurements Data Lake Folder**&quot;}
-7f5dca65-50b4-4103-9ac7-3a406a09047a--&gt;|&quot;Solution Linking Wire&quot;|a5d4d638-6836-47e5-99d0-fdcde637e13f
-0bf2547c-937c-41b6-814f-6284849271a1@{ shape: odd, label: &quot;*Solution Component*
-**Treatment Assessment Report Validation and Delivery**&quot;}
-72a86eec-9734-4bc0-babb-4fec0aa7c9ff--&gt;|&quot;Solution Linking Wire&quot;|0bf2547c-937c-41b6-814f-6284849271a1
-f6bc847b-868d-43cc-b767-41f5fe3e47d1@{ shape: trap-t, label: &quot;*Solution Actor Role*
-**Clinical Trial Sponsor**&quot;}
-f6bc847b-868d-43cc-b767-41f5fe3e47d1--&gt;|&quot;Reviewer&quot;|0bf2547c-937c-41b6-814f-6284849271a1
-a5d4d638-6836-47e5-99d0-fdcde637e13f--&gt;|&quot;Solution Linking Wire&quot;|26c07ca4-3b8e-484b-812b-36c1ace4b275
-fb32bef2-e79f-4893-b500-2e547f24d482@{ shape: subproc, label: &quot;*Solution Component*
-**Set up Data Lake Folder**&quot;}
-b0290339-c96c-4b05-904f-12fc98e54e14--&gt;|&quot;Initiator&quot;|fb32bef2-e79f-4893-b500-2e547f24d482
-1c150d6e-30cf-481c-9afb-3b06c9c9e78f@{ shape: lin-cyl, label: &quot;*Solution Component*
-**Hospital Landing Area Folder**&quot;}
-ee2bb773-e630-4cf9-bdf1-7c2dd64fe4ec--&gt;|&quot;Solution Linking Wire&quot;|1c150d6e-30cf-481c-9afb-3b06c9c9e78f
-1c150d6e-30cf-481c-9afb-3b06c9c9e78f--&gt;|&quot;Solution Linking Wire&quot;|07705e15-efff-4f80-8992-f04ac85e0ef1
-11c7c850-c67c-41cc-9423-d74db47cbf3a@{ shape: subproc, label: &quot;*Solution Component*
-**Nominate Hospital**&quot;}
-f37f3735-28a1-4e03-9ff5-3fe2f137f661--&gt;|&quot;Initiator&quot;|11c7c850-c67c-41cc-9423-d74db47cbf3a
-end
-style 48bc201e-3d4e-4beb-bdb2-0fd9d134f6d5 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style ece17806-836c-4756-b3a2-2d12dde215f6 color:#FFFFFF, fill:#AA00FF, stroke:#E1D5E7
-style e9c2f911-ffcb-40c6-aeee-8c4d43811576 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style a5d4d638-6836-47e5-99d0-fdcde637e13f color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style 0bf2547c-937c-41b6-814f-6284849271a1 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style 30adaab5-8870-47a8-8ae9-facbf84cb05a color:#FFFFFF, fill:#AA00FF, stroke:#E1D5E7
-style b0290339-c96c-4b05-904f-12fc98e54e14 color:#FFFFFF, fill:#AA00FF, stroke:#E1D5E7
-style 26c07ca4-3b8e-484b-812b-36c1ace4b275 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style 1c150d6e-30cf-481c-9afb-3b06c9c9e78f color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style 07705e15-efff-4f80-8992-f04ac85e0ef1 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style a8bd84ca-0aae-4534-b0e8-87e8659467a6 color:#FFFFFF, fill:#AA00FF, stroke:#E1D5E7
-style 0c757e35-8a42-4d5f-b01b-c72a6cea65cc color:#FFFFFF, fill:#AA00FF, stroke:#E1D5E7
-style c4f8d707-7c85-4125-b5fd-c3257a2ef2ef color:#3079ab, fill:#b7c0c7, stroke:#3079ab
-style 37b8560d-84d4-434b-9b0d-105420fcc924 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style 11c7c850-c67c-41cc-9423-d74db47cbf3a color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style fc2de77f-7320-48ea-8750-d434c6e870db color:#000000, fill:#F9F7ED, stroke:#b7c0c7
-style 849b0b42-f465-452b-813c-477d6398e082 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style 7f5dca65-50b4-4103-9ac7-3a406a09047a color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style ee2bb773-e630-4cf9-bdf1-7c2dd64fe4ec color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style 72a86eec-9734-4bc0-babb-4fec0aa7c9ff color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style b5c8da4c-f925-4cf1-8294-e43cd2c1a584 color:#FFFFFF, fill:#838cc7, stroke:#3079ab
-style f6bc847b-868d-43cc-b767-41f5fe3e47d1 color:#FFFFFF, fill:#AA00FF, stroke:#E1D5E7
-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>
-
-    <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`);
-
-                    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>
-
-