pyegeria 5.3.9.9.3__py3-none-any.whl → 5.5.3.3__py3-none-any.whl

commands/tech/list_related_elements_with_prop_value.py

@@ -15,27 +15,19 @@ from rich.table import Table
 
 from pyegeria import (
     EgeriaTech,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    PyegeriaException,
+    ValidMetadataManager,
+    print_basic_exception,
+    settings,
+    config_logging
 )
 
-console = Console()
-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("EGERIA_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", "220"))
+
+app_config = settings.Environment
+config_logging()
+console = Console(width=app_config.console_width)
 
 
 def list_related_elements_with_prop_value(
@@ -48,8 +40,8 @@ def list_related_elements_with_prop_value(
     url: str,
     username: str,
     password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
 ):
     c_client = EgeriaTech(server, url, user_id=username, user_pwd=password)
     token = c_client.create_egeria_bearer_token()
@@ -165,11 +157,9 @@ def list_related_elements_with_prop_value(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
         print("\n\nPerhaps the type name isn't known")
     finally:
         c_client.close_session()
@@ -184,8 +174,8 @@ def main():
 
     args = parser.parse_args()
 
-    server = args.server.strip() if args.server is not None else EGERIA_VIEW_SERVER
-    url = args.url.strip if args.url is not None else EGERIA_PLATFORM_URL
+    server = args.server.strip() if args.server is not None else app_config.egeria_view_server
+    url = args.url.strip if args.url is not None else app_config.egeria_platform_url
     userid = args.userid.strip() if args.userid is not None else EGERIA_USER
     password = (
         args.password.strip() if args.password is not None else EGERIA_USER_PASSWORD

commands/tech/list_related_specification.py

@@ -20,10 +20,7 @@ from rich.table import Table
 
 from pyegeria import (
     ClassificationManager,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
 )
 
 console = Console()

commands/tech/list_relationship_types.py

@@ -18,27 +18,19 @@ from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
     ValidMetadataManager,
-    print_exception_response,
+    print_basic_exception,
+    settings,
+    config_logging
 )
 
-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("EGERIA_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"))
+
+app_config = settings.Environment
+config_logging()
+console = Console(width=app_config.console_width)
 
 
 def display_relationship_types(
@@ -48,10 +40,10 @@ def display_relationship_types(
     username: str,
     user_pass: str,
     save_output: bool = False,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
 ):
-    p_client = ValidMetadataManager(server, url, user_id=username)
+    p_client = ValidMetadataManager(server, url, user_id=username, user_pwd=user_pass)
     token = p_client.create_egeria_bearer_token(username, user_pass)
 
     def generate_table(type_name: str) -> Table:
@@ -126,15 +118,13 @@ def display_relationship_types(
             console.save_html("projects.html")
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException,
         ValueError,
     ) as e:
         if type(e) is str:
             print(e)
         else:
-            print_exception_response(e)
+            print_basic_exception(e)
 
 
 def main():
@@ -147,8 +137,8 @@ def main():
 
     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
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.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
     save_output = args.save_output if args.save_output is not None else False

commands/tech/list_relationships.py

@@ -21,29 +21,18 @@ from rich.table import Table
 
 from pyegeria import (
     ClassificationManager,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    max_paging_size,
+    PyegeriaException,
+    print_basic_exception,
+    settings,
+    config_logging
 )
 
-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("EGERIA_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"))
-
 
-disable_ssl_warnings = True
+app_config = settings.Environment
+config_logging()
+console = Console(width=app_config.console_width)
 
 
 def list_relationships(
@@ -53,11 +42,11 @@ def list_relationships(
     username: str,
     user_password: str,
     time_out: int = 60,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
 ):
     console = Console(width=width, force_terminal=not jupyter, soft_wrap=True)
-    if (search_string is None) or ((len(search_string) < 3)) and (search_string != "*"):
+    if (search_string is None) or (len(search_string) < 3) and (search_string != "*"):
         raise ValueError(
             "Invalid Search String - must be greater than four characters long"
         )
@@ -88,9 +77,8 @@ def list_relationships(
         table.add_column("End 2 Type")
         table.add_column("Properties", min_width=40)
 
-        rel_list = g_client.get_relationships(
-            search_string, page_size=max_paging_size, time_out=time_out
-        )
+        rel_list = g_client.get_relationships(search_string, page_size=0, time_out=time_out,
+                                              output_format="JSON")
         if type(rel_list) is str:
             return table
 
@@ -127,21 +115,17 @@ def list_relationships(
         return table
 
     try:
-        # with Live(generate_table(), refresh_per_second=4, screen=True) as live:
-        #     while True:
-        #         time.sleep(2)
-        #         live.update(generate_table())
-
         with console.pager(styles=True):
             console.print(generate_table(search_string), soft_wrap=True)
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        console.print_exception()
-        sys.exit(1)
+        if e.response_egeria_msg_id == "OMAG-COMMON-400-018":
+            print("\n\n==>Invalid Relationship Type\n\n")
+        else:
+            print_basic_exception(e)
+            assert False, "Invalid request"
 
     except ValueError as e:
         console.print(
@@ -160,8 +144,8 @@ def main():
 
     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
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.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
     time_out = args.time_out if args.time_out is not None else 60

commands/tech/list_solution_blueprints.py

@@ -21,33 +21,27 @@ from rich.text import Text
 from rich.tree import Tree
 
 from pyegeria import (
-    InvalidParameterException,
-    ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
+    print_basic_exception,
+    SolutionArchitect,
+    settings, load_app_config, pretty_print_config,
+    config_logging,
     save_mermaid_html,
 )
-from pyegeria._exceptions import print_exception_response
-from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
-from pyegeria.solution_architect_omvs import SolutionArchitect
-
-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("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+
+
+
+
+app_config = settings.Environment
+config_path = os.path.join(app_config.pyegeria_config_directory, app_config.pyegeria_config_file)
+
 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"))
-EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
-
+EGERIA_MERMAID_FOLDER = os.path.join(app_config.pyegeria_root, app_config.egeria_mermaid_folder)
+conf = load_app_config(config_path)
+# print(f"Loading config from {config_path} and mermaid folder is {EGERIA_MERMAID_FOLDER}")
+console = Console(width = app_config.console_width)
+config_logging()
 
 def blueprint_list(
     search_string: str,
@@ -55,13 +49,15 @@ def blueprint_list(
     platform_url: str,
     user: str,
     user_password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
     timeout: int = 30,
 ):
     """A Supply Chain viewer"""
+    print(user + ":" + user_password )
+    start_time = time.time()
     client = SolutionArchitect(server_name, platform_url, user, user_password)
-    token = client.create_egeria_bearer_token()
+    token = client.create_egeria_bearer_token(user,user_password)
 
     def generate_table() -> Table | str:
         table = Table(
@@ -100,7 +96,7 @@ def blueprint_list(
                 link = save_mermaid_html(
                     bp_name, bp_mermaid, f"{EGERIA_MERMAID_FOLDER}/blueprints"
                 )
-                link = f"file://:{link}"
+                link = f"file://{link}"
                 bp_mermaid = Text(link, style="blue link " + link)
 
             bp_mermaid_label = Text(f"{bp_name}\n\n--\n\n{bp_mermaid}")
@@ -149,11 +145,9 @@ def blueprint_list(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
 
 
 def main():
@@ -165,11 +159,12 @@ def main():
     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
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.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)

commands/tech/list_solution_components.py

@@ -21,32 +21,28 @@ from rich.text import Text
 from rich.tree import Tree
 
 from pyegeria import (
-    InvalidParameterException,
-    ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
+    print_basic_exception,
+    SolutionArchitect,
+    settings, load_app_config, pretty_print_config,
+    config_logging,
     save_mermaid_html,
 )
-from pyegeria._exceptions import print_exception_response
-from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
-from pyegeria.solution_architect_omvs import SolutionArchitect
 
-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("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+
+app_config = settings.Environment
+config_path = os.path.join(app_config.pyegeria_config_directory, app_config.pyegeria_config_file)
+
 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"))
-EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
+EGERIA_MERMAID_FOLDER = os.path.join(app_config.pyegeria_root, app_config.egeria_mermaid_folder)
+conf = load_app_config(config_path)
+# print(f"Loading config from {config_path} and mermaid folder is {EGERIA_MERMAID_FOLDER}")
+console = Console(width = app_config.console_width)
+config_logging()
+
+
+disable_ssl_warnings = True
 
 
 def solution_component_list(
@@ -55,8 +51,8 @@ def solution_component_list(
     platform_url: str,
     user: str,
     user_password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
     timeout: int = 30,
 ):
     """A Solution Component viewer"""
@@ -153,11 +149,9 @@ def solution_component_list(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
 
 
 def main():
@@ -169,8 +163,8 @@ def main():
     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
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.egeria_view_server_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
 

commands/tech/list_solution_roles.py

@@ -18,35 +18,26 @@ 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 import (
-    InvalidParameterException,
-    ProjectManager,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
+    print_basic_exception,
+    SolutionArchitect,
+    settings, load_app_config, pretty_print_config,
+    config_logging,
     save_mermaid_html,
 )
-from pyegeria._exceptions import print_exception_response
-from pyegeria.mermaid_utilities import EGERIA_MERMAID_FOLDER
-from pyegeria.solution_architect_omvs import SolutionArchitect
-
-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("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+
+
+app_config = settings.Environment
+config_path = os.path.join(app_config.pyegeria_config_directory, app_config.pyegeria_config_file)
+
 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"))
-EGERIA_MERMAID_FOLDER = os.environ.get("EGERIA_MERMAID_FOLDER", "work/mermaid_graphs")
+EGERIA_MERMAID_FOLDER = os.path.join(app_config.pyegeria_root, app_config.egeria_mermaid_folder)
+conf = load_app_config(config_path)
+# print(f"Loading config from {config_path} and mermaid folder is {EGERIA_MERMAID_FOLDER}")
+console = Console(width = app_config.console_width)
+config_logging()
 
 
 def solution_role_list(
@@ -55,8 +46,8 @@ def solution_role_list(
     platform_url: str,
     user: str,
     user_password: str,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
     timeout: int = 30,
 ):
     """A Supply Chain viewer"""
@@ -152,11 +143,9 @@ def solution_role_list(
             console.print(generate_table())
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
 
 
 def main():
@@ -168,8 +157,8 @@ def main():
     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
+    server = args.server if args.server is not None else app_config.egeria_view_server
+    url = args.url if args.url is not None else app_config.egeria_view_server_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