move view handlers to view class

Author: mahenzon

fastapi_jsonapi/views/detail_view.py

@@ -1,13 +1,15 @@
 import logging
-from typing import TypeVar, Union
+from typing import TYPE_CHECKING, TypeVar, Union
 
 from fastapi_jsonapi import BadRequest
 from fastapi_jsonapi.schema import (
     BaseJSONAPIItemInSchema,
     JSONAPIResultDetailSchema,
 )
 from fastapi_jsonapi.views.view_base import ViewBase
-from fastapi_jsonapi.views.view_handlers import handle_endpoint_dependencies
+
+if TYPE_CHECKING:
+    from fastapi_jsonapi.data_layers.base import BaseDataLayer
 
 logger = logging.getLogger(__name__)
 
@@ -21,8 +23,7 @@ async def handle_get_resource_detail(
         object_id: Union[int, str],
         **extra_view_deps,
     ):
-        dl_kwargs = await handle_endpoint_dependencies(self, extra_view_deps)
-        dl = self._get_data_layer_for_detail(**dl_kwargs)
+        dl: "BaseDataLayer" = await self._get_data_layer_for_detail(extra_view_deps)
 
         view_kwargs = {dl.url_id_field: object_id}
         db_object = await dl.get_object(view_kwargs=view_kwargs, qs=self.query_params)
@@ -40,8 +41,7 @@ async def handle_update_resource(
                 detail="obj_id and data.id should be same",
                 pointer="/data/id",
             )
-        dl_kwargs = await handle_endpoint_dependencies(self, extra_view_deps)
-        dl = self._get_data_layer_for_detail(**dl_kwargs)
+        dl: "BaseDataLayer" = await self._get_data_layer_for_detail(extra_view_deps)
 
         view_kwargs = {dl.url_id_field: obj_id}
         db_object = await dl.get_object(view_kwargs=view_kwargs, qs=self.query_params)
@@ -55,8 +55,7 @@ async def handle_delete_resource(
         obj_id: str,
         **extra_view_deps,
     ):
-        dl_kwargs = await handle_endpoint_dependencies(self, extra_view_deps)
-        dl = self._get_data_layer_for_detail(**dl_kwargs)
+        dl: "BaseDataLayer" = await self._get_data_layer_for_detail(extra_view_deps)
 
         view_kwargs = {dl.url_id_field: obj_id}
         db_object = await dl.get_object(view_kwargs=view_kwargs, qs=self.query_params)

fastapi_jsonapi/views/list_view.py

@@ -1,12 +1,15 @@
 import logging
+from typing import TYPE_CHECKING
 
 from fastapi_jsonapi.schema import (
     BaseJSONAPIDataInSchema,
     JSONAPIResultDetailSchema,
     JSONAPIResultListSchema,
 )
 from fastapi_jsonapi.views.view_base import ViewBase
-from fastapi_jsonapi.views.view_handlers import handle_endpoint_dependencies
+
+if TYPE_CHECKING:
+    from fastapi_jsonapi.data_layers.base import BaseDataLayer
 
 logger = logging.getLogger(__name__)
 
@@ -26,8 +29,7 @@ def _calculate_total_pages(self, db_items_count: int) -> int:
         return total_pages
 
     async def handle_get_resource_list(self, **extra_view_deps) -> JSONAPIResultListSchema:
-        dl_kwargs = await handle_endpoint_dependencies(self, extra_view_deps)
-        dl = self._get_data_layer_for_list(**dl_kwargs)
+        dl: "BaseDataLayer" = await self._get_data_layer_for_list(extra_view_deps)
         query_params = self.query_params
         count, items_from_db = await dl.get_collection(qs=query_params)
         total_pages = self._calculate_total_pages(count)
@@ -39,8 +41,7 @@ async def handle_post_resource_list(
         data_create: BaseJSONAPIDataInSchema,
         **extra_view_deps,
     ) -> JSONAPIResultDetailSchema:
-        dl_kwargs = await handle_endpoint_dependencies(self, extra_view_deps)
-        dl = self._get_data_layer_for_list(**dl_kwargs)
+        dl: "BaseDataLayer" = await self._get_data_layer_for_list(extra_view_deps)
         created_object = await dl.create_object(data_create=data_create.data, view_kwargs={})
         created_object_id = getattr(created_object, dl.get_object_id_field_name())
 
