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

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

@@ -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 → scim2_models-0.3.5}/doc/changelog.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+[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.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "scim2-models"
-version = "0.3.4"
+version = "0.3.5"
 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.5}/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 → scim2_models-0.3.5}/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.5}/uv.lock

@@ -939,7 +939,7 @@ wheels = [
 
 [[package]]
 name = "scim2-models"
-version = "0.3.4"
+version = "0.3.5"
 source = { editable = "." }
 dependencies = [
     { name = "pydantic", extra = ["email"] },