move start_solver_job to job_service

Author: bisgaard-itis

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

@@ -22,18 +22,27 @@
 from models_library.users import UserID
 from pydantic import HttpUrl
 from servicelib.logging_utils import log_context
+from simcore_service_api_server.api.routes.solvers_jobs import compose_job_resource_name
 
 from ._service_solvers import (
     SolverService,
 )
+from .exceptions.backend_errors import JobAssetsMissingError, ProjectAlreadyStartedError
 from .exceptions.custom_errors import SolverServiceListJobsFiltersError
 from .models.api_resources import RelativeResourceName
 from .models.basic_types import NameValueTuple, VersionStr
-from .models.schemas.jobs import Job, JobID, JobInputs, compose_resource_name
+from .models.schemas.jobs import (
+    Job,
+    JobID,
+    JobInputs,
+    JobPricingSpecification,
+    compose_resource_name,
+)
 from .models.schemas.programs import Program
 from .models.schemas.solvers import Solver, SolverKeyId
 from .models.schemas.studies import StudyID
 from .services_http.director_v2 import DirectorV2Api
+from .services_http.jobs import start_project
 from .services_http.solver_job_models_converters import (
     JobStatus,
     create_job_from_project,
@@ -317,3 +326,39 @@ async def inspect_solver_job(
         )
         job_status: JobStatus = create_jobstatus_from_task(task)
         return job_status
+
+    async def start_solver_job(
+        self,
+        *,
+        solver_key: SolverKeyId,
+        version: VersionStr,
+        job_id: JobID,
+        pricing_spec: JobPricingSpecification | None,
+    ):
+        job_name = compose_job_resource_name(solver_key, version, job_id)
+        _logger.debug("Start Job '%s'", job_name)
+        job_parent_resource_name = Solver.compose_resource_name(solver_key, version)
+        job = await self.get_job(
+            job_id=job_id, job_parent_resource_name=job_parent_resource_name
+        )
+        if job.storage_assets_deleted:
+            raise JobAssetsMissingError(job_id=job_id)
+        try:
+            await start_project(
+                pricing_spec=pricing_spec,
+                job_id=job_id,
+                expected_job_name=job_name,
+                webserver_api=self._web_rest_client,
+            )
+        except ProjectAlreadyStartedError:
+            job_status = await self.inspect_solver_job(
+                solver_key=solver_key,
+                version=version,
+                job_id=job_id,
+            )
+            return job_status
+        return await self.inspect_solver_job(
+            solver_key=solver_key,
+            version=version,
+            job_id=job_id,
+        )

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

@@ -4,16 +4,13 @@
 from collections.abc import Callable
 from typing import Annotated, Any
 
-from fastapi import APIRouter, Depends, Header, HTTPException, Query, Request, status
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import JSONResponse
+from fastapi import APIRouter, Depends, Header, Query, Request, status
 from models_library.clusters import ClusterID
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from pydantic.types import PositiveInt
 
 from ..._service_jobs import JobService
-from ...exceptions.backend_errors import ProjectAlreadyStartedError
 from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import VersionStr
 from ...models.schemas.errors import ErrorGet
@@ -23,11 +20,12 @@
     JobInputs,
     JobMetadata,
     JobMetadataUpdate,
+    JobPricingSpecification,
     JobStatus,
 )
 from ...models.schemas.solvers import Solver, SolverKeyId
 from ...services_http.director_v2 import DirectorV2Api
-from ...services_http.jobs import replace_custom_metadata, start_project, stop_project
+from ...services_http.jobs import replace_custom_metadata, stop_project
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id
 from ..dependencies.services import get_api_client, get_job_service
@@ -211,49 +209,15 @@ async def start_job(
     solver_key: SolverKeyId,
     version: VersionStr,
     job_id: JobID,
-    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)],
     job_service: Annotated[JobService, Depends(get_job_service)],
     cluster_id: Annotated[  # pylint: disable=unused-argument  # noqa: ARG001
         ClusterID | None, Query(deprecated=True)
     ] = None,
 ):
-    job_name = compose_job_resource_name(solver_key, version, job_id)
-    _logger.debug("Start Job '%s'", job_name)
+    pricing_spec = JobPricingSpecification.create_from_headers(headers=request.headers)
 
-    job_parent_resource_name = Solver.compose_resource_name(solver_key, version)
-    job = await job_service.get_job(
-        job_id=job_id, job_parent_resource_name=job_parent_resource_name
-    )
-    if job.storage_assets_deleted:
-        raise HTTPException(
-            status_code=status.HTTP_409_CONFLICT,
-            detail=f"Assets for job job_id={job_id} are missing",
-        )
-
-    try:
-        await start_project(
-            request=request,
-            job_id=job_id,
-            expected_job_name=job_name,
-            webserver_api=webserver_api,
-        )
-    except ProjectAlreadyStartedError:
-        job_status = await inspect_job(
-            solver_key=solver_key,
-            version=version,
-            job_id=job_id,
-            job_service=job_service,
-        )
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=jsonable_encoder(job_status)
-        )
-    return await inspect_job(
-        solver_key=solver_key,
-        version=version,
-        job_id=job_id,
-        job_service=job_service,
+    return await job_service.start_solver_job(
+        solver_key=solver_key, version=version, job_id=job_id, pricing_spec=pricing_spec
     )
 
 

services/api-server/src/simcore_service_api_server/exceptions/backend_errors.py

@@ -140,3 +140,8 @@ class CanNotCheckoutServiceIsNotRunningError(BaseBackEndError):
 class LicensedItemCheckoutNotFoundError(BaseBackEndError):
     msg_template = "Licensed item checkout {licensed_item_checkout_id} not found."
     status_code = status.HTTP_404_NOT_FOUND
+
+
+class JobAssetsMissingError(BaseBackEndError):
+    msg_template = "Job assets missing for job {job_id}"
+    status_code = status.HTTP_409_CONFLICT

services/api-server/src/simcore_service_api_server/services_http/jobs.py

@@ -2,14 +2,13 @@
 from typing import Annotated
 from uuid import UUID
 
-from fastapi import Depends, HTTPException, Request, status
+from fastapi import Depends, HTTPException, status
 from models_library.api_schemas_webserver.projects import ProjectGet
 from pydantic import HttpUrl, PositiveInt
 from servicelib.logging_utils import log_context
 
 from ..api.dependencies.authentication import get_current_user_id
 from ..api.dependencies.services import get_api_client
-from ..api.dependencies.webserver_http import get_webserver_session
 from ..models.schemas.jobs import (
     JobID,
     JobMetadata,
@@ -36,12 +35,12 @@ def raise_if_job_not_associated_with_solver(
 
 async def start_project(
     *,
-    request: Request,
     job_id: JobID,
     expected_job_name: str,
-    webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
+    pricing_spec: JobPricingSpecification | None,
+    webserver_api: AuthSession,
 ) -> None:
-    if pricing_spec := JobPricingSpecification.create_from_headers(request.headers):
+    if pricing_spec is not None:
         with log_context(_logger, logging.DEBUG, "Set pricing plan and unit"):
             project: ProjectGet = await webserver_api.get_project(project_id=job_id)
             raise_if_job_not_associated_with_solver(expected_job_name, project)