✨ Enhance job listing functionality by adding solver filters and updating job URLs

Author: pcrespov

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

@@ -95,27 +95,40 @@ async def list_jobs(
         *,
         user_id: UserID,
         product_name: ProductName,
+        # filters
+        solver_id: SolverKeyId | None = None,
+        solver_version: VersionStr | None = None,
+        # pagination
         offset: PageOffsetInt = 0,
         limit: PageLimitInt = DEFAULT_PAGINATION_LIMIT,
     ) -> tuple[list[Job], PageMetaInfoLimitOffset]:
         """Lists all solver jobs for a user with pagination"""
 
         # NOTE: perhaps we should get comp_tasks instead of projects! or a combinatino of both?
         # I need inputs_checksum and job_parent_source_name!
+        # FIXME: this is still buggy. soldve_id and solver_version need to be encoded!
+        job_parent_resource_name_filter = "solvers"
+        if solver_id:
+            job_parent_resource_name_filter += f"/{solver_id}"
+            if solver_version:
+                job_parent_resource_name_filter += f"/{solver_version}"
+        elif solver_version:
+            msg = "solver_version is set but solver_id is not. Please provide both or none of them"
+            raise ValueError(msg)
 
         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_filter="solvers",  # TODO: project shouldr eturn parent resource name and workbench
+            job_parent_resource_name_filter=job_parent_resource_name_filter,
         )
 
         jobs: list[Job] = []
 
         for project_job in projects_page.data:
 
-            assert (
+            assert (  # nosec
                 len(project_job.workbench) == 1
             ), "Expected only one solver node in workbench"
 

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

@@ -18,6 +18,7 @@
 from pydantic.types import PositiveInt
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from servicelib.logging_utils import log_context
+from simcore_service_api_server.models.api_resources import parse_resources_ids
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ..._service_solvers import SolverService
@@ -35,6 +36,7 @@
     JobLog,
     JobMetadata,
     JobOutputs,
+    update_job_urls,
 )
 from ...models.schemas.model_adapter import (
     PricingUnitGetLegacy,
@@ -131,11 +133,26 @@ async def list_all_solvers_jobs(
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     page_params: Annotated[PaginationParams, Depends()],
     solver_service: Annotated[SolverService, Depends(SolverService)],
-    webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     product_name: Annotated[str, Depends(get_product_name)],
 ):
-    raise NotImplementedError
+
+    jobs, meta = await solver_service.list_jobs(
+        product_name=product_name,
+        user_id=user_id,
+        offset=page_params.offset,
+        limit=page_params.limit,
+    )
+
+    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)
+
+    return create_page(
+        jobs,
+        total=meta.total,
+        params=page_params,
+    )
 
 
 @router.get(

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

@@ -50,7 +50,7 @@
 #  - custom metadata
 #
 from .programs import Program, ProgramKeyId
-from .solvers import Solver
+from .solvers import Solver, SolverKeyId
 
 JobID: TypeAlias = UUID
 
@@ -371,6 +371,36 @@ 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)]