pyegeria 5.3.6.4__py3-none-any.whl → 5.3.6.6__py3-none-any.whl

pyegeria/__init__.py

@@ -92,7 +92,8 @@ 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)
+                                  get_current_datetime_string, process_per_proj_upsert_command, commands,
+                                  render_markdown, process_provenance_command)
 
 #
 # The following assignments were generated by the `create_tech_guid_lists.py` utility that uses the pyegeria functions

pyegeria/commands/cat/Dr-Egeria_md-orig.py

@@ -0,0 +1,167 @@
+"""
+This is an ongoing experiment in parsing and playing with Freddie docs
+"""
+import json
+import os
+from rich import print
+from rich.console import Console
+from rich.markdown import Markdown
+
+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 (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")
+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_INTEGRATION_DAEMON_URL = os.environ.get(
+    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
+)
+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_WIDTH = os.environ.get("EGERIA_WIDTH", 220)
+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/dr_egeria_inbox")
+EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat/dr_egeria_outbox")
+
+console = Console(width=int(EGERIA_WIDTH))
+
+
+
+@click.command("process-markdown-file", help="Process a markdown file and return the output as a string.")
+@click.option("--file-path", help="File path to markdown file",
+              default="glossary_exp.md")
+@click.option("--directive", default="display-only", help="How to process the file")
+@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("--user_pass", default=EGERIA_USER_PASSWORD, help="Egeria user password")
+def process_markdown_file(
+        file_path: str,
+        directive: str,
+        server: str,
+        url: str,
+        userid: str,
+        user_pass: str,
+        ):
+
+    client = EgeriaTech(server, url, user_id=userid)
+    token = client.create_egeria_bearer_token(userid, user_pass)
+
+    updated = False
+    full_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_INBOX_PATH, file_path)
+    print(f"Processing Markdown File: {full_file_path}")
+    try:
+        with open(full_file_path, 'r') as f:
+            lines = f.readlines()
+    except FileNotFoundError:
+        print(f"Error: File not found at path: {full_file_path}")
+        return {}  # Return empty dict if file not found
+
+    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
+    element_dictionary = {}
+
+    for line in lines:
+        line = line.strip()  # Remove leading/trailing whitespace
+
+        if line.startswith("# ") and not in_h1_block:  # Start of a new H1 block
+            if current_block:
+                h1_blocks.append(current_block)
+            current_block = line
+            in_h1_block = True
+        elif line.startswith("---") and in_h1_block:  # End of the current H1 block
+            h1_blocks.append(current_block)
+            current_block = ""
+            in_h1_block = False
+        elif in_h1_block:  # Add line to the current H1 block
+            current_block += "\n" + line
+        else:
+            # Add non-H1 blocks directly to the final output
+            final_output += line
+
+    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)
+            elif 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"]:
+                result = process_per_proj_upsert_command(client, element_dictionary, block, directive)
+            else:
+                # If command is not recognized, copy the block as-is
+                result = None
+
+            if result:
+                if directive == "process":
+                    updated = True
+                    final_output += f"\n---\n{result}\n"
+                    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"
+                      f"\tPlease correct and try again. \n")
+                final_output += f"\n---\n{block}\n"
+        else:
+            # If no command is detected, add the block to the final output as-is
+            final_output += f"\n---\n{block}\n"
+
+
+    # Write the final_output to a new file if updated
+    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__":
+    process_markdown_file()

pyegeria/commands/cat/dr_egeria_md.py

@@ -1,15 +1,17 @@
 """
 This is an ongoing experiment in parsing and playing with Freddie docs
 """
+import argparse
 import json
 import os
 from rich import print
 from rich.console import Console
 from rich.markdown import Markdown
+from rich.prompt import Prompt
 
-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)
+from pyegeria 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 (extract_command, process_glossary_upsert_command, process_term_upsert_command,
@@ -41,20 +43,20 @@ EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "/Users/dwolfson/localGit/
 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))
 
 
 
-@click.command("process-markdown-file", help="Process a markdown file and return the output as a string.")
-@click.option("--file-path", help="File path to markdown file",
-              default="glossary_exp.md")
-@click.option("--directive", default="display-only", help="How to process the file")
-@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("--user_pass", default=EGERIA_USER_PASSWORD, help="Egeria user password")
+
+# @click.command("process_markdown_file", help="Process a markdown file and return the output as a string.")
+# @click.option("--file-path", help="File path to markdown file",
+#               default="glossary_exp.md")
+# @click.option("--directive", default="display-only", help="How to process the file")
+# @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("--user_pass", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 def process_markdown_file(
         file_path: str,
         directive: str,
