fixed typing issue

Author: eadwinCode

README.md

@@ -63,7 +63,6 @@ class CreateUserSchema(ModelSchema):
 ##  `from_orm(cls, obj: Any)`
 You can generate a schema instance from your django model instance
 ```Python
-from typings import Optional
 from django.contrib.auth import get_user_model
 from ninja_schema import ModelSchema, model_validator
 
@@ -90,15 +89,14 @@ print(schema.json(indent=2)
 }
 ```
 
-## `apply(self, model_instance, **kwargs)`
+## `apply_to_model(self, model_instance, **kwargs)`
 You can transfer data from your ModelSchema to Django Model instance using the `apply` function.
-The `apply` function uses Pydantic model `.dict` function, `dict` function filtering that can be passed as `kwargs` to the `.apply` function.
+The `apply_to_model` function uses Pydantic model `.dict` function, `dict` function filtering that can be passed as `kwargs` to the `.apply` function.
 
 For more info, visit [Pydantic model export](https://pydantic-docs.helpmanual.io/usage/exporting_models/)
 ```Python
-from typings import Optional
 from django.contrib.auth import get_user_model
-from ninja_schema import ModelSchema, model_validator
+from ninja_schema import ModelSchema
 
 UserModel = get_user_model()
 new_user = UserModel.objects.create_user(username='eadwin', email='[email protected]', password='password')
@@ -111,7 +109,7 @@ class UpdateUserSchema(ModelSchema):
         optional = ['username']  # `username` is now optional
 
 schema = UpdateUserSchema(first_name='Emeka', last_name='Okoro')
-schema.apply(new_user, exclude_none=True)
+schema.apply_to_model(new_user, exclude_none=True)
 
 assert new_user.first_name == 'Emeka' # True
 assert new_user.username == 'eadwin' # True
@@ -269,4 +267,3 @@ print(UserSchema.schema())
     }
 }
 ```
-

ninja_schema/orm/schema_registry.py

@@ -31,11 +31,11 @@ def register_model(self, model: Type[Model], schema: Type["ModelSchema"]) -> Non
         from ninja_schema.orm.model_schema import ModelSchema
 
         assert is_valid_class(schema) and issubclass(schema, (ModelSchema,)), (
-            "Only Schema can be" 'registered, received "{}"'.format(schema.__name__)
+            'Only Schema can beregistered, received "{}"'.format(schema.__name__)
+        )
+        assert is_valid_django_model(model), (
+            "Only Django Models are allowed. {}".format(model.__name__)
         )
-        assert is_valid_django_model(
-            model
-        ), "Only Django Models are allowed. {}".format(model.__name__)
         # TODO: register model as module_name.model_name
         self.register_schema(model, schema)
 

ninja_schema/orm/utils/converter.py

@@ -39,9 +39,9 @@
 
 def assert_valid_name(name: str) -> None:
     """Helper to assert that provided names are valid."""
-    assert COMPILED_NAME_PATTERN.match(
-        name
-    ), 'Names must match /{}/ but "{}" does not.'.format(NAME_PATTERN, name)
+    assert COMPILED_NAME_PATTERN.match(name), (
+        'Names must match /{}/ but "{}" does not.'.format(NAME_PATTERN, name)
+    )
 
 
 def convert_choice_name(name: str) -> str:

tests/test_v1_pydantic/test_custom_fields.py

@@ -33,7 +33,7 @@ class Config:
                     "title": "SemesterEnum",
                     "description": "An enumeration.",
                     "enum": ["1", "2", "3"],
-                    "type": "string"
+                    "type": "string",
                 }
             },
         }

tests/test_v2_pydantic/test_model_schema.py

@@ -1,13 +1,17 @@
 import json
+import typing as t
 
 import pydantic
 import pytest
+from django.db.models import Model as DjangoModel
 
 from ninja_schema import ModelSchema, SchemaFactory, model_validator
 from ninja_schema.errors import ConfigError
 from ninja_schema.pydanticutils import IS_PYDANTIC_V1
 from tests.models import Event
 
+T = t.TypeVar("T", bound=DjangoModel)
+
 
 class TestModelSchema:
     @pytest.mark.skipif(IS_PYDANTIC_V1, reason="requires pydantic == 2.1.x")
@@ -522,15 +526,8 @@ 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:
+            def save(self, instance: t.Optional[T] = None) -> T:
                 """
                 Save the model instance and return it.
                 """
@@ -542,19 +539,17 @@ def save(self, instance: T | None = None) -> T:
                 instance = self.Config.model(**self.dict())
                 instance.save()
                 return instance
-        class BaseModelSchema(ModelSchema, GenericMixin[T]):
-            ...
+
+        class BaseModelSchema(ModelSchema, GenericMixin[T]): ...
+
         class EventGenericSchema(BaseModelSchema[Event]):
             class Config:
                 model = Event
-                include = (
-                    "title",
-                )
+                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"
-