pyegeria 5.3.8.10__py3-none-any.whl → 5.3.9.2__py3-none-any.whl

pyegeria/md_processing_utils.py

@@ -16,7 +16,7 @@ from rich.console import Console
 from rich.markdown import Markdown
 
 from pyegeria import body_slimmer
-from pyegeria._globals import (NO_GLOSSARIES_FOUND, NO_ELEMENTS_FOUND, NO_PROJECTS_FOUND, NO_CATEGORIES_FOUND)
+from pyegeria._globals import (NO_GLOSSARIES_FOUND, NO_ELEMENTS_FOUND, NO_PROJECTS_FOUND, NO_CATEGORIES_FOUND, DEBUG_LEVEL)
 from pyegeria.dr_egeria_state import get_element_dictionary, update_element_dictionary, find_key_with_value
 from pyegeria.egeria_tech_client import EgeriaTech
 # from pyegeria.md_processing_helpers import process_q_name_list
@@ -25,14 +25,14 @@ from pyegeria.project_manager_omvs import ProjectManager
 EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "170"))
 console = Console(width=EGERIA_WIDTH)
 
-command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term", "Update Term", "List Terms",
+command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term", "Update Term", "List Terms", "List Term Details",
                 "List Glossary Terms", "List Term History", "List Term Revision History", "List Term Update History",
                 "List Glossary Structure", "List Glossaries", "List Categories", "List Glossary Categories",
                 "Create Personal Project", "Update Personal Project", "Create Category", "Update Category",
                 "Create Solution Blueprint", "Update Solution Blueprint", "Create Solution Component",
                 "Update Solution Component", "Create Term-Term Relationship", "Update Term-Term Relationship",]
 # verbosity - verbose, quiet, debug
