restore typing in tests and docs, remove unused metaclass code

ormar/__init__.py

@@ -18,6 +18,7 @@ from ormar.fields import (  # noqa: I100
     UniqueColumns,
 )
 from ormar.models import Model
+from ormar.models.metaclass import ModelMeta
 from ormar.queryset import QuerySet
 from ormar.relations import RelationType
 
@@ -56,4 +57,5 @@ __all__ = [
     "UniqueColumns",
     "QuerySetProtocol",
     "RelationProtocol",
+    "ModelMeta",
 ]

ormar/fields/model_fields.py

@@ -1,7 +1,7 @@
 import datetime
 import decimal
 import uuid
-from typing import Any, Optional, Type
+from typing import Any, Optional, TYPE_CHECKING, Type
 
 import pydantic
 import sqlalchemy
@@ -178,12 +178,20 @@ class Float(ModelFieldFactory, float):
         return sqlalchemy.Float()
 
 
-class Boolean(ModelFieldFactory, int):
-    _type = bool
+if TYPE_CHECKING:  # pragma: nocover
 
-    @classmethod
-    def get_column_type(cls, **kwargs: Any) -> Any:
-        return sqlalchemy.Boolean()
+    def Boolean(**kwargs: Any) -> bool:
+        pass
+
+
+else:
+
+    class Boolean(ModelFieldFactory, int):
+        _type = bool
+
+        @classmethod
+        def get_column_type(cls, **kwargs: Any) -> Any:
+            return sqlalchemy.Boolean()
 
 
 class DateTime(ModelFieldFactory, datetime.datetime):

ormar/models/metaclass.py

@@ -1,4 +1,5 @@
 import logging
+import warnings
 from typing import Any, Dict, List, Optional, TYPE_CHECKING, Tuple, Type, Union
 
 import databases
@@ -192,20 +193,6 @@ def populate_default_pydantic_field_value(
     return attrs
 
 
-def check_if_field_annotation_or_value_is_ormar(
-    field: Any, field_name: str, attrs: Dict
-) -> bool:
-    return lenient_issubclass(field, BaseField) or issubclass(
-        attrs.get(field_name, type), BaseField
-    )
-
-
-def extract_field_from_annotation_or_value(
-    field: Any, field_name: str, attrs: Dict
-) -> Type[ormar.fields.BaseField]:
-    return field if lenient_issubclass(field, BaseField) else attrs.get(field_name)
-
-
 def populate_pydantic_default_values(attrs: Dict) -> Tuple[Dict, Dict]:
     model_fields = {}
     potential_fields = {
@@ -213,22 +200,22 @@ def populate_pydantic_default_values(attrs: Dict) -> Tuple[Dict, Dict]:
         for k, v in attrs["__annotations__"].items()
         if lenient_issubclass(v, BaseField)
     }
+    if potential_fields:
+        warnings.warn(
+            "Using ormar.Fields as type Model annotation has been deprecated,"
+            " check documentation of current version",
+            DeprecationWarning,
+        )
+
     potential_fields.update(
         {k: v for k, v in attrs.items() if lenient_issubclass(v, BaseField)}
     )
     for field_name, field in potential_fields.items():
-        # ormar fields can be used as annotation or as default value
-        if check_if_field_annotation_or_value_is_ormar(field, field_name, attrs):
-            ormar_field = extract_field_from_annotation_or_value(
-                field, field_name, attrs
-            )
-            if ormar_field.name is None:
-                ormar_field.name = field_name
-            attrs = populate_default_pydantic_field_value(
-                ormar_field, field_name, attrs
-            )
-            model_fields[field_name] = ormar_field
-            attrs["__annotations__"][field_name] = ormar_field.__type__
+        if field.name is None:
+            field.name = field_name
+        attrs = populate_default_pydantic_field_value(field, field_name, attrs)
+        model_fields[field_name] = field
+        attrs["__annotations__"][field_name] = field.__type__
     return attrs, model_fields