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

scim2_models/rfc7643/resource.py

@@ -17,6 +17,7 @@ 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
@@ -253,8 +254,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 +269,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 +284,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
@@ -323,7 +324,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.dist-info → scim2_models-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scim2-models
-Version: 0.3.4
+Version: 0.3.5
 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.5.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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.py,sha256=PUWoajKewJuitaxVcClxfCucaSdkzIfphld-kK8KLdo,12812
 scim2_models/rfc7643/resource_type.py,sha256=p8IKV5IakPMBX6d2Fv2MFqaQL5iTw152vmozVVSC8gU,3196
 scim2_models/rfc7643/schema.py,sha256=B7TzMbT6ngYQrMqvqW5_LberN6EaqtZaFwBVsgoA3S0,10388
 scim2_models/rfc7643/service_provider_config.py,sha256=deMNCXlqiNzuLcVRN9mdHiTUxhczDnvi-oO6k-Anj8U,5402
@@ -18,7 +18,7 @@ scim2_models/rfc7644/list_response.py,sha256=ltjV1WII2fNy8j3RX8J0_Jb5DW4hTFoO6P-
 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.5.dist-info/METADATA,sha256=h7WtwUPjMOgw4iUIhqrfdmISInw8dDyOupVqu308vYg,16288
+scim2_models-0.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+scim2_models-0.3.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+scim2_models-0.3.5.dist-info/RECORD,,