pyegeria 5.3.6.2.4__tar.gz → 5.3.6.4__tar.gz

{pyegeria-5.3.6.2.4 → pyegeria-5.3.6.4}/PKG-INFO

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

{pyegeria-5.3.6.2.4 → pyegeria-5.3.6.4}/pyegeria/__init__.py

@@ -90,6 +90,9 @@ from .solution_architect_omvs import SolutionArchitect
 from .utils import body_slimmer, print_response
 from .valid_metadata_omvs import ValidMetadataManager
 from .x_action_author_omvs import ActionAuthor
+from .md_processing_utils import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
+                                  process_categories_upsert_command,
+                                  get_current_datetime_string, process_per_proj_upsert_command, commands)
 
 #
 # The following assignments were generated by the `create_tech_guid_lists.py` utility that uses the pyegeria functions

{pyegeria-5.3.6.2.4 → pyegeria-5.3.6.4}/pyegeria/_client.py

@@ -11,6 +11,7 @@ import asyncio
 import inspect
 import json
 import os
+import re
 from datetime import datetime
 
 import httpx
@@ -769,6 +770,15 @@ class Client:
         )
         return result
 
+    def __create_qualified_name__(self, type: str, display_name: str, local_qualifier: str = None) -> str:
+        """Helper function to create a qualified name for a given type and display name.
+           If present, the local qualifier will be prepended to the qualified name."""
+        EGERIA_LOCAL_QUALIFIER = os.environ.get("EGERIA_LOCAL_QUALIFIER", local_qualifier)
+        display_name = re.sub(r'\s','-',display_name.strip())
+        q_name = f"{type}:{display_name}"
+        if EGERIA_LOCAL_QUALIFIER:
+            q_name = f"{EGERIA_LOCAL_QUALIFIER}:{q_name}"
+        return q_name
 
 if __name__ == "__main__":
     print("Main-__client")

pyegeria-5.3.6.2.4/pyegeria/commands/cat/freddie_jupyter.py → pyegeria-5.3.6.4/pyegeria/commands/cat/dr_egeria_jupyter.py

@@ -1,28 +1,20 @@
 """
 This is an ongoing experiment in parsing and playing with Freddie docs
 """
-import json
 
-from jupyter_notebook_parser import JupyterNotebookParser
 import nbformat
 import os
-import re
-from pyegeria import EgeriaTech
-from rich import box, print
+from rich import print
 from rich.console import Console
-from rich.markdown import Markdown
-from rich.prompt import Prompt
-from rich.table import Table
-from freddie_utils import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
-                        get_current_datetime_string, process_per_proj_upsert_command, commands)
+from pyegeria.md_processing_utils import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
+                                          get_current_datetime_string, process_per_proj_upsert_command, commands)
 import click
-from pyegeria import EgeriaTech, body_slimmer, NO_GLOSSARIES_FOUND, NO_TERMS_FOUND, NO_ELEMENTS_FOUND, NO_PROJECTS_FOUND
+from pyegeria import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
+                      get_current_datetime_string, process_per_proj_upsert_command, commands,EgeriaTech
+                      )
 from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
     print_exception_response,
 )
-from datetime import datetime
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
@@ -44,8 +36,8 @@ EGERIA_JUPYTER = os.environ.get("EGERIA_JUPYTER", False)
 EGERIA_HOME_GLOSSARY_GUID = os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None)
 EGERIA_GLOSSARY_PATH = os.environ.get("EGERIA_GLOSSARY_PATH", None)
 EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "/Users/dwolfson/localGit/egeria-v5-3/egeria-python")
-EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/freddies-inbox")
-EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/freddies-outbox")
+EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/dr_egeria_inbox")
+EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/dr_egeria_outbox")
 
 console = Console(width=int(EGERIA_WIDTH))
 

pyegeria-5.3.6.2.4/pyegeria/commands/cat/freddie_md.py → pyegeria-5.3.6.4/pyegeria/commands/cat/dr_egeria_md.py

