pyegeria 5.2.1__py3-none-any.whl → 5.3__py3-none-any.whl

{pyegeria/commands → commands}/cat/list_deployed_database_schemas.py

@@ -1,32 +1,33 @@
 """This creates a templates guid file from the core metadata archive"""
-from rich.markdown import Markdown
-from rich.prompt import Prompt
-import os
+
 import argparse
-import time
+import os
 import sys
+import time
+
 from rich import box
 from rich.console import Console
+from rich.markdown import Markdown
+from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
+    EgeriaTech,
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    EgeriaTech,
 )
 
-
 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("VIEW_SERVER", "view-server")
+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_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")
@@ -136,7 +137,7 @@ def list_deployed_database_schemas(
             for c in el_classification:
                 el_cat_guid = "---"
                 if c["type"]["typeName"] == "Anchors":
-                    el_anchor_guid = c["classificationProperties"]["anchorGUID"]
+                    el_anchor_guid = c["classificationProperties"].get("anchorGUID",'---')
                     el_anchor_type_name = c["classificationProperties"][
                         "anchorTypeName"
                     ]

{pyegeria/commands → commands}/cat/list_deployed_databases.py

@@ -1,32 +1,33 @@
 """This displays deployed databases"""
-from rich.markdown import Markdown
-from rich.prompt import Prompt
-import os
+
 import argparse
-import time
+import os
 import sys
+import time
+
 from rich import box
 from rich.console import Console
+from rich.markdown import Markdown
+from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
+    EgeriaTech,
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    EgeriaTech,
 )
 
-
 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("VIEW_SERVER", "view-server")
+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_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")

pyegeria/commands/cat/list_servers_deployed_imp.py → commands/cat/list_deployed_servers.py

@@ -25,19 +25,19 @@ from rich.text import Text
 from pyegeria import (
     InvalidParameterException,
     PropertyServerException,
+    RuntimeManager,
     UserNotAuthorizedException,
     print_exception_response,
-    RuntimeManager,
 )
 
 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("VIEW_SERVER", "view-server")
+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_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

{pyegeria/commands → commands}/cat/list_glossaries.py

@@ -15,15 +15,16 @@ import time
 
 from rich import box
 from rich.console import Console
+from rich.markdown import Markdown
 from rich.prompt import Prompt
 from rich.table import Table
 from rich.text import Text
 
 from pyegeria import (
+    EgeriaTech,
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
-    EgeriaTech,
     print_exception_response,
 )
 
@@ -32,17 +33,22 @@ 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("VIEW_SERVER", "view-server")
+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_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"))
+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_glossaries(
@@ -53,6 +59,7 @@ def display_glossaries(
     user_pass: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
+    output_format: str = "JSON"
 ):
     """Display either a specified glossary or all glossaries if the search_string is '*'.
     Parameters
@@ -71,10 +78,39 @@ def display_glossaries(
         A boolean indicating whether the output is intended for a Jupyter notebook (default is EGERIA_JUPYTER).
     width : int, optional
         The width of the console output (default is EGERIA_WIDTH).
+    output_format: str, optional, default is 'JSON'
+        One of TABLE, FORM, REPORT
     """
     m_client = EgeriaTech(view_server, view_url, user_id=user, user_pwd=user_pass)
     token = m_client.create_egeria_bearer_token()
+    console = Console(
+        style="bold bright_white on black",
+        width=width,
+        force_terminal=not jupyter,
+        )
+
     try:
+        if output_format == "FORM":
+            action = "Update-Form"
+        elif output_format == "REPORT":
+            action = "Report"
+        if output_format != "TABLE":
+            file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH)
+            file_name = f"Glossaries-{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)
+            output = m_client.find_glossaries(search_string,  None, output_format=output_format)
+            if output == "NO_GLOSSARIES_FOUND":
+                print(f"\n==> No glossaries found for search string '{search_string}'")
+                return
+            try:
+                with open(full_file_path, 'w') as f:
+                    f.write(output)
+                print(f"\n==> Glossaries output written to {full_file_path}")
+                return
+            except Exception:
+                console.print_exception()
+
         table = Table(
             title=f"Glossary List @ {time.asctime()}",
             style="bright_white on black",
@@ -93,6 +129,7 @@ def display_glossaries(
         table.add_column("Language")
         table.add_column("Description")
         table.add_column("Usage")
+        table.add_column("Categories")
 
         glossaries = m_client.find_glossaries(search_string)
         if type(glossaries) is list:
@@ -100,19 +137,23 @@ def display_glossaries(
                 glossaries, key=lambda k: k["glossaryProperties"]["displayName"]
             )
             for glossary in sorted_glossary_list:
-                display_name = glossary["glossaryProperties"]["displayName"]
+                display_name = glossary["glossaryProperties"].get("displayName",'---')
                 qualified_name = glossary["glossaryProperties"]["qualifiedName"]
                 guid = glossary["elementHeader"]["guid"]
                 q_name = Text(f"{qualified_name}\n&\n{guid}", justify="center")
-                language = glossary["glossaryProperties"]["language"]
-                description = glossary["glossaryProperties"]["description"]
-                usage = glossary["glossaryProperties"]["usage"]
-                table.add_row(display_name, q_name, language, description, usage)
-            console = Console(
-                style="bold bright_white on black",
-                width=width,
-                force_terminal=not jupyter,
-            )
+                language = glossary["glossaryProperties"].get("language",'---')
+                description = glossary["glossaryProperties"].get("description",'---')
+                usage = glossary["glossaryProperties"].get("usage",'---')
+
+                categories = m_client.get_categories_for_glossary(guid)
+                cat_md = ''
+                if type(categories) is list:
+                    for category in categories:
+                        cat_md += f"* {category['glossaryCategoryProperties'][('displayName')]}\n"
+                    cat_md = cat_md.strip()
+
+                table.add_row(display_name, q_name, language, description, usage, Markdown(cat_md))
+
             console.print(table)
 
     except (InvalidParameterException, PropertyServerException) as e:
@@ -139,8 +180,9 @@ def main():
         search_string = Prompt.ask(
             "Enter the glossary you are searching for or '*' for all:", default="*"
         )
-
-        display_glossaries(search_string, server, url, userid, user_pass)
+        output_format = Prompt.ask("What output format do you want?", choices=["TABLE", "FORM", "REPORT"], default="TABLE")
+        display_glossaries(search_string, server, url, userid,
+                           user_pass, output_format=output_format)
 
     except KeyboardInterrupt:
         pass

{pyegeria/commands → commands}/cat/list_projects.py

@@ -14,28 +14,28 @@ import json
 import os
 import time
 
-from rich import box
-from rich import print
+from rich import box, print
 from rich.console import Console
 from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
+    ClassificationManager,
     InvalidParameterException,
+    ProjectManager,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
 )
-from pyegeria import ProjectManager, ClassificationManager
 
 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("VIEW_SERVER", "view-server")
+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_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

{pyegeria/commands → commands}/cat/list_tech_type_elements.py

@@ -19,21 +19,21 @@ from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
+    AutomatedCuration,
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    AutomatedCuration,
 )
 
 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("VIEW_SERVER", "view-server")
