cleanup

Author: bisgaard-itis

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

@@ -22,12 +22,11 @@
 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.backend_errors import JobAssetsMissingError
 from .exceptions.custom_errors import SolverServiceListJobsFiltersError
 from .models.api_resources import RelativeResourceName
 from .models.basic_types import NameValueTuple, VersionStr
@@ -59,6 +58,14 @@
 _logger = logging.getLogger(__name__)
 
 
+def compose_job_resource_name(solver_key, solver_version, job_id) -> str:
+    """Creates a unique resource name for solver's jobs"""
+    return Job.compose_resource_name(
+        parent_name=Solver.compose_resource_name(solver_key, solver_version),
+        job_id=job_id,
+    )
+
+
 @dataclass(frozen=True, kw_only=True)
 class JobService:
     _web_rest_client: AuthSession
@@ -335,6 +342,9 @@ async def start_solver_job(
         job_id: JobID,
         pricing_spec: JobPricingSpecification | None,
     ):
+        """
+        Raises ProjectAlreadyStartedError if the project is already started
+        """
         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)
@@ -343,20 +353,12 @@ async def start_solver_job(
         )
         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
+        await start_project(
+            pricing_spec=pricing_spec,
+            job_id=job_id,
+            expected_job_name=job_name,
+            webserver_api=self._web_rest_client,
+        )
         return await self.inspect_solver_job(
             solver_key=solver_key,
             version=version,

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

@@ -5,12 +5,14 @@
 from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, Header, Query, Request, status
+from fastapi.responses import JSONResponse
 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 ..._service_jobs import JobService, compose_job_resource_name
+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
@@ -42,14 +44,6 @@
 router = APIRouter()
 
 
-def compose_job_resource_name(solver_key, solver_version, job_id) -> str:
-    """Creates a unique resource name for solver's jobs"""
-    return Job.compose_resource_name(
-        parent_name=Solver.compose_resource_name(solver_key, solver_version),
-        job_id=job_id,
-    )
-
-
 # JOBS ---------------
 #
 # - Similar to docker container's API design (container = job and image = solver)
@@ -216,9 +210,20 @@ async def start_job(
 ):
     pricing_spec = JobPricingSpecification.create_from_headers(headers=request.headers)
 
-    return await job_service.start_solver_job(
-        solver_key=solver_key, version=version, job_id=job_id, pricing_spec=pricing_spec
-    )
+    try:
+        return await job_service.start_solver_job(
+            solver_key=solver_key,
+            version=version,
+            job_id=job_id,
+            pricing_spec=pricing_spec,
+        )
+    except ProjectAlreadyStartedError:
+        job_status = await job_service.inspect_solver_job(
+            solver_key=solver_key, version=version, job_id=job_id
+        )
+        return JSONResponse(
+            status_code=status.HTTP_200_OK, content=job_status.model_dump(mode="json")
+        )
 
 
 @router.post(

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

@@ -28,6 +28,7 @@
     JobMetadata,
     JobMetadataUpdate,
     JobOutputs,
+    JobPricingSpecification,
     JobStatus,
 )
 from ...models.schemas.studies import JobLogsMap, Study, StudyID
@@ -288,14 +289,16 @@ async def start_study_job(
         ),
     ] = None,
 ):
+    pricing_spec = JobPricingSpecification.create_from_headers(headers=request.headers)
+
     job_name = _compose_job_resource_name(study_id, job_id)
     with log_context(_logger, logging.DEBUG, f"Starting Job '{job_name}'"):
         try:
             await start_project(
-                request=request,
                 job_id=job_id,
                 expected_job_name=job_name,
                 webserver_api=webserver_api,
+                pricing_spec=pricing_spec,
             )
         except ProjectAlreadyStartedError:
             job_status: JobStatus = await inspect_study_job(

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

@@ -1,14 +1,11 @@
 import logging
-from typing import Annotated
 from uuid import UUID
 
-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 ..exceptions.backend_errors import InvalidInputError
 from ..models.schemas.jobs import (
     JobID,
     JobMetadata,
@@ -27,10 +24,7 @@ def raise_if_job_not_associated_with_solver(
     expected_project_name: str, project: ProjectGet
 ) -> None:
     if expected_project_name != project.name:
-        raise HTTPException(
-            status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=f"Invalid input data for job {project.uuid}",
-        )
+        raise InvalidInputError()
 
 
 async def start_project(
@@ -59,8 +53,8 @@ async def start_project(
 async def stop_project(
     *,
     job_id: JobID,
-    user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
-    director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
+    user_id: PositiveInt,
+    director2_api: DirectorV2Api,
 ) -> JobStatus:
     await director2_api.stop_computation(project_id=job_id, user_id=user_id)