scim2-models 0.3.4__tar.gz → 0.3.6__tar.gz

{scim2_models-0.3.4 → scim2_models-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scim2-models
-Version: 0.3.4
+Version: 0.3.6
 Summary: SCIM2 models serialization and validation with pydantic
 Project-URL: documentation, https://scim2-models.readthedocs.io
 Project-URL: repository, https://github.com/python-scim/scim2-models

{scim2_models-0.3.4 → scim2_models-0.3.6}/doc/changelog.rst

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+[0.3.6] - 2025-07-02
+--------------------
+
+Added
+^^^^^
+- Fix :meth:`ResourceType.from_resource <scim2_models.ResourceType.from_resource>`
+  usage for resources with several extensions. :pr:`95`
+
+[0.3.5] - 2025-06-05
+--------------------
+
+Added
+^^^^^
+- Fix dynamic schema generation for user defined classes with inheritance.
+
 [0.3.4] - 2025-06-05
 --------------------
 

{scim2_models-0.3.4 → scim2_models-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "scim2-models"
-version = "0.3.4"
+version = "0.3.6"
 description = "SCIM2 models serialization and validation with pydantic"
 authors = [{name="Yaal Coop", email="contact@yaal.coop"}]
 license = {file = "LICENSE"}

{scim2_models-0.3.4 → scim2_models-0.3.6}/scim2_models/rfc7643/resource.py

@@ -4,7 +4,6 @@ from typing import Any
 from typing import Generic
 from typing import Optional
 from typing import TypeVar
-from typing import Union
 from typing import get_args
 from typing import get_origin
 
@@ -17,12 +16,14 @@ from ..base import BaseModelType
 from ..base import CaseExact
 from ..base import ComplexAttribute
 from ..base import ExternalReference
+from ..base import MultiValuedComplexAttribute
 from ..base import Mutability
 from ..base import Required
 from ..base import Returned
 from ..base import Uniqueness
 from ..base import URIReference
 from ..base import is_complex_attribute
+from ..utils import UNION_TYPES
 from ..utils import normalize_attribute_name
 
 
@@ -116,7 +117,7 @@ class ResourceMetaclass(BaseModelType):
             extensions = kwargs["__pydantic_generic_metadata__"]["args"][0]
             extensions = (
                 get_args(extensions)
-                if get_origin(extensions) == Union
+                if get_origin(extensions) in UNION_TYPES
                 else [extensions]
             )
             for extension in extensions:
@@ -182,7 +183,8 @@ class Resource(BaseModel, Generic[AnyExtension], metaclass=ResourceMetaclass):
         extension_models = cls.__pydantic_generic_metadata__.get("args", [])
         extension_models = (
             get_args(extension_models[0])
-            if len(extension_models) == 1 and get_origin(extension_models[0]) == Union
+            if len(extension_models) == 1
+            and get_origin(extension_models[0]) in UNION_TYPES
             else extension_models
         )
 
@@ -253,8 +255,8 @@ class Resource(BaseModel, Generic[AnyExtension], metaclass=ResourceMetaclass):
 AnyResource = TypeVar("AnyResource", bound="Resource")
 
 
-def dedicated_attributes(model):
-    """Return attributes that are not members of parent classes."""
+def dedicated_attributes(model, excluded_models):
+    """Return attributes that are not members the parent 'excluded_models'."""
 
     def compare_field_infos(fi1, fi2):
         return (
@@ -268,8 +270,8 @@ def dedicated_attributes(model):
 
     parent_field_infos = {
         field_name: field_info
-        for parent in model.__bases__
-        for field_name, field_info in parent.model_fields.items()
+        for excluded_model in excluded_models
+        for field_name, field_info in excluded_model.model_fields.items()
     }
     field_infos = {
         field_name: field_info
@@ -283,7 +285,7 @@ def model_to_schema(model: type[BaseModel]):
     from scim2_models.rfc7643.schema import Schema
 
     schema_urn = model.model_fields["schemas"].default[0]
-    field_infos = dedicated_attributes(model)
+    field_infos = dedicated_attributes(model, [Resource])
     attributes = [
         model_attribute_to_attribute(model, attribute_name)
         for attribute_name in field_infos
@@ -300,7 +302,7 @@ def model_to_schema(model: type[BaseModel]):
 
 def get_reference_types(type) -> list[str]:
     first_arg = get_args(type)[0]
-    types = get_args(first_arg) if get_origin(first_arg) == Union else [first_arg]
+    types = get_args(first_arg) if get_origin(first_arg) in UNION_TYPES else [first_arg]
 
     def serialize_ref_type(ref_type):
         if ref_type == URIReference:
@@ -323,7 +325,9 @@ def model_attribute_to_attribute(model, attribute_name):
     sub_attributes = (
         [
             model_attribute_to_attribute(root_type, sub_attribute_name)
-            for sub_attribute_name in dedicated_attributes(root_type)
+            for sub_attribute_name in dedicated_attributes(
+                root_type, [MultiValuedComplexAttribute]
+            )
             if (
                 attribute_name != "sub_attributes"
                 or sub_attribute_name != "sub_attributes"

{scim2_models-0.3.4 → scim2_models-0.3.6}/scim2_models/rfc7643/resource_type.py

@@ -1,5 +1,7 @@
 from typing import Annotated
 from typing import Optional
+from typing import get_args
+from typing import get_origin
 
 from pydantic import Field
 from typing_extensions import Self
@@ -11,6 +13,7 @@ from ..base import Reference
 from ..base import Required
 from ..base import Returned
 from ..base import URIReference
+from ..utils import UNION_TYPES
 from .resource import Resource
 
 
@@ -82,7 +85,16 @@ class ResourceType(Resource):
         """Build a naive ResourceType from a resource model."""
         schema = resource_model.model_fields["schemas"].default[0]
         name = schema.split(":")[-1]
-        extensions = resource_model.__pydantic_generic_metadata__["args"]
+        if resource_model.__pydantic_generic_metadata__["args"]:
+            extensions = resource_model.__pydantic_generic_metadata__["args"][0]
+            extensions = (
+                get_args(extensions)
+                if get_origin(extensions) in UNION_TYPES
+                else [extensions]
+            )
+        else:
+            extensions = []
+
         return ResourceType(
             id=name,
             name=name,

{scim2_models-0.3.4 → scim2_models-0.3.6}/scim2_models/rfc7644/list_response.py

@@ -20,6 +20,7 @@ from ..base import BaseModelType
 from ..base import Context
 from ..base import Required
 from ..rfc7643.resource import AnyResource
+from ..utils import UNION_TYPES
 from .message import Message
 
 
@@ -29,7 +30,7 @@ class ListResponseMetaclass(BaseModelType):
 
         https://docs.pydantic.dev/latest/concepts/unions/#discriminated-unions
         """
-        if not get_origin(resource_union) == Union:
+        if get_origin(resource_union) not in UNION_TYPES:
             return resource_union
 
         resource_types = get_args(resource_union)

{scim2_models-0.3.4 → scim2_models-0.3.6}/tests/test_dynamic_schemas.py

@@ -1,8 +1,12 @@
 import operator
+from typing import Annotated
+from typing import Optional
 
 from scim2_models.base import Context
+from scim2_models.base import Required
 from scim2_models.rfc7643.enterprise_user import EnterpriseUser
 from scim2_models.rfc7643.group import Group
+from scim2_models.rfc7643.resource import Resource
 from scim2_models.rfc7643.resource_type import ResourceType
 from scim2_models.rfc7643.schema import Schema
 from scim2_models.rfc7643.service_provider_config import ServiceProviderConfig
@@ -127,3 +131,49 @@ def test_dump_with_context():
     models = [User, EnterpriseUser, Group, ResourceType, Schema, ServiceProviderConfig]
     for model in models:
         model.to_schema().model_dump(scim_ctx=Context.RESOURCE_QUERY_RESPONSE)
+
+
+def test_inheritance():
+    """Check that parent attributes are included in the schema."""
+
+    class Foo(Resource):
+        schemas: Annotated[list[str], Required.true] = [
+            "urn:ietf:params:scim:schemas:core:2.0:Foo"
+        ]
+
+        foo: Optional[str] = None
+
+    class Bar(Foo):
+        bar: Optional[str] = None
+
+    schema = Bar.to_schema()
+    assert schema.model_dump() == {
+        "attributes": [
+            {
+                "caseExact": False,
+                "multiValued": False,
+                "mutability": "readWrite",
+                "name": "foo",
+                "required": False,
+                "returned": "default",
+                "type": "string",
+                "uniqueness": "none",
+            },
+            {
+                "caseExact": False,
+                "multiValued": False,
+                "mutability": "readWrite",
+                "name": "bar",
+                "required": False,
+                "returned": "default",
+                "type": "string",
+                "uniqueness": "none",
+            },
+        ],
+        "description": "Bar",
+        "id": "urn:ietf:params:scim:schemas:core:2.0:Foo",
+        "name": "Bar",
+        "schemas": [
+            "urn:ietf:params:scim:schemas:core:2.0:Schema",
+        ],
+    }

{scim2_models-0.3.4 → scim2_models-0.3.6}/tests/test_resource_type.py

@@ -1,5 +1,10 @@
+from typing import Annotated
+from typing import Union
+
 from scim2_models import EnterpriseUser
+from scim2_models import Extension
 from scim2_models import Reference
+from scim2_models import Required
 from scim2_models import ResourceType
 from scim2_models import User
 
@@ -61,3 +66,32 @@ def test_from_resource_with_extensions():
         == "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"
     )
     assert not enterprise_user_rt.schema_extensions[0].required
+
+
+def test_from_resource_with_mulitple_extensions():
+    class TestExtension(Extension):
+        schemas: Annotated[list[str], Required.true] = [
+            "urn:ietf:params:scim:schemas:extension:Test:1.0:User"
+        ]
+
+        test: Union[str, None] = None
+        test2: Union[list[str], None] = None
+
+    enterprise_user_rt = ResourceType.from_resource(
+        User[Union[EnterpriseUser, TestExtension]]
+    )
+    assert enterprise_user_rt.id == "User"
+    assert enterprise_user_rt.name == "User"
+    assert enterprise_user_rt.description == "User"
+    assert enterprise_user_rt.endpoint == "/Users"
+    assert enterprise_user_rt.schema_ == "urn:ietf:params:scim:schemas:core:2.0:User"
+    assert (
+        enterprise_user_rt.schema_extensions[0].schema_
+        == "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"
+    )
+    assert not enterprise_user_rt.schema_extensions[0].required
+    assert (
+        enterprise_user_rt.schema_extensions[1].schema_
+        == "urn:ietf:params:scim:schemas:extension:Test:1.0:User"
+    )
+    assert not enterprise_user_rt.schema_extensions[1].required