pyegeria 5.3.7.2__py3-none-any.whl → 5.3.7.8__py3-none-any.whl

pyegeria/__init__.py

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

pyegeria/_client.py

@@ -770,7 +770,8 @@ class Client:
         )
         return result
 
-    def __create_qualified_name__(self, type: str, display_name: str, local_qualifier: str = None) -> str:
+    def __create_qualified_name__(self, type: str, display_name: str, local_qualifier: str = None,
+                                  version_identifier: str = None) -> str:
         """Helper function to create a qualified name for a given type and display name.
            If present, the local qualifier will be prepended to the qualified name."""
         EGERIA_LOCAL_QUALIFIER = os.environ.get("EGERIA_LOCAL_QUALIFIER", local_qualifier)
@@ -778,6 +779,8 @@ class Client:
         q_name = f"{type}:{display_name}"
         if EGERIA_LOCAL_QUALIFIER:
             q_name = f"{EGERIA_LOCAL_QUALIFIER}:{q_name}"
+        if version_identifier:
+            q_name = f"{q_name}:{version_identifier}"
         return q_name
 
 if __name__ == "__main__":

pyegeria/commands/cat/dr_egeria_md.py

@@ -13,6 +13,8 @@ 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,
+                      process_blueprint_upsert_command, process_solution_component_upsert_command,
+                      shared_state
                       )
 from datetime import datetime
 
@@ -39,10 +41,6 @@ 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")
 
-
-
-
-
 @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)