+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_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")

{pyegeria/commands → commands}/cat/list_tech_types.py

@@ -8,8 +8,8 @@ Unit tests for the Utils helper functions using the Pytest framework.
 
 A simple display for my profile
 """
-import os
 import argparse
+import os
 import sys
 import time
 
@@ -19,21 +19,21 @@ from rich.prompt import Prompt
 from rich.table import Table
 
 from pyegeria import (
+    AutomatedCuration,
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    AutomatedCuration,
 )
 
 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("VIEW_SERVER", "view-server")
+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_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")

{pyegeria/commands → commands}/cat/list_terms.py

@@ -3,8 +3,6 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-Unit tests for the Utils helper functions using the Pytest framework.
-
 
 A simple display for glossary terms
 """
@@ -15,35 +13,40 @@ import time
 
 from rich import box
 from rich.console import Console
+from rich.markdown import Markdown
 from rich.prompt import Prompt
 from rich.table import Table
 from rich.text import Text
 
 from pyegeria import (
+    EgeriaTech,
     InvalidParameterException,
     PropertyServerException,
-    UserNotAuthorizedException,
-    EgeriaTech,
-)
-from pyegeria.commands.cat.glossary_actions import EGERIA_HOME_GLOSSARY_GUID
+    UserNotAuthorizedException, NO_CATEGORIES_FOUND,
+    )
+from commands.cat.glossary_actions import EGERIA_HOME_GLOSSARY_GUID
+from pyegeria._globals import NO_GLOSSARIES_FOUND
 
 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("VIEW_SERVER", "view-server")
+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_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"))
-EGERIA_HOME_GLOSSARY_GUID = os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None)
+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(
@@ -56,6 +59,7 @@ def display_glossary_terms(
     user_pass: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
+    output_format: str = "TABLE",
 ):
     """Display a table of glossary terms filtered by search_string and glossary, if specified. If no
         filters then all terms are displayed. If glossary_guid or name is specified, then only terms from that
@@ -84,22 +88,54 @@ def display_glossary_terms(
         Flag to indicate if the output should be formatted for Jupyter notebook. Defaults to EGERIA_JUPYTER.
     width : int
         The width of the console output. Defaults to EGERIA_WIDTH.
+        output_format: str, optional, default is 'JSON'
+        One of TABLE, FORM, REPORT
     """
 
     console = Console(
         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()
-    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":
-            console.print(
-                f"\nThe glossary name {glossary_name} was not found. Please try using the glossary guid"
-            )
-            sys.exit(0)
+    try:
+        g_client = EgeriaTech(view_server, view_url, user_id, user_pass)
+        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_GLOSSARIES_FOUND:
+                console.print(
+                    f"\nThe glossary name {glossary_name} was not found. Please try using the glossary guid"
+                )
+                sys.exit(1)
+        elif (glossary_guid is not None) and (len(glossary_guid) < 10):
+                glossary_guid = None
+
+        if output_format == "FORM":
+            action = "Update-Form"
+        elif output_format == "REPORT":
+            action = "Report"
+        if output_format != "TABLE":
+            file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH)
+            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)
+            output = g_client.find_glossary_terms(search_string, glossary_guid, output_format=output_format)
+            if output == "NO_TERMS_FOUND":
+                print(f"\n==> No terms found for search string '{search_string}'")
+                return
+            with open(full_file_path, 'w') as f:
+                f.write(output)
+            print(f"\n==> Terms output written to {full_file_path}")
+            return
+
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+        ) as e:
+        console.print_exception()
 
