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

commands/cat/list_terms.py

@@ -19,46 +19,29 @@ from rich.table import Table
 from rich.text import Text
 
 from pyegeria import (
-    EgeriaTech,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException, NO_CATEGORIES_FOUND,
-    )
-from commands.cat.glossary_actions import EGERIA_HOME_GLOSSARY_GUID
-from pyegeria._globals import NO_GLOSSARIES_FOUND
-
+    EgeriaTech, settings,
+    PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
+)
+from pyegeria.core._globals import NO_GLOSSARIES_FOUND
+app_config = settings.Environment
+# config_logging()
 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("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", "250"))
-EGERIA_GLOSSARY_PATH = os.environ.get("EGERIA_GLOSSARY_PATH", None)
-EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "../../")
-EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "md_processing/dr_egeria_inbox")
-EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "md_processing/dr_egeria_outbox")
 
 
 def display_glossary_terms(
     search_string: str = "*",
-    glossary_guid: str = EGERIA_HOME_GLOSSARY_GUID,
+    glossary_guid: str = settings.User_Profile.egeria_home_glossary_name,
     glossary_name: str = None,
-    view_server: str = EGERIA_VIEW_SERVER,
-    view_url: str = EGERIA_VIEW_SERVER_URL,
+    view_server: str = app_config.egeria_view_server,
+    view_url: str = app_config.egeria_view_server_url,
     user_id: str = EGERIA_USER,
     user_pass: str = EGERIA_USER_PASSWORD,
-    jupyter: bool = EGERIA_JUPYTER,
-    width: int = EGERIA_WIDTH,
+    jupyter: bool = app_config.egeria_jupyter,
+    width: int = app_config.console_width,
     output_format: str = "TABLE",
 ):
     """Display a table of glossary terms filtered by search_string and glossary, if specified. If no
@@ -113,7 +96,7 @@ def display_glossary_terms(
         elif output_format == "REPORT":
             action = "Report"
         if output_format != "TABLE":
-            file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH)
+            file_path = os.path.join(app_config.pyegeria_root, app_config.egeria_outbox)
             file_name = f"Terms-{time.strftime('%Y-%m-%d-%H-%M-%S')}-{action}.md"
             full_file_path = os.path.join(file_path, file_name)
             os.makedirs(os.path.dirname(full_file_path), exist_ok=True)
@@ -126,12 +109,8 @@ def display_glossary_terms(
             print(f"\n==> Terms output written to {full_file_path}")
             return
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-        ) as e:
-        console.print_exception()
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
 
 
 
@@ -154,16 +133,12 @@ def display_glossary_terms(
         table.add_column("Summary")
         table.add_column("Description")
         table.add_column("Glossary")
+        table.add_column("Collection Folder")
         table.add_column("Status")
-        table.add_column("Categories")
         table.add_column("Example/Usage", min_width=50)
 
         terms = g_client.find_glossary_terms(
             search_string,
-            glossary_guid,
-            starts_with=False,
-            ends_with=False,
-            status_filter=[],
             page_size=500,
         )
 
@@ -171,14 +146,14 @@ def display_glossary_terms(
             print(f"No terms found! - {search_string} : {glossary_guid} ")
             sys.exit(0)
         sorted_terms = sorted(
-            terms, key=lambda k: k["glossaryTermProperties"].get("displayName","---")
+            terms, key=lambda k: k["properties"].get("displayName","---")
         )
         style = "bright_white on black"
         if type(terms) is str:
             return table
         glossary_info = {}
         for term in sorted_terms:
-            props = term.get("glossaryTermProperties", "None")
+            props = term.get("properties", "None")
             if props == "None":
                 return table
 
@@ -197,28 +172,18 @@ def display_glossary_terms(
             usage = props.get("usage", "---")
             ex_us_out = Markdown(f"Example:\n{example}\n---\nUsage: \n{usage}")
 
-            classifications = term["elementHeader"]["classifications"]
-            glossary_guid = None
-            for c in classifications:
-                if c["classificationName"] == "Anchors":
-                    glossary_guid = c["classificationProperties"]["anchorScopeGUID"]
-
-            if glossary_guid and glossary_guid in glossary_info:
-                glossary_name = glossary_info[glossary_guid]
-            elif glossary_guid:
-                g = g_client.get_glossary_for_term(term_guid)
-                glossary_name = g["glossaryProperties"].get("displayName", "---")
-                glossary_info[glossary_guid] = glossary_name
-            else:
-                glossary_name = "---"
+            parents = term.get('memberOfCollections',[])
+            glossary_list_md = ""
             category_list_md = ""
-            category_list = g_client.get_categories_for_term(term_guid)
-            if type(category_list) is str and category_list == NO_CATEGORIES_FOUND:
-                category_list_md = '---'
-            elif isinstance(category_list, list) and len(category_list) > 0:
-                for category in category_list:
-                    category_name = category["glossaryCategoryProperties"].get("displayName",'---')
-                    category_list_md += f"* {category_name}\n"
+            for parent in parents:
+                parent_q_name = parent.get('relatedElement',{}).get('properties',{}).get('qualifiedName','---')
+                parent_type = parent.get('relatedElement',{}).get('elementHeader',{}).get('type',{}).get('typeName','---')
+                if parent_type == 'Glossary':
+                    glossary_list_md += f"{parent_q_name}\n"
+                elif parent_type == 'CollectionFolder':
+                    category_list_md += f"{parent_q_name}\n"
+
+
             term_abb_ver_out = Markdown(f"{display_name}\n---\n{abbrev}\n---\n{version}")
             category_list_out = Markdown(category_list_md)
 
@@ -228,9 +193,9 @@ def display_glossary_terms(
                 q_name,
                 summary,
                 description,
-                glossary_name,
-                term_status,
+                glossary_list_md,
                 category_list_out,
+                term_status,
                 ex_us_out,
                 style="bold white on black",
             )
@@ -242,12 +207,8 @@ def display_glossary_terms(
         with console.pager(styles=True):
             console.print(generate_table(search_string, glossary_guid))
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        console.print_exception()
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
 
 
 def main():
@@ -262,12 +223,12 @@ 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 EGERIA_VIEW_SERVER
+    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 EGERIA_PLATFORM_URL
+    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
-    guid = args.guid if args.guid is not None else EGERIA_HOME_GLOSSARY_GUID
+    guid = args.guid if args.guid is not None else settings.User_Profile.egeria_home_glossary_name
 
     try:
         search_string = Prompt.ask("Enter the term you are searching for:", default="*")
@@ -277,10 +238,8 @@ def main():
         )
         output_format = Prompt.ask("What output format do you want?", choices=["TABLE", "FORM", "REPORT"], default="TABLE")
 
-        display_glossary_terms(
-        search_string, guid, glossary_name, server, url,
-            userid, user_pass, output_format= output_format
-        )
+        display_glossary_terms(search_string, guid, glossary_name, server, url, userid, user_pass,
+                               output_format=output_format)
 
     except KeyboardInterrupt:
         pass

commands/cat/list_todos.py

@@ -20,12 +20,9 @@ from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    PyegeriaAPIException, PyegeriaClientException, print_basic_exception, print_exception_table
 )
-from pyegeria.my_profile_omvs import MyProfile
+from pyegeria.omvs.my_profile import MyProfile
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
@@ -148,12 +145,8 @@ def display_to_dos(
         with console.pager():
             console.print(generate_table(search_string))
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        print_exception_response(e)
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
     except KeyboardInterrupt:
         pass
     finally:

commands/cat/list_user_ids.py

@@ -13,10 +13,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()
@@ -111,12 +108,8 @@ def list_user_ids(
         with console.pager(styles=True):
             console.print(generate_table())
 
-    except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
-    ) as e:
-        print_exception_response(e)
+    except (PyegeriaAPIException, PyegeriaClientException) as e:
+        print_basic_exception(e)
         print("Perhaps the type name isn't known")
     finally:
         c_client.close_session()