Merge branch 'master' into enh/lazy-load-templates

Author: odeimaiz

api/tests/requirements.txt

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

ci/helpers/requirements/requirements.txt

@@ -1,4 +1,6 @@
-aiohttp==3.9.5
+aiohappyeyeballs==2.6.1
+    # via aiohttp
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/requirements.in
@@ -33,6 +35,10 @@ multidict==6.0.5
     # via
     #   aiohttp
     #   yarl
+propcache==0.3.1
+    # via
+    #   aiohttp
+    #   yarl
 pydantic==2.10.5
     # via
     #   -c requirements/../../../requirements/constraints.txt
@@ -57,5 +63,5 @@ urllib3==2.3.0
     #   -c requirements/../../../requirements/constraints.txt
     #   docker
     #   requests
-yarl==1.9.4
+yarl==1.20.0
     # via aiohttp

packages/aws-library/requirements/_base.txt

@@ -18,7 +18,7 @@ aiofiles==24.1.0
     #   aioboto3
 aiohappyeyeballs==2.4.6
     # via aiohttp
-aiohttp==3.11.13
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/notifications-library/requirements/_test.txt

@@ -2,7 +2,7 @@ aiodocker==0.24.0
     # via -r requirements/_test.in
 aiohappyeyeballs==2.4.6
     # via aiohttp
-aiohttp==3.11.13
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   aiodocker

packages/service-library/requirements/_aiohttp.txt

@@ -1,6 +1,6 @@
 aiohappyeyeballs==2.4.6
     # via aiohttp
-aiohttp==3.11.13
+aiohttp==3.11.18
     # 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/_base.txt

@@ -10,7 +10,7 @@ aiofiles==24.1.0
     # via -r requirements/_base.in
 aiohappyeyeballs==2.4.6
     # via aiohttp
-aiohttp==3.11.13
+aiohttp==3.11.18
     # 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

@@ -3,7 +3,7 @@ aiohappyeyeballs==2.4.6
     #   -c requirements/_aiohttp.txt
     #   -c requirements/_base.txt
     #   aiohttp
-aiohttp==3.11.13
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_aiohttp.txt

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

@@ -5,7 +5,7 @@
 
 import logging
 from collections.abc import Awaitable, Callable
-from typing import Any, Union
+from typing import Any
 
 from aiohttp import web
 from aiohttp.web_request import Request
@@ -37,7 +37,7 @@ def is_api_request(request: web.Request, api_version: str) -> bool:
     return bool(request.path.startswith(base_path))
 
 
-def error_middleware_factory(
+def error_middleware_factory(  # noqa: C901
     api_version: str,
 ) -> Middleware:
     _is_prod: bool = is_production_environ()
@@ -69,7 +69,7 @@ def _process_and_raise_unexpected_error(request: web.BaseRequest, err: Exception
         raise http_error
 
     @web.middleware
-    async def _middleware_handler(request: web.Request, handler: Handler):
+    async def _middleware_handler(request: web.Request, handler: Handler):  # noqa: C901
         """
         Ensure all error raised are properly enveloped and json responses
         """
@@ -147,12 +147,14 @@ async def _middleware_handler(request: web.Request, handler: Handler):
     return _middleware_handler
 
 
-_ResponseOrBodyData = Union[StreamResponse, Any]
+_ResponseOrBodyData = StreamResponse | Any
 HandlerFlexible = Callable[[Request], Awaitable[_ResponseOrBodyData]]
 MiddlewareFlexible = Callable[[Request, HandlerFlexible], Awaitable[StreamResponse]]
 
 
-def envelope_middleware_factory(api_version: str) -> MiddlewareFlexible:
+def envelope_middleware_factory(
+    api_version: str,
+) -> Callable[..., Awaitable[StreamResponse]]:
     # FIXME: This data conversion is very error-prone. Use decorators instead!
     _is_prod: bool = is_production_environ()
 
@@ -197,4 +199,4 @@ def append_rest_middlewares(
 ):
     """Helper that appends rest-middlewares in the correct order"""
     app.middlewares.append(error_middleware_factory(api_version))
-    app.middlewares.append(envelope_middleware_factory(api_version))  # type: ignore[arg-type]
+    app.middlewares.append(envelope_middleware_factory(api_version))

packages/service-library/src/servicelib/docker_utils.py

@@ -124,7 +124,7 @@ def get_image_complete_url(
         # NOTE: entries like nginx:latest or ngingx:1.3 will raise an exception here
         url = URL(f"https://{image}")
         assert url.host  # nosec
-        if not url.port or "." not in url.host:
+        if not url.port or ("." not in f"{url.host}"):
             # this is Dockerhub + official images are in /library
             url = _create_docker_hub_complete_url(image)
     except ValueError:

packages/simcore-sdk/requirements/_base.txt

@@ -14,7 +14,7 @@ aiofiles==24.1.0
     #   -r requirements/_base.in
 aiohappyeyeballs==2.4.6
     # via aiohttp
-aiohttp==3.11.13
+aiohttp==3.11.18
     # via
     #   -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt