Merge pull request #43 from mts-ai/feature/fix_atomic_operations_method_config_resolution

fix atomic operations method config resolution

Author: mahenzon

docs/changelog.rst

@@ -1,6 +1,18 @@
 Changelog
 #########
 
+**2.2.2**
+*********
+
+Atomic Operation dependency resolution fixes
+============================================
+
+* fixed Atomic Operation dependency resolution `#43 <https://github.com/mts-ai/FastAPI-JSONAPI/pull/43>`_
+
+Authors
+"""""""
+
+* `@mahenzon`_
 
 **2.2.1**
 *********

docs/conf.py

@@ -66,7 +66,7 @@
 # The short X.Y version.
 version = "2.2"
 # The full version, including alpha/beta/rc tags.
-release = "2.2.1"
+release = "2.2.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

fastapi_jsonapi/__init__.py

@@ -8,7 +8,7 @@
 from fastapi_jsonapi.exceptions.json_api import HTTPException
 from fastapi_jsonapi.querystring import QueryStringManager
 
-__version__ = "2.2.1"
+__version__ = "2.2.2"
 
 __all__ = [
     "init",

fastapi_jsonapi/api.py

@@ -22,6 +22,7 @@
 from fastapi_jsonapi.schema_base import BaseModel
 from fastapi_jsonapi.schema_builder import SchemaBuilder
 from fastapi_jsonapi.signature import create_additional_query_params
+from fastapi_jsonapi.utils.dependency_helper import DependencyHelper
 from fastapi_jsonapi.views.utils import (
     HTTPMethod,
     HTTPMethodConfig,
@@ -408,13 +409,6 @@ def _update_method_config_and_get_dependency_params(
 
         return self._create_dependency_params_from_pydantic_model(method_config.dependencies)
 
-    def get_method_config_for_create(self):
-        method_config = self._update_method_config(
-            view=self.list_view_resource,
-            method=HTTPMethod.POST,
-        )
-        return method_config
-
     def prepare_dependencies_handler_signature(
         self,
         custom_handler: Callable[..., Any],
@@ -432,6 +426,35 @@ def prepare_dependencies_handler_signature(
 
         return sig.replace(parameters=params + list(additional_dependency_params) + tail_params)
 
+    async def handle_view_dependencies(
+        self,
+        request: Request,
+        view_cls: Type["ViewBase"],
+        method: HTTPMethod,
+    ) -> Dict[str, Any]:
+        """
+        Consider method config is already prepared for generic views
+        Reuse the same config for atomic operations
+
+        :param request:
+        :param view_cls:
+        :param method:
+        :return:
+        """
+        method_config: HTTPMethodConfig = view_cls.method_dependencies[method]
+
+        def handle_dependencies(**dep_kwargs):
+            return dep_kwargs
+
+        handle_dependencies.__signature__ = self.prepare_dependencies_handler_signature(
+            custom_handler=handle_dependencies,
+            method_config=method_config,
+        )
+
+        dep_helper = DependencyHelper(request=request)
+        dependencies_result: Dict[str, Any] = await dep_helper.run(handle_dependencies)
+        return dependencies_result
+
     def _create_get_resource_list_view(self):
         """
         Create wrapper for GET list (get objects list)

fastapi_jsonapi/atomic/atomic_handler.py

@@ -8,7 +8,6 @@
     Any,
     Awaitable,
     Callable,
-    Dict,
     List,
     Optional,
     TypedDict,
@@ -22,8 +21,6 @@
 from fastapi_jsonapi import RoutersJSONAPI
 from fastapi_jsonapi.atomic.prepared_atomic_operation import LocalIdsType, OperationBase
 from fastapi_jsonapi.atomic.schemas import AtomicOperation, AtomicOperationRequest, AtomicResultResponse
-from fastapi_jsonapi.utils.dependency_helper import DependencyHelper
-from fastapi_jsonapi.views.utils import HTTPMethodConfig
 
 if TYPE_CHECKING:
     from fastapi_jsonapi.data_layers.base import BaseDataLayer
@@ -73,23 +70,6 @@ def __init__(
         self.operations_request = operations_request
         self.local_ids_cache: LocalIdsType = defaultdict(dict)
 
-    async def handle_view_dependencies(
-        self,
-        jsonapi: RoutersJSONAPI,
-    ) -> Dict[str, Any]:
-        method_config: HTTPMethodConfig = jsonapi.get_method_config_for_create()
-
-        def handle_dependencies(**dep_kwargs):
-            return dep_kwargs
-
-        handle_dependencies.__signature__ = jsonapi.prepare_dependencies_handler_signature(
-            custom_handler=handle_dependencies,
-            method_config=method_config,
-        )
-
-        dependencies_result: Dict[str, Any] = await DependencyHelper(request=self.request).run(handle_dependencies)
-        return dependencies_result
-
     async def prepare_one_operation(self, operation: AtomicOperation):
         """
         :param operation:
@@ -102,16 +82,12 @@ async def prepare_one_operation(self, operation: AtomicOperation):
             raise ValueError(msg)
         jsonapi = RoutersJSONAPI.all_jsonapi_routers[operation_type]
 
-        dependencies_result: Dict[str, Any] = await self.handle_view_dependencies(
-            jsonapi=jsonapi,
-        )
-        one_operation = OperationBase.prepare(
+        one_operation = await OperationBase.prepare(
             action=operation.op,
             request=self.request,
             jsonapi=jsonapi,
             ref=operation.ref,
             data=operation.data,
-            data_layer_view_dependencies=dependencies_result,
         )
         return one_operation
 

fastapi_jsonapi/atomic/prepared_atomic_operation.py

@@ -7,6 +7,7 @@
 
 from fastapi_jsonapi import RoutersJSONAPI
 from fastapi_jsonapi.atomic.schemas import AtomicOperationAction, AtomicOperationRef, OperationDataType
+from fastapi_jsonapi.views.utils import HTTPMethod
 
 if TYPE_CHECKING:
     from fastapi_jsonapi.data_layers.base import BaseDataLayer
@@ -27,14 +28,13 @@ class OperationBase:
     op_type: str
 
     @classmethod
-    def prepare(
+    async def prepare(
         cls,
         action: str,
         request: Request,
         jsonapi: RoutersJSONAPI,
         ref: Optional[AtomicOperationRef],
         data: OperationDataType,
-        data_layer_view_dependencies: Dict[str, Any],
     ) -> "OperationBase":
         view_cls: Type[ViewBase] = jsonapi.detail_view_resource
 
@@ -55,6 +55,11 @@ def prepare(
 
         view = view_cls(request=request, jsonapi=jsonapi)
 
+        data_layer_view_dependencies: Dict[str, Any] = await jsonapi.handle_view_dependencies(
+            request=request,
+            view_cls=view_cls,
+            method=operation_cls.http_method,
+        )
         return operation_cls(
             jsonapi=jsonapi,
             view=view,
@@ -127,6 +132,8 @@ class DetailOperationBase(OperationBase):
 
 
 class OperationAdd(ListOperationBase):
+    http_method = HTTPMethod.POST
+
     async def handle(self, dl: BaseDataLayer):
         data_in = self.jsonapi.schema_in_post(data=self.data)
         response = await self.view.process_create_object(
@@ -137,6 +144,8 @@ async def handle(self, dl: BaseDataLayer):
 
 
 class OperationUpdate(DetailOperationBase):
+    http_method = HTTPMethod.PATCH
+
     async def handle(self, dl: BaseDataLayer):
         if self.data is None:
             # TODO: clear to-one relationships
@@ -153,6 +162,8 @@ async def handle(self, dl: BaseDataLayer):
 
 
 class OperationRemove(DetailOperationBase):
+    http_method = HTTPMethod.DELETE
+
     async def handle(
         self,
         dl: BaseDataLayer,

pyproject.toml

@@ -72,7 +72,7 @@ packages = [
 
 [tool.poetry]
 name = "fastapi-jsonapi"
-version = "2.2.1"
+version = "2.2.2"
 description = "FastAPI extension to create REST web api according to JSON:API specification"
 authors = [
     "Aleksei Nekrasov <nekrasov.aleks@mail.ru>",

tests/fixtures/app.py

@@ -1,11 +1,14 @@
 from pathlib import Path
+from typing import Type
 
 import uvicorn
 from fastapi import APIRouter, FastAPI
 from pytest import fixture  # noqa PT013
 
 from fastapi_jsonapi import RoutersJSONAPI, init
 from fastapi_jsonapi.atomic import AtomicOperations
+from fastapi_jsonapi.views.detail_view import DetailViewBase
+from fastapi_jsonapi.views.list_view import ListViewBase
 from tests.fixtures.views import (
     DetailViewBaseGeneric,
     ListViewBaseGeneric,
@@ -191,3 +194,36 @@ def app(app_plain: FastAPI):
         reload=True,
         app_dir=str(CURRENT_DIR),
     )
+
+
+def build_app_custom(
+    model,
+    schema,
+    schema_in_patch=None,
+    schema_in_post=None,
+    path: str = "/misc",
+    resource_type: str = "misc",
+    class_list: Type[ListViewBase] = ListViewBaseGeneric,
+    class_detail: Type[DetailViewBase] = DetailViewBaseGeneric,
+) -> FastAPI:
+    router: APIRouter = APIRouter()
+
+    RoutersJSONAPI(
+        router=router,
+        path=path,
+        tags=["Misc"],
+        class_list=class_list,
+        class_detail=class_detail,
+        schema=schema,
+        resource_type=resource_type,
+        schema_in_patch=schema_in_patch,
+        schema_in_post=schema_in_post,
+        model=model,
+    )
+
+    app = build_app_plain()
+    app.include_router(router, prefix="")
+
+    atomic = AtomicOperations()
+    app.include_router(atomic.router, prefix="")
+    return app

tests/fixtures/views.py

@@ -16,13 +16,15 @@
 from tests.fixtures.db_connection import async_session_dependency
 
 
-class SessionDependency(BaseModel):
-    session: AsyncSession = Depends(async_session_dependency)
-
+class ArbitraryModelBase(BaseModel):
     class Config:
         arbitrary_types_allowed = True
 
 
+class SessionDependency(ArbitraryModelBase):
+    session: AsyncSession = Depends(async_session_dependency)
+
+
 def common_handler(view: ViewBase, dto: SessionDependency) -> Dict:
     return {"session": dto.session}
 

tests/test_api/test_api_sqla_with_includes.py

@@ -5,7 +5,7 @@
 from typing import Dict, List
 from uuid import UUID, uuid4
 
-from fastapi import APIRouter, FastAPI, status
+from fastapi import FastAPI, status
 from httpx import AsyncClient
 from pydantic import BaseModel, Field, root_validator, validator
 from pytest import fixture, mark, param  # noqa PT013
@@ -15,9 +15,8 @@
 from fastapi_jsonapi.exceptions import BadRequest
 from fastapi_jsonapi.schema_builder import SchemaBuilder
 from fastapi_jsonapi.views.view_base import ViewBase
-from tests.fixtures.app import build_app_plain
+from tests.fixtures.app import build_app_custom
 from tests.fixtures.entities import build_workplace, create_user
-from tests.fixtures.views import DetailViewBaseGeneric, ListViewBaseGeneric
 from tests.misc.utils import fake
 from tests.models import (
     Computer,
@@ -51,34 +50,6 @@ def association_key(data: dict):
     return data["type"], data["id"]
 
 
-def build_app_custom(
-    model,
-    schema,
-    schema_in_patch=None,
-    schema_in_post=None,
-    resource_type: str = "misc",
-) -> FastAPI:
-    router: APIRouter = APIRouter()
-
-    RoutersJSONAPI(
-        router=router,
-        path="/misc",
-        tags=["Misc"],
-        class_detail=DetailViewBaseGeneric,
-        class_list=ListViewBaseGeneric,
-        schema=schema,
-        resource_type=resource_type,
-        schema_in_patch=schema_in_patch,
-        schema_in_post=schema_in_post,
-        model=model,
-    )
-
-    app = build_app_plain()
-    app.include_router(router, prefix="")
-
-    return app
-
-
 async def test_root(client: AsyncClient):
     response = await client.get("/docs")
     assert response.status_code == status.HTTP_200_OK