pyegeria 5.3.8.5__tar.gz → 5.3.8.8__tar.gz

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/PKG-INFO

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

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/pyegeria/__init__.py

@@ -91,12 +91,12 @@ from .utils import body_slimmer, print_response
 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,
+                                  process_category_upsert_command,
                                   get_current_datetime_string, process_per_proj_upsert_command, command_list,
                                   render_markdown, process_provenance_command, process_blueprint_upsert_command,
-                                  process_solution_component_upsert_command, process_set_categories_parent_command,
-                                  process_term_list_command, process_glossary_list_command,process_category_list_command,
-                                  process_term_history_command,)
+                                  process_solution_component_upsert_command,
+                                  process_term_list_command, process_glossary_list_command, process_category_list_command,
+                                  process_term_history_command)
 
 #
 # The following assignments were generated by the `create_tech_guid_lists.py` utility that uses the pyegeria functions

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/pyegeria/commands/cat/Dr-Egeria_md-orig.py

@@ -13,8 +13,8 @@ from pyegeria.md_processing_utils import (extract_command, process_glossary_upse
 
 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_category_upsert_command,
+                      get_current_datetime_string, process_per_proj_upsert_command, commands, EgeriaTech
                       )
 from datetime import datetime
 
@@ -116,13 +116,13 @@ def process_markdown_file(
                 prov_found = True
                 result = process_provenance_command(file_path, block)
             elif potential_command in ["Create Glossary", "Update Glossary"]:
-                result = process_glossary_upsert_command(client, element_dictionary, block, directive)
+                result = process_glossary_upsert_command(client, block, directive)
             elif potential_command in ["Create Category", "Update Category"]:
-                result = process_categories_upsert_command(client, element_dictionary, block, directive)
+                result = process_category_upsert_command(client, block, directive)
             elif potential_command in ["Create Term", "Update Term"]:
-                result = process_term_upsert_command(client, element_dictionary, block, directive)
+                result = process_term_upsert_command(client, block, directive)
             elif potential_command in ["Create Personal Project", "Update Personal Project"]:
-                result = process_per_proj_upsert_command(client, element_dictionary, block, directive)
+                result = process_per_proj_upsert_command(client, block, directive)
             else:
                 # If command is not recognized, copy the block as-is
                 result = None

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/pyegeria/commands/cat/dr_egeria_jupyter.py

@@ -79,14 +79,12 @@ def process_jupyter_notebook(
                         potential_command = extract_command(cell.source)
                         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)
+                                result = process_glossary_upsert_command(client, cell.source, directive)
 
                             elif potential_command in ["Create Term", "Update Term"]:
-                                result = process_term_upsert_command(client, element_dictionary,
-                                                                     cell.source, directive)
+                                result = process_term_upsert_command(client, cell.source, directive)
                             elif potential_command in ["Create Personal Project", "Update Personal Project"]:
-                                result = process_per_proj_upsert_command(client, element_dictionary, cell.source, directive)
+                                result = process_per_proj_upsert_command(client, cell.source, directive)
                             else:
                                 # If command is not recognized, copy the block as-is
                                 result = None

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/pyegeria/commands/cat/dr_egeria_md.py

@@ -9,8 +9,8 @@ from rich import print
 from rich.console import Console
 
 from pyegeria import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
-                      process_categories_upsert_command, process_provenance_command,
-                      process_set_categories_parent_command, get_current_datetime_string,
+                      process_category_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, dr_egeria_state, process_term_list_command,
                       process_category_list_command, process_glossary_list_command, process_term_history_command)
