moving requestcontext

Author: pcrespov

services/web/server/src/simcore_service_webserver/director_v2/_handlers.py

@@ -26,6 +26,7 @@
 from .._meta import API_VTAG as VTAG
 from ..db.plugin import get_database_engine
 from ..login.decorators import login_required
+from ..models import RequestContext
 from ..products import api as products_api
 from ..security.decorators import permission_required
 from ..users.exceptions import UserDefaultWalletNotFoundError

services/web/server/src/simcore_service_webserver/long_running_tasks.py

@@ -1,25 +1,16 @@
 from functools import wraps
 
 from aiohttp import web
-from models_library.rest_base import RequestParameters
-from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
-from pydantic import Field
 from servicelib.aiohttp.long_running_tasks._constants import (
     RQT_LONG_RUNNING_TASKS_CONTEXT_KEY,
 )
 from servicelib.aiohttp.long_running_tasks.server import setup
 from servicelib.aiohttp.typing_extension import Handler
-from servicelib.request_keys import RQT_USERID_KEY
 
-from ._constants import RQ_PRODUCT_KEY
 from ._meta import API_VTAG
 from .login.decorators import login_required
-
-
-class _RequestContext(RequestParameters):
-    user_id: UserID = Field(..., alias=RQT_USERID_KEY)  # type: ignore[literal-required]
-    product_name: str = Field(..., alias=RQ_PRODUCT_KEY)  # type: ignore[literal-required]
+from .models import RequestContext
 
 
 def _webserver_request_context_decorator(handler: Handler):
@@ -28,7 +19,7 @@ async def _test_task_context_decorator(
         request: web.Request,
     ) -> web.StreamResponse:
         """this task context callback tries to get the user_id from the query if available"""
-        req_ctx = _RequestContext.parse_obj(request)
+        req_ctx = RequestContext.parse_obj(request)
         request[RQT_LONG_RUNNING_TASKS_CONTEXT_KEY] = jsonable_encoder(req_ctx)
         return await handler(request)
 

services/web/server/src/simcore_service_webserver/models.py

@@ -0,0 +1,11 @@
+from models_library.rest_base import RequestParameters
+from models_library.users import UserID
+from pydantic import Field
+from servicelib.request_keys import RQT_USERID_KEY
+
+from ._constants import RQ_PRODUCT_KEY
+
+
+class RequestContext(RequestParameters):
+    user_id: UserID = Field(..., alias=RQT_USERID_KEY)  # type: ignore[literal-required]
+    product_name: str = Field(..., alias=RQ_PRODUCT_KEY)  # type: ignore[literal-required]

services/web/server/src/simcore_service_webserver/projects/_common_models.py

@@ -5,16 +5,11 @@
 """
 
 from models_library.projects import ProjectID
-from models_library.users import UserID
 from pydantic import BaseModel, Extra, Field
-from servicelib.request_keys import RQT_USERID_KEY
 
-from .._constants import RQ_PRODUCT_KEY
+from ..models import RequestContext
 
-
-class RequestContext(BaseModel):
-    user_id: UserID = Field(..., alias=RQT_USERID_KEY)  # type: ignore[literal-required]
-    product_name: str = Field(..., alias=RQ_PRODUCT_KEY)  # type: ignore[literal-required]
+assert RequestContext  # nosec
 
 
 class ProjectPathParams(BaseModel):
@@ -29,3 +24,6 @@ class RemoveQueryParams(BaseModel):
     force: bool = Field(
         default=False, description="Force removal (even if resource is active)"
     )
+
+
+__all__: tuple[str, ...] = ("RequestContext",)