From 5097e1635579140b464babe6254228afa0b117a2 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Thu, 28 Nov 2024 11:54:39 +0100 Subject: [PATCH 01/13] upgrade api-server dependencies --- services/api-server/requirements/_base.txt | 203 ++++++++++---------- services/api-server/requirements/_test.txt | 95 +++++---- services/api-server/requirements/_tools.txt | 43 +++-- 3 files changed, 181 insertions(+), 160 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 50bb56b4e69..91b47074b5c 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -1,8 +1,8 @@ -aio-pika==9.4.1 +aio-pika==9.5.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -aiocache==0.12.2 +aiocache==0.12.3 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in @@ -11,17 +11,19 @@ aiodebug==2.3.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -aiodocker==0.21.0 +aiodocker==0.24.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -aiofiles==23.2.1 +aiofiles==24.1.0 # 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 -aiohttp==3.9.3 +aiohappyeyeballs==2.4.3 + # via aiohttp +aiohttp==3.11.8 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -57,25 +59,23 @@ aiopg==1.4.0 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -aiormq==6.8.0 +aiormq==6.8.1 # via aio-pika aiosignal==1.3.1 # via aiohttp -alembic==1.13.1 +alembic==1.14.0 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in annotated-types==0.7.0 # via pydantic -anyio==4.3.0 +anyio==4.6.2.post1 # via # fast-depends # faststream # httpx # starlette # watchfiles -appdirs==1.4.4 - # via pint arrow==1.3.0 # via # -r requirements/../../../packages/models-library/requirements/_base.in @@ -87,16 +87,14 @@ arrow==1.3.0 asgiref==3.8.1 # via opentelemetry-instrumentation-asgi async-timeout==4.0.3 - # via - # aiopg - # asyncpg -asyncpg==0.29.0 + # via aiopg +asyncpg==0.30.0 # via sqlalchemy -attrs==23.2.0 +attrs==24.2.0 # via # aiohttp # jsonschema -certifi==2024.2.2 +certifi==2024.8.30 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -129,15 +127,15 @@ certifi==2024.2.2 # httpcore # httpx # requests -cffi==1.16.0 +cffi==1.17.1 # via cryptography -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via # typer # uvicorn -cryptography==42.0.5 +cryptography==44.0.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -168,58 +166,59 @@ cryptography==42.0.5 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # -r requirements/_base.in -deprecated==1.2.14 +deprecated==1.2.15 # via # opentelemetry-api # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # opentelemetry-semantic-conventions -dnspython==2.6.1 +dnspython==2.7.0 # via email-validator -email-validator==2.1.1 +email-validator==2.2.0 # via # fastapi # pydantic -fast-depends==2.4.2 +exceptiongroup==1.2.2 + # via aio-pika +fast-depends==2.4.12 # via faststream fastapi==0.115.5 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in - # prometheus-fastapi-instrumentator fastapi-cli==0.0.5 # via fastapi -fastapi-pagination==0.12.31 +fastapi-pagination==0.12.32 # via -r requirements/_base.in -faststream==0.5.28 +faststream==0.5.30 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in flexcache==0.3 # via pint -flexparser==0.3.1 +flexparser==0.4 # via pint -frozenlist==1.4.1 +frozenlist==1.5.0 # via # aiohttp # aiosignal -googleapis-common-protos==1.65.0 +googleapis-common-protos==1.66.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -greenlet==3.0.3 +greenlet==3.1.1 # via sqlalchemy -grpcio==1.66.0 +grpcio==1.68.0 # via opentelemetry-exporter-otlp-proto-grpc h11==0.14.0 # via # httpcore # uvicorn -httpcore==1.0.5 +httpcore==1.0.7 # via httpx -httptools==0.6.1 +httptools==0.6.4 # via uvicorn -httpx==0.27.0 +httpx==0.27.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -252,18 +251,18 @@ httpx==0.27.0 # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in # fastapi -idna==3.6 +idna==3.10 # via # anyio # email-validator # httpx # requests # yarl -importlib-metadata==8.0.0 +importlib-metadata==8.5.0 # via opentelemetry-api -itsdangerous==2.1.2 +itsdangerous==2.2.0 # via fastapi -jinja2==3.1.3 +jinja2==3.1.4 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -301,7 +300,7 @@ jsonschema==3.2.0 # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in -mako==1.3.2 +mako==1.3.6 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -334,17 +333,17 @@ mako==1.3.2 # alembic markdown-it-py==3.0.0 # via rich -markupsafe==2.1.5 +markupsafe==3.0.2 # via # jinja2 # mako mdurl==0.1.2 # via markdown-it-py -multidict==6.0.5 +multidict==6.1.0 # via # aiohttp # yarl -opentelemetry-api==1.27.0 +opentelemetry-api==1.28.2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in @@ -361,19 +360,19 @@ opentelemetry-api==1.27.0 # opentelemetry-instrumentation-requests # opentelemetry-sdk # opentelemetry-semantic-conventions -opentelemetry-exporter-otlp==1.27.0 +opentelemetry-exporter-otlp==1.28.2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-exporter-otlp-proto-common==1.27.0 +opentelemetry-exporter-otlp-proto-common==1.28.2 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-grpc==1.27.0 +opentelemetry-exporter-otlp-proto-grpc==1.28.2 # via opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-http==1.27.0 +opentelemetry-exporter-otlp-proto-http==1.28.2 # via opentelemetry-exporter-otlp -opentelemetry-instrumentation==0.48b0 +opentelemetry-instrumentation==0.49b2 # via # opentelemetry-instrumentation-aiopg # opentelemetry-instrumentation-asgi @@ -383,41 +382,42 @@ opentelemetry-instrumentation==0.48b0 # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-redis # opentelemetry-instrumentation-requests -opentelemetry-instrumentation-aiopg==0.48b0 +opentelemetry-instrumentation-aiopg==0.49b2 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -opentelemetry-instrumentation-asgi==0.48b0 +opentelemetry-instrumentation-asgi==0.49b2 # via opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-asyncpg==0.48b0 +opentelemetry-instrumentation-asyncpg==0.49b2 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in -opentelemetry-instrumentation-dbapi==0.48b0 +opentelemetry-instrumentation-dbapi==0.49b2 # via opentelemetry-instrumentation-aiopg -opentelemetry-instrumentation-fastapi==0.48b0 +opentelemetry-instrumentation-fastapi==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -opentelemetry-instrumentation-httpx==0.48b0 +opentelemetry-instrumentation-httpx==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -opentelemetry-instrumentation-redis==0.48b0 +opentelemetry-instrumentation-redis==0.49b2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-instrumentation-requests==0.48b0 +opentelemetry-instrumentation-requests==0.49b2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-proto==1.27.0 +opentelemetry-proto==1.28.2 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-sdk==1.27.0 +opentelemetry-sdk==1.28.2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-semantic-conventions==0.48b0 +opentelemetry-semantic-conventions==0.49b2 # via + # opentelemetry-instrumentation # opentelemetry-instrumentation-asgi # opentelemetry-instrumentation-asyncpg # opentelemetry-instrumentation-dbapi @@ -426,13 +426,13 @@ opentelemetry-semantic-conventions==0.48b0 # opentelemetry-instrumentation-redis # opentelemetry-instrumentation-requests # opentelemetry-sdk -opentelemetry-util-http==0.48b0 +opentelemetry-util-http==0.49b2 # via # opentelemetry-instrumentation-asgi # opentelemetry-instrumentation-fastapi # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-requests -orjson==3.10.0 +orjson==3.10.12 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -482,37 +482,44 @@ orjson==3.10.0 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in # -r requirements/_base.in # fastapi -packaging==24.0 +packaging==24.2 # via # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in + # opentelemetry-instrumentation pamqp==3.3.0 # via aiormq parse==1.20.2 # via -r requirements/_base.in -pint==0.24.3 +pint==0.24.4 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in -prometheus-client==0.20.0 +platformdirs==4.3.6 + # via pint +prometheus-client==0.21.0 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # prometheus-fastapi-instrumentator -prometheus-fastapi-instrumentator==6.1.0 +prometheus-fastapi-instrumentator==7.0.0 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -protobuf==4.25.4 +propcache==0.2.0 + # via + # aiohttp + # yarl +protobuf==5.29.0 # via # googleapis-common-protos # opentelemetry-proto -psutil==6.0.0 +psutil==6.1.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 +psycopg2-binary==2.9.10 # via # aiopg # sqlalchemy pycparser==2.22 # via cffi -pydantic==2.9.2 +pydantic==2.10.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -575,9 +582,9 @@ pydantic==2.9.2 # fastapi-pagination # pydantic-extra-types # pydantic-settings -pydantic-core==2.23.4 +pydantic-core==2.27.1 # via pydantic -pydantic-extra-types==2.9.0 +pydantic-extra-types==2.10.0 # via # -r requirements/../../../packages/common-library/requirements/_base.in # -r requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/_base.in @@ -609,9 +616,9 @@ pydantic-settings==2.6.1 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in # fastapi -pygments==2.17.2 +pygments==2.18.0 # via rich -pyinstrument==4.6.2 +pyinstrument==5.0.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in @@ -623,9 +630,9 @@ python-dotenv==1.0.1 # via # pydantic-settings # uvicorn -python-multipart==0.0.9 +python-multipart==0.0.17 # via fastapi -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -660,7 +667,7 @@ pyyaml==6.0.1 # -r requirements/_base.in # fastapi # uvicorn -redis==5.0.4 +redis==5.2.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -698,17 +705,15 @@ repro-zipfile==0.3.1 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in requests==2.32.3 # via opentelemetry-exporter-otlp-proto-http -rich==13.7.1 +rich==13.9.4 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in # typer -setuptools==69.2.0 - # via - # jsonschema - # opentelemetry-instrumentation +setuptools==75.6.0 + # via jsonschema shellingham==1.5.4 # via typer six==1.16.0 @@ -719,7 +724,7 @@ sniffio==1.3.1 # via # anyio # httpx -sqlalchemy==1.4.52 +sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -753,7 +758,7 @@ sqlalchemy==1.4.52 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in # aiopg # alembic -starlette==0.41.2 +starlette==0.41.3 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -784,22 +789,23 @@ starlette==0.41.2 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # fastapi -tenacity==8.5.0 + # prometheus-fastapi-instrumentator +tenacity==9.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/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -toolz==0.12.1 +toolz==1.0.0 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -tqdm==4.66.2 +tqdm==4.67.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 -typer==0.12.3 +typer==0.13.1 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in @@ -807,12 +813,11 @@ typer==0.12.3 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/_base.in # fastapi-cli -types-python-dateutil==2.9.0.20240316 +types-python-dateutil==2.9.0.20241003 # via arrow -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # aiodebug - # aiodocker # alembic # fastapi # fastapi-pagination @@ -823,8 +828,9 @@ typing-extensions==4.10.0 # pint # pydantic # pydantic-core + # pydantic-extra-types # typer -ujson==5.9.0 +ujson==5.10.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -886,30 +892,33 @@ urllib3==2.2.3 # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt # requests -uvicorn==0.29.0 +uvicorn==0.32.1 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # fastapi # fastapi-cli -uvloop==0.19.0 +uvloop==0.21.0 # via uvicorn -watchfiles==0.21.0 +watchfiles==1.0.0 # via uvicorn -websockets==12.0 +websockets==14.1 # via uvicorn -wrapt==1.16.0 +wrapt==1.17.0 # via # deprecated # opentelemetry-instrumentation # opentelemetry-instrumentation-aiopg # opentelemetry-instrumentation-dbapi + # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-redis -yarl==1.9.4 +yarl==1.18.0 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in + # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # aio-pika # aiohttp # aiormq -zipp==3.20.1 +zipp==3.21.0 # via importlib-metadata diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 26f93fde738..d326b9c8fe6 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -1,25 +1,29 @@ -aiohttp==3.9.3 +aiohappyeyeballs==2.4.3 + # via + # -c requirements/_base.txt + # aiohttp +aiohttp==3.11.8 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # aioresponses -aioresponses==0.7.6 +aioresponses==0.7.7 # via -r requirements/_test.in aiosignal==1.3.1 # via # -c requirements/_base.txt # aiohttp -alembic==1.13.1 +alembic==1.14.0 # via # -c requirements/_base.txt # -r requirements/_test.in -anyio==4.3.0 +anyio==4.6.2.post1 # via # -c requirements/_base.txt # httpx asgi-lifespan==2.1.0 # via -r requirements/_test.in -attrs==23.2.0 +attrs==24.2.0 # via # -c requirements/_base.txt # aiohttp @@ -33,28 +37,28 @@ aws-sam-translator==1.55.0 # cfn-lint aws-xray-sdk==2.14.0 # via moto -boto3==1.35.25 +boto3==1.35.71 # via # aws-sam-translator # moto -boto3-stubs==1.35.25 +boto3-stubs==1.35.71 # via types-boto3 -botocore==1.35.25 +botocore==1.35.71 # via # aws-xray-sdk # boto3 # moto # s3transfer -botocore-stubs==1.35.25 +botocore-stubs==1.35.71 # via boto3-stubs -certifi==2024.2.2 +certifi==2024.8.30 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # httpcore # httpx # requests -cffi==1.16.0 +cffi==1.17.1 # via # -c requirements/_base.txt # cryptography @@ -62,7 +66,7 @@ cfn-lint==0.72.0 # via # -c requirements/./constraints.txt # moto -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via # -c requirements/_base.txt # requests @@ -71,9 +75,9 @@ click==8.1.7 # -c requirements/_base.txt # -r requirements/_test.in # flask -coverage==7.6.1 +coverage==7.6.8 # via pytest-cov -cryptography==42.0.5 +cryptography==44.0.0 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -89,7 +93,7 @@ ecdsa==0.19.0 # moto # python-jose # sshpubkeys -faker==29.0.0 +faker==33.1.0 # via -r requirements/_test.in flask==2.1.3 # via @@ -97,14 +101,14 @@ flask==2.1.3 # moto flask-cors==5.0.0 # via moto -frozenlist==1.4.1 +frozenlist==1.5.0 # via # -c requirements/_base.txt # aiohttp # aiosignal -graphql-core==3.2.4 +graphql-core==3.2.5 # via moto -greenlet==3.0.3 +greenlet==3.1.1 # via # -c requirements/_base.txt # sqlalchemy @@ -112,16 +116,16 @@ h11==0.14.0 # via # -c requirements/_base.txt # httpcore -httpcore==1.0.5 +httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.27.0 +httpx==0.27.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # respx -idna==3.6 +idna==3.10 # via # -c requirements/_base.txt # anyio @@ -131,11 +135,11 @@ idna==3.6 # yarl iniconfig==2.0.0 # via pytest -itsdangerous==2.1.2 +itsdangerous==2.2.0 # via # -c requirements/_base.txt # flask -jinja2==3.1.3 +jinja2==3.1.4 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -151,7 +155,7 @@ jsondiff==2.2.1 # via moto jsonpatch==1.33 # via cfn-lint -jsonpickle==3.3.0 +jsonpickle==4.0.0 # via jschema-to-python jsonpointer==3.0.0 # via jsonpatch @@ -167,12 +171,12 @@ jsonschema==3.2.0 # openapi-spec-validator junit-xml==1.9 # via cfn-lint -mako==1.3.2 +mako==1.3.6 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # alembic -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -c requirements/_base.txt # jinja2 @@ -182,12 +186,12 @@ moto==4.0.1 # via # -c requirements/./constraints.txt # -r requirements/_test.in -multidict==6.0.5 +multidict==6.1.0 # via # -c requirements/_base.txt # aiohttp # yarl -mypy==1.12.0 +mypy==1.13.0 # via sqlalchemy mypy-extensions==1.0.0 # via mypy @@ -199,9 +203,10 @@ openapi-spec-validator==0.4.0 # via # -c requirements/./constraints.txt # moto -packaging==24.0 +packaging==24.2 # via # -c requirements/_base.txt + # aioresponses # pytest pbr==6.1.0 # via @@ -209,6 +214,11 @@ pbr==6.1.0 # sarif-om pluggy==1.5.0 # via pytest +propcache==0.2.0 + # via + # -c requirements/_base.txt + # aiohttp + # yarl pyasn1==0.6.1 # via # python-jose @@ -217,11 +227,11 @@ pycparser==2.22 # via # -c requirements/_base.txt # cffi -pyinstrument==4.6.2 +pyinstrument==5.0.0 # via # -c requirements/_base.txt # -r requirements/_test.in -pyparsing==3.1.4 +pyparsing==3.2.0 # via moto pyrsistent==0.20.0 # via @@ -238,7 +248,7 @@ pytest-asyncio==0.23.8 # via # -c requirements/../../../requirements/constraints.txt # -r requirements/_test.in -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via -r requirements/_test.in pytest-docker==3.1.1 # via -r requirements/_test.in @@ -256,7 +266,7 @@ python-jose==3.3.0 # via moto pytz==2024.2 # via moto -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -279,11 +289,11 @@ rsa==4.9 # via # -c requirements/../../../requirements/constraints.txt # python-jose -s3transfer==0.10.2 +s3transfer==0.10.4 # via boto3 sarif-om==1.0.4 # via cfn-lint -setuptools==69.2.0 +setuptools==75.6.0 # via # -c requirements/_base.txt # jsonschema @@ -302,7 +312,7 @@ sniffio==1.3.1 # anyio # asgi-lifespan # httpx -sqlalchemy==1.4.52 +sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -314,17 +324,18 @@ sshpubkeys==3.3.1 # via moto types-aiofiles==24.1.0.20240626 # via -r requirements/_test.in -types-awscrt==0.21.5 +types-awscrt==0.23.1 # via botocore-stubs types-boto3==1.0.2 # via -r requirements/_test.in -types-s3transfer==0.10.2 +types-s3transfer==0.10.4 # via boto3-stubs -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # alembic # boto3-stubs + # faker # mypy # sqlalchemy2-stubs urllib3==2.2.3 @@ -339,13 +350,13 @@ werkzeug==2.1.2 # via # flask # moto -wrapt==1.16.0 +wrapt==1.17.0 # via # -c requirements/_base.txt # aws-xray-sdk -xmltodict==0.13.0 +xmltodict==0.14.2 # via moto -yarl==1.9.4 +yarl==1.18.0 # via # -c requirements/_base.txt # aiohttp diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index 8b1f4a36d83..aacaeb39634 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -1,8 +1,8 @@ -astroid==3.3.4 +astroid==3.3.5 # via pylint -black==24.8.0 +black==24.10.0 # via -r requirements/../../../requirements/devenv.txt -build==1.2.2 +build==1.2.2.post1 # via pip-tools bump2version==1.0.1 # via -r requirements/../../../requirements/devenv.txt @@ -16,32 +16,32 @@ click==8.1.7 # -c requirements/_test.txt # black # pip-tools -dill==0.3.8 +dill==0.3.9 # via pylint -distlib==0.3.8 +distlib==0.3.9 # via virtualenv filelock==3.16.1 # via virtualenv -identify==2.6.1 +identify==2.6.3 # via pre-commit isort==5.13.2 # via # -r requirements/../../../requirements/devenv.txt # pylint -jinja2==3.1.3 +jinja2==3.1.4 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # -c requirements/_test.txt # -r requirements/_tools.in -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -c requirements/_base.txt # -c requirements/_test.txt # jinja2 mccabe==0.7.0 # via pylint -mypy==1.12.0 +mypy==1.13.0 # via # -c requirements/_test.txt # -r requirements/../../../requirements/devenv.txt @@ -52,7 +52,7 @@ mypy-extensions==1.0.0 # mypy nodeenv==1.9.1 # via pre-commit -packaging==24.0 +packaging==24.2 # via # -c requirements/_base.txt # -c requirements/_test.txt @@ -60,47 +60,48 @@ packaging==24.0 # build pathspec==0.12.1 # via black -pip==24.2 +pip==24.3.1 # via pip-tools pip-tools==7.4.1 # via -r requirements/../../../requirements/devenv.txt platformdirs==4.3.6 # via + # -c requirements/_base.txt # black # pylint # virtualenv -pre-commit==3.8.0 +pre-commit==4.0.1 # via -r requirements/../../../requirements/devenv.txt -pylint==3.3.0 +pylint==3.3.1 # via -r requirements/../../../requirements/devenv.txt -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt # -c requirements/_test.txt # pre-commit # watchdog -ruff==0.6.7 +ruff==0.8.0 # via -r requirements/../../../requirements/devenv.txt -setuptools==69.2.0 +setuptools==75.6.0 # via # -c requirements/_base.txt # -c requirements/_test.txt # pip-tools tomlkit==0.13.2 # via pylint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # -c requirements/_base.txt # -c requirements/_test.txt # mypy -virtualenv==20.26.5 +virtualenv==20.28.0 # via pre-commit -watchdog==5.0.2 +watchdog==6.0.0 # via -r requirements/_tools.in -wheel==0.44.0 +wheel==0.45.1 # via pip-tools From 78b1ebfe78a4c1781dfbd14d7b022765f5d93e03 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Wed, 4 Dec 2024 09:24:52 +0100 Subject: [PATCH 02/13] make typechecking test happy --- .../core/settings.py | 2 +- .../models/api_resources.py | 21 ++----------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/services/api-server/src/simcore_service_api_server/core/settings.py b/services/api-server/src/simcore_service_api_server/core/settings.py index 8c804df22be..98323adf4e4 100644 --- a/services/api-server/src/simcore_service_api_server/core/settings.py +++ b/services/api-server/src/simcore_service_api_server/core/settings.py @@ -59,7 +59,7 @@ class BasicSettings(BaseCustomSettings, MixinLoggingSettings): # LOGGING LOG_LEVEL: LogLevel = Field( - default=LogLevel.INFO.value, + default=LogLevel.INFO, validation_alias=AliasChoices("API_SERVER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"), ) API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field( diff --git a/services/api-server/src/simcore_service_api_server/models/api_resources.py b/services/api-server/src/simcore_service_api_server/models/api_resources.py index e8bf8bf2bc1..9a2221034ad 100644 --- a/services/api-server/src/simcore_service_api_server/models/api_resources.py +++ b/services/api-server/src/simcore_service_api_server/models/api_resources.py @@ -1,8 +1,8 @@ import re import urllib.parse -from typing import Annotated, Any, TypeAlias +from typing import Annotated, TypeAlias -from pydantic import BaseModel, Field, TypeAdapter +from pydantic import Field, TypeAdapter from pydantic.types import StringConstraints # RESOURCE NAMES https://cloud.google.com/apis/design/resource_names @@ -56,20 +56,3 @@ def compose_resource_name(*collection_or_resource_ids) -> RelativeResourceName: def split_resource_name(resource_name: RelativeResourceName) -> list[str]: quoted_parts = resource_name.split("/") return [f"{urllib.parse.unquote_plus(p)}" for p in quoted_parts] - - -# -# For resource definitions, the first field should be a string field for the resource name, -# and it should be called *name* -# Resource IDs must be clearly documented whether they are assigned by the client, the server, or either -# -class BaseResource(BaseModel): - name: RelativeResourceName = Field(None, examples=["solvers/isolve/releases/1.2.3"]) - id: Any = Field(None, description="Resource ID", examples=["1.2.3"]) # noqa: A003 - - -class BaseCollection(BaseModel): - name: RelativeResourceName = Field(None, examples=["solvers/isolve/releases"]) - id: Any = Field( - None, description="Collection ID", examples=["releases"] - ) # noqa: A003 From 74ce03359038dc11ec5a215f89f3ff0853cb125a Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Fri, 6 Dec 2024 08:11:32 +0100 Subject: [PATCH 03/13] upgrade once again --- services/api-server/requirements/_base.txt | 48 +++++++++++---------- services/api-server/requirements/_test.txt | 38 ++++++++-------- services/api-server/requirements/_tools.txt | 4 +- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 86eac32f26d..3620ffd9c25 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -1,4 +1,4 @@ -aio-pika==9.5.0 +aio-pika==9.5.3 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in @@ -21,9 +21,9 @@ aiofiles==24.1.0 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/_base.in # -r requirements/_base.in -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.4 # via aiohttp -aiohttp==3.11.8 +aiohttp==3.11.10 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -69,7 +69,7 @@ alembic==1.14.0 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/postgres-database/requirements/_base.in annotated-types==0.7.0 # via pydantic -anyio==4.6.2.post1 +anyio==4.7.0 # via # fast-depends # faststream @@ -133,6 +133,7 @@ charset-normalizer==3.4.0 # via requests click==8.1.7 # via + # rich-toolkit # typer # uvicorn cryptography==44.0.0 @@ -182,15 +183,15 @@ exceptiongroup==1.2.2 # via aio-pika fast-depends==2.4.12 # via faststream -fastapi==0.115.5 +fastapi==0.115.6 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in -fastapi-cli==0.0.5 +fastapi-cli==0.0.6 # via fastapi fastapi-pagination==0.12.32 # via -r requirements/_base.in -faststream==0.5.31 +faststream==0.5.33 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in @@ -208,7 +209,7 @@ googleapis-common-protos==1.66.0 # opentelemetry-exporter-otlp-proto-http greenlet==3.1.1 # via sqlalchemy -grpcio==1.68.0 +grpcio==1.68.1 # via opentelemetry-exporter-otlp-proto-grpc h11==0.14.0 # via @@ -218,7 +219,7 @@ httpcore==1.0.7 # via httpx httptools==0.6.4 # via uvicorn -httpx==0.27.2 +httpx==0.28.0 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -300,7 +301,7 @@ jsonschema==3.2.0 # -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/models-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in -mako==1.3.6 +mako==1.3.7 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -495,17 +496,17 @@ pint==0.24.4 # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in platformdirs==4.3.6 # via pint -prometheus-client==0.21.0 +prometheus-client==0.21.1 # via # -r requirements/../../../packages/service-library/requirements/_fastapi.in # prometheus-fastapi-instrumentator prometheus-fastapi-instrumentator==7.0.0 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -propcache==0.2.0 +propcache==0.2.1 # via # aiohttp # yarl -protobuf==5.29.0 +protobuf==5.29.1 # via # googleapis-common-protos # opentelemetry-proto @@ -519,7 +520,7 @@ psycopg2-binary==2.9.10 # sqlalchemy pycparser==2.22 # via cffi -pydantic==2.10.2 +pydantic==2.10.3 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -630,7 +631,7 @@ python-dotenv==1.0.1 # via # pydantic-settings # uvicorn -python-multipart==0.0.17 +python-multipart==0.0.19 # via fastapi pyyaml==6.0.2 # via @@ -711,19 +712,20 @@ rich==13.9.4 # -r requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in + # rich-toolkit # typer +rich-toolkit==0.12.0 + # via fastapi-cli setuptools==75.6.0 # via jsonschema shellingham==1.5.4 # via typer -six==1.16.0 +six==1.17.0 # via # jsonschema # python-dateutil sniffio==1.3.1 - # via - # anyio - # httpx + # via anyio sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -805,7 +807,7 @@ tqdm==4.67.1 # -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 -typer==0.13.1 +typer==0.15.1 # via # -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/../../../packages/settings-library/requirements/_base.in @@ -813,12 +815,13 @@ typer==0.13.1 # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/_base.in # -r requirements/_base.in # fastapi-cli -types-python-dateutil==2.9.0.20241003 +types-python-dateutil==2.9.0.20241206 # via arrow typing-extensions==4.12.2 # via # aiodebug # alembic + # anyio # fastapi # fastapi-pagination # faststream @@ -829,6 +832,7 @@ typing-extensions==4.12.2 # pydantic # pydantic-core # pydantic-extra-types + # rich-toolkit # typer ujson==5.10.0 # via @@ -911,7 +915,7 @@ wrapt==1.17.0 # opentelemetry-instrumentation-dbapi # opentelemetry-instrumentation-httpx # opentelemetry-instrumentation-redis -yarl==1.18.0 +yarl==1.18.3 # via # -r requirements/../../../packages/postgres-database/requirements/_base.in # -r requirements/../../../packages/service-library/requirements/_base.in diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index d326b9c8fe6..909b0cc2568 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -1,8 +1,8 @@ -aiohappyeyeballs==2.4.3 +aiohappyeyeballs==2.4.4 # via # -c requirements/_base.txt # aiohttp -aiohttp==3.11.8 +aiohttp==3.11.10 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -17,7 +17,7 @@ alembic==1.14.0 # via # -c requirements/_base.txt # -r requirements/_test.in -anyio==4.6.2.post1 +anyio==4.7.0 # via # -c requirements/_base.txt # httpx @@ -37,20 +37,18 @@ aws-sam-translator==1.55.0 # cfn-lint aws-xray-sdk==2.14.0 # via moto -boto3==1.35.71 +boto3==1.35.76 # via # aws-sam-translator # moto -boto3-stubs==1.35.71 - # via types-boto3 -botocore==1.35.71 +botocore==1.35.76 # via # aws-xray-sdk # boto3 # moto # s3transfer -botocore-stubs==1.35.71 - # via boto3-stubs +botocore-stubs==1.35.76 + # via types-boto3 certifi==2024.8.30 # via # -c requirements/../../../requirements/constraints.txt @@ -120,7 +118,7 @@ httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.27.2 +httpx==0.28.0 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -171,7 +169,7 @@ jsonschema==3.2.0 # openapi-spec-validator junit-xml==1.9 # via cfn-lint -mako==1.3.6 +mako==1.3.7 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt @@ -214,7 +212,7 @@ pbr==6.1.0 # sarif-om pluggy==1.5.0 # via pytest -propcache==0.2.0 +propcache==0.2.1 # via # -c requirements/_base.txt # aiohttp @@ -237,7 +235,7 @@ pyrsistent==0.20.0 # via # -c requirements/_base.txt # jsonschema -pytest==8.3.3 +pytest==8.3.4 # via # -r requirements/_test.in # pytest-asyncio @@ -299,7 +297,7 @@ setuptools==75.6.0 # jsonschema # moto # openapi-spec-validator -six==1.16.0 +six==1.17.0 # via # -c requirements/_base.txt # ecdsa @@ -311,7 +309,6 @@ sniffio==1.3.1 # -c requirements/_base.txt # anyio # asgi-lifespan - # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt @@ -324,20 +321,21 @@ sshpubkeys==3.3.1 # via moto types-aiofiles==24.1.0.20240626 # via -r requirements/_test.in -types-awscrt==0.23.1 +types-awscrt==0.23.3 # via botocore-stubs -types-boto3==1.0.2 +types-boto3==1.35.76 # via -r requirements/_test.in types-s3transfer==0.10.4 - # via boto3-stubs + # via types-boto3 typing-extensions==4.12.2 # via # -c requirements/_base.txt # alembic - # boto3-stubs + # anyio # faker # mypy # sqlalchemy2-stubs + # types-boto3 urllib3==2.2.3 # via # -c requirements/../../../requirements/constraints.txt @@ -356,7 +354,7 @@ wrapt==1.17.0 # aws-xray-sdk xmltodict==0.14.2 # via moto -yarl==1.18.0 +yarl==1.18.3 # via # -c requirements/_base.txt # aiohttp diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt index aacaeb39634..ba68de2e0b8 100644 --- a/services/api-server/requirements/_tools.txt +++ b/services/api-server/requirements/_tools.txt @@ -72,7 +72,7 @@ platformdirs==4.3.6 # virtualenv pre-commit==4.0.1 # via -r requirements/../../../requirements/devenv.txt -pylint==3.3.1 +pylint==3.3.2 # via -r requirements/../../../requirements/devenv.txt pyproject-hooks==1.2.0 # via @@ -85,7 +85,7 @@ pyyaml==6.0.2 # -c requirements/_test.txt # pre-commit # watchdog -ruff==0.8.0 +ruff==0.8.2 # via -r requirements/../../../requirements/devenv.txt setuptools==75.6.0 # via From 78ac8bfb7f11b6a7fd2b629e829908f5b0f107b1 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Fri, 6 Dec 2024 09:21:45 +0100 Subject: [PATCH 04/13] upgrade reqs --- services/api-server/requirements/_base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 5a2e1287deb..335b4d8e9b5 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -399,11 +399,11 @@ opentelemetry-instrumentation-fastapi==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in opentelemetry-instrumentation-httpx==0.49b2 # via -r requirements/../../../packages/service-library/requirements/_fastapi.in -opentelemetry-instrumentation-logging==0.48b0 +opentelemetry-instrumentation-logging==0.49b2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in -opentelemetry-instrumentation-redis==0.48b0 +opentelemetry-instrumentation-redis==0.49b2 # via # -r requirements/../../../packages/service-library/requirements/_base.in # -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in From 8c9baf80576c88ff06e42f81f9cb262301a2cbff Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Fri, 6 Dec 2024 10:26:02 +0100 Subject: [PATCH 05/13] avoid httpx 0.28.0 due to https://github.com/lundberg/respx/pull/278 --- services/api-server/requirements/_base.txt | 7 +++++-- services/api-server/requirements/_test.txt | 4 +++- services/api-server/requirements/constraints.txt | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/services/api-server/requirements/_base.txt b/services/api-server/requirements/_base.txt index 335b4d8e9b5..a49ef21c613 100644 --- a/services/api-server/requirements/_base.txt +++ b/services/api-server/requirements/_base.txt @@ -219,7 +219,7 @@ httpcore==1.0.7 # via httpx httptools==0.6.4 # via uvicorn -httpx==0.28.0 +httpx==0.27.2 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt @@ -249,6 +249,7 @@ httpx==0.28.0 # -c requirements/../../../packages/simcore-sdk/requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt # -c requirements/../../../packages/simcore-sdk/requirements/../../../requirements/constraints.txt # -c requirements/../../../requirements/constraints.txt + # -c requirements/./constraints.txt # -r requirements/../../../packages/service-library/requirements/_fastapi.in # -r requirements/_base.in # fastapi @@ -731,7 +732,9 @@ six==1.17.0 # jsonschema # python-dateutil sniffio==1.3.1 - # via anyio + # via + # anyio + # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt diff --git a/services/api-server/requirements/_test.txt b/services/api-server/requirements/_test.txt index 909b0cc2568..a9341530919 100644 --- a/services/api-server/requirements/_test.txt +++ b/services/api-server/requirements/_test.txt @@ -118,10 +118,11 @@ httpcore==1.0.7 # via # -c requirements/_base.txt # httpx -httpx==0.28.0 +httpx==0.27.2 # via # -c requirements/../../../requirements/constraints.txt # -c requirements/_base.txt + # -c requirements/./constraints.txt # respx idna==3.10 # via @@ -309,6 +310,7 @@ sniffio==1.3.1 # -c requirements/_base.txt # anyio # asgi-lifespan + # httpx sqlalchemy==1.4.54 # via # -c requirements/../../../requirements/constraints.txt diff --git a/services/api-server/requirements/constraints.txt b/services/api-server/requirements/constraints.txt index 6247b000156..2991a5be8b4 100644 --- a/services/api-server/requirements/constraints.txt +++ b/services/api-server/requirements/constraints.txt @@ -40,3 +40,6 @@ aws-sam-translator<1.56.0 # # aws-sam-translator<1.55.0 (from -c ./constraints.txt (line 32)) # # aws-sam-translator>=1.57.0 (from cfn-lint==0.72.10->-c ./constraints.txt (line 33)) cfn-lint<0.72.1 + +# due to https://github.com/lundberg/respx/pull/278 +httpx!=0.28.0 From 24cae71d323241d6cce1060a43b2538df7857586 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Fri, 6 Dec 2024 13:31:51 +0100 Subject: [PATCH 06/13] whitespace to test ci triggers --- services/api-server/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/services/api-server/Makefile b/services/api-server/Makefile index 39672c9764e..82263c83658 100644 --- a/services/api-server/Makefile +++ b/services/api-server/Makefile @@ -87,6 +87,7 @@ openapi-diff.md: guard-OPENAPI_JSON_BASE_URL openapi.json ## Diffs against a rem # SEE https://schemathesis.readthedocs.io/en/stable/index.html APP_URL:=http://$(get_my_ip).nip.io:8006 + test-api: ## Runs schemathesis against development server (NOTE: make up-devel first) @docker run schemathesis/schemathesis:stable run \ "$(APP_URL)/api/v0/openapi.json" From f78e10a0978d0a9224607fb6f16f514e6931142a Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Tue, 10 Dec 2024 09:58:06 +0100 Subject: [PATCH 07/13] update openapi specs --- services/api-server/openapi.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/api-server/openapi.json b/services/api-server/openapi.json index ee8d7f9479d..d70ef50e6bc 100644 --- a/services/api-server/openapi.json +++ b/services/api-server/openapi.json @@ -5548,6 +5548,7 @@ "urls": { "items": { "type": "string", + "minLength": 1, "format": "uri" }, "type": "array", @@ -6161,6 +6162,7 @@ }, "download_link": { "type": "string", + "minLength": 1, "format": "uri", "title": "Download Link" } From e484083a94706b94b2d33e75884c487825a958ab Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Tue, 10 Dec 2024 10:20:21 +0100 Subject: [PATCH 08/13] update openapi specs --- .../api/v0/openapi.yaml | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml index db975aa23c3..bc73e5441d2 100644 --- a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml +++ b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml @@ -396,6 +396,12 @@ paths: application/json: schema: $ref: '#/components/schemas/Envelope_list_ApiKeyGet__' + '409': + description: Conflict + content: + application/json: + schema: + $ref: '#/components/schemas/EnvelopedError' '404': description: Not Found content: @@ -421,6 +427,12 @@ paths: application/json: schema: $ref: '#/components/schemas/Envelope_ApiKeyCreateResponse_' + '409': + description: Conflict + content: + application/json: + schema: + $ref: '#/components/schemas/EnvelopedError' '404': description: Not Found content: @@ -450,6 +462,12 @@ paths: application/json: schema: $ref: '#/components/schemas/Envelope_ApiKeyGet_' + '409': + content: + application/json: + schema: + $ref: '#/components/schemas/EnvelopedError' + description: Conflict '404': content: application/json: @@ -474,6 +492,12 @@ paths: responses: '204': description: Successful Response + '409': + content: + application/json: + schema: + $ref: '#/components/schemas/EnvelopedError' + description: Conflict '404': content: application/json: @@ -6765,6 +6789,11 @@ components: title: ApiKeyCreateRequest ApiKeyCreateResponse: properties: + id: + type: string + maxLength: 100 + minLength: 1 + title: Id displayName: type: string minLength: 3 @@ -6777,11 +6806,6 @@ components: title: Expiration description: Time delta from creation time to expiration. If None, then it does not expire. - id: - type: string - maxLength: 100 - minLength: 1 - title: Id apiBaseUrl: type: string title: Apibaseurl @@ -6793,8 +6817,8 @@ components: title: Apisecret type: object required: - - displayName - id + - displayName - apiBaseUrl - apiKey - apiSecret From 493120634eb6eda4c81eb5c8373ff7eb950bacd1 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Tue, 10 Dec 2024 10:41:36 +0100 Subject: [PATCH 09/13] improve error messages in ci --- .github/workflows/ci-testing-pull-request.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-testing-pull-request.yml b/.github/workflows/ci-testing-pull-request.yml index 3d877cb091a..7a111e24f66 100644 --- a/.github/workflows/ci-testing-pull-request.yml +++ b/.github/workflows/ci-testing-pull-request.yml @@ -35,11 +35,13 @@ jobs: run: | uv venv .venv && source .venv/bin/activate make openapi-specs - ./ci/github/helpers/openapi-specs-diff.bash diff \ + if !./ci/github/helpers/openapi-specs-diff.bash diff \ https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/refs/heads/${{ github.event.pull_request.head.ref }} \ - . + .; then \ + echo "::error OAS are not up to date. Run 'make openapi-specs' to update them"; \ + fi - api-server-backwards-compatibility: + api-server-oas-breaking: needs: api-specs timeout-minutes: 10 name: "api-server backwards compatibility" @@ -62,7 +64,7 @@ jobs: https://raw.githubusercontent.com/${{ github.event.pull_request.base.repo.full_name }}/refs/heads/${{ github.event.pull_request.base.ref }}/services/api-server/openapi.json \ /specs/services/api-server/openapi.json - oas-backwards-compatibility: + all-oas-breaking: needs: api-specs continue-on-error: true timeout-minutes: 10 From b5c8f96ada28f7105a819f7448749ab5d472d1c5 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Tue, 10 Dec 2024 10:43:09 +0100 Subject: [PATCH 10/13] minor fixes to workflow files --- .github/workflows/ci-testing-pull-request.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-testing-pull-request.yml b/.github/workflows/ci-testing-pull-request.yml index 7a111e24f66..8d5a3f4147a 100644 --- a/.github/workflows/ci-testing-pull-request.yml +++ b/.github/workflows/ci-testing-pull-request.yml @@ -17,7 +17,7 @@ concurrency: jobs: api-specs: timeout-minutes: 10 - name: "check oas' are up to date" + name: "check OAS' are up to date" runs-on: ubuntu-latest steps: - name: setup python environment @@ -35,7 +35,7 @@ jobs: run: | uv venv .venv && source .venv/bin/activate make openapi-specs - if !./ci/github/helpers/openapi-specs-diff.bash diff \ + if ! ./ci/github/helpers/openapi-specs-diff.bash diff \ https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/refs/heads/${{ github.event.pull_request.head.ref }} \ .; then \ echo "::error OAS are not up to date. Run 'make openapi-specs' to update them"; \ @@ -68,7 +68,7 @@ jobs: needs: api-specs continue-on-error: true timeout-minutes: 10 - name: "oas backwards compatibility" + name: "OAS backwards compatibility" runs-on: ubuntu-latest steps: - name: setup python environment From 0bd94dafe7a4580bb4f0de0a06d09a309ed84e07 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Tue, 10 Dec 2024 10:47:06 +0100 Subject: [PATCH 11/13] test ci --- services/api-server/openapi.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/api-server/openapi.json b/services/api-server/openapi.json index d70ef50e6bc..eb58ac00550 100644 --- a/services/api-server/openapi.json +++ b/services/api-server/openapi.json @@ -6484,16 +6484,6 @@ "title": "Pricingunitid", "minimum": 0 }, - "unitName": { - "type": "string", - "title": "Unitname" - }, - "unitExtraInfo": { - "$ref": "#/components/schemas/UnitExtraInfo" - }, - "currentCostPerUnit": { - "type": "number", - "minimum": 0.0, "title": "Currentcostperunit" }, "default": { From bb90b706b964b5cf3f027f06d18eec4f18c1badd Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Tue, 10 Dec 2024 10:51:58 +0100 Subject: [PATCH 12/13] minor fixes to workflow files --- .github/workflows/ci-testing-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing-pull-request.yml b/.github/workflows/ci-testing-pull-request.yml index 8d5a3f4147a..a8c3641b4df 100644 --- a/.github/workflows/ci-testing-pull-request.yml +++ b/.github/workflows/ci-testing-pull-request.yml @@ -38,7 +38,7 @@ jobs: if ! ./ci/github/helpers/openapi-specs-diff.bash diff \ https://raw.githubusercontent.com/${{ github.event.pull_request.head.repo.full_name }}/refs/heads/${{ github.event.pull_request.head.ref }} \ .; then \ - echo "::error OAS are not up to date. Run 'make openapi-specs' to update them"; \ + echo "::error:: OAS are not up to date. Run 'make openapi-specs' to update them"; exit 1; \ fi api-server-oas-breaking: From 59cd15e88eabe16b35601079846df2bc04586552 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Tue, 10 Dec 2024 10:55:54 +0100 Subject: [PATCH 13/13] update api-server openapi.json --- services/api-server/openapi.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/services/api-server/openapi.json b/services/api-server/openapi.json index eb58ac00550..d70ef50e6bc 100644 --- a/services/api-server/openapi.json +++ b/services/api-server/openapi.json @@ -6484,6 +6484,16 @@ "title": "Pricingunitid", "minimum": 0 }, + "unitName": { + "type": "string", + "title": "Unitname" + }, + "unitExtraInfo": { + "$ref": "#/components/schemas/UnitExtraInfo" + }, + "currentCostPerUnit": { + "type": "number", + "minimum": 0.0, "title": "Currentcostperunit" }, "default": {