fix: additional type fixes

Author: azmeuk

pyproject.toml

@@ -110,6 +110,10 @@ plugins = [
   "pydantic.mypy"
 ]
 warn_unused_ignores = true
+exclude = [
+  "tests/",
+  "conftest.py",
+]
 
 [tool.pydantic-mypy]
 init_forbid_extra = true

scim2_models/base.py

@@ -161,27 +161,30 @@ def normalize_value(value: Any) -> Any:
             return value
 
         normalized_value = normalize_value(value)
-        return handler(normalized_value)
+        obj = handler(normalized_value)
+        assert isinstance(obj, cls)
+        return obj
 
     @model_validator(mode="wrap")
     @classmethod
     def check_response_attributes_returnability(
         cls, value: Any, handler: ValidatorFunctionWrapHandler, info: ValidationInfo
     ) -> Self:
         """Check that the fields returnability is expected according to the responses validation context, as defined in :rfc:`RFC7643 §7 <7653#section-7>`."""
-        value = handler(value)
+        obj = handler(value)
+        assert isinstance(obj, cls)
 
         if (
             not info.context
             or not info.context.get("scim")
             or not Context.is_response(info.context["scim"])
         ):
-            return value
+            return obj
 
         for field_name in cls.model_fields:
             returnability = cls.get_field_annotation(field_name, Returned)
 
-            if returnability == Returned.always and getattr(value, field_name) is None:
+            if returnability == Returned.always and getattr(obj, field_name) is None:
                 raise PydanticCustomError(
                     "returned_error",
                     "Field '{field_name}' has returnability 'always' but value is missing or null",
@@ -190,10 +193,7 @@ def check_response_attributes_returnability(
                     },
                 )
 
-            if (
-                returnability == Returned.never
-                and getattr(value, field_name) is not None
-            ):
+            if returnability == Returned.never and getattr(obj, field_name) is not None:
                 raise PydanticCustomError(
                     "returned_error",
                     "Field '{field_name}' has returnability 'never' but value is set",
@@ -202,15 +202,16 @@ def check_response_attributes_returnability(
                     },
                 )
 
-        return value
+        return obj
 
     @model_validator(mode="wrap")
     @classmethod
     def check_response_attributes_necessity(
         cls, value: Any, handler: ValidatorFunctionWrapHandler, info: ValidationInfo
     ) -> Self:
         """Check that the required attributes are present in creations and replacement requests."""
-        value = handler(value)
+        obj = handler(value)
+        assert isinstance(obj, cls)
 
         if (
             not info.context
@@ -221,12 +222,12 @@ def check_response_attributes_necessity(
                 Context.RESOURCE_REPLACEMENT_REQUEST,
             )
         ):
-            return value
+            return obj
 
         for field_name in cls.model_fields:
             necessity = cls.get_field_annotation(field_name, Required)
 
-            if necessity == Required.true and getattr(value, field_name) is None:
+            if necessity == Required.true and getattr(obj, field_name) is None:
                 raise PydanticCustomError(
                     "required_error",
                     "Field '{field_name}' is required but value is missing or null",
@@ -235,7 +236,7 @@ def check_response_attributes_necessity(
                     },
                 )
 
-        return value
+        return obj
 
     @model_validator(mode="wrap")
     @classmethod
