@bisgaard-itis review: url jobs moved

Author: pcrespov

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

@@ -14,7 +14,7 @@
 from models_library.projects_nodes_io import BaseFileLink
 from models_library.users import UserID
 from models_library.wallets import ZERO_CREDITS
-from pydantic import NonNegativeInt
+from pydantic import HttpUrl, NonNegativeInt
 from pydantic.types import PositiveInt
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from servicelib.logging_utils import log_context
@@ -36,7 +36,6 @@
     JobLog,
     JobMetadata,
     JobOutputs,
-    update_job_urls,
 )
 from ...models.schemas.model_adapter import (
     PricingUnitGetLegacy,
@@ -119,6 +118,36 @@
 }
 
 
+def _update_job_urls(
+    job: Job,
+    solver_key: SolverKeyId,
+    solver_version: VersionStr,
+    job_id: JobID | str,
+    url_for: Callable[..., HttpUrl],
+) -> Job:
+    job.url = url_for(
+        "get_job",
+        solver_key=solver_key,
+        version=solver_version,
+        job_id=job_id,
+    )
+
+    job.runner_url = url_for(
+        "get_solver_release",
+        solver_key=solver_key,
+        version=solver_version,
+    )
+
+    job.outputs_url = url_for(
+        "get_job_outputs",
+        solver_key=solver_key,
+        version=solver_version,
+        job_id=job_id,
+    )
+
+    return job
+
+
 router = APIRouter()
 
 
@@ -150,7 +179,7 @@ async def list_all_solvers_jobs(
 
     for job in jobs:
         solver_key, version, job_id = parse_resources_ids(job.resource_name)
-        update_job_urls(job, solver_key, version, job_id, url_for)
+        _update_job_urls(job, solver_key, version, job_id, url_for)
 
     return create_page(
         jobs,

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

@@ -48,7 +48,7 @@
 #  - custom metadata
 #
 from .programs import Program, ProgramKeyId
-from .solvers import Solver, SolverKeyId
+from .solvers import Solver
 
 JobID: TypeAlias = UUID
 
@@ -362,36 +362,6 @@ def get_outputs_url(
     return None
 
 
-def update_job_urls(
-    job: Job,
-    solver_key: SolverKeyId,
-    solver_version: VersionStr,
-    job_id: JobID | str,
-    url_for: Callable[..., HttpUrl],
-) -> Job:
-    job.url = url_for(
-        "get_job",
-        solver_key=solver_key,
-        version=solver_version,
-        job_id=job_id,
-    )
-
-    job.runner_url = url_for(
-        "get_solver_release",
-        solver_key=solver_key,
-        version=solver_version,
-    )
-
-    job.outputs_url = url_for(
-        "get_job_outputs",
-        solver_key=solver_key,
-        version=solver_version,
-        job_id=job_id,
-    )
-
-    return job
-
-
 PercentageInt: TypeAlias = Annotated[int, Field(ge=0, le=100)]