removed occurences of cluster_id

Author: sanderegg

services/api-server/openapi.json

@@ -2598,7 +2598,7 @@
           "solvers"
         ],
         "summary": "Start Job",
-        "description": "Starts job job_id created with the solver solver_key:version\n\nAdded in *version 0.4.3*: query parameter `cluster_id`\nAdded in *version 0.6*: responds with a 202 when successfully starting a computation",
+        "description": "Starts job job_id created with the solver solver_key:version\n\nAdded in *version 0.4.3*: query parameter `cluster_id`\nAdded in *version 0.6*: responds with a 202 when successfully starting a computation\nChanged in *version 0.8*: query parameter `cluster_id` deprecated",
         "operationId": "start_job",
         "security": [
           {
@@ -2651,7 +2651,8 @@
                 }
               ],
               "title": "Cluster Id"
-            }
+            },
+            "deprecated": true
           }
         ],
         "responses": {
@@ -4585,7 +4586,7 @@
           "studies"
         ],
         "summary": "Start Study Job",
-        "description": "Changed in *version 0.6.0*: Now responds with a 202 when successfully starting a computation",
+        "description": "Changed in *version 0.6.0*: Now responds with a 202 when successfully starting a computation\nChanged in *version 0.8*: query parameter `cluster_id` deprecated",
         "operationId": "start_study_job",
         "security": [
           {
@@ -4628,7 +4629,8 @@
                 }
               ],
               "title": "Cluster Id"
-            }
+            },
+            "deprecated": true
           }
         ],
         "responses": {
@@ -6891,7 +6893,7 @@
             "type": "integer",
             "x_unit": "second"
           },
-          "key": "input_2",
+          "key": "f763658f-a89a-4a90-ace4-c44631290f12",
           "kind": "input"
         }
       },
@@ -7099,7 +7101,9 @@
         "required": [
           "walletId",
           "name",
+          "description",
           "owner",
+          "thumbnail",
           "status",
           "created",
           "modified",

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

@@ -40,7 +40,11 @@
 from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.services import get_api_client
 from ..dependencies.webserver import AuthSession, get_webserver_session
-from ._constants import FMSG_CHANGELOG_ADDED_IN_VERSION, FMSG_CHANGELOG_NEW_IN_VERSION
+from ._constants import (
+    FMSG_CHANGELOG_ADDED_IN_VERSION,
+    FMSG_CHANGELOG_CHANGED_IN_VERSION,
+    FMSG_CHANGELOG_NEW_IN_VERSION,
+)
 
 _logger = logging.getLogger(__name__)
 
@@ -182,6 +186,9 @@ async def delete_job(
     + FMSG_CHANGELOG_ADDED_IN_VERSION.format("0.4.3", "query parameter `cluster_id`")
     + FMSG_CHANGELOG_ADDED_IN_VERSION.format(
         "0.6", "responds with a 202 when successfully starting a computation"
+    )
+    + FMSG_CHANGELOG_CHANGED_IN_VERSION.format(
+        "0.8", "query parameter `cluster_id` deprecated"
     ),
 )
 async def start_job(
@@ -192,7 +199,7 @@ 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)],
-    cluster_id: ClusterID | None = None,
+    cluster_id: Annotated[ClusterID | None, Query(deprecated=True)] = None,
 ):
     job_name = _compose_job_resource_name(solver_key, version, job_id)
     _logger.debug("Start Job '%s'", job_name)