@@ -62,8 +64,11 @@ def process_markdown_file(
         url: str,
         userid: str,
         user_pass: str,
-        ):
-
+        )-> None:
+    """
+    Process a markdown file by parsing and executing Dr. Egeria commands. Write output to a new file.
+    """
+    console = Console(width=int(EGERIA_WIDTH))
     client = EgeriaTech(server, url, user_id=userid)
     token = client.create_egeria_bearer_token(userid, user_pass)
 
@@ -78,6 +83,7 @@ def process_markdown_file(
         return {}  # Return empty dict if file not found
 
     final_output =""
+    prov_found = False
     prov_output = (f"\n* Results from processing file {file_path} on "
                     f"{datetime.now().strftime("%Y-%m-%d %H:%M")}\n")
     h1_blocks = []
@@ -85,62 +91,56 @@ def process_markdown_file(
     in_h1_block = False
     element_dictionary = {}
 
+    # Read and process lines sequentially, preserving their order
     for line in lines:
         line = line.strip()  # Remove leading/trailing whitespace
 
-        if line.startswith("# ") and not in_h1_block:  # Start of a new H1 block
-            if current_block:
-                h1_blocks.append(current_block)
-            current_block = line
+        if line.startswith("# "):  # Start of a new H1 block
+            current_block = line  # Initialize the H1 block
             in_h1_block = True
-        elif line == "---" and in_h1_block:  # End of the current H1 block
-            h1_blocks.append(current_block)
-            current_block = ""
+        elif line.startswith("---") and in_h1_block:  # End of the current H1 block
+            # Process the completed H1 block
+            current_block += f"\n{line}"  # Add the closing line
+            potential_command = extract_command(current_block)  # Extract 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, current_block)
+                elif potential_command in ["Create Glossary", "Update Glossary"]:
+                    result = process_glossary_upsert_command(client, element_dictionary, current_block, directive)
+                elif potential_command in ["Create Category", "Update Category"]:
+                    result = process_categories_upsert_command(client, element_dictionary, current_block, directive)
+                elif potential_command in ["Create Term", "Update Term"]:
+                    result = process_term_upsert_command(client, element_dictionary, current_block, directive)
+                elif potential_command in ["Create Personal Project", "Update Personal Project"]:
+                    result = process_per_proj_upsert_command(client, element_dictionary, current_block, directive)
+                else:
+                    # If command is not recognized, keep the block as-is
+                    result = None
+
+                if result:
+                    if directive == "process":
+                        updated = True
+                        final_output += f"\n---\n{result}\n"
+                        print(json.dumps(element_dictionary, indent=4))
+                elif directive == "process":
+                    # Handle errors (skip this block but notify the user)
+                    print(f"\n==>\tErrors found while processing command: \'{potential_command}\'\n"
+                          f"\tPlease correct and try again. \n")
+                    final_output += f"\n---\n{current_block}\n"
+            else:
+                # If there is no command, append the block as-is
+                final_output += f"\n---\n{current_block}\n"
+
+            current_block = ""  # Clear the block
             in_h1_block = False
         elif in_h1_block:  # Add line to the current H1 block
-            current_block += "\n" + line
+            current_block += f"\n{line}"
         else:
-            # Add non-H1 blocks directly to the final output
-            final_output += line
-
-    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"]:
-                result = process_per_proj_upsert_command(client, element_dictionary, block, directive)
-            else:
-                # If command is not recognized, copy the block as-is
-                result = None
-
-            if result:
-                if directive == "process":
-                    updated = True
-                    final_output += f"\n---\n{result}\n---\n\n"
-                    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"
-                      f"\tPlease correct and try again. \n")
-                final_output += f"\n---\n{block}\n---\n\n"
-        else:
-            # If no command is detected, add the block to the final output as-is
-            final_output += f"\n---\n{block}\n---\n\n"
-
+            # For non-H1 lines, add them directly to the output
+            final_output += f"\n{line}"
 
     # Write the final_output to a new file if updated
     try:
@@ -152,8 +152,10 @@ def process_markdown_file(
 
             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"
+                prov_output = process_provenance_command(file_path, prov_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:
@@ -163,5 +165,29 @@ def process_markdown_file(
         console.print_exception(show_locals=True)
 
 
+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")
+    parser.add_argument("--time_out", help="Time Out")
+
+    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
+    time_out = args.time_out if args.time_out is not None else 60
+    try:
+        file_path = Prompt.ask("Markdown File name to process:", default="")
+        directive = Prompt.ask("Processing Directive:", choices=[ "display", "validate", "process"], default="validate")
+
+        process_markdown_file(file_path, directive, server, url, userid, user_pass)
+    except KeyboardInterrupt:
+        pass
+
+
 if __name__ == "__main__":
-    process_markdown_file()
+    main()

pyegeria/commands/cat/get_collection.py

@@ -20,8 +20,8 @@ from pyegeria import (
     CollectionManager,
     InvalidParameterException,
     PropertyServerException,
-    UserNotAuthorizedException,
-)
+    UserNotAuthorizedException, NO_ELEMENTS_FOUND,
+    )
 from pyegeria._exceptions import print_exception_response
 
 disable_ssl_warnings = True

pyegeria/commands/cli/egeria.py

@@ -54,6 +54,8 @@ from pyegeria.commands.cat.list_terms import display_glossary_terms
 from pyegeria.commands.cat.list_todos import display_to_dos as list_todos
 from pyegeria.commands.cat.list_user_ids import list_user_ids
 
+from pyegeria.commands.cat.dr_egeria_md import process_markdown_file
+
 from pyegeria.commands.cli.egeria_login_tui import login
 from pyegeria.commands.cli.egeria_ops import show_server
 from pyegeria.commands.cli.ops_config import Config
@@ -374,6 +376,7 @@ my_tell.add_command(mark_todo_complete)
 my_tell.add_command(reassign_todo)
 
 
+
 #
 #  tech User: Show
 #
@@ -1457,6 +1460,18 @@ def tell_cat(ctx):
     """Perform actions an Egeria Objects"""
     pass
 
+#
+# dr.egeria
+#
+@tell_cat.group("dr_egeria")
+@click.pass_context
+def dr_egeria(ctx):
+    """Execute Dr.Egeria actions"""
+    pass
+
+dr_egeria.add_command(process_markdown_file)
+
+
 
 @tell_cat.group("glossary")
 @click.pass_context

pyegeria/commands/cli/egeria_cat.py

@@ -14,6 +14,7 @@ import os
 import click
 from trogon import tui
 
+from pyegeria.commands.cat.dr_egeria_md import process_markdown_file
 from pyegeria.commands.cat.get_asset_graph import asset_viewer
 from pyegeria.commands.cat.get_collection import collection_viewer
 from pyegeria.commands.cat.get_project_dependencies import project_dependency_viewer
@@ -31,22 +32,18 @@ from pyegeria.commands.cat.glossary_actions import (
     delete_category,
     add_term_to_category,
     remove_term_from_category)
-
-from pyegeria.commands.cat.dr_egeria_jupyter import process_jupyter_notebook
-from pyegeria.commands.cat.dr_egeria_md_file import process_markdown_file
-
-from pyegeria.commands.cat.list_categories import display_categories
 from pyegeria.commands.cat.list_assets import display_assets
+from pyegeria.commands.cat.list_categories import display_categories
 from pyegeria.commands.cat.list_cert_types import display_certifications
 from pyegeria.commands.cat.list_collections import display_collections
 from pyegeria.commands.cat.list_deployed_catalogs import list_deployed_catalogs
 from pyegeria.commands.cat.list_deployed_database_schemas import (
     list_deployed_database_schemas,
-)
+    )
 from pyegeria.commands.cat.list_deployed_databases import list_deployed_databases
+from pyegeria.commands.cat.list_deployed_servers import display_servers_by_dep_imp
 from pyegeria.commands.cat.list_glossaries import display_glossaries
 from pyegeria.commands.cat.list_projects import display_project_list
-from pyegeria.commands.cat.list_deployed_servers import display_servers_by_dep_imp
 from pyegeria.commands.cat.list_tech_type_elements import list_tech_elements
 from pyegeria.commands.cat.list_tech_types import display_tech_types
 from pyegeria.commands.cat.list_terms import display_glossary_terms
@@ -58,7 +55,7 @@ from pyegeria.commands.my.todo_actions import (
     delete_todo,
     mark_todo_complete,
     reassign_todo,
-)
+    )
 from pyegeria.commands.tech.list_asset_types import display_asset_types
 
 
@@ -668,6 +665,26 @@ def tell(ctx):
     """Perform actions an Egeria Objects"""
     pass
 
+#
+# dr.egeria
+#
+@tell.group("dr_egeria")
+@click.pass_context
+def tell_dr_egeria(ctx):
+    """Execute Dr.Egeria actions"""
+    pass
+
+@tell_dr_egeria.command("process_markdown_file")
+@click.option("--file-path", help="File path to markdown file",
+              default="glossary_exp.md")
+@click.option("--directive", type=click.Choice(['Display','Validate','Process'], case_sensitive=False),
+              default="validate", help="How to process the file")
+@click.pass_context
+def process_markdown_file(ctx, file_path, directive):
+    """Process a markdown file"""
+    c = ctx.obj
+    process_markdown_file(file_path, directive, c.view_server, c.view_server_url, c.userid, c.password)
+
 
 @tell.group("glossary")
 @click.pass_context
@@ -676,6 +693,8 @@ def tell_glossary(ctx):
     pass
 
 
+
+
 tell_glossary.add_command(create_glossary)
 tell_glossary.add_command(delete_glossary)
 tell_glossary.add_command(create_term)

pyegeria/egeria_client.py

@@ -27,7 +27,8 @@ from pyegeria.solution_architect_omvs import SolutionArchitect
 from pyegeria.server_operations import ServerOps
 from pyegeria.registered_info import RegisteredInfo
 from pyegeria.valid_metadata_omvs import ValidMetadataManager
-
+from pyegeria.egeria_config_client import EgeriaConfig
+from pyegeria.md_processing_utils import render_markdown
 
 
 class Egeria(
@@ -49,6 +50,8 @@ class Egeria(
     ValidMetadataManager,
     MetadataExplorer,
     SolutionArchitect,
+    EgeriaMy,
+    EgeriaConfig,
 ):
     """
     Client to issue Runtime status requests.

pyegeria/glossary_browser_omvs.py

@@ -183,7 +183,7 @@ class GlossaryBrowser(Client):
             elements_md += self.make_md_attribute("published version", pub_version, output_format)
             elements_md += self.make_md_attribute("qualified name", qualified_name, output_format)
             elements_md += self.make_md_attribute("GUID", guid, output_format)
-            # elements_md += MD_SEPERATOR
+            elements_md += MD_SEPERATOR
 
         return elements_md
 

pyegeria/md_processing_utils.py

@@ -21,9 +21,9 @@ from rich.table import Table
 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, )
-import datetime
-
-console = Console(width=120)
+from datetime import datetime
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+console = Console(width=EGERIA_WIDTH)
 
 commands = ["Provenance", "Create Glossary", "Update Glossary", "Create Term", "Update Term", "Create Personal Project",
             "Update Personal Project", "Create Category", "Update Category"]
@@ -34,6 +34,10 @@ pre_command = "\n---\n==> Processing command:"
 EGERIA_LOCAL_QUALIFIER = os.environ.get("EGERIA_LOCAL_QUALIFIER", "PDR")
 element_dictionary = {}
 
+def render_markdown(markdown_text: str) -> None:
+    """Renders the given markdown text in the console."""
+    console.print(Markdown(markdown_text))
+
 
 def is_valid_iso_date(date_text) -> bool:
     """Checks if the given string is a valid ISO date."""
@@ -46,10 +50,12 @@ def is_valid_iso_date(date_text) -> bool:
 
 def get_current_datetime_string():
     """Returns the current date and time as a human-readable string."""
-    now = datetime.datetime.now()
-    return now.strftime("%Y-%m-%d-%H-%M")
+    now = datetime.now().strftime('%Y-%m-%d %H:%M')
+    return now
+
 
-def add_term_to_categories(egeria_client: EgeriaTech, term_guid: str, categories_exist: bool, categories_list: [str], element_dictionary: dict)-> None:
+def add_term_to_categories(egeria_client: EgeriaTech, term_guid: str, categories_exist: bool,
+                           categories_list: List[str], element_dictionary: dict) -> None:
     if categories_exist is True and categories_list is not None:
         for category in categories_list:
             cat_guid = None
@@ -58,19 +64,18 @@ def add_term_to_categories(egeria_client: EgeriaTech, term_guid: str, categories
                 cat= element_dictionary.get(cat_el, None)
                 cat_guid = cat.get('guid', None) if cat else None
             if cat_guid is None:
-                cat_guid = egeria_client.__get_guid__(qualified_name=category)
+                cat_guid = egeria_client.__get_guid__(qualified_name=cat_el)
             egeria_client.add_term_to_category(term_guid, cat_guid)
 
 
-
-def extract_command(block: str) -> str | None:
+def extract_command(block: str) -> Optional[str]:
     match = re.search(r"#(.*?)(?:##|\n|$)", block)  # Using a non capturing group
     if match:
         return match.group(1).strip()
     return None
 
 
-def extract_attribute(text: str, labels: List[str]) -> str | None:
+def extract_attribute(text: str, labels: List[str]) -> Optional[str]:
     """
         Extracts the glossary name from a string.
 
@@ -84,12 +89,15 @@ def extract_attribute(text: str, labels: List[str]) -> str | None:
     # Iterate over the list of labels
     for label in labels:
         # Construct pattern for the current label
-        pattern = rf"## {re.escape(label)}\n(.*?)(?:##|$)"
+        pattern = rf"## {re.escape(label)}\n(.*?)(?:#|---|$)"
         match = re.search(pattern, text, re.DOTALL)
-        if match and not match.group(1).isspace():  # Ensure extracted text is not blank
-            return match.group(1).strip()  # Return the matched text
+        if match:
+            # Extract matched text and replace consecutive \n with a single \n
+            extracted_text = re.sub(r'\n+', '\n', match.group(1).strip())
+            if not extracted_text.isspace() and extracted_text:
+                return extracted_text  # Return the cleaned text
 
-    return None  # Return None if no match is found
+    return None
 
 
 def update_a_command(txt: str, command: str, obj_type: str, q_name: str, u_guid: str) -> str:
@@ -119,16 +127,17 @@ def update_a_command(txt: str, command: str, obj_type: str, q_name: str, u_guid:
     return txt
 
 def process_provenance_command(file_path: str, txt: str) -> str:
-    """This commands processes a provenence command by pre-pending the current file name and time to the provenance output"""
+    """This commands processes a provenence command by pre-pending the current file name and time to the provenance
+    output"""
     output = (f"* Derived from processing file {file_path} on "
-                    f"{datetime.now().strftime("%Y-%m-%d %H:%M")}\n")
+              f"{get_current_datetime_string()}\n")
     existing_prov = extract_attribute(txt,'Provenance')
-    return f"# Provenance:\n{existing_prov}\n{output}\n"
-
+    existing_prov = existing_prov if existing_prov else " "
+    return f"\n# Provenance:\n{existing_prov}\n{output}\n"
 
 
 def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionary: dict, txt: str,
-                                    directive: str = "display") -> str | None:
+                                    directive: str = "display") -> Optional[str]:
     """
     Processes a glossary create or update command by extracting key attributes such as
     glossary name, language, description, and usage from the given text.
@@ -157,7 +166,7 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionar
         guid = extract_attribute(txt, ['GUID', 'guid', 'Guid'])
         glossary_display += f"* Qualified Name: {q_name}\n\t* GUID: {guid}\n\n"
 
-    def validate_glossary(obj_action: str) -> tuple[bool, bool, str | None, str | None]:
+    def validate_glossary(obj_action: str) -> tuple[bool, bool, Optional[str], Optional[str]]:
         valid = True
         msg = ""
         known_glossary_guid = None
@@ -183,7 +192,7 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionar
             valid = False
         if len(glossary_details) == 1:
             known_glossary_guid = glossary_details[0]['elementHeader'].get('guid', None)
-            known_q_name = glossary_details[0]['glossaryProperties'].get('qualifiedName', None)
+            known_q_name = glossary_details[0]['glossaryProperties'].get('qualifiedName', None).strip()
 
         if obj_action == "Update":
 
@@ -276,7 +285,7 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionar
 
 
 def process_categories_upsert_command(egeria_client: EgeriaTech, element_dictionary: dict, txt: str,
-                                      directive: str = "display") -> str | None:
+                                      directive: str = "display") -> Optional[str]:
     """
     Processes a glossary category create or update command by extracting key attributes such as
     category name, qualified, description, and anchor glossary from the given txt..
