minor cleanup

Author: bisgaard-itis

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

@@ -39,6 +39,8 @@
 from .models.schemas.jobs import (
     JobInputs,
     JobPricingSpecification,
+)
+from .services_http.solver_job_models_converters import (
     get_solver_job_rest_interface_links,
 )
 from .services_rpc.wb_api_server import WbApiRpcClient

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

@@ -24,11 +24,13 @@
     JobMetadataUpdate,
     JobPricingSpecification,
     JobStatus,
-    get_solver_job_rest_interface_links,
 )
 from ...models.schemas.solvers import Solver, SolverKeyId
 from ...services_http.director_v2 import DirectorV2Api
 from ...services_http.jobs import replace_custom_metadata, stop_project
+from ...services_http.solver_job_models_converters import (
+    get_solver_job_rest_interface_links,
+)
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id
 from ..dependencies.services import get_api_client, get_job_service

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

@@ -38,7 +38,6 @@
     JobLog,
     JobMetadata,
     JobOutputs,
-    get_solver_job_rest_interface_links,
 )
 from ...models.schemas.jobs_filters import JobMetadataFilter
 from ...models.schemas.model_adapter import (
@@ -52,7 +51,10 @@
     raise_if_job_not_associated_with_solver,
 )
 from ...services_http.log_streaming import LogDistributor, LogStreamer
-from ...services_http.solver_job_models_converters import create_job_from_project
+from ...services_http.solver_job_models_converters import (
+    create_job_from_project,
+    get_solver_job_rest_interface_links,
+)
 from ...services_http.solver_job_outputs import ResultsTypes, get_solver_output_results
 from ...services_http.storage import StorageApi, to_file_api_model
 from ..dependencies.application import get_reverse_url_mapper

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

@@ -209,7 +209,7 @@ def test_create_job_from_project(faker: Faker):
     solver_key = "simcore/services/comp/itis/sleeper"
     solver_version = "2.0.2"
 
-    fake_job_rest_interface_links = JobLinks(
+    fake_job_links = JobLinks(
         url_template=faker.url() + "/{job_id}",
         runner_url_template=faker.url(),
         outputs_url_template=faker.url() + "/{job_id}",
@@ -227,7 +227,7 @@ def test_create_job_from_project(faker: Faker):
     job = create_job_from_project(
         solver_or_program=solver,
         project=project,
-        job_links=fake_job_rest_interface_links,
+        job_links=fake_job_links,
     )
 
     assert job.id == project.uuid