-debug_level = "debug"
+
 message_types = {
     "INFO": "INFO-", "WARNING": "WARNING->", "ERROR": "ERROR->", "DEBUG-INFO": "DEBUG-INFO->",
     "DEBUG-WARNING": "DEBUG-WARNING->", "DEBUG-ERROR": "DEBUG-ERROR->", "ALWAYS": "\n\n==> "
@@ -96,6 +96,7 @@ def is_valid_iso_date(date_text) -> bool:
     except ValueError:
         return False
 
+debug_level = DEBUG_LEVEL
 
 def set_debug_level(directive: str) -> None:
     """Sets the debug level for the script."""
@@ -360,8 +361,7 @@ def update_a_command(txt: str, command: str, obj_type: str, q_name: str, u_guid:
     verb = command.split(' ')[0].strip()
     action = "Update" if (verb == "Create" and u_guid is not None) else "Create"
     txt = txt.replace(f"{command}", f'{action} {obj_type}\n')  # update the command
-    txt = txt.replace('<GUID>', f'GUID\n{u_guid}')  # update with GUID
-    txt = txt.replace('<Qualified Name>', f"Qualified Name\n{q_name}")
+
     if "Qualified Name" not in txt:
         txt += f"\n## Qualified Name\n{q_name}\n"
     if "GUID" not in txt:
@@ -389,7 +389,7 @@ def process_provenance_command(file_path: str, txt: [str]) -> str:
             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"
 
@@ -978,11 +978,13 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, txt: str, directi
         if valid:
             print(Markdown(glossary_display))
         else:
-            msg = f"Validation failed for Glossary `{glossary_name}`\n"
-            print_msg(ERROR, msg, debug_level)
-            print(Markdown(glossary_display))
-            return None
-
+            if glossary_exists and object_action == "Create":
+                msg = f"Create failed because glossary `{glossary_name}` exists - changing `Create` to `Update` in processed output \n"
+                print_msg(ERROR, msg, debug_level)
+                print(Markdown(glossary_display))
+                return update_a_command(txt, command, object_type, known_q_name, known_guid)
+            else:
+                return None
         if object_action == "Update":
             if not glossary_exists:
                 print(f"\n{ERROR}Glossary `{glossary_name}` does not exist! Updating result document with Create "
@@ -1123,10 +1125,13 @@ def process_category_upsert_command(egeria_client: EgeriaTech, txt: str, directi
         if valid:
             print(Markdown(category_display))
         else:
-            msg = f"* --> Validation failed for {object_type} `{category_name}`\n"
-            print_msg(ERROR, msg, debug_level)
-            print(Markdown(category_display))
-            return None
+            if category_exists and object_action == "Create":
+                msg = f"Create failed because category `{category_name}` exists - changing `Create` to `Update` in processed output \n"
+                print_msg(ERROR, msg, debug_level)
+                print(Markdown(category_display))
+                return update_a_command(txt, command, object_type, known_q_name, known_guid)
+            else:
+                return None
 
         if object_action == "Update":
             if not category_exists:
@@ -1144,7 +1149,6 @@ def process_category_upsert_command(egeria_client: EgeriaTech, txt: str, directi
             update_element_dictionary(known_q_name, {
                 'guid': known_guid, 'display_name': category_name
                 })
-            print_msg(ALWAYS, f"Updated Category `{category_name}` with GUID {known_guid}", debug_level)
 
             category_sync = update_category_parent(egeria_client, known_guid, parent_category_name)
             print_msg(ALWAYS, f"Updated Category hierarchy for  `{category_name}` with outcome {category_sync}",
@@ -1173,7 +1177,7 @@ def process_category_upsert_command(egeria_client: EgeriaTech, txt: str, directi
                     'guid': category_guid, 'display_name': category_name
                     })
                 print_msg(ALWAYS, f"Created Category `{category_name}` with GUID {category_guid}", debug_level)
-                if parent_valid & parent_exists:
+                if parent_valid and parent_guid:
                     egeria_client.set_parent_category(parent_guid, category_guid)
                     print_msg(ALWAYS, f"Set parent category for `{category_name}` to `{parent_category_name}`",
                               debug_level)
@@ -1297,9 +1301,9 @@ def process_term_upsert_command(egeria_client: EgeriaTech, txt: str, directive:
     version = process_simple_attribute(txt, ['Version', "Version Identifier", "Published Version"], INFO)
     q_name = process_simple_attribute(txt, ['Qualified Name'], INFO)
 
-    aliases = process_simple_attribute(txt, ['Aliases'], INFO)
+    aliases = process_simple_attribute(txt, ['Aliases','Alias'], INFO)
     if aliases:
-        alias_list = list(filter(None, re.split(r'[,\s]+', aliases.strip())))
+        alias_list = list(filter(None, re.split(r'[,\n]+', aliases.strip())))
     else:
         alias_list = None
 
@@ -1382,7 +1386,14 @@ def process_term_upsert_command(egeria_client: EgeriaTech, txt: str, directive:
     elif directive == "process":
         try:
             if not valid:  # First validate the term before we process it
-                return None
+                if term_exists and object_action == "Create":
+                    msg = f"Create failed because term `{term_name}` exists - changing `Create` to `Update` in processed output \n"
+                    print_msg(ERROR, msg, debug_level)
+                    print(Markdown(term_display))
+                    return update_a_command(txt, command, object_type, known_q_name, known_guid)
+                else:
+                    return None
+
             print(Markdown(term_display))
             if object_action == "Update" and directive == "process":
                 if not term_exists:
@@ -1471,16 +1482,16 @@ def process_create_term_term_relationship_command(egeria_client: EgeriaTech, txt
     term2_guid = None
 
 
-    term_relationship = process_simple_attribute(txt, ["Term Relationship"], "ERROR")
+    term_relationship = process_simple_attribute(txt, ["Term Relationship", "Relationship Type"], "ERROR")
     if term_relationship not in TERM_RELATIONSHPS:
         valid = False
 
     print(Markdown(f"{pre_command} `{command}` for term relationship: `{term_relationship}` with directive: `{directive}` "))
 
-    term1_q_name, term1_guid, term1_valid, term1_exists = process_element_identifiers(egeria_client, object_type, ["Term 1 Name"], txt,
+    term1_q_name, term1_guid, term1_valid, term1_exists = process_element_identifiers(egeria_client, object_type, ["Term 1 Name", "Term 1"], txt,
                                                                      "Exists Required", None )
 
-    term2_q_name, term2_guid, term2_valid, term2_exists = process_element_identifiers(egeria_client, object_type, ["Term 2 Name"], txt,
+    term2_q_name, term2_guid, term2_valid, term2_exists = process_element_identifiers(egeria_client, object_type, ["Term 2 Name", "Term 2"], txt,
                                                                      "Exists Required", None )
 
     request_display = (f"\n\t* Term 1 Qualified Name: {term1_q_name}\n\t* Term 2 Qualified Name {term2_q_name}\n\t"
@@ -1515,7 +1526,6 @@ def process_create_term_term_relationship_command(egeria_client: EgeriaTech, txt
         return None
 
 
-
 def process_per_proj_upsert_command(egeria_client: ProjectManager, txt: str, directive: str = "display") -> str | None:
     """
     Processes a personal project create or update command by extracting key attributes such as
@@ -1678,7 +1688,7 @@ def process_term_list_command(egeria_client: EgeriaTech, txt: str, directive: st
         search_string = '*'
     print(Markdown(f"{pre_command} `{command}` with search string:`{search_string}` with directive: `{directive}`"))
 
-    glossary = process_simple_attribute(txt, ['Glossary', 'In Glossary'])
+    glossary = process_simple_attribute(txt, ['Glossary', 'In Glossary', "Glossary Name"])
     if glossary is not None:
         _, glossary_guid, _, glossary_exists = get_element_by_name(egeria_client, "Glossary", glossary)
         msg = f"Found glossary `{glossary}` with GUID {glossary_guid}"
@@ -1892,6 +1902,58 @@ def process_glossary_list_command(egeria_client: EgeriaTech, txt: str, directive
         return None
 
 
+def process_term_details_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
+    """ List terms as a markdown table. Filter based on optional search string. """
+    set_debug_level(directive)
+    valid = True
+    command = extract_command(txt)
+    object_type = command.split(' ')[1].strip()
+    object_action = command.split(' ')[0].strip()
+
+
+    term_identifier = process_simple_attribute(txt, TERM_NAME_LABELS, "ERROR")
+
+    print(Markdown(f"{pre_command} `{command}` for term:`{term_identifier}` with directive: `{directive}`"))
+
+    output_format = process_simple_attribute(txt, OUTPUT_LABELS, "INFO")
+    if output_format is None:
+        output_format = "REPORT"
+    else:
+        output_format = output_format.upper()
+
+    if output_format not in ["DICT", "REPORT"]:
+        valid = False
+        print_msg(ERROR, f"Invalid output format: `{output_format}`", debug_level)
+
+    request_display = f"\n\t* Term Identifier: {term_identifier}\n\t* Output Format {output_format}"
+
+    if directive == "display":
+        print(request_display)
+        return None
+    elif directive == "validate":
+        print(request_display)
+        return valid
+    elif directive == "process":
+        try:
+            print(request_display)
+            if not valid:  # First validate the term before we process it
+                return None
+            output = egeria_client.get_term_details(term_identifier, output_format=output_format)
+            if output_format == "DICT":
+                output = f"```{json.dumps(output, indent=4)}```"
+            print_msg("ALWAYS", f"Wrote Term Details for term: `{term_identifier}`", debug_level)
+
+            return output
+
+        except Exception as e:
+            print(f"{ERROR}Error performing {command}: {e}")
+            console.print_exception(show_locals=True)
+            return None
+    else:
+        return None
+
+
+
 def process_term_history_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """ List terms as a markdown table. Filter based on optional search string. """
     set_debug_level(directive)

{pyegeria-5.3.8.10.dist-info → pyegeria-5.3.9.2.dist-info}/METADATA

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

{pyegeria-5.3.8.10.dist-info → pyegeria-5.3.9.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pyegeria/README.md,sha256=PwX5OC7-YSZUCIsoyHh1O-WBM2hE84sm3Bd4O353NOk,1464
-pyegeria/__init__.py,sha256=kqNIJb2ZvIoBXDZwfoCj92C2J6gSVyfgvt0WQnKN_EE,30764
+pyegeria/__init__.py,sha256=nFCanIHEBLo4bQSMBdqncR-otfySxnit8Atf5lSjeYA,30805
 pyegeria/_client.py,sha256=lCWq8XJOFg3MnEO4ulMVuCJrW3uU4eWUCcbLEd90_LU,34673
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
 pyegeria/_exceptions.py,sha256=1SrnV194V4_YJNnNAU0myTHQ3dhLn4GF2B2gZcj1u90,18153
-pyegeria/_globals.py,sha256=a_irI6oGuBLks2LzQHkSdK6xWbPdJCPRjqxK7PKxwgw,991
+pyegeria/_globals.py,sha256=wTUFvZgk_evuGk9ds2lCegQT3FQfBJxgPaI-zWFsiMw,1012
 pyegeria/_validators.py,sha256=vP9nuZwucnCo_LrPU7hkitpWzaych5bTZEKE58TaTnQ,12726
 pyegeria/asset_catalog_omvs.py,sha256=P6FceMP0FgakGSOt3ePxpEbsF7nnypzo1aQahjdL_94,29021
 pyegeria/automated_curation_omvs.py,sha256=tzwCyXL0Hx8UjryBBWcPoEuBRajXZpLuwPQ1vuOg2yc,130349
@@ -16,7 +16,7 @@ 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_jupyter.py,sha256=h9LmDmejmaPDlDuGNlVor-bqNnKPvSBhcC7JFWBdOEM,5710
-pyegeria/commands/cat/dr_egeria_md.py,sha256=OCY1tu6NMi0-rTCTOuiRw6wHGZYNY9iS-XmCYRMoC0s,11610
+pyegeria/commands/cat/dr_egeria_md.py,sha256=aR6qlZ3-DjtxuAmDcn4aKWgnyhYB-eRV7IkOhSA7j2E,11836
 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
@@ -36,7 +36,7 @@ pyegeria/commands/cat/list_glossaries.py,sha256=D2ovkffSmnO-NQ7y-Jw0aDBtK2j06CQz
 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=HPZ_S_5EwJezdgf8UY1dZiDbN5P9aD88pI_rBHftm1M,12185
+pyegeria/commands/cat/list_terms.py,sha256=vgf4vqLqPGNTdCR3ptX0Xdqx_FR_Izu6SHrV1q1R6nE,12145
 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
@@ -226,11 +226,11 @@ pyegeria/egeria_my_client.py,sha256=eOKLk2zdI6FHZnhAimfR_0yNdBjpUgD41dJZcJODcqE,
 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=oxOch569LtyQA35sROtXjS_XAVD4Ek-2ApiqFoKRZRQ,161667
+pyegeria/glossary_browser_omvs.py,sha256=YoiTgqm5wdF1ly6d3fwSUagkxvwzANKv6PFcDvI6zKY,172548
 pyegeria/glossary_manager_omvs.py,sha256=aGYZFuzWrPmPLLNwkNpV7-FsalqwDR7gyBzgdubnM04,87989
 pyegeria/m_test.py,sha256=M5-M2ZczsAJLXWfSeqTTADHdx6Ku-y4PbQ4M21JthAE,7778
 pyegeria/md_processing_helpers.py,sha256=sV-ciVg_xOGVGTH_CMpH2B5k3V5jzdFp_XvnQQ5xafw,2131
-pyegeria/md_processing_utils.py,sha256=wLt-lOxyVuMJr_JN90qJsbt9xD7eCexu_icGuPZqL5E,94233
+pyegeria/md_processing_utils.py,sha256=77k_5aDcrcZB_bxIuYA2nssvRYfB-0CxMgj4lfADH78,96844
 pyegeria/md_processing_utils_orig.py,sha256=64eVP86__zI4EdzwveskDyLiw6EyWJXZW4pqk9aLpuM,52486
 pyegeria/mermaid_utilities.py,sha256=sQqdFUWdNpHu9d3Tk9UVe80M-5bOzses0XcFYX5FF-E,54254
 pyegeria/metadata_explorer_omvs.py,sha256=xHnZTQKbd6XwOhYia-RiIisrvZcqHi0SL1l6OCf04Gk,86911
@@ -245,8 +245,8 @@ pyegeria/template_manager_omvs.py,sha256=chBljs1vy5wr9DRAtbvIt4Cob_7HxGfxLkCNlDT
 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.8.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.3.8.10.dist-info/METADATA,sha256=_RPRxspNSRd8BtM8mymkGp6VvPRDVAWRMTnvSMjIUks,2758
-pyegeria-5.3.8.10.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pyegeria-5.3.8.10.dist-info/entry_points.txt,sha256=eAvQ_vkejlF3JzMzEc5VD93ymLA_hSFV0HM8fntG-d8,6791
-pyegeria-5.3.8.10.dist-info/RECORD,,
+pyegeria-5.3.9.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.3.9.2.dist-info/METADATA,sha256=AGkUdX36k28Sor23eShJz3r_-tJ3ZmySZvQLpqfS4ns,2757
+pyegeria-5.3.9.2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pyegeria-5.3.9.2.dist-info/entry_points.txt,sha256=eAvQ_vkejlF3JzMzEc5VD93ymLA_hSFV0HM8fntG-d8,6791
+pyegeria-5.3.9.2.dist-info/RECORD,,