pyegeria 5.3.3.8__tar.gz → 5.3.3.10__tar.gz

{pyegeria-5.3.3.8 → pyegeria-5.3.3.10}/PKG-INFO

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

{pyegeria-5.3.3.8 → pyegeria-5.3.3.10}/pyegeria/__init__.py

@@ -68,14 +68,16 @@ 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
+from .mermaid_utilities import load_mermaid, render_mermaid, generate_process_graph, save_mermaid_graph
 from .egeria_my_client import EgeriaMy
+
+from .solution_architect_omvs import SolutionArchitect
+
 from .egeria_cat_client import EgeriaCat
 from .egeria_tech_client import EgeriaTech
 from .egeria_config_client import EgeriaConfig
 from .egeria_client import Egeria
 
-
 #
 # The following assignments were generated by the `create_tech_guid_lists.py` utility that uses the pyegeria functions
 # to interrogate Egeria (and the Core Content Pack) for the GUIDS associates with integration connectors and templates.

{pyegeria-5.3.3.8 → pyegeria-5.3.3.10}/pyegeria/_client.py

@@ -10,6 +10,8 @@ import asyncio
 import inspect
 import json
 import os
+from datetime import datetime
+
 from pyegeria import body_slimmer
 import httpx
 from httpx import AsyncClient, Response
@@ -469,7 +471,7 @@ class Client:
                 msg = OMAGCommonErrorCode.CLIENT_SIDE_REST_API_ERROR.value[
                     "message_template"
                 ].format(
-                    str(response.status_code),
+                    str(response.status_code) + " " + datetime.now().strftime("%H: %M: %S") ,
                     caller_method,
                     class_name,
                     endpoint,

{pyegeria-5.3.3.8 → pyegeria-5.3.3.10}/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.8 → pyegeria-5.3.3.10}/pyegeria/commands/cat/list_terms.py

@@ -90,16 +90,16 @@ def display_glossary_terms(
         style="bold bright_white on black", width=width, force_terminal=not jupyter
     )
     g_client = EgeriaTech(view_server, view_url, user_id, user_pass)
-    token = g_client.create_egeria_bearer_token()
+    token = g_client.create_egeria_bearer_token(user_id, user_pass)
     if (glossary_name is not None) and (glossary_name != "*"):
         glossary_guid = g_client.get_guid_for_name(glossary_name)
-        if glossary_guid == "No elements found":
+        if glossary_guid == "Glossary guid not found":
             console.print(
                 f"\nThe glossary name {glossary_name} was not found. Please try using the glossary guid"
             )
-            sys.exit(0)
+            sys.exit(1)
 
-    def generate_table(search_string: str, glossary_guid: str = None) -> Table:
+    def generate_table(search_string: str, glossary_guid: str) -> Table:
         """Make a new table."""
         table = Table(
             title=f"Glossary Definitions for Terms like  {search_string} @ {time.asctime()}",
@@ -133,7 +133,7 @@ def display_glossary_terms(
         )
 
         if type(terms) is str:
-            print(f"No terms found!")
+            print(f"No terms found! - {search_string} : {glossary_guid} ")
             sys.exit(0)
         sorted_terms = sorted(
             terms, key=lambda k: k["glossaryTermProperties"]["displayName"]
@@ -219,10 +219,10 @@ def main():
     args = parser.parse_args()
 
     # server = args.server if args.server is not None else EGERIA_VIEW_SERVER
-    server = args.server if args.server is not None else 'qs-view-server'
+    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'
+    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
     guid = args.guid if args.guid is not None else EGERIA_HOME_GLOSSARY_GUID
 
@@ -233,7 +233,8 @@ def main():
             default="*",
         )
         display_glossary_terms(
-            search_string, guid, glossary_name, server, url, userid, user_pass
+            search_string, guid, glossary_name, server, url,
+            userid, user_pass
         )
 
     except KeyboardInterrupt:

{pyegeria-5.3.3.8 → pyegeria-5.3.3.10}/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.8 → pyegeria-5.3.3.10}/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.8 → pyegeria-5.3.3.10}/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.8 → pyegeria-5.3.3.10}/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.8 → pyegeria-5.3.3.10}/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.8 → pyegeria-5.3.3.10}/pyegeria/commands/ops/monitor_server_status.py

