pyegeria 5.3.3.10.dev6__tar.gz → 5.3.3.10.dev8__tar.gz

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/PKG-INFO

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

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/__init__.py

@@ -68,12 +68,13 @@ from .create_tech_guid_lists import build_global_guid_lists
 from .classification_manager_omvs import ClassificationManager
 from .feedback_manager_omvs import FeedbackManager
 from .metadata_explorer_omvs import MetadataExplorer
-from .mermaid_utilities import load_mermaid, render_mermaid, generate_process_graph, check_mermaid_version
+from .mermaid_utilities import load_mermaid, render_mermaid, generate_process_graph
 from .egeria_my_client import EgeriaMy
 from .egeria_cat_client import EgeriaCat
 from .egeria_tech_client import EgeriaTech
 from .egeria_config_client import EgeriaConfig
 from .egeria_client import Egeria
+from .solution_architect_omvs import SolutionArchitect
 
 
 #

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/classification_manager_omvs.py

@@ -1547,6 +1547,8 @@ class ClassificationManager(Client):
         UserNotAuthorizedException
             the requesting user is not authorized to issue this request.
         """
+        if property_value is '*':
+            property_value = None
 
         possible_query_params = query_string(
             [

pyegeria-5.3.3.10.dev8/pyegeria/commands/cat/get_information_supply_chains.py

@@ -0,0 +1,207 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+A simple viewer for Information Supply Chains
+
+"""
+
+import argparse
+import os
+from datetime import time
+
+from rich import print, box
+from rich.console import Console
+from rich.markdown import Markdown
+from rich.panel import Panel
+from rich.prompt import Prompt
+from rich.table import Table
+from rich.tree import Tree
+from pyegeria.solution_architect_omvs import SolutionArchitect
+from pyegeria import (
+    ProjectManager,
+    UserNotAuthorizedException,
+    PropertyServerException,
+    InvalidParameterException, ClassificationManager, SolutionArchitect,
+    )
+from pyegeria._exceptions import (
+    print_exception_response,
+)
+
+disable_ssl_warnings = True
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+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"))
+
+
+def supply_chain_viewer(
+    search_string: str,
+    server_name: str,
+    platform_url: str,
+    user: str,
+    user_password: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+    timeout: int = 30,
+):
+    """A Supply Chain viewer"""
+
+    def display_supply_chains(supply_chains: list[dict] ) -> Table:
+        table = Table(
+            title=f"Supply Chains matching  {search_string} @ {time.asctime()}",
+            style="bright_white on black",
+            header_style="bright_white on dark_blue",
+            title_style="bold white on black",
+            caption_style="white on black",
+            show_lines=True,
+            box=box.ROUNDED,
+            caption=f"View Server '{server_name}' @ Platform - {platform_url}",
+            expand=True,
+            )
+        table.add_column("Supply Chain Name")
+        table.add_column("Qualified Name / GUID", width=38, no_wrap=True)
+        table.add_column("Purpose")
+        table.add_column("Scope")
+        table.add_column("Description")
+
+        for sc in supply_chains:
+            sc_name = sc["properties"].get("displayName", '---')
+            sc_qname = sc["elementHeader"]["qualifiedName"]
+            sc_guid = sc["elementHeader"]["guid"]
+            sc_purpose = sc["properties"].get("purposes",'---')
+            sc_scope = sc["properties"].get("scope",'---')
+            sc_desc = sc["properties"].get("description",'---')
+            sc_unique_name = f"\t{sc_qname}\n\t/\n\t{sc_guid}"
+            table.add_row(sc_name, sc_unique_name, sc_purpose, sc_scope, sc_desc)
+
+        return table
+
+
+    def walk_project_hierarchy(
+        project_client: ProjectManager,
+        project_name: str,
+        tree: Tree,
+        root: bool = False,
+    ) -> None:
+        """Recursively build a Tree with collection contents."""
+        t = None
+        style = "bright_white on black"
+
+        project = project_client.get_projects_by_name(project_name)
+        if type(project) is list:
+            proj_guid = project[0]["elementHeader"]["guid"]
+            proj_props = project[0]["properties"]
+
+            proj_type = proj_props.get("typeName", "---")
+            proj_unique = proj_props.get("qualifiedName", "---")
+            proj_identifier = proj_props.get("identifier", "---")
+            proj_name = proj_props.get("name", "---")
+            proj_desc = proj_props.get("description", "---")
+            proj_status = proj_props.get("projectStatus", "---")
+            proj_priority = proj_props.get("priority", "---")
+            proj_start = proj_props.get("startDate", "---")[:-10]
+            proj_props_md = (
+                f"* Name: {proj_name}\n"
+                f"* Identifier: {proj_identifier}\n"
+                f"* Type: {proj_type}\n"
+                f"* Status: {proj_status}\n"
+                f"* priority: {proj_priority}\n"
+                f"* Start:    {proj_start}\n"
+                f"* Description: {proj_desc}\n"
+                f"* GUID: {proj_guid}"
+            )
+        else:
+            return
+
+        team = project_client.get_project_team(proj_guid)
+        member_md = ""
+        if type(team) is list:
+            for member in team:
+                member_guid = member["member"]["guid"]
+                member_unique = member["member"]["uniqueName"]
+                member_md += f"* Member Unique Name: {member_unique}\n* Member GUID: {member_guid}"
+            proj_props_md += f"\n### Team Members\n {member_md}"
+
+        proj_props_out = Markdown(proj_props_md)
+        p = Panel.fit(proj_props_out, style=style, title=project_name)
+        t = tree.add(p)
+
+        linked_projects = project_client.get_linked_projects(proj_guid)
+        if type(linked_projects) is list:
+            for proj in linked_projects:
+                child_md = ""
+                child_guid = proj["elementHeader"]["guid"]
+                child_name = proj["properties"]["name"]
+                relationship = proj["relatedElement"]["relationshipHeader"]["type"][
+                    "typeName"
+                ]
+                if relationship != "ProjectDependency":
+                    continue
+                walk_project_hierarchy(project_client, child_name, t)
+
+        else:
+            return t
+
+    try:
+        console = Console(width=width, force_terminal=not jupyter)
+        tree = Tree(
+            f"[bold bright green on black]Supply Chains containing: {search_string}", guide_style="bold bright_blue"
+        )
+        client = SolutionArchitect(server_name, platform_url, user, user_password)
+
+        token = client.create_egeria_bearer_token()
+
+        sc = client.find_all_information_supply_chains(search_string)
+
+        if (isinstance(sc, list)):
+            t = tree.add(display_supply_chains(sc))
+        else:
+            t = tree.add(type(sc))
+        # walk_project_hierarchy(p_client, root, tree, root=True)
+        print(tree)
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
+        print_exception_response(e)
+
+
+def main():
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_USER
+    user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    try:
+        search_string = Prompt.ask(
+            "Enter a search string:", default="*"
+        )
+        supply_chain_viewer(search_string, server, url, userid, user_pass)
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/commands/my/monitor_my_todos.py

