remove define _projects_service.get_project_for_user

Author: pcrespov

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

@@ -8,10 +8,8 @@
     ProjectOutputGet,
 )
 from models_library.basic_types import KeyIDStr
-from models_library.projects import ProjectID
 from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeID
-from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from models_library.utils.services_io import JsonSchemaDict
 from pydantic import BaseModel, Field, TypeAdapter
@@ -26,29 +24,14 @@
 from ...models import ClientSessionHeaderParams
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
-from .. import _ports_service, _projects_service
-from .._access_rights_service import check_user_project_permission
+from .. import _access_rights_service, _nodes_service, _ports_service
 from .._projects_repository_legacy import ProjectDBAPI
-from ..models import ProjectDict
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import AuthenticatedRequestContext, ProjectPathParams
 
 log = logging.getLogger(__name__)
 
 
-async def _get_validated_workbench_model(
-    app: web.Application, project_id: ProjectID, user_id: UserID
-) -> dict[NodeID, Node]:
-    project: ProjectDict = await _projects_service.get_project_for_user(
-        app,
-        project_uuid=f"{project_id}",
-        user_id=user_id,
-        include_state=False,
-    )
-
-    return TypeAdapter(dict[NodeID, Node]).validate_python(project["workbench"])
-
-
 routes = web.RouteTableDef()
 
 
@@ -66,9 +49,17 @@ async def get_project_inputs(request: web.Request) -> web.Response:
 
     assert request.app  # nosec
 
-    workbench = await _get_validated_workbench_model(
-        app=request.app, project_id=path_params.project_id, user_id=req_ctx.user_id
+    await _access_rights_service.check_user_project_permission(
+        request.app,
+        product_name=req_ctx.product_name,
+        user_id=req_ctx.user_id,
+        project_id=path_params.project_id,
+        permission="read",
+    )
+    workbench = await _nodes_service.get_project_nodes_map(
+        app=request.app, project_id=path_params.project_id
     )
+
     inputs: dict[NodeID, Any] = _ports_service.get_project_inputs(workbench)
 
     return envelope_json_response(
@@ -94,8 +85,15 @@ async def update_project_inputs(request: web.Request) -> web.Response:
 
     assert request.app  # nosec
 
-    workbench = await _get_validated_workbench_model(
-        app=request.app, project_id=path_params.project_id, user_id=req_ctx.user_id
+    await _access_rights_service.check_user_project_permission(
+        request.app,
+        product_name=req_ctx.product_name,
+        user_id=req_ctx.user_id,
+        project_id=path_params.project_id,
+        permission="write",  # because we are updating inputs later
+    )
+    workbench = await _nodes_service.get_project_nodes_map(
+        app=request.app, project_id=path_params.project_id
     )
     current_inputs: dict[NodeID, Any] = _ports_service.get_project_inputs(workbench)
 
@@ -112,14 +110,6 @@ async def update_project_inputs(request: web.Request) -> web.Response:
         )
 
     # patch workbench
-    await check_user_project_permission(
-        request.app,
-        project_id=path_params.project_id,
-        user_id=req_ctx.user_id,
-        product_name=req_ctx.product_name,
-        permission="write",
-    )
-
     assert db  # nosec
     updated_project, _ = await db.update_project_multiple_node_data(
         user_id=req_ctx.user_id,
@@ -159,9 +149,17 @@ async def get_project_outputs(request: web.Request) -> web.Response:
 
     assert request.app  # nosec
 
-    workbench = await _get_validated_workbench_model(
-        app=request.app, project_id=path_params.project_id, user_id=req_ctx.user_id
+    await _access_rights_service.check_user_project_permission(
+        request.app,
+        product_name=req_ctx.product_name,
+        user_id=req_ctx.user_id,
+        project_id=path_params.project_id,
+        permission="read",
     )
+    workbench = await _nodes_service.get_project_nodes_map(
+        app=request.app, project_id=path_params.project_id
+    )
+
     outputs: dict[NodeID, Any] = await _ports_service.get_project_outputs(
         request.app, project_id=path_params.project_id, workbench=workbench
     )
@@ -206,10 +204,16 @@ async def list_project_metadata_ports(request: web.Request) -> web.Response:
 
     assert request.app  # nosec
 
-    workbench = await _get_validated_workbench_model(
-        app=request.app, project_id=path_params.project_id, user_id=req_ctx.user_id
+    await _access_rights_service.check_user_project_permission(
+        request.app,
+        product_name=req_ctx.product_name,
+        user_id=req_ctx.user_id,
+        project_id=path_params.project_id,
+        permission="read",
+    )
+    workbench = await _nodes_service.get_project_nodes_map(
+        app=request.app, project_id=path_params.project_id
     )
-
     return envelope_json_response(
         [
             ProjectMetadataPortGet(

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

@@ -1,18 +1,37 @@
 from aiohttp import web
 from models_library.projects import ProjectID
+from models_library.projects_nodes import Node
+from models_library.projects_nodes_io import NodeID
 from models_library.services_types import ServiceKey, ServiceVersion
+from pydantic import TypeAdapter
 from simcore_postgres_database.utils_projects_nodes import ProjectNodesRepo
-
-from ..db.plugin import get_database_engine_legacy
+from simcore_postgres_database.utils_repos import pass_or_acquire_connection
+from simcore_service_webserver.db.plugin import get_asyncpg_engine
 
 
 async def get_project_nodes_services(
     app: web.Application, *, project_uuid: ProjectID
 ) -> list[tuple[ServiceKey, ServiceVersion]]:
     repo = ProjectNodesRepo(project_uuid=project_uuid)
 
-    async with get_database_engine_legacy(app).acquire() as conn:
-        nodes = await repo.list(conn)
+    async with pass_or_acquire_connection(get_asyncpg_engine(app)) as conn:
+        project_nodes = await repo.list(conn)
 
     # removes duplicates by preserving order
-    return list(dict.fromkeys((node.key, node.version) for node in nodes))
+    return list(dict.fromkeys((node.key, node.version) for node in project_nodes))
+
+
+async def get_project_nodes_map(
+    app: web.Application, *, project_id: ProjectID
+) -> dict[NodeID, Node]:
+
+    repo = ProjectNodesRepo(project_uuid=project_id)
+
+    async with pass_or_acquire_connection(get_asyncpg_engine(app)) as conn:
+        project_nodes = await repo.list(conn)
+
+    workbench = {
+        project_node.node_id: project_node.model_dump_as_node()
+        for project_node in project_nodes
+    }
+    return TypeAdapter(dict[NodeID, Node]).validate_python(workbench)

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

@@ -81,6 +81,15 @@ async def get_project_nodes_services(
     )
 
 
+async def get_project_nodes_map(
+    app: web.Application, *, project_id: ProjectID
+) -> dict[NodeID, Node]:
+    """
+    Returns a map of node_id to Node for the given project_id which used to be called the project's `workbench`
+    """
+    return await _nodes_repository.get_project_nodes_map(app, project_id=project_id)
+
+
 #
 # PREVIEWS
 #