Merge branch 'master' into handle_function_errors_api

Author: wvangeit

api/tests/requirements.txt

@@ -1,6 +1,6 @@
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c ../../requirements/constraints.txt
     #   -r requirements.in

ci/helpers/requirements/requirements.txt

@@ -1,6 +1,6 @@
 aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/requirements.in

packages/aws-library/requirements/_base.txt

@@ -16,9 +16,9 @@ aiofiles==24.1.0
     # via
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   aioboto3
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/dask-task-models-library/src/dask_task_models_library/container_tasks/errors.py

@@ -1,11 +1,9 @@
-""" Dask task exceptions
+"""Dask task exceptions"""
 
-"""
 from common_library.errors_classes import OsparcErrorMixin
 
 
-class TaskValueError(OsparcErrorMixin, ValueError):
-    ...
+class TaskValueError(OsparcErrorMixin, ValueError): ...
 
 
 class TaskCancelledError(OsparcErrorMixin, RuntimeError):
@@ -18,3 +16,12 @@ class ServiceRuntimeError(OsparcErrorMixin, RuntimeError):
         " running in container {container_id} failed with code"
         " {exit_code}. Last logs:\n{service_logs}"
     )
+
+
+class ServiceInputsUseFileToKeyMapButReceivesZipDataError(
+    OsparcErrorMixin, RuntimeError
+):
+    msg_template = (
+        "The service {service_key}:{service_version} {input} uses a file-to-key {file_to_key_map} map but receives zip data instead. "
+        "TIP: either pass a single file or zip file and remove the file-to-key map parameter."
+    )

packages/models-library/src/models_library/functions.py

@@ -76,7 +76,10 @@ class FunctionClass(str, Enum):
 # see here https://github.com/ITISFoundation/osparc-simcore/issues/7659
 FunctionInputs: TypeAlias = dict[str, Any] | None
 
-FunctionInputsList: TypeAlias = list[FunctionInputs]
+FunctionInputsList: TypeAlias = Annotated[
+    list[FunctionInputs],
+    Field(max_length=50),
+]
 
 FunctionOutputs: TypeAlias = dict[str, Any] | None
 

packages/notifications-library/requirements/_test.txt

@@ -1,8 +1,8 @@
 aiodocker==0.24.0
     # via -r requirements/_test.in
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   aiodocker

packages/service-library/requirements/_aiohttp.txt

@@ -1,6 +1,6 @@
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via -r requirements/_aiohttp.in
 aiopg==1.4.0
     # via -r requirements/_aiohttp.in

packages/service-library/requirements/_base.txt

@@ -8,9 +8,9 @@ aiodocker==0.24.0
     # via -r requirements/_base.in
 aiofiles==24.1.0
     # via -r requirements/_base.in
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/service-library/requirements/_test.txt

@@ -1,9 +1,9 @@
-aiohappyeyeballs==2.4.6
+aiohappyeyeballs==2.6.1
     # via
     #   -c requirements/_aiohttp.txt
     #   -c requirements/_base.txt
     #   aiohttp
-aiohttp==3.11.18
+aiohttp==3.12.7
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_aiohttp.txt

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -18,7 +18,12 @@
 from ..mimetype_constants import MIMETYPE_APPLICATION_JSON
 from ..rest_responses import is_enveloped_from_map, is_enveloped_from_text
 from ..utils import is_production_environ
-from .rest_responses import create_data_response, create_http_error, wrap_as_envelope
+from .rest_responses import (
+    create_data_response,
+    create_http_error,
+    safe_status_message,
+    wrap_as_envelope,
+)
 from .rest_utils import EnvelopeFactory
 from .typing_extension import Handler, Middleware
 
@@ -83,6 +88,8 @@ async def _middleware_handler(request: web.Request, handler: Handler):  # noqa:
         except web.HTTPError as err:
 
             err.content_type = MIMETYPE_APPLICATION_JSON
+            if err.reason:
+                err.set_status(err.status, safe_status_message(message=err.reason))
 
             if not err.text or not is_enveloped_from_text(err.text):
                 error_message = err.text or err.reason or "Unexpected error"
@@ -102,6 +109,9 @@ async def _middleware_handler(request: web.Request, handler: Handler):  # noqa:
 
         except web.HTTPSuccessful as err:
             err.content_type = MIMETYPE_APPLICATION_JSON
+            if err.reason:
+                err.set_status(err.status, safe_status_message(message=err.reason))
+
             if err.text:
                 try:
                     payload = json_loads(err.text)
@@ -176,10 +186,7 @@ async def _middleware_handler(
             return resp
 
         if not isinstance(resp, StreamResponse):
-            resp = create_data_response(
-                data=resp,
-                skip_internal_error_details=_is_prod,
-            )
+            resp = create_data_response(data=resp)
 
         assert isinstance(resp, web.StreamResponse)  # nosec
         return resp