fix tests after refactoring

Author: bisgaard-itis

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

@@ -27,9 +27,12 @@
 from .models.schemas.programs import Program
 from .models.schemas.solvers import Solver, SolverKeyId
 from .models.schemas.studies import StudyID
+from .services_http.director_v2 import DirectorV2Api
 from .services_http.solver_job_models_converters import (
+    JobStatus,
     create_job_from_project,
     create_job_inputs_from_node_inputs,
+    create_jobstatus_from_task,
     create_new_project_for_job,
 )
 from .services_http.webserver import AuthSession
@@ -45,6 +48,7 @@ class JobService:
     _web_rest_client: AuthSession
     _web_rpc_client: WbApiRpcClient
     _storage_rpc_client: StorageService
+    _director2_api: DirectorV2Api
     _directorv2_rpc_client: DirectorV2Service
     _solver_service: SolverService
     user_id: UserID
@@ -260,3 +264,18 @@ async def create_solver_job(
         )
 
         return job
+
+    async def inspect_solver_job(
+        self,
+        *,
+        solver_key: SolverKeyId,
+        version: VersionStr,
+        job_id: JobID,
+    ):
+        assert solver_key  # nosec
+        assert version  # nosec
+        task = await self._director2_api.get_computation(
+            project_id=job_id, user_id=self.user_id
+        )
+        job_status: JobStatus = create_jobstatus_from_task(task)
+        return job_status

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

@@ -7,12 +7,13 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 from servicelib.rabbitmq import RabbitMQRPCClient
-from simcore_service_api_server._service_function_jobs import FunctionJobService
-from simcore_service_api_server._service_functions import FunctionService
 
+from ..._service_function_jobs import FunctionJobService
+from ..._service_functions import FunctionService
 from ..._service_jobs import JobService
 from ..._service_programs import ProgramService
 from ..._service_solvers import SolverService
+from ...services_http.director_v2 import DirectorV2Api
 from ...services_http.webserver import AuthSession
 from ...services_rpc.catalog import CatalogService
 from ...services_rpc.director_v2 import DirectorV2Service
