vercel-queue 0.8.0__tar.gz → 0.8.1__tar.gz

{vercel_queue-0.8.0 → vercel_queue-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: vercel-queue
-Version: 0.8.0
+Version: 0.8.1
 Summary: Vercel Queue client for Python
 License-Expression: MIT
 License-File: LICENSE
@@ -9,9 +9,9 @@ Requires-Dist: anyio>=4.0.0
 Requires-Dist: httpx[http2]>=0.27.0
 Requires-Dist: python-multipart>=0.0.20
 Requires-Dist: typing-extensions>=4.0.0
-Requires-Dist: vercel-headers>=0.7.1
-Requires-Dist: vercel-internal-core<0.2.0,>=0.1.2
-Requires-Dist: vercel-oidc>=0.8.0
+Requires-Dist: vercel-headers>=0.7.2
+Requires-Dist: vercel-internal-core<0.2.0,>=0.1.3
+Requires-Dist: vercel-oidc>=0.8.1
 Provides-Extra: devserver
 Requires-Dist: uvicorn; extra == 'devserver'
 Provides-Extra: trio
@@ -27,7 +27,7 @@ designed for seamless integration with Vercel deployments.
 
 ## Features
 
-- **Simple API**: `send`, `subscribe`, and `asgi_app` cover standard workflows.
+- **Simple API**: `send`, `subscribe`, and `poll` cover standard workflows.
 - **Automatic Triggering on Vercel**: Vercel invokes your function when messages are ready.
 - **Works Anywhere**: `send`, decorated subscribers, and manual `poll` loops work on Vercel, self-hosted workers, and locally.
 - **Sync and Async Clients**: Prefer async for applications, use sync for scripts and blocking workers.

{vercel_queue-0.8.0 → vercel_queue-0.8.1}/README.md

@@ -5,7 +5,7 @@ designed for seamless integration with Vercel deployments.
 
 ## Features
 
-- **Simple API**: `send`, `subscribe`, and `asgi_app` cover standard workflows.
+- **Simple API**: `send`, `subscribe`, and `poll` cover standard workflows.
 - **Automatic Triggering on Vercel**: Vercel invokes your function when messages are ready.
 - **Works Anywhere**: `send`, decorated subscribers, and manual `poll` loops work on Vercel, self-hosted workers, and locally.
 - **Sync and Async Clients**: Prefer async for applications, use sync for scripts and blocking workers.

{vercel_queue-0.8.0 → vercel_queue-0.8.1}/vercel/queue/_internal/devserver.py

@@ -15,6 +15,9 @@ import time
 from collections.abc import Callable, Iterator, Mapping
 from dataclasses import dataclass
 
+import anyio
+from anyio import from_thread
+
 from ..embedded import create_embedded_queue_app
 from .asgi import QueueClientAsgiApp, asgi_app
 from .client import QueueClient
@@ -23,6 +26,9 @@ from .embedded import EmbeddedQueueDevServer
 from .http import AsyncHttpClientFactory
 from .types import Duration
 
+_GRACEFUL_SHUTDOWN_TIMEOUT_SECONDS = 5.0
+_SERVER_STOP_TIMEOUT_MARGIN_SECONDS = 1.0
+
 
 @dataclass(frozen=True, kw_only=True)
 class QueueClientAsgiDevServer:
@@ -55,8 +61,9 @@ def embedded_queue_dev_server(
         log_level="warning",
         lifespan="off",
         ws="none",
+        timeout_graceful_shutdown=_GRACEFUL_SHUTDOWN_TIMEOUT_SECONDS,
     )
-    server = uvicorn.Server(config)
+    server = _cancellable_server(uvicorn, config)
     thread = threading.Thread(target=_profiled_server_run(server, profile), daemon=True)
     thread.start()
     _wait_for_server(server)
@@ -69,11 +76,15 @@ def embedded_queue_dev_server(
             _thread=thread,
         )
     finally:
-        server.should_exit = True
-        thread.join(timeout=5)
-        if thread.is_alive():
-            raise RuntimeError("embedded queue dev server did not stop")
-        app.state.close()
+        try:
+            _stop_server(
+                server,
+                thread,
+                "embedded queue dev server",
+                timeout=_GRACEFUL_SHUTDOWN_TIMEOUT_SECONDS,
+            )
+        finally:
+            app.state.close()
 
 
 @contextlib.contextmanager
@@ -110,8 +121,9 @@ def queue_client_asgi_dev_server(  # noqa: PLR0913
         log_level="warning",
         lifespan="on",
         ws="none",
+        timeout_graceful_shutdown=_GRACEFUL_SHUTDOWN_TIMEOUT_SECONDS,
     )
-    server = uvicorn.Server(config)
+    server = _cancellable_server(uvicorn, config)
     thread = threading.Thread(target=_profiled_server_run(server, profile), daemon=True)
     thread.start()
     _wait_for_server(server, "queue client ASGI dev server")
@@ -123,10 +135,12 @@ def queue_client_asgi_dev_server(  # noqa: PLR0913
             _thread=thread,
         )
     finally:
-        server.should_exit = True
-        thread.join(timeout=5)
-        if thread.is_alive():
-            raise RuntimeError("queue client ASGI dev server did not stop")
+        _stop_server(
+            server,
+            thread,
+            "queue client ASGI dev server",
+            timeout=_GRACEFUL_SHUTDOWN_TIMEOUT_SECONDS,
+        )
 
 
 def main(argv: list[str] | None = None) -> int:
@@ -181,6 +195,52 @@ def _wait_for_server(server: Any, name: str = "embedded queue dev server") -> No
         raise RuntimeError(f"{name} did not start")
 
 
+def _stop_server(
+    server: Any,
+    thread: threading.Thread,
+    name: str,
+    *,
+    timeout: float,
+) -> None:
+    server.should_exit = True
+    thread.join(timeout=timeout + _SERVER_STOP_TIMEOUT_MARGIN_SECONDS)
+    if thread.is_alive():
+        server.force_exit = True
+        server.cancel()
+        thread.join(timeout=timeout)
+    if thread.is_alive():
+        raise RuntimeError(f"{name} did not stop")
+
+
+def _cancellable_server(uvicorn: Any, config: Any) -> Any:
+    class CancellableServer(uvicorn.Server):
+        _cancel_scope: anyio.CancelScope | None = None
+        _portal: from_thread.BlockingPortal | None = None
+
+        def run(self, sockets: list[Any] | None = None) -> None:
+            backend_options: dict[str, Any] = {}
+            get_loop_factory = getattr(self.config, "get_loop_factory", None)
+            if get_loop_factory is not None:
+                backend_options["loop_factory"] = get_loop_factory()
+            else:
+                self.config.setup_event_loop()
+            anyio.run(self._run, sockets, backend_options=backend_options)
+
+        async def _run(self, sockets: list[Any] | None) -> None:
+            async with from_thread.BlockingPortal() as self._portal:
+                with anyio.CancelScope() as self._cancel_scope:
+                    await self.serve(sockets=sockets)
+
+        def cancel(self) -> None:
+            if self._portal is not None and self._cancel_scope is not None:
+                try:
+                    self._portal.start_task_soon(self._cancel_scope.cancel)
+                except RuntimeError:
+                    pass
+
+    return CancellableServer(config)
+
+
 def _server_port(server: Any) -> int:
     for asyncio_server in server.servers:
         sockets = asyncio_server.sockets or ()

{vercel_queue-0.8.0 → vercel_queue-0.8.1}/vercel/queue/version.py

@@ -1,3 +1,3 @@
 """Package version metadata."""
 
-__version__ = "0.8.0"
+__version__ = "0.8.1"