renames

Author: pcrespov

packages/models-library/src/models_library/rpc/webserver/projects.py

@@ -15,16 +15,16 @@ class MetadataFilterItem(BaseModel):
     pattern: str
 
 
-class ListProjectsMarkedAsJobRpcFilter(BaseModel):
-    """Filter model for the list_projects_marked_as_jobs RPC.
+class ListProjectsMarkedAsJobRpcFilters(BaseModel):
+    """Filters model for the list_projects_marked_as_jobs RPC.
 
-    NOTE: Filter models are used to validate all possible filters in an API early on,
+    NOTE: Filters models are used to validate all possible filters in an API early on,
     particularly to ensure compatibility and prevent conflicts between different filters.
     """
 
     job_parent_resource_name_prefix: str | None = None
 
-    any_of_metadata: Annotated[
+    any_custom_metadata: Annotated[
         list[MetadataFilterItem] | None,
         Field(description="Searchs for matches of any of the custom metadata fields"),
     ] = None

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_rpc_server.py

@@ -9,7 +9,7 @@
 from models_library.projects import ProjectID
 from models_library.rest_pagination import PageOffsetInt
 from models_library.rpc.webserver.projects import (
-    ListProjectsMarkedAsJobRpcFilter,
+    ListProjectsMarkedAsJobRpcFilters,
     PageRpcProjectJobRpcGet,
     ProjectJobRpcGet,
 )
@@ -57,7 +57,7 @@ async def list_projects_marked_as_jobs(
         # pagination
         offset: PageOffsetInt = 0,
         limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
-        filters: ListProjectsMarkedAsJobRpcFilter | None = None,
+        filters: ListProjectsMarkedAsJobRpcFilters | None = None,
     ) -> PageRpcProjectJobRpcGet:
         assert rpc_client
         assert product_name

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py

@@ -7,7 +7,7 @@
 from models_library.rabbitmq_basic_types import RPCMethodName
 from models_library.rest_pagination import PageOffsetInt
 from models_library.rpc.webserver.projects import (
-    ListProjectsMarkedAsJobRpcFilter,
+    ListProjectsMarkedAsJobRpcFilters,
     PageRpcProjectJobRpcGet,
 )
 from models_library.rpc_pagination import (
@@ -54,7 +54,7 @@ async def list_projects_marked_as_jobs(
     # pagination
     offset: PageOffsetInt = 0,
     limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
-    filters: ListProjectsMarkedAsJobRpcFilter | None = None,
+    filters: ListProjectsMarkedAsJobRpcFilters | None = None,
 ) -> PageRpcProjectJobRpcGet:
     result = await rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,

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

@@ -41,7 +41,7 @@ async def list_jobs(
         self,
         job_parent_resource_name: str,
         *,
-        filter_by_job_custom_metadata: list[dict[str, str]] | None = None,
+        filter_any_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]:
@@ -54,7 +54,7 @@ async def list_jobs(
             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,
+            filter_any_custom_metadata=filter_any_custom_metadata,
         )
 
         # 2. Convert projects to jobs

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

@@ -92,7 +92,7 @@ async def list_jobs(
         *,
         filter_by_solver_key: SolverKeyId | None = None,
         filter_by_solver_version: VersionStr | None = None,
-        filter_by_job_custom_metadata: list[dict[str, str]] | None = None,
+        filter_any_custom_metadata: list[dict[str, str]] | None = None,
         pagination_offset: PageOffsetInt = 0,
         pagination_limit: PageLimitInt = DEFAULT_PAGINATION_LIMIT,
     ) -> tuple[list[Job], PageMetaInfoLimitOffset]:
@@ -115,7 +115,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,
-            filter_by_job_custom_metadata=filter_by_job_custom_metadata,
+            filter_any_custom_metadata=filter_any_custom_metadata,
             pagination_offset=pagination_offset,
             pagination_limit=pagination_limit,
         )

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

@@ -134,7 +134,7 @@
             FMSG_CHANGELOG_NEW_IN_VERSION.format("0.8"),
         ],
     ),
-    include_in_schema=True,  # TO BE RELEASED in 0.8
+    include_in_schema=False,  # TO BE RELEASED in 0.8
 )
 async def list_all_solvers_jobs(
     page_params: Annotated[PaginationParams, Depends()],
@@ -146,7 +146,7 @@ async def list_all_solvers_jobs(
 ):
 
     jobs, meta = await solver_service.list_jobs(
-        filter_by_job_custom_metadata=(
+        filter_any_custom_metadata=(
             [
                 {filter_metadata.name: filter_metadata.pattern}
                 for filter_metadata in filter_job_metadata_params.any

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

@@ -22,6 +22,7 @@ class JobMetadataFilter(BaseModel):
         list[MetadataFilterItem],
         Field(description="Matches any custom metadata field (OR logic)"),
     ]
+    # NOTE: AND logic shall be implemented as `all: list[MetadataFilterItem] | None = None`
 
     @staticmethod
     def _update_json_schema_extra(schema: JsonDict) -> None:

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

@@ -35,7 +35,7 @@
 )
 from models_library.rpc.webserver.projects import ListProjectsMarkedAsJobRpcFilter
 from models_library.rpc.webserver.projects import (
-    ListProjectsMarkedAsJobRpcFilter,
+    ListProjectsMarkedAsJobRpcFilters,
     MetadataFilterItem,
 )
 from models_library.services_types import ServiceRunID
@@ -251,16 +251,16 @@ async def list_projects_marked_as_jobs(
         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,
+        filter_any_custom_metadata: list[dict[str, str]] | None,
     ):
-        filters = ListProjectsMarkedAsJobRpcFilter(
+        filters = ListProjectsMarkedAsJobRpcFilters(
             job_parent_resource_name_prefix=filter_by_job_parent_resource_name_prefix,
-            any_of_metadata=(
+            any_custom_metadata=(
                 [
                     MetadataFilterItem(name=key, pattern=value)
-                    for key, value in filter_by_any_custom_metadata
+                    for key, value in filter_any_custom_metadata
                 ]
-                if filter_by_any_custom_metadata
+                if filter_any_custom_metadata
                 else None
             ),
         )

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

@@ -4,7 +4,7 @@
 from models_library.projects import ProjectID
 from models_library.rest_pagination import PageLimitInt, PageOffsetInt
 from models_library.rpc.webserver.projects import (
-    ListProjectsMarkedAsJobRpcFilter,
+    ListProjectsMarkedAsJobRpcFilters,
     PageRpcProjectJobRpcGet,
     ProjectJobRpcGet,
 )
@@ -66,24 +66,24 @@ async def list_projects_marked_as_jobs(
     # pagination
     offset: PageOffsetInt,
     limit: PageLimitInt,
-    filters: ListProjectsMarkedAsJobRpcFilter | None = None,
+    filters: ListProjectsMarkedAsJobRpcFilters | None = None,
 ) -> PageRpcProjectJobRpcGet:
 
     total, projects = await _jobs_service.list_my_projects_marked_as_jobs(
         app,
         product_name=product_name,
         user_id=user_id,
-        offset=offset,
-        limit=limit,
+        pagination_offset=offset,
+        pagination_limit=limit,
         filter_by_job_parent_resource_name_prefix=(
             filters.job_parent_resource_name_prefix if filters else None
         ),
-        filter_by_any_custom_metadata=(
+        filter_any_custom_metadata=(
             [
                 {custom_metadata.name: custom_metadata.pattern}
-                for custom_metadata in filters.any_of_metadata
+                for custom_metadata in filters.any_custom_metadata
             ]
-            if filters and filters.any_of_metadata
+            if filters and filters.any_custom_metadata
             else None
         ),
     )

services/web/server/src/simcore_service_webserver/projects/_jobs_repository.py

@@ -37,18 +37,18 @@ def _apply_job_parent_resource_name_filter(
     return query.where(projects_to_jobs.c.job_parent_resource_name.like(f"{prefix}%"))
 
 
-def _apply_metadata_filter(
-    query: sa.sql.Select, any_of_metadata_fields: list[dict[str, str]]
+def _apply_custom_metadata_filter(
+    query: sa.sql.Select, any_metadata_fields: list[dict[str, str]]
 ) -> sa.sql.Select:
     """Apply metadata filters to query.
 
     For PostgreSQL JSONB fields, we need to extract the text value using ->> operator
     before applying string comparison operators like ILIKE.
     """
-    assert any_of_metadata_fields  # nosec
+    assert any_metadata_fields  # nosec
 
     expressions = []
-    for field in any_of_metadata_fields:
+    for field in any_metadata_fields:
         for key, pattern in field.items():
             # Use ->> operator to extract the text value from JSONB
             # Then apply ILIKE for case-insensitive pattern matching
@@ -92,10 +92,10 @@ async def list_projects_marked_as_jobs(
         *,
         product_name: ProductName,
         user_id: UserID,
-        pagination_offset: int = 0,
-        pagination_limit: int = 10,
+        pagination_offset: int,
+        pagination_limit: int,
         filter_by_job_parent_resource_name_prefix: str | None = None,
-        filter_by_any_custom_metadata: list[dict[str, str]] | None = None,
+        filter_any_custom_metadata: list[dict[str, str]] | None = None,
     ) -> tuple[int, list[ProjectJobDBGet]]:
         """Lists projects marked as jobs for a specific user and product
 
@@ -161,9 +161,9 @@ async def list_projects_marked_as_jobs(
                 access_query, filter_by_job_parent_resource_name_prefix
             )
 
-        if filter_by_any_custom_metadata:
-            access_query = _apply_metadata_filter(
-                access_query, filter_by_any_custom_metadata
+        if filter_any_custom_metadata:
+            access_query = _apply_custom_metadata_filter(
+                access_query, filter_any_custom_metadata
             )
 
         # Step 4. Convert access_query to a subquery