list_projects_full_depth from app

Author: pcrespov

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

@@ -78,7 +78,7 @@ async def delete_project(
     app: web.Application,
     project_uuid: ProjectID,
     user_id: UserID,
-    simcore_user_agent,
+    simcore_user_agent: str,
     remove_project_dynamic_services: RemoveProjectServicesCallable,
 ) -> None:
     """Stops dynamic services, deletes data and finally deletes project

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

@@ -28,7 +28,24 @@
 from .models import ProjectDict, ProjectTypeAPI
 
 
-async def _update_project_dict(
+async def _batch_update_list_of_project_dict(
+    app: web.Application, list_of_project_dict: list[ProjectDict]
+) -> list[ProjectDict]:
+
+    # updating `trashed_by_primary_gid`
+    trashed_by_primary_gid_values = await batch_get_trashed_by_primary_gid(
+        app, projects_uuids=[ProjectID(p["uuid"]) for p in list_of_project_dict]
+    )
+
+    for project_dict, value in zip(
+        list_of_project_dict, trashed_by_primary_gid_values, strict=True
+    ):
+        project_dict.update(trashed_by_primary_gid=value)
+
+    return list_of_project_dict
+
+
+async def _update_and_get_project_dict(
     request: web.Request,
     *,
     user_id: UserID,
@@ -49,23 +66,6 @@ async def _update_project_dict(
     return project
 
 
-async def _batch_update_list_of_project_dict(
-    app: web.Application, list_of_project_dict: list[ProjectDict]
-) -> list[ProjectDict]:
-
-    # updating `trashed_by_primary_gid`
-    trashed_by_primary_gid_values = await batch_get_trashed_by_primary_gid(
-        app, projects_uuids=[ProjectID(p["uuid"]) for p in list_of_project_dict]
-    )
-
-    for project_dict, value in zip(
-        list_of_project_dict, trashed_by_primary_gid_values, strict=True
-    ):
-        project_dict.update(trashed_by_primary_gid=value)
-
-    return list_of_project_dict
-
-
 async def list_projects(  # pylint: disable=too-many-arguments
     request: web.Request,
     user_id: UserID,
@@ -145,11 +145,13 @@ 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(
+            _update_and_get_project_dict(
                 request,
                 user_id=user_id,
                 project=prj,
@@ -165,7 +167,7 @@ async def list_projects(  # pylint: disable=too-many-arguments
 
 
 async def list_projects_full_depth(
-    request,
+    app: web.Application,
     *,
     user_id: UserID,
     product_name: str,
@@ -180,10 +182,10 @@ async def list_projects_full_depth(
     search_by_multi_columns: str | None,
     search_by_project_name: str | None,
 ) -> tuple[list[ProjectDict], int]:
-    db = ProjectDBAPI.get_from_app_context(request.app)
+    db = ProjectDBAPI.get_from_app_context(app)
 
     user_available_services: list[dict] = await get_services_for_user_in_product(
-        request.app, user_id, product_name, only_key_versions=True
+        app, user_id, product_name, only_key_versions=True
     )
 
     db_projects, db_project_types, total_number_projects = await db.list_projects_dicts(
@@ -202,15 +204,18 @@ async def list_projects_full_depth(
         order_by=order_by,
     )
 
-    db_projects = await _batch_update_list_of_project_dict(request.app, db_projects)
+    # 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,
+            # 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
@@ -61,7 +62,10 @@
     ProjectsListQueryParams,
     ProjectsSearchQueryParams,
 )
-from ._permalink_api import update_or_pop_permalink_in_project
+from ._permalink_api import (
+    aggregate_permalink_in_project,
+    update_or_pop_permalink_in_project,
+)
 from .exceptions import (
     ProjectDeleteError,
     ProjectInvalidRightsError,
@@ -252,7 +256,7 @@ async def list_projects_full_search(request: web.Request):
     tag_ids_list = query_params.tag_ids_list()
 
     projects, total_number_of_projects = await _crud_api_read.list_projects_full_depth(
-        request,
+        request.app,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
         trashed=query_params.filters.trashed,
@@ -264,8 +268,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
+            aggregate_permalink_in_project(request, project=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,
@@ -486,9 +502,9 @@ async def delete_project(request: web.Request):
 
         await projects_service.submit_delete_project_task(
             request.app,
-            path_params.project_id,
-            req_ctx.user_id,
-            request.headers.get(
+            project_uuid=path_params.project_id,
+            user_id=req_ctx.user_id,
+            simcore_user_agent=request.headers.get(
                 X_SIMCORE_USER_AGENT, UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
             ),
         )