scim2-models 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

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/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/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.dist-info → scim2_models-0.3.6.dist-info}/METADATA

@@ -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.dist-info → scim2_models-0.3.6.dist-info}/RECORD

@@ -6,19 +6,19 @@ scim2_models/utils.py,sha256=MzZz212-lkVWgXcpXvNwoi_u28wBTpkTwPrfYC5v92A,2771
 scim2_models/rfc7643/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scim2_models/rfc7643/enterprise_user.py,sha256=EaxdHH2dcBrwWwGpaZC6iZ9dbcaVN1NpoRLAdkTYssQ,1781
 scim2_models/rfc7643/group.py,sha256=JML8OtgKjvHHv2YufiYcTtbZuN5GFVQTbm1J6MLtp8o,1427
-scim2_models/rfc7643/resource.py,sha256=zMyk02Traoq6XNBcS_fSnXIOadZwxTdA9CV4vLuy38k,12648
-scim2_models/rfc7643/resource_type.py,sha256=p8IKV5IakPMBX6d2Fv2MFqaQL5iTw152vmozVVSC8gU,3196
+scim2_models/rfc7643/resource.py,sha256=oEm0RVBFonTrrhS-iYQquAdiy4UW4nXHbk_Bf--fR3g,12849
+scim2_models/rfc7643/resource_type.py,sha256=vT2ItHvBzmsFVt3zbIJABxjcnSLUK-mW-zWduHxGE3k,3570
 scim2_models/rfc7643/schema.py,sha256=B7TzMbT6ngYQrMqvqW5_LberN6EaqtZaFwBVsgoA3S0,10388
 scim2_models/rfc7643/service_provider_config.py,sha256=deMNCXlqiNzuLcVRN9mdHiTUxhczDnvi-oO6k-Anj8U,5402
 scim2_models/rfc7643/user.py,sha256=EEje4V_zbMVwVYOu2Gj1W7GjD90WnC0lUK3FJuh4jWE,10607
 scim2_models/rfc7644/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scim2_models/rfc7644/bulk.py,sha256=I6S40kyJPwDQwPFi668wFFDVTST7z6QTe9HTL5QUViI,2577
 scim2_models/rfc7644/error.py,sha256=l4-vtGQYm5u13-ParhbHSeqXEil0E09QXSO9twAT3SU,6185
-scim2_models/rfc7644/list_response.py,sha256=ltjV1WII2fNy8j3RX8J0_Jb5DW4hTFoO6P-Myr7TnBY,4551
+scim2_models/rfc7644/list_response.py,sha256=GNfRKpL2WK2KHGC3kg7ldaSiPwCXl0AxDfhnbHByEAY,4589
 scim2_models/rfc7644/message.py,sha256=F4kPqbHAka3-wZzap9a45noQZw-o1vznTJypNABBF7w,253
 scim2_models/rfc7644/patch_op.py,sha256=OE-ixDanTkY5zQP7EK7OAp88uE_fMk03mqmaZHxgJ-g,2210
 scim2_models/rfc7644/search_request.py,sha256=DRGlixcWtYtbUuP9MT7PsnvyxlONLcXGEcQveWdqQng,3003
-scim2_models-0.3.4.dist-info/METADATA,sha256=K4xDCV3A2Hv7Wq-QiCoXrPU3XoDKFaeqAzTQL8aKybY,16288
-scim2_models-0.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-scim2_models-0.3.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-scim2_models-0.3.4.dist-info/RECORD,,
+scim2_models-0.3.6.dist-info/METADATA,sha256=ihhjxgKo0dF-ufWhrgCdsNiH6vGXOplFlga07UVHrLw,16288
+scim2_models-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+scim2_models-0.3.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+scim2_models-0.3.6.dist-info/RECORD,,