@@ -86,39 +86,31 @@ def process_markdown_file(file_path: str, directive: str, server: str, url: str,
                 prov_found = True
 
             elif potential_command in ["Create Glossary", "Update Glossary"]:
-                result = process_glossary_upsert_command(client, dr_egeria_state.get_element_dictionary(),
-                                                         current_block, directive)
+                result = process_glossary_upsert_command(client, current_block, directive)
             elif potential_command in ["Create Category", "Update Category"]:
-                result = process_categories_upsert_command(client, dr_egeria_state.get_element_dictionary(),
-                                                           current_block, directive)
-            elif potential_command in ["Set Parent Category", "UnSet Parent Category"]:
-                result = process_set_categories_parent_command(client, dr_egeria_state.get_element_dictionary(),
-                                                               current_block, directive)
+                result = process_category_upsert_command(client, current_block, directive)
+            # elif potential_command in ["Set Parent Category", "UnSet Parent Category"]:
+            #     result = process_set_categories_parent_command(client, dr_egeria_state.get_element_dictionary(),
+            #                                                    current_block, directive)
             elif potential_command in ["Create Term", "Update Term"]:
-                result = process_term_upsert_command(client, dr_egeria_state.get_element_dictionary(), current_block,
-                                                     directive)
+                result = process_term_upsert_command(client, current_block, directive)
             elif potential_command in ["List Term History", "Term History"]:
-                result = process_term_history_command(client, dr_egeria_state.get_element_dictionary(), current_block,
-                                                 directive)
+                result = process_term_history_command(client, current_block, directive)
             elif potential_command in ["List Terms", "List Glossary Terms"]:
-                result = process_term_list_command(client, dr_egeria_state.get_element_dictionary(), current_block,
-                                                     directive)
+                result = process_term_list_command(client, current_block, directive)
             elif potential_command in ["List Categories", "List Glossary Categories"]:
                 result = process_category_list_command(client, dr_egeria_state.get_element_dictionary(), current_block,
-                                                     directive)
+                                                       directive)
             elif potential_command in ["List Glossaries"]:
                 result = process_glossary_list_command(client, dr_egeria_state.get_element_dictionary(), current_block,
-                                                     directive)
+                                                       directive)
             elif potential_command in ["Create Personal Project", "Update Personal Project"]:
-                result = process_per_proj_upsert_command(client, dr_egeria_state.get_element_dictionary(),
-                                                         current_block, directive)
+                result = process_per_proj_upsert_command(client, current_block, directive)
             elif potential_command in ["Create Blueprint", "Update Blueprint", "Create Solution Blueprint",
                                        "Update Solution Blueprint"]:
-                result = process_blueprint_upsert_command(client, dr_egeria_state.get_element_dictionary(),
-                                                          current_block, directive)
+                result = process_blueprint_upsert_command(client, current_block, directive)
             elif potential_command in ["Create Solution Component", "Update Solution Component"]:
-                result = process_solution_component_upsert_command(client, dr_egeria_state.get_element_dictionary(),
-                                                                   current_block, directive)
+                result = process_solution_component_upsert_command(client, current_block, directive)
 
 
             else:

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/pyegeria/commands/cat/list_categories.py

