Merge branch 'master' into enh/new-batch-get-services

Author: odeimaiz

api/specs/web-server/_catalog.py

@@ -15,7 +15,7 @@
 from models_library.generics import Envelope
 from models_library.rest_pagination import Page
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.catalog._handlers import (
+from simcore_service_webserver.catalog._rest_controller import (
     ListServiceParams,
     ServicePathParams,
     _FromServiceOutputParams,

api/specs/web-server/_catalog_tags.py

@@ -10,7 +10,7 @@
 from models_library.api_schemas_webserver.catalog import CatalogServiceGet
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.catalog._tags_handlers import (
+from simcore_service_webserver.catalog._rest_tags_controller import (
     ServicePathParams,
     ServiceTagPathParams,
 )
@@ -31,8 +31,7 @@
 )
 def list_service_tags(
     _path_params: Annotated[ServicePathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -41,8 +40,7 @@ def list_service_tags(
 )
 def add_service_tag(
     _path_params: Annotated[ServiceTagPathParams, Depends()],
-):
-    ...
+): ...
 
 
 @router.post(
@@ -51,5 +49,4 @@ def add_service_tag(
 )
 def remove_service_tag(
     _path_params: Annotated[ServiceTagPathParams, Depends()],
-):
-    ...
+): ...

services/api-server/tests/unit/pact_broker/pacts/05_licensed_items.json

@@ -127,7 +127,7 @@
               "version": "1.0.0"
             }
           ],
-          "limit": 50,
+          "limit": 20,
           "links": {
             "first": "/v0/licensed-items?offset=0",
             "last": "/v0/licensed-items?offset=0",

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/docker_logs.py

@@ -1,15 +1,15 @@
 """
-    BackgroundLogFetcher:
-        Creates background task that
-        reads every line of a container's log and
-        posts it as a message to rabbit's log channel (logger)
+BackgroundLogFetcher:
+    Creates background task that
+    reads every line of a container's log and
+    posts it as a message to rabbit's log channel (logger)
 """
 
-
 import logging
 from asyncio import CancelledError, Task, create_task
+from collections.abc import AsyncGenerator, Callable, Coroutine
 from contextlib import suppress
-from typing import Any, AsyncGenerator, Callable, Coroutine, cast
+from typing import Any, cast
 
 from aiodocker import DockerError
 from fastapi import FastAPI
@@ -85,7 +85,9 @@ async def stop_log_fetching(self, container_name: str) -> None:
             return
 
         task.cancel()
-        with suppress(CancelledError):
+        
+        # NOTE: sometime the docker engine causes a TimeoutError after the task is cancelled
+        with suppress(CancelledError, TimeoutError):
             await task
 
         logger.debug("Logs fetching stopped for container '%s'", container_name)

services/static-webserver/client/source/class/osparc/store/Data.js

@@ -77,7 +77,7 @@ qx.Class.define("osparc.store.Data", {
       if (locationId in cache && cache[locationId] && cache[locationId].length) {
         const data = {
           location: locationId,
-          datasets: cache[locationId]
+          items: cache[locationId]
         };
         return data;
       }

services/storage/src/simcore_service_storage/api/rest/_files.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 from typing import Annotated, cast
+from urllib.parse import quote
 
 from fastapi import APIRouter, Depends, Header, HTTPException, Request
 from models_library.api_schemas_storage.storage_schemas import (
@@ -202,23 +203,31 @@ async def upload_file(
     abort_url = (
         URL(f"{request.url}")
         .with_path(
-            request.app.url_path_for(
-                "abort_upload_file",
-                location_id=f"{location_id}",
-                file_id=file_id,
-            )
+            quote(
+                request.app.url_path_for(
+                    "abort_upload_file",
+                    location_id=f"{location_id}",
+                    file_id=file_id,
+                ),
+                safe=":/",
+            ),
+            encoded=True,
         )
         .with_query(user_id=query_params.user_id)
     )
 
     complete_url = (
         URL(f"{request.url}")
         .with_path(
-            request.app.url_path_for(
-                "complete_upload_file",
-                location_id=f"{location_id}",
-                file_id=file_id,
-            )
+            quote(
+                request.app.url_path_for(
+                    "complete_upload_file",
+                    location_id=f"{location_id}",
+                    file_id=file_id,
+                ),
+                safe=":/",
+            ),
+            encoded=True,
         )
         .with_query(user_id=query_params.user_id)
     )
@@ -273,12 +282,16 @@ async def complete_upload_file(
     route = (
         URL(f"{request.url}")
         .with_path(
-            request.app.url_path_for(
-                "is_completed_upload_file",
-                location_id=f"{location_id}",
-                file_id=file_id,
-                future_id=task.get_name(),
-            )
+            quote(
+                request.app.url_path_for(
+                    "is_completed_upload_file",
+                    location_id=f"{location_id}",
+                    file_id=file_id,
+                    future_id=task.get_name(),
+                ),
+                safe=":/",
+            ),
+            encoded=True,
         )
         .with_query(user_id=query_params.user_id)
     )

services/web/server/src/simcore_service_webserver/catalog/client.py renamed to services/web/server/src/simcore_service_webserver/catalog/_catalog_rest_client_service.py

@@ -1,7 +1,5 @@
-""" Requests to catalog service API
+"""Requests to catalog service API"""
 
-"""
-import asyncio
 import logging
 import urllib.parse
 from collections.abc import Iterator
@@ -47,7 +45,7 @@ def _handle_client_exceptions(app: web.Application) -> Iterator[ClientSession]:
             reason=MSG_CATALOG_SERVICE_UNAVAILABLE
         ) from err
 
-    except (asyncio.TimeoutError, ClientConnectionError) as err:
+    except (TimeoutError, ClientConnectionError) as err:
         _logger.debug("Request to catalog service failed: %s", err)
         raise web.HTTPServiceUnavailable(
             reason=MSG_CATALOG_SERVICE_UNAVAILABLE

services/web/server/src/simcore_service_webserver/catalog/exceptions.py renamed to services/web/server/src/simcore_service_webserver/catalog/_exceptions.py

@@ -1,11 +1,19 @@
 """Defines the different exceptions that may arise in the catalog subpackage"""
 
+from servicelib.aiohttp import status
 from servicelib.rabbitmq.rpc_interfaces.catalog.errors import (
     CatalogForbiddenError,
     CatalogItemNotFoundError,
 )
 
 from ..errors import WebServerBaseError
+from ..exception_handling import (
+    ExceptionToHttpErrorMap,
+    HttpErrorInfo,
+    exception_handling_decorator,
+    to_exceptions_handlers_map,
+)
+from ..resource_usage.errors import DefaultPricingPlanNotFoundError
 
 
 class BaseCatalogError(WebServerBaseError):
@@ -35,6 +43,28 @@ def __init__(self, *, service_key: str, service_version: str, **ctxs):
 assert CatalogItemNotFoundError  # nosec
 
 
+_TO_HTTP_ERROR_MAP: ExceptionToHttpErrorMap = {
+    CatalogItemNotFoundError: HttpErrorInfo(
+        status.HTTP_404_NOT_FOUND,
+        "Catalog item not found",
+    ),
+    DefaultPricingPlanNotFoundError: HttpErrorInfo(
+        status.HTTP_404_NOT_FOUND,
+        "Default pricing plan not found",
+    ),
+    DefaultPricingUnitForServiceNotFoundError: HttpErrorInfo(
+        status.HTTP_404_NOT_FOUND, "Default pricing unit not found"
+    ),
+    CatalogForbiddenError: HttpErrorInfo(
+        status.HTTP_403_FORBIDDEN, "Forbidden catalog access"
+    ),
+}
+
+handle_plugin_requests_exceptions = exception_handling_decorator(
+    to_exceptions_handlers_map(_TO_HTTP_ERROR_MAP)
+)
+
+
 __all__: tuple[str, ...] = (
     "CatalogForbiddenError",
     "CatalogItemNotFoundError",