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

pyegeria/__init__.py

@@ -61,7 +61,7 @@ from .collection_manager_omvs import CollectionManager
 from .core_omag_server_config import CoreServerConfig
 from .create_tech_guid_lists import build_global_guid_lists
 from .egeria_cat_client import EgeriaCat
-from .egeria_client import Egeria
+# from .egeria_client import Egeria
 from .egeria_config_client import EgeriaConfig
 from .egeria_my_client import EgeriaMy
 from .egeria_tech_client import EgeriaTech
@@ -92,7 +92,7 @@ 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, command_list,
                                   render_markdown, process_provenance_command)
 
 #

pyegeria/commands/cat/dr_egeria_jupyter.py

@@ -6,12 +6,13 @@ import nbformat
 import os
 from rich import print
 from rich.console import Console
+
+from pyegeria.egeria_tech_client import EgeriaTech
 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)
+                                          get_current_datetime_string, process_per_proj_upsert_command, command_list,
+                                          )
 import click
-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 (
     print_exception_response,
 )
@@ -76,7 +77,7 @@ def process_jupyter_notebook(
                 if cell.cell_type == 'markdown':
                     if cell.source.strip().startswith('#'):
                         potential_command = extract_command(cell.source)
-                        if potential_command in commands:
+                        if potential_command in command_list:
                             if potential_command in ["Create Glossary", "Update Glossary"]:
                                 result = process_glossary_upsert_command(client, element_dictionary,
                                                                          cell.source, directive)

pyegeria/commands/cat/dr_egeria_md.py

@@ -6,17 +6,13 @@ 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 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
+                      process_categories_upsert_command, process_provenance_command,
+                      get_current_datetime_string, process_per_proj_upsert_command, command_list,EgeriaTech,
                       )
 from datetime import datetime
 
@@ -47,16 +43,17 @@ EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat
 
 
 
