permalink factory: undo

Author: pcrespov

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

@@ -413,7 +413,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         task_progress.update()
 
         # Adds permalink
-        await update_or_pop_permalink_in_project(request.app, new_project)
+        await update_or_pop_permalink_in_project(request, new_project)
 
         # Adds folderId
         user_specific_project_data_db = (

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

@@ -28,25 +28,9 @@
 from .models import ProjectDict, ProjectTypeAPI
 
 
-async def _update_project_dict(
-    app: web.Application,
-    *,
-    user_id: UserID,
-    project: ProjectDict,
-    is_template: bool,
-) -> ProjectDict:
-    # state
-    await projects_service.add_project_states_for_user(
-        user_id=user_id,
-        project=project,
-        is_template=is_template,
-        app=app,
-    )
-
-    # permalink
-    await update_or_pop_permalink_in_project(app, project)
-
-    return project
+async def _sequential_execution(*coros):
+    for coro in coros:
+        await coro  # Ensures each coroutine runs in sequence
 
 
 async def _batch_update_list_of_project_dict(
@@ -145,15 +129,22 @@ async def list_projects(  # pylint: disable=too-many-arguments
         order_by=order_by,
     )
 
+    # AGGREGATE data to the project from other sources, first some sources
+    # as batch-update and then as parallel-update
     db_projects = await _batch_update_list_of_project_dict(app, db_projects)
 
     projects: list[ProjectDict] = await logged_gather(
         *(
-            _update_project_dict(
-                request.app,
-                user_id=user_id,
-                project=prj,
-                is_template=prj_type == ProjectTypeDB.TEMPLATE,
+            _sequential_execution(
+                # state
+                projects_service.add_project_states_for_user(
+                    user_id=user_id,
+                    project=prj,
+                    is_template=prj_type == ProjectTypeDB.TEMPLATE,
+                    app=request.app,
+                ),
+                # permalink
+                update_or_pop_permalink_in_project(request, project=prj),
             )
             for prj, prj_type in zip(db_projects, db_project_types, strict=False)
         ),
@@ -202,15 +193,18 @@ async def list_projects_full_depth(
         order_by=order_by,
     )
 
+    # AGGREGATE data to the project from other sources, first some sources
+    # as BATCH-update and then as PARALLEL-update
     db_projects = await _batch_update_list_of_project_dict(app, db_projects)
 
     projects: list[ProjectDict] = await logged_gather(
         *(
-            _update_project_dict(
-                app,
+            # state
+            projects_service.add_project_states_for_user(
                 user_id=user_id,
                 project=prj,
                 is_template=prj_type == ProjectTypeDB.TEMPLATE,
+                app=app,
             )
             for prj, prj_type in zip(db_projects, db_project_types, strict=False)
         ),

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

@@ -39,6 +39,7 @@
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.redis import get_project_locked_state
 from servicelib.rest_constants import RESPONSE_MODEL_POLICY
+from servicelib.utils import logged_gather
 from simcore_service_webserver.projects.models import ProjectDict
 
 from .._meta import API_VTAG as VTAG
@@ -264,8 +265,20 @@ async def list_projects_full_search(request: web.Request):
         order_by=OrderBy.model_construct(**query_params.order_by.model_dump()),
     )
 
+    updated_projects: list[ProjectDict] = await logged_gather(
+        # AGGREGATE data to the project from other sources and
+        # that depend on the **request**.
+        *(
+            # permalink
+            update_or_pop_permalink_in_project(request, prj)
+            for prj in projects
+        ),
+        reraise=True,
+        max_concurrency=100,
+    )
+
     return _create_page_response(
-        projects=projects,
+        projects=updated_projects,
         request_url=request.url,
         total=total_number_of_projects,
         limit=query_params.limit,
@@ -312,7 +325,7 @@ async def get_active_project(request: web.Request) -> web.Response:
             )
 
             # updates project's permalink field
-            await update_or_pop_permalink_in_project(request.app, project)
+            await update_or_pop_permalink_in_project(request, project)
 
             data = ProjectGet.from_domain_model(project).data(exclude_unset=True)
 
@@ -370,7 +383,7 @@ async def get_project(request: web.Request):
             project["uuid"] = new_uuid
 
         # Adds permalink
-        await update_or_pop_permalink_in_project(request.app, project)
+        await update_or_pop_permalink_in_project(request, project)
 
         data = ProjectGet.from_domain_model(project).data(exclude_unset=True)
         return web.json_response({"data": data}, dumps=json_dumps)

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

@@ -15,7 +15,7 @@
 
 class CreateLinkCoroutine(Protocol):
     async def __call__(
-        self, app: web.Application, project_id: ProjectID
+        self, request: web.Request, project_uuid: ProjectID
     ) -> ProjectPermalink:
         ...
 
@@ -39,13 +39,13 @@ def _get_factory(app: web.Application) -> CreateLinkCoroutine:
 
 
 async def _create_permalink(
-    app: web.Application, project_id: ProjectID
+    request: web.Request, project_uuid: ProjectID
 ) -> ProjectPermalink:
-    create_coro: CreateLinkCoroutine = _get_factory(app)
+    create_coro: CreateLinkCoroutine = _get_factory(request.app)
 
     try:
         permalink: ProjectPermalink = await asyncio.wait_for(
-            create_coro(app, project_id),
+            create_coro(request=request, project_uuid=project_uuid),
             timeout=_PERMALINK_CREATE_TIMEOUT_S,
         )
         return permalink
@@ -55,7 +55,7 @@ async def _create_permalink(
 
 
 async def update_or_pop_permalink_in_project(
-    app: web.Application, project: ProjectDict
+    request: web.Request, project: ProjectDict
 ) -> ProjectPermalink | None:
     """Updates permalink entry in project
 
@@ -64,7 +64,7 @@ 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(app, project_id=project["uuid"])
+        permalink = await _create_permalink(request, project_uuid=project["uuid"])
 
         assert permalink  # nosec
         project["permalink"] = permalink

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects_permalinks.py

@@ -74,14 +74,14 @@ def create_permalink_for_study(
 
 
 async def permalink_factory(
-    app: web.Application, project_uuid: ProjectID
+    request: web.Request, project_uuid: ProjectID
 ) -> ProjectPermalink:
     """
     - Assumes project_id is up-to-date in the database
 
     """
     # NOTE: next iterations will mobe this as part of the project repository pattern
-    engine = get_database_engine(app)
+    engine = get_database_engine(request.app)
     async with engine.acquire() as conn:
         access_rights_subquery = (
             sa.select(