pyegeria 5.3.7.4__tar.gz → 5.3.7.7__tar.gz

{pyegeria-5.3.7.4 → pyegeria-5.3.7.7}/PKG-INFO

@@ -1,26 +1,16 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.3.7.4
+Version: 5.3.7.7
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance
 Author: Dan Wolfson
 Author-email: dan.wolfson@pdr-associates.com
+Requires-Python: >3.12,<4.0.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: click
 Requires-Dist: httpx
@@ -30,7 +20,7 @@ Requires-Dist: mermaid-py
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
 Requires-Dist: pytest
 Requires-Dist: requests
-Requires-Dist: rich (>=13.9.4,<14.0.0)
+Requires-Dist: rich
 Requires-Dist: textual
 Requires-Dist: trogon (>=0.6.0,<0.7.0)
 Requires-Dist: urllib3

{pyegeria-5.3.7.4 → pyegeria-5.3.7.7}/pyegeria/__init__.py

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

{pyegeria-5.3.7.4 → pyegeria-5.3.7.7}/pyegeria/commands/cat/dr_egeria_md.py

@@ -13,9 +13,11 @@ 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
                       )
 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")
@@ -62,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)
@@ -94,7 +96,7 @@ def process_markdown_file(
             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)
@@ -108,6 +110,8 @@ def process_markdown_file(
                 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)
+            elif potential_command in ["Create Blueprint", "Update Blueprint", "Create Solution Blueprint", "Update Solution Blueprint"]:
+                result = process_blueprint_upsert_command(client, element_dictionary, current_block, directive)
             else:
                 # If command is not recognized, keep the block as-is
                 result = None
@@ -116,7 +120,7 @@ def process_markdown_file(
                 if directive == "process":
                     updated = True
                     final_output.append(result)
-                    print(json.dumps(element_dictionary, indent=4))
+                    # print(json.dumps(element_dictionary, indent=4))
                 elif directive == "validate":
                     print(json.dumps(element_dictionary, indent=4))
             elif directive == "process":
@@ -178,7 +182,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.")
 
@@ -212,3 +216,5 @@ def process_markdown_file(
 #
 # if __name__ == "__main__":
 #     main()
+if __name__ == "__main__":
+    process_markdown_file()

{pyegeria-5.3.7.4 → pyegeria-5.3.7.7}/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-5.3.7.7/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-5.3.7.4 → pyegeria-5.3.7.7}/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-5.3.7.4 → pyegeria-5.3.7.7}/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", display_name),
 
                 body = {
                     "class": "ReferenceableRequestBody",

pyegeria-5.3.7.7/pyegeria/md_processing_helpers.py

@@ -0,0 +1,68 @@
+
+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
+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,str,str,bool,bool]:
+    msg = ""
+    known_guid = None
+    valid = True
+    exists = False
+    
+    elements_txt = extract_attribute(txt, [element_type])
+
+    if elements_txt is None:
+        msg += f"* {INFO}No Solution Blueprints found\n"
+    
+    else:
+        element_list = re.split(r'[,\n]+', elements_txt)
+        elements = ""
+        new_element_list = []
+        for element in element_list:
+            element_el = element.strip()
+            if element_el not in element_dictionary:
+                # Get the element using the generalized function
+
+                el = get_element_by_name(egeria_client, element_type, element_el)
+                if isinstance(el, str):
+                    msg += (f"* {WARNING}Blueprint `{element_el}` not found -> "
+                            f"Blueprints for this Solution Component won't be processed!\n")
+                    el_exist = False
+                    break
+    
+                # Extract properties using the element type name to construct property access
+                properties_key = f"{element_type}Properties"
+                el_qname = el[0][properties_key].get('qualifiedName', None)
+    
+                if el_qname not in element_dictionary:
+                    el_guid = el[0]['elementHeader']['guid']
+                    el_display_name = el[0][properties_key].get('displayName', None)
+                    element_dictionary[el_qname] = {
+                        'guid': el_guid,
+                        'displayName': el_display_name
+                        }
+            elements = f"{el_qname}, {elements}"
+            new_element_list.append(el_qname)
+        if el_exist:
+            elements += '\n'
+            element_list = new_element_list
+        else:
+            elements = None