nucliadb-utils 5.2.1.post1709__py3-none-any.whl → 5.2.1.post1711__py3-none-any.whl

nucliadb_utils/fastapi/run.py

@@ -20,6 +20,7 @@
 import asyncio
 import os
 import sys
+from contextlib import AbstractContextManager, nullcontext
 
 import click
 from fastapi import FastAPI
@@ -34,14 +35,11 @@ STARTUP_FAILURE = 3
 
 
 def metrics_app() -> tuple[Server, Config]:
-    loop_setup = "auto"
-
     metrics_config = Config(
         application_metrics,
         host=running_settings.metrics_host,
         port=running_settings.metrics_port,
-        debug=False,
-        loop=loop_setup,
+        loop="auto",
         http="auto",
         reload=False,
         workers=1,
@@ -63,14 +61,12 @@ async def serve_metrics() -> Server:
 
 
 def run_fastapi_with_metrics(application: FastAPI) -> None:
-    loop_setup = "auto"
     metrics_server, metrics_config = metrics_app()
     config = Config(
         application,
         host=running_settings.serving_host,
         port=running_settings.serving_port,
-        debug=running_settings.debug,
-        loop=loop_setup,
+        loop="auto",
         http="auto",
         reload=False,
         workers=1,
@@ -113,14 +109,22 @@ async def run_server_forever(server: Server, config: Config):
     await start_server(server, config)
     process_id = os.getpid()
 
-    server.install_signal_handlers()
-
-    message = "Started server process [%d]"
-    color_message = "Started server process [" + click.style("%d", fg="cyan") + "]"
-    logger.info(message, process_id, extra={"color_message": color_message})
-
-    if server.should_exit:
-        return
-
-    await server.main_loop()
-    await server.shutdown()
+    # compatibility with uvicorn<0.29
+    capture_signals: AbstractContextManager
+    if hasattr(server, "install_signal_handlers"):  # pragma: no cover
+        server.install_signal_handlers()
+        capture_signals = nullcontext()
+    else:
+        # uvicorn>=0.29
+        capture_signals = server.capture_signals()
+
+    with capture_signals:
+        message = "Started server process [%d]"
+        color_message = "Started server process [" + click.style("%d", fg="cyan") + "]"
+        logger.info(message, process_id, extra={"color_message": color_message})
+
+        if server.should_exit:
+            return
+
+        await server.main_loop()
+        await server.shutdown()

{nucliadb_utils-5.2.1.post1709.dist-info → nucliadb_utils-5.2.1.post1711.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nucliadb_utils
-Version: 5.2.1.post1709
+Version: 5.2.1.post1711
 Home-page: https://nuclia.com
 License: BSD
 Classifier: Development Status :: 4 - Beta
@@ -24,16 +24,16 @@ Requires-Dist: PyNaCl
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: memorylru>=1.1.2
 Requires-Dist: mrflagly>=0.2.9
-Requires-Dist: nucliadb-protos>=5.2.1.post1709
-Requires-Dist: nucliadb-telemetry>=5.2.1.post1709
+Requires-Dist: nucliadb-protos>=5.2.1.post1711
+Requires-Dist: nucliadb-telemetry>=5.2.1.post1711
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"
 Requires-Dist: lru-dict>=1.1.7; extra == "cache"
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.95.2; extra == "fastapi"
-Requires-Dist: uvicorn<0.19.0,>=0.16.0; extra == "fastapi"
 Requires-Dist: starlette>=0.21.0; extra == "fastapi"
+Requires-Dist: uvicorn; extra == "fastapi"
 Provides-Extra: storages
 Requires-Dist: oauth2client>=4.1.3; extra == "storages"
 Requires-Dist: aiobotocore>=2.9.0; extra == "storages"

{nucliadb_utils-5.2.1.post1709.dist-info → nucliadb_utils-5.2.1.post1711.dist-info}/RECORD

@@ -34,7 +34,7 @@ nucliadb_utils/encryption/__init__.py,sha256=oav6jFOTGgmIen88sdmy-bCK-uj1tyDt2hr
 nucliadb_utils/encryption/settings.py,sha256=yF2AW6c_mu0yWbBn1grAERDAqDvKIpXqQnwD0OFmROI,1467
 nucliadb_utils/fastapi/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
 nucliadb_utils/fastapi/openapi.py,sha256=b0pLuri0QuzQd0elDyOVXM42YYmES_cmT-jEfsQ1G6Y,1737
-nucliadb_utils/fastapi/run.py,sha256=n6vOX64QqF1I5n4UlKnpm_ZJ24rmwfRGi-J9YMGpZzA,3631
+nucliadb_utils/fastapi/run.py,sha256=OVuzjfsX_8IdVXKuK-RsIVf2OdP6t8h9DLfEn2P_-KI,3910
 nucliadb_utils/fastapi/versioning.py,sha256=pwiwuesJW1jElUUI3pI5kcxkigfGBvI64IL6QCBEWS8,3805
 nucliadb_utils/nuclia_usage/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_utils/nuclia_usage/utils/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
@@ -59,8 +59,8 @@ nucliadb_utils/tests/indexing.py,sha256=YW2QhkhO9Q_8A4kKWJaWSvXvyQ_AiAwY1VylcfVQ
 nucliadb_utils/tests/local.py,sha256=7nuP8EFUAiA8ZH50R1iPV9EUXBySQxOanVm3Zht_e0g,1835
 nucliadb_utils/tests/nats.py,sha256=xqpww4jZjTKY9oPGlJdDJG67L3FIBQsa9qDHxILR8r8,7687
 nucliadb_utils/tests/s3.py,sha256=IdMxK_cNdSHLvO1u8BwsKFzD87Hk1MVPDZ57zx6h-rA,3656
-nucliadb_utils-5.2.1.post1709.dist-info/METADATA,sha256=-FJ__SfHJPJQJYWvSKaG9jWboA-DvAhULcXg7VMJRrg,2071
-nucliadb_utils-5.2.1.post1709.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-nucliadb_utils-5.2.1.post1709.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-5.2.1.post1709.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb_utils-5.2.1.post1709.dist-info/RECORD,,
+nucliadb_utils-5.2.1.post1711.dist-info/METADATA,sha256=HFkBvfyWw4wN07YoUBqeaXbfYPTOlTzmUXQ6oVkblhY,2055
+nucliadb_utils-5.2.1.post1711.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+nucliadb_utils-5.2.1.post1711.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-5.2.1.post1711.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb_utils-5.2.1.post1711.dist-info/RECORD,,