refactoring

Author: bisgaard-itis

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

@@ -29,7 +29,7 @@ async def create_solver_or_program_job(
 ) -> Job:
     # creates NEW job as prototype
     pre_job = Job.create_job_from_solver_or_program(
-        solver_or_program=solver_or_program, inputs=inputs
+        solver_or_program_name=solver_or_program.name, inputs=inputs
     )
     _logger.debug("Creating Job '%s'", pre_job.name)
 
@@ -46,54 +46,13 @@ async def create_solver_or_program_job(
     assert new_project.uuid == pre_job.id  # nosec
 
     # for consistency, it rebuild job
-
-    # create urls
-    url = None
-    runner_url = None
-    outputs_url = None
-    if isinstance(solver_or_program, Solver):
-        url = url_for(
-            "get_job",
-            solver_key=solver_or_program.id,
-            version=solver_or_program.version,
-            job_id=pre_job.id,
-        )
-        runner_url = url_for(
-            "get_solver_release",
-            solver_key=solver_or_program.id,
-            version=solver_or_program.version,
-        )
-        outputs_url = url_for(
-            "get_job_outputs",
-            solver_key=solver_or_program.id,
-            version=solver_or_program.version,
-            job_id=pre_job.id,
-        )
-
     job = create_job_from_project(
-        solver_key=solver_or_program.id,
-        solver_version=solver_or_program.version,
-        project=new_project,
-        url=url,
-        runner_url=runner_url,
-        outputs_url=outputs_url,
+        solver_or_program=solver_or_program, project=new_project, url_for=url_for
     )
     assert job.id == pre_job.id  # nosec
     assert job.name == pre_job.name  # nosec
-    resource_name = ""
-    if isinstance(solver_or_program, Program):
-        resource_name = Job.compose_resource_name(
-            parent_name=Program.compose_resource_name(
-                solver_or_program.id, solver_or_program.version
-            ),
-            job_id=job.id,
-        )
-    if isinstance(solver_or_program, Solver):
-        resource_name = Job.compose_resource_name(
-            parent_name=Solver.compose_resource_name(
-                solver_or_program.id, solver_or_program.version
-            ),
-            job_id=job.id,
-        )
-    assert job.name == resource_name
+    assert job.name == Job.compose_resource_name(
+        parent_name=solver_or_program.resource_name,
+        job_id=job.id,
+    )
     return job

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

@@ -147,7 +147,9 @@ async def list_jobs(
 
     jobs: deque[Job] = deque()
     for prj in projects_page.data:
-        job = create_job_from_project(solver_key, version, prj, url_for)
+        job = create_job_from_project(
+            solver_or_program=solver, project=prj, url_for=url_for
+        )
         assert job.id == prj.uuid  # nosec
         assert job.name == prj.name  # nosec
 
@@ -191,7 +193,7 @@ async def get_jobs_page(
     )
 
     jobs: list[Job] = [
-        create_job_from_project(solver_key, version, prj, url_for)
+        create_job_from_project(solver_or_program=solver, project=prj, url_for=url_for)
         for prj in projects_page.data
     ]
 
@@ -211,17 +213,28 @@ async def get_job(
     solver_key: SolverKeyId,
     version: VersionStr,
     job_id: JobID,
+    user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
+    product_name: Annotated[str, Depends(get_product_name)],
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
+    catalog_client: Annotated[CatalogApi, Depends(get_api_client(CatalogApi))],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
 ):
     """Gets job of a given solver"""
     _logger.debug(
         "Getting Job '%s'", _compose_job_resource_name(solver_key, version, job_id)
     )
 
+    solver = await catalog_client.get_solver(
+        user_id=user_id,
+        name=solver_key,
+        version=version,
+        product_name=product_name,
+    )
     project: ProjectGet = await webserver_api.get_project(project_id=job_id)
 
-    job = create_job_from_project(solver_key, version, project, url_for)
+    job = create_job_from_project(
+        solver_or_program=solver, project=project, url_for=url_for
+    )
     assert job.id == job_id  # nosec
     return job  # nosec
 

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

@@ -25,8 +25,6 @@
 from starlette.datastructures import Headers
 
 from ...models.schemas.files import File
-from ...models.schemas.programs import Program
-from ...models.schemas.solvers import Solver
 from .._utils_pydantic import UriSchema
 from ..api_resources import (
     RelativeResourceName,
@@ -257,10 +255,10 @@ def create_now(
 
     @classmethod
     def create_job_from_solver_or_program(
-        cls, *, solver_or_program: Solver | Program, inputs: JobInputs
+        cls, *, solver_or_program_name: str, inputs: JobInputs
     ):
         return Job.create_now(
-            parent_name=solver_or_program.name,
+            parent_name=solver_or_program_name,
             inputs_checksum=inputs.compute_checksum(),
         )
 

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

@@ -1,4 +1,5 @@
 import urllib.parse
+from collections.abc import Callable
 from typing import Annotated
 
 import packaging.version
@@ -8,6 +9,7 @@
 from pydantic import BaseModel, ConfigDict, Field, HttpUrl, StringConstraints
 
 from ...models._utils_pydantic import UriSchema
+from ...models.schemas.jobs import JobID
 from ..api_resources import compose_resource_name
 from ..basic_types import VersionStr
 
@@ -106,10 +108,24 @@ def name(self) -> str:
         """API standards notation (see api_resources.py)"""
         return self.resource_name
 
+    def get_url(self, url_for: Callable[..., HttpUrl], job_id: JobID) -> HttpUrl | None:
+        # missing endpoint
+        return None
+
+    def get_runner_url(self, url_for: Callable[..., HttpUrl]) -> HttpUrl | None:
+        # missing endpoint
+        return None
+
+    def get_outputs_url(
+        self, url_for: Callable[..., HttpUrl], job_id: JobID
+    ) -> HttpUrl | None:
+        # missing endpoint
+        return None
+
     @classmethod
     def compose_resource_name(
         cls, program_key: ProgramKeyId, program_version: VersionStr
     ) -> str:
         return compose_resource_name(
-            "solvers", program_key, "releases", program_version
+            "programs", program_key, "releases", program_version
         )

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

@@ -1,4 +1,5 @@
 import urllib.parse
+from collections.abc import Callable
 from typing import Annotated, Any, Literal
 
 import packaging.version
@@ -7,6 +8,7 @@
 from models_library.services_regex import COMPUTATIONAL_SERVICE_KEY_RE
 from packaging.version import Version
 from pydantic import BaseModel, ConfigDict, Field, HttpUrl, StringConstraints
+from simcore_service_api_server.models.schemas.jobs import JobID
 
 from ...models._utils_pydantic import UriSchema
 from ..api_resources import compose_resource_name
@@ -107,6 +109,31 @@ def name(self) -> str:
         """API standards notation (see api_resources.py)"""
         return self.resource_name
 
+    def get_url(self, url_for: Callable[..., HttpUrl], job_id: JobID) -> HttpUrl:
+        return url_for(
+            "get_job",
+            solver_key=self.id,
+            version=self.version,
+            job_id=job_id,
+        )
+
+    def get_runner_url(self, url_for: Callable[..., HttpUrl]) -> HttpUrl:
+        return url_for(
+            "get_solver_release",
+            solver_key=self.id,
+            version=self.version,
+        )
+
+    def get_outputs_url(
+        self, url_for: Callable[..., HttpUrl], job_id: JobID
+    ) -> HttpUrl:
+        return url_for(
+            "get_job_outputs",
+            solver_key=self.id,
+            version=self.version,
+            job_id=job_id,
+        )
+
     @classmethod
     def compose_resource_name(cls, solver_key, solver_version) -> str:
         return compose_resource_name("solvers", solver_key, "releases", solver_version)

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

@@ -5,17 +5,18 @@
 
 import urllib.parse
 import uuid
+from collections.abc import Callable
 from datetime import UTC, datetime
 from functools import lru_cache
 
 import arrow
 from models_library.api_schemas_webserver.projects import ProjectCreateNew, ProjectGet
 from models_library.api_schemas_webserver.projects_ui import StudyUI
 from models_library.basic_types import KeyIDStr
+from models_library.projects import Project
 from models_library.projects_nodes import InputID
 from pydantic import HttpUrl, TypeAdapter
 
-from ..models.basic_types import VersionStr
 from ..models.domain.projects import InputTypes, Node, SimCoreFileLink
 from ..models.schemas.files import File
 from ..models.schemas.jobs import (
@@ -26,7 +27,7 @@
     PercentageInt,
 )
 from ..models.schemas.programs import Program
-from ..models.schemas.solvers import Solver, SolverKeyId
+from ..models.schemas.solvers import Solver
 from .director_v2 import ComputationTaskGet
 
 # UTILS ------
@@ -176,12 +177,10 @@ def create_new_project_for_job(
 
 
 def create_job_from_project(
-    solver_key: SolverKeyId,
-    solver_version: VersionStr,
-    project: ProjectGet,
-    url: HttpUrl | None,
-    runner_url: HttpUrl | None,
-    outputs_url: HttpUrl | None,
+    *,
+    solver_or_program: Solver | Program,
+    project: ProjectGet | Project,
+    url_for: Callable[..., HttpUrl],
 ) -> Job:
     """
     Given a project, creates a job
@@ -192,8 +191,8 @@ def create_job_from_project(
     raise ValidationError
     """
     assert len(project.workbench) == 1  # nosec
-    assert solver_version in project.name  # nosec
-    assert urllib.parse.quote_plus(solver_key) in project.name  # 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()))
@@ -203,7 +202,7 @@ def create_job_from_project(
     )
 
     # create solver's job
-    solver_name = Solver.compose_resource_name(solver_key, solver_version)
+    solver_or_program_name = solver_or_program.resource_name
 
     job_id = project.uuid
 
@@ -212,10 +211,10 @@ def create_job_from_project(
         name=project.name,
         inputs_checksum=job_inputs.compute_checksum(),
         created_at=project.creation_date,  # type: ignore[arg-type]
-        runner_name=solver_name,
-        url=url,
-        runner_url=runner_url,
-        outputs_url=outputs_url,
+        runner_name=solver_or_program_name,
+        url=solver_or_program.get_url(url_for=url_for, job_id=job_id),
+        runner_url=solver_or_program.get_runner_url(url_for=url_for),
+        outputs_url=solver_or_program.get_outputs_url(url_for=url_for, job_id=job_id),
     )
 
     return job

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

@@ -6,7 +6,7 @@
 from faker import Faker
 from models_library.projects import Project
 from models_library.projects_nodes import InputsDict, InputTypes, SimCoreFileLink
-from pydantic import RootModel, TypeAdapter, create_model
+from pydantic import HttpUrl, RootModel, TypeAdapter, create_model
 from simcore_service_api_server.models.schemas.files import File
 from simcore_service_api_server.models.schemas.jobs import ArgumentTypes, Job, JobInputs
 from simcore_service_api_server.models.schemas.solvers import Solver
@@ -48,7 +48,9 @@ def test_create_project_model_for_job(faker: Faker):
 
     print(inputs.model_dump_json(indent=2))
 
-    job = Job.create_job_from_solver_or_program(solver_or_program=solver, inputs=inputs)
+    job = Job.create_job_from_solver_or_program(
+        solver_or_program_name=solver.name, inputs=inputs
+    )
 
     # body of create project!
     createproject_body = create_new_project_for_job(solver, job, inputs)
@@ -197,11 +199,19 @@ def test_create_job_from_project(faker: Faker):
     solver_key = "simcore/services/comp/itis/sleeper"
     solver_version = "2.0.2"
 
-    def fake_url_for(*args, **kwargs):
-        return faker.url()
+    def fake_url_for(*args, **kwargs) -> HttpUrl:
+        return HttpUrl(faker.url())
+
+    solver = Solver(
+        id=solver_key,
+        version=solver_version,
+        title=faker.text(),
+        maintainer=faker.name(),
+        url=None,
+    )
 
     job = create_job_from_project(
-        solver_key, solver_version, project, url_for=fake_url_for
+        solver_or_program=solver, project=project, url_for=fake_url_for
     )
 
     assert job.id == project.uuid