scim2-client 0.1.2__tar.gz → 0.1.4__tar.gz

{scim2_client-0.1.2 → scim2_client-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scim2-client
-Version: 0.1.2
+Version: 0.1.4
 Summary: Pythonically build SCIM requests and parse SCIM responses
 License: MIT
 Keywords: scim,scim2,provisioning,httpx,api
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: httpx (>=0.27.0,<0.28.0)
-Requires-Dist: scim2-models (>=0.1.1,<0.2.0)
+Requires-Dist: scim2-models (>=0.1.2,<0.2.0)
 Description-Content-Type: text/markdown
 
 # scim2-client
@@ -65,7 +65,8 @@ assert user.meta.last_updated == datetime.datetime(
 )
 
 # Create resources
-response = scim.create(User, "2819c223-7f76-453a-919d-413861904646")
+payload = User(user_name="bjensen@example.com")
+response = scim.create(user)
 assert isinstance(response, Error)
 assert response.detail == "One or more of the attribute values are already in use or are reserved."
 ```

{scim2_client-0.1.2 → scim2_client-0.1.4}/README.md

@@ -40,7 +40,8 @@ assert user.meta.last_updated == datetime.datetime(
 )
 
 # Create resources
-response = scim.create(User, "2819c223-7f76-453a-919d-413861904646")
+payload = User(user_name="bjensen@example.com")
+response = scim.create(user)
 assert isinstance(response, Error)
 assert response.detail == "One or more of the attribute values are already in use or are reserved."
 ```

{scim2_client-0.1.2 → scim2_client-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "scim2-client"
-version = "0.1.2"
+version = "0.1.4"
 description = "Pythonically build SCIM requests and parse SCIM responses"
 authors = ["Yaal Coop <contact@yaal.coop>"]
 license = "MIT"
@@ -27,7 +27,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.9"
 httpx = "^0.27.0"
-scim2-models = "^0.1.1"
+scim2-models = "^0.1.2"
 
 [tool.poetry.group.doc]
 optional = true

{scim2_client-0.1.2 → scim2_client-0.1.4}/scim2_client/client.py

@@ -15,8 +15,10 @@ from scim2_models import Context
 from scim2_models import Error
 from scim2_models import ListResponse
 from scim2_models import PatchOp
+from scim2_models import Resource
 from scim2_models import SearchRequest
 
+from .errors import SCIMClientError
 from .errors import UnexpectedContentFormat
 from .errors import UnexpectedContentType
 from .errors import UnexpectedStatusCode
@@ -104,7 +106,12 @@ class SCIMClient:
             raise ValueError(f"Unknown resource type: '{resource_type}'")
 
     def resource_endpoint(self, resource_type: Type):
-        return f"/{resource_type.__name__}s"
+        try:
+            first_bracket_index = resource_type.__name__.index("[")
+            root_name = resource_type.__name__[:first_bracket_index]
+        except ValueError:
+            root_name = resource_type.__name__
+        return f"/{root_name}s"
 
     def check_response(
         self,
@@ -166,6 +173,7 @@ class SCIMClient:
         <7644#section-3.3>`.
 
         :param resource: The resource to create
+            If is a :data:`dict`, the resource type will be guessed from the schema.
         :param check_request_payload: If :data:`False`,
             :code:`resource` is expected to be a dict that will be passed as-is in the request.
         :param check_response_payload: Whether to validate that the response payload is valid.
@@ -184,8 +192,20 @@ class SCIMClient:
             url = kwargs.pop("url", None)
 
         else:
-            self.check_resource_type(resource.__class__)
-            url = kwargs.pop("url", self.resource_endpoint(resource.__class__))
+            if isinstance(resource, Resource):
+                resource_type = resource.__class__
+
+            else:
+                resource_type = Resource.get_by_payload(self.resource_types, resource)
+                if not resource_type:
+                    raise SCIMClientError(
+                        None, "Cannot guess resource type from the payload"
+                    )
+
+                resource = resource_type.model_validate(resource)
+
+            self.check_resource_type(resource_type)
+            url = kwargs.pop("url", self.resource_endpoint(resource_type))
             payload = resource.model_dump(scim_ctx=Context.RESOURCE_CREATION_REQUEST)
 
         response = self.client.post(url, json=payload, **kwargs)
@@ -352,7 +372,7 @@ class SCIMClient:
                 else None
             )
 
-        response = self.client.post("/.search", params=payload)
+        response = self.client.post("/.search", json=payload)
 
         return self.check_response(
             response,
@@ -397,7 +417,8 @@ class SCIMClient:
         """Perform a PUT request to replace a resource, as defined in
         :rfc:`RFC7644 §3.5.1 <7644#section-3.5.1>`.
 
-        :param resource: The new state of the resource to replace.
+        :param resource: The new resource to replace.
+            If is a :data:`dict`, the resource type will be guessed from the schema.
         :param check_request_payload: If :data:`False`,
             :code:`resource` is expected to be a dict that will be passed as-is in the request.
         :param check_response_payload: Whether to validate that the response payload is valid.
@@ -413,12 +434,25 @@ class SCIMClient:
 
         if not check_request_payload:
             payload = resource
-            url = kwargs.pop("url")
+            url = kwargs.pop("url", None)
 
         else:
-            self.check_resource_type(resource.__class__)
+            if isinstance(resource, Resource):
+                resource_type = resource.__class__
+
+            else:
+                resource_type = Resource.get_by_payload(self.resource_types, resource)
+                if not resource_type:
+                    raise SCIMClientError(
+                        None, "Cannot guess resource type from the payload"
+                    )
+
+                resource = resource_type.model_validate(resource)
+
+            self.check_resource_type(resource_type)
+
             if not resource.id:
-                raise Exception("Resource must have an id")
+                raise SCIMClientError(None, "Resource must have an id")
 
             payload = resource.model_dump(scim_ctx=Context.RESOURCE_REPLACEMENT_REQUEST)
             url = kwargs.pop(