spooled 1.2.0__tar.gz → 1.2.2__tar.gz

{spooled-1.2.0 → spooled-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: spooled
-Version: 1.2.0
+Version: 1.2.2
 Summary: Official Python SDK for Spooled Cloud job queue service
 Project-URL: Homepage, https://spooled.cloud
 Project-URL: Documentation, https://spooled.cloud/docs/

{spooled-1.2.0 → spooled-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "spooled"
-version = "1.2.0"
+version = "1.2.2"
 description = "Official Python SDK for Spooled Cloud job queue service"
 readme = "README.md"
 license = "Apache-2.0"

{spooled-1.2.0 → spooled-1.2.2}/src/spooled/_version.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("spooled")
 except PackageNotFoundError:  # pragma: no cover - source checkout without installed metadata
-    __version__ = "1.2.0"
+    __version__ = "1.2.2"

{spooled-1.2.0 → spooled-1.2.2}/src/spooled/realtime/sse.py

@@ -12,6 +12,7 @@ import time
 from collections.abc import AsyncGenerator, Callable, Generator
 from enum import Enum
 from typing import Any
+from urllib.parse import quote
 
 import httpx
 
@@ -285,8 +286,11 @@ class SSEClient:
         """Build SSE endpoint URL."""
         if self._job_id:
             return f"{self._base_url}/api/v1/events/jobs/{self._job_id}"
+        # A queue subscription uses /events?queue=: /events/queues/{name} carries
+        # only queue.stats, so job events never arrived for a queue filter.
+        # Requires API 0.1.114+.
         if self._queue:
-            return f"{self._base_url}/api/v1/events/queues/{self._queue}"
+            return f"{self._base_url}/api/v1/events?queue={quote(self._queue, safe='')}"
         return f"{self._base_url}/api/v1/events"
 
     def connect(self) -> None:
@@ -300,16 +304,27 @@ class SSEClient:
 
         try:
             self._client = httpx.Client()
-            self._response = self._client.stream(
-                "GET",
-                url,
-                headers={
-                    "Authorization": f"Bearer {self._token}",
-                    "Accept": "text/event-stream",
-                },
-            ).__enter__()
-
-            self._sse_client = sseclient.SSEClient(self._response.iter_lines())  # type: ignore[arg-type]
+            # send(stream=True) keeps the response open until close(). Entering
+            # client.stream(...) by hand dropped its context manager, which the
+            # garbage collector then exited — closing the stream before any
+            # event was read ("the stream has been closed").
+            self._response = self._client.send(
+                self._client.build_request(
+                    "GET",
+                    url,
+                    headers={
+                        "Authorization": f"Bearer {self._token}",
+                        "Accept": "text/event-stream",
+                    },
+                ),
+                stream=True,
+            )
+
+            # sseclient needs raw byte chunks: it finds event boundaries by the
+            # blank line between events. iter_lines() yields str lines with the
+            # newlines stripped, so the first line raised TypeError and the
+            # stream never produced an event.
+            self._sse_client = sseclient.SSEClient(self._response.iter_bytes())  # type: ignore[arg-type]
             self._set_state(SSEConnectionState.CONNECTED)
             self._reconnect_attempts = 0
             self._closed = False
@@ -629,8 +644,11 @@ class AsyncSSEClient:
         """Build SSE endpoint URL."""
         if self._job_id:
             return f"{self._base_url}/api/v1/events/jobs/{self._job_id}"
+        # A queue subscription uses /events?queue=: /events/queues/{name} carries
+        # only queue.stats, so job events never arrived for a queue filter.
+        # Requires API 0.1.114+.
         if self._queue:
-            return f"{self._base_url}/api/v1/events/queues/{self._queue}"
+            return f"{self._base_url}/api/v1/events?queue={quote(self._queue, safe='')}"
         return f"{self._base_url}/api/v1/events"
 
     async def connect(self) -> None:
@@ -643,14 +661,18 @@ class AsyncSSEClient:
 
         try:
             self._client = httpx.AsyncClient()
-            self._response = await self._client.stream(
-                "GET",
-                url,
-                headers={
-                    "Authorization": f"Bearer {self._token}",
-                    "Accept": "text/event-stream",
-                },
-            ).__aenter__()
+            # See SSEClient.connect: keep the response open until close().
+            self._response = await self._client.send(
+                self._client.build_request(
+                    "GET",
+                    url,
+                    headers={
+                        "Authorization": f"Bearer {self._token}",
+                        "Accept": "text/event-stream",
+                    },
+                ),
+                stream=True,
+            )
             self._set_state(SSEConnectionState.CONNECTED)
             self._reconnect_attempts = 0
             self._closed = False

{spooled-1.2.0 → spooled-1.2.2}/src/spooled/realtime/unified.py

@@ -15,6 +15,7 @@ from collections.abc import Callable, Generator
 from dataclasses import dataclass
 from enum import Enum
 from typing import Any, Literal
+from urllib.parse import quote
 
 from spooled.realtime.events import (
     RealtimeEvent,
@@ -509,17 +510,24 @@ class SpooledRealtime:
 
         try:
             self._http_client = httpx.Client()
-            self._sse_response = self._http_client.stream(
-                "GET",
-                url,
-                headers={
-                    "Authorization": f"Bearer {self._options.token}",
-                    "Accept": "text/event-stream",
-                },
-            ).__enter__()
+            # send(stream=True) keeps the response open until disconnect(); a
+            # hand-entered client.stream(...) was closed by the GC (see sse.py).
+            self._sse_response = self._http_client.send(
+                self._http_client.build_request(
+                    "GET",
+                    url,
+                    headers={
+                        "Authorization": f"Bearer {self._options.token}",
+                        "Accept": "text/event-stream",
+                    },
+                ),
+                stream=True,
+            )
 
             if HAS_SSE:
-                self._sse_client = sseclient.SSEClient(self._sse_response.iter_lines())
+                # Raw byte chunks: sseclient splits events on the blank line,
+                # which iter_lines() strips (see realtime/sse.py).
+                self._sse_client = sseclient.SSEClient(self._sse_response.iter_bytes())
 
             self._set_state(ConnectionState.CONNECTED)
             self._reconnect_attempts = 0
@@ -578,8 +586,12 @@ class SpooledRealtime:
         if filter:
             if filter.job_id:
                 return f"{self._options.base_url}/api/v1/events/jobs/{filter.job_id}"
+            # /events/queues/{name} carries only queue.stats; job events for a
+            # queue come from /events?queue= (API 0.1.114+).
             if filter.queue:
-                return f"{self._options.base_url}/api/v1/events/queues/{filter.queue}"
+                return (
+                    f"{self._options.base_url}/api/v1/events?queue={quote(filter.queue, safe='')}"
+                )
 
         return f"{self._options.base_url}/api/v1/events"