@@ -139,13 +139,16 @@ 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=4, screen=True) as live:
+        # with Live(generate_table(), refresh_per_second=1, screen=True) 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(2)
+                time.sleep(5)
                 live.update(generate_table())
 
     except (

pyegeria-5.3.3.10/pyegeria/commands/tech/list_information_blueprints.py

@@ -0,0 +1,166 @@
+#!/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
+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.text import Text
+from rich.tree import Tree
+from pyegeria.solution_architect_omvs import SolutionArchitect
+from pyegeria import (
+    ProjectManager,
+    UserNotAuthorizedException,
+    PropertyServerException,
+    InvalidParameterException,
+    )
+
+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", "qs-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", "150"))
+
+
+def blueprint_list(
+    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"""
+    client = SolutionArchitect(server_name, platform_url, user, user_password)
+    token = client.create_egeria_bearer_token()
+
+    def generate_table() -> Table | str:
+        table = Table(
+            title=f"Blueprints 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("Blueprint Name")
+        table.add_column("Qualified Name \n/\n GUID\n/\nVersion", width=38, no_wrap=False)
+        table.add_column("Description")
+        table.add_column("Solution Components")
+
+        blueprints = client.find_solution_blueprints(search_string)
+        if isinstance(blueprints, list) is False:
+            return "No Blueprints found"
+
+        for bp in blueprints:
+            bp_name = bp["properties"].get("displayName", '---')
+            bp_qname = bp["properties"].get("qualifiedName", '---')
+            bp_guid = bp["elementHeader"]["guid"]
+            bp_desc = bp["properties"].get("description",'---')
+            bp_unique_name = f"{bp_qname}\n\n\t\t/\n\n{bp_guid}"
+            bp_mermaid = bp.get("mermaid",'---')
+
+            bp_components = bp.get("solutionComponents",[])
+            comp_table = Table(title="No Solution Components")
+            for component in bp_components:
+                comp = component.get("solutionComponent","")
+                if isinstance(comp,dict) is False:
+                    continue
+                comp_props = comp.get("properties",{})
+                comp_name = comp_props.get("displayName",'---')
+                comp_description = comp_props.get("description",'---')
+                comp_planned = comp_props['extendedProperties'].get("plannedDeployedImplementationType",'---')
+                comp_type = comp_props.get('solutionComponentType','---')
+                comp_actors = comp_props.get('actors', [])
+                comp_actors_list = ""
+                for actor in comp_actors:
+                    comp_actor_role = actor['relationshipProperties'].get('role','---')
+                    comp_actor_props = actor['relatedElement'].get('properties',{})
+                    comp_actor_props_md = f"* Role: {comp_actor_role}\n"
+                    for prop in comp_actor_props.keys():
+                        comp_actor_props_md += f"* {prop}: {comp_actor_props[prop]}\n"
+                    comp_actors_list += comp_actor_props_md
+
+                comp_table = Table(title=f"Solution Component {comp_name}")
+                comp_table.add_column("Comp Type")
+                comp_table.add_column("Description")
+                comp_table.add_column("Planned Deployment")
+                comp_table.add_column("Actors")
+                comp_table.add_row(comp_type, comp_description, comp_planned, comp_actors_list)
+
+            table.add_row(bp_name, bp_unique_name, bp_desc, comp_table)
+
+        return table
+
+
+
+
+    try:
+        console = Console(width=width, force_terminal=not jupyter)
+        with console.pager():
+            console.print(generate_table())
+
+    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="*"
+        )
+        blueprint_list(search_string, server, url, userid, user_pass)
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()