Revert "fix: attributes with none type are excluded from Schema generation"

This reverts commit f5128a3.

Author: azmeuk

doc/changelog.rst

@@ -6,7 +6,6 @@ Changelog
 
 Fixed
 ^^^^^
-- Attributes with ``None`` type are excluded from Schema generation.
 - Allow PATCH operations on resources and extensions root path.
 - Multiple ComplexAttribute do not inherit from MultiValuedComplexAttribute by default. :issue:`72` :issue:`73`
 - Forbid :class:`~scim2_models.PatchOp` with zero ``operations``.

doc/tutorial.rst

@@ -357,15 +357,6 @@ This is useful for server implementations, so custom models or models provided b
     ...     ],
     ... }
 
-To disable an attribute in a custom resource subclass, annotate it with type ``None``:
-
-.. code-block:: python
-   :caption: Disabling a field inherited from a parent resource
-
-    >>> class CustomUser(User):
-    ...     # This attribute will be excluded from schema generation
-    ...     display_name: None = None
-
 Dynamic models from schemas
 ===========================
 

scim2_models/resources/resource.py

@@ -411,7 +411,6 @@ def _model_to_schema(model: type[BaseModel]) -> "Schema":
         _model_attribute_to_scim_attribute(model, attribute_name)
         for attribute_name in field_infos
         if attribute_name != "schemas"
-        and model.get_field_root_type(attribute_name) is not type(None)
     ]
     schema = Schema(
         name=model.__name__,

tests/test_schema.py

@@ -1,18 +1,11 @@
-from typing import Annotated
-from typing import Optional
-
 import pytest
 from pydantic import ValidationError
 
 from scim2_models import Attribute
-from scim2_models import CaseExact
 from scim2_models import Mutability
-from scim2_models import Required
 from scim2_models import Returned
 from scim2_models import Schema
 from scim2_models import Uniqueness
-from scim2_models.resources.resource import Resource
-from scim2_models.resources.resource import _model_to_schema
 
 
 def test_group_schema(load_sample):
@@ -130,50 +123,3 @@ def test_get_attribute_attribute(load_sample):
 
     attribute["value"].mutability = Mutability.read_write
     assert attribute.sub_attributes[0].mutability == Mutability.read_write
-
-
-def test_model_to_schema_excludes_none_type_attributes():
-    """Test that _model_to_schema excludes attributes with None type from schema."""
-
-    class TestResource(Resource):
-        schemas: list[str] = ["urn:test:schema"]
-        valid_attr: Optional[str] = None
-        none_attr: None = None
-
-    schema = TestResource.to_schema()
-
-    assert schema.id == "urn:test:schema"
-    assert schema.name == "TestResource"
-
-    attribute_names = [attr.name for attr in schema.attributes]
-
-    assert "validAttr" in attribute_names
-    assert "noneAttr" not in attribute_names
-
-
-def test_external_id_redefined_in_subclass_is_exported():
-    class CustomResource(Resource):
-        schemas: list[str] = ["urn:custom:schema"]
-
-        external_id: Annotated[
-            Optional[str],
-            Mutability.immutable,
-            Returned.always,
-            Required.true,
-            CaseExact.false,
-        ] = None
-
-    schema = CustomResource.to_schema()
-
-    attribute_names = [attr.name for attr in schema.attributes]
-    assert "externalId" in attribute_names
-
-
-def test_external_id_not_exported_when_not_redefined():
-    class SimpleResource(Resource):
-        schemas: list[str] = ["urn:simple:schema"]
-
-    schema = _model_to_schema(SimpleResource)
-
-    attribute_names = [attr.name for attr in schema.attributes]
-    assert "externalId" not in attribute_names