pyegeria 5.4.0.28__py3-none-any.whl → 5.5.3.3__py3-none-any.whl

pyegeria/{_exceptions_new.py → core/_exceptions.py}

@@ -19,8 +19,12 @@ from rich import print, box
 from rich.console import Console
 
 
-EGERIA_WIDTH = os.getenv("PYEGERIA_CONSOLE_WIDTH", 200)
-console = Console(width=EGERIA_WIDTH)
+# Standardize on CONSOLE_WIDTH with backward-compatible fallback
+try:
+    _width_val = int(os.getenv("CONSOLE_WIDTH", os.getenv("PYEGERIA_CONSOLE_WIDTH", 190)))
+except Exception:
+    _width_val = 250
+console = Console(width=_width_val)
 
 """
 
@@ -158,10 +162,17 @@ class PyegeriaException(Exception):
             self.response = response
             self.response_url = getattr(response, "url", "unknown URL") if response else additional_info.get("endpoint",                                                                                             "")
             self.response_code = getattr(response, "status_code", "unknown status code") if response else ""
+            self.response_reason_phrase = getattr(response, "reason_phrase", "unknown reason")
+            self.http_status_code = getattr(response, "status_code", "unknown status code")
+            if self.http_status_code == 200:
+                self.response_egeria_msg_id = response.json().get("exceptionErrorMessageId", "")
+                self.response_egeria_msg = response.json().get("exceptionErrorMessage", "")
         else:
             self.response = None
             self.response_url = ""
             self.response_code = ""
+            self.response_egeria_msg_id = ""
+            self.response_egeria_msg = ""
         self.error_code = error_code
         self.error_details = error_code.value
         self.pyegeria_code = self.error_details.get("message_id", "UNKNOWN_ERROR")
@@ -205,7 +216,7 @@ class PyegeriaConnectionException(PyegeriaException):
         super().__init__(None, PyegeriaErrorCode.CONNECTION_ERROR,
                  context, additional_info, e)
         self.message = self.error_details["message_template"].format(self.response_url)
-        logger.error(self.__str__())
+        logger.info(self.__str__())
 
 class PyegeriaInvalidParameterException(PyegeriaException):
     """Raised for invalid parameters - parameters that might be missing or incorrect."""
@@ -214,7 +225,7 @@ class PyegeriaInvalidParameterException(PyegeriaException):
         super().__init__(response, PyegeriaErrorCode.VALIDATION_ERROR,
                          context, additional_info, e)
         self.message = self.error_details["message_template"].format(self.additional_info.get('reason', ''))
-        logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+        logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 class PyegeriaClientException(PyegeriaException):
     """Raised for invalid parameters - parameters that might be missing or incorrect."""
@@ -223,7 +234,7 @@ class PyegeriaClientException(PyegeriaException):
         # base_exception = context.get('caught_exception', None)
         super().__init__(response, PyegeriaErrorCode.CLIENT_ERROR,
                          context, additional_info, e)
-        logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+        logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 
 class PyegeriaAPIException(PyegeriaException):
@@ -242,7 +253,7 @@ class PyegeriaAPIException(PyegeriaException):
             for key, value in related_response.items():
                 msg += f"\t\t* {key} = {format_dict_to_string(value)}\n"
 
-        logger.error(msg, ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+        logger.info(msg, ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 
 
@@ -254,7 +265,7 @@ class PyegeriaAPIException(PyegeriaException):
 #         super().__init__(response,  PyegeriaErrorCode.AUTHENTICATION_ERROR,
 #                          context, additional_info)
 #         self.message = self.error_details["message_template"].format(additional_info.get("userid",""))
-#         logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+#         logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 class PyegeriaUnauthorizedException(PyegeriaException):
     """Raised for 403 authorization errors."""
@@ -263,7 +274,7 @@ class PyegeriaUnauthorizedException(PyegeriaException):
         super().__init__(response, PyegeriaErrorCode.AUTHORIZATION_ERROR,
                          context, additional_info, e)
         self.message = self.error_details["message_template"].format(additional_info.get("userid", ""))
-        logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+        logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 
 
@@ -273,7 +284,7 @@ class PyegeriaNotFoundException(PyegeriaException):
                  context: dict = None, additional_info: dict = None, e: Exception = None) -> None:
         super().__init__(response, PyegeriaErrorCode.CLIENT_ERROR,
                          context, additional_info, e)
-        logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+        logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 
 # class PyegeriaInvalidResponseException(PyegeriaException):
@@ -282,7 +293,7 @@ class PyegeriaNotFoundException(PyegeriaException):
 #                  context: dict = None, additional_info: dict = None) -> None:
 #         super().__init__(response, PyegeriaErrorCode.CLIENT_ERROR,
 #                          context, additional_info)
-#         logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+#         logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 #
 #
 # class PyegeriaValidationException(PyegeriaException):
@@ -295,7 +306,7 @@ class PyegeriaNotFoundException(PyegeriaException):
 #         reason = additional_info.get("reason","")
 #         input_parameters = additional_info.get("input_parameters","")
 #         self.message = self.error_details["message_template"].format(reason, input_parameters)
-#         logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+#         logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 #
 # class PyegeriaRequestException(PyegeriaException):
 #     """Raised when data sent to the API fails validation, or received data fails Pydantic validation."""
@@ -303,7 +314,7 @@ class PyegeriaNotFoundException(PyegeriaException):
 #                  context: dict = None, additional_info: dict = None) -> None:
 #         super().__init__(response, PyegeriaErrorCode.CLIENT_ERROR,
 #                          context, additional_info)
-#         logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+#         logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 
 class PyegeriaUnknownException(PyegeriaException):
@@ -312,7 +323,7 @@ class PyegeriaUnknownException(PyegeriaException):
                  context: dict = None, additional_info: dict = None, e: Exception = None) -> None:
         super().__init__(response, PyegeriaErrorCode.CLIENT_ERROR,
                          context, additional_info, e)
-        logger.error(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
+        logger.info(self.__str__(), ip=self.response_url, http_code=self.response_code, pyegeria_code=self.pyegeria_code)
 
 
 
@@ -340,6 +351,7 @@ def print_exception_table(e: PyegeriaException):
     """Prints the exception response"""
     related_code = e.related_http_code if hasattr(e, "related_http_code") else ""
     related_response = e.response.json()
+
     table = Table(title=f"Exception: {e.__class__.__name__}", show_lines=True, header_style="bold", box=box.HEAVY_HEAD)
     table.caption = e.pyegeria_code
     table.add_column("Facet", justify="center")
@@ -354,8 +366,9 @@ def print_exception_table(e: PyegeriaException):
             item_table = Table(show_lines = True, header_style="bold")
             item_table.add_column("Item", justify="center")
             item_table.add_column("Detail", justify="left")
-            for key, value in related_response.items():
-                item_table.add_row(key, format_dict_to_string(value))
+            if related_response:
+                for key, value in related_response.items():
+                    item_table.add_row(key, format_dict_to_string(value))
             table.add_row("Egeria Details", item_table)
 
 
@@ -373,36 +386,55 @@ def print_exception_table(e: PyegeriaException):
 
 def print_basic_exception(e: PyegeriaException):
     """Prints the exception response"""
+    standard_errors = ["OMAG-REPOSITORY-HANDLER-404-001",
+                       "OMAG-REPOSITORY-HANDLER-404-007",
+    ]
+    if e.response_egeria_msg_id and e.response_egeria_msg_id in standard_errors:
+        print(f"\n==> {e.response_egeria_msg}")
+        return
+
     related_code = e.related_http_code if hasattr(e, "related_http_code") else ""
     http_reason = e.response.text if e.response else ""
+
     table = Table(title=f"Exception: {e.__class__.__name__}", show_lines=True, header_style="bold", box=box.HEAVY_HEAD)
     table.caption = e.pyegeria_code
     table.add_column("Facet", justify="center")
     table.add_column("Item", justify="left", width=80)
-    related_response = e.response.json() if e.response else ""
+    if e.response:
+        related_response = e.response.json() if isinstance(e, PyegeriaException) else None
+        exception_msg_id = related_response.get("exceptionErrorMessageId", None)
+    else:
+        exception_msg_id = ""
+
     table = Table(title=f"Exception: {e.__class__.__name__}", show_lines=True, header_style="bold", box=box.HEAVY_HEAD)
     table.caption = e.pyegeria_code
     table.add_column("Facet", justify="center")
     table.add_column("Item", justify="left", width=80)
 
     if isinstance(e, PyegeriaException):
-        table.add_row("HTTP Code", str(e.response_code))
-        table.add_row("HTTP Reason", str(http_reason))
-        table.add_row("Egeria Code", str(related_code))
-        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',"")) if isinstance(related_response,dict) else related_response)
-        table.add_row("Egeria User Action",
-                      format_dict_to_string(related_response.get('exceptionUserAction',"")) if isinstance(related_response,dict) else related_response)
-
-        exception_msg_id = related_response.get("exceptionErrorMessageId", None) if isinstance(related_response,dict) else related_response
-        table.add_row("Pyegeria Exception", exception_msg_id)
+        if e.context:
+            table.add_row("Context", e.context.get('reason',""), style = "bold yellow")
+        if e.response:
+            table.add_row("HTTP Code", str(e.response_code))
+            table.add_row("HTTP Reason", str(http_reason))
+            table.add_row("Egeria Code", str(related_code))
+            table.add_row("Caller Method", e.context.get("caller method", "---")) if e.context else ""
+            table.add_row("Request URL", str(e.response_url))
+            if related_response:
+                if isinstance(related_response, dict):
+                    table.add_row("Egeria Message",
+                          format_dict_to_string(related_response.get('exceptionErrorMessage',"")))
+                elif isinstance(related_response, str):
+                    table.add_row(related_response,)
+
+            table.add_row("Egeria User Action",
+                          format_dict_to_string(related_response.get('exceptionUserAction',"")) if isinstance(related_response,dict) else related_response)
+
+            exception_msg_id = related_response.get("exceptionErrorMessageId", None) if isinstance(related_response,dict) else related_response
+        table.add_row("Egeria Exception Message Id", exception_msg_id)
         table.add_row("Pyegeria Message", e.message)
         console.print(table)
 
-
-        console.print(table)
     else:
         print(f"\n\n\t  Not an Pyegeria exception {e}")
 

pyegeria/{_globals.py → core/_globals.py}

@@ -15,13 +15,14 @@ enable_ssl_check = False
 max_paging_size = 500
 default_time_out = 30
 DEBUG_LEVEL = "quiet"
-comment_types = (
+COMMENT_TYPES = (
+    "STANDARD_COMMENT",
     "ANSWER",
     "OTHER",
     "QUESTION",
-    "STANDARD_COMMENT",
     "SUGGESTION",
     "USAGE_EXPERIENCE",
+    "REQUIREMENT"
 )
 star_ratings = (
     "FIVE_STARS",
@@ -46,4 +47,14 @@ NO_ELEMENT_FOUND = "No element found"
 NO_PROJECTS_FOUND = "No projects found"
 NO_COLLECTION_FOUND = "No collection found"
 NO_GUID_RETURNED = "No guid returned"
-NO_MEMBERS_FOUND = "No members found"
+NO_MEMBERS_FOUND = "No members found"
+
+MERMAID_GRAPHS = ["anchorMermaidGraph", "informationSupplyChainMermaidGraph","fieldLevelLineageGraph",
+                  "actionMermaidGraph", "localLineageGraph", "edgeMermaidGraph", "iscImplementationMermaidGraph",
+                  "specificationMermaidGraph", "solutionBlueprintMermaidGraph","mermaidGraph",
+                  "solutionSubcomponentMermaidGraph"]
+MERMAID_GRAPH_TITLES = ["Anchor Mermaid Graph", "Information Supply Chain Mermaid Graph","Field Level Lineage Graph",
+                  "Action Mermaid Graph", "Local Lineage Graph", "Edge Mermaid Graph", "ISC Implementation Mermaid Graph",
+                  "Specification Mermaid Graph", "Solution Blueprint Mermaid Graph","Mermaid Graph",
+                  "Solution Subcomponent Mermaid Graph"]
+TERM_STATUS = ["DRAFT", "PREPARED","PROPOSED","APPROVED", "REJECTED", "ACTIVE", "DEPRECATED", "DELETED", "OTHER"]