adds filters in service layer

Author: pcrespov

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

@@ -39,8 +39,9 @@ class JobService:
 
     async def list_jobs(
         self,
+        job_parent_resource_name: str,
         *,
-        filter_by_job_parent_resource_name_prefix: str,
+        filter_by_job_custom_metadata: list[dict[str, str]] | None = None,
         pagination_offset: PageOffsetInt = 0,
         pagination_limit: PageLimitInt = MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1,
     ) -> tuple[list[Job], PageMetaInfoLimitOffset]:
@@ -50,9 +51,10 @@ async def list_jobs(
         projects_page = await self._web_rpc_client.list_projects_marked_as_jobs(
             product_name=self.product_name,
             user_id=self.user_id,
-            offset=pagination_offset,
-            limit=pagination_limit,
-            job_parent_resource_name_prefix=filter_by_job_parent_resource_name_prefix,
+            pagination_offset=pagination_offset,
+            pagination_limit=pagination_limit,
+            filter_by_job_parent_resource_name_prefix=job_parent_resource_name,
+            filter_by_any_custom_metadata=filter_by_job_custom_metadata,
         )
 
         # 2. Convert projects to jobs

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

@@ -113,9 +113,9 @@ async def list_jobs(
 
         # 2. list jobs under job_parent_resource_name
         return await self.job_service.list_jobs(
+            job_parent_resource_name=job_parent_resource_name,
             pagination_offset=pagination_offset,
             pagination_limit=pagination_limit,
-            filter_by_job_parent_resource_name_prefix=job_parent_resource_name,
         )
 
     async def solver_release_history(

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

@@ -52,7 +52,7 @@ async def list_jobs(
 
         # 2. list jobs under job_parent_resource_name
         return await self.job_service.list_jobs(
+            job_parent_resource_name=job_parent_resource_name,
             pagination_offset=pagination_offset,
             pagination_limit=pagination_limit,
-            filter_by_job_parent_resource_name_prefix=job_parent_resource_name,
         )

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -34,6 +34,10 @@
     PageOffsetInt,
 )
 from models_library.rpc.webserver.projects import ListProjectsMarkedAsJobRpcFilter
+from models_library.rpc.webserver.projects import (
+    ListProjectsMarkedAsJobRpcFilter,
+    MetadataFilterItem,
+)
 from models_library.services_types import ServiceRunID
 from models_library.users import UserID
 from models_library.wallets import WalletID
@@ -244,20 +248,29 @@ async def list_projects_marked_as_jobs(
         *,
         product_name: ProductName,
         user_id: UserID,
-        offset: int = 0,
-        limit: int = 50,
-        job_parent_resource_name_prefix: str | None = None,
+        pagination_offset: int = 0,
+        pagination_limit: int = 50,
+        filter_by_job_parent_resource_name_prefix: str | None,
+        filter_by_any_custom_metadata: list[dict[str, str]] | None,
     ):
         filters = ListProjectsMarkedAsJobRpcFilter(
-            job_parent_resource_name_prefix=job_parent_resource_name_prefix
+            job_parent_resource_name_prefix=filter_by_job_parent_resource_name_prefix,
+            any_of_metadata=(
+                [
+                    MetadataFilterItem(name=key, pattern=value)
+                    for key, value in filter_by_any_custom_metadata
+                ]
+                if filter_by_any_custom_metadata
+                else None
+            ),
         )
 
         return await projects_rpc.list_projects_marked_as_jobs(
             rpc_client=self._client,
             product_name=product_name,
             user_id=user_id,
-            offset=offset,
-            limit=limit,
+            offset=pagination_offset,
+            limit=pagination_limit,
             filters=filters,
         )
 

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

@@ -16,7 +16,7 @@ async def test_list_jobs_by_resource_prefix(
 ):
     # Test with default pagination parameters
     jobs, page_meta = await job_service.list_jobs(
-        filter_by_job_parent_resource_name_prefix="solvers/some-solver"
+        job_parent_resource_name="solvers/some-solver"
     )
 
     assert isinstance(jobs, list)