drafts service layer

Author: pcrespov

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

@@ -0,0 +1,93 @@
+from models_library.products import ProductName
+from models_library.projects_nodes import Node
+from models_library.rest_pagination import (
+    MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE,
+    PageMetaInfoLimitOffset,
+    PageOffsetInt,
+)
+from models_library.rpc_pagination import PageLimitInt
+from models_library.users import UserID
+from simcore_service_api_server.models.schemas.studies import StudyID
+
+from .models.api_resources import compose_resource_name
+from .models.schemas.jobs import Job, JobInputs
+from .services_http.solver_job_models_converters import (
+    create_job_inputs_from_node_inputs,
+)
+from .services_rpc.wb_api_server import WbApiRpcClient
+
+DEFAULT_PAGINATION_LIMIT = MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1
+
+
+class StudiesService:
+    _webserver_client: WbApiRpcClient
+
+    def __init__(
+        self,
+        webserver_client: WbApiRpcClient,
+    ):
+        self._webserver_client = webserver_client
+
+    async def list_jobs(
+        self,
+        *,
+        product_name: ProductName,
+        user_id: UserID,
+        # filters
+        study_id: StudyID | None = None,
+        # pagination
+        offset: PageOffsetInt = 0,
+        limit: PageLimitInt = DEFAULT_PAGINATION_LIMIT,
+    ) -> tuple[list[Job], PageMetaInfoLimitOffset]:
+        """Lists all solver jobs for a user with pagination"""
+
+        # 1. Compose job parent resource name prefix
+        collection_or_resource_ids: list[str] = [
+            "study",  # study_id, "jobs",
+        ]
+        if study_id:
+            collection_or_resource_ids.append(f"{study_id}")
+
+        job_parent_resource_name_prefix = compose_resource_name(
+            *collection_or_resource_ids
+        )
+
+        # 2. List projects marked as jobs
+        projects_page = await self._webserver_client.list_projects_marked_as_jobs(
+            product_name=product_name,
+            user_id=user_id,
+            offset=offset,
+            limit=limit,
+            job_parent_resource_name_prefix=job_parent_resource_name_prefix,
+        )
+
+        # 3. Convert projects to jobs
+        jobs: list[Job] = []
+        for project_job in projects_page.data:
+
+            assert (  # nosec
+                len(project_job.workbench) == 1
+            ), "Expected only one solver node in workbench"
+
+            solver_node: Node = next(iter(project_job.workbench.values()))
+            job_inputs: JobInputs = create_job_inputs_from_node_inputs(
+                inputs=solver_node.inputs or {}
+            )
+            assert project_job.job_parent_resource_name  # nosec
+
+            jobs.append(
+                Job(
+                    id=project_job.uuid,
+                    name=Job.compose_resource_name(
+                        project_job.job_parent_resource_name, project_job.uuid
+                    ),
+                    inputs_checksum=job_inputs.compute_checksum(),
+                    created_at=project_job.created_at,
+                    runner_name=project_job.job_parent_resource_name,
+                    url=None,
+                    runner_url=None,
+                    outputs_url=None,
+                )
+            )
+
+        return jobs, projects_page.meta

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

@@ -5,6 +5,7 @@
 
 from fastapi import Depends, HTTPException, Request, status
 from servicelib.rabbitmq import RabbitMQRPCClient
+from simcore_service_api_server._service_studies import StudiesService
 
 from ..._service_solvers import SolverService
 from ...services_rpc.catalog import CatalogService
@@ -62,3 +63,11 @@ def get_solver_service(
         catalog_service=catalog_service,
         webserver_client=webserver_client,
     )
+
+
+def get_studies_service(
+    webserver_client: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+) -> StudiesService:
+    return StudiesService(
+        webserver_client=webserver_client,
+    )

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

@@ -14,7 +14,9 @@
 from models_library.projects_nodes import InputID, InputTypes
 from models_library.projects_nodes_io import NodeID
 from pydantic import PositiveInt
+from pydantic.types import PositiveInt
 from servicelib.logging_utils import log_context
+from simcore_service_api_server._service_studies import StudiesService
 
 from ...exceptions.backend_errors import ProjectAlreadyStartedError
 from ...models.pagination import Page, PaginationParams
@@ -47,8 +49,8 @@
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id, get_product_name
-from ..dependencies.services import get_api_client
-from ..dependencies.webserver_http import get_webserver_session
+from ..dependencies.services import get_api_client, get_studies_service
+from ..dependencies.webserver_http import AuthSession, get_webserver_session
 from ..dependencies.webserver_rpc import (
     get_wb_api_rpc_client,
 )
@@ -57,9 +59,17 @@
     FMSG_CHANGELOG_NEW_IN_VERSION,
     create_route_description,
 )
-from .solvers_jobs import JOBS_STATUS_CODES
+from .solvers_jobs import (
+    JOBS_STATUS_CODES,
+    _compose_job_resource_name,
+)
+
+# pylint: disable=too-many-arguments
+
 
 _logger = logging.getLogger(__name__)
+
+
 router = APIRouter()
 
 
@@ -85,6 +95,9 @@ def _compose_job_resource_name(study_key, job_id) -> str:
 async def list_study_jobs(
     study_id: StudyID,
     page_params: Annotated[PaginationParams, Depends()],
+    studies_service: Annotated[StudiesService, Depends(get_studies_service)],
+    url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
+    product_name: Annotated[str, Depends(get_product_name)],
 ):
     msg = f"list study jobs study_id={study_id!r} with pagination={page_params!r}. SEE https://github.com/ITISFoundation/osparc-simcore/issues/4177"
     raise NotImplementedError(msg)