@@ -2,27 +2,20 @@
 This is an ongoing experiment in parsing and playing with Freddie docs
 """
 import json
-import mistune
-from jupyter_notebook_parser import JupyterNotebookParser
-import nbformat
 import os
-import re
-from pyegeria import EgeriaTech
-from rich import box, print
+from rich import print
 from rich.console import Console
 from rich.markdown import Markdown
-from rich.prompt import Prompt
-from rich.table import Table
-from freddie_utils import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
-                        get_current_datetime_string, process_per_proj_upsert_command, commands)
+
+from pyegeria.md_processing_utils import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
+                                          get_current_datetime_string, process_per_proj_upsert_command, commands,
+                                          process_provenance_command)
 
 import click
-from pyegeria import EgeriaTech, body_slimmer, NO_GLOSSARIES_FOUND, NO_TERMS_FOUND, NO_ELEMENTS_FOUND, NO_PROJECTS_FOUND
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    print_exception_response,
-)
+from pyegeria import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
+                      process_categories_upsert_command,
+                      get_current_datetime_string, process_per_proj_upsert_command, commands,EgeriaTech
+                      )
 from datetime import datetime
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -45,8 +38,8 @@ EGERIA_JUPYTER = os.environ.get("EGERIA_JUPYTER", False)
 EGERIA_HOME_GLOSSARY_GUID = os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None)
 EGERIA_GLOSSARY_PATH = os.environ.get("EGERIA_GLOSSARY_PATH", None)
 EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "/Users/dwolfson/localGit/egeria-v5-3/egeria-python")
-EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/freddies-inbox")
-EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/freddies-outbox")
+EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/dr_egeria_inbox")
+EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/dr_egeria_outbox")
 
 console = Console(width=int(EGERIA_WIDTH))
 
@@ -84,8 +77,9 @@ def process_markdown_file(
         print(f"Error: File not found at path: {full_file_path}")
         return {}  # Return empty dict if file not found
 
-    final_output = (f"\n# Results from processing file {file_path} on "
-                    f"{datetime.now().strftime("%Y-%m-%d %H:%M")}\n---\n")
+    final_output =""
+    prov_output = (f"\n* Results from processing file {file_path} on "
+                    f"{datetime.now().strftime("%Y-%m-%d %H:%M")}\n")
     h1_blocks = []
     current_block = ""
     in_h1_block = False
@@ -111,15 +105,20 @@ def process_markdown_file(
 
     if current_block:  # Add the last H1 block
         h1_blocks.append(current_block)
-
+    prov_found = False
     # Process each identified H1 block
     for block in h1_blocks:
         potential_command = extract_command(block)  # Extract potential command
 
         if potential_command in commands:
             # Process the block based on the command
+            if potential_command == "Provenance":
+                prov_found = True
+                result = process_provenance_command(file_path, block)
             if potential_command in ["Create Glossary", "Update Glossary"]:
                 result = process_glossary_upsert_command(client, element_dictionary, block, directive)
+            elif potential_command in ["Create Category", "Update Category"]:
+                result = process_categories_upsert_command(client, element_dictionary, block, directive)
             elif potential_command in ["Create Term", "Update Term"]:
                 result = process_term_upsert_command(client, element_dictionary, block, directive)
             elif potential_command in ["Create Personal Project", "Update Personal Project"]:
@@ -132,7 +131,7 @@ def process_markdown_file(
                 if directive == "process":
                     updated = True
                     final_output += f"\n---\n{result}\n---\n\n"
-                    # print(json.dumps(element_dictionary, indent=4))
+                    print(json.dumps(element_dictionary, indent=4))
             elif directive == "process":
                 # Handle case with errors (skip this block but notify the user)
                 print(f"\n==>\tErrors found while processing command: \'{potential_command}\'\n"
@@ -142,19 +141,26 @@ def process_markdown_file(
             # If no command is detected, add the block to the final output as-is
             final_output += f"\n---\n{block}\n---\n\n"
 
+
     # Write the final_output to a new file if updated
-    if updated:
-        path, filename = os.path.split(file_path)  # Get both parts
-        new_filename = f"processed-{get_current_datetime_string()}-{filename}"  # Create the new filename
-        new_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH, new_filename)  # Construct the new path
-        os.makedirs(os.path.dirname(new_file_path), exist_ok=True)
-
-        with open(new_file_path, 'w') as f2:
-            f2.write(final_output)
-        click.echo(f"\n==> Notebook written to {new_file_path}")
-    else:
-        click.echo("\nNo updates detected. New File not created.")
+    try:
+        if updated:
+            path, filename = os.path.split(file_path)  # Get both parts
+            new_filename = f"processed-{get_current_datetime_string()}-{filename}"  # Create the new filename
+            new_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH, new_filename)  # Construct the new path
+            os.makedirs(os.path.dirname(new_file_path), exist_ok=True)
+
+            with open(new_file_path, 'w') as f2:
+                f2.write(final_output)
+                if not prov_found:
+                    prov_output += f"\n# Provenance:\n{prov_output}\n"
+                f2.write(prov_output)
+            click.echo(f"\n==> Notebook written to {new_file_path}")
+        else:
+            click.echo("\nNo updates detected. New File not created.")
 
+    except (Exception):
+        console.print_exception(show_locals=True)
 
 
 if __name__ == "__main__":

{pyegeria-5.3.6.2.4 → pyegeria-5.3.6.4}/pyegeria/commands/cat/glossary_actions.py

@@ -259,6 +259,64 @@ def delete_term(server, url, userid, password, timeout, term_guid):
     finally:
         m_client.close_session()
 
+@click.command("add-term-to-category")
+@click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
+@click.option(
+    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+)
+@click.option("--userid", default=EGERIA_USER, help="Egeria user")
+@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
+@click.option("--timeout", default=60, help="Number of seconds to wait")
+@click.option("--term-guid", required=True, help="GUID of term to add to a category")
+@click.option("--category-guid", required=True, help="GUID of category to add term to")
+
+def add_term_to_category(server, url, userid, password, timeout, term_guid, category_guid):
+    """Add a glossary term to a category"""
+    m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
+    token = m_client.create_egeria_bearer_token()
+    try:
+        term_guid = term_guid.strip()
+        category_guid = category_guid.strip()
+        m_client.add_term_to_category(term_guid, category_guid)
+
+        click.echo(
+            f"Added term with GUID: {term_guid} to category with GUID: {category_guid}\n"
+        )
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()
+
+@click.command("remove-term-from-category")
+@click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
+@click.option(
+    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+)
+@click.option("--userid", default=EGERIA_USER, help="Egeria user")
+@click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
+@click.option("--timeout", default=60, help="Number of seconds to wait")
+@click.option("--term-guid", required=True, help="GUID of term to add to a category")
+@click.option("--category-guid", required=True, help="GUID of category to add term to")
+
+def remove_term_from_category(server, url, userid, password, timeout, term_guid, category_guid):
+    """Add a glossary term to a category"""
+    m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
+    token = m_client.create_egeria_bearer_token()
+    try:
+        term_guid = term_guid.strip()
+        category_guid = category_guid.strip()
+        m_client.remove_term_from_category(term_guid, category_guid)
+
+        click.echo(
+            f"Removed term with GUID: {term_guid} from category with GUID: {category_guid}\n"
+        )
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()
+
 
 @click.command("import-terms-from-csv")
 @click.option("--glossary_name", help="Name of Glossary", required=True)
@@ -368,7 +426,7 @@ def export_terms_csv(
 @click.option(
     "--is_root",
     help="Is this a root category?",
-    default=False,
+    default=True,
     is_flag=True,
 )
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use.")

pyegeria-5.3.6.4/pyegeria/commands/cat/list_categories.py

@@ -0,0 +1,185 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+List categories for a category.
+
+
+A simple display for category terms
+"""
+import argparse
+import os
+import sys
+import time
+
+from rich import box
+from rich.console import Console
+from rich.prompt import Prompt
+from rich.table import Table
+from rich.text import Text
+
+from pyegeria import (
+    EgeriaTech,
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    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("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", "150"))
+EGERIA_category_PATH = os.environ.get("EGERIA_category_PATH", None)
+EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "/Users/dwolfson/localGit/egeria-v5-3/egeria-python")
+EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/dr_egeria_inbox")
+EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/dr_egeria_outbox")
+
+
+
+def display_categories(
+    search_string: str = "*",
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+    output_format: str = "TABLE",
+):
+    """Display either a specified category or all categories if the search_string is '*'.
+    Parameters
+    ----------
+    search_string : str, default is '*'
+        The string used to search for categories.
+    view_server : str
+        The view server name or address where the Egeria services are hosted.
+    view_url : str
+        The URL of the platform the view server is on.
+    user : str
+        The user ID for authentication with the Egeria server.
+    user_pass : str
+        The password for authentication with the Egeria server.
+    jupyter : bool, optional
+        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  FORM, REPORT, TABLE
+    """
+    m_client = EgeriaTech(view_server, view_url, user_id=user, user_pwd=user_pass)
+    token = m_client.create_egeria_bearer_token()
+
+
+    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"Categories-{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_glossary_categories(search_string, output_format=output_format)
+            if output == "NO_CATEGORIES_FOUND":
+                print(f"\n==> No categories found for search string '{search_string}'")
+                return
+            with open(full_file_path, 'w') as f:
+                f.write(output)
+            print(f"\n==> Categories output written to {full_file_path}")
+            return
+
+        table = Table(
+            title=f"Category List @ {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 '{view_server}' @ Platform - {view_url}",
+            expand=True,
+        )
+        table.add_column("Category Name")
+        table.add_column(
+            "Qualified Name & GUID", width=38, no_wrap=True, justify="center"
+        )
+        table.add_column("Description")
+        table.add_column("In Glossary (Qualified Name)")
+
+        categories = m_client.find_glossary_categories(search_string)
+        if type(categories) is list:
+            sorted_category_list = sorted(
+                categories, key=lambda k: k["glossaryCategoryProperties"]["displayName"]
+            )
+            for category in sorted_category_list:
+                display_name = category["glossaryCategoryProperties"].get("displayName",'---')
+                qualified_name = category["glossaryCategoryProperties"]["qualifiedName"]
+                category_guid = category["elementHeader"]["guid"]
+                q_name = Text(f"{qualified_name}\n&\n{category_guid}", justify="center")
+                description = category["glossaryCategoryProperties"].get("description",'---')
+                classification_props = category["elementHeader"]['classifications'][0].get('classificationProperties',None)
+                glossary_qualified_name = '---'
+                if classification_props is not None:
+                    glossary_guid = classification_props.get('anchorGUID','---')
+                    glossary_qualified_name = (
+                        m_client.get_glossary_by_guid(glossary_guid))['glossaryProperties']['qualifiedName']
+
+                table.add_row(display_name, q_name, description, glossary_qualified_name)
+            console = Console(
+                style="bold bright_white on black",
+                width=width,
+                force_terminal=not jupyter,
+            )
+            console.print(table)
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        m_client.close_session()
+
+
+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 the category you are searching for or '*' for all:", default="*"
+        )
+        output_format = Prompt.ask("What output format do you want?", choices=["TABLE", "FORM", "REPORT"],
+                                   default="TABLE")
+
+        display_categories(search_string, server, url, userid,
+                           user_pass, output_format = output_format)
+
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == "__main__":
+    main()