@@ -50,8 +51,7 @@ async def handle_post_resource_list(
         return self._build_detail_response(db_object)
 
     async def handle_delete_resource_list(self, **extra_view_deps) -> JSONAPIResultListSchema:
-        dl_kwargs = await handle_endpoint_dependencies(self, extra_view_deps)
-        dl = self._get_data_layer_for_list(**dl_kwargs)
+        dl: "BaseDataLayer" = await self._get_data_layer_for_list(extra_view_deps)
         query_params = self.query_params
         count, items_from_db = await dl.get_collection(qs=query_params)
         total_pages = self._calculate_total_pages(count)

fastapi_jsonapi/views/view_base.py

@@ -1,7 +1,10 @@
+import inspect
 import logging
 from contextvars import ContextVar
+from functools import partial
 from typing import (
     Any,
+    Callable,
     Dict,
     Iterable,
     List,
@@ -12,7 +15,9 @@
 )
 
 from fastapi import Request
+from pydantic import BaseModel as PydanticBaseModel
 from pydantic.fields import ModelField
+from starlette.concurrency import run_in_threadpool
 
 from fastapi_jsonapi import QueryStringManager, RoutersJSONAPI
 from fastapi_jsonapi.data_layers.base import BaseDataLayer
@@ -64,26 +69,84 @@ def _get_data_layer(self, schema: Type[BaseModel], **dl_kwargs):
             **dl_kwargs,
         )
 
-    def _get_data_layer_for_detail(self, **kwargs: Any) -> BaseDataLayer:
+    async def _get_data_layer_for_detail(
+        self,
+        extra_view_deps: Dict[str, Any],
+    ) -> BaseDataLayer:
         """
-        :param kwargs: Any extra kwargs for the data layer
+        :param extra_view_deps:
         :return:
         """
+        dl_kwargs = await self.handle_endpoint_dependencies(extra_view_deps)
         return self._get_data_layer(
             schema=self.jsonapi.schema_detail,
-            **kwargs,
+            **dl_kwargs,
         )
 
-    def _get_data_layer_for_list(self, **kwargs: Any) -> BaseDataLayer:
+    async def _get_data_layer_for_list(
+        self,
+        extra_view_deps: Dict[str, Any],
+    ) -> BaseDataLayer:
         """
-        :param kwargs: Any extra kwargs for the data layer
+        :param extra_view_deps:
         :return:
         """
+        dl_kwargs = await self.handle_endpoint_dependencies(extra_view_deps)
         return self._get_data_layer(
             schema=self.jsonapi.schema_list,
-            **kwargs,
+            **dl_kwargs,
         )
 
+    async def _run_handler(
+        self,
+        handler: Callable,
+        dto: Optional[BaseModel] = None,
+    ):
+        handler = partial(handler, self, dto) if dto is not None else partial(handler, self)
+
+        if inspect.iscoroutinefunction(handler):
+            return await handler()
+
+        return await run_in_threadpool(handler)
+
+    async def _handle_config(
+        self,
+        method_config: HTTPMethodConfig,
+        extra_view_deps: Dict[str, Any],
+    ) -> Dict[str, Any]:
+        if method_config.handler is None:
+            return {}
+
+        if method_config.dependencies:
+            dto_class: Type[PydanticBaseModel] = method_config.dependencies
+            dto = dto_class(**extra_view_deps)
+            dl_kwargs = await self._run_handler(method_config.handler, dto)
+
+            return dl_kwargs
+
+        dl_kwargs = await self._run_handler(method_config.handler)
+
+        return dl_kwargs
+
+    async def handle_endpoint_dependencies(
+        self,
+        extra_view_deps: Dict[str, Any],
+    ) -> Dict:
+        """
+        :return dict: this is **kwargs for DataLayer.__init___
+        """
+        dl_kwargs = {}
+        if common_method_config := self.method_dependencies.get(HTTPMethod.ALL):
+            dl_kwargs.update(await self._handle_config(common_method_config, extra_view_deps))
+
+        if self.request.method not in HTTPMethod.names():
+            return dl_kwargs
+
+        if method_config := self.method_dependencies.get(HTTPMethod[self.request.method]):
+            dl_kwargs.update(await self._handle_config(method_config, extra_view_deps))
+
+        return dl_kwargs
+
     def _build_response(self, items_from_db: List[TypeModel], item_schema: Type[BaseModel]):
         return self.process_includes_for_db_items(
             includes=self.query_params.include,