PyPI - pyegeria - Versions diffs - 5.3.3.11__py3-none-any.whl → 5.3.3.13__py3-none-any.whl - Mend

pyegeria 5.3.3.11py3-none-any.whl → 5.3.3.13py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (101) hide show

pyegeria/commands/tech/work/mermaid_graphs/{{displayName}}.html ADDED Viewed

@@ -0,0 +1,115 @@
+    <html>
+        <head>
+          <style type="text/css">
+            #mySvgId {
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            border: 1px solid #ccc;
+            position: relative;
+            margin-bottom: 10px;
+            }
+            svg {
+            cursor: grab;
+            }
+          </style>
+        </head>
+        <body>
+          <div id="graphDiv"></div>
+          <script src="https://bumbu.me/svg-pan-zoom/dist/svg-pan-zoom.min.js"></script>
+          <script type="module">
+            import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
+            mermaid.initialize({startOnLoad: false});
+            await mermaid.run({
+              querySelector: '.mermaid',
+              postRenderCallback: (id) => {
+                const container = document.getElementById("diagram-container");
+                const svgElement = container.querySelector("svg");
+                // Initialize Panzoom
+                const panzoomInstance = Panzoom(svgElement, {
+                  maxScale: 5,
+                  minScale: 0.5,
+                  step: 0.1,
+                });
+                // Add mouse wheel zoom
+                container.addEventListener("wheel", (event) => {
+                  panzoomInstance.zoomWithWheel(event);
+                });
+              }
+            });
+            const drawDiagram = async function () {
+              const element = document.querySelector('#graphDiv');
+              const graphDefinition = `
+    flowchart TD
+%%{init: {"flowchart": {"htmlLabels": false}} }%%
+ba3ab0dd-3ec5-4ec5-9db9-f3dc56e3a732@{ shape: flip-tri, label: "*Information Supply Chain*
+**{{displayName}}**"}
+40130bec-d839-48cc-992a-3b2a2fc82caa@{ shape: text, label: "*Description*
+**{{description}}**"}
+ba3ab0dd-3ec5-4ec5-9db9-f3dc56e3a732~~~40130bec-d839-48cc-992a-3b2a2fc82caa
+style ba3ab0dd-3ec5-4ec5-9db9-f3dc56e3a732 color:#FFFFFF, fill:#004563, stroke:#b7c0c7
+style 40130bec-d839-48cc-992a-3b2a2fc82caa color:#000000, fill:#F9F7ED, stroke:#b7c0c7`;
+              const {svg} = await mermaid.render('mySvgId', graphDefinition);
+              element.innerHTML = svg.replace(/( )*max-width:( 0-9\.)*px;/i, '');
+              var doPan = false;
+              var eventsHandler;
+              var panZoom;
+              var mousepos;
+              eventsHandler = {
+                haltEventListeners: ['mousedown', 'mousemove', 'mouseup']
+                , mouseDownHandler: function (ev) {
+                  if (event.target.className == "[object SVGAnimatedString]") {
+                    doPan = true;
+                    mousepos = {x: ev.clientX, y: ev.clientY}
+                  }
+                  ;
+                }
+                , mouseMoveHandler: function (ev) {
+                  if (doPan) {
+                    panZoom.panBy({x: ev.clientX - mousepos.x, y: ev.clientY - mousepos.y});
+                    mousepos = {x: ev.clientX, y: ev.clientY};
+                    window.getSelection().removeAllRanges();
+                  }
+                }
+                , mouseUpHandler: function (ev) {
+                  doPan = false;
+                }
+                , init: function (options) {
+                  options.svgElement.addEventListener('mousedown', this.mouseDownHandler, false);
+                  options.svgElement.addEventListener('mousemove', this.mouseMoveHandler, false);
+                  options.svgElement.addEventListener('mouseup', this.mouseUpHandler, false);
+                }
+                , destroy: function (options) {
+                  options.svgElement.removeEventListener('mousedown', this.mouseDownHandler, false);
+                  options.svgElement.removeEventListener('mousemove', this.mouseMoveHandler, false);
+                  options.svgElement.removeEventListener('mouseup', this.mouseUpHandler, false);
+                }
+              }
+              panZoom = svgPanZoom('#mySvgId', {
+                zoomEnabled: true
+                , controlIconsEnabled: true
+                , fit: 1
+                , center: 1
+                , customEventsHandler: eventsHandler
+              })
+            };
+            await drawDiagram();
+          </script>
+        </body>

pyegeria/mermaid_utilities.py CHANGED Viewed

