From f22215c751a52365657af4289ed20c9a458eddb6 Mon Sep 17 00:00:00 2001 From: Andrei Neagu <5694077+GitHK@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:02:02 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20rabbitmq=20queue=20name=20prefix?= =?UTF-8?q?=20is=20unique=20during=20the=20lifecycle=20of=20the=20containe?= =?UTF-8?q?r=20(#6365)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Andrei Neagu --- packages/aws-library/requirements/_base.txt | 6 +++++- packages/service-library/requirements/_base.in | 1 + packages/service-library/requirements/_base.txt | 2 ++ packages/service-library/requirements/_test.in | 4 ++-- packages/service-library/requirements/_test.txt | 4 ++-- .../src/servicelib/rabbitmq/_utils.py | 10 +++++++++- packages/simcore-sdk/requirements/_base.txt | 6 +++++- services/api-server/requirements/_base.txt | 9 ++++++++- services/autoscaling/requirements/_base.txt | 7 ++++++- services/autoscaling/requirements/_test.txt | 2 +- services/catalog/requirements/_base.txt | 6 +++++- services/clusters-keeper/requirements/_base.txt | 10 ++++++++-- services/clusters-keeper/requirements/_test.txt | 2 +- services/dask-sidecar/requirements/_base.txt | 8 ++++++-- .../dask-sidecar/requirements/_dask-distributed.txt | 2 +- services/datcore-adapter/requirements/_base.txt | 6 +++++- services/director-v2/requirements/_base.txt | 6 +++++- services/director-v2/requirements/_test.txt | 2 +- services/dynamic-scheduler/requirements/_base.txt | 4 ++++ services/dynamic-sidecar/requirements/_base.txt | 12 +++++++++--- services/efs-guardian/requirements/_base.txt | 10 +++++++++- services/efs-guardian/requirements/_test.txt | 4 +++- services/invitations/requirements/_base.txt | 4 ++++ .../osparc-gateway-server/requirements/_test.txt | 2 +- .../tests/system/requirements/_test.txt | 2 +- services/payments/requirements/_base.txt | 4 ++++ .../resource-usage-tracker/requirements/_base.txt | 7 +++++++ services/storage/requirements/_base.txt | 10 +++++++++- services/web/server/requirements/_base.txt | 6 ++++++ tests/swarm-deploy/requirements/_test.txt | 9 ++++++++- 30 files changed, 138 insertions(+), 29 deletions(-) diff --git a/packages/aws-library/requirements/_base.txt b/packages/aws-library/requirements/_base.txt index 9b654a894e4..1c4e64828a3 100644 --- a/packages/aws-library/requirements/_base.txt +++ b/packages/aws-library/requirements/_base.txt @@ -5,7 +5,9 @@ aioboto3==13.1.1 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.22.2 @@ -174,6 +176,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in pydantic==1.10.17 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/packages/service-library/requirements/_base.in b/packages/service-library/requirements/_base.in index 9de45d3d0af..f31af0b3a40 100644 --- a/packages/service-library/requirements/_base.in +++ b/packages/service-library/requirements/_base.in @@ -19,6 +19,7 @@ opentelemetry-api opentelemetry-exporter-otlp opentelemetry-instrumentation-requests opentelemetry-sdk +psutil pydantic pyinstrument pyyaml diff --git a/packages/service-library/requirements/_base.txt b/packages/service-library/requirements/_base.txt index ffa75cad108..4216f1f186d 100644 --- a/packages/service-library/requirements/_base.txt +++ b/packages/service-library/requirements/_base.txt @@ -138,6 +138,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/_base.in pydantic==1.10.17 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/packages/service-library/requirements/_test.in b/packages/service-library/requirements/_test.in index 5f85f1ff4d6..3ce22356810 100644 --- a/packages/service-library/requirements/_test.in +++ b/packages/service-library/requirements/_test.in @@ -18,7 +18,6 @@ docker faker flaky openapi-spec-validator -psutil pytest pytest-aiohttp pytest-asyncio @@ -35,5 +34,6 @@ python-dotenv respx sqlalchemy[mypy] types_aiofiles -types-psycopg2 types_tqdm +types-psutil +types-psycopg2 diff --git a/packages/service-library/requirements/_test.txt b/packages/service-library/requirements/_test.txt index 0817127e0af..42d1479b5d2 100644 --- a/packages/service-library/requirements/_test.txt +++ b/packages/service-library/requirements/_test.txt @@ -141,8 +141,6 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==6.0.0 - # via -r requirements/_test.in py-cpuinfo==9.0.0 # via pytest-benchmark pytest==8.3.2 @@ -244,6 +242,8 @@ termcolor==2.4.0 # via pytest-sugar types-aiofiles==24.1.0.20240626 # via -r requirements/_test.in +types-psutil==6.0.0.20240901 + # via -r requirements/_test.in types-psycopg2==2.9.21.20240819 # via -r requirements/_test.in types-tqdm==4.66.0.20240417 diff --git a/packages/service-library/src/servicelib/rabbitmq/_utils.py b/packages/service-library/src/servicelib/rabbitmq/_utils.py index 716d8e2adae..588ab9ecbfa 100644 --- a/packages/service-library/src/servicelib/rabbitmq/_utils.py +++ b/packages/service-library/src/servicelib/rabbitmq/_utils.py @@ -1,8 +1,10 @@ import logging +import os import socket from typing import Any, Final import aio_pika +import psutil from aiormq.exceptions import ChannelPreconditionFailed from pydantic import NonNegativeInt from tenacity import retry @@ -51,7 +53,13 @@ async def wait_till_rabbitmq_responsive(url: str) -> bool: def get_rabbitmq_client_unique_name(base_name: str) -> str: - return f"{base_name}_{socket.gethostname()}" + # NOTE: below prefix is guaranteed to change each time the preocess restarts + # Why is this desiarable? + # 1. the code base makes the above assumption, otherwise subcscribers and consumers do not work + # 2. enables restartability of webserver during [re]deploys + prefix_create_time = f"{psutil.Process(os.getpid()).create_time()}".strip(".")[-6:] + + return f"{base_name}_{socket.gethostname()}_{prefix_create_time}" async def declare_queue( diff --git a/packages/simcore-sdk/requirements/_base.txt b/packages/simcore-sdk/requirements/_base.txt index dd540268ec8..65fcbaa084c 100644 --- a/packages/simcore-sdk/requirements/_base.txt +++ b/packages/simcore-sdk/requirements/_base.txt @@ -1,7 +1,9 @@ aio-pika==9.4.3 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.22.2 @@ -191,6 +193,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 0971eea6abf..ea43eef9e4a 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -3,7 +3,10 @@ aio-pika==9.4.1 # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in @@ -365,6 +368,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/autoscaling/requirements/_base.txt b/services/autoscaling/requirements/_base.txt index d41dbd7c0df..4895d0ce00a 100644 --- a/services/autoscaling/requirements/_base.txt +++ b/services/autoscaling/requirements/_base.txt @@ -8,7 +8,9 @@ aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in aiodebug==2.3.0 # via @@ -57,6 +59,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -344,9 +347,11 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # distributed pydantic==1.10.15 # via diff --git a/services/autoscaling/requirements/_test.txt b/services/autoscaling/requirements/_test.txt index 0ea92cb9a42..8f2bda059cd 100644 --- a/services/autoscaling/requirements/_test.txt +++ b/services/autoscaling/requirements/_test.txt @@ -173,7 +173,7 @@ ply==3.11 # via jsonpath-ng pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/_base.txt # -r requirements/_test.in diff --git a/services/catalog/requirements/_base.txt b/services/catalog/requirements/_base.txt index ffc4ea41fb3..f69139967eb 100644 --- a/services/catalog/requirements/_base.txt +++ b/services/catalog/requirements/_base.txt @@ -1,7 +1,9 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -257,6 +259,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pydantic==1.10.14 diff --git a/services/clusters-keeper/requirements/_base.txt b/services/clusters-keeper/requirements/_base.txt index 61454bc6491..9adaa406642 100644 --- a/services/clusters-keeper/requirements/_base.txt +++ b/services/clusters-keeper/requirements/_base.txt @@ -7,7 +7,10 @@ aioboto3==13.1.0 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/../../../packages/aws-library/requirements/_base.in + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in @@ -54,6 +57,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -341,9 +345,11 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # distributed pydantic==1.10.15 # via diff --git a/services/clusters-keeper/requirements/_test.txt b/services/clusters-keeper/requirements/_test.txt index c0ae277a70c..4dea10f742d 100644 --- a/services/clusters-keeper/requirements/_test.txt +++ b/services/clusters-keeper/requirements/_test.txt @@ -193,7 +193,7 @@ pluggy==1.5.0 # via pytest ply==3.11 # via jsonpath-ng -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/_base.txt # -r requirements/_test.in diff --git a/services/dask-sidecar/requirements/_base.txt b/services/dask-sidecar/requirements/_base.txt index f244baa1cfe..a04b02047b3 100644 --- a/services/dask-sidecar/requirements/_base.txt +++ b/services/dask-sidecar/requirements/_base.txt @@ -2,6 +2,8 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in aiobotocore==2.13.0 # via s3fs +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -251,8 +253,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 - # via distributed +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # distributed pydantic==1.10.15 # via # -c requirements/../../../packages/dask-task-models-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/services/dask-sidecar/requirements/_dask-distributed.txt b/services/dask-sidecar/requirements/_dask-distributed.txt index b4ff09e8003..e9ebbb2a0f5 100644 --- a/services/dask-sidecar/requirements/_dask-distributed.txt +++ b/services/dask-sidecar/requirements/_dask-distributed.txt @@ -63,7 +63,7 @@ partd==1.4.2 # via # -c requirements/./_base.txt # dask -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/./_base.txt # distributed diff --git a/services/datcore-adapter/requirements/_base.txt b/services/datcore-adapter/requirements/_base.txt index b5ebf65f34c..d1ed690f390 100644 --- a/services/datcore-adapter/requirements/_base.txt +++ b/services/datcore-adapter/requirements/_base.txt @@ -1,7 +1,9 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in aiocache==0.12.2 - # via -r requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -229,6 +231,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in pydantic==1.10.14 # via # -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/services/director-v2/requirements/_base.txt b/services/director-v2/requirements/_base.txt index c6d20f8910b..500eb0159de 100644 --- a/services/director-v2/requirements/_base.txt +++ b/services/director-v2/requirements/_base.txt @@ -5,6 +5,8 @@ aio-pika==9.4.1 # -r requirements/_base.in aiocache==0.12.2 # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in aiodebug==2.3.0 @@ -430,8 +432,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 +psutil==6.0.0 # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt # distributed psycopg2-binary==2.9.9 diff --git a/services/director-v2/requirements/_test.txt b/services/director-v2/requirements/_test.txt index 3e854eaddaa..a344bc67885 100644 --- a/services/director-v2/requirements/_test.txt +++ b/services/director-v2/requirements/_test.txt @@ -215,7 +215,7 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/_base.txt # distributed diff --git a/services/dynamic-scheduler/requirements/_base.txt b/services/dynamic-scheduler/requirements/_base.txt index 6b8b5400a04..bab6a9c099e 100644 --- a/services/dynamic-scheduler/requirements/_base.txt +++ b/services/dynamic-scheduler/requirements/_base.txt @@ -1,5 +1,7 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -233,6 +235,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pydantic==1.10.15 diff --git a/services/dynamic-sidecar/requirements/_base.txt b/services/dynamic-sidecar/requirements/_base.txt index 8931eb864de..9cdc66a8256 100644 --- a/services/dynamic-sidecar/requirements/_base.txt +++ b/services/dynamic-sidecar/requirements/_base.txt @@ -4,7 +4,10 @@ aio-pika==9.4.1 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in aiocache==0.12.2 - # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in @@ -316,8 +319,11 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto -psutil==5.9.8 - # via -r requirements/_base.in +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/efs-guardian/requirements/_base.txt b/services/efs-guardian/requirements/_base.txt index e7733a1c0ae..6d67dee0772 100644 --- a/services/efs-guardian/requirements/_base.txt +++ b/services/efs-guardian/requirements/_base.txt @@ -7,7 +7,10 @@ aioboto3==13.1.0 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/../../../packages/aws-library/requirements/_base.in + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in @@ -54,6 +57,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -280,6 +284,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in pydantic==1.10.15 # via # -c requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt diff --git a/services/efs-guardian/requirements/_test.txt b/services/efs-guardian/requirements/_test.txt index 19db2db14aa..f35b36a175a 100644 --- a/services/efs-guardian/requirements/_test.txt +++ b/services/efs-guardian/requirements/_test.txt @@ -192,7 +192,9 @@ pluggy==1.5.0 ply==3.11 # via jsonpath-ng psutil==6.0.0 - # via -r requirements/_test.in + # via + # -c requirements/_base.txt + # -r requirements/_test.in py-partiql-parser==0.5.5 # via moto pycparser==2.22 diff --git a/services/invitations/requirements/_base.txt b/services/invitations/requirements/_base.txt index b937284d30e..590de2833e0 100644 --- a/services/invitations/requirements/_base.txt +++ b/services/invitations/requirements/_base.txt @@ -1,5 +1,7 @@ aio-pika==9.4.1 # via -r requirements/../../../packages/service-library/requirements/_base.in +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.21.0 @@ -218,6 +220,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in pycparser==2.21 # via cffi pydantic==1.10.14 diff --git a/services/osparc-gateway-server/requirements/_test.txt b/services/osparc-gateway-server/requirements/_test.txt index 6e5c4d5dba7..a092c888f38 100644 --- a/services/osparc-gateway-server/requirements/_test.txt +++ b/services/osparc-gateway-server/requirements/_test.txt @@ -117,7 +117,7 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../dask-sidecar/requirements/_dask-distributed.txt # distributed diff --git a/services/osparc-gateway-server/tests/system/requirements/_test.txt b/services/osparc-gateway-server/tests/system/requirements/_test.txt index c16ee0a03f1..f2a90715442 100644 --- a/services/osparc-gateway-server/tests/system/requirements/_test.txt +++ b/services/osparc-gateway-server/tests/system/requirements/_test.txt @@ -110,7 +110,7 @@ pluggy==1.5.0 # via pytest pprintpp==0.4.0 # via pytest-icdiff -psutil==5.9.8 +psutil==6.0.0 # via # -c requirements/../../../../dask-sidecar/requirements/_dask-distributed.txt # distributed diff --git a/services/payments/requirements/_base.txt b/services/payments/requirements/_base.txt index 7e8274bea6c..e8c6dd841e1 100644 --- a/services/payments/requirements/_base.txt +++ b/services/payments/requirements/_base.txt @@ -1,5 +1,7 @@ aio-pika==9.4.2 # via -r requirements/../../../packages/service-library/requirements/_base.in +aiocache==0.12.2 + # via -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via -r requirements/../../../packages/service-library/requirements/_base.in aiodocker==0.22.2 @@ -266,6 +268,8 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pyasn1==0.6.0 diff --git a/services/resource-usage-tracker/requirements/_base.txt b/services/resource-usage-tracker/requirements/_base.txt index bbf9e2ff722..75e0ca71ed2 100644 --- a/services/resource-usage-tracker/requirements/_base.txt +++ b/services/resource-usage-tracker/requirements/_base.txt @@ -8,7 +8,9 @@ aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_base.in aiodebug==2.3.0 # via @@ -60,6 +62,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -344,6 +347,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via sqlalchemy pydantic==1.10.14 diff --git a/services/storage/requirements/_base.txt b/services/storage/requirements/_base.txt index 16b7395e592..f65c39f7b71 100644 --- a/services/storage/requirements/_base.txt +++ b/services/storage/requirements/_base.txt @@ -9,7 +9,10 @@ aioboto3==13.1.0 aiobotocore==2.13.1 # via aioboto3 aiocache==0.12.2 - # via -r requirements/../../../packages/aws-library/requirements/_base.in + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in @@ -67,6 +70,7 @@ arrow==1.3.0 # -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/aws-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in @@ -329,6 +333,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg diff --git a/services/web/server/requirements/_base.txt b/services/web/server/requirements/_base.txt index 352ae52b9ec..770ea9b9d9e 100644 --- a/services/web/server/requirements/_base.txt +++ b/services/web/server/requirements/_base.txt @@ -5,6 +5,8 @@ aio-pika==9.1.2 # -r requirements/_base.in aiocache==0.11.1 # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in aiodebug==2.3.0 @@ -373,6 +375,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../../packages/service-library/requirements/_base.in + # -r requirements/../../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.6 # via # aiopg diff --git a/tests/swarm-deploy/requirements/_test.txt b/tests/swarm-deploy/requirements/_test.txt index 8b474b1fee9..22c0768cda4 100644 --- a/tests/swarm-deploy/requirements/_test.txt +++ b/tests/swarm-deploy/requirements/_test.txt @@ -4,7 +4,10 @@ aio-pika==9.4.3 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/_test.in aiocache==0.12.2 - # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/_base.in aiodebug==2.3.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in @@ -266,6 +269,10 @@ protobuf==4.25.4 # via # googleapis-common-protos # opentelemetry-proto +psutil==6.0.0 + # via + # -r requirements/../../../packages/service-library/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in psycopg2-binary==2.9.9 # via # aiopg