Merge branch 'master' into is7622/fix-automatic-api-keys-generation

Author: giancarloromeo

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

@@ -1,10 +1,13 @@
+# pylint: disable=no-self-use
 # pylint: disable=not-context-manager
 # pylint: disable=protected-access
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
 
+from dataclasses import dataclass
+
 from models_library.api_schemas_catalog.services import (
     LatestServiceGet,
     ServiceGetV2,
@@ -122,7 +125,7 @@ async def update_service(
         return got.model_copy(update=update.model_dump(exclude_unset=True))
 
     @validate_call(config={"arbitrary_types_allowed": True})
-    async def list_my_service_history_paginated(
+    async def list_my_service_history_latest_first(
         self,
         rpc_client: RabbitMQRPCClient | MockType,
         *,
@@ -171,3 +174,20 @@ async def get_service_ports(
         return TypeAdapter(list[ServicePortGet]).validate_python(
             ServicePortGet.model_json_schema()["examples"],
         )
+
+
+@dataclass
+class ZeroListingCatalogRpcSideEffects:
+    """Catalog RPC mocks that return empty lists"""
+
+    async def list_services_paginated(self, *args, **kwargs): ...
+    async def get_service(self, *args, **kwargs): ...
+    async def update_service(self, *args, **kwargs): ...
+    async def get_service_ports(self, *args, **kwargs): ...
+    async def list_my_service_history_latest_first(self, *args, **kwargs):
+        return PageRpc[ServiceRelease].create(
+            [],
+            total=0,
+            limit=10,
+            offset=0,
+        )

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/catalog/services.py

@@ -194,7 +194,7 @@ async def batch_get_my_services(
 
 
 @validate_call(config={"arbitrary_types_allowed": True})
-async def list_my_service_history_paginated(  # pylint: disable=too-many-arguments
+async def list_my_service_history_latest_first(  # pylint: disable=too-many-arguments
     rpc_client: RabbitMQRPCClient,
     *,
     product_name: ProductName,
@@ -205,13 +205,15 @@ async def list_my_service_history_paginated(  # pylint: disable=too-many-argumen
     filters: ServiceListFilters | None = None,
 ) -> PageRpcServiceRelease:
     """
-
+    Sorts service releases by version (latest first)
     Raises:
         ValidationError: on invalid arguments
     """
     result = await rpc_client.request(
         CATALOG_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("list_my_service_history_paginated"),
+        TypeAdapter(RPCMethodName).validate_python(
+            "list_my_service_history_latest_first"
+        ),
         product_name=product_name,
         user_id=user_id,
         service_key=service_key,

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

@@ -63,13 +63,15 @@ async def list_program_history(
         offset: NonNegativeInt,
         limit: PositiveInt,
     ) -> tuple[list[Program], PageMetaInfoLimitOffset]:
-        page, page_meta = await self._catalog_service.list_release_history(
+        page, page_meta = await self._catalog_service.list_release_history_latest_first(
             user_id=user_id,
             service_key=program_key,
             product_name=product_name,
             offset=offset,
             limit=limit,
         )
+        if len(page) == 0:
+            return [], page_meta
 
         program_instance = await self._catalog_service.get(
             user_id=user_id,

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

@@ -1,4 +1,3 @@
-from common_library.pagination_tools import iter_pagination_params
 from models_library.api_schemas_catalog.services import ServiceListFilters
 from models_library.basic_types import VersionStr
 from models_library.products import ProductName
@@ -10,10 +9,11 @@
 )
 from models_library.rpc_pagination import PageLimitInt
 from models_library.services_enums import ServiceType
-from models_library.services_history import ServiceRelease
 from models_library.users import UserID
-from packaging.version import Version
 from pydantic import NonNegativeInt, PositiveInt
+from simcore_service_api_server.exceptions.backend_errors import (
+    ProgramOrSolverOrStudyNotFoundError,
+)
 from simcore_service_api_server.exceptions.custom_errors import (
     SolverServiceListJobsFiltersError,
 )
@@ -69,23 +69,20 @@ async def get_latest_release(
         user_id: int,
         solver_key: SolverKeyId,
     ) -> Solver:
-        service_releases: list[ServiceRelease] = []
-        for page_params in iter_pagination_params(limit=DEFAULT_PAGINATION_LIMIT):
-            releases, page_meta = await self._catalog_service.list_release_history(
-                user_id=user_id,
-                service_key=solver_key,
-                product_name=product_name,
-                offset=page_params.offset,
-                limit=page_params.limit,
-            )
-            page_params.total_number_of_items = page_meta.total
-            service_releases.extend(releases)
+        releases, _ = await self._catalog_service.list_release_history_latest_first(
+            user_id=user_id,
+            service_key=solver_key,
+            product_name=product_name,
+            offset=0,
+            limit=1,
+        )
 
-        release = sorted(service_releases, key=lambda s: Version(s.version))[-1]
+        if len(releases) == 0:
+            raise ProgramOrSolverOrStudyNotFoundError(name=solver_key, version="latest")
         service = await self._catalog_service.get(
             user_id=user_id,
             name=solver_key,
-            version=release.version,
+            version=releases[0].version,
             product_name=product_name,
         )
 
@@ -171,12 +168,14 @@ async def solver_release_history(
         limit: PositiveInt,
     ) -> tuple[list[Solver], PageMetaInfoLimitOffset]:
 
-        releases, page_meta = await self._catalog_service.list_release_history(
-            user_id=user_id,
-            service_key=solver_key,
-            product_name=product_name,
-            offset=offset,
-            limit=limit,
+        releases, page_meta = (
+            await self._catalog_service.list_release_history_latest_first(
+                user_id=user_id,
+                service_key=solver_key,
+                product_name=product_name,
+                offset=offset,
+                limit=limit,
+            )
         )
 
         service_instance = await self._catalog_service.get(

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

@@ -71,7 +71,7 @@ async def list_latest_releases(
         )
         return page.data, meta
 
-    async def list_release_history(
+    async def list_release_history_latest_first(
         self,
         *,
         product_name: ProductName,
@@ -81,7 +81,7 @@ async def list_release_history(
         limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
     ) -> tuple[list[ServiceRelease], PageMetaInfoLimitOffset]:
 
-        page = await catalog_rpc.list_my_service_history_paginated(
+        page = await catalog_rpc.list_my_service_history_latest_first(
             self._client,
             product_name=product_name,
             user_id=user_id,

services/api-server/tests/unit/conftest.py

@@ -491,9 +491,16 @@ def mocked_webserver_rpc_api(
     }
 
 
+@pytest.fixture
+def catalog_rpc_side_effects(request) -> Any:
+    if "param" in dir(request) and request.param is not None:
+        return request.param
+    return CatalogRpcSideEffects()
+
+
 @pytest.fixture
 def mocked_catalog_rpc_api(
-    mocked_app_dependencies: None, mocker: MockerFixture
+    mocked_app_dependencies: None, mocker: MockerFixture, catalog_rpc_side_effects: Any
 ) -> dict[str, MockType]:
     """
     Mocks the catalog's simcore service RPC API for testing purposes.
@@ -502,37 +509,36 @@ def mocked_catalog_rpc_api(
         services as catalog_rpc,  # keep import here
     )
 
-    side_effects = CatalogRpcSideEffects()
     return {
         "list_services_paginated": mocker.patch.object(
             catalog_rpc,
             "list_services_paginated",
             autospec=True,
-            side_effect=side_effects.list_services_paginated,
+            side_effect=catalog_rpc_side_effects.list_services_paginated,
         ),
         "get_service": mocker.patch.object(
             catalog_rpc,
             "get_service",
             autospec=True,
-            side_effect=side_effects.get_service,
+            side_effect=catalog_rpc_side_effects.get_service,
         ),
         "update_service": mocker.patch.object(
             catalog_rpc,
             "update_service",
             autospec=True,
-            side_effect=side_effects.update_service,
+            side_effect=catalog_rpc_side_effects.update_service,
         ),
-        "list_my_service_history_paginated": mocker.patch.object(
+        "list_my_service_history_latest_first": mocker.patch.object(
             catalog_rpc,
-            "list_my_service_history_paginated",
+            "list_my_service_history_latest_first",
             autospec=True,
-            side_effect=side_effects.list_my_service_history_paginated,
+            side_effect=catalog_rpc_side_effects.list_my_service_history_latest_first,
         ),
         "get_service_ports": mocker.patch.object(
             catalog_rpc,
             "get_service_ports",
             autospec=True,
-            side_effect=side_effects.get_service_ports,
+            side_effect=catalog_rpc_side_effects.get_service_ports,
         ),
     }
 

services/api-server/tests/unit/test_api_programs.py

@@ -14,6 +14,7 @@
 from models_library.api_schemas_storage.storage_schemas import FileUploadSchema
 from models_library.users import UserID
 from pytest_mock import MockerFixture, MockType
+from pytest_simcore.helpers.catalog_rpc_server import ZeroListingCatalogRpcSideEffects
 from pytest_simcore.helpers.faker_factories import DEFAULT_FAKER
 from pytest_simcore.helpers.httpx_calls_capture_models import (
     CreateRespxMockCallback,
@@ -168,3 +169,19 @@ async def test_list_program_history(
         f"/{API_VTAG}/programs/{program_key}/releases", auth=auth
     )
     assert response.status_code == status.HTTP_200_OK
+
+
+@pytest.mark.parametrize(
+    "catalog_rpc_side_effects", [ZeroListingCatalogRpcSideEffects()], indirect=True
+)
+async def test_list_program_history_no_program(
+    auth: httpx.BasicAuth,
+    client: AsyncClient,
+    mocked_catalog_rpc_api: dict[str, MockType],
+):
+    program_key = "simcore/services/dynamic/my_program"
+    # Arrange
+    response = await client.get(
+        f"/{API_VTAG}/programs/{program_key}/releases", auth=auth
+    )
+    assert response.status_code == status.HTTP_200_OK

services/api-server/tests/unit/test_api_solvers.py

@@ -12,6 +12,7 @@
 from httpx import AsyncClient
 from models_library.api_schemas_api_server.pricing_plans import ServicePricingPlanGet
 from pytest_mock import MockType
+from pytest_simcore.helpers.catalog_rpc_server import ZeroListingCatalogRpcSideEffects
 from pytest_simcore.helpers.httpx_calls_capture_models import CreateRespxMockCallback
 from simcore_service_api_server._meta import API_VTAG
 
@@ -75,3 +76,28 @@ async def test_get_latest_solver_release(
     if response.status_code == status.HTTP_200_OK:
         assert "id" in response.json()
         assert response.json()["id"] == solver_key
+
+
+@pytest.mark.parametrize(
+    "catalog_rpc_side_effects",
+    [ZeroListingCatalogRpcSideEffects()],
+    indirect=True,
+)
+@pytest.mark.parametrize(
+    "solver_key,expected_status_code",
+    [
+        ("simcore/services/comp/valid_solver", status.HTTP_404_NOT_FOUND),
+    ],
+)
+async def test_get_latest_solver_release_zero_releases(
+    client: AsyncClient,
+    mocked_catalog_rpc_api,
+    auth: httpx.BasicAuth,
+    solver_key: str,
+    expected_status_code: int,
+):
+    response = await client.get(
+        f"{API_VTAG}/solvers/{solver_key}/latest",
+        auth=auth,
+    )
+    assert response.status_code == expected_status_code

services/api-server/tests/unit/test_services_catalog.py

@@ -49,7 +49,7 @@ async def test_catalog_service_read_solvers(
 
     # Step 2: Select one release and list solver releases
     selected_solver = solver_releases_page[0]
-    releases, meta = await catalog_service.list_release_history(
+    releases, meta = await catalog_service.list_release_history_latest_first(
         product_name=product_name,
         user_id=user_id,
         service_key=selected_solver.id,
@@ -85,6 +85,6 @@ async def test_catalog_service_read_solvers(
 
     # checks calls to rpc
     mocked_catalog_rpc_api["list_services_paginated"].assert_called_once()
-    mocked_catalog_rpc_api["list_my_service_history_paginated"].assert_called_once()
+    mocked_catalog_rpc_api["list_my_service_history_latest_first"].assert_called_once()
     mocked_catalog_rpc_api["get_service"].assert_called_once()
     mocked_catalog_rpc_api["get_service_ports"].assert_called_once()

services/catalog/src/simcore_service_catalog/api/rpc/_services.py

@@ -242,7 +242,7 @@ async def batch_get_my_services(
 @router.expose(reraise_if_error_type=(ValidationError,))
 @log_decorator(_logger, level=logging.DEBUG)
 @validate_call(config={"arbitrary_types_allowed": True})
-async def list_my_service_history_paginated(
+async def list_my_service_history_latest_first(
     app: FastAPI,
     *,
     product_name: ProductName,
@@ -252,6 +252,7 @@ async def list_my_service_history_paginated(
     offset: PageOffsetInt = 0,
     filters: ServiceListFilters | None = None,
 ) -> PageRpcServiceRelease:
+    """sorts service releases by version (latest first)"""
     assert app.state.engine  # nosec
 
     total_count, items = await catalog_services.list_user_service_release_history(