⬆️ Complete upgrade of director v2 dependencies

services/director-v2/requirements/_test.txt

@@ -4,15 +4,15 @@
 #
 #    pip-compile --output-file=requirements/_test.txt --strip-extras requirements/_test.in
 #
-aio-pika==9.1.2
+aio-pika==9.1.4
     # via
     #   -c requirements/_base.txt
     #   -r requirements/_test.in
 aioboto3==11.2.0
     # via -r requirements/_test.in
 aiobotocore==2.5.0
     # via aioboto3
-aiohttp==3.8.3
+aiohttp==3.8.4
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
@@ -25,15 +25,15 @@ aiormq==6.7.6
     # via
     #   -c requirements/_base.txt
     #   aio-pika
-aiosignal==1.2.0
+aiosignal==1.3.1
     # via
     #   -c requirements/_base.txt
     #   aiohttp
-alembic==1.8.1
+alembic==1.11.1
     # via
     #   -c requirements/_base.txt
     #   -r requirements/_test.in
-anyio==3.6.2
+anyio==3.7.1
     # via
     #   -c requirements/_base.txt
     #   httpcore
@@ -45,7 +45,7 @@ async-timeout==4.0.2
     # via
     #   -c requirements/_base.txt
     #   aiohttp
-attrs==21.4.0
+attrs==23.1.0
     # via
     #   -c requirements/_base.txt
     #   aiohttp
@@ -59,7 +59,7 @@ botocore==1.29.76
     #   aiobotocore
     #   boto3
     #   s3transfer
-certifi==2022.12.7
+certifi==2023.5.7
     # via
     #   -c requirements/_base.txt
     #   httpcore
@@ -68,7 +68,7 @@ certifi==2022.12.7
     #   requests
 cffi==1.15.1
     # via cryptography
-charset-normalizer==2.0.12
+charset-normalizer==3.2.0
     # via
     #   -c requirements/_base.txt
     #   aiohttp
@@ -87,7 +87,7 @@ colorlog==6.7.0
     # via dask-gateway-server
 coverage==7.2.7
     # via pytest-cov
-cryptography==41.0.1
+cryptography==41.0.2
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   dask-gateway-server
@@ -104,15 +104,18 @@ distributed==2023.3.2
     #   dask
 docker==6.1.3
     # via -r requirements/_test.in
-exceptiongroup==1.1.1
-    # via pytest
-execnet==1.9.0
+exceptiongroup==1.1.2
+    # via
+    #   -c requirements/_base.txt
+    #   anyio
+    #   pytest
+execnet==2.0.2
     # via pytest-xdist
-faker==18.10.1
+faker==19.1.0
     # via -r requirements/_test.in
 flaky==3.7.0
     # via -r requirements/_test.in
-frozenlist==1.3.0
+frozenlist==1.4.0
     # via
     #   -c requirements/_base.txt
     #   aiohttp
@@ -125,22 +128,22 @@ greenlet==2.0.2
     # via
     #   -c requirements/_base.txt
     #   sqlalchemy
-h11==0.12.0
+h11==0.14.0
     # via
     #   -c requirements/_base.txt
     #   httpcore
-httpcore==0.15.0
+httpcore==0.17.3
     # via
     #   -c requirements/_base.txt
     #   httpx
-httpx==0.24.0
+httpx==0.24.1
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
     #   respx
 icdiff==2.0.6
     # via pytest-icdiff
-idna==2.10
+idna==3.4
     # via
     #   -c requirements/_base.txt
     #   anyio
@@ -169,7 +172,7 @@ locket==1.0.0
     #   -c requirements/_base.txt
     #   distributed
     #   partd
-mako==1.2.2
+mako==1.2.4
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
@@ -187,17 +190,17 @@ msgpack==1.0.5
     # via
     #   -c requirements/_base.txt
     #   distributed
-multidict==6.0.2
+multidict==6.0.4
     # via
     #   -c requirements/_base.txt
     #   aiohttp
     #   async-asgi-testclient
     #   yarl
-mypy==1.3.0
+mypy==1.4.1
     # via sqlalchemy
 mypy-extensions==1.0.0
     # via mypy
-numpy==1.24.3
+numpy==1.25.1
     # via bokeh
 packaging==23.1
     # via
