Merge branch 'master' into feature/pending-users

Author: mergify[bot]

packages/models-library/src/models_library/api_schemas_catalog/services.py

@@ -385,5 +385,19 @@ class ServiceListFilters(Filters):
         ),
     ] = None
 
+    service_key_pattern: Annotated[
+        str | None,
+        Field(
+            description="Filter services by key pattern (e.g. 'simcore/services/comp/itis/*')",
+        ),
+    ] = None
+
+    version_display_pattern: Annotated[
+        str | None,
+        Field(
+            description="Filter services by version display pattern (e.g. '*2023*')",
+        ),
+    ] = None
+
 
 __all__: tuple[str, ...] = ("ServiceRelease",)

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

@@ -6,6 +6,7 @@
 # pylint: disable=unused-variable
 
 
+import fnmatch
 from dataclasses import dataclass
 
 from models_library.api_schemas_catalog.services import (
@@ -31,7 +32,9 @@
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
 assert ServiceListFilters.model_json_schema()["properties"].keys() == {
-    "service_type"
+    "service_type",
+    "service_key_pattern",
+    "version_display_pattern",
 }, (
     "ServiceListFilters is expected to only have the key 'service_type'. "
     "Please update the mock if the schema changes."
@@ -55,18 +58,40 @@ async def list_services_paginated(
         assert product_name
         assert user_id
 
-        items = TypeAdapter(list[LatestServiceGet]).validate_python(
+        services_list = TypeAdapter(list[LatestServiceGet]).validate_python(
             LatestServiceGet.model_json_schema()["examples"],
         )
         if filters:
-            items = [
-                item for item in items if item.service_type == filters.service_type
-            ]
 
-        total_count = len(items)
+            filtered_services = []
+            for src in services_list:
+                # Match service type if specified
+                if filters.service_type and src.service_type != filters.service_type:
+                    continue
+
+                # Match service key pattern if specified
+                if filters.service_key_pattern and not fnmatch.fnmatch(
+                    src.key, filters.service_key_pattern
+                ):
+                    continue
+
+                # Match version display pattern if specified
+                if filters.version_display_pattern and (
+                    src.version_display is None
+                    or not fnmatch.fnmatch(
+                        src.version_display, filters.version_display_pattern
+                    )
+                ):
+                    continue
+
+                filtered_services.append(src)
+
+            services_list = filtered_services
+
+        total_count = len(services_list)
 
         return PageRpc[LatestServiceGet].create(
-            items[offset : offset + limit],
+            services_list[offset : offset + limit],
             total=total_count,
             limit=limit,
             offset=offset,

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

@@ -20,7 +20,9 @@ def __call__(
         team_access: str | None = None,
         everyone_access: str | None = None,
         product: ProductName = "osparc",
+        # DB overrides
         deprecated: datetime | None = None,  # DB column
+        version_display: str | None = None,  # DB column
     ) -> tuple[dict[str, Any], ...]:  # type: ignore
         """
         Returns a fake factory that creates catalog DATA that can be used to fill

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

@@ -156,14 +156,36 @@ async def solver_release_history(
     async def latest_solvers(
         self,
         *,
-        offset: NonNegativeInt,
-        limit: PositiveInt,
+        pagination_offset: NonNegativeInt,
+        pagination_limit: PositiveInt,
+        filter_by_solver_id: str | None = None,
+        filter_by_version_display: str | None = None,
     ) -> tuple[list[Solver], PageMetaInfoLimitOffset]:
-        """Lists the latest solvers with pagination."""
+        """Lists the latest solvers with pagination and filtering.
+
+        Args:
+            offset: Pagination offset
+            limit: Pagination limit
+            solver_id_pattern: Optional pattern to filter solvers by ID
+            version_display_pattern: Optional pattern to filter by version display
+
+        Returns:
+            A tuple with the list of filtered solvers and pagination metadata
+        """
+        filters = ServiceListFilters(service_type=ServiceType.COMPUTATIONAL)
+
+        # Add key_pattern filter for solver ID if provided
+        if filter_by_solver_id:
+            filters.service_key_pattern = filter_by_solver_id
+
+        # Add version_display_pattern filter if provided
+        if filter_by_version_display:
+            filters.version_display_pattern = filter_by_version_display
+
         services, page_meta = await self.catalog_service.list_latest_releases(
-            pagination_offset=offset,
-            pagination_limit=limit,
-            filters=ServiceListFilters(service_type=ServiceType.COMPUTATIONAL),
+            pagination_offset=pagination_offset,
+            pagination_limit=pagination_limit,
+            filters=filters,
         )
 
         solvers = [Solver.create_from_service(service) for service in services]

services/api-server/src/simcore_service_api_server/api/dependencies/models_schemas_job_filters.py renamed to services/api-server/src/simcore_service_api_server/api/dependencies/models_schemas_jobs_filters.py

@@ -0,0 +1,35 @@
+from typing import Annotated, Any
+
+from fastapi import Query
+from pydantic.fields import FieldInfo
+
+from ...models.schemas.solvers_filters import SolversListFilters
+
+
+def _get_query_params(field: FieldInfo) -> dict[str, Any]:
+    params = {}
+
+    if field.description:
+        params["description"] = field.description
+    if field.examples:
+        params["example"] = next(
+            (example for example in field.examples if "*" in example), field.examples[0]
+        )
+    return params
+
+
+def get_solvers_filters(
+    # pylint: disable=unsubscriptable-object
+    solver_id: Annotated[
+        str | None,
+        Query(**_get_query_params(SolversListFilters.model_fields["solver_id"])),
+    ] = None,
+    version_display: Annotated[
+        str | None,
+        Query(**_get_query_params(SolversListFilters.model_fields["version_display"])),
+    ] = None,
+) -> SolversListFilters:
+    return SolversListFilters(
+        solver_id=solver_id,
+        version_display=version_display,
+    )

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

@@ -15,7 +15,7 @@
     programs,
     solvers,
     solvers_jobs,
-    solvers_jobs_getters,
+    solvers_jobs_read,
     studies,
     studies_jobs,
     users,
@@ -43,7 +43,7 @@ def create_router(settings: ApplicationSettings):
     router.include_router(solvers.router, tags=["solvers"], prefix=_SOLVERS_PREFIX)
     router.include_router(solvers_jobs.router, tags=["solvers"], prefix=_SOLVERS_PREFIX)
     router.include_router(
-        solvers_jobs_getters.router, tags=["solvers"], prefix=_SOLVERS_PREFIX
+        solvers_jobs_read.router, tags=["solvers"], prefix=_SOLVERS_PREFIX
     )
     router.include_router(studies.router, tags=["studies"], prefix="/studies")
     router.include_router(studies_jobs.router, tags=["studies"], prefix="/studies")

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

@@ -27,7 +27,7 @@
 from ..dependencies.services import get_api_client
 from ..dependencies.webserver_http import get_webserver_session
 from ..dependencies.webserver_rpc import get_wb_api_rpc_client
-from . import solvers_jobs, solvers_jobs_getters, studies_jobs
+from . import solvers_jobs, solvers_jobs_read, studies_jobs
 
 # pylint: disable=too-many-arguments
 # pylint: disable=cyclic-import
@@ -203,7 +203,7 @@ async def function_job_outputs(
     ):
         return dict(
             (
-                await solvers_jobs_getters.get_job_outputs(
+                await solvers_jobs_read.get_job_outputs(
                     solver_key=function.solver_key,
                     version=function.solver_version,
                     job_id=function_job.solver_job_id,

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

@@ -19,9 +19,11 @@
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.model_adapter import ServicePricingPlanGetLegacy
 from ...models.schemas.solvers import Solver, SolverKeyId, SolverPort
+from ...models.schemas.solvers_filters import SolversListFilters
 from ...services_rpc.catalog import CatalogService
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id, get_product_name
+from ..dependencies.models_schemas_solvers_filters import get_solvers_filters
 from ..dependencies.services import get_catalog_service, get_solver_service
 from ..dependencies.webserver_http import AuthSession, get_webserver_session
 from ._constants import (
@@ -90,11 +92,14 @@ async def list_solvers(
 async def get_solvers_page(
     page_params: Annotated[PaginationParams, Depends()],
     solver_service: Annotated[SolverService, Depends(get_solver_service)],
+    filters: Annotated[SolversListFilters, Depends(get_solvers_filters)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
 ):
     solvers, page_meta = await solver_service.latest_solvers(
-        offset=page_params.offset,
-        limit=page_params.limit,
+        pagination_offset=page_params.offset,
+        pagination_limit=page_params.limit,
+        filter_by_solver_id=filters.solver_id,
+        filter_by_version_display=filters.version_display,
     )
 
     for solver in solvers:
@@ -129,8 +134,8 @@ async def list_solvers_releases(
     latest_solvers: list[Solver] = []
     for page_params in iter_pagination_params(limit=DEFAULT_PAGINATION_LIMIT):
         solvers, page_meta = await solver_service.latest_solvers(
-            offset=page_params.offset,
-            limit=page_params.limit,
+            pagination_offset=page_params.offset,
+            pagination_limit=page_params.limit,
         )
         page_params.total_number_of_items = page_meta.total
         latest_solvers.extend(solvers)

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

@@ -56,7 +56,7 @@
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id
 from ..dependencies.database import get_db_asyncpg_engine
-from ..dependencies.models_schemas_job_filters import get_job_metadata_filter
+from ..dependencies.models_schemas_jobs_filters import get_job_metadata_filter
 from ..dependencies.rabbitmq import get_log_check_timeout, get_log_distributor
 from ..dependencies.services import get_api_client, get_solver_service
 from ..dependencies.webserver_http import AuthSession, get_webserver_session