fixed tests

Author: Andrei Neagu

services/web/server/src/simcore_service_webserver/projects/_controller/_rest_utils.py

@@ -4,20 +4,25 @@
 from models_library.rest_pagination_utils import paginate_data
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
+from yarl import URL
 
 from .. import _permalink_service
 from .._crud_api_read import _paralell_update
 from ..models import ProjectDict
 
 
 async def aggregate_data_to_projects_from_request(
-    request: web.Request,
+    app: web.Application,
+    url: URL,
+    headers: dict[str, str],
     projects: list[ProjectDict],
 ) -> list[ProjectDict]:
 
     update_permalink_per_project = [
         # permalink
-        _permalink_service.aggregate_permalink_in_project(request, project=prj)
+        _permalink_service.aggregate_permalink_in_project(
+            app, url, headers, project=prj
+        )
         for prj in projects
     ]
 

services/web/server/src/simcore_service_webserver/projects/_controller/nodes_rest.py

@@ -322,7 +322,8 @@ async def _stop_dynamic_service_task(
         return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
-TaskRegistry.register(_stop_dynamic_service_task)
+def register_stop_dynamic_service_task(app: web.Application) -> None:
+    TaskRegistry.register_partial(_stop_dynamic_service_task, app=app)
 
 
 @routes.post(
@@ -352,7 +353,6 @@ async def stop_node(request: web.Request) -> web.Response:
         _stop_dynamic_service_task.__name__,
         task_context=jsonable_encoder(req_ctx),
         # task arguments from here on ---
-        app=request.app,
         dynamic_service_stop=DynamicServiceStop(
             user_id=req_ctx.user_id,
             project_id=path_params.project_id,

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest.py

@@ -101,7 +101,8 @@ async def create_project(request: web.Request):
         fire_and_forget=True,
         task_context=jsonable_encoder(req_ctx),
         # arguments
-        request=request,
+        url=request.url,
+        headers=dict(request.headers),
         new_project_was_hidden_before_data_was_copied=query_params.hidden,
         from_study=query_params.from_study,
         as_template=query_params.as_template,
@@ -158,7 +159,7 @@ async def list_projects(request: web.Request):
     )
 
     projects = await _rest_utils.aggregate_data_to_projects_from_request(
-        request, projects
+        request.app, request.url, dict(request.headers), projects
     )
 
     return _rest_utils.create_page_response(
@@ -197,7 +198,7 @@ async def list_projects_full_search(request: web.Request):
     )
 
     projects = await _rest_utils.aggregate_data_to_projects_from_request(
-        request, projects
+        request.app, request.url, dict(request.headers), projects
     )
 
     return _rest_utils.create_page_response(
@@ -247,7 +248,9 @@ async def get_active_project(request: web.Request) -> web.Response:
         )
 
         # updates project's permalink field
-        await update_or_pop_permalink_in_project(request, project)
+        await update_or_pop_permalink_in_project(
+            request.app, request.url, dict(request.headers), project
+        )
 
         data = ProjectGet.from_domain_model(project).data(exclude_unset=True)
 
@@ -280,7 +283,9 @@ async def get_project(request: web.Request):
     )
 
     # Adds permalink
-    await update_or_pop_permalink_in_project(request, project)
+    await update_or_pop_permalink_in_project(
+        request.app, request.url, dict(request.headers), project
+    )
 
     data = ProjectGet.from_domain_model(project).data(exclude_unset=True)
     return envelope_json_response(data)
@@ -419,7 +424,8 @@ async def clone_project(request: web.Request):
         fire_and_forget=True,
         task_context=jsonable_encoder(req_ctx),
         # arguments
-        request=request,
+        url=request.url,
+        headers=dict(request.headers),
         new_project_was_hidden_before_data_was_copied=False,
         from_study=path_params.project_id,
         as_template=False,

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

@@ -27,6 +27,7 @@
     ProjectNodeCreate,
 )
 from simcore_postgres_database.webserver_models import ProjectType as ProjectTypeDB
+from yarl import URL
 
 from ..application_settings import get_application_settings
 from ..catalog import catalog_service
