Enhance ModelSchemaMetaclass to accept additional kwargs in __new__ method and add test for schema with generic mixin class

Author: Izcarmt95

ninja_schema/orm/model_schema.py

@@ -320,11 +320,12 @@ def __new__(
         name: str,
         bases: tuple,
         namespace: dict,
+        **kwargs: Any,
     ):
         if bases == (SchemaBaseModel,) or not namespace.get(
             "Config", namespace.get("model_config")
         ):
-            return super().__new__(mcs, name, bases, namespace)
+            return super().__new__(mcs, name, bases, namespace, **kwargs)
 
         config = namespace.get("Config")
         if not config:
@@ -407,16 +408,20 @@ def __new__(
 
                 field_values[field_name] = (python_type, pydantic_field)
             if IS_PYDANTIC_V1:
-                cls = super().__new__(mcs, name, bases, namespace)
+                cls = super().__new__(mcs, name, bases, namespace, **kwargs)
                 return update_class_missing_fields(
                     cls,
                     list(bases),
                     compute_field_annotations(namespace, **field_values),
                 )
             return super().__new__(
-                mcs, name, bases, compute_field_annotations(namespace, **field_values)
+                mcs,
+                name,
+                bases,
+                compute_field_annotations(namespace, **field_values),
+                **kwargs,
             )
-        return super().__new__(mcs, name, bases, namespace)
+        return super().__new__(mcs, name, bases, namespace, **kwargs)
 
 
 class SchemaBaseModel(SchemaMixins, BaseModel):

tests/test_v2_pydantic/test_model_schema.py

@@ -514,3 +514,47 @@ def validate_title(cls, value):
 
         event = EventWithNewModelConfig(start_date="2021-06-12", title="PyConf 2021")
         assert "value cleaned" in event.title
+
+    @pytest.mark.django_db
+    @pytest.mark.skipif(IS_PYDANTIC_V1, reason="requires pydantic == 2.1.x")
+    def test_schema_with_mixin_generic_class(self):
+        """
+        Test that a schema with a generic mixin class works correctly.
+        """
+
+        import datetime
+        import typing as t
+
+        from django.db.models import Model as DjangoModel
+
+        T = t.TypeVar("T", bound=DjangoModel)
+
+        class GenericMixin(t.Generic[T]):
+            def save(self, instance: T | None = None) -> T:
+                """
+                Save the model instance and return it.
+                """
+                if instance:
+                    self.apply_to_model(instance, **self.dict())
+                    instance.save()
+                    return instance
+
+                instance = self.Config.model(**self.dict())
+                instance.save()
+                return instance
+        class BaseModelSchema(ModelSchema, GenericMixin[T]):
+            ...
+        class EventGenericSchema(BaseModelSchema[Event]):
+            class Config:
+                model = Event
+                include = (
+                    "title",
+                )
+
+        event = EventGenericSchema(title="PyConf 2021")
+        assert event.title == "PyConf 2021"
+
+        instance_event = event.save()
+        assert isinstance(instance_event, Event)
+        assert instance_event.title == "PyConf 2021"
+