@@ -215,9 +218,9 @@ partd==1.4.0
     # via
     #   -c requirements/_base.txt
     #   dask
-pillow==9.5.0
+pillow==10.0.0
     # via bokeh
-pluggy==1.0.0
+pluggy==1.2.0
     # via pytest
 pprintpp==0.4.0
     # via pytest-icdiff
@@ -227,7 +230,7 @@ psutil==5.9.5
     #   distributed
 pycparser==2.21
     # via cffi
-pytest==7.3.1
+pytest==7.4.0
     # via
     #   -r requirements/_test.in
     #   pytest-aiohttp
@@ -239,15 +242,15 @@ pytest==7.3.1
     #   pytest-xdist
 pytest-aiohttp==1.0.4
     # via -r requirements/_test.in
-pytest-asyncio==0.21.0
+pytest-asyncio==0.21.1
     # via pytest-aiohttp
 pytest-cov==4.1.0
     # via -r requirements/_test.in
 pytest-docker==1.0.1
     # via -r requirements/_test.in
 pytest-icdiff==0.6
     # via -r requirements/_test.in
-pytest-mock==3.10.0
+pytest-mock==3.11.1
     # via -r requirements/_test.in
 pytest-runner==6.0.0
     # via -r requirements/_test.in
@@ -267,18 +270,17 @@ pyyaml==6.0.1
     #   distributed
 requests==2.31.0
     # via
-    #   -c requirements/_base.txt
     #   async-asgi-testclient
     #   docker
 respx==0.20.1
     # via -r requirements/_test.in
 s3transfer==0.6.1
     # via boto3
-six==1.15.0
+six==1.16.0
     # via
     #   -c requirements/_base.txt
     #   python-dateutil
-sniffio==1.2.0
+sniffio==1.3.0
     # via
     #   -c requirements/_base.txt
     #   anyio
@@ -289,14 +291,14 @@ sortedcontainers==2.4.0
     # via
     #   -c requirements/_base.txt
     #   distributed
-sqlalchemy==1.4.47
+sqlalchemy==1.4.49
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
     #   -r requirements/_test.in
     #   alembic
     #   dask-gateway-server
-sqlalchemy2-stubs==0.0.2a34
+sqlalchemy2-stubs==0.0.2a35
     # via sqlalchemy
 tblib==1.7.0
     # via
@@ -320,9 +322,10 @@ tornado==6.3.2
     #   distributed
 traitlets==5.9.0
     # via dask-gateway-server
-typing-extensions==4.3.0
+typing-extensions==4.7.1
     # via
     #   -c requirements/_base.txt
+    #   alembic
     #   bokeh
     #   mypy
     #   sqlalchemy2-stubs
@@ -335,7 +338,7 @@ urllib3==1.26.16
     #   docker
     #   minio
     #   requests
-websocket-client==1.5.2
+websocket-client==1.6.1
     # via docker
 wrapt==1.15.0
     # via aiobotocore

services/director-v2/requirements/_tools.txt

@@ -4,9 +4,9 @@
 #
 #    pip-compile --output-file=requirements/_tools.txt --strip-extras requirements/_tools.in
 #
-astroid==2.15.5
+astroid==2.15.6
     # via pylint
-black==23.3.0
+black==23.7.0
     # via -r requirements/../../../requirements/devenv.txt
 build==0.10.0
     # via pip-tools
@@ -22,9 +22,9 @@ click==8.1.3
     #   pip-tools
 dill==0.3.6
     # via pylint
-distlib==0.3.6
+distlib==0.3.7
     # via virtualenv
-filelock==3.12.0
+filelock==3.12.2
     # via virtualenv
 identify==2.5.24
     # via pre-commit
@@ -50,14 +50,14 @@ packaging==23.1
     #   build
 pathspec==0.11.1
     # via black
-pip-tools==7.0.0
+pip-tools==7.1.0
     # via -r requirements/../../../requirements/devenv.txt
-platformdirs==3.5.1
+platformdirs==3.9.1
     # via
     #   black
     #   pylint
     #   virtualenv
-pre-commit==3.3.2
+pre-commit==3.3.3
     # via -r requirements/../../../requirements/devenv.txt
 pylint==2.17.4
     # via -r requirements/../../../requirements/devenv.txt
