add test

Author: bisgaard-itis

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

@@ -67,7 +67,7 @@ async def create_job(
     ) -> tuple[Job, ProjectGet]:
         # creates NEW job as prototype
         pre_job = Job.create_job_from_solver_or_program(
-            solver_or_program_name=solver_or_program.name, inputs=inputs, name=name
+            solver_or_program_name=solver_or_program.name, inputs=inputs
         )
         with log_context(
             logger=_logger, level=logging.DEBUG, msg=f"Creating job {pre_job.name}"
@@ -77,6 +77,7 @@ async def create_job(
                 job=pre_job,
                 inputs=inputs,
                 description=description,
+                name=name,
             )
             new_project: ProjectGet = await self._web_rest_api.create_project(
                 project_in,

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

@@ -24,8 +24,6 @@
     StringConstraints,
     TypeAdapter,
     ValidationError,
-    ValidationInfo,
-    field_validator,
 )
 from servicelib.logging_utils import LogLevelInt, LogMessageStr
 from starlette.datastructures import Headers
@@ -275,28 +273,18 @@ class Job(BaseModel):
         }
     )
 
-    @field_validator("name", mode="before")
-    @classmethod
-    def _check_name(cls, v, info: ValidationInfo):
-        _id = str(info.data["id"])
-        if not v.endswith(f"/{_id}"):
-            msg = f"Resource name [{v}] and id [{_id}] do not match"
-            raise ValueError(msg)
-        return v
-
     # constructors ------
 
     @classmethod
     def create_now(
         cls,
         parent_name: RelativeResourceName,
         inputs_checksum: str,
-        name: str | None = None,
     ) -> "Job":
         global_uuid = uuid4()
 
         return cls(
-            name=name or cls.compose_resource_name(parent_name, global_uuid),
+            name=cls.compose_resource_name(parent_name, global_uuid),
             id=global_uuid,
             runner_name=parent_name,
             inputs_checksum=inputs_checksum,
@@ -308,10 +296,9 @@ def create_now(
 
     @classmethod
     def create_job_from_solver_or_program(
-        cls, *, solver_or_program_name: str, inputs: JobInputs, name: str | None = None
+        cls, *, solver_or_program_name: str, inputs: JobInputs
     ):
         return Job.create_now(
-            name=name,
             parent_name=solver_or_program_name,
             inputs_checksum=inputs.compute_checksum(),
         )

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

@@ -3,7 +3,6 @@
 services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs.py
 """
 
-import urllib.parse
 import uuid
 from collections.abc import Callable
 from datetime import UTC, datetime
@@ -124,6 +123,7 @@ def create_new_project_for_job(
     job: Job,
     inputs: JobInputs,
     description: str | None = None,
+    name: str | None = None,
 ) -> ProjectCreateNew:
     """
     Creates a project for a solver's job
@@ -162,7 +162,7 @@ def create_new_project_for_job(
 
     return ProjectCreateNew(
         uuid=project_id,
-        name=job.name,  # NOTE: this IS an identifier as well. MUST NOT be changed in the case of project APIs!
+        name=name or job.name,
         description=description
         or f"Study associated to solver/study/program job:\n{job_info}",
         thumbnail="https://via.placeholder.com/170x120.png",  # type: ignore[arg-type]
@@ -199,8 +199,6 @@ def create_job_from_project(
     raise ValidationError
     """
     assert len(project.workbench) == 1  # nosec
-    assert solver_or_program.version in project.name  # nosec
-    assert urllib.parse.quote_plus(solver_or_program.id) in project.name  # nosec
 
     # get solver node
     node_id = next(iter(project.workbench.keys()))
@@ -216,7 +214,9 @@ def create_job_from_project(
 
     job = Job(
         id=job_id,
-        name=project.name,
+        name=Job.compose_resource_name(
+            parent_name=solver_or_program_name, job_id=job_id
+        ),
         inputs_checksum=job_inputs.compute_checksum(),
         created_at=project.creation_date,  # type: ignore[arg-type]
         runner_name=solver_or_program_name,

services/api-server/tests/unit/test_api_programs.py

@@ -7,6 +7,7 @@
 
 import httpx
 import pytest
+from faker import Faker
 from fastapi import status
 from httpx import AsyncClient
 from models_library.api_schemas_storage.storage_schemas import FileUploadSchema
@@ -20,6 +21,8 @@
 from simcore_service_api_server.models.schemas.jobs import Job
 from simcore_service_api_server.models.schemas.programs import Program
 
+_faker = Faker()
+
 
 async def test_get_program_release(
     auth: httpx.BasicAuth,
@@ -43,17 +46,29 @@ async def test_get_program_release(
     assert program.version == version
 
 
+@pytest.mark.parametrize(
+    "job_name,job_description",
+    [
+        (None, None),
+        (_faker.name(), None),
+        (None, _faker.sentence()),
+        (_faker.name(), _faker.sentence()),
+    ],
+)
 @pytest.mark.parametrize("capture_name", ["create_program_job_success.json"])
 async def test_create_program_job(
     auth: httpx.BasicAuth,
     client: AsyncClient,
     mocked_webserver_rest_api_base,
     mocked_rpc_catalog_service_api: dict[str, MockType],
+    mocked_webserver_rpc_api: dict[str, MockType],
     create_respx_mock_from_capture: CreateRespxMockCallback,
     mocker: MockerFixture,
     user_id: UserID,
     capture_name: str,
     project_tests_dir: Path,
+    job_name: str | None,
+    job_description: str | None,
 ):
 
     mocker.patch(
@@ -76,18 +91,33 @@ def _side_effect(
 
         response_body = capture.response_body
 
-        # first call defines the project uuid
+        # first call creates project
         if server_state.get("project_uuid") is None:
-            _project_uuid = json.loads(request.content.decode("utf-8")).get("uuid")
+            get_body_field = lambda field: json.loads(
+                request.content.decode("utf-8")
+            ).get(field)
+
+            _project_uuid = get_body_field("uuid")
             assert _project_uuid
             server_state["project_uuid"] = _project_uuid
 
+            _name = get_body_field("name")
+            assert _name
+            server_state["name"] = _name
+
+            _description = get_body_field("description")
+            assert _description
+            server_state["description"] = _description
+
+            if job_name:
+                assert job_name == get_body_field("name")
+            if job_description:
+                assert job_description == get_body_field("description")
+
         if request.url.path.endswith("/result"):
-            capture_uuid = response_body["data"]["uuid"]
             response_body["data"]["uuid"] = server_state["project_uuid"]
-            response_body["data"]["name"] = response_body["data"]["name"].replace(
-                capture_uuid, server_state["project_uuid"]
-            )
+            response_body["data"]["name"] = server_state["name"]
+            response_body["data"]["description"] = server_state["description"]
         assert isinstance(response_body, dict)
         return response_body
 
@@ -100,14 +130,15 @@ def _side_effect(
         side_effects_callbacks=3 * [partial(_side_effect, _server_state)],
     )
 
-    # Arrange
     program_key = "simcore/services/dynamic/electrode-selector"
     version = "2.1.3"
 
+    body = {"name": job_name, "description": job_description}
+
     response = await client.post(
         f"/{API_VTAG}/programs/{program_key}/releases/{version}/jobs",
-        # headers=headers,
         auth=auth,
+        json={k: v for k, v in body.items() if v is not None},
     )
 
     # Assert