pyegeria 5.4.0.18__py3-none-any.whl → 5.4.0.20__py3-none-any.whl

commands/cat/list_collections.py

@@ -19,9 +19,9 @@ from rich.text import Text
 from loguru import logger
 from pyegeria import (
     CollectionManager,
-     NO_ELEMENTS_FOUND,config_logging, get_app_config, init_logging
-    )
-from pyegeria._exceptions_new import PyegeriaException, print_exception_response
+    NO_ELEMENTS_FOUND, config_logging, load_app_config, get_app_config, init_logging, config_logging, PyegeriaException,
+    print_basic_exception,PyegeriaException, )
+# from pyegeria._exceptions_new import PyegeriaException, print_exception_response
 
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
@@ -39,7 +39,7 @@ out_struct = {
                     {'name': 'description', 'key': 'description', 'format': True},
                     {'name': "classifications", 'key': 'classifications'},
                     {'name': 'members', 'key': 'members', 'format': True},
-                    {'name': 'collection_type', 'key': 'collection_type', 'format': True},
+                    {'name': 'category', 'key': 'category', 'format': True},
                     {'name': 'GUID', 'key': 'GUID'},
                 ],
             },
@@ -183,7 +183,7 @@ def display_collections(
     except (
         PyegeriaException
     ) as e:
-        print_exception_response(e)
+        print_basic_exception(e)
     finally:
         m_client.close_session()
 
@@ -216,7 +216,7 @@ def main():
         pass
 
     except PyegeriaException as e:
-        print_exception_response(e)
+        print_basic_exception(e)
 
 
 if __name__ == "__main__":

commands/ops/load_archive.py

@@ -12,7 +12,9 @@ import os
 
 import click
 from loguru import logger
-from pyegeria import AutomatedCuration, EgeriaTech,  config_logging, get_app_config
+from pyegeria import AutomatedCuration, EgeriaTech
+from pyegeria.load_config import get_app_config
+from pyegeria.logging_configuration import config_logging
 from pyegeria._exceptions_new import (
 PyegeriaException, print_exception_response, print_basic_exception
 )
@@ -74,7 +76,7 @@ def load_archive(file_name, server_name, view_server, url, userid, password, tim
             f"Perhaps there was a timeout? If so, the command will complete despite the exception\n"
             f"===> You can check by rerunning the command in a few minutes"
         )
-        print_exception_response(e)
+        print_basic_exception(e)
 
 
 if __name__ == "__main__":

md_processing/md_commands/data_designer_commands.py

@@ -409,7 +409,7 @@ def sync_data_class_rel_elements(egeria_client: EgeriaTech, containing_data_clas
 def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a data specification create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.
@@ -535,7 +535,7 @@ def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, direct
 def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a data dictionary create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.
@@ -649,7 +649,7 @@ def process_data_structure_upsert_command(egeria_client: EgeriaTech, txt: str, d
     str]:
     """
     Processes a data structure create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.
@@ -847,7 +847,7 @@ def process_data_structure_upsert_command(egeria_client: EgeriaTech, txt: str, d
 def process_data_field_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a data field create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.
@@ -1125,7 +1125,7 @@ def process_data_field_upsert_command(egeria_client: EgeriaTech, txt: str, direc
 def process_data_class_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a data class create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.

md_processing/md_commands/governance_officer_commands.py

@@ -81,7 +81,7 @@ def sync_gov_rel_elements(egeria_client: EgeriaTech, object_action:str, object_t
 def process_gov_definition_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a data specification create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.

md_processing/md_commands/product_manager_commands.py

@@ -413,7 +413,7 @@ def sync_data_class_rel_elements(egeria_client: EgeriaTech, containing_data_clas
 def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a digital product create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.
@@ -550,7 +550,7 @@ def process_collection_upsert_command(egeria_client: EgeriaTech, txt: str, direc
 def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes a digital product create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.
@@ -751,7 +751,7 @@ def process_digital_product_upsert_command(egeria_client: EgeriaTech, txt: str,
 def process_agreement_upsert_command(egeria_client: EgeriaTech, txt: str, directive: str = "display") -> Optional[str]:
     """
     Processes an agreement create or update object_action by extracting key attributes such as
-    spec name, parent_guid, parent_relationship_type, parent_at_end_1, collection_type
+    spec name, parent_guid, parent_relationship_type, parent_at_end_1, category
 
     :param txt: A string representing the input cell to be processed for
         extracting glossary-related attributes.

pyegeria/__init__.py

@@ -27,7 +27,12 @@ if disable_ssl_warnings:
 
 from ._client import Client
 from ._client_new import Client2
-
+from ._exceptions_new import (PyegeriaInvalidParameterException,PyegeriaAPIException, PyegeriaException,
+                              PyegeriaUnauthorizedException, PyegeriaClientException, PyegeriaUnknownException,
+                              PyegeriaConnectionException, PyegeriaNotFoundException,
+                              print_exception_table, print_basic_exception)
+from .load_config import load_app_config, get_app_config
+from .logging_configuration import config_logging, console_log_filter, init_logging
 from ._exceptions import (InvalidParameterException, PropertyServerException, UserNotAuthorizedException,
                           print_exception_response, )
 from ._validators import (is_json, validate_guid, validate_name, validate_public, validate_search_string,

pyegeria/_client_new.py

@@ -20,6 +20,7 @@ import httpx
 from loguru import logger
 
 from httpx import AsyncClient, Response, HTTPStatusError
+from pydantic import TypeAdapter
 
 from pyegeria.utils import body_slimmer
 from pyegeria._exceptions_new import (
@@ -35,6 +36,9 @@ from pyegeria._validators import (
     validate_url,
     validate_user_id,
 )
+from pyegeria.models import SearchStringRequestBody, FilterRequestBody, GetRequestBody, NewElementRequestBody, \
+    TemplateRequestBody, UpdateStatusRequestBody, UpdateElementRequestBody, NewRelationshipRequestBody, \
+    DeleteRequestBody
 
 ...
 
@@ -137,8 +141,15 @@ class Client2:
                 self.server_name = server_name
             self.session = AsyncClient(verify=enable_ssl_check)
 
-
-
+        self._search_string_request_adapter = TypeAdapter(SearchStringRequestBody)
+        self._filter_request_adapter = TypeAdapter(FilterRequestBody)
+        self._get_request_adapter = TypeAdapter(GetRequestBody)
+        self._new_element_request_adapter = TypeAdapter(NewElementRequestBody)
+        self._update_element_request_adapter = TypeAdapter(UpdateElementRequestBody)
+        self._update_status_request_adapter = TypeAdapter(UpdateStatusRequestBody)
+        self._new_relationship_request_adapter = TypeAdapter(NewRelationshipRequestBody)
+        self._delete_request_adapter = TypeAdapter(DeleteRequestBody)
+        self._template_request_adapter = TypeAdapter(TemplateRequestBody)
 
     def __enter__(self):
         return self
@@ -423,17 +434,27 @@ class Client2:
                     response = await self.session.post(
                         endpoint, headers=self.headers, timeout=time_out
                     )
+                elif type(payload) is dict:
+                    response = await self.session.post(
+                        endpoint, json=payload, headers=self.headers, timeout=time_out
+                        )
                 elif type(payload) is str:
+                    # if is_json:
+                    #     response = await self.session.post(
+                    #         endpoint, json=payload, headers=self.headers, timeout=time_out
+                    #         )
+                    # else:
                     response = await self.session.post(
                         endpoint,
-                        headers=self.text_headers,
-                        data=payload,
+                        headers=self.headers,
+                        content=payload,
                         timeout=time_out,
                     )
                 else:
-                    response = await self.session.post(
-                        endpoint, headers=self.headers, json=payload, timeout=time_out
-                    )
+                    # response = await self.session.post(
+                    #     endpoint, headers=self.headers, json=payload, timeout=time_out)
+                    raise TypeError(f"Invalid payload type {type(payload)}")
+
 
             elif request_type == "POST-DATA":
                 if True:
@@ -598,7 +619,7 @@ class Client2:
                 name = f"{tech_type}::{display_name}"
                 body = {
                     "class": "NameRequestBody",
-                    "name": name,
+                    "displayName": name,
                     "namePropertyName": property_name,
                     "forLineage": False,
                     "forDuplicateProcessing": False,
@@ -665,11 +686,11 @@ class Client2:
         """Helper function to create a qualified name for a given type and display name.
            If present, the local qualifier will be prepended to the qualified name."""
         EGERIA_LOCAL_QUALIFIER = os.environ.get("EGERIA_LOCAL_QUALIFIER", local_qualifier)
-        # display_name = re.sub(r'\s','-',display_name.strip()) # This changes spaces between words to -; removing
+        display_name = re.sub(r'\s','-',display_name.strip()) # This changes spaces between words to -; removing
         if display_name is None:
             additional_info = {"reason": "Display name is missing - please provide.",}
             raise PyegeriaInvalidParameterException(additional_info=additional_info)
-        q_name = f"{type}::{display_name.strip()}"
+        q_name = f"{type}::{display_name}"
         if EGERIA_LOCAL_QUALIFIER:
             q_name = f"{EGERIA_LOCAL_QUALIFIER}::{q_name}"
         if version_identifier:
@@ -716,6 +737,22 @@ class Client2:
 
         return elements
 
+def validate_new_element_request(self, body: dict | NewElementRequestBody, prop: str)-> NewElementRequestBody
+    if isinstance(body, NewElementRequestBody):
+        if body.properties.class_ == prop:
+            validated_body = body
+        else:
+            raise PyegeriaInvalidParameterException(additional_info=
+                                                    {"reason": "unexpected property class name"})
+
+    elif isinstance(body, dict):
+        if body.get("properties", {}).get("class", "") == prop:
+            validated_body = self._new_element_request_adapter.validate_python(body)
+        else:
+            raise PyegeriaInvalidParameterException(additional_info=
+                                                    {"reason": "unexpected property class name"})
 
+    else:
+        raise TypeError("Invalid parameter type")
 if __name__ == "__main__":
     print("Main-__client")

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
@@ -34,7 +35,7 @@ class PyegeriaErrorCode(Enum):
         "http_code": 400,
         "egeria_code": "From Egeria",
         "message_id": "CLIENT_ERROR_400",
-        "message_template": "Client error occurred accessing `{0}` with status code `{1}`.",
+        "message_template": "Client error occurred with status code `{0}`.",
         "system_action": "The client is unable to connect to the Egeria platform.",
         "user_action": "Check the URL to ensure the valid platform url, server, user id are correct.",
     }
@@ -148,14 +149,20 @@ def format_dict_to_string(d: dict) -> str:
 class PyegeriaException(Exception):
     """Base exception for My REST Library errors."""
 
-    def __init__(self, response:Response, error_code: PyegeriaErrorCode,
+    def __init__(self, response:Response = None, error_code: PyegeriaErrorCode = None,
                  context: dict = None, additional_info:dict = None, e:Exception = None) -> None:
-        self.response = response
+        if response:
+            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 ""
+        else:
+            self.response = None
+            self.response_url = ""
+            self.response_code = ""
         self.error_code = error_code
         self.error_details = error_code.value
         self.pyegeria_code = self.error_details.get("message_id", "UNKNOWN_ERROR")
-        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.message = self.error_details["message_template"].format(self.response_url, self.response_code)
         self.system_action = self.error_details.get("system_action", "")
         self.user_action = self.error_details.get("user_action", "")
@@ -199,7 +206,7 @@ class PyegeriaConnectionException(PyegeriaException):
 
 class PyegeriaInvalidParameterException(PyegeriaException):
     """Raised for invalid parameters - parameters that might be missing or incorrect."""
-    def __init__(self, response: Response,
+    def __init__(self, response: Response = None,
                  context: dict = None, additional_info: dict = None, e: Exception = None) -> None:
         super().__init__(response, PyegeriaErrorCode.VALIDATION_ERROR,
                          context, additional_info, e)
@@ -311,7 +318,7 @@ def print_exception_response(e: PyegeriaException):
     if isinstance(e, PyegeriaException):
         console.print(Markdown(f"\n---\n# Exception: {e.__class__.__name__}"))
         msg: Text = Text(e.__str__(), overflow="fold")
-        if hasattr(e, 'related_http_code') and e.related_http_code:
+        if e.response_code:
             related_response = e.response.json()
             exception_msg_id = related_response.get("exceptionErrorMessageId", None)
             if exception_msg_id:
@@ -340,7 +347,7 @@ def print_exception_table(e: PyegeriaException):
         table.add_row("Egeria Code", str(related_code))
         table.add_row("Caller Method", e.context.get("caller method", "---"))
         table.add_row("Request URL", str(e.response_url))
-        if e.related_http_code:
+        if e.response_code:
             item_table = Table(show_lines = True, header_style="bold")
             item_table.add_column("Item", justify="center")
             item_table.add_column("Detail", justify="left")
@@ -364,7 +371,7 @@ def print_exception_table(e: PyegeriaException):
 def print_basic_exception(e: PyegeriaException):
     """Prints the exception response"""
     related_code = e.related_http_code if hasattr(e, "related_http_code") else ""
-    related_response = e.response.json()
+    related_response = e.response.json() 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")
@@ -388,4 +395,22 @@ def print_basic_exception(e: PyegeriaException):
 
         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(error["loc"])
+        message = error["msg"]
+        table.add_row(error_type, attribute, message)
+
+
+    console.print(table)

pyegeria/classification_manager_omvs.py

@@ -857,7 +857,7 @@ class ClassificationManager(Client):
 
         body = {
             "class": "NameRequestBody",
-            "name": name,
+            "displayName": name,
             "namePropertyName": property_name,
             "forLineage": for_lineage,
             "forDuplicateProcessing": for_duplicate_processing,