Merge pull request #23 from febus982/fix_model_validation

Use class to validate if the model is handled by SQLAlchemy

Author: febus982

sqlalchemy_bind_manager/_repository/async_.py

@@ -101,7 +101,7 @@ async def delete(
         :type entity: Union[MODEL, PRIMARY_KEY]
         """
         # TODO: delete without loading the model
-        obj = entity if self._is_mapped_object(entity) else await self.get(entity)  # type: ignore
+        obj = entity if isinstance(entity, self._model) else await self.get(entity)  # type: ignore
         async with self._get_session() as session:
             await session.delete(obj)
 

sqlalchemy_bind_manager/_repository/common.py

@@ -17,8 +17,8 @@
 
 from pydantic.generics import GenericModel
 from sqlalchemy import asc, desc, select, func
-from sqlalchemy.orm import object_mapper, class_mapper, Mapper, lazyload
-from sqlalchemy.orm.exc import UnmappedInstanceError
+from sqlalchemy.orm import class_mapper, Mapper, lazyload
+from sqlalchemy.orm.exc import UnmappedClassError
 from sqlalchemy.sql import Select
 
 from sqlalchemy_bind_manager.exceptions import InvalidModel, UnmappedProperty
@@ -48,31 +48,25 @@ def __init__(self, model_class: Union[Type[MODEL], None] = None) -> None:
         if getattr(self, "_model", None) is None and model_class is not None:
             self._model = model_class
 
-        if getattr(self, "_model", None) is None or not self._is_mapped_object(
-            self._model()
+        if getattr(self, "_model", None) is None or not self._is_mapped_class(
+            self._model
         ):
             raise InvalidModel(
                 "You need to supply a valid model class either in the `model_class` parameter"
                 " or in the `_model` class property."
             )
 
-    def _is_mapped_object(self, obj: object) -> bool:
-        """Checks if the object is handled by the repository and is mapped in SQLAlchemy.
+    def _is_mapped_class(self, class_: Type[MODEL]) -> bool:
+        """Checks if the class is mapped in SQLAlchemy.
 
-        :param obj: a mapped object instance
-        :return: True if the object is mapped and matches self._model type, False if it's not a mapped object
+        :param class_: the model class
+        :return: True if the Type is mapped, False otherwise
         :rtype: bool
-        :raises InvalidModel: when the object is mapped but doesn't match self._model type
         """
-        # TODO: This is probably redundant, we could do these checks once in __init__
         try:
-            object_mapper(obj)
-            if isinstance(obj, self._model):
-                return True
-            raise InvalidModel(
-                f"This repository can handle only `{self._model}` models. `{type(obj)}` has been passed."
-            )
-        except UnmappedInstanceError:
+            class_mapper(class_)
+            return True
+        except UnmappedClassError:
             return False
 
     def _validate_mapped_property(self, property_name: str) -> None:

sqlalchemy_bind_manager/_repository/sync.py

@@ -96,7 +96,7 @@ def delete(self, entity: Union[MODEL, PRIMARY_KEY]) -> None:
         :type entity: Union[MODEL, PRIMARY_KEY]
         """
         # TODO: delete without loading the model
-        obj = entity if self._is_mapped_object(entity) else self.get(entity)  # type: ignore
+        obj = entity if isinstance(entity, self._model) else self.get(entity)  # type: ignore
         with self._get_session() as session:
             session.delete(obj)