@@ -136,7 +136,7 @@ def display_categories(
                 classification_props = category["elementHeader"]['classifications'][0].get('classificationProperties',None)
                 glossary_qualified_name = '---'
                 if classification_props is not None:
-                    glossary_guid = classification_props.get('anchorGUID','---')
+                    glossary_guid = classification_props.get('anchorScopeGUID','---')
                     glossary_qualified_name = (
                         m_client.get_glossary_by_guid(glossary_guid))['glossaryProperties']['qualifiedName']
                 cat_info = m_client.get_category_parent(category_guid)

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/pyegeria/commands/cat/list_terms.py

@@ -187,23 +187,23 @@ def display_glossary_terms(
             q_name = Text(
                 f"{qualified_name}\n&\n{term_guid}", style=style, justify="center"
             )
-            abbrev = Text(props.get("abbreviation", " "), style=style, justify="center")
-            summary = Text(props.get("summary", " "), style=style)
-            description = Markdown(props.get("description"))
+            abbrev = Text(props.get("abbreviation", "---"), style=style, justify="center")
+            summary = Text(props.get("summary", "---"), style=style)
+            description = Markdown(props.get("description",'---'))
             version = Text(
-                props.get("publishVersionIdentifier", " "),
+                props.get("publishVersionIdentifier", "---"),
                 style=style,
                 justify="center",
             )
-            example = props.get("example", " ")
-            usage = props.get("usage", " ")
+            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
             for c in classifications:
                 if c["classificationName"] == "Anchors":
-                    glossary_guid = c["classificationProperties"]["anchorGUID"]
+                    glossary_guid = c["classificationProperties"]["anchorScopeGUID"]
 
             if glossary_guid and glossary_guid in glossary_info:
                 glossary_name = glossary_info[glossary_guid]

{pyegeria-5.3.8.5 → pyegeria-5.3.8.8}/pyegeria/glossary_browser_omvs.py

@@ -847,16 +847,21 @@ class GlossaryBrowser(Client):
         # Get parent category
         parent_cat_md = self._get_parent_category_name(category_guid, output_format)
 
-        # Get subcategories
-        _, subcategory_list_md = self._get_subcategories_list(category_guid, output_format)
-
         # Get glossary information
         glossary_qualified_name = self._get_glossary_name_for_element(element, output_format)
 
-        return {
-            'in_glossary': glossary_qualified_name, 'parent_category': parent_cat_md,
-            'subcategories': subcategory_list_md
-            }
+        # Only include subcategories if output_format is not FORM, REPORT, or MD
+        if output_format not in ['FORM', 'REPORT', 'MD']:
+            # Get subcategories
+            _, subcategory_list_md = self._get_subcategories_list(category_guid, output_format)
+            return {
+                'in_glossary': glossary_qualified_name, 'parent_category': parent_cat_md,
+                'subcategories': subcategory_list_md
+                }
+        else:
+            return {
+                'in_glossary': glossary_qualified_name, 'parent_category': parent_cat_md
+                }
 
     def _generate_category_md(self, elements: list, elements_action: str, output_format: str) -> str:
         """
@@ -1528,6 +1533,7 @@ class GlossaryBrowser(Client):
 
         return response.json().get("elementList", "No categories found")
 
+
     def get_glossary_subcategories(self, glossary_category_guid: str, effective_time: str = None, start_from: int = 0,
             page_size: int = max_paging_size, for_lineage: bool = False,
             for_duplicate_processing: bool = False, ) -> dict | str:
@@ -1979,8 +1985,8 @@ class GlossaryBrowser(Client):
             self._async_get_categories_by_name(name, glossary_guid, status, start_from, page_size))
         return response
 
-    async def _async_get_categories_by_guid(self, glossary_category_guid: str, effective_time: str = None,
-            output_format: str = 'JSON', ) -> list | str:
+    async def _async_get_category_by_guid(self, glossary_category_guid: str, effective_time: str = None,
+                                          output_format: str = 'JSON', ) -> list | str:
         """Retrieve the requested glossary category metadata element.  The optional request body contain an effective
         time for the query..
 
@@ -2035,8 +2041,8 @@ class GlossaryBrowser(Client):
             return self.generate_categories_md(element, "GUID", output_format)
         return response.json().get("element", NO_CATEGORIES_FOUND)
 
-    def get_categories_by_guid(self, glossary_category_guid: str, effective_time: str = None,
-            output_format: str = 'JSON', ) -> list | str:
+    def get_category_by_guid(self, glossary_category_guid: str, effective_time: str = None,
+                             output_format: str = 'JSON', ) -> list | str:
         """Retrieve the requested glossary category metadata element.  The optional request body contain an effective
         time for the query..
 
@@ -2074,7 +2080,7 @@ class GlossaryBrowser(Client):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_categories_by_guid(glossary_category_guid, effective_time, output_format))
+            self._async_get_category_by_guid(glossary_category_guid, effective_time, output_format))
         return response
 
     async def _async_get_category_parent(self, glossary_category_guid: str, effective_time: str = None, ) -> list | str:
@@ -2849,7 +2855,7 @@ class GlossaryBrowser(Client):
         """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_get_terms_by_guid(term_guid, output_format))
+        response = loop.run_until_complete(self._async_get_term_by_guid(term_guid, output_format))
 
         return response