pyegeria 5.3.4.9__tar.gz → 5.3.4.11__tar.gz

{pyegeria-5.3.4.9 → pyegeria-5.3.4.11}/PKG-INFO

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

{pyegeria-5.3.4.9 → pyegeria-5.3.4.11}/pyegeria/asset_catalog_omvs.py

@@ -467,7 +467,7 @@ class AssetCatalog(Client):
         )
 
         response = await self._async_make_request("GET", url)
-        return response.json().get("assetGraph", "no asset found")
+        return response.json().get("assetGraph", NO_ASSETS_FOUND)
 
     def get_asset_graph(
         self,
@@ -578,7 +578,7 @@ class AssetCatalog(Client):
         )
 
         response = await self._async_make_request("POST", url)
-        return response.json().get("assetLineageGraph", "no asset found")
+        return response.json().get("assetLineageGraph", NO_ASSETS_FOUND)
 
     def get_asset_lineage_graph(
         self,

{pyegeria-5.3.4.9 → pyegeria-5.3.4.11}/pyegeria/commands/cli/egeria.py

@@ -38,7 +38,7 @@ from pyegeria.commands.cat.list_deployed_database_schemas import (
 from pyegeria.commands.cat.list_deployed_databases import list_deployed_databases
 from pyegeria.commands.cat.list_glossaries import display_glossaries
 from pyegeria.commands.cat.list_projects import display_project_list
-from pyegeria.commands.cat.list_servers_deployed_imp import display_servers_by_dep_imp
+from pyegeria.commands.cat.list_deployed_servers import display_servers_by_dep_imp
 from pyegeria.commands.cat.list_tech_type_elements import list_tech_elements
 from pyegeria.commands.cat.list_tech_types import display_tech_types
 from pyegeria.commands.cat.list_terms import display_glossary_terms

{pyegeria-5.3.4.9 → pyegeria-5.3.4.11}/pyegeria/commands/cli/egeria_cat.py

@@ -37,7 +37,7 @@ from pyegeria.commands.cat.list_deployed_database_schemas import (
 from pyegeria.commands.cat.list_deployed_databases import list_deployed_databases
 from pyegeria.commands.cat.list_glossaries import display_glossaries
 from pyegeria.commands.cat.list_projects import display_project_list
-from pyegeria.commands.cat.list_servers_deployed_imp import display_servers_by_dep_imp
+from pyegeria.commands.cat.list_deployed_servers import display_servers_by_dep_imp
 from pyegeria.commands.cat.list_tech_type_elements import list_tech_elements
 from pyegeria.commands.cat.list_tech_types import display_tech_types
 from pyegeria.commands.cat.list_terms import display_glossary_terms

{pyegeria-5.3.4.9 → pyegeria-5.3.4.11}/pyegeria/commands/ops/monitor_integ_daemon_status.py

@@ -45,7 +45,7 @@ EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
-EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", 200))
 
 disable_ssl_warnings = True
 
@@ -64,7 +64,7 @@ def display_integration_daemon_status(
     user_pass: str = os.environ.get("EGERIA_USER_PASSWORD"),
     paging: bool = False,
     jupyter: bool = os.environ.get("EGERIA_JUPYTER", "False"),
-    width: int = os.environ.get("EGERIA_WIDTH", "150"),
+    width: int = EGERIA_WIDTH,
     sort: bool = True,
 ) -> None:
     """Display the status of connectors running on the specified Integration Daemon OMAG Server.
@@ -202,8 +202,8 @@ def display_integration_daemon_status(
         return table
 
     try:
+        console = Console(width=width)  # main_pagig, force_terminal=not jupyter)
         if paging is True:
-            console = Console(width=width)  # main_pagig, force_terminal=not jupyter)
             with console.pager():
                 console.print(generate_table(search_list))
         else:

{pyegeria-5.3.4.9 → pyegeria-5.3.4.11}/pyegeria/mermaid_utilities.py

@@ -68,16 +68,20 @@ def render_mermaid(mermaid_code):
 
 def parse_mermaid_code(mermaid_code):
     parts = mermaid_code.split("---", maxsplit=3)
+    guid = None
     if len(parts) == 3:
         full_title = parts[1].strip()
-        title_l = full_title.split("[")[0]
-        title = title_l.replace("title: ", "")
-        guid = full_title.split("[")[1].split("]")[0]
-        guid = " " if guid is None else guid
+        if "[" in full_title:
+            title_l = full_title.split("[")[0]
+            title = title_l.replace("title: ", "")
+            guid = full_title.split("[")[1].split("]")[0]
+        else:
+            title = full_title.replace("title: ", "")
         mermaid_code = parts[2].strip()
     else:
-        title = "Unlabeled diagram"
-        guid = " "
+        title = None
+    if guid is None:
+        guid = str(uuid.uuid4())[:8]
     return title, guid, mermaid_code
 
 
@@ -233,6 +237,8 @@ def construct_mermaid_html(mermaid_str: str) -> str:
         """ if title_label else ""
 
     html_content = f"""
+    <!DOCTYPE html>
+    <html>
     <div id="{graph_id}-wrapper" style="width: 100%; height: 100%; display: flex; flex-direction: column; align-items: stretch;">
         
         <!-- Title/Heading -->
@@ -347,7 +353,7 @@ def construct_mermaid_html(mermaid_str: str) -> str:
             }}
         }})();
     </script>
-
+</html>
     """
 
 

pyegeria-5.3.4.11/pyegeria/test_m.html

@@ -0,0 +1,226 @@
+
+    <!DOCTYPE html>
+    <html>
+    <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-wrapper" style="width: 100%; height: 100%; display: flex; flex-direction: column; align-items: stretch;">
+        
+        <!-- Title/Heading -->
+        
+        
+        <h3 id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-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-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>
+        
+        <!-- Mermaid Diagram -->
+        <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-container" class="diagram-container"
+             style="width: 100%; flex: 1 1 auto; position: relative; display: flex; align-items: center; justify-content: center; overflow: hidden;">
+            <div id="mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef" class="mermaid"
+                 style="width: 100%; height: 100%; cursor: grab; user-select: none; margin: 0; padding: 0;">
+                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>
+    </div>
+    
+    <style>
+        /* Ensure no margins or padding for the body or html in Jupyter */
+        body, html {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+        }
+        /* General reset for Jupyter Notebook's extra spacing */
+        #notebook, .container, .cell, .output_area {
+            margin: 0 !important;
+            padding: 0 !important;
+        }
+        .diagram-container {
+            width: 100%;
+            height: 100%;
+            overflow: hidden; /* Prevent scrollbars during zoom/pan */
+        }
+        h2 {
+            margin: 0;
+            padding: 10px;
+            font-size: 24px;
+            text-align: center;
+            flex: 0 0 auto; /* Fix height explicitly for heading */
+        }
+        .mermaid {
+            margin: 0;
+            padding: 0;
+        }
+    </style>
+    
+    <script>
+        (function() {
+            const graphId = "mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef";  // Pass the graph ID
+
+            function loadScript(url, callback) {
+                const script = document.createElement('script');
+                script.src = url;
+                script.onload = callback;
+                document.head.appendChild(script);
+            }
+            
+            // Initialize Mermaid and render the diagram
+            function initializeMermaid() {
+                mermaid.initialize({startOnLoad: false});
+                mermaid.init(undefined, "#" + graphId);
+
+                setTimeout(() => {
+                    const container = document.getElementById(graphId);
+                    if (!container) {
+                        console.error("Container not found for graph:", graphId);
+                        return;
+                    }
+
+                    const svg = container.querySelector("svg");
+                    if (!svg) {
+                        console.error("SVG not rendered by Mermaid.");
+                        return;
+                    }
+
+                    console.log("SVG rendered. Applying pan & zoom.");
+
+                    // Adjust to container size
+                    const containerElement = document.getElementById("mermaid-graph-c4f8d707-7c85-4125-b5fd-c3257a2ef2ef-container");
+                    svg.setAttribute("width", containerElement.offsetWidth);
+                    svg.setAttribute("height", containerElement.offsetHeight);
+
+                    // Add pan/zoom functionality
+                    loadScript("https://cdn.jsdelivr.net/npm/svg-pan-zoom/dist/svg-pan-zoom.min.js", () => {
+                        const panZoom = svgPanZoom(svg, {
+                            zoomEnabled: true,
+                            controlIconsEnabled: true,
+                            fit: true,
+                            center: true,
+                            minZoom: 0.5,
+                            maxZoom: 10
+                        });
+
+                        // Reinitialize pan-zoom on window resize
+                        function onResize() {
+                            panZoom.resize();
+                            panZoom.fit();
+                            panZoom.center();
+                        }
+                        window.addEventListener('resize', onResize);
+
+                        console.log("Pan & zoom initialized successfully.");
+                    });
+                }, 500);
+            }
+
+            // Load Mermaid.js and initialize
+            if (typeof mermaid === "undefined") {
+                loadScript("https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js", initializeMermaid);
+            } else {
+                initializeMermaid();
+            }
+        })();
+    </script>
+</html>
+    

{pyegeria-5.3.4.9 → pyegeria-5.3.4.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "5.3.4.9"
+version = "5.3.4.11"
 
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
@@ -77,6 +77,7 @@ isort = "^6.0.0"
     list_deployed_catalogs = "pyegeria.commands.cat.list_deployed_catalogs:main"
     list_deployed_databases = "pyegeria.commands.cat.list_deployed_databases:main"
     list_deployed_schemas = "pyegeria.commands.cat.list_deployed_database_schemas:main"
+    list_deployed_servers = "pyegeria.commands.cat.list_deployed_servers.py:main"
     create_glossary = "pyegeria.commands.cat.glossary_actions:create_glossary"
     delete_glossary = "pyegeria.commands.cat.glossary_actions:delete_glossary"
     create_term = "pyegeria.commands.cat.glossary_actions:create_term"
@@ -84,7 +85,7 @@ isort = "^6.0.0"
     list_glossaries = "pyegeria.commands.cat.list_glossaries:main"
     load_terms_from_file = "pyegeria.commands.cat.glossary_actions:load_terms"
     export_terms_to_file = "pyegeria.commands.cat.glossary_actions:export_terms"
-    list_deployed_servers = "pyegeria.commands.cat.list_servers_deployed_imp.py:main"
+
     list_collections = "pyegeria.commands.cat.list_collections:main"
 
     monitor_asset_events = "pyegeria.commands.ops.monitor_asset_events:main"