@@ -245,7 +246,8 @@ def check_replacement_request_mutability(
         """Check if 'immutable' attributes have been mutated in replacement requests."""
         from scim2_models.rfc7643.resource import Resource
 
-        value = handler(value)
+        obj = handler(value)
+        assert isinstance(obj, cls)
 
         context = info.context.get("scim") if info.context else None
         original = info.context.get("original") if info.context else None
@@ -254,8 +256,8 @@ def check_replacement_request_mutability(
             and issubclass(cls, Resource)
             and original is not None
         ):
-            cls.check_mutability_issues(original, value)
-        return value
+            cls.check_mutability_issues(original, obj)
+        return obj
 
     @classmethod
     def check_mutability_issues(
@@ -403,7 +405,7 @@ def model_serializer_exclude_none(
     @classmethod
     def model_validate(
         cls,
-        *args,
+        *args: Any,
         scim_ctx: Optional[Context] = Context.DEFAULT,
         original: Optional["BaseModel"] = None,
         **kwargs: Any,
@@ -443,6 +445,3 @@ def get_attribute_urn(self, field_name: str) -> str:
             else f"{main_schema}:{alias}"
         )
         return full_urn
-
-
-BaseModelType: type = type(BaseModel)

scim2_models/reference.py

@@ -54,9 +54,7 @@ def __get_pydantic_core_schema__(
 
     @classmethod
     def _validate(cls, input_value: Any, /) -> str:
-        if isinstance(input_value, cls):
-            return str(input_value)
-        return input_value
+        return str(input_value)
 
     @classmethod
     def get_types(cls, type_annotation: Any) -> list[str]:
@@ -79,6 +77,6 @@ def serialize_ref_type(ref_type: Any) -> str:
             elif ref_type == ExternalReference:
                 return "external"
 
-            return get_args(ref_type)[0]
+            return str(get_args(ref_type)[0])
 
         return list(map(serialize_ref_type, types))

scim2_models/rfc7643/resource.py

@@ -6,6 +6,7 @@
 from typing import Optional
 from typing import TypeVar
 from typing import Union
+from typing import cast
 from typing import get_args
 from typing import get_origin
 
@@ -103,7 +104,7 @@ def from_schema(cls, schema: "Schema") -> type["Extension"]:
 
 AnyExtension = TypeVar("AnyExtension", bound="Extension")
 
-_PARAMETERIZED_CLASSES: dict[tuple[type, tuple], type] = {}
+_PARAMETERIZED_CLASSES: dict[tuple[type, tuple[Any, ...]], type] = {}
 
 
 def extension_serializer(
@@ -154,9 +155,11 @@ def __class_getitem__(cls, item: Any) -> type["Resource"]:
 
         extensions = get_args(item) if get_origin(item) in UNION_TYPES else [item]
 
-        # Skip TypeVar parameters (used for generic class definitions)
+        # Skip TypeVar parameters and Any (used for generic class definitions)
         valid_extensions = [
-            extension for extension in extensions if not isinstance(extension, TypeVar)
+            extension
+            for extension in extensions
+            if not isinstance(extension, TypeVar) and extension is not Any
         ]
 
         if not valid_extensions:
@@ -209,9 +212,9 @@ def __getitem__(self, item: Any) -> Optional[Extension]:
         if not isinstance(item, type) or not issubclass(item, Extension):
             raise KeyError(f"{item} is not a valid extension type")
 
-        return getattr(self, item.__name__)
+        return cast(Optional[Extension], getattr(self, item.__name__))
 
-    def __setitem__(self, item: Any, value: "Resource") -> None:
+    def __setitem__(self, item: Any, value: "Extension") -> None:
         if not isinstance(item, type) or not issubclass(item, Extension):
             raise KeyError(f"{item} is not a valid extension type")
 
@@ -260,7 +263,9 @@ def get_by_schema(
 
     @staticmethod
     def get_by_payload(
-        resource_types: list[type["Resource"]], payload: dict, **kwargs: Any
+        resource_types: list[type["Resource"]],
+        payload: dict[str, Any],
+        **kwargs: Any,
     ) -> Optional[type]:
         """Given a resource type list and a payload, find the matching resource type."""
         if not payload or not payload.get("schemas"):
@@ -317,7 +322,7 @@ def model_dump(
         attributes: Optional[list[str]] = None,
         excluded_attributes: Optional[list[str]] = None,
         **kwargs: Any,
-    ) -> dict:
+    ) -> dict[str, Any]:
         """Create a model representation that can be included in SCIM messages by using Pydantic :code:`BaseModel.model_dump`.
 
         :param scim_ctx: If a SCIM context is passed, some default values of
@@ -366,7 +371,7 @@ def model_dump_json(
 
 def dedicated_attributes(
     model: type[BaseModel], excluded_models: list[type[BaseModel]]
-) -> dict:
+) -> dict[str, Any]:
     """Return attributes that are not members the parent 'excluded_models'."""
 
     def compare_field_infos(fi1: Any, fi2: Any) -> bool:

scim2_models/rfc7644/list_response.py

@@ -51,6 +51,7 @@ def check_results_number(
         - 'resources' must be set if 'totalResults' is non-zero.
         """
         obj = handler(value)
+        assert isinstance(obj, cls)
 
         if (
             not info.context

scim2_models/rfc7644/message.py

@@ -8,9 +8,9 @@
 
 from pydantic import Discriminator
 from pydantic import Tag
+from pydantic._internal._model_construction import ModelMetaclass
 
 from ..base import BaseModel
-from ..base import BaseModelType
 from ..scim_object import ScimObject
 from ..utils import UNION_TYPES
 
@@ -91,10 +91,12 @@ def create_tagged_resource_union(resource_union: Any) -> Any:
     return Annotated[union, discriminator]
 
 
-class GenericMessageMetaclass(BaseModelType):
+class GenericMessageMetaclass(ModelMetaclass):
     """Metaclass for SCIM generic types with discriminated unions."""
 
-    def __new__(cls, name: str, bases: tuple, attrs: dict, **kwargs: Any) -> type:
+    def __new__(
+        cls, name: str, bases: tuple[type, ...], attrs: dict[str, Any], **kwargs: Any
+    ) -> type:
         """Create class with tagged resource unions for generic parameters."""
         if kwargs.get("__pydantic_generic_metadata__") and kwargs[
             "__pydantic_generic_metadata__"

scim2_models/scim_object.py

@@ -115,7 +115,7 @@ def model_dump(
         *args: Any,
         scim_ctx: Optional[Context] = Context.DEFAULT,
         **kwargs: Any,
-    ) -> dict:
+    ) -> dict[str, Any]:
         """Create a model representation that can be included in SCIM messages by using Pydantic :code:`BaseModel.model_dump`.
 
         :param scim_ctx: If a SCIM context is passed, some default values of