{pyegeria-5.3.6.2.4 → pyegeria-5.3.6.4}/pyegeria/commands/cat/list_glossaries.py

@@ -45,8 +45,8 @@ 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", "/Users/dwolfson/localGit/egeria-v5-3/egeria-python")
-EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/freddies-inbox")
-EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/freddies-outbox")
+EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/dr_egeria_inbox")
+EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/dr_egeria_outbox")
 
 
 
@@ -58,8 +58,7 @@ def display_glossaries(
     user_pass: str = EGERIA_USER_PASSWORD,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
-    md: bool = False,
-    form: bool = False,
+    output_format: str = "JSON"
 ):
     """Display either a specified glossary or all glossaries if the search_string is '*'.
     Parameters
@@ -78,35 +77,38 @@ 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).
-    md: bool, [default=False]
-        If true, a simplified markdown report of the glossaries will be created. Filename is Glossaries-<DATE>-<ACTION>
-        The filepath is derived from the environment variables EGERIA_ROOT_PATH and EGERIA_OUTPUT_PATH, respectively.
-    form: bool, [default=False]
-        If true and md is true, a form for the glossaries will be created as a markdown file.
-        If false and md is true, a markdown report for the glossaries will be created.
+    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 md:
-            if form:
-                action = "Update-Form"
-            else:
-                action = "Report"
+        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, md=md, form=form)
+            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
-            with open(full_file_path, 'w') as f:
-                f.write(output)
-            print(f"\n==> Glossaries output written to {full_file_path}")
-            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()}",
@@ -141,11 +143,7 @@ def display_glossaries(
                 description = glossary["glossaryProperties"].get("description",'---')
                 usage = glossary["glossaryProperties"].get("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,
-            )
+
             console.print(table)
 
     except (InvalidParameterException, PropertyServerException) as e:
@@ -172,14 +170,9 @@ def main():
         search_string = Prompt.ask(
             "Enter the glossary you are searching for or '*' for all:", default="*"
         )
-        mdq = Prompt.ask("Do you want to create a markdown report?", choices=["y", "n"], default="n")
-        md = True if mdq.lower() == "y" else False
-
-        formq = Prompt.ask("Do you want to create a form?", choices=["y", "n"], default="n")
-        form = True if formq.lower() == "y" else False
-
+        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, md = md, form = form)
+                           user_pass, output_format=output_format)
 
     except KeyboardInterrupt:
         pass