@@ -82,12 +82,12 @@ tomli==2.0.1
     #   pyproject-hooks
 tomlkit==0.11.8
     # via pylint
-typing-extensions==4.3.0
+typing-extensions==4.7.1
     # via
     #   -c requirements/_base.txt
     #   -c requirements/_test.txt
     #   astroid
-virtualenv==20.23.0
+virtualenv==20.24.0
     # via pre-commit
 watchdog==3.0.0
     # via -r requirements/_tools.in

services/director-v2/requirements/constraints.txt

@@ -1,9 +0,0 @@
-
-
-# SEE https://github.com/ITISFoundation/osparc-simcore/issues/4332
-fastapi==0.85.0
-
-# WARNING: this constraint is incompatible with security 'requirements/constraints.txt':
-#      starlette>=0.27.0                             # https://github.com/advisories/GHSA-qj8w-rv5x-2v9h
-# Until the issue above is not resolve, the only way to upgrade these requirements is to comment out
-# the line above in 'requirements/constraints.txt' !!

services/director-v2/tests/integration/01/test_computation_api.py

@@ -378,7 +378,7 @@ class PartialComputationParams:
     ],
 )
 async def test_run_partial_computation(
-    catalog_ready: Callable[[UserID, str], Awaitable[None]],
+    wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
     minimal_configuration: None,
     async_client: httpx.AsyncClient,
     registered_user: Callable,
@@ -390,7 +390,7 @@ async def test_run_partial_computation(
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
     user = registered_user()
-    await catalog_ready(user["id"], osparc_product_name)
+    await wait_for_catalog_service(user["id"], osparc_product_name)
     sleepers_project: ProjectAtDB = await project(
         user, workbench=fake_workbench_without_outputs
     )
@@ -530,7 +530,7 @@ def _convert_to_pipeline_details(
 
 
 async def test_run_computation(
-    catalog_ready: Callable[[UserID, str], Awaitable[None]],
+    wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
     minimal_configuration: None,
     async_client: httpx.AsyncClient,
     registered_user: Callable,
@@ -543,7 +543,7 @@ async def test_run_computation(
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
     user = registered_user()
-    await catalog_ready(user["id"], osparc_product_name)
+    await wait_for_catalog_service(user["id"], osparc_product_name)
     sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
     # send a valid project with sleepers
     task_out = await create_pipeline(

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -140,7 +140,7 @@
 
 @pytest.fixture
 async def minimal_configuration(
-    catalog_ready: Callable[[UserID, str], Awaitable[None]],
+    wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
     sleeper_service: dict,
     dy_static_file_server_dynamic_sidecar_service: dict,
     dy_static_file_server_dynamic_sidecar_compose_spec_service: dict,
@@ -156,7 +156,7 @@ async def minimal_configuration(
     current_user: dict[str, Any],
     osparc_product_name: str,
 ) -> AsyncIterator[None]:
-    await catalog_ready(current_user["id"], osparc_product_name)
+    await wait_for_catalog_service(current_user["id"], osparc_product_name)
     with postgres_db.connect() as conn:
         # pylint: disable=no-value-for-parameter
         conn.execute(comp_tasks.delete())

services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py

@@ -17,6 +17,7 @@
 from fastapi import FastAPI
 from models_library.projects import ProjectAtDB
 from models_library.services_resources import ServiceResourcesDict
+from models_library.users import UserID
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.utils_docker import get_localhost_ip
@@ -212,6 +213,7 @@ async def _mocked_context_manger(*args, **kwargs) -> AsyncIterator[None]:
 @pytest.mark.flaky(max_runs=3)
 async def test_legacy_and_dynamic_sidecar_run(
     minimal_app: FastAPI,
+    wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
     dy_static_file_server_project: ProjectAtDB,
     user_dict: dict[str, Any],
     services_endpoint: dict[str, URL],
@@ -232,6 +234,7 @@ async def test_legacy_and_dynamic_sidecar_run(
     - dy-static-file-server-dynamic-sidecar  (sidecared w/ std config)
     - dy-static-file-server-dynamic-sidecar-compose (sidecared w/ docker-compose)
     """
+    await wait_for_catalog_service(user_dict["id"], osparc_product_name)
     await asyncio.gather(
         *(
             assert_start_service(