Merge branch 'master' into extract-celery-code

Author: giancarloromeo

.github/workflows/ci-testing-deploy.yml

@@ -2707,7 +2707,7 @@ jobs:
     if: ${{ always() }}
     needs:
       [
-        system-test-e2e,
+        # system-test-e2e, NOTE: not required, until Odei will have a look
         system-test-e2e-playwright,
         system-test-environment-setup,
         system-test-public-api,

.vscode/settings.template.json

@@ -1,7 +1,6 @@
 // This is a template. Clone and replace extension ".template.json" by ".json"
 {
   "autoDocstring.docstringFormat": "pep257",
-
   "editor.tabSize": 2,
   "editor.insertSpaces": true,
   "editor.detectIndentation": false,

api/specs/web-server/_long_running_tasks.py

@@ -65,6 +65,7 @@ def cancel_async_job(
 
 @router.get(
     "/tasks/{task_id}/result",
+    response_model=Any,
     name="get_task_result",
     description="Retrieves the result of a task",
     responses=_export_data_responses,

api/specs/web-server/_long_running_tasks_legacy.py

@@ -4,7 +4,7 @@
 # pylint: disable=too-many-arguments
 
 
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, status
 from models_library.generics import Envelope
@@ -54,6 +54,7 @@ def cancel_and_delete_task(
 @router.get(
     "/{task_id}/result",
     name="get_task_result",
+    response_model=Any,
     description="Retrieves the result of a task",
 )
 def get_task_result(

packages/models-library/src/models_library/api_schemas_long_running_tasks/tasks.py

@@ -18,9 +18,12 @@ class TaskResult(BaseModel):
     error: Any | None
 
 
-class TaskGet(BaseModel):
+class TaskBase(BaseModel):
     task_id: TaskId
     task_name: str
+
+
+class TaskGet(TaskBase):
     status_href: str
     result_href: str
     abort_href: str

packages/models-library/src/models_library/rest_error.py

@@ -4,6 +4,7 @@
 from common_library.basic_types import DEFAULT_FACTORY
 from models_library.generics import Envelope
 from pydantic import BaseModel, ConfigDict, Field
+from pydantic.config import JsonDict
 
 from .basic_types import IDStr, LogLevel
 
@@ -72,39 +73,55 @@ class ErrorGet(BaseModel):
             description="Message displayed to the user",
         ),
     ]
+
     support_id: Annotated[
         IDStr | None,
         Field(description="ID to track the incident during support", alias="supportId"),
     ] = None
-    status: int
 
-    # NOTE: The fields blow are DEPRECATED. Still here to keep compatibilty with front-end until updated
+    status: Annotated[
+        int,
+        Field(
+            description="Redundant HTTP status code of the error."
+            "Must be the same as in the HTTP response"
+        ),
+    ]
+
+    # NOTE: The fields below are DEPRECATED.
+    #  Still here to keep compatibilty with front-end until updated
     errors: Annotated[
         list[ErrorItemType],
         Field(deprecated=True, default_factory=list, json_schema_extra={"default": []}),
     ] = DEFAULT_FACTORY
+
     logs: Annotated[
         list[LogMessageType],
         Field(deprecated=True, default_factory=list, json_schema_extra={"default": []}),
     ] = DEFAULT_FACTORY
 
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "examples": [
+                    {
+                        "message": "Sorry you do not have sufficient access rights for product",
+                        "status": 401,
+                    },
+                    {
+                        "message": "Opps this error was unexpected. We are working on that!",
+                        "supportId": "OEC:12346789",
+                        "status": 500,
+                    },
+                ]
+            }
+        )
+
     model_config = ConfigDict(
         populate_by_name=True,
         extra="ignore",  # Used to prune extra fields from internal data
         frozen=True,
-        json_schema_extra={
-            "examples": [
-                {
-                    "message": "Sorry you do not have sufficient access rights for product",
-                    "status": 401,
-                },
-                {
-                    "message": "Opps this error was unexpected. We are working on that!",
-                    "supportId": "OEC:12346789",
-                    "status": 500,
-                },
-            ]
-        },
+        json_schema_extra=_update_json_schema_extra,
     )
 
 

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_login.py

@@ -17,7 +17,7 @@
     get_plugin_storage,
 )
 from simcore_service_webserver.products.products_service import list_products
-from simcore_service_webserver.security.api import clean_auth_policy_cache
+from simcore_service_webserver.security import security_service
 from yarl import URL
 
 from .assert_checks import assert_status
@@ -187,7 +187,7 @@ async def __aexit__(self, *args):
         assert self.client.app
         # NOTE: cache key is based on an email. If the email is
         # reused during the test, then it creates quite some noise
-        await clean_auth_policy_cache(self.client.app)
+        await security_service.clean_auth_policy_cache(self.client.app)
         return await super().__aexit__(*args)
 
 

packages/service-library/src/servicelib/aiohttp/long_running_tasks/_constants.py

@@ -3,9 +3,9 @@
 from pydantic import PositiveFloat
 
 MINUTE: Final[PositiveFloat] = 60
-APP_LONG_RUNNING_TASKS_MANAGER_KEY: Final[
-    str
-] = f"{__name__ }.long_running_tasks.tasks_manager"
-RQT_LONG_RUNNING_TASKS_CONTEXT_KEY: Final[
-    str
-] = f"{__name__}.long_running_tasks.context"
+APP_LONG_RUNNING_MANAGER_KEY: Final[str] = (
+    f"{__name__ }.long_running_tasks.tasks_manager"
+)
+RQT_LONG_RUNNING_TASKS_CONTEXT_KEY: Final[str] = (
+    f"{__name__}.long_running_tasks.context"
+)

packages/service-library/src/servicelib/aiohttp/long_running_tasks/_dependencies.py

@@ -0,0 +1,41 @@
+import datetime
+
+from aiohttp import web
+
+from ...long_running_tasks.base_long_running_manager import BaseLongRunningManager
+from ...long_running_tasks.task import TaskContext, TasksManager
+from ._constants import APP_LONG_RUNNING_MANAGER_KEY
+from ._request import get_task_context
+
+
+class AiohttpLongRunningManager(BaseLongRunningManager):
+    def __init__(
+        self,
+        app: web.Application,
+        stale_task_check_interval: datetime.timedelta,
+        stale_task_detect_timeout: datetime.timedelta,
+    ):
+        self._app = app
+        self._tasks_manager = TasksManager(
+            stale_task_check_interval=stale_task_check_interval,
+            stale_task_detect_timeout=stale_task_detect_timeout,
+        )
+
+    @property
+    def tasks_manager(self) -> TasksManager:
+        return self._tasks_manager
+
+    async def setup(self) -> None:
+        await self._tasks_manager.setup()
+
+    async def teardown(self) -> None:
+        await self._tasks_manager.teardown()
+
+    @staticmethod
+    def get_task_context(request: web.Request) -> TaskContext:
+        return get_task_context(request)
+
+
+def get_long_running_manager(app: web.Application) -> AiohttpLongRunningManager:
+    output: AiohttpLongRunningManager = app[APP_LONG_RUNNING_MANAGER_KEY]
+    return output