pyegeria 5.4.0.19__py3-none-any.whl → 5.4.0.22__py3-none-any.whl

pyegeria/_exceptions_new.py

@@ -11,6 +11,7 @@ from enum import Enum
 
 from httpx import Response
 from loguru import logger
+from pydantic_core import ValidationError
 from rich.markdown import Markdown
 from rich.table import Table
 from rich.text import Text
@@ -113,12 +114,15 @@ def print_bullet_list(items)->Text:
 def flatten_dict_to_string(d: dict) -> str:
     """Flatten a dictionary into a string and replace quotes with backticks."""
     try:
-        flat_string = "\n\t".join(
-            # Change replace(\"'\", '`') to replace("'", '`')
-            f"\t* {key}=`{str(value).replace('\"', '`').replace("'", '`')}`"
-            for key, value in d.items()
-        )
-        return flat_string
+        if d:
+            flat_string = "\n\t".join(
+                # Change replace(\"'\", '`') to replace("'", '`')
+                f"\t* {key}=`{str(value).replace('\"', '`').replace("'", '`')}`"
+                for key, value in d.items()
+            )
+            return flat_string
+        else:
+            return ""
     except Exception as e:
         # Corrected syntax for exception chaining
         raise Exception("Error flattening dictionary") from e
@@ -379,19 +383,37 @@ def print_basic_exception(e: PyegeriaException):
     if isinstance(e, PyegeriaException):
         table.add_row("HTTP Code", str(e.response_code))
         table.add_row("Egeria Code", str(related_code))
-        table.add_row("Caller Method", e.context.get("caller method", "---"))
+        table.add_row("Caller Method", e.context.get("caller method", "---")) if e.context else ""
         table.add_row("Request URL", str(e.response_url))
         table.add_row("Egeria Message",
-                      format_dict_to_string(related_response.get('exceptionErrorMessage',"")))
+                      format_dict_to_string(related_response.get('exceptionErrorMessage',"")) if isinstance(related_response,dict) else related_response)
         table.add_row("Egeria User Action",
-                      format_dict_to_string(related_response.get('exceptionUserAction',"")))
+                      format_dict_to_string(related_response.get('exceptionUserAction',"")) if isinstance(related_response,dict) else related_response)
 
-        exception_msg_id = related_response.get("exceptionErrorMessageId", None)
+        exception_msg_id = related_response.get("exceptionErrorMessageId", None) if isinstance(related_response,dict) else related_response
         table.add_row("Pyegeria Exception", exception_msg_id)
-        table.add_row("Pyegeria Message",
-                      f"\n\t{e.error_details['message_template'].format(exception_msg_id)}\n")
+        table.add_row("Pyegeria Message", e.message)
+        console.print(table)
 
 
         console.print(table)
     else:
-        print(f"\n\n\t  Not an Pyegeria exception {e}")
+        print(f"\n\n\t  Not an Pyegeria exception {e}")
+
+def print_validation_error(e: ValidationError):
+    """Prints the pydantic validation exception response"""
+
+    table = Table(title=f"Validation Error for {e.title}", show_lines=True, header_style="bold", box=box.HEAVY_HEAD)
+    table.caption = "Pydantic Validation Error"
+    table.add_column("Type", justify="center")
+    table.add_column("Attribute", justify="center")
+    table.add_column("Message", justify="center")
+
+    for error in e.errors():
+        error_type = error["type"]
+        attribute = " ".join(str(part) for part in error["loc"])
+        message = error["msg"]
+        table.add_row(error_type, attribute, message)
+
+
+    console.print(table)

pyegeria/_output_formats.py

@@ -248,7 +248,7 @@ output_format_sets = FormatSetDict({
         action=[ActionParameter(
             function="CollectionManager.find_collections",
             user_params=["search_string"],
-            spec_params={"classification_name": "DigitalProducts"},
+            spec_params={"initial_classifications": "DigitalProducts"},
         )]
     ),
 
@@ -269,7 +269,7 @@ output_format_sets = FormatSetDict({
         action=[ActionParameter(
             function="CollectionManager.find_collections",
             user_params=["search_string"],
-            spec_params={"classification_name": "DataDictionary"},
+            spec_params={"initial_classifications": "DataDictionary"},
         )]
     ),
 
@@ -288,7 +288,7 @@ output_format_sets = FormatSetDict({
         action=[ActionParameter(
             function="CollectionManager.find_collections",
             user_params=["search_string"],
-            spec_params={"classification_name": "DataSpec"},
+            spec_params={"initial_classifications": "DataSpec"},
         )]
     ),