switch from class to instance fro fields

ormar/relations/alias_manager.py

@@ -151,7 +151,7 @@ class AliasManager:
         self,
         source_model: Union[Type["Model"], Type["ModelRow"]],
         relation_str: str,
-        relation_field: Type["ForeignKeyField"],
+        relation_field: "ForeignKeyField",
     ) -> str:
         """
         Given source model and relation string returns the alias for this complex
@@ -159,7 +159,7 @@ class AliasManager:
         field definition.
 
         :param relation_field: field with direct relation definition
-        :type relation_field: Type["ForeignKeyField"]
+        :type relation_field: "ForeignKeyField"
         :param source_model: model with query starts
         :type source_model: source Model
         :param relation_str: string with relation joins defined

ormar/relations/relation_manager.py

@@ -16,7 +16,7 @@ class RelationsManager:
 
     def __init__(
         self,
-        related_fields: List[Type["ForeignKeyField"]] = None,
+        related_fields: List["ForeignKeyField"] = None,
         owner: Optional["Model"] = None,
     ) -> None:
         self.owner = proxy(owner)
@@ -57,7 +57,7 @@ class RelationsManager:
         return None  # pragma nocover
 
     @staticmethod
-    def add(parent: "Model", child: "Model", field: Type["ForeignKeyField"],) -> None:
+    def add(parent: "Model", child: "Model", field: "ForeignKeyField",) -> None:
         """
         Adds relation on both sides -> meaning on both child and parent models.
         One side of the relation is always weakref proxy to avoid circular refs.
@@ -138,12 +138,12 @@ class RelationsManager:
             return relation
         return None
 
-    def _get_relation_type(self, field: Type["BaseField"]) -> RelationType:
+    def _get_relation_type(self, field: "BaseField") -> RelationType:
         """
         Returns type of the relation declared on a field.
 
         :param field: field with relation declaration
-        :type field: Type[BaseField]
+        :type field: BaseField
         :return: type of the relation defined on field
         :rtype: RelationType
         """
@@ -153,13 +153,13 @@ class RelationsManager:
             return RelationType.THROUGH
         return RelationType.PRIMARY if not field.virtual else RelationType.REVERSE
 
-    def _add_relation(self, field: Type["BaseField"]) -> None:
+    def _add_relation(self, field: "BaseField") -> None:
         """
         Registers relation in the manager.
         Adds Relation instance under field.name.
 
         :param field: field with relation declaration
-        :type field: Type[BaseField]
+        :type field: BaseField
         """
         self._relations[field.name] = Relation(
             manager=self,

ormar/relations/utils.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Tuple, Type
+from typing import TYPE_CHECKING, Tuple
 from weakref import proxy
 
 from ormar.fields.foreign_key import ForeignKeyField
@@ -8,7 +8,7 @@ if TYPE_CHECKING:  # pragma no cover
 
 
 def get_relations_sides_and_names(
-    to_field: Type[ForeignKeyField], parent: "Model", child: "Model",
+    to_field: ForeignKeyField, parent: "Model", child: "Model",
 ) -> Tuple["Model", "Model", str, str]:
     """
     Determines the names of child and parent relations names, as well as