-    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()}",
@@ -113,15 +149,14 @@ def display_glossary_terms(
             caption=f"View Server '{view_server}' @ Platform - {view_url}",
             expand=True,
         )
-        table.add_column("Term Name")
-        table.add_column("Qualified Name / GUID", width=38, no_wrap=True)
-        table.add_column("Abbreviation")
+        table.add_column("Term Name / Abbreviation / Version")
+        table.add_column("Qualified Name / GUID / Aliases", width=38, no_wrap=True)
         table.add_column("Summary")
         table.add_column("Description")
-        table.add_column("Version Id")
         table.add_column("Glossary")
         table.add_column("Status")
-        table.add_column("Example")
+        table.add_column("Categories")
+        table.add_column("Example/Usage", min_width=50)
 
         terms = g_client.find_glossary_terms(
             search_string,
@@ -133,10 +168,10 @@ 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"]
+            terms, key=lambda k: k["glossaryTermProperties"].get("displayName","---")
         )
         style = "bright_white on black"
         if type(terms) is str:
@@ -147,27 +182,26 @@ def display_glossary_terms(
             if props == "None":
                 return table
 
-            display_name = Text(props["displayName"], style=style, justify="center")
+            display_name = props.get("displayName","---")
             qualified_name = props["qualifiedName"]
             term_guid = term["elementHeader"]["guid"]
+            aliases = props.get("aliases", "---")
             q_name = Text(
-                f"{qualified_name}\n&\n{term_guid}", style=style, justify="center"
-            )
-            abbrev = Text(props.get("abbreviation", " "), style=style, justify="center")
-            summary = Text(props.get("summary", " "), style=style)
-            description = Text(props.get("description", " "), style=style)
-            version = Text(
-                props.get("publishVersionIdentifier", " "),
-                style=style,
-                justify="center",
+                f"{qualified_name}\n&\n{term_guid}\n&\n{aliases}", style=style, justify="center"
             )
-            example = Text(props.get("example", " "), style=style)
+            abbrev = props.get("abbreviation", "---")
+            summary = props.get("summary", "---")
+            description = Markdown(props.get("description",'---'))
+            version = props.get("publishVersionIdentifier", "---")
+            example = props.get("example", "---")
+            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"]["anchorGUID"]
+                    glossary_guid = c["classificationProperties"]["anchorScopeGUID"]
 
             if glossary_guid and glossary_guid in glossary_info:
                 glossary_name = glossary_info[glossary_guid]
@@ -177,18 +211,27 @@ def display_glossary_terms(
                 glossary_info[glossary_guid] = glossary_name
             else:
                 glossary_name = "---"
+            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"
+            term_abb_ver_out = Markdown(f"{display_name}\n---\n{abbrev}\n---\n{version}")
+            category_list_out = Markdown(category_list_md)
 
-            term_status = term["elementHeader"]["status"]
+            term_status = term["elementHeader"].get("status","---")
             table.add_row(
-                display_name,
+                term_abb_ver_out,
                 q_name,
-                abbrev,
                 summary,
                 description,
-                version,
                 glossary_name,
                 term_status,
-                example,
+                category_list_out,
+                ex_us_out,
                 style="bold white on black",
             )
 
@@ -218,7 +261,9 @@ 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
+
     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
@@ -230,8 +275,11 @@ def main():
             "Enter the name of the glossary to search or '*' for all glossaries:",
             default="*",
         )
+        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
+        search_string, guid, glossary_name, server, url,
+            userid, user_pass, output_format= output_format
         )
 
     except KeyboardInterrupt:

{pyegeria/commands → commands}/cat/list_todos.py

@@ -9,8 +9,8 @@ Unit tests for the Utils helper functions using the Pytest framework.
 
 A simple display for glossary terms
 """
-import os
 import argparse
+import os
 import time
 
 from rich import box
@@ -30,11 +30,11 @@ from pyegeria.my_profile_omvs import MyProfile
 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("VIEW_SERVER", "view-server")
+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_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )