pyegeria 5.4.0.19__tar.gz → 5.4.0.20__tar.gz

{pyegeria-5.4.0.19 → pyegeria-5.4.0.20}/PKG-INFO

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

{pyegeria-5.4.0.19 → pyegeria-5.4.0.20}/pyegeria/_client_new.py

@@ -145,11 +145,11 @@ class Client2:
         self._filter_request_adapter = TypeAdapter(FilterRequestBody)
         self._get_request_adapter = TypeAdapter(GetRequestBody)
         self._new_element_request_adapter = TypeAdapter(NewElementRequestBody)
-        self._new_elemet_template_request_adapter = TypeAdapter(TemplateRequestBody)
         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
@@ -737,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-5.4.0.19 → pyegeria-5.4.0.20}/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
@@ -394,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-5.4.0.19 → pyegeria-5.4.0.20}/pyegeria/collection_manager.py

@@ -2400,18 +2400,17 @@ class CollectionManager(Client2):
 
         """
 
-        try:
-            if isinstance(body, TemplateRequestBody):
-                validated_body = body
 
-            elif isinstance(body, dict):
-                validated_body = self._new_element_template_request_adapter.validate_python(body)
+        if isinstance(body, TemplateRequestBody):
+            validated_body = body
 
-        except ValidationError as e:
-            logger.error(f"Validation error: {e}")
-            raise ValidationError(e)
+        elif isinstance(body, dict):
+            validated_body = self._template_request_adapter.validate_python(body)
 
-        url = f"{self.collection_command_root}"
+
+
+
+        url = f"{self.collection_command_root}/from-template"
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
         logger.info(json_body)
         resp = await self._async_make_request("POST", url, json_body, is_json=True)
@@ -2696,27 +2695,25 @@ class CollectionManager(Client2):
         OTHER.  If using OTHER, set the userDefinedStatus with the status value you want. If not specified, will
         default to ACTIVE.
         """
-        try:
-            if isinstance(body, NewElementRequestBody):
-                if body.properties.class_ == "DigitalProductProperties":
-                    validated_body = body
-                else:
-                    raise PyegeriaInvalidParameterException(additional_info=
-                                                            {"reason": "unexpected property class name"})
 
-            elif isinstance(body, dict):
-                if body.get("properties", {}).get("class", "") == "DigitalProductProperties":
-                    validated_body = self._new_element_request_adapter.validate_python(body)
-                else:
-                    raise PyegeriaInvalidParameterException(additional_info=
-                                                            {"reason": "unexpected property class name"})
+        if isinstance(body, NewElementRequestBody):
+            if body.properties.class_ == "DigitalProductProperties":
+                validated_body = body
+            else:
+                raise PyegeriaInvalidParameterException(additional_info=
+                                                        {"reason": "unexpected property class name"})
 
+        elif isinstance(body, dict):
+            if body.get("properties", {}).get("class", "") == "DigitalProductProperties":
+                validated_body = self._new_element_request_adapter.validate_python(body)
             else:
-                raise TypeError("Invalid parameter type")
+                raise PyegeriaInvalidParameterException(additional_info=
+                                                        {"reason": "unexpected property class name"})
+
+        else:
+            raise TypeError("Invalid parameter type")
+
 
-        except ValidationError as e:
-            logger.error(f"Validation error: {e}")
-            raise ValidationError(e)
 
         url = f"{self.collection_command_root}"
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
@@ -4388,7 +4385,7 @@ class CollectionManager(Client2):
 
     @dynamic_catch
     async def _async_link_agreement_item(self, agreement_guid: str, agreement_item_guid: str,
-                                         body: dict = None) -> None:
+                                         body: dict| NewRelationshipRequestBody = None) -> None:
         """ Attach an agreement to an element referenced in its definition. The agreement item element is of type
            'Referenceable' to allow the agreement to refer to many things. Request body is optional. Async version.
 
@@ -4398,7 +4395,7 @@ class CollectionManager(Client2):
             The guid of the agreement to update.
         agreement_item_guid: str
             The guid of the element to attach.
-        body: dict, optional, default = None
+        body: dict | NewRelationshipRequestBody, optional, default = None
             A dict representing the details of the relationship.
 
         Returns
@@ -4416,9 +4413,8 @@ class CollectionManager(Client2):
 
         Notes
         _____
-
         {
-          "class" : "RelationshipRequestBody",
+          "class" : "NewRelationshipRequestBody",
           "externalSourceGUID": "add guid here",
           "externalSourceName": "add qualified name here",
           "effectiveTime" : "{{$isoTimestamp}}",
@@ -4437,6 +4433,10 @@ class CollectionManager(Client2):
               "property1Name" : "property1Value",
               "property2Name" : "property2Value"
             },
+            "entitlements" : {
+              "property1Name" : "property1Value",
+              "property2Name" : "property2Value"
+            },
             "usageMeasurements" : {
               "property1Name" : "property1Value",
               "property2Name" : "property2Value"
@@ -4446,16 +4446,30 @@ class CollectionManager(Client2):
           }
         }
 
-        """
-
-        url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/collection-manager/collections/"
-               f"agreements/{agreement_guid}/agreement-items/{agreement_item_guid}/attach")
-
-        if body:
-            await self._async_make_request("POST", url, body)
-        else:
-            await self._async_make_request("POST", url)
-        logger.info(f"Attached agreement item {agreement_item_guid} to {agreement_guid}")
+            """
+        pass
+        # if isinstance(body,NewRelationshipRequestBody ):
+        #     validated_body = body
+        # elif isinstance(body, dict):
+        #     try:
+        #         validated_body = (**body)
+        #     except ValidationError as e:
+        #         logger.error(f"Validation error: {e}")
+        #         raise PyegeriaInvalidParameterException(f"Invalid body: {e}")
+        # elif body is None:
+        #     validated_body = (
+        #
+        #     )
+        # # else:
+        #     raise PyegeriaInvalidParameterException(f"Invalid body type: {type(body)}")
+        #     url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/collection-manager/collections/"
+        #            f"agreements/{agreement_guid}/agreement-items/{agreement_item_guid}/attach")
+        #
+        #     if body:
+        #         await self._async_make_request("POST", url, body)
+        #     else:
+        #         await self._async_make_request("POST", url)
+        #     logger.info(f"Attached agreement item {agreement_item_guid} to {agreement_guid}")
 
 
     def link_agreement_item(self, agreement_guid: str, agreement_item_guid: str, body: dict = None) -> None:

{pyegeria-5.4.0.19 → pyegeria-5.4.0.20}/pyegeria/models.py

@@ -283,7 +283,7 @@ class TemplateRequestBody(PyegeriaModel):
     parent_guid: str | None = None
     parent_relationship_type_name: str | None = None
     parent_at_end_1: bool | None = True
-    template_guid: str | None = None
+    template_guid: str
     replacement_properties: dict[str, Any] = {}
     placeholder_properties: dict[str, Any] = {}
 

{pyegeria-5.4.0.19 → pyegeria-5.4.0.20}/pyproject.toml

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