Fix typing

Author: awtkns

fastapi_crudrouter/core/gino_starlette.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, List, Optional, Type, Union
+from typing import Any, Callable, List, Optional, Type, Union, Coroutine
 
 from fastapi import HTTPException
 
@@ -18,6 +18,9 @@
 else:
     gino_installed = True
 
+CALLABLE_SINGLE = Callable[..., Coroutine[Any, Any, Model]]
+CALLABLE_LIST = Callable[..., Coroutine[Any, Any, List[Model]]]
+
 
 class GinoCRUDRouter(CRUDGenerator[SCHEMA]):
     def __init__(
@@ -61,7 +64,7 @@ def __init__(
             **kwargs
         )
 
-    def _get_all(self, *args: Any, **kwargs: Any) -> Callable[..., List[Model]]:
+    def _get_all(self, *args: Any, **kwargs: Any) -> CALLABLE_LIST:
         async def route(
             pagination: PAGINATION = self.pagination,
         ) -> List[Model]:
@@ -74,8 +77,8 @@ async def route(
 
         return route
 
-    def _get_one(self, *args: Any, **kwargs: Any) -> Callable[..., Model]:
-        async def route(item_id: self._pk_type) -> Model:
+    def _get_one(self, *args: Any, **kwargs: Any) -> CALLABLE_SINGLE:
+        async def route(item_id: self._pk_type) -> Model:  # type: ignore
             model: Model = await self.db_model.get(item_id)
 
             if model:
@@ -85,7 +88,7 @@ async def route(item_id: self._pk_type) -> Model:
 
         return route
 
-    def _create(self, *args: Any, **kwargs: Any) -> Callable[..., Model]:
+    def _create(self, *args: Any, **kwargs: Any) -> CALLABLE_SINGLE:
         async def route(
             model: self.create_schema,  # type: ignore
         ) -> Model:
@@ -98,7 +101,7 @@ async def route(
 
         return route
 
-    def _update(self, *args: Any, **kwargs: Any) -> Callable[..., Model]:
+    def _update(self, *args: Any, **kwargs: Any) -> CALLABLE_SINGLE:
         async def route(
             item_id: self._pk_type,  # type: ignore
             model: self.update_schema,  # type: ignore
@@ -115,14 +118,14 @@ async def route(
 
         return route
 
-    def _delete_all(self, *args: Any, **kwargs: Any) -> Callable[..., List[Model]]:
+    def _delete_all(self, *args: Any, **kwargs: Any) -> CALLABLE_LIST:
         async def route() -> List[Model]:
             await self.db_model.delete.gino.status()
             return await self._get_all()(pagination={"skip": 0, "limit": None})
 
         return route
 
-    def _delete_one(self, *args: Any, **kwargs: Any) -> Callable[..., Model]:
+    def _delete_one(self, *args: Any, **kwargs: Any) -> CALLABLE_SINGLE:
         async def route(item_id: self._pk_type) -> Model:  # type: ignore
             db_model: Model = await self._get_one()(item_id)
             await db_model.delete()

setup.cfg

@@ -1,7 +1,7 @@
 [flake8]
 max-line-length = 88
 select = C,E,F,W,B,B9
-ignore = B008, E203, W503, CFQ001, CFQ002
+ignore = B008, E203, W503, CFQ001, CFQ002, ECE001
 import-order-style = pycharm
 
 [mypy]

tests/implementations/gino_.py

@@ -12,7 +12,7 @@
     CustomPotato,
     Potato,
     PotatoType,
-    config
+    config,
 )