@@ -42,35 +42,7 @@ EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
 EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
 EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "./work/mermaid_graphs")
-# Check Mermaid.js version
-# def check_mermaid_version():
-#     """Check the version of Mermaid.js loaded in Jupyter Notebook"""
-#     display(HTML("""
-#     <script>
-#         function checkMermaid() {
-#             if (window.mermaid && typeof window.mermaid.version !== "undefined") {
-#                 console.log("Mermaid.js version:", mermaid.version);
-#                 alert("Mermaid.js version: " + mermaid.version);
-#             } else {
-#                 console.warn("Mermaid.js is not loaded yet. Please ensure it's properly injected.");
-#                 alert("Mermaid.js is not loaded yet. Please ensure it's properly injected.");
-#             }
-#         }
-#         // Delay execution to ensure Mermaid.js has had time to load
-#         setTimeout(checkMermaid, 1000);
-#     </script>
-#     """))
-# another site to get mermaid from is "https://cdnjs.cloudflare.com/ajax/libs/mermaid/11.4.1/mermaid.min.js";
-# below was:
-#<script src="https://unpkg.com/mermaid@11.4.0/dist/mermaid.min.js"></script>
-# <script type="text/javascript">
-    #     if (!window.mermaid) {
-    #         var mermaidScript = document.createElement('script');
-    #         mermaidScript.src = https://unpkg.com/mermaid@11.4.1/dist/mermaid.min.js"
-    #         document.head.appendChild(mermaidScript);
-    #     }
-    # </script>
 def load_mermaid():
     """Inject Mermaid.js library"""
     # Alternative CDN URL via unpkg
@@ -83,60 +55,293 @@ def load_mermaid():
     </script>
     """
-    # mermaid_js = """
-    # <script src="https://unpkg.com/mermaid@11.4.0/dist/mermaid.min.js"></script>
-    # <script>
-    #     document.addEventListener('DOMContentLoaded', function() {{
-    #     mermaid.initialize({{"startOnLoad": true}});
-    #     }});
-    # </script>
-    #
-    # """
     display(HTML(mermaid_js))
+# def render_mermaid(mermaid_code):
+#     """Function to display a Mermaid diagram in a Jupyter notebook"""
+#     mermaid_html = f"""
+#     <div class="mermaid">
+#         {mermaid_code}
+#     </div>
+#     <script type="text/javascript">
+#         if (window.mermaid) {{
+#     mermaid.initialize({{startOnLoad: true}});
+#     mermaid.contentLoaded();
+#     }}
+#     </script>
+#     """
+#     display(HTML(mermaid_html))
 def render_mermaid(mermaid_code):