@@ -306,7 +315,7 @@ def process_categories_upsert_command(egeria_client: EgeriaTech, element_diction
         category_display += (f"* GUID: {guid}\n\n"
                              f"* Update Description: \n {update_description}\n\t")
 
-    def validate_category(obj_action: str) -> tuple[bool, bool, str | None, str | None, str | None]:
+    def validate_category(obj_action: str) -> tuple[bool, bool, Optional[str], Optional[str], Optional[str]]:
         valid = True
         msg = ""
         known_category_guid = None
@@ -442,8 +451,9 @@ def process_categories_upsert_command(egeria_client: EgeriaTech, element_diction
                 # return update_a_command(txt, command, object_type, qualified_name, category_guid)
                 return egeria_client.get_categories_by_guid(category_guid, output_format='MD')
 
+
 def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: dict, txt: str,
-                                directive: str = "display") -> str | None:
+                                directive: str = "display") -> Optional[str]:
     """
     Processes a term create or update command by extracting key attributes such as
     term name, summary, description, abbreviation, examples, usage, version, and status from the given cell.
@@ -477,7 +487,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
 
     print(Markdown(f"{pre_command} `{command}` for term: `\'{term_name}\'` with directive: `{directive}`"))
 
-    def validate_term(obj_action: str) -> tuple[bool, bool, str | None, str | None]:
+    def validate_term(obj_action: str) -> tuple[bool, bool, Optional[str], Optional[str]]:
         nonlocal version, status, categories, categories_list, cats_exist, q_name
         valid = True
         msg = ""
@@ -525,17 +535,30 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
         else:
             categories_list = re.split(r'[,\n]+', categories)
             categories = ""
+            new_cat_list = []
             for category in categories_list:
                 category_el = category.strip()
                 if category_el not in element_dictionary:
-                    cat = egeria_client.get_categories_by_name(category) # assuming qualified name?
+                    cat = egeria_client.get_categories_by_name(category_el) # assuming qualified name?
                     if isinstance(cat,str):
-                        msg += (f"* {WARNING}Category `{category}` not found -> "
+                        msg += (f"* {WARNING}Category `{category_el}` not found -> "
                                 f"categories for this term won't be processed!\n")
                         cats_exist = False
+                        break
+                    cat_qname = cat[0]['glossaryCategoryProperties'].get('qualifiedName', None)
+                    category = cat_qname # use the qualified name if found
+                    if cat_qname not in element_dictionary:
+                        cat_guid = cat[0]['elementHeader']['guid']
+                        cat_display_name = cat[0]['glossaryCategoryProperties'].get('displayName', None)
+                        element_dictionary[cat_qname] = {
+                            'guid' : cat_guid,
+                            'displayName': cat_display_name
+                            }
                 categories = f"{category}, {categories}"
+                new_cat_list.append(category)
             if cats_exist:
                 categories +='\n'
+                categories_list = new_cat_list
             else:
                 categories = None
 
@@ -557,7 +580,6 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
             # version = "0.0.1"
 
 
-
         if obj_action == "Update":  # check to see if provided information exists and is consistent with existing info
             if not term_exists:
                 msg += f"* {ERROR}Term {term_name} does not exist\n"
@@ -591,10 +613,10 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
             print(Markdown(msg))
             return valid, term_exists, known_term_guid, known_q_name
 
-
+    # Continue processing the upsert
     if object_action == "Update":
         term_guid = extract_attribute(txt, 'GUID')
-        term_guid = term_guid if term_guid else " "
+        term_guid = term_guid if term_guid else None
 
 
         update_description = extract_attribute(txt, 'Update Description')
@@ -631,11 +653,19 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
                     print(f"\n-->Term {term_name} does not exist")
                     return None
                 body = {
-                    "class": "ReferenceableRequestBody", "elementProperties": {
-                        "class": "GlossaryTermProperties", "qualifiedName": known_q_name, "summary": summary,
-                        "description": description, "abbreviation": abbreviation, "examples": examples, "usage": usage,
-                        "publishVersionIdentifier": version, "status": status
-                        }, "updateDescription": update_description
+                    "class": "ReferenceableRequestBody",
+                    "elementProperties": {
+                        "class": "GlossaryTermProperties",
+                        "qualifiedName": known_q_name,
+                        "summary": summary,
+                        "description": description,
+                        "abbreviation": abbreviation,
+                        "examples": examples,
+                        "usage": usage,
+                        "publishVersionIdentifier": version,
+                        "status": status
+                        },
+                    "updateDescription": update_description
                     }
                 egeria_client.update_term(known_guid, body)
                 # if cats_exist is True and categories_list is not None:

{pyegeria-5.3.6.4.dist-info → pyegeria-5.3.6.6.dist-info}/METADATA

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

{pyegeria-5.3.6.4.dist-info → pyegeria-5.3.6.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyegeria/README.md,sha256=PwX5OC7-YSZUCIsoyHh1O-WBM2hE84sm3Bd4O353NOk,1464
-pyegeria/__init__.py,sha256=08v01IyeVZ-YlRZU0qGPAGDhNsdEscX1IHvPcsAYZrE,30187
+pyegeria/__init__.py,sha256=koaCNp-uWubVVhrdGCcd4auWV7qeVKZGAVG1zY0rPgs,30266
 pyegeria/_client.py,sha256=nhUPmeQFHqbobM6_3EGmUy-STYURxb15BEXf6erY2oI,31733
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
 pyegeria/_exceptions.py,sha256=1SrnV194V4_YJNnNAU0myTHQ3dhLn4GF2B2gZcj1u90,18153
@@ -11,15 +11,16 @@ pyegeria/classification_manager_omvs.py,sha256=n55-62Mby-_5pxPGaz3nkjM9NWlY4PzSl
 pyegeria/collection_manager_omvs.py,sha256=xNuF3Ki6Rg-TehdbFGS8exSOUXpkQ3X63__OdXuCkc8,101746
 pyegeria/commands/README.md,sha256=hJdOWhZ5eCfwTkY4Tx6De6Y1XVo7cbaddQEvjqppvls,2036
 pyegeria/commands/__init__.py,sha256=R2o66ctVicTZ8B5VSPtc7EDRKNiNclzFbYX0o2Zg2dQ,1120
+pyegeria/commands/cat/Dr-Egeria_md-orig.py,sha256=3SCibPi_wq-znp8qeWRJLDYEh4SkAmQaWO5biWeXK2E,7665
 pyegeria/commands/cat/README.md,sha256=-aaAnIT2fcfU63vajgB-RzQk4l4yFdhkyVfSaTPiqRY,967
 pyegeria/commands/cat/__init__.py,sha256=5OCy4m_yZsnSxdy_gvkCyP_OkjvuWKimqUGHYCJc_qA,450
 pyegeria/commands/cat/dr_egeria_inbox/glossary_creation_experiment.ipynb,sha256=dbzNu90fCKNohOWVSRBOB1GLyd95x8Qw51I5AkaPtso,11552
 pyegeria/commands/cat/dr_egeria_inbox/glossary_exp.md,sha256=KsUeTzDe5QkrTmIfIAXR74qZ29oSfRW-NAEn0RYIRqM,2534
 pyegeria/commands/cat/dr_egeria_jupyter.py,sha256=4LcmD5CrtazLgUK_LCjgOnwtxZqTBB6lrMR8tsugl94,6036
-pyegeria/commands/cat/dr_egeria_md.py,sha256=jMioOrViTFuExh8AlFpJvrEZt4U5I9oUICvKhQPx4D0,7675
+pyegeria/commands/cat/dr_egeria_md.py,sha256=HlCgBRrECsi5UL1L_f_d5RMcuHMzK0W26nLWK5nqitc,9052
 pyegeria/commands/cat/exp_list_glossaries.py,sha256=dC6Bnfm3YSMTKPP146qeslIFRiZnGu5b7iDYE07p4iU,5817
 pyegeria/commands/cat/get_asset_graph.py,sha256=xnXJfpDTVH1TJ2TwE3dtjaXU36Di6-N6JAyhothzz2o,12461
-pyegeria/commands/cat/get_collection.py,sha256=KbSFoGZeK30_bMCa0BpIuCwBF5ywCX0g4hgDPnI0lEo,5356
+pyegeria/commands/cat/get_collection.py,sha256=kXPcP8u-SMWfrVyyBhNoxG8mcgB7EV_5i9N9w_IBU7o,5379
 pyegeria/commands/cat/get_project_dependencies.py,sha256=wDK_lAfR6p4VxYRV6MZE9XgU3OfIRcWKKYn0Xf64w6o,5986
 pyegeria/commands/cat/get_project_structure.py,sha256=4Jo3F9f7auTnTt_xElsrQ4eA8k8xMge0C5xE-Rjkjcw,5974
 pyegeria/commands/cat/get_tech_type_elements.py,sha256=IznytHXwDOFriGM6mypV9wuEeM-vT2s66cUzf-IROog,6147
@@ -40,8 +41,8 @@ pyegeria/commands/cat/list_terms.py,sha256=D0tCD2f8j-UgnV4Bgisj9a11CCEOneNsRT7_3
 pyegeria/commands/cat/list_todos.py,sha256=NitCw0uyVVjmN1hxb1W-I4FbOsa8wQxW2ICyOElHyc8,6556
 pyegeria/commands/cat/list_user_ids.py,sha256=X5Q-YNEp38saPYDuy9VwdQC5Qpa4HyC3WvAdbyp_P6M,5108
 pyegeria/commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
-pyegeria/commands/cli/egeria.py,sha256=Rtqru3Dp61SspzMVQ_UMHhtPc4_kq7S3Ocf-SqdfTN0,52635
-pyegeria/commands/cli/egeria_cat.py,sha256=_1qA7PS3fMH22j9BTGqFLnqVOTMRewP8-6jIPBvjuCI,18237
+pyegeria/commands/cli/egeria.py,sha256=_Z__gugx11bpwyWU6Uiacw_0r0q5o4mbAZ-ipDozFwc,52884
+pyegeria/commands/cli/egeria_cat.py,sha256=uYI_KD_9iAOgx5zsSWPpvK8MK3ymJcMmsTRONfbQDkM,18848
 pyegeria/commands/cli/egeria_login_tui.py,sha256=W5ouG3nlN7z2Waa-wzYFS7yyoGfOrK-lNB0FMt2JdOk,9492
 pyegeria/commands/cli/egeria_my.py,sha256=0KTH7OIeKyp16ZeN7zK5uhadbPfAQsq38GMzJNWYG8g,6386
 pyegeria/commands/cli/egeria_ops.py,sha256=8W4t2jFGn22OOOtyUAapQH8yyOl1wo09CVNTojRQKvo,12817
@@ -218,16 +219,16 @@ pyegeria/commands/tech/x_list_related_elements.py,sha256=ynaw792VnbMZ9IXBi5mmG7x
 pyegeria/core_omag_server_config.py,sha256=pNQpocICkZx8sRsTw5DPUe-TFyxlIo1U88qqgci_f7I,97764
 pyegeria/create_tech_guid_lists.py,sha256=hf5q8Xrdsz-bqeIW3yTORZ1XB6_BrKzLDWWwC_bNG2g,4811
 pyegeria/egeria_cat_client.py,sha256=d8dQNPLzL4efi99OJfH1T-Rt1N0k9Rf9LX8LpuhiFls,2179
-pyegeria/egeria_client.py,sha256=RxD-iU2SiUcWG-c3I2M4dSDGBgE9oCK40edJ4kKfm3w,4135
+pyegeria/egeria_client.py,sha256=HAM7pwH2ooegnpeaBr6Q0Km3zrzH1Mpgm0wgC82Y-DQ,4278
 pyegeria/egeria_config_client.py,sha256=3TZUeXSl1f7SQ2WWYTbgOu1Cu1YqApilErAgjZLzbWY,1391
 pyegeria/egeria_my_client.py,sha256=eOKLk2zdI6FHZnhAimfR_0yNdBjpUgD41dJZcJODcqE,1607
 pyegeria/egeria_tech_client.py,sha256=uycgYfCpb4jzFfaQ7I5JxbZ5PKsWdaWxLOJjbw6C2Zk,3817
 pyegeria/feedback_manager_omvs.py,sha256=0xBs0p54vmdfVYYgQ8pOanLC4fxfgTk1Z61Y6D1U7_I,152978
 pyegeria/full_omag_server_config.py,sha256=CQqLCy_3DZFvJZEOcGf50HWdFaWpiAIs6z-kKyjvpDA,47464
-pyegeria/glossary_browser_omvs.py,sha256=r8PYlNTN-Ej2pGg1SigKQn8Qu1wDmFvWG5vM2I12JyI,109391
+pyegeria/glossary_browser_omvs.py,sha256=kJPfVd46w7HdV2KKoq7jRxVYdvvqEl0RAIMRsfXrtME,109389
 pyegeria/glossary_manager_omvs.py,sha256=QSOVqbwEASueCQzpvYNEOaUIAhOvwqLWWhfzwT8hrrs,70275
 pyegeria/m_test.py,sha256=M5-M2ZczsAJLXWfSeqTTADHdx6Ku-y4PbQ4M21JthAE,7778
-pyegeria/md_processing_utils.py,sha256=FiZqeN39YH9LeZvzY_YZ8wo6DnRRvQif3-BBHLebcBg,40329
+pyegeria/md_processing_utils.py,sha256=8ucemhlOniobCn8ZSWN3D9-JaeZkgHJAwy2K2xWx3Bo,41759
 pyegeria/mermaid_utilities.py,sha256=sQqdFUWdNpHu9d3Tk9UVe80M-5bOzses0XcFYX5FF-E,54254
 pyegeria/metadata_explorer_omvs.py,sha256=xHnZTQKbd6XwOhYia-RiIisrvZcqHi0SL1l6OCf04Gk,86911
 pyegeria/my_profile_omvs.py,sha256=d0oJYCJG7pS9BINPuGciVa00ac0jwPHNANXDCLginEc,34720
@@ -241,8 +242,8 @@ pyegeria/template_manager_omvs.py,sha256=PfJ9dOfmBvf59DgRdZ9Dl1Kl_UYqjF-JncXVnbC
 pyegeria/utils.py,sha256=GCt1C0bp0Xng1ahzbZhzV9qQwH7Dj93IaCt2dvWb-sg,5417
 pyegeria/valid_metadata_omvs.py,sha256=Xq9DqBQvBFFJzaFIRKcVZ2k4gJvSh9yeXs_j-O3vn1w,65050
 pyegeria/x_action_author_omvs.py,sha256=RcqSzahUKCtvb_3u_wyintAlc9WFkC_2v0E12TZs8lQ,6433
-pyegeria-5.3.6.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.3.6.4.dist-info/METADATA,sha256=yd4UPOQI1S90JJ0hO89N5EIKSu6t5CvWuywJ9c4PFh4,2743
-pyegeria-5.3.6.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pyegeria-5.3.6.4.dist-info/entry_points.txt,sha256=eAvQ_vkejlF3JzMzEc5VD93ymLA_hSFV0HM8fntG-d8,6791
-pyegeria-5.3.6.4.dist-info/RECORD,,
+pyegeria-5.3.6.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.3.6.6.dist-info/METADATA,sha256=ialvs-DxLCrQU-TTXD9UZDS6mv917IEsjChoV6urAYw,2743
+pyegeria-5.3.6.6.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pyegeria-5.3.6.6.dist-info/entry_points.txt,sha256=-25SObCenvad7XXzMewoEnHVqXNwHOwEVfXHE12vBmI,6774
+pyegeria-5.3.6.6.dist-info/RECORD,,

{pyegeria-5.3.6.4.dist-info → pyegeria-5.3.6.6.dist-info}/entry_points.txt

@@ -10,7 +10,7 @@ delete_glossary=pyegeria.commands.cat.glossary_actions:delete_glossary
 delete_term=pyegeria.commands.cat.glossary_actions:delete_term
 delete_todo=pyegeria.commands.my.todo_actions:delete_todo
 dr_egeria_jupyter=pyegeria.commands.cat.dr_egeria_jupyter:process_jupyter_notebook
-dr_egeria_md=pyegeria.commands.cat.dr_egeria_md:process_markdown_file
+dr_egeria_md=pyegeria.commands.cat.dr_egeria_md:main
 egeria_login=pyegeria.commands.cli.egeria_login_tui:login
 export_terms_to_csv_file=pyegeria.commands.cat.glossary_actions:export_terms_csv
 get_asset_graph=pyegeria.commands.cat.get_asset_graph:main