finish mypy checks add reqs and linting

ormar/models/metaclass.py

@@ -293,7 +293,9 @@ def populate_choices_validators(  # noqa CCR001
 
 
 class ModelMetaclass(pydantic.main.ModelMetaclass):
-    def __new__(mcs: "ModelMetaclass", name: str, bases: Any, attrs: dict) -> "ModelMetaclass":  # type: ignore
+    def __new__(  # type: ignore
+        mcs: "ModelMetaclass", name: str, bases: Any, attrs: dict
+    ) -> "ModelMetaclass":
         attrs["Config"] = get_pydantic_base_orm_config()
         attrs["__name__"] = name
         attrs = extract_annotations_and_default_vals(attrs, bases)
@@ -312,7 +314,9 @@ class ModelMetaclass(pydantic.main.ModelMetaclass):
                 field_name = new_model.Meta.pkname
                 field = Integer(name=field_name, primary_key=True)
                 attrs["__annotations__"][field_name] = field
-                populate_default_pydantic_field_value(field, field_name, attrs)  # type: ignore
+                populate_default_pydantic_field_value(
+                    field, field_name, attrs  # type: ignore
+                )
 
             new_model = super().__new__(  # type: ignore
                 mcs, name, bases, attrs

ormar/models/model.py

@@ -1,5 +1,5 @@
 import itertools
-from typing import Any, List, Dict, Optional
+from typing import Any, Dict, List, Optional
 
 import sqlalchemy
 from databases.backends.postgres import Record
@@ -28,12 +28,12 @@ class Model(NewBaseModel):
     __abstract__ = False
 
     @classmethod
-    def from_row(
-            cls,
-            row: sqlalchemy.engine.ResultProxy,
-            select_related: List = None,
-            related_models: Any = None,
-            previous_table: str = None,
+    def from_row(  # noqa CCR001
+        cls,
+        row: sqlalchemy.engine.ResultProxy,
+        select_related: List = None,
+        related_models: Any = None,
+        previous_table: str = None,
     ) -> Optional["Model"]:
 
         item: Dict[str, Any] = {}
@@ -44,9 +44,9 @@ class Model(NewBaseModel):
 
         # breakpoint()
         if (
-                previous_table
-                and previous_table in cls.Meta.model_fields
-                and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField)
+            previous_table
+            and previous_table in cls.Meta.model_fields
+            and issubclass(cls.Meta.model_fields[previous_table], ManyToManyField)
         ):
             previous_table = cls.Meta.model_fields[
                 previous_table
@@ -57,7 +57,7 @@ class Model(NewBaseModel):
                 previous_table, cls.Meta.table.name
             )
         else:
-            table_prefix = ''
+            table_prefix = ""
         previous_table = cls.Meta.table.name
 
         item = cls.populate_nested_models_from_row(
@@ -70,11 +70,11 @@ class Model(NewBaseModel):
 
     @classmethod
     def populate_nested_models_from_row(
-            cls,
-            item: dict,
-            row: sqlalchemy.engine.ResultProxy,
-            related_models: Any,
-            previous_table: sqlalchemy.Table,
+        cls,
+        item: dict,
+        row: sqlalchemy.engine.ResultProxy,
+        related_models: Any,
+        previous_table: sqlalchemy.Table,
     ) -> dict:
         for related in related_models:
             if isinstance(related_models, dict) and related_models[related]:
@@ -93,7 +93,7 @@ class Model(NewBaseModel):
 
     @classmethod
     def extract_prefixed_table_columns(  # noqa CCR001
-            cls, item: dict, row: sqlalchemy.engine.result.ResultProxy, table_prefix: str
+        cls, item: dict, row: sqlalchemy.engine.result.ResultProxy, table_prefix: str
     ) -> dict:
         for column in cls.Meta.table.columns:
             if column.name not in item:
@@ -142,6 +142,8 @@ class Model(NewBaseModel):
         expr = self.Meta.table.select().where(self.pk_column == self.pk)
         row = await self.Meta.database.fetch_one(expr)
         if not row:  # pragma nocover
-            raise ValueError('Instance was deleted from database and cannot be refreshed')
+            raise ValueError(
+                "Instance was deleted from database and cannot be refreshed"
+            )
         self.from_dict(dict(row))
         return self

ormar/models/modelproxy.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import List, Optional, Set, TYPE_CHECKING, Type, TypeVar, Union, Dict
+from typing import Dict, List, Set, TYPE_CHECKING, Type, TypeVar, Union
 
 import ormar
 from ormar.exceptions import RelationshipInstanceError
@@ -94,7 +94,8 @@ class ModelTableProxy:
 
     @staticmethod
     def resolve_relation_name(
-        item: Union["NewBaseModel", Type["NewBaseModel"]], related: Union["NewBaseModel", Type["NewBaseModel"]]
+        item: Union["NewBaseModel", Type["NewBaseModel"]],
+        related: Union["NewBaseModel", Type["NewBaseModel"]],
     ) -> str:
         for name, field in item.Meta.model_fields.items():
             if issubclass(field, ForeignKeyField):

ormar/models/newbasemodel.py

@@ -84,7 +84,9 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
             for k, v in kwargs.items()
         }
 
-        values, fields_set, validation_error = pydantic.validate_model(self, kwargs)  # type: ignore
+        values, fields_set, validation_error = pydantic.validate_model(
+            self, kwargs  # type: ignore
+        )
         if validation_error and not pk_only:
             raise validation_error
 
@@ -218,7 +220,9 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass
         condition = (
             isinstance(value, str) if op == "loads" else not isinstance(value, str)
         )
-        operand: Callable[[Any], Any] = json.loads if op == "loads" else json.dumps
+        operand: Callable[[Any], Any] = (
+            json.loads if op == "loads" else json.dumps  # type: ignore
+        )
 
         if condition:
             try: