⬆️♻️Uniformize uvicorn/fastapi dependencies repository-wide (#7765)

Author: sanderegg

ci/helpers/requirements/requirements.txt

@@ -20,7 +20,7 @@ charset-normalizer==3.4.1
     # via requests
 docker==7.1.0
     # via -r requirements/requirements.in
-fastapi==0.115.0
+fastapi==0.115.12
     # via -r requirements/requirements.in
 frozenlist==1.4.1
     # via
@@ -49,7 +49,7 @@ requests==2.32.3
     # via docker
 sniffio==1.3.1
     # via anyio
-starlette==0.38.6
+starlette==0.46.2
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   fastapi

packages/aws-library/requirements/_test.txt

@@ -70,7 +70,7 @@ docker==7.1.0
     # via moto
 faker==36.1.1
     # via -r requirements/_test.in
-fastapi==0.115.11
+fastapi==0.115.12
     # via -r requirements/_test.in
 flask==3.1.0
     # via

packages/service-library/requirements/_base.txt

@@ -220,7 +220,7 @@ pyinstrument==5.0.1
     # via -r requirements/_base.in
 python-dateutil==2.9.0.post0
     # via arrow
-python-dotenv==1.0.1
+python-dotenv==1.1.0
     # via pydantic-settings
 pyyaml==6.0.2
     # via
@@ -252,7 +252,7 @@ referencing==0.35.1
     #   jsonschema-specifications
 requests==2.32.3
     # via opentelemetry-exporter-otlp-proto-http
-rich==13.9.4
+rich==14.0.0
     # via
     #   -r requirements/../../../packages/settings-library/requirements/_base.in
     #   typer
@@ -274,7 +274,7 @@ toolz==1.0.0
     # via -r requirements/_base.in
 tqdm==4.67.1
     # via -r requirements/_base.in
-typer==0.15.2
+typer==0.16.0
     # via -r requirements/../../../packages/settings-library/requirements/_base.in
 types-python-dateutil==2.9.0.20241206
     # via arrow

packages/service-library/requirements/_fastapi.in

@@ -4,10 +4,9 @@
 #
 
 
-fastapi
+fastapi[standard]
 fastapi-lifespan-manager
-httpx
+httpx[http2]
 opentelemetry-instrumentation-fastapi
 opentelemetry-instrumentation-httpx
 prometheus-client
-uvicorn

packages/service-library/requirements/_fastapi.txt

@@ -4,38 +4,67 @@ anyio==4.8.0
     # via
     #   httpx
     #   starlette
+    #   watchfiles
 asgiref==3.8.1
     # via opentelemetry-instrumentation-asgi
 certifi==2025.1.31
     # via
     #   httpcore
     #   httpx
 click==8.1.8
-    # via uvicorn
+    # via
+    #   rich-toolkit
+    #   typer
+    #   uvicorn
 deprecated==1.2.18
     # via
     #   opentelemetry-api
     #   opentelemetry-semantic-conventions
-fastapi==0.115.11
+dnspython==2.7.0
+    # via email-validator
+email-validator==2.2.0
+    # via fastapi
+fastapi==0.115.12
     # via
     #   -r requirements/_fastapi.in
     #   fastapi-lifespan-manager
+fastapi-cli==0.0.7
+    # via fastapi
 fastapi-lifespan-manager==0.1.4
     # via -r requirements/_fastapi.in
 h11==0.14.0
     # via
     #   httpcore
     #   uvicorn
+h2==4.2.0
+    # via httpx
+hpack==4.1.0
+    # via h2
 httpcore==1.0.7
     # via httpx
+httptools==0.6.4
+    # via uvicorn
 httpx==0.28.1
-    # via -r requirements/_fastapi.in
+    # via
+    #   -r requirements/_fastapi.in
+    #   fastapi
+hyperframe==6.1.0
+    # via h2
 idna==3.10
     # via
     #   anyio
+    #   email-validator
     #   httpx
 importlib-metadata==8.5.0
     # via opentelemetry-api
+jinja2==3.1.6
+    # via fastapi
+markdown-it-py==3.0.0
+    # via rich
+markupsafe==3.0.2
+    # via jinja2
+mdurl==0.1.2
+    # via markdown-it-py
 opentelemetry-api==1.30.0
     # via
     #   opentelemetry-instrumentation
@@ -73,18 +102,46 @@ pydantic==2.10.6
     # via fastapi
 pydantic-core==2.27.2
     # via pydantic
+pygments==2.19.1
+    # via rich
+python-dotenv==1.1.0
+    # via uvicorn
+python-multipart==0.0.20
+    # via fastapi
+pyyaml==6.0.2
+    # via uvicorn
+rich==14.0.0
+    # via
+    #   rich-toolkit
+    #   typer
+rich-toolkit==0.14.7
+    # via fastapi-cli
+shellingham==1.5.4
+    # via typer
 sniffio==1.3.1
     # via anyio
 starlette==0.46.0
     # via fastapi
+typer==0.16.0
+    # via fastapi-cli
 typing-extensions==4.12.2
     # via
     #   anyio
     #   fastapi
     #   pydantic
     #   pydantic-core
-uvicorn==0.34.0
-    # via -r requirements/_fastapi.in
+    #   rich-toolkit
+    #   typer
+uvicorn==0.34.2
+    # via
+    #   fastapi
+    #   fastapi-cli
+uvloop==0.21.0
+    # via uvicorn
+watchfiles==1.0.5
+    # via uvicorn
+websockets==15.0.1
+    # via uvicorn
 wrapt==1.17.2
     # via
     #   deprecated

packages/service-library/requirements/_test.txt

@@ -191,14 +191,16 @@ python-dateutil==2.9.0.post0
     # via
     #   -c requirements/_base.txt
     #   botocore
-python-dotenv==1.0.1
+python-dotenv==1.1.0
     # via
     #   -c requirements/_base.txt
+    #   -c requirements/_fastapi.txt
     #   -r requirements/_test.in
 pyyaml==6.0.2
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -c requirements/_base.txt
+    #   -c requirements/_fastapi.txt
     #   jsonschema-path
 referencing==0.35.1
     # via

packages/service-library/tests/fastapi/test_cancellation_middleware.py

@@ -13,6 +13,7 @@
 from pytest_simcore.helpers.logging_tools import log_context
 from servicelib.fastapi.cancellation_middleware import RequestCancellationMiddleware
 from servicelib.utils import unused_port
+from tenacity import retry, stop_after_delay, wait_fixed
 from yarl import URL
 
 
@@ -32,6 +33,12 @@ def fastapi_router(
 ) -> APIRouter:
     router = APIRouter()
 
+    @router.get("/")
+    async def root() -> dict[str, str]:
+        with log_context(logging.INFO, msg="root endpoint") as ctx:
+            ctx.logger.info("root endpoint called")
+            return {"message": "Hello, World!"}
+
     @router.get("/sleep")
     async def sleep(sleep_time: float) -> dict[str, str]:
         with log_context(logging.INFO, msg="sleeper") as ctx:
@@ -93,6 +100,16 @@ def uvicorn_server(fastapi_app: FastAPI) -> Iterator[URL]:
         thread.daemon = True
         thread.start()
 
+        @retry(wait=wait_fixed(0.1), stop=stop_after_delay(10), reraise=True)
+        def wait_for_server_ready() -> None:
+            with httpx.Client() as client:
+                response = client.get(f"http://127.0.1:{random_port}/")
+                assert (
+                    response.is_success
+                ), f"Server did not start successfully: {response.status_code} {response.text}"
+
+        wait_for_server_ready()
+
         ctx.logger.info(
             "server ready at: %s",
             f"http://127.0.0.1:{random_port}",

services/agent/requirements/_base.in

@@ -14,7 +14,5 @@
 --requirement ../../../packages/service-library/requirements/_fastapi.in
 
 aiodocker
-fastapi
 packaging
 pydantic
-uvicorn