pyegeria 5.3.9.1__tar.gz → 5.3.9.3__tar.gz

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/PKG-INFO

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

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/pyegeria/__init__.py

@@ -14,7 +14,7 @@ the server platform and servers.
 from ._globals import (INTEGRATION_GUIDS, TEMPLATE_GUIDS, default_time_out, disable_ssl_warnings, enable_ssl_check,
                        is_debug, max_paging_size, NO_ELEMENTS_FOUND, NO_ASSETS_FOUND, NO_SERVERS_FOUND,
                        NO_CATALOGS_FOUND, NO_GLOSSARIES_FOUND, NO_TERMS_FOUND, NO_CATEGORIES_FOUND, NO_ELEMENT_FOUND,
-                       NO_PROJECTS_FOUND, )
+                       NO_PROJECTS_FOUND, DEBUG_LEVEL,)
 
 if disable_ssl_warnings:
     from urllib3 import disable_warnings

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/pyegeria/_globals.py

@@ -14,7 +14,7 @@ disable_ssl_warnings = True
 enable_ssl_check = False
 max_paging_size = 500
 default_time_out = 30
-
+DEBUG_LEVEL = "quiet"
 comment_types = (
     "ANSWER",
     "OTHER",

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/pyegeria/commands/cat/dr_egeria_md.py

@@ -133,6 +133,7 @@ def process_markdown_file(file_path: str, directive: str, server: str, url: str,
                 print(f"\n==>\tErrors found while processing command: \'{potential_command}\'\n"
                       f"\tPlease correct and try again. \n")
                 final_output.append(current_block)
+                final_output.append('\n___\n')
         else:
             # If there is no command, append the block as-is
             final_output.append(current_block)

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/pyegeria/commands/cat/list_terms.py

@@ -25,6 +25,7 @@ from pyegeria import (
     UserNotAuthorizedException, NO_CATEGORIES_FOUND,
     )
 from pyegeria.commands.cat.glossary_actions import EGERIA_HOME_GLOSSARY_GUID
+from pyegeria._globals import NO_GLOSSARIES_FOUND
 
 disable_ssl_warnings = True
 
@@ -99,7 +100,7 @@ def display_glossary_terms(
         token = g_client.create_egeria_bearer_token(user_id, user_pass)
         if (glossary_name is not None) and (glossary_name != "*"):
             glossary_guid = g_client.get_guid_for_name(glossary_name)
-            if glossary_guid == "Glossary guid not found":
+            if glossary_guid == NO_GLOSSARIES_FOUND:
                 console.print(
                     f"\nThe glossary name {glossary_name} was not found. Please try using the glossary guid"
                 )
@@ -188,14 +189,10 @@ def display_glossary_terms(
             q_name = Text(
                 f"{qualified_name}\n&\n{term_guid}\n&\n{aliases}", style=style, justify="center"
             )
-            abbrev = Text(props.get("abbreviation", "---"), style=style, justify="center")
-            summary = Text(props.get("summary", "---"), style=style)
+            abbrev = props.get("abbreviation", "---")
+            summary = props.get("summary", "---")
             description = Markdown(props.get("description",'---'))
-            version = Text(
-                props.get("publishVersionIdentifier", "---"),
-                style=style,
-                justify="center",
-            )
+            version = props.get("publishVersionIdentifier", "---")
             example = props.get("example", "---")
             usage = props.get("usage", "---")
             ex_us_out = Markdown(f"Example:\n{example}\n---\nUsage: \n{usage}")
@@ -217,7 +214,7 @@ def display_glossary_terms(
             category_list_md = ""
             category_list = g_client.get_categories_for_term(term_guid)
             if type(category_list) is str and category_list == NO_CATEGORIES_FOUND:
-                category_list_md = ['---']
+                category_list_md = '---'
             elif isinstance(category_list, list) and len(category_list) > 0:
                 for category in category_list:
                     category_name = category["glossaryCategoryProperties"].get("displayName",'---')

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/pyegeria/glossary_browser_omvs.py

@@ -132,17 +132,20 @@ class GlossaryBrowser(Client):
         categories = self.get_categories_for_glossary(guid)
         cat_md_display = ''
         cat_md_qn = ''
+        category_names = ''
+        category_qualified_names = ''
+
         if type(categories) is list:
             for category in categories:
                 cat_md_display += f" {category['glossaryCategoryProperties'][('displayName')]},\n"
                 cat_md_qn += f" {category['glossaryCategoryProperties'][('qualifiedName')]},\n"
-            cat_md = cat_md_display.strip()
-            cat_md_qn = cat_md_qn.strip()
+            category_names = cat_md_display.rstrip(',')
+            category_qualified_names = cat_md_qn.rstrip(',')
 
         return {
             'guid': guid, 'properties': properties, 'display_name': display_name, 'description': description,
-            'language': language, 'usage': usage, 'qualified_name': qualified_name, 'categories_dn_md': cat_md_display,
-            'categories_qn_md': cat_md_qn
+            'language': language, 'usage': usage, 'qualified_name': qualified_name, 'categories_names': category_names,
+            'categories_qualified_names': category_qualified_names
             }
 
     def _generate_entity_md(self, elements: list, elements_action: str, output_format: str, entity_type: str,
@@ -182,17 +185,18 @@ class GlossaryBrowser(Client):
 
             # Add common attributes
             for key, value in props.items():
-                # Skip categories_dn_md for FORM output and categories_qn_md for REPORT output
-                if key == 'categories_dn_md' and output_format == 'FORM':
-                    continue
-                if key == 'categories_qn_md' and output_format == 'REPORT':
-                    continue
                 if key not in ['guid', 'properties', 'display_name']:
-                    # Use "Categories" as the label for both categories_qn_md and categories_dn_md
-                    if key == 'categories_qn_md' and output_format == 'FORM':
-                        elements_md += self.make_md_attribute("Categories", value, output_format)
-                    elif key == 'categories_dn_md' and output_format == 'REPORT':
-                        elements_md += self.make_md_attribute("Categories", value, output_format)
+                    # Handle categories based on output format
+                    if key == 'categories_qualified_names':
+                        if output_format == 'FORM':
+                            elements_md += self.make_md_attribute("Category Names", value, output_format)
+                        elif output_format != 'REPORT':  # Include for all formats except REPORT
+                            elements_md += self.make_md_attribute(key.replace('_', ' '), value, output_format)
+                    elif key == 'categories_names':
+                        if output_format == 'REPORT':
+                            elements_md += self.make_md_attribute("Category Names", value, output_format)
+                        elif output_format != 'FORM':  # Include for all formats except FORM
+                            elements_md += self.make_md_attribute(key.replace('_', ' '), value, output_format)
                     else:
                         elements_md += self.make_md_attribute(key.replace('_', ' '), value, output_format)
 
@@ -308,7 +312,7 @@ class GlossaryBrowser(Client):
                    {'name': 'Language', 'key': 'language', 'format': True},
                    {'name': 'Description', 'key': 'description', 'format': True},
                    {'name': 'Usage', 'key': 'usage', 'format': True},
-                   {'name': 'Categories', 'key': 'categories_dn_md', 'format': True}, ]
+                   {'name': 'Categories', 'key': 'categories_names', 'format': True}, ]
 
         return self._generate_entity_md_table(elements=elements, search_string=search_string, entity_type="Glossary",
                                               extract_properties_func=self._extract_glossary_properties,
@@ -371,7 +375,7 @@ class GlossaryBrowser(Client):
             list: List of glossary dictionaries
         """
         return self._generate_entity_dict(elements=elements, extract_properties_func=self._extract_glossary_properties,
-                                          exclude_keys=['properties', 'categories_qn_md'], output_format=output_format)
+                                          exclude_keys=['properties', 'categories_qualified_names'], output_format=output_format)
 
     def generate_glossaries_md(self, elements: list | dict, search_string: str,
                                output_format: str = 'MD') -> str | list:

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/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
@@ -32,7 +32,7 @@ command_list = ["Provenance", "Create Glossary", "Update Glossary", "Create Term
                 "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."""
@@ -388,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"
 
@@ -1020,7 +1021,7 @@ def process_glossary_upsert_command(egeria_client: EgeriaTech, txt: str, directi
                     })
                 # return update_a_command(txt, command, object_type, qualified_name, glossary_guid)
                 print_msg(ALWAYS, f"Created Glossary `{glossary_name}` with GUID {glossary_guid}", debug_level)
-                return egeria_client.get_glossary_by_guid(glossary_guid, output_format='MD')
+                return egeria_client.get_glossary_by_guid(glossary_guid, output_format='FORM')
         else:
             return None
     else:
@@ -1148,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}",
@@ -1303,7 +1303,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, txt: str, directive:
 
     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
 

{pyegeria-5.3.9.1 → pyegeria-5.3.9.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "5.3.9.1"
+version = "5.3.9.3"
 
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]