@@ -203,7 +210,6 @@ async def start_job(
             job_id=job_id,
             expected_job_name=job_name,
             webserver_api=webserver_api,
-            cluster_id=cluster_id,
         )
     except ProjectAlreadyStartedError:
         job_status = await inspect_job(

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

@@ -210,6 +210,9 @@ async def delete_study_job(
     },
     description=FMSG_CHANGELOG_CHANGED_IN_VERSION.format(
         "0.6.0", "Now responds with a 202 when successfully starting a computation"
+    )
+    + FMSG_CHANGELOG_CHANGED_IN_VERSION.format(
+        "0.8", "query parameter `cluster_id` deprecated"
     ),
 )
 async def start_study_job(
@@ -219,7 +222,7 @@ async def start_study_job(
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
     director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
-    cluster_id: ClusterID | None = None,
+    cluster_id: Annotated[ClusterID | None, Query(deprecated=True)] = None,
 ):
     job_name = _compose_job_resource_name(study_id, job_id)
     with log_context(_logger, logging.DEBUG, f"Starting Job '{job_name}'"):
@@ -229,7 +232,6 @@ async def start_study_job(
                 job_id=job_id,
                 expected_job_name=job_name,
                 webserver_api=webserver_api,
-                cluster_id=cluster_id,
             )
         except ProjectAlreadyStartedError:
             job_status: JobStatus = await inspect_study_job(

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

@@ -3,7 +3,6 @@
 from uuid import UUID
 
 from fastapi import FastAPI
-from models_library.clusters import ClusterID
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_pipeline import ComputationTask
 from models_library.projects_state import RunningState
@@ -102,19 +101,14 @@ async def start_computation(
         user_id: PositiveInt,
         product_name: str,
         groups_extra_properties_repository: GroupsExtraPropertiesRepository,
-        cluster_id: ClusterID | None = None,
     ) -> ComputationTaskGet:
-        extras = {}
 
         use_on_demand_clusters = (
             await groups_extra_properties_repository.use_on_demand_clusters(
                 user_id, product_name
             )
         )
 
-        if cluster_id is not None and not use_on_demand_clusters:
-            extras["cluster_id"] = cluster_id
-
         response = await self.client.post(
             "/v2/computations",
             json={
@@ -123,7 +117,6 @@ async def start_computation(
                 "start_pipeline": True,
                 "product_name": product_name,
                 "use_on_demand_clusters": use_on_demand_clusters,
-                **extras,
             },
         )
         response.raise_for_status()

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

@@ -4,7 +4,6 @@
 
 from fastapi import Depends, HTTPException, Request, status
 from models_library.api_schemas_webserver.projects import ProjectGet
-from models_library.clusters import ClusterID
 from pydantic import HttpUrl, PositiveInt
 from servicelib.logging_utils import log_context
 
@@ -41,7 +40,6 @@ async def start_project(
     job_id: JobID,
     expected_job_name: str,
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
-    cluster_id: ClusterID | None = None,
 ) -> None:
     if pricing_spec := JobPricingSpecification.create_from_headers(request.headers):
         with log_context(_logger, logging.DEBUG, "Set pricing plan and unit"):
@@ -56,7 +54,7 @@ async def start_project(
                 pricing_unit=pricing_spec.pricing_unit,
             )
     with log_context(_logger, logging.DEBUG, "Starting job"):
-        await webserver_api.start_project(project_id=job_id, cluster_id=cluster_id)
+        await webserver_api.start_project(project_id=job_id)
 
 
 async def stop_project(

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

@@ -2,9 +2,10 @@
 
 import logging
 import urllib.parse
+from collections.abc import Mapping
 from dataclasses import dataclass
 from functools import partial
-from typing import Any, Mapping
+from typing import Any
 from uuid import UUID
 
 import httpx
@@ -36,7 +37,6 @@
     WalletGet,
     WalletGetWithAvailableCredits,
 )
-from models_library.clusters import ClusterID
 from models_library.generics import Envelope
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
@@ -444,11 +444,12 @@ async def connect_pricing_unit_to_project_node(
         }
     )
     async def start_project(
-        self, *, project_id: UUID, cluster_id: ClusterID | None = None
+        self,
+        *,
+        project_id: UUID,
     ) -> None:
         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",

services/api-server/tests/unit/api_solvers/test_api_routers_solvers_jobs.py

@@ -231,7 +231,6 @@ async def test_run_solver_job(
         "result",
         "pipeline_details",
         "iteration",
-        "cluster_id",
         "url",
         "stop_url",
         "submitted",
@@ -269,7 +268,6 @@ async def test_run_solver_job(
                         "progress": 0.0,
                     },
                     "iteration": 1,
-                    "cluster_id": 0,
                     "url": "http://test.com",
                     "stop_url": "http://test.com",
                     "started": None,
@@ -365,7 +363,6 @@ async def test_run_solver_job(
     resp = await client.post(
         f"/{API_VTAG}/solvers/{solver_key}/releases/{solver_version}/jobs/{job.id}:start",
         auth=auth,
-        params={"cluster_id": 1},
     )
     assert resp.status_code == status.HTTP_202_ACCEPTED
     assert mocked_directorv2_service_api["inspect_computation"].called