-# @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", required=True, prompt=False)
+@click.option("--directive", default="display", help="How to process the file",
+              type=click.Choice(["display","validate","process"],case_sensitive=False), prompt=False,)
+@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,
@@ -68,6 +65,7 @@ def process_markdown_file(
     """
     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)
@@ -82,67 +80,96 @@ 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 =""
+    final_output = []
     prov_found = False
-    prov_output = (f"\n* Results from processing file {file_path} on "
+    prov_output = (f"\n# Provenance\n\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 = {}
 
-    # Read and process lines sequentially, preserving their order
+    # Helper function to process the current block
+    def process_current_block(current_block):
+        nonlocal updated, final_output, prov_found, prov_output, h1_blocks, in_h1_block, element_dictionary
+
+        if not current_block:
+            return  # No block to process
+
+        potential_command = extract_command(current_block)  # Extract command
+        if potential_command in command_list:
+            # Process the block based on the command
+            if potential_command == "Provenance":
+                result = process_provenance_command(file_path, current_block)
+                prov_found = True
+
+            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.append(result)
+                    # print(json.dumps(element_dictionary, indent=4))
+                # elif directive == "validate":
+                #     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.append(current_block)
+        else:
+            # If there is no command, append the block as-is
+            final_output.append(current_block)
+
+    # Main parsing loop
     for line in lines:
         line = line.strip()  # Remove leading/trailing whitespace
 
-        if line.startswith("# "):  # Start of a new H1 block
-            current_block = line  # Initialize the H1 block
+        # Handle a new H1 block (starting with `# `)
+        if line.startswith("# "):
+            if in_h1_block:
+                # Process the current block before starting a new one
+                process_current_block(current_block)
+
+            # Start a new H1 block
+            current_block = line
             in_h1_block = True
-        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
+        # Handle the end of a block (line starts with `---`)
+        elif line.startswith("---"):
+            if in_h1_block:
+                # Process the current block when it ends with `---`
+                current_block += f"\n{line}"
+                process_current_block(current_block)
+                current_block = ""  # Clear the block
+                in_h1_block = False
+
+        # Add lines to the current H1 block
+        elif in_h1_block:
             current_block += f"\n{line}"
+
+        # Append non-H1 content directly to the output
         else:
-            # For non-H1 lines, add them directly to the output
-            final_output += f"\n{line}"
+            final_output.append(line)
+
+    # Ensure the final H1 block is processed if the file doesn't end with `---`
+    if in_h1_block:
+        process_current_block(current_block)
+
+    # Join the final output list into a single string
+    final_output = "\n".join(final_output)
+
 
-    # Write the final_output to a new file if updated
     try:
         if updated:
             path, filename = os.path.split(file_path)  # Get both parts
@@ -152,11 +179,8 @@ def process_markdown_file(
 
             with open(new_file_path, 'w') as f2:
                 f2.write(final_output)
-                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)
+                if not prov_found:
+                    f2.write(prov_output)
             click.echo(f"\n==> Notebook written to {new_file_path}")
         else:
             click.echo("\nNo updates detected. New File not created.")
@@ -165,29 +189,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__":
-    main()
+# 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__":
+#     main()

pyegeria/commands/cat/list_terms.py

@@ -41,7 +41,7 @@ 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_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", "/Users/dwolfson/localGit/egeria-v5-3/egeria-python")
 EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "pyegeria/commands/cat/dr_egeria_inbox")
@@ -148,16 +148,14 @@ def display_glossary_terms(
             caption=f"View Server '{view_server}' @ Platform - {view_url}",
             expand=True,
         )
-        table.add_column("Term Name")
+        table.add_column("Term Name / Abbreviation / Version")
         table.add_column("Qualified Name / GUID", width=38, no_wrap=True)
-        table.add_column("Abbreviation")
         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,
@@ -183,7 +181,7 @@ def display_glossary_terms(
             if props == "None":
                 return table
 
-            display_name = Text(props.get("displayName","---"), style=style, justify="center")
+            display_name = props.get("displayName","---")
             qualified_name = props["qualifiedName"]
             term_guid = term["elementHeader"]["guid"]
             q_name = Text(
@@ -197,7 +195,9 @@ def display_glossary_terms(
                 style=style,
                 justify="center",
             )
-            example = Text(props.get("example", " "), style=style)
+            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
@@ -221,20 +221,18 @@ def display_glossary_terms(
                 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"].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",
             )
 

pyegeria/commands/cli/egeria_cat.py

@@ -674,17 +674,7 @@ 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_dr_egeria.add_command(process_markdown_file)
 
 @tell.group("glossary")
 @click.pass_context

pyegeria/egeria_client.py

@@ -11,7 +11,7 @@ for all use cases..using the more role based clients is often appropriate:
     * EgeriaTech - for technical users such as data scientists and engineers
 
 """
-from pyegeria.x_action_author_omvs import ActionAuthor
+# from pyegeria.x_action_author_omvs import ActionAuthor
 from pyegeria.asset_catalog_omvs import AssetCatalog
 from pyegeria.collection_manager_omvs import CollectionManager
 from pyegeria.glossary_manager_omvs import GlossaryManager
@@ -22,19 +22,21 @@ from pyegeria.template_manager_omvs import TemplateManager
 from pyegeria.runtime_manager_omvs import RuntimeManager
 from pyegeria.full_omag_server_config import FullServerConfig
 from pyegeria.metadata_explorer_omvs import MetadataExplorer
-from pyegeria.egeria_my_client import EgeriaMy
+from pyegeria.my_profile_omvs import MyProfile
+from pyegeria.feedback_manager_omvs import FeedbackManager
 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
+# from pyegeria.md_processing_utils import render_markdown
 
 
 class Egeria(
     AssetCatalog,
     CollectionManager,
-    EgeriaMy,
+    MyProfile,
+    FeedbackManager,
     GlossaryManager,
     # GovernanceAuthor,
     # PeopleOrganizer,
@@ -42,15 +44,14 @@ class Egeria(
     RuntimeManager,
     ServerOps,
     FullServerConfig,
-    ActionAuthor,
+    # ActionAuthor,
     AutomatedCuration,
     ClassificationManager,
     RegisteredInfo,
-    # TemplateManager,
+    TemplateManager,
     ValidMetadataManager,
     MetadataExplorer,
     SolutionArchitect,
-    EgeriaMy,
     EgeriaConfig,
 ):
     """
@@ -87,7 +88,10 @@ class Egeria(
             self, view_server, platform_url, user_id, user_pwd, token
         )
 
-        EgeriaMy.__init__(self, view_server, platform_url, user_id, user_pwd, token)
+        MyProfile.__init__(self, view_server, platform_url, user_id, user_pwd, token)
+        FeedbackManager.__init__(
+            self, view_server, platform_url, user_id, user_pwd, token
+            )
 
         GlossaryManager.__init__(
             self, view_server, platform_url, user_id, user_pwd, token
@@ -104,7 +108,7 @@ class Egeria(
 
         EgeriaConfig.__init__(self, view_server, platform_url, user_id, user_pwd)
 
-        ActionAuthor.__init__(self, view_server, platform_url, user_id, user_pwd, token)
+        # ActionAuthor.__init__(self, view_server, platform_url, user_id, user_pwd, token)
         AutomatedCuration.__init__(
             self, view_server, platform_url, user_id, user_pwd, token
         )
@@ -120,3 +124,4 @@ class Egeria(
         SolutionArchitect.__init__(
             self, view_server, platform_url, user_id, user_pwd, token
         )
+print(Egeria.mro())

pyegeria/glossary_browser_omvs.py

@@ -93,8 +93,8 @@ class GlossaryBrowser(Client):
 
     def make_md_attribute(self, attribute_name: str, attribute_value: str, output_type: str) -> str | None:
         output = ""
-        attribute_value = attribute_value.strip() if attribute_value else None
-        attribute_title = attribute_name.title() if attribute_name else None
+        attribute_value = attribute_value.strip() if attribute_value else ""
+        attribute_title = attribute_name.title() if attribute_name else ""
         if output_type in ["FORM", "MD"]:
             output = f"## {attribute_title}\n{attribute_value}\n\n"
         elif output_type == "REPORT":
@@ -149,7 +149,7 @@ class GlossaryBrowser(Client):
             description = element_properties.get("description", None)
             examples = element_properties.get("examples", None)
             usage = element_properties.get("usage", None)
-            pub_version = element_properties.get("publishedVersionIdentifier", None)
+            pub_version = element_properties.get("publishVersionIdentifier", None)
             qualified_name = element_properties.get("qualifiedName", None)
             status = element['elementHeader'].get('status', None)
 
@@ -161,9 +161,14 @@ class GlossaryBrowser(Client):
             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:
+                first_cat = True
                 for category in category_list:
                     category_name = category["glossaryCategoryProperties"].get("qualifiedName", '---')
-                    category_list_md += f" {category_name}\n"
+                    if first_cat:
+                        category_list_md += f" {category_name}\n"
+                        first_cat = False
+                    else:
+                        category_list_md += f", {category_name}\n"
 
             if output_format in ['FORM', 'MD']:
                 elements_md += f"# {elements_action}\n\n"
@@ -180,7 +185,7 @@ class GlossaryBrowser(Client):
             elements_md += self.make_md_attribute( "description", description, output_format)
             elements_md += self.make_md_attribute( "examples", examples, output_format)
             elements_md += self.make_md_attribute("usage", usage, output_format)
-            elements_md += self.make_md_attribute("published version", pub_version, output_format)
+            elements_md += self.make_md_attribute("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

pyegeria/md_processing_utils.py

@@ -12,26 +12,28 @@ from typing import List, Optional
 
 import os
 import re
-from pyegeria import EgeriaTech, NO_CATEGORIES_FOUND
+
 from rich import box, print
 from rich.console import Console
 from rich.markdown import Markdown
-from rich.prompt import Prompt
-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, )
+
+from pyegeria import body_slimmer
+from pyegeria._globals import NO_TERMS_FOUND, NO_GLOSSARIES_FOUND, NO_TERMS_FOUND, NO_ELEMENTS_FOUND, NO_PROJECTS_FOUND, NO_CATEGORIES_FOUND
+
+from pyegeria.project_manager_omvs import ProjectManager
+from pyegeria.glossary_manager_omvs import GlossaryManager
+
 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",
+command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term", "Update Term", "Create Personal Project",
             "Update Personal Project", "Create Category", "Update Category"]
 ERROR = "ERROR-> "
 INFO = "INFO- "
 WARNING = "WARNING-> "
 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:
@@ -42,7 +44,7 @@ def render_markdown(markdown_text: str) -> None:
 def is_valid_iso_date(date_text) -> bool:
     """Checks if the given string is a valid ISO date."""
     try:
-        datetime.datetime.strptime(date_text, '%Y-%m-%d')
+        datetime.strptime(date_text, '%Y-%m-%d')
         return True
     except ValueError:
         return False
@@ -54,7 +56,7 @@ def get_current_datetime_string():
     return now
 
 
-def add_term_to_categories(egeria_client: EgeriaTech, term_guid: str, categories_exist: bool,
+def add_term_to_categories(egeria_client: GlossaryManager, 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:
@@ -97,7 +99,6 @@ def extract_attribute(text: str, labels: List[str]) -> Optional[str]:
             if not extracted_text.isspace() and extracted_text:
                 return extracted_text  # Return the cleaned text
 
-    return None
 
 
 def update_a_command(txt: str, command: str, obj_type: str, q_name: str, u_guid: str) -> str:
@@ -126,17 +127,26 @@ def update_a_command(txt: str, command: str, obj_type: str, q_name: str, u_guid:
         txt = re.sub(pattern, replacement, txt)
     return txt
 
-def process_provenance_command(file_path: str, txt: str) -> str:
+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"""
     output = (f"* Derived from processing file {file_path} on "
               f"{get_current_datetime_string()}\n")
-    existing_prov = extract_attribute(txt,'Provenance')
+    pattern = rf"# {re.escape('Provenance')}\n(.*?)(?:#|---|$)"
+    match = re.search(pattern, txt, re.DOTALL)
+    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:
+            existing_prov =  extracted_text  # Return the cleaned text
+        else:
+            existing_prov = None
+    print(f"txt is: {txt}, existing_prov: {existing_prov}")
     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,
+def process_glossary_upsert_command(egeria_client: GlossaryManager, element_dictionary: dict, txt: str,
                                     directive: str = "display") -> Optional[str]:
     """
     Processes a glossary create or update command by extracting key attributes such as
@@ -199,12 +209,7 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionar
             if not glossary_exists:
                 msg += f"* {ERROR}Glossary {glossary_name} does not exist\n"
                 valid = False
-            # if len(glossary_details) > 1 and glossary_exists:
-            #     msg += f"* {ERROR}More than one glossary with name {glossary_name} found\n"
-            #     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)
+
             if q_name is None:
                 msg += f"* {INFO}Qualified Name is missing => can use known qualified name of {known_q_name}\n"
                 valid = True
@@ -215,6 +220,7 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionar
             if valid:
                 msg += glossary_display
                 msg += f"* -->Glossary `{glossary_name}` exists and can be updated\n"
+                element_dictionary[known_q_name] = {'display_name': glossary_name, 'guid': known_glossary_guid}
             else:
                 msg += f"* --> validation failed\n"
 
@@ -228,6 +234,8 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionar
             elif valid:
                 msg += f"-->It is valid to create Glossary \'{glossary_name}\' with:\n"
                 msg += glossary_display
+                expected_q_name = egeria_client.__create_qualified_name__('Glossary', glossary_name)
+                element_dictionary[expected_q_name] = {'display_name': glossary_name}
 
             print(Markdown(msg))
             return valid, glossary_exists, known_glossary_guid, known_q_name
@@ -284,7 +292,7 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, element_dictionar
                 return egeria_client.get_glossary_by_guid(glossary_guid, output_format = 'MD')
 
 
-def process_categories_upsert_command(egeria_client: EgeriaTech, element_dictionary: dict, txt: str,
+def process_categories_upsert_command(egeria_client: GlossaryManager, element_dictionary: dict, txt: str,
                                       directive: str = "display") -> Optional[str]:
     """
     Processes a glossary category create or update command by extracting key attributes such as
@@ -383,6 +391,7 @@ def process_categories_upsert_command(egeria_client: EgeriaTech, element_diction
             if valid:
                 msg += category_display
                 msg += f"* -->category `{category_name}` exists and can be updated\n"
+                element_dictionary[known_q_name] = {'display_name': glossary_name, 'guid': known_category_guid}
             else:
                 msg += f"* --> validation failed\n"
 
@@ -396,6 +405,8 @@ def process_categories_upsert_command(egeria_client: EgeriaTech, element_diction
             elif valid:
                 msg += f"-->It is valid to create category `{category_name}` with:\n"
                 msg += category_display
+                expected_q_name = egeria_client.__create_qualified_name__('Category', category_name)
+                element_dictionary[expected_q_name] = {'display_name': category_name}
 
             print(Markdown(msg))
             return valid, category_exists, known_category_guid, known_q_name, glossary_guid
@@ -452,7 +463,7 @@ def process_categories_upsert_command(egeria_client: EgeriaTech, element_diction
                 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,
+def process_term_upsert_command(egeria_client: GlossaryManager, element_dictionary: dict, txt: str,
                                 directive: str = "display") -> Optional[str]:
     """
     Processes a term create or update command by extracting key attributes such as
@@ -475,7 +486,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
     examples = extract_attribute(txt, ['Examples'])
     usage = extract_attribute(txt, ['Usage'])
     status = extract_attribute(txt, ['Status'])
-    version = extract_attribute(txt, ['Version', "Version Identifier"])
+    version = extract_attribute(txt, ['Version', "Version Identifier", "Published Version"])
     categories = extract_attribute(txt, ['Categories'])
     q_name = extract_attribute(txt, ['Qualified Name'])
     # q_name = q_name if q_name else " "
@@ -598,6 +609,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
             else:
                 msg += f"\n--> * Term {term_name} exists and can be updated\n"
                 msg += term_display
+                element_dictionary[known_q_name] = {'display_name': term_name, 'guid': known_term_guid}
 
             print(Markdown(msg))
             return valid, term_exists, known_term_guid, known_q_name
@@ -609,6 +621,8 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
                 msg += f"\n-->Validation checks failed in creating Term \'{term_name}\' with: {term_display}\n"
             else:
                 msg += f"\n-->It is valid to create Term \'{term_name}\' with: {term_display}\n"
+                expected_q_name = egeria_client.__create_qualified_name__('Term', term_name)
+                element_dictionary[expected_q_name] = {'display_name': term_name}
 
             print(Markdown(msg))
             return valid, term_exists, known_term_guid, known_q_name
@@ -667,7 +681,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
                         },
                     "updateDescription": update_description
                     }
-                egeria_client.update_term(known_guid, body)
+                egeria_client.update_term(known_guid, body_slimmer(body))
                 # if cats_exist is True and categories_list is not None:
                 #     for category in categories_list:
                 #         cat_guid = element_dictionary.get(f"category.{category}", None)
@@ -686,7 +700,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
             elif object_action == "Create":
                 guid = None
 
-                q_name = egeria_client.__create_qualified_name__("Term",term_name, EGERIA_LOCAL_QUALIFIER)
+                q_name = egeria_client.__create_qualified_name__("Term",term_name)
                 if exists:
                     print(f"\n{WARNING}Term {term_name} exists and result document updated")
                     return update_a_command(txt, command, object_type, q_name, known_guid)
@@ -706,9 +720,15 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
                             return None
                     term_body = {
                         "class": "ReferenceableRequestBody", "elementProperties": {
-                            "class": "GlossaryTermProperties", "qualifiedName": q_name, "displayName": term_name,
-                            "summary": summary, "description": description, "abbreviation": abbreviation,
-                            "examples": examples, "usage": usage, "publishVersionIdentifier": version
+                            "class": "GlossaryTermProperties",
+                            "qualifiedName": q_name,
+                            "displayName": term_name,
+                            "summary": summary,
+                            "description": description,
+                            "abbreviation": abbreviation,
+                            "examples": examples,
+                            "usage": usage,
+                            "publishVersionIdentifier": version
                             # "additionalProperties":
                             #     {
                             #         "propertyName1": "xxxx",
@@ -733,7 +753,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, element_dictionary: d
             console.print_exception(show_locals=True)
             return None
 
-def process_per_proj_upsert_command(egeria_client: EgeriaTech, element_dictionary: dict, txt: str,
+def process_per_proj_upsert_command(egeria_client: ProjectManager, element_dictionary: dict, txt: str,
                                     directive: str = "display") -> str | None:
     """
     Processes a personal project create or update command by extracting key attributes such as

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

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

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

@@ -1,5 +1,5 @@
 pyegeria/README.md,sha256=PwX5OC7-YSZUCIsoyHh1O-WBM2hE84sm3Bd4O353NOk,1464
-pyegeria/__init__.py,sha256=koaCNp-uWubVVhrdGCcd4auWV7qeVKZGAVG1zY0rPgs,30266
+pyegeria/__init__.py,sha256=4ANzq4fFT3vpvPX0Khav7S0mkPZXFRpSJifE0ujSK3o,30272
 pyegeria/_client.py,sha256=nhUPmeQFHqbobM6_3EGmUy-STYURxb15BEXf6erY2oI,31733
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
 pyegeria/_exceptions.py,sha256=1SrnV194V4_YJNnNAU0myTHQ3dhLn4GF2B2gZcj1u90,18153
@@ -16,8 +16,8 @@ pyegeria/commands/cat/README.md,sha256=-aaAnIT2fcfU63vajgB-RzQk4l4yFdhkyVfSaTPiq
 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=HlCgBRrECsi5UL1L_f_d5RMcuHMzK0W26nLWK5nqitc,9052
+pyegeria/commands/cat/dr_egeria_jupyter.py,sha256=U-3m9BMoCXj2fvuawr3PTc2HQWAXThqQ3sIXjyCWv6s,5912
+pyegeria/commands/cat/dr_egeria_md.py,sha256=CcqRdO5lIPmbMuHu59DDD5731sPu1Q_A08cQ0L7E_f4,9523
 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=kXPcP8u-SMWfrVyyBhNoxG8mcgB7EV_5i9N9w_IBU7o,5379
@@ -37,12 +37,12 @@ pyegeria/commands/cat/list_glossaries.py,sha256=jlhe840GxadFVM2qIcVm7-YwZ-8EBN-a
 pyegeria/commands/cat/list_projects.py,sha256=NzWTuepTGUEyxK-eWvuUxtBgCtNWubVwmz2eqm2UN1c,7997
 pyegeria/commands/cat/list_tech_type_elements.py,sha256=-9omj5en9dSP1xMSljYVHyfXsuhuE1bO2IFj_bZPhAs,6873
 pyegeria/commands/cat/list_tech_types.py,sha256=uqZcXHCzAznhEG6WWeM5j-spwUh8ycygFqpVDeXOG-0,4653
-pyegeria/commands/cat/list_terms.py,sha256=D0tCD2f8j-UgnV4Bgisj9a11CCEOneNsRT7_3cyDnH4,12098
+pyegeria/commands/cat/list_terms.py,sha256=GwhbQeesYMCXOx3o4Hsom21wtC2nzmbpjhpwRLZ7iVE,12177
 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=_Z__gugx11bpwyWU6Uiacw_0r0q5o4mbAZ-ipDozFwc,52884
-pyegeria/commands/cli/egeria_cat.py,sha256=uYI_KD_9iAOgx5zsSWPpvK8MK3ymJcMmsTRONfbQDkM,18848
+pyegeria/commands/cli/egeria_cat.py,sha256=C57P0qltiwNZKF9WrsetqbVB5ezKQgZwj3mo_gZ3AzA,18345
 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
@@ -219,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=HAM7pwH2ooegnpeaBr6Q0Km3zrzH1Mpgm0wgC82Y-DQ,4278
+pyegeria/egeria_client.py,sha256=UjvwDkTO3iYaPEGuPZJTiK_k_i4ZuVeB8QMTVNUHwxg,4490
 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=kJPfVd46w7HdV2KKoq7jRxVYdvvqEl0RAIMRsfXrtME,109389
+pyegeria/glossary_browser_omvs.py,sha256=NHcLStpzejiT3BinIpm4FmYKPiVcBKSvp2ihZfNwTik,109579
 pyegeria/glossary_manager_omvs.py,sha256=QSOVqbwEASueCQzpvYNEOaUIAhOvwqLWWhfzwT8hrrs,70275
 pyegeria/m_test.py,sha256=M5-M2ZczsAJLXWfSeqTTADHdx6Ku-y4PbQ4M21JthAE,7778
-pyegeria/md_processing_utils.py,sha256=8ucemhlOniobCn8ZSWN3D9-JaeZkgHJAwy2K2xWx3Bo,41759
+pyegeria/md_processing_utils.py,sha256=oELxTiJBB3ilViMjNtjxAicG2awEPmhjipd8rvXKPr4,42704
 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
@@ -242,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.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.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.3.7.dist-info/METADATA,sha256=7rhI0QxgXZv4dtwa4poxMpzrup7d9Doljw1-YXqgQ58,2741
+pyegeria-5.3.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pyegeria-5.3.7.dist-info/entry_points.txt,sha256=eAvQ_vkejlF3JzMzEc5VD93ymLA_hSFV0HM8fntG-d8,6791
+pyegeria-5.3.7.dist-info/RECORD,,

{pyegeria-5.3.6.6.dist-info → pyegeria-5.3.7.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:main
+dr_egeria_md=pyegeria.commands.cat.dr_egeria_md:process_markdown_file
 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