pyegeria 5.3.6.6__tar.gz → 5.3.7__tar.gz

{pyegeria-5.3.6.6 → pyegeria-5.3.7}/PKG-INFO

@@ -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 → pyegeria-5.3.7}/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-5.3.6.6 → pyegeria-5.3.7}/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-5.3.7/pyegeria/commands/cat/dr_egeria_md.py

@@ -0,0 +1,217 @@
+"""
+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.prompt import Prompt
+
+
+import click
+from pyegeria import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
+                      process_categories_upsert_command, process_provenance_command,
+                      get_current_datetime_string, process_per_proj_upsert_command, command_list,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")
+
+
+
+
+
+@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,
+        server: str,
+        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)
+
+    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_found = False
+    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 = {}
+
+    # 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
+
+        # 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
+
+        # 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:
+            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)
+
+
+    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:
+                    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)
+
+
+# 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-5.3.6.6 → pyegeria-5.3.7}/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-5.3.6.6 → pyegeria-5.3.7}/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-5.3.6.6 → pyegeria-5.3.7}/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-5.3.6.6 → pyegeria-5.3.7}/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