-    """Function to display a Mermaid diagram in a Jupyter notebook"""
-    mermaid_html = f"""
-    <div class="mermaid">
-        {mermaid_code}
-    </div>
-    <script type="text/javascript">
-        if (window.mermaid) {{
-    mermaid.initialize({{startOnLoad: true}});
-    mermaid.contentLoaded();
-    }}
-    </script>
+    return display(HTML(construct_mermaid_html(mermaid_code)))
+def parse_mermaid_code(mermaid_code):
+    parts = mermaid_code.split('---', maxsplit=3)
+    if len(parts) == 3:
+        title = parts[1].strip()
+        mermaid_code = parts[2].strip()
+    else:
+        title = "No Title"
+    return title, mermaid_code
+def construct_mermaid_html(mermaid_str: str) -> str:
+    """Function to display a HTML code in a Jupyter notebook"""
+    title, mermaid_code = parse_mermaid_code(mermaid_str)
+    html_section1 = """
+    <html>
+        <head>
+          <style type="text/css">
+            #mySvgId {
+            width: 100%;
+            height: 600px;
+            overflow: scroll;
+            border: 2px solid #ccc;
+            position: relative;
+            margin-bottom: 10px;
+            }
+            svg {
+            cursor: grab;
+            }
+          </style>
+        </head>
+    """
+    html_section2 = """"
+        <title>{title}</title>
+    """
+    html_section3 = """
+        <body>
+          <div id="graphDiv"></div>
+          <script src="https://bumbu.me/svg-pan-zoom/dist/svg-pan-zoom.min.js"></script>
+          <script type="module">
+            import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
+            mermaid.initialize({startOnLoad: false});
+            await mermaid.run({
+              querySelector: '.mermaid',
+              postRenderCallback: (id) => {
+                const container = document.getElementById("diagram-container");
+                const svgElement = container.querySelector("svg");
+                // Initialize Panzoom
+                const panzoomInstance = Panzoom(svgElement, {
+                  maxScale: 5,
+                  minScale: 0.5,
+                  step: 0.1,
+                });
+                // Add mouse wheel zoom
+                container.addEventListener("wheel", (event) => {
+                  panzoomInstance.zoomWithWheel(event);
+                });
+              }
+            });
+            const drawDiagram = async function () {
+              const element = document.querySelector('#graphDiv');
+              const graphDefinition = `
     """
-    display(HTML(mermaid_html))
-def save_mermaid_graph(title, mermaid_code, folder:str = EGERIA_MERMAID_FOLDER):
+    html_section4 = """`;
+              const {svg} = await mermaid.render('mySvgId', graphDefinition);
+              element.innerHTML = svg.replace(/( )*max-width:( 0-9\.)*px;/i, '');
+              var doPan = false;
+              var eventsHandler;
+              var panZoom;
+              var mousepos;
+              eventsHandler = {
+                haltEventListeners: ['mousedown', 'mousemove', 'mouseup']
+                , mouseDownHandler: function (ev) {
+                  if (event.target.className == "[object SVGAnimatedString]") {
+                    doPan = true;
+                    mousepos = {x: ev.clientX, y: ev.clientY}
+                  }
+                  ;
+                }
+                , mouseMoveHandler: function (ev) {
+                  if (doPan) {
+                    panZoom.panBy({x: ev.clientX - mousepos.x, y: ev.clientY - mousepos.y});
+                    mousepos = {x: ev.clientX, y: ev.clientY};
+                    window.getSelection().removeAllRanges();
+                  }
+                }
+                , mouseUpHandler: function (ev) {
+                  doPan = false;
+                }
+                , init: function (options) {
+                  options.svgElement.addEventListener('mousedown', this.mouseDownHandler, false);
+                  options.svgElement.addEventListener('mousemove', this.mouseMoveHandler, false);
+                  options.svgElement.addEventListener('mouseup', this.mouseUpHandler, false);
+                }
+                , destroy: function (options) {
+                  options.svgElement.removeEventListener('mousedown', this.mouseDownHandler, false);
+                  options.svgElement.removeEventListener('mousemove', this.mouseMoveHandler, false);
+                  options.svgElement.removeEventListener('mouseup', this.mouseUpHandler, false);
+                }
+              }
+              panZoom = svgPanZoom('#mySvgId', {
+                zoomEnabled: true
+                , controlIconsEnabled: true
+                , fit: 1
+                , center: 1
+                , customEventsHandler: eventsHandler
+              })
+            };
+            await drawDiagram();
+          </script>
+        </body>
+    """
+    return html_section1 + html_section2 + html_section3 + mermaid_code + html_section4
+def save_mermaid_html(title: str, mermaid_str: str, folder:str = EGERIA_MERMAID_FOLDER):
     """Save a Mermaid diagram to a file"""
     if not os.path.exists(folder):
         os.makedirs(folder)
-    mermaid_file = os.path.join(folder, title + ".mmd")
-    mermaid_code = f"""
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
-</head>
-<body>
-  <div class="mermaid">
-    {mermaid_code}
-  </div>
-""" \
-+ \
-"""
-  <script>
-    mermaid.initialize({startOnLoad:true});
-  </script>
-</body>
-</html>
-"""
+    mermaid_file = os.path.join(folder, title + ".html")
+    payload = construct_mermaid_html(mermaid_str)
+    with open(mermaid_file, "w") as f:
+        f.write(payload)
+    return mermaid_file
+def save_mermaid_graph(title, mermaid_str, folder:str = EGERIA_MERMAID_FOLDER):
+    """Save a Mermaid diagram to a file"""
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+    mermaid_file = os.path.join(folder, title + ".html")
+    title, mermaid_code = parse_mermaid_code(mermaid_str)
+    html_prefix = """
+    <html>
+        <head>
+          <style type="text/css">
+            #mySvgId {
+            width: 100%;
+            height: 100%;
+            overflow: hidden;
+            border: 1px solid #ccc;
+            position: relative;
+            margin-bottom: 10px;
+            }
+            svg {
+            cursor: grab;
+            }
+          </style>
+        </head>
+        <body>
+          <div id="graphDiv"></div>
+          <script src="https://bumbu.me/svg-pan-zoom/dist/svg-pan-zoom.min.js"></script>
+          <script type="module">
+            import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs';
+            mermaid.initialize({startOnLoad: false});
+            await mermaid.run({
+              querySelector: '.mermaid',
+              postRenderCallback: (id) => {
+                const container = document.getElementById("diagram-container");
+                const svgElement = container.querySelector("svg");
+                // Initialize Panzoom
+                const panzoomInstance = Panzoom(svgElement, {
+                  maxScale: 5,
+                  minScale: 0.5,
+                  step: 0.1,
+                });
+                // Add mouse wheel zoom
+                container.addEventListener("wheel", (event) => {
+                  panzoomInstance.zoomWithWheel(event);
+                });
+              }
+            });
+            const drawDiagram = async function () {
+              const element = document.querySelector('#graphDiv');
+              const graphDefinition = `
+    """
+    html_postfix = """`;
+              const {svg} = await mermaid.render('mySvgId', graphDefinition);
+              element.innerHTML = svg.replace(/( )*max-width:( 0-9\.)*px;/i, '');
+              var doPan = false;
+              var eventsHandler;
+              var panZoom;
+              var mousepos;
+              eventsHandler = {
+                haltEventListeners: ['mousedown', 'mousemove', 'mouseup']
+                , mouseDownHandler: function (ev) {
+                  if (event.target.className == "[object SVGAnimatedString]") {
+                    doPan = true;
+                    mousepos = {x: ev.clientX, y: ev.clientY}
+                  }
+                  ;
+                }
+                , mouseMoveHandler: function (ev) {
+                  if (doPan) {
+                    panZoom.panBy({x: ev.clientX - mousepos.x, y: ev.clientY - mousepos.y});
+                    mousepos = {x: ev.clientX, y: ev.clientY};
+                    window.getSelection().removeAllRanges();
+                  }
+                }
+                , mouseUpHandler: function (ev) {
+                  doPan = false;
+                }
+                , init: function (options) {
+                  options.svgElement.addEventListener('mousedown', this.mouseDownHandler, false);
+                  options.svgElement.addEventListener('mousemove', this.mouseMoveHandler, false);
+                  options.svgElement.addEventListener('mouseup', this.mouseUpHandler, false);
+                }
+                , destroy: function (options) {
+                  options.svgElement.removeEventListener('mousedown', this.mouseDownHandler, false);
+                  options.svgElement.removeEventListener('mousemove', this.mouseMoveHandler, false);
+                  options.svgElement.removeEventListener('mouseup', this.mouseUpHandler, false);
+                }
+              }
+              panZoom = svgPanZoom('#mySvgId', {
+                zoomEnabled: true
+                , controlIconsEnabled: true
+                , fit: 1
+                , center: 1
+                , customEventsHandler: eventsHandler
+              })
+            };
+            await drawDiagram();
+          </script>
+        </body>
+    """
+    payload = html_prefix + mermaid_code + html_postfix
     with open(mermaid_file, "w") as f:
-        f.write(mermaid_code)
+        f.write(payload)
     return mermaid_file

pyegeria/solution_architect_omvs.py CHANGED Viewed

@@ -144,12 +144,12 @@ class SolutionArchitect(Client):
         possible_query_params = query_string(
             [
+                ("addImplementation", add_implementation),
                 ("startFrom", start_from),
                 ("pageSize", page_size),
                 ("startsWith", starts_with),
                 ("endsWith", ends_with),
                 ("ignoreCase", ignore_case),
-                ("addImplementation", add_implementation),
             ]
         )
@@ -176,6 +176,7 @@ class SolutionArchitect(Client):
     def find_information_supply_chains(self,
                                            filter: str = "*",
+                                           add_implementation: bool = True,
                                            starts_with: bool = True,
                                            ends_with: bool = False,
                                            ignore_case: bool = False,
@@ -190,6 +191,8 @@ class SolutionArchitect(Client):
         ----------
         filter: str
             - search_filterstring to search for.
+        add_implementation : bool, [default=True], optional
+            - add_implementation flag to include information supply chain implementations details..
         starts_with : bool, [default=False], optional
             Starts with the supplied string.
         ends_with : bool, [default=False], optional
@@ -218,6 +221,7 @@ class SolutionArchitect(Client):
         response = loop.run_until_complete(
             self._async_find_information_supply_chains(
                 filter,
+                add_implementation,
                 starts_with,
                 ends_with,
                 ignore_case,

{pyegeria-5.3.3.11.dist-info → pyegeria-5.3.3.13.dist-info}/METADATA RENAMED Viewed

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

pyegeria 5.3.3.11__py3-none-any.whl → 5.3.3.13__py3-none-any.whl

pyegeria 5.3.3.11py3-none-any.whl → 5.3.3.13py3-none-any.whl