Skip to content

⬆️ Maintenance: upgrade aiohttp, version 3.11.13 is yanked #7649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
May 9, 2025
Merged

⬆️ Maintenance: upgrade aiohttp, version 3.11.13 is yanked #7649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7e74cd1
add constraint against yanked version
sanderegg May 8, 2025
3cc71c2
upgrade aiohttp
sanderegg May 8, 2025
1127d07
mypy
sanderegg May 8, 2025
aef3818
mypy
sanderegg May 8, 2025
8691274
ignore not web.appkey warning
sanderegg May 8, 2025
31b97c7
fix error
sanderegg May 8, 2025
8c8fcbc
mypy
sanderegg May 8, 2025
dd43202
linter
sanderegg May 8, 2025
2c21399
linter
sanderegg May 8, 2025
8e264db
linter
sanderegg May 8, 2025
d602648
linter
sanderegg May 8, 2025
c0f1f24
fixed types
sanderegg May 9, 2025
919c5e3
pylint
sanderegg May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 8 additions & 2 deletions ci/helpers/requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion packages/aws-library/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/notifications-library/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/service-library/requirements/_aiohttp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/service-library/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/service-library/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions packages/service-library/src/servicelib/aiohttp/rest_middlewares.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
"""
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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))
2 changes: 1 addition & 1 deletion packages/service-library/src/servicelib/docker_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion packages/simcore-sdk/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/simcore-sdk/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ aiohappyeyeballs==2.4.6
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.13
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
4 changes: 2 additions & 2 deletions packages/simcore-sdk/src/simcore_sdk/node_ports_common/_filemanager_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def _get_https_link_if_storage_secure(url: str) -> str:
# DY-SIDECAR (simcore-sdk) -> STORAGE (httpS requests)
# https://github.com/ITISFoundation/osparc-simcore/issues/5390
parsed_url = URL(url)
if is_storage_secure() and parsed_url.scheme != "https":
return f'{parsed_url.with_scheme("https")}'
if bool(is_storage_secure()):
return f"{parsed_url.with_scheme('https')}"

return url

Expand Down
2 changes: 1 addition & 1 deletion requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# Vulnerabilities -----------------------------------------------------------------------------------------
#
aiohttp>=3.7.4 # https://github.com/advisories/GHSA-v6wp-4m6f-gcjg
aiohttp>=3.7.4, !=3.11.13 # https://github.com/advisories/GHSA-v6wp-4m6f-gcjg, 3.11.13 was yanked https://github.com/aio-libs/aiohttp/issues/10617
certifi>=2023.7.22 # https://github.com/advisories/GHSA-xqr8-7jwr-rhp7
cryptography>=41.0.6 # https://github.com/advisories/GHSA-v8gr-m533-ghj9
httpx>=0.23.0 # https://github.com/advisories/GHSA-h8pj-cxx2-jfg2 / CVE-2021-41945
Expand Down
2 changes: 1 addition & 1 deletion services/agent/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aiofiles==24.1.0
# via -r requirements/../../../packages/service-library/requirements/_base.in
aiohappyeyeballs==2.5.0
# 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
Expand Down
2 changes: 1 addition & 1 deletion services/agent/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ aiohappyeyeballs==2.5.0
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.13
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
2 changes: 1 addition & 1 deletion services/api-server/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ aiofiles==24.1.0
# -r requirements/_base.in
aiohappyeyeballs==2.4.4
# via aiohttp
aiohttp==3.11.10
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
Expand Down
2 changes: 1 addition & 1 deletion services/api-server/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ aiohappyeyeballs==2.4.4
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.10
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
2 changes: 1 addition & 1 deletion services/autoscaling/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ aiofiles==24.1.0
# aioboto3
aiohappyeyeballs==2.4.4
# via aiohttp
aiohttp==3.11.10
aiohttp==3.11.18
# via
# -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion services/catalog/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aiofiles==24.1.0
# via -r requirements/../../../packages/service-library/requirements/_base.in
aiohappyeyeballs==2.6.1
# 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
Expand Down
2 changes: 1 addition & 1 deletion services/catalog/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ aiohappyeyeballs==2.6.1
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.13
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
2 changes: 1 addition & 1 deletion services/clusters-keeper/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ aiofiles==24.1.0
# aioboto3
aiohappyeyeballs==2.4.4
# via aiohttp
aiohttp==3.11.10
aiohttp==3.11.18
# via
# -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion services/clusters-keeper/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ aiohappyeyeballs==2.4.4
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.10
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
2 changes: 1 addition & 1 deletion services/dask-sidecar/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ aiofiles==24.1.0
# -r requirements/_base.in
aiohappyeyeballs==2.4.4
# via aiohttp
aiohttp==3.11.10
aiohttp==3.11.18
# via
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down
10 changes: 8 additions & 2 deletions services/datcore-adapter/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ aiofiles==23.2.1
# via
# -r requirements/../../../packages/service-library/requirements/_base.in
# -r requirements/_base.in
aiohttp==3.9.3
aiohappyeyeballs==2.6.1
# via aiohttp
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
Expand Down Expand Up @@ -270,6 +272,10 @@ prometheus-client==0.20.0
# prometheus-fastapi-instrumentator
prometheus-fastapi-instrumentator==6.1.0
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
propcache==0.3.1
# via
# aiohttp
# yarl
protobuf==4.25.4
# via
# googleapis-common-protos
Expand Down Expand Up @@ -494,7 +500,7 @@ wrapt==1.16.0
# deprecated
# opentelemetry-instrumentation
# opentelemetry-instrumentation-redis
yarl==1.9.4
yarl==1.20.0
# via
# -r requirements/../../../packages/service-library/requirements/_base.in
# aio-pika
Expand Down
2 changes: 1 addition & 1 deletion services/director-v2/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ aiofiles==24.1.0
# -r requirements/../../../packages/simcore-sdk/requirements/_base.in
aiohappyeyeballs==2.5.0
# via aiohttp
aiohttp==3.11.13
aiohttp==3.11.18
# via
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion services/director-v2/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ aiohappyeyeballs==2.5.0
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.13
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
2 changes: 1 addition & 1 deletion services/director/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ aiofiles==24.1.0
# via -r requirements/../../../packages/service-library/requirements/_base.in
aiohappyeyeballs==2.4.3
# via aiohttp
aiohttp==3.11.1
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
Expand Down
2 changes: 1 addition & 1 deletion services/director/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ aiohappyeyeballs==2.4.3
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.1
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
2 changes: 1 addition & 1 deletion services/docker-api-proxy/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aiofiles==24.1.0
# via -r requirements/../../../packages/service-library/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
Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-scheduler/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ aiofiles==24.1.0
# nicegui
aiohappyeyeballs==2.5.0
# 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
Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-sidecar/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ aiofiles==24.1.0
# -r requirements/_base.in
aiohappyeyeballs==2.5.0
# 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
Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-sidecar/requirements/_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ aiohappyeyeballs==2.5.0
# via
# -c requirements/_base.txt
# aiohttp
aiohttp==3.11.13
aiohttp==3.11.18
# via
# -c requirements/../../../requirements/constraints.txt
# -c requirements/_base.txt
Expand Down
10 changes: 6 additions & 4 deletions services/efs-guardian/requirements/_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ aiofiles==24.1.0
# aioboto3
aiohappyeyeballs==2.4.3
# via aiohttp
aiohttp==3.10.10
aiohttp==3.11.18
# via
# -c requirements/../../../packages/aws-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
# -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
Expand Down Expand Up @@ -417,8 +417,10 @@ prometheus-client==0.21.0
# prometheus-fastapi-instrumentator
prometheus-fastapi-instrumentator==6.1.0
# via -r requirements/../../../packages/service-library/requirements/_fastapi.in
propcache==0.2.0
# via yarl
propcache==0.3.1
# via
# aiohttp
# yarl
protobuf==4.25.5
# via
# googleapis-common-protos
Expand Down Expand Up @@ -820,7 +822,7 @@ wrapt==1.16.0
# deprecated
# opentelemetry-instrumentation
# opentelemetry-instrumentation-redis
yarl==1.15.4
yarl==1.20.0
# via
# -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
# -r requirements/../../../packages/postgres-database/requirements/_base.in
Expand Down
Loading
Loading