♻️ start jobs via webserver (#4926)

Author: bisgaard-itis

api/specs/web-server/_computations.py

@@ -1,10 +1,10 @@
 from fastapi import APIRouter, status
+from models_library.api_schemas_webserver.computations import ComputationStart
 from models_library.generics import Envelope
 from models_library.projects import ProjectID
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.director_v2._handlers import (
     ComputationTaskGet,
-    _ComputationStart,
     _ComputationStarted,
 )
 
@@ -29,7 +29,7 @@ async def get_computation(project_id: ProjectID):
     "/computations/{project_id}:start",
     response_model=Envelope[_ComputationStarted],
 )
-async def start_computation(project_id: ProjectID, _start: _ComputationStart):
+async def start_computation(project_id: ProjectID, _start: ComputationStart):
     ...
 
 

packages/models-library/src/models_library/api_schemas_webserver/computations.py

@@ -0,0 +1,11 @@
+from models_library.clusters import ClusterID
+from pydantic import BaseModel
+
+
+class ComputationStart(BaseModel):
+    force_restart: bool = False
+    cluster_id: ClusterID = 0
+    subgraph: set[str] = set()
+
+
+__all__: tuple[str, ...] = ("ComputationStart",)

services/api-server/src/simcore_service_api_server/api/routes/files.py

@@ -325,8 +325,8 @@ async def search_files_page(
             stored_files = stored_files[: page_params.limit]
         return create_page(
             [to_file_api_model(fmd) for fmd in stored_files],
-            total=len(stored_files),
-            params=page_params,
+            len(stored_files),
+            page_params,
         )
 
     except (ValueError, ValidationError) as err:

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs.py

@@ -12,7 +12,6 @@
 from pydantic.types import PositiveInt
 from servicelib.logging_utils import log_context
 
-from ...db.repositories.groups_extra_properties import GroupsExtraPropertiesRepository
 from ...models.basic_types import VersionStr
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.jobs import (
@@ -35,7 +34,6 @@
 from ...services.webserver import ProjectNotFoundError
 from ..dependencies.application import get_product_name, get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id
-from ..dependencies.database import get_repository
 from ..dependencies.services import get_api_client
 from ..dependencies.webserver import AuthSession, get_webserver_session
 from ..errors.http_error import create_error_json_response
@@ -172,11 +170,6 @@ async def start_job(
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
-    product_name: Annotated[str, Depends(get_product_name)],
-    groups_extra_properties_repository: Annotated[
-        GroupsExtraPropertiesRepository,
-        Depends(get_repository(GroupsExtraPropertiesRepository)),
-    ],
     cluster_id: ClusterID | None = None,
 ):
     """Starts job job_id created with the solver solver_key:version
@@ -201,15 +194,14 @@ async def start_job(
             )
 
     with log_context(_logger, logging.DEBUG, "Starting job"):
-        task = await director2_api.start_computation(
-            project_id=job_id,
+        await webserver_api.start_project(project_id=job_id, cluster_id=cluster_id)
+        return await inspect_job(
+            solver_key=solver_key,
+            version=version,
+            job_id=job_id,
             user_id=user_id,
-            product_name=product_name,
-            cluster_id=cluster_id,
-            groups_extra_properties_repository=groups_extra_properties_repository,
+            director2_api=director2_api,
         )
-        job_status: JobStatus = create_jobstatus_from_task(task)
-        return job_status
 
 
 @router.post(

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs_getters.py

@@ -126,8 +126,8 @@ async def get_jobs_page(
 
     return create_page(
         jobs,
-        total=projects_page.meta.total,
-        params=page_params,
+        projects_page.meta.total,
+        page_params,
     )
 
 

services/api-server/src/simcore_service_api_server/api/routes/studies.py

@@ -57,8 +57,8 @@ async def list_studies(
 
     return create_page(
         studies,
-        total=projects_page.meta.total,
-        params=page_params,
+        projects_page.meta.total,
+        page_params,
     )
 
 

services/api-server/src/simcore_service_api_server/services/webserver.py

@@ -10,6 +10,7 @@
 from cryptography import fernet
 from fastapi import FastAPI, HTTPException
 from httpx import Response
+from models_library.api_schemas_webserver.computations import ComputationStart
 from models_library.api_schemas_webserver.projects import ProjectCreateNew, ProjectGet
 from models_library.api_schemas_webserver.projects_metadata import (
     ProjectMetadataGet,
@@ -23,6 +24,7 @@
     WalletGet,
     WalletGetWithAvailableCredits,
 )
+from models_library.clusters import ClusterID
 from models_library.generics import Envelope
 from models_library.projects import ProjectID
 from models_library.rest_pagination import Page
@@ -409,6 +411,21 @@ async def connect_pricing_unit_to_project_node(
             )
             response.raise_for_status()
 
+    async def start_project(
+        self, project_id: UUID, cluster_id: ClusterID | None = None
+    ) -> None:
+        with _handle_webserver_api_errors():
+            body_input: dict[str, Any] = {}
+            if cluster_id:
+                body_input["cluster_id"] = cluster_id
+            body: ComputationStart = ComputationStart(**body_input)
+            response = await self.client.post(
+                f"/computations/{project_id}:start",
+                cookies=self.session_cookies,
+                json=jsonable_encoder(body, exclude_unset=True, exclude_defaults=True),
+            )
+            response.raise_for_status()
+
     # WALLETS -------------------------------------------------
 
     async def get_wallet(self, wallet_id: int) -> WalletGetWithAvailableCredits:

services/api-server/tests/mocks/start_job_no_payment.json

@@ -1,47 +1,99 @@
 [
  {
-  "name": "POST /v2/computations",
-  "description": "<Request('POST', 'http://director-v2:8000/v2/computations')>",
+  "name": "POST /computations/48323c7f-e379-4e16-8b58-dc69643f653d:start",
+  "description": "<Request('POST', 'http://webserver:8080/v0/computations/48323c7f-e379-4e16-8b58-dc69643f653d:start')>",
   "method": "POST",
-  "host": "director-v2",
+  "host": "webserver",
   "path": {
-   "path": "/v2/computations",
-   "path_parameters": []
+   "path": "/v0/computations/{project_id}:start",
+   "path_parameters": [
+    {
+     "in": "path",
+     "name": "project_id",
+     "required": true,
+     "schema": {
+      "title": "Project Id",
+      "type": "str",
+      "pattern": null,
+      "format": "uuid",
+      "exclusiveMinimum": null,
+      "minimum": null,
+      "anyOf": null,
+      "allOf": null,
+      "oneOf": null
+     },
+     "response_value": "computations"
+    }
+   ]
   },
   "query": null,
   "request_payload": {
-   "user_id": 1,
-   "project_id": "6e52228c-6edd-4505-9131-e901fdad5b17",
-   "start_pipeline": true,
-   "product_name": "osparc",
-   "use_on_demand_clusters": false
+   "force_restart": false,
+   "cluster_id": 0,
+   "subgraph": []
+  },
+  "response_body": {
+   "data": {
+    "pipeline_id": "48323c7f-e379-4e16-8b58-dc69643f653d"
+   }
+  },
+  "status_code": 201
+ },
+ {
+  "name": "GET /v2/computations/48323c7f-e379-4e16-8b58-dc69643f653d",
+  "description": "<Request('GET', 'http://director-v2:8000/v2/computations/48323c7f-e379-4e16-8b58-dc69643f653d?user_id=1')>",
+  "method": "GET",
+  "host": "director-v2",
+  "path": {
+   "path": "/v2/computations/{project_id}",
+   "path_parameters": [
+    {
+     "in": "path",
+     "name": "project_id",
+     "required": true,
+     "schema": {
+      "title": "Project Id",
+      "type": "str",
+      "pattern": null,
+      "format": "uuid",
+      "exclusiveMinimum": null,
+      "minimum": null,
+      "anyOf": null,
+      "allOf": null,
+      "oneOf": null
+     },
+     "response_value": "computations"
+    }
+   ]
   },
+  "query": "user_id=1",
+  "request_payload": null,
   "response_body": {
-   "id": "6e52228c-6edd-4505-9131-e901fdad5b17",
-   "state": "PUBLISHED",
+   "id": "48323c7f-e379-4e16-8b58-dc69643f653d",
+   "state": "STARTED",
    "result": null,
    "pipeline_details": {
     "adjacency_list": {
-     "97792753-cbda-56a7-b8c0-576f990b21c0": []
+     "3b0b20e0-c860-51d9-9f82-d6b4bc5c2f24": []
     },
     "progress": 0.0,
     "node_states": {
-     "97792753-cbda-56a7-b8c0-576f990b21c0": {
+     "3b0b20e0-c860-51d9-9f82-d6b4bc5c2f24": {
       "modified": true,
       "dependencies": [],
-      "currentStatus": "PUBLISHED",
-      "progress": null
+      "currentStatus": "STARTED",
+      "progress": 0.0
      }
     }
    },
-   "iteration": 9,
+   "iteration": 1,
    "cluster_id": 0,
-   "started": null,
-   "stopped": "2023-10-19T12:59:28.719336+00:00",
-   "submitted": "2023-10-19T12:59:50.999473+00:00",
-   "url": "http://director-v2:8000/v2/computations/6e52228c-6edd-4505-9131-e901fdad5b17?user_id=1",
-   "stop_url": "http://director-v2:8000/v2/computations/6e52228c-6edd-4505-9131-e901fdad5b17:stop?user_id=1"
+   "started": "2023-10-26T14:19:05.389765+00:00",
+   "stopped": null,
+   "submitted": "2023-10-26T14:19:05.241935+00:00",
+   "url": "http://director-v2:8000/v2/computations/48323c7f-e379-4e16-8b58-dc69643f653d?user_id=1",
+   "stop_url": "http://director-v2:8000/v2/computations/48323c7f-e379-4e16-8b58-dc69643f653d:stop?user_id=1"
   },
-  "status_code": 201
+  "status_code": 200
  }
 ]