🐛 Fixes mismatch on error status-code for start-computation (#5994)

Author: pcrespov

api/specs/web-server/_computations.py

@@ -29,23 +29,16 @@ async def get_computation(project_id: ProjectID):
     "/computations/{project_id}:start",
     response_model=Envelope[_ComputationStarted],
     responses={
-        status.HTTP_404_NOT_FOUND: {
-            "description": "Project/wallet/pricing details not found"
-        },
         status.HTTP_402_PAYMENT_REQUIRED: {
-            "description": "Insufficient osparc credits"
-        },
-        status.HTTP_406_NOT_ACCEPTABLE: {
-            "description": "Cluster not found",
+            "description": "Insufficient credits to run computation"
         },
-        status.HTTP_503_SERVICE_UNAVAILABLE: {
-            "description": "Service not available",
-        },
-        status.HTTP_422_UNPROCESSABLE_ENTITY: {
-            "description": "Configuration error",
+        status.HTTP_404_NOT_FOUND: {
+            "description": "Project/wallet/pricing details were not found"
         },
-        status.HTTP_402_PAYMENT_REQUIRED: {"description": "Payment required"},
+        status.HTTP_406_NOT_ACCEPTABLE: {"description": "Cluster not found"},
         status.HTTP_409_CONFLICT: {"description": "Project already started"},
+        status.HTTP_422_UNPROCESSABLE_ENTITY: {"description": "Configuration error"},
+        status.HTTP_503_SERVICE_UNAVAILABLE: {"description": "Service not available"},
     },
 )
 async def start_computation(project_id: ProjectID, _start: ComputationStart):

services/director-v2/src/simcore_service_director_v2/api/routes/computations.py

@@ -98,15 +98,15 @@
 router = APIRouter()
 
 
-async def _check_pipeline_not_running(
+async def _check_pipeline_not_running_or_raise_409(
     comp_tasks_repo: CompTasksRepository, computation: ComputationCreate
 ) -> None:
     pipeline_state = utils.get_pipeline_state_from_task_states(
         await comp_tasks_repo.list_computational_tasks(computation.project_id)
     )
     if utils.is_pipeline_running(pipeline_state):
         raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
+            status_code=status.HTTP_409_CONFLICT,
             detail=f"Project {computation.project_id} already started, current state is {pipeline_state}",
         )
 
@@ -324,7 +324,7 @@ async def create_computation(  # noqa: PLR0913
         project: ProjectAtDB = await project_repo.get_project(computation.project_id)
 
         # check if current state allow to modify the computation
-        await _check_pipeline_not_running(comp_tasks_repo, computation)
+        await _check_pipeline_not_running_or_raise_409(comp_tasks_repo, computation)
 
         # create the complete DAG graph
         complete_dag = create_complete_dag(project.workbench)

services/director-v2/tests/integration/01/test_computation_api.py

@@ -835,7 +835,7 @@ async def test_update_and_delete_computation(
     ), f"pipeline is not in the expected starting state but in {task_out.state}"
 
     # now try to update the pipeline, is expected to be forbidden
-    with pytest.raises(httpx.HTTPStatusError, match=f"{status.HTTP_403_FORBIDDEN}"):
+    with pytest.raises(httpx.HTTPStatusError, match=f"{status.HTTP_409_CONFLICT}"):
         await create_pipeline(
             async_client,
             project=sleepers_project,

services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js

@@ -472,7 +472,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
         this.getStudy().setPipelineRunning(false);
       }, this);
       req.addListener("fail", async e => {
-        if (e.getTarget().getStatus() == "403") {
+        if (e.getTarget().getStatus() == "409") {
           this.getStudyLogger().error(null, "Pipeline is already running");
         } else if (e.getTarget().getStatus() == "422") {
           this.getStudyLogger().info(null, "The pipeline is up-to-date");

services/web/server/tests/integration/02/test_computation.py

@@ -85,7 +85,7 @@ class _ExpectedResponseTuple(NamedTuple):
     ok: int
     created: int
     no_content: int
-    forbidden: int
+    confict: int
 
     # pylint: disable=no-member
     def __str__(self) -> str:
@@ -105,7 +105,7 @@ def standard_role_response():
                     ok=status.HTTP_401_UNAUTHORIZED,
                     created=status.HTTP_401_UNAUTHORIZED,
                     no_content=status.HTTP_401_UNAUTHORIZED,
-                    forbidden=status.HTTP_401_UNAUTHORIZED,
+                    confict=status.HTTP_401_UNAUTHORIZED,
                 ),
             ),
             pytest.param(
@@ -114,7 +114,7 @@ def standard_role_response():
                     ok=status.HTTP_200_OK,
                     created=status.HTTP_201_CREATED,
                     no_content=status.HTTP_204_NO_CONTENT,
-                    forbidden=status.HTTP_403_FORBIDDEN,
+                    confict=status.HTTP_409_CONFLICT,
                 ),
             ),
             pytest.param(
@@ -123,7 +123,7 @@ def standard_role_response():
                     ok=status.HTTP_200_OK,
                     created=status.HTTP_201_CREATED,
                     no_content=status.HTTP_204_NO_CONTENT,
-                    forbidden=status.HTTP_403_FORBIDDEN,
+                    confict=status.HTTP_409_CONFLICT,
                 ),
             ),
             pytest.param(
@@ -132,7 +132,7 @@ def standard_role_response():
                     ok=status.HTTP_200_OK,
                     created=status.HTTP_201_CREATED,
                     no_content=status.HTTP_204_NO_CONTENT,
-                    forbidden=status.HTTP_403_FORBIDDEN,
+                    confict=status.HTTP_409_CONFLICT,
                 ),
             ),
         ],
@@ -390,7 +390,7 @@ async def test_start_stop_computation(
     if not error:
         # starting again should be disallowed, since it's already running
         resp = await client.post(f"{url_start}")
-        assert resp.status == expected.forbidden
+        assert resp.status == expected.confict
 
         assert "pipeline_id" in data
         assert data["pipeline_id"] == project_id