@@ -111,6 +112,7 @@ def get_job_service(
     web_rpc_api: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
     storage_service: Annotated[StorageService, Depends(get_storage_service)],
     directorv2_service: Annotated[DirectorV2Service, Depends(get_directorv2_service)],
+    director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
     user_id: Annotated[UserID, Depends(get_current_user_id)],
     product_name: Annotated[ProductName, Depends(get_product_name)],
     solver_service: Annotated[SolverService, Depends(get_solver_service)],
@@ -124,6 +126,7 @@ def get_job_service(
         _web_rpc_client=web_rpc_api,
         _storage_rpc_client=storage_service,
         _directorv2_rpc_client=directorv2_service,
+        _director2_api=director2_api,
         _solver_service=solver_service,
         user_id=user_id,
         product_name=product_name,

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

@@ -206,6 +206,7 @@ async def function_job_status(
     function: Annotated[RegisteredFunction, Depends(get_function_from_functionjob)],
     stored_job_status: Annotated[FunctionJobStatus, Depends(get_stored_job_status)],
     director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
+    job_service: Annotated[JobService, Depends(get_job_service)],
     user_id: Annotated[UserID, Depends(get_current_user_id)],
     product_name: Annotated[ProductName, Depends(get_product_name)],
     wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
@@ -231,8 +232,7 @@ async def function_job_status(
             solver_key=function.solver_key,
             version=function.solver_version,
             job_id=function_job.solver_job_id,
-            user_id=user_id,
-            director2_api=director2_api,
+            job_service=job_service,
         )
     else:
         raise UnsupportedFunctionFunctionJobClassCombinationError(

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

@@ -13,7 +13,6 @@
 from pydantic.types import PositiveInt
 
 from ..._service_jobs import JobService
-from ..._service_solvers import SolverService
 from ...exceptions.backend_errors import ProjectAlreadyStartedError
 from ...exceptions.service_errors_utils import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import VersionStr
@@ -29,12 +28,9 @@
 from ...models.schemas.solvers import Solver, SolverKeyId
 from ...services_http.director_v2 import DirectorV2Api
 from ...services_http.jobs import replace_custom_metadata, start_project, stop_project
-from ...services_http.solver_job_models_converters import (
-    create_jobstatus_from_task,
-)
 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, get_solver_service
+from ..dependencies.services import get_api_client, get_job_service
 from ..dependencies.webserver_http import AuthSession, get_webserver_session
 from ._constants import (
     FMSG_CHANGELOG_ADDED_IN_VERSION,
@@ -97,7 +93,6 @@ async def create_solver_job(  # noqa: PLR0913
     solver_key: SolverKeyId,
     version: VersionStr,
     inputs: JobInputs,
-    solver_service: Annotated[SolverService, Depends(get_solver_service)],
     job_service: Annotated[JobService, Depends(get_job_service)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     hidden: Annotated[bool, Query()] = True,
@@ -109,24 +104,16 @@ async def create_solver_job(  # noqa: PLR0913
     NOTE: This operation does **not** start the job
     """
 
-    # ensures user has access to solver
-    solver = await solver_service.get_solver(
+    return await job_service.create_solver_job(
         solver_key=solver_key,
-        solver_version=version,
-    )
-    job, _ = await job_service.create_project_marked_as_job(
-        project_name=None,
-        description=None,
-        solver_or_program=solver,
+        version=version,
         inputs=inputs,
-        url_for=url_for,
         hidden=hidden,
-        parent_project_uuid=x_simcore_parent_project_uuid,
-        parent_node_id=x_simcore_parent_node_id,
+        x_simcore_parent_project_uuid=x_simcore_parent_project_uuid,
+        x_simcore_parent_node_id=x_simcore_parent_node_id,
+        url_for=url_for,
     )
 
-    return job
-
 
 @router.delete(
     "/{solver_key:path}/releases/{version}/jobs/{job_id:uuid}",
@@ -193,6 +180,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)],
+    job_service: Annotated[JobService, Depends(get_job_service)],
     cluster_id: Annotated[  # pylint: disable=unused-argument  # noqa: ARG001
         ClusterID | None, Query(deprecated=True)
     ] = None,
@@ -212,8 +200,7 @@ async def start_job(
             solver_key=solver_key,
             version=version,
             job_id=job_id,
-            user_id=user_id,
-            director2_api=director2_api,
+            job_service=job_service,
         )
         return JSONResponse(
             status_code=status.HTTP_200_OK, content=jsonable_encoder(job_status)
@@ -222,8 +209,7 @@ async def start_job(
         solver_key=solver_key,
         version=version,
         job_id=job_id,
-        user_id=user_id,
-        director2_api=director2_api,
+        job_service=job_service,
     )
 
 
@@ -268,15 +254,14 @@ async def inspect_job(
     solver_key: SolverKeyId,
     version: VersionStr,
     job_id: JobID,
-    user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
-    director2_api: Annotated[DirectorV2Api, Depends(get_api_client(DirectorV2Api))],
+    job_service: Annotated[JobService, Depends(get_job_service)],
 ) -> JobStatus:
     job_name = compose_job_resource_name(solver_key, version, job_id)
     _logger.debug("Inspecting Job '%s'", job_name)
 
-    task = await director2_api.get_computation(project_id=job_id, user_id=user_id)
-    job_status: JobStatus = create_jobstatus_from_task(task)
-    return job_status
+    return await job_service.inspect_solver_job(
+        solver_key=solver_key, version=version, job_id=job_id
+    )
 
 
 @router.patch(

services/api-server/tests/unit/api_functions/test_api_routers_function_jobs.py

@@ -178,6 +178,7 @@ def mocked_list_function_jobs(offset: int, limit: int):
 
 @pytest.mark.parametrize("job_status", ["SUCCESS", "FAILED", "STARTED"])
 async def test_get_function_job_status(
+    mocked_app_dependencies: None,
     client: AsyncClient,
     mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
     mock_registered_project_function_job: RegisteredProjectFunctionJob,

services/api-server/tests/unit/service/conftest.py

@@ -19,6 +19,7 @@
 from simcore_service_api_server._service_jobs import JobService
 from simcore_service_api_server._service_programs import ProgramService
 from simcore_service_api_server._service_solvers import SolverService
+from simcore_service_api_server.services_http.director_v2 import DirectorV2Api
 from simcore_service_api_server.services_http.webserver import AuthSession
 from simcore_service_api_server.services_rpc.catalog import CatalogService
 from simcore_service_api_server.services_rpc.director_v2 import DirectorV2Service
@@ -107,6 +108,11 @@ async def _create_project(project: ProjectCreateNew, **kwargs):
     return mock
 
 
+@pytest.fixture
+def director2_api(mocker: MockerFixture) -> DirectorV2Api:
+    return mocker.AsyncMock(spec=DirectorV2Api)
+
+
 @pytest.fixture
 def catalog_service(
     mocked_rpc_client: MockType,
@@ -144,6 +150,7 @@ def job_service(
     director_v2_rpc_client: DirectorV2Service,
     storage_rpc_client: StorageService,
     wb_api_rpc_client: WbApiRpcClient,
+    director2_api: DirectorV2Api,
     product_name: ProductName,
     user_id: UserID,
     solver_service: SolverService,
@@ -153,6 +160,7 @@ def job_service(
         _web_rpc_client=wb_api_rpc_client,
         _storage_rpc_client=storage_rpc_client,
         _directorv2_rpc_client=director_v2_rpc_client,
+        _director2_api=director2_api,
         _solver_service=solver_service,
         user_id=user_id,
         product_name=product_name,

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

@@ -202,6 +202,7 @@ def _get_pricing_unit_side_effect(
     ],
 )
 async def test_start_solver_job_pricing_unit_with_payment(
+    mocked_app_dependencies: None,
     client: AsyncClient,
     mocked_webserver_rest_api_base: MockRouter,
     mocked_directorv2_rest_api_base: MockRouter,
@@ -277,6 +278,7 @@ def _put_pricing_plan_and_unit_side_effect(
 
 
 async def test_get_solver_job_pricing_unit_no_payment(
+    mocked_app_dependencies: None,
     client: AsyncClient,
     mocked_webserver_rest_api_base: MockRouter,
     mocked_directorv2_rest_api_base: MockRouter,
@@ -310,6 +312,7 @@ async def test_get_solver_job_pricing_unit_no_payment(
 
 
 async def test_start_solver_job_conflict(
+    mocked_app_dependencies: None,
     client: AsyncClient,
     mocked_webserver_rest_api_base: MockRouter,
     mocked_directorv2_rest_api_base: MockRouter,