fix: make_python_model typing

Author: azmeuk

scim2_models/rfc7643/resource.py

@@ -92,7 +92,7 @@ def to_schema(cls) -> "Schema":
         return model_to_schema(cls)
 
     @classmethod
-    def from_schema(cls, schema: "Schema") -> "Extension":
+    def from_schema(cls, schema: "Schema") -> type["Extension"]:
         """Build a :class:`~scim2_models.Extension` subclass from the schema definition."""
         from .schema import make_python_model
 
@@ -259,7 +259,7 @@ def to_schema(cls) -> "Schema":
         return model_to_schema(cls)
 
     @classmethod
-    def from_schema(cls, schema: "Schema") -> "Resource":
+    def from_schema(cls, schema: "Schema") -> type["Resource"]:
         """Build a :class:`scim2_models.Resource` subclass from the schema definition."""
         from .schema import make_python_model
 

scim2_models/rfc7643/schema.py

@@ -6,6 +6,7 @@
 from typing import List  # noqa : UP005,UP035
 from typing import Literal
 from typing import Optional
+from typing import TypeVar
 from typing import Union
 from typing import get_origin
 
@@ -31,9 +32,10 @@
 from ..reference import URIReference
 from ..utils import Base64Bytes
 from ..utils import normalize_attribute_name
-from .resource import Extension
 from .resource import Resource
 
+T = TypeVar("T", bound=BaseModel)
+
 
 def make_python_identifier(identifier: str) -> str:
     """Sanitize string to be a suitable Python/Pydantic class attribute name."""
@@ -46,17 +48,16 @@ def make_python_identifier(identifier: str) -> str:
 
 def make_python_model(
     obj: Union["Schema", "Attribute"],
-    base: Optional[type[BaseModel]] = None,
+    base: type[T],
     multiple: bool = False,
-) -> Union[Resource, Extension]:
+) -> type[T]:
     """Build a Python model from a Schema or an Attribute object."""
     if isinstance(obj, Attribute):
         pydantic_attributes = {
             to_snake(make_python_identifier(attr.name)): attr.to_python()
             for attr in (obj.sub_attributes or [])
             if attr.name
         }
-        base = MultiValuedComplexAttribute if multiple else ComplexAttribute
 
     else:
         pydantic_attributes = {
@@ -214,7 +215,9 @@ def to_python(self) -> Optional[tuple[Any, Field]]:
         attr_type = self.type.to_python(bool(self.multi_valued), self.reference_types)
 
         if attr_type in (ComplexAttribute, MultiValuedComplexAttribute):
-            attr_type = make_python_model(obj=self, multiple=bool(self.multi_valued))
+            attr_type = make_python_model(
+                obj=self, base=attr_type, multiple=bool(self.multi_valued)
+            )
 
         if self.multi_valued:
             attr_type = list[attr_type]  # type: ignore