@@ -249,7 +250,9 @@ async def _compose_project_data(
 async def create_project(  # pylint: disable=too-many-arguments,too-many-branches,too-many-statements  # noqa: C901, PLR0913
     progress: TaskProgress,
     *,
-    request: web.Request,
+    app: web.Application,
+    url: URL,
+    headers: dict[str, str],
     new_project_was_hidden_before_data_was_copied: bool,
     from_study: ProjectID | None,
     as_template: bool,
@@ -281,7 +284,6 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         web.HTTPUnauthorized:
 
     """
-    assert request.app  # nosec
     _logger.info(
         "create_project for '%s' with %s %s %s",
         f"{user_id=}",
@@ -290,7 +292,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         f"{from_study=}",
     )
 
-    _projects_repository_legacy = ProjectDBAPI.get_from_app_context(request.app)
+    _projects_repository_legacy = ProjectDBAPI.get_from_app_context(app)
 
     new_project: ProjectDict = {}
     copy_file_coro = None
@@ -303,7 +305,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         if predefined_project:
             if workspace_id := predefined_project.get("workspaceId", None):
                 await check_user_workspace_access(
-                    request.app,
+                    app,
                     user_id=user_id,
                     workspace_id=workspace_id,
                     product_name=product_name,
@@ -312,7 +314,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
             if folder_id := predefined_project.get("folderId", None):
                 # Check user has access to folder
                 await folders_folders_repository.get_for_user_or_workspace(
-                    request.app,
+                    app,
                     folder_id=folder_id,
                     product_name=product_name,
                     user_id=user_id if workspace_id is None else None,
@@ -328,7 +330,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
                 project_node_coro,
                 copy_file_coro,
             ) = await _prepare_project_copy(
-                request.app,
+                app,
                 user_id=user_id,
                 product_name=product_name,
                 src_project_uuid=from_study,
@@ -342,7 +344,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
             # 1.2 does project belong to some folder?
             workspace_id = new_project["workspaceId"]
             prj_to_folder_db = await _folders_repository.get_project_to_folder(
-                request.app,
+                app,
                 project_id=from_study,
                 private_workspace_user_id_or_none=(
                     user_id if workspace_id is None else None
@@ -361,7 +363,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         if predefined_project:
             # 2. overrides with optional body and re-validate
             new_project, project_nodes = await _compose_project_data(
-                request.app,
+                app,
                 user_id=user_id,
                 new_project=new_project,
                 predefined_project=predefined_project,
@@ -378,7 +380,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         )
         # add parent linking if needed
         await set_project_ancestors(
-            request.app,
+            app,
             user_id=user_id,
             project_uuid=new_project["uuid"],
             parent_project_uuid=parent_project_uuid,
@@ -389,7 +391,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         # 3.2 move project to proper folder
         if folder_id:
             await _folders_repository.insert_project_to_folder(
-                request.app,
+                app,
                 project_id=new_project["uuid"],
                 folder_id=folder_id,
                 private_workspace_user_id_or_none=(
@@ -405,20 +407,20 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         # 5. unhide the project if needed since it is now complete
         if not new_project_was_hidden_before_data_was_copied:
             await _projects_repository.patch_project(
-                request.app,
+                app,
                 project_uuid=new_project["uuid"],
                 new_partial_project_data={"hidden": False},
             )
 
         # update the network information in director-v2
         await dynamic_scheduler_service.update_projects_networks(
-            request.app, project_id=ProjectID(new_project["uuid"])
+            app, project_id=ProjectID(new_project["uuid"])
         )
         await progress.update()
 
         # This is a new project and every new graph needs to be reflected in the pipeline tables
         await director_v2_service.create_or_update_pipeline(
-            request.app,
+            app,
             user_id,
             new_project["uuid"],
             product_name,
@@ -433,12 +435,12 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
             user_id=user_id,
             project=new_project,
             is_template=as_template,
-            app=request.app,
+            app=app,
         )
         await progress.update()
 
         # Adds permalink
-        await update_or_pop_permalink_in_project(request, new_project)
+        await update_or_pop_permalink_in_project(app, url, headers, new_project)
 
         # Adds folderId
         user_specific_project_data_db = (
@@ -454,7 +456,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         # Overwrite project access rights
         if workspace_id:
             workspace: UserWorkspaceWithAccessRights = await get_user_workspace(
-                request.app,
+                app,
                 user_id=user_id,
                 workspace_id=workspace_id,
                 product_name=product_name,
@@ -497,7 +499,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
     except (ParentProjectNotFoundError, ParentNodeNotFoundError) as exc:
         if project_uuid := new_project.get("uuid"):
             await _projects_service.submit_delete_project_task(
-                app=request.app,
+                app=app,
                 project_uuid=project_uuid,
                 user_id=user_id,
                 simcore_user_agent=simcore_user_agent,
@@ -511,12 +513,13 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         )
         if project_uuid := new_project.get("uuid"):
             await _projects_service.submit_delete_project_task(
-                app=request.app,
+                app=app,
                 project_uuid=project_uuid,
                 user_id=user_id,
                 simcore_user_agent=simcore_user_agent,
             )
         raise
 
 
-TaskRegistry.register(create_project)
+def register_create_project_task(app: web.Application) -> None:
+    TaskRegistry.register_partial(create_project, app=app)

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

@@ -5,6 +5,7 @@
 from aiohttp import web
 from models_library.api_schemas_webserver.permalinks import ProjectPermalink
 from models_library.projects import ProjectID
+from yarl import URL
 
 from .exceptions import PermalinkFactoryError, PermalinkNotAllowedError
 from .models import ProjectDict
@@ -15,9 +16,12 @@
 
 class CreateLinkCoroutine(Protocol):
     async def __call__(
-        self, request: web.Request, project_uuid: ProjectID
-    ) -> ProjectPermalink:
-        ...
+        self,
+        app: web.Application,
+        url: URL,
+        headers: dict[str, str],
+        project_uuid: ProjectID,
+    ) -> ProjectPermalink: ...
 
 
 def register_factory(app: web.Application, factory_coro: CreateLinkCoroutine):
@@ -39,13 +43,13 @@ def _get_factory(app: web.Application) -> CreateLinkCoroutine:
 
 
 async def _create_permalink(
-    request: web.Request, project_uuid: ProjectID
+    app: web.Application, url: URL, headers: dict[str, str], project_uuid: ProjectID
 ) -> ProjectPermalink:
-    create_coro: CreateLinkCoroutine = _get_factory(request.app)
+    create_coro: CreateLinkCoroutine = _get_factory(app)
 
     try:
         permalink: ProjectPermalink = await asyncio.wait_for(
-            create_coro(request=request, project_uuid=project_uuid),
+            create_coro(app, url, headers, project_uuid),
             timeout=_PERMALINK_CREATE_TIMEOUT_S,
         )
         return permalink
@@ -55,7 +59,7 @@ async def _create_permalink(
 
 
 async def update_or_pop_permalink_in_project(
-    request: web.Request, project: ProjectDict
+    app: web.Application, url: URL, headers: dict[str, str], project: ProjectDict
 ) -> ProjectPermalink | None:
     """Updates permalink entry in project
 
@@ -64,7 +68,9 @@ async def update_or_pop_permalink_in_project(
     If fails, it pops it from project (so it is not set in the pydantic model. SEE ProjectGet.permalink)
     """
     try:
-        permalink = await _create_permalink(request, project_uuid=project["uuid"])
+        permalink = await _create_permalink(
+            app, url, headers, project_uuid=project["uuid"]
+        )
 
         assert permalink  # nosec
         project["permalink"] = permalink
@@ -78,12 +84,12 @@ async def update_or_pop_permalink_in_project(
 
 
 async def aggregate_permalink_in_project(
-    request: web.Request, project: ProjectDict
+    app: web.Application, url: URL, headers: dict[str, str], project: ProjectDict
 ) -> ProjectDict:
     """
     Adapter to use in parallel aggregation of fields in a project dataset
     """
-    await update_or_pop_permalink_in_project(request, project)
+    await update_or_pop_permalink_in_project(app, url, headers, project)
     return project
 
 

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

@@ -29,6 +29,8 @@
     wallets_rest,
     workspaces_rest,
 )
+from ._controller.nodes_rest import register_stop_dynamic_service_task
+from ._crud_api_create import register_create_project_task
 from ._projects_repository_legacy import setup_projects_db
 from ._security_service import setup_projects_access
 
@@ -75,4 +77,7 @@ def setup_projects(app: web.Application) -> bool:
     app.router.add_routes(workspaces_rest.routes)
     app.router.add_routes(trash_rest.routes)
 
+    register_create_project_task(app)
+    register_stop_dynamic_service_task(app)
+
     return True