@@ -159,7 +159,7 @@ def display_my_todos(
                 role_id = role["properties"].get("roleId", "No Role Id")
                 add_rows(table, role_guid, role_id)
 
-        # m_client.close_session()
+        token = m_client.refresh_egeria_bearer_token()
         return table
 
     try:

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/commands/my/monitor_open_todos.py

@@ -134,7 +134,7 @@ def display_todos(
                     status,
                     assigned_out,
                 )
-
+        token = m_client.refresh_egeria_bearer_token()
         return table
 
     try:

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/commands/ops/monitor_engine_activity.py

@@ -82,6 +82,7 @@ def display_engine_activity(
         The width of the console for table printing.
     """
     g_client = AutomatedCuration(view_server, view_url, user, user_pwd=user_pass)
+    token = g_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -108,7 +109,7 @@ def display_engine_activity(
         table.add_column("Process Name")
         table.add_column("Completion Message")
 
-        token = g_client.create_egeria_bearer_token()
+
         action_status = g_client.get_engine_actions()
 
         if type(action_status) is str:
@@ -186,7 +187,7 @@ def display_engine_activity(
         else:
             print("Egeria integration daemon not running")
             sys.exit()
-
+        g_client.refresh_egeria_bearer_token()
         return table
 
     try:

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/commands/ops/monitor_engine_activity_c.py

@@ -85,7 +85,7 @@ def display_engine_activity_c(
         The width of the console for table printing.
     """
     g_client = AutomatedCuration(view_server, view_url, user, user_pwd=user_pass)
-
+    token = g_client.create_egeria_bearer_token()
     def generate_table() -> Table:
         """Make a new table."""
         table = Table(
@@ -109,7 +109,7 @@ def display_engine_activity_c(
         table.add_column("Core Results")
         # table.add_column("Completion Message")
 
-        token = g_client.create_egeria_bearer_token()
+
         action_status = g_client.get_engine_actions()
 
         if type(action_status) is str:
@@ -203,7 +203,7 @@ def display_engine_activity_c(
         else:
             print("Egeria integration daemon not running")
             sys.exit()
-
+        g_client.refresh_egeria_bearer_token()
         return table
 
     try:

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/commands/ops/monitor_platform_status.py

@@ -146,7 +146,7 @@ def display_status(
             platform_url = " "
             platform_origin = " "
             platform_started = " "
-
+        token = r_client.refresh_egeria_bearer_token()
         return table
 
     try:

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/commands/ops/monitor_server_status.py

@@ -81,7 +81,7 @@ def display_status(
             table.add_column("Description")
             table.add_column("Server Type")
             table.add_column("Last Started")
-        token = p_client.create_egeria_bearer_token()
+
         platform_list = p_client.get_platforms_by_type()
         if type(platform_list) is str:
             print("No OMAG Server Platforms found?")
@@ -139,12 +139,13 @@ def display_status(
                         "[red]Inactive" "" if status == "Inactive" else "[green]Active",
                         # server_status,
                     )
-        # p_client.close_session()
+        p_client.refresh_egeria_bearer_token()
         return table
 
     try:
         # with Live(generate_table(), refresh_per_second=1, screen=True) as live:
-        with Live(generate_table(), refresh_per_second=1, screen=False, transient=False) as live:
+        print(f" Started at {time.asctime()} \n")
+        with Live(generate_table(), refresh_per_second=4, screen=True, transient=True) as live:
 
             while True:
                 time.sleep(5)

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/mermaid_utilities.py

@@ -43,23 +43,23 @@ EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
 
 
 # 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>
-    """))
+# 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:

{pyegeria-5.3.3.10.dev6 → pyegeria-5.3.3.10.dev8}/pyegeria/metadata_explorer_omvs.py

@@ -489,49 +489,6 @@ class MetadataExplorer(Client):
         )
         return response
 
-    # def get_metadata_element_mermaid_graph(
-    #     self,
-    #     guid: str,
-    #     effective_time: str = None,
-    #     as_of_time: str = None,
-    #     for_lineage: bool = None,
-    #     for_duplicate_processing: bool = None,
-    # ) -> dict | str:
-    #     """
-    #     Retrieve the metadata element using its unique identifier.
-    #
-    #     Parameters
-    #     ----------
-    #     guid : str
-    #         - unique identifier of the element to retrieve
-    #     effective_time: str, default = None
-    #         - Time format is "YYYY-MM-DDTHH:MM:SS" (ISO 8601)
-    #     as_of_time: str, default = None
-    #         - Query the element as of this time. If None, then use current time.
-    #     for_lineage: bool, default is set by server
-    #         - determines if elements classified as Memento should be returned - normally false
-    #     for_duplicate_processing: bool, default is set by server
-    #         - Normally false. Set true when the caller is part of a deduplication function
-    #
-    #     Returns
-    #     -------
-    #     dict | str
-    #         If the element is found, a dict of the element details is returned. Otherwise the string "No element found".
-    #
-    #     Raises
-    #     ------
-    #     InvalidParameterException
-    #         one of the parameters is null or invalid or
-    #     PropertyServerException
-    #         There is a problem adding the element properties to the metadata repository or
-    #     UserNotAuthorizedException
-    #         the requesting user is not authorized to issue this request.
-    #     """
-    #
-    #     response = self.get_metadata_element_graph(
-    #         guid, effective_time, as_of_time, for_lineage, for_duplicate_processing
-    #     )
-    #     return response.get("mermaidGraph", NO_ELEMENTS_FOUND)
 
     async def _async_get_metadata_element_by_unique_name(
         self,