rename back

Author: pcrespov

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

@@ -27,7 +27,7 @@
 DEFAULT_PAGINATION_LIMIT = 999  # MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1
 
 
-class JobsService:
+class JobService:
     # clients
     _web_rest_api: AuthSession
     _web_rpc_api: WbApiRpcClient

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

@@ -17,7 +17,7 @@
     SolverServiceListJobsFiltersError,
 )
 
-from ._service_jobs import JobsService
+from ._service_jobs import JobService
 from .models.api_resources import compose_resource_name
 from .models.schemas.jobs import Job
 from .models.schemas.solvers import Solver, SolverKeyId
@@ -28,15 +28,15 @@
 
 class SolverService:
     _catalog_service: CatalogService
-    _jobs_service: JobsService
+    _job_service: JobService
 
     def __init__(
         self,
         catalog_service: CatalogService,
-        jobs_service: JobsService,
+        job_service: JobService,
     ):
         self._catalog_service = catalog_service
-        self._jobs_service = jobs_service
+        self._job_service = job_service
 
     async def get_solver(
         self,
@@ -116,7 +116,7 @@ async def list_jobs(
         )
 
         # Use the common implementation from JobService
-        return await self._jobs_service.list_jobs_by_resource_prefix(
+        return await self._job_service.list_jobs_by_resource_prefix(
             offset=offset,
             limit=limit,
             job_parent_resource_name_prefix=job_parent_resource_name_prefix,

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

@@ -6,21 +6,21 @@
 from models_library.rpc_pagination import PageLimitInt
 from simcore_service_api_server.models.schemas.studies import StudyID
 
-from ._service_jobs import JobsService
+from ._service_jobs import JobService
 from .models.api_resources import compose_resource_name
 from .models.schemas.jobs import Job
 
 DEFAULT_PAGINATION_LIMIT = MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1
 
 
 class StudiesService:
-    _jobs_service: JobsService
+    _job_service: JobService
 
     def __init__(
         self,
-        jobs_service: JobsService,
+        job_service: JobService,
     ):
-        self._jobs_service = jobs_service
+        self._job_service = job_service
 
     async def list_jobs(
         self,
@@ -45,7 +45,7 @@ async def list_jobs(
         )
 
         # Use the common implementation from JobService
-        return await self._jobs_service.list_jobs_by_resource_prefix(
+        return await self._job_service.list_jobs_by_resource_prefix(
             offset=offset,
             limit=limit,
             job_parent_resource_name_prefix=job_parent_resource_name_prefix,

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

@@ -9,7 +9,7 @@
 from servicelib.rabbitmq import RabbitMQRPCClient
 from simcore_service_api_server._service_studies import StudiesService
 
-from ..._service_jobs import JobsService
+from ..._service_jobs import JobService
 from ..._service_solvers import SolverService
 from ...services_rpc.catalog import CatalogService
 from ...services_rpc.wb_api_server import WbApiRpcClient
@@ -55,17 +55,17 @@ def get_catalog_service(
     return CatalogService(client=rpc_client)
 
 
-def get_jobs_service(
+def get_job_service(
     web_rest_api: Annotated[AuthSession, Depends(get_webserver_session)],
     web_rpc_api: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
     user_id: Annotated[UserID, Depends(get_current_user_id)],
     product_name: Annotated[ProductName, Depends(get_product_name)],
-) -> JobsService:
+) -> JobService:
     """
     "Assembles" the JobsService layer to the underlying service and client interfaces
     in the context of the rest controller (i.e. api/dependencies)
     """
-    return JobsService(
+    return JobService(
         web_rest_api=web_rest_api,
         web_rpc_api=web_rpc_api,
         user_id=user_id,
@@ -75,7 +75,7 @@ def get_jobs_service(
 
 def get_solver_service(
     catalog_service: Annotated[CatalogService, Depends(get_catalog_service)],
-    jobs_service: Annotated[JobsService, Depends(get_jobs_service)],
+    job_service: Annotated[JobService, Depends(get_job_service)],
 ) -> SolverService:
     """
     "Assembles" the SolverService layer to the underlying service and client interfaces
@@ -84,13 +84,13 @@ def get_solver_service(
 
     return SolverService(
         catalog_service=catalog_service,
-        jobs_service=jobs_service,
+        job_service=job_service,
     )
 
 
 def get_studies_service(
-    jobs_service: Annotated[JobsService, Depends(get_jobs_service)],
+    job_service: Annotated[JobService, Depends(get_job_service)],
 ) -> StudiesService:
     return StudiesService(
-        jobs_service=jobs_service,
+        job_service=job_service,
     )

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

@@ -19,7 +19,7 @@
     get_upload_links_from_s3,
 )
 
-from ..._service_jobs import JobsService
+from ..._service_jobs import JobService
 from ..._service_programs import ProgramService
 from ...api.routes._constants import (
     DEFAULT_MAX_STRING_LENGTH,
@@ -164,7 +164,7 @@ async def create_program_job(
     version: VersionStr,
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     program_service: Annotated[ProgramService, Depends()],
-    jobs_service: Annotated[JobsService, Depends()],
+    job_service: Annotated[JobService, Depends()],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     product_name: Annotated[str, Depends(get_product_name)],
     x_simcore_parent_project_uuid: Annotated[ProjectID | None, Header()] = None,
@@ -187,7 +187,7 @@ async def create_program_job(
         product_name=product_name,
     )
 
-    job, project = await jobs_service.create_job(
+    job, project = await job_service.create_job(
         project_name=name,
         description=description,
         solver_or_program=program,

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

@@ -12,7 +12,7 @@
 from models_library.projects_nodes_io import NodeID
 from pydantic.types import PositiveInt
 
-from ..._service_jobs import JobsService
+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
@@ -92,7 +92,7 @@ async def create_solver_job(
     inputs: JobInputs,
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     solver_service: Annotated[SolverService, Depends(get_solver_service)],
-    jobs_service: Annotated[JobsService, Depends()],
+    job_service: Annotated[JobService, Depends()],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     product_name: Annotated[str, Depends(get_product_name)],
     hidden: Annotated[bool, Query()] = True,
@@ -111,7 +111,7 @@ async def create_solver_job(
         solver_version=version,
         product_name=product_name,
     )
-    job, _ = await jobs_service.create_job(
+    job, _ = await job_service.create_job(
         project_name=None,
         description=None,
         solver_or_program=solver,

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

@@ -7,24 +7,44 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 from pytest_mock import MockerFixture, MockType
+from simcore_service_api_server._service_jobs import JobService
 from simcore_service_api_server._service_solvers import SolverService
 from simcore_service_api_server.models.schemas.solvers import Solver
 from simcore_service_api_server.services_rpc.catalog import CatalogService
 from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
 
 
 @pytest.fixture
-def solver_service(
+def job_service(
     mocker: MockerFixture,
-    mocked_catalog_rpc_api: dict[str, MockType],
     mocked_webserver_rpc_api: dict[str, MockType],
-) -> SolverService:
-    return SolverService(
-        catalog_service=CatalogService(client=mocker.MagicMock()),
-        webserver_client=WbApiRpcClient(_client=mocker.MagicMock()),
+    product_name: ProductName,
+    user_id: UserID,
+) -> JobService:
+    return JobService(
+        web_rest_api=mocker.MagicMock(),
+        web_rpc_api=WbApiRpcClient(_client=mocker.MagicMock()),
+        user_id=user_id,
+        product_name=product_name,
     )
 
 
+@pytest.fixture
+def catalog_service(
+    mocker: MockerFixture,
+    mocked_catalog_rpc_api: dict[str, MockType],
+) -> CatalogService:
+    return CatalogService(client=mocker.MagicMock())
+
+
+@pytest.fixture
+def solver_service(
+    catalog_service: CatalogService,
+    job_service: JobService,
+) -> SolverService:
+    return SolverService(catalog_service=catalog_service, job_service=job_service)
+
+
 async def test_get_solver(
     solver_service: SolverService,
     mocked_catalog_rpc_api: dict[str, MockType],

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rpc.py

@@ -16,7 +16,7 @@
 )
 
 from ...rabbitmq import get_rabbitmq_rpc_server
-from .. import _jobs_service
+from .. import _job_service
 from ..exceptions import ProjectInvalidRightsError, ProjectNotFoundError
 
 router = RPCRouter()
@@ -41,7 +41,7 @@ async def mark_project_as_job(
 
     try:
 
-        await _jobs_service.set_project_as_job(
+        await _job_service.set_project_as_job(
             app,
             product_name=product_name,
             user_id=user_id,
@@ -69,7 +69,7 @@ async def list_projects_marked_as_jobs(
     job_parent_resource_name_prefix: str | None,
 ) -> PageRpcProjectJobRpcGet:
 
-    total, projects = await _jobs_service.list_my_projects_marked_as_jobs(
+    total, projects = await _job_service.list_my_projects_marked_as_jobs(
         app,
         product_name=product_name,
         user_id=user_id,

services/web/server/tests/unit/with_dbs/02/test_projects__jobs_service.py

@@ -12,7 +12,7 @@
 from models_library.projects import ProjectID
 from models_library.users import UserID
 from pytest_simcore.helpers.webserver_login import UserInfoDict
-from simcore_service_webserver.projects._jobs_service import (
+from simcore_service_webserver.projects._job_service import (
     list_my_projects_marked_as_jobs,
     set_project_as_job,
 )