@@ -52,6 +50,7 @@ EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat
 @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(
@@ -65,7 +64,7 @@ def process_markdown_file(
     """
     Process a markdown file by parsing and executing Dr. Egeria commands. Write output to a new file.
     """
-
+    cmd_list = command_list
     console = Console(width=int(EGERIA_WIDTH))
     client = EgeriaTech(server, url, user_id=userid)
     token = client.create_egeria_bearer_token(userid, user_pass)
@@ -87,41 +86,47 @@ def process_markdown_file(
     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
+        nonlocal updated, final_output, prov_found, prov_output, h1_blocks, in_h1_block
 
         if not current_block:
             return  # No block to process
 
         potential_command = extract_command(current_block)  # Extract command
-        if potential_command in command_list:
+        if potential_command in cmd_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)
+                result = process_glossary_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
             elif potential_command in ["Create Category", "Update Category"]:
-                result = process_categories_upsert_command(client, element_dictionary, current_block, directive)
+                result = process_categories_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
             elif potential_command in ["Create Term", "Update Term"]:
-                result = process_term_upsert_command(client, element_dictionary, current_block, directive)
+                result = process_term_upsert_command(client, shared_state.get_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)
+                result = process_per_proj_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
+            elif potential_command in ["Create Blueprint", "Update Blueprint", "Create Solution Blueprint", "Update Solution Blueprint"]:
+                result = process_blueprint_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
+            elif potential_command in ["Create Solution Component", "Update Solution Component"]:
+                result = process_solution_component_upsert_command(client, shared_state.get_element_dictionary(), current_block, directive)
+
+
             else:
                 # If command is not recognized, keep the block as-is
                 result = None
-
+            print(json.dumps(shared_state.get_element_dictionary(), indent=4))
             if result:
                 if directive == "process":
                     updated = True
                     final_output.append(result)
-                    # print(json.dumps(element_dictionary, indent=4))
+                    print(json.dumps(shared_state.get_element_dictionary(), indent=4))
                 elif directive == "validate":
-                    print(json.dumps(element_dictionary, indent=4))
+                    print(json.dumps(shared_state.get_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"
@@ -181,7 +186,7 @@ def process_markdown_file(
                 f2.write(final_output)
                 if not prov_found:
                     f2.write(prov_output)
-            click.echo(f"\n==> Notebook written to {new_file_path}")
+            click.echo(f"\n==> Output written to {new_file_path}")
         else:
             click.echo("\nNo updates detected. New File not created.")
 
@@ -215,3 +220,5 @@ def process_markdown_file(
 #
 # if __name__ == "__main__":
 #     main()
+if __name__ == "__main__":
+    process_markdown_file()

pyegeria/commands/cat/get_project_dependencies.py

@@ -109,7 +109,7 @@ def project_dependency_viewer(
                 child_md = ""
                 child_guid = proj["elementHeader"]["guid"]
                 child_name = proj["properties"]["name"]
-                relationship = proj["relatedElement"]["relationshipHeader"]["type"][
+                relationship = proj["startingElement"]["relationshipHeader"]["type"][
                     "typeName"
                 ]
                 if relationship != "ProjectDependency":

pyegeria/commands/cat/get_project_structure.py

@@ -109,7 +109,7 @@ def project_structure_viewer(
                 child_md = ""
                 child_guid = proj["elementHeader"]["guid"]
                 child_name = proj["properties"]["name"]
-                relationship = proj["relatedElement"]["relationshipHeader"]["type"][
+                relationship = proj["startingElement"]["relationshipHeader"]["type"][
                     "typeName"
                 ]
                 if relationship != "ProjectHierarchy":

pyegeria/commands/cat/glossary_actions.py

@@ -141,6 +141,7 @@ def delete_glossary(server, url, userid, password, timeout, glossary_guid):
 @click.command("create-term")
 @click.option("--glossary-name", help="Name of Glossary", required=True)
 @click.option("--term-name", help="Name of Term", required=True)
+@click.option("--qualified-name",  help="Qualified name of Term", default=None)
 @click.option(
     "--summary",
     help="Summary definition",
@@ -170,31 +171,23 @@ def delete_glossary(server, url, userid, password, timeout, glossary_guid):
 @click.option("--userid", default=EGERIA_USER, help="Egeria user")
 @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 @click.option("--timeout", default=60, help="Number of seconds to wait")
-def create_term(
-    server,
-    url,
-    userid,
-    password,
-    glossary_name,
-    term_name,
-    summary,
-    description,
-    abbrev,
-    examples,
-    usage,
-    version,
-    status,
-    timeout: int = 120,
-) -> str:
-    """Create a new term"""
+def create_term(server, url, userid, password, glossary_name, term_name, summary, description, abbrev, examples, usage,
+                version, status, timeout: int = 120, qualified_name=None) -> str:
+    """Create a new term
+
+    Args:
+        qualified_name:
+    """
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
     token = m_client.create_egeria_bearer_token()
+    if qualified_name is None:
+        qualified_name = m_client.__create_qualified_name__('Term', term_name)
     try:
         body = {
             "class": "ReferenceableRequestBody",
             "elementProperties": {
                 "class": "GlossaryTermProperties",
-                "qualifiedName": f"GlossaryTerm: {term_name} - {datetime.now().isoformat()}",
+                "qualifiedName": qualified_name,
                 "displayName": term_name,
                 "summary": summary,
                 "description": description,

pyegeria/dr.egeria spec.md

@@ -0,0 +1,9 @@
+
+| Attribute Name  | Input Required? | Generated/Default? | Unique? | Notes | Type                     
+|:----------------| :- | :- | :- | :-|:-------------------------|
+| Term Name       | Yes | No | No | A display name (informal name). | string                   |
+| Owning Glossary | Yes | No | Yes | This is the qualified name of the glossary that owns this term. | Qualified name reference |
+| Categories      | No | No | Yes | This is the qualified (unique) name of the category. Multiple categories can be assigned, separated by a `,` or line. | qualified name reference
+| Description     | No | No  | No | A textual description of this term | string |
+| Qualified Name  | No | Yes | Yes | The qualified name can either be provided by the user or generated. If generated, a pattern is followed. | mfg or supplied q_name |
+| GUID            | No | Yes | Yes | GUIDs are always generated by Egeria. They are meant for automation, not people. | Generated

pyegeria/glossary_browser_omvs.py

@@ -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("publishVersionIdentifier", None)
+            pub_version = element_properties.get("publishfinVersionIdentifier", None)
             qualified_name = element_properties.get("qualifiedName", None)
             status = element['elementHeader'].get('status', None)
 

pyegeria/glossary_manager_omvs.py

@@ -936,7 +936,7 @@ class GlossaryManager(GlossaryBrowser):
                             continue
 
                 # Add the term
-                term_qualified_name = self.__create_qualified_name("Term", display_name),
+                term_qualified_name = self.__create_qualified_name__("Term", term_name)
 
                 body = {
                     "class": "ReferenceableRequestBody",

pyegeria/md_processing_helpers.py

@@ -0,0 +1,58 @@
+#
+# from typing import List, Optional
+#
+# import os
+# import re
+#
+# from rich import box, print
+# from rich.console import Console
+# from rich.markdown import Markdown
+#
+# 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.egeria_tech_client import EgeriaTech
+# from pyegeria.md_processing_utils import extract_attribute, get_element_by_name, process_element_identifiers
+# from pyegeria.project_manager_omvs import ProjectManager
+# from pyegeria.glossary_manager_omvs import GlossaryManager
+# ERROR = "ERROR-> "
+# INFO = "INFO- "
+# WARNING = "WARNING-> "
+# pre_command = "\n---\n==> Processing command:"
+#
+#
+#
+# def process_q_name_list(egeria_client: EgeriaTech, element_type:str, txt:str )-> tuple[str | None,list | None,str | None,bool,bool]:
+#     msg = ""
+#     known_guid = None
+#     valid = True
+#     exists = False
+#     elements = ""
+#     new_element_list = []
+#
+#     elements_txt = extract_attribute(txt, [element_type])
+#
+#     if elements_txt is None:
+#         msg += f"* {INFO}No {element_type}s found\n"
+#
+#     else:
+#         element_list = re.split(r'[,\n]+', elements_txt)
+#
+#         for element in element_list:
+#             element_el = element.strip()
+#
+#                 # Get the element using the generalized function
+#             known_q_name, known_guid, status_msg, el_valid, el_exists = get_element_by_name(
+#                 egeria_client, element_type,txt)
+#             msg += status_msg
+#             if exists and valid:
+#                 elements = f"{element_el}, {elements}" # list of the input names
+#                 new_element_list.append(known_q_name) # list of qualified names
+#             valid = valid and el_valid
+#             exists = exists and el_exists
+#
+#         if elements:
+#             elements += "\n"
+#             msg += f"* {INFO}Found {element_type}s: {elements}"
+#         else:
+#             msg += f"* {INFO}List contains one or more invalid elements.\n"
+#         return elements,new_element_list, msg, valid, exists