durable-workflow 2.3.7__tar.gz → 2.3.9__tar.gz

{durable_workflow-2.3.7/src/durable_workflow.egg-info → durable_workflow-2.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durable-workflow
-Version: 2.3.7
+Version: 2.3.9
 Summary: Python client and worker SDK for Durable Workflow Cloud and self-hosted Server
 Author: Durable Workflow Contributors
 License-Expression: MIT

{durable_workflow-2.3.7 → durable_workflow-2.3.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "durable-workflow"
-version = "2.3.7"
+version = "2.3.9"
 description = "Python client and worker SDK for Durable Workflow Cloud and self-hosted Server"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -71,8 +71,8 @@ durable-workflow-replay-conformance = "durable_workflow.replay_conformance:main"
 durable-workflow-workflow-updates-conformance = "durable_workflow.workflow_updates_conformance:main"
 
 [tool.durable-workflow]
-product-train = "2.3.7"
-registry-version = "2.3.7"
+product-train = "2.3.9"
+registry-version = "2.3.9"
 supported-server-versions = "2.4.8"
 worker-protocol-version = "1.19"
 control-plane-version = "2"

{durable_workflow-2.3.7 → durable_workflow-2.3.9}/src/durable_workflow/client.py

@@ -1794,7 +1794,7 @@ class Client:
                 f"/api{path}",
                 headers=self._discovery_headers() if discovery else self._headers(worker=worker),
                 json=request_json,
-                timeout=timeout,
+                timeout=self.timeout if timeout is None else timeout,
             )
             # Raise HTTPStatusError for 4xx/5xx so retry policy can catch it
             resp.raise_for_status()

{durable_workflow-2.3.7 → durable_workflow-2.3.9}/src/durable_workflow/worker.py

@@ -951,30 +951,6 @@ def _server_supports_update_validation_tasks(info: dict[str, Any]) -> bool:
     )
 
 
-def _server_long_poll_timeout(info: dict[str, Any]) -> float | None:
-    worker_protocol = info.get("worker_protocol")
-    if not isinstance(worker_protocol, dict):
-        return None
-
-    capabilities = worker_protocol.get("server_capabilities")
-    if not isinstance(capabilities, dict):
-        return None
-
-    timeout = capabilities.get("long_poll_timeout")
-    if isinstance(timeout, bool):
-        return None
-    if isinstance(timeout, int | float):
-        return float(timeout) if timeout > 0 else None
-    if isinstance(timeout, str):
-        try:
-            parsed = float(timeout)
-        except ValueError:
-            return None
-        return parsed if parsed > 0 else None
-
-    return None
-
-
 def _contract_version_matches(value: Any, expected: int) -> bool:
     if isinstance(value, int):
         return value == expected
@@ -1041,6 +1017,7 @@ class Worker:
             raise ValueError("heartbeat_interval must be positive")
 
         self._poll_timeout = poll_timeout
+        # Client supplies HTTP grace separately from this requested poll window.
         self._poll_http_timeout = poll_timeout
         self.max_concurrent_workflow_tasks = max_concurrent_workflow_tasks
         self.max_concurrent_activity_tasks = max_concurrent_activity_tasks
@@ -1191,9 +1168,6 @@ class Worker:
                 "multiplexed workflow/update-validation polling. Refusing registration so validated "
                 "updates cannot be accepted without validator approval or exceed worker capacity."
             )
-        server_long_poll_timeout = _server_long_poll_timeout(info)
-        if server_long_poll_timeout is not None:
-            self._poll_http_timeout = max(self._poll_http_timeout, server_long_poll_timeout + 5.0)
         log.debug(
             "server compatibility accepted: app_version=%s control_plane=%s worker_protocol=%s",
             info.get("version", "unknown"),

{durable_workflow-2.3.7 → durable_workflow-2.3.9/src/durable_workflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: durable-workflow
-Version: 2.3.7
+Version: 2.3.9
 Summary: Python client and worker SDK for Durable Workflow Cloud and self-hosted Server
 Author: Durable Workflow Contributors
 License-Expression: MIT

{durable_workflow-2.3.7 → durable_workflow-2.3.9}/src/durable_workflow.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ tests/test_avro_value_protocol.py
 tests/test_ci_checkout.py
 tests/test_ci_integration_endpoint.py
 tests/test_client.py
+tests/test_client_timeouts.py
 tests/test_codec_regression_corpus.py
 tests/test_control_plane_parity_fixtures.py
 tests/test_docstring_cross_references.py

durable_workflow-2.3.9/tests/test_client_timeouts.py

@@ -0,0 +1,93 @@
+from __future__ import annotations
+
+import asyncio
+import json
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+
+import httpx
+import pytest
+
+from durable_workflow.client import Client
+from durable_workflow.retry_policy import TransportRetryPolicy
+
+
+@asynccontextmanager
+async def response_server(*, delay: float | None) -> AsyncIterator[str]:
+    """A real HTTP peer, with response progress controlled by the test."""
+    writers: list[asyncio.StreamWriter] = []
+    handlers: set[asyncio.Task[None]] = set()
+
+    async def respond(reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
+        task = asyncio.current_task()
+        assert task is not None
+        handlers.add(task)
+        writers.append(writer)
+        try:
+            headers = await reader.readuntil(b"\r\n\r\n")
+            for header in headers.split(b"\r\n"):
+                if header.lower().startswith(b"content-length:"):
+                    await reader.readexactly(int(header.split(b":", 1)[1]))
+            if delay is None:
+                await reader.read()
+                return
+            await asyncio.sleep(delay)
+            body = json.dumps({"task": None, "poll_status": "empty"}).encode()
+            writer.write(
+                b"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n"
+                + f"Content-Length: {len(body)}\r\nConnection: close\r\n\r\n".encode()
+                + body
+            )
+            await writer.drain()
+        finally:
+            writer.close()
+            await writer.wait_closed()
+            handlers.discard(task)
+
+    server = await asyncio.start_server(respond, "127.0.0.1", 0)
+    try:
+        assert server.sockets
+        yield f"http://127.0.0.1:{server.sockets[0].getsockname()[1]}"
+    finally:
+        server.close()
+        await server.wait_closed()
+        for writer in writers:
+            writer.close()
+        if handlers:
+            await asyncio.gather(*handlers)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("operation", ["control", "discovery", "worker"])
+async def test_configured_timeout_bounds_a_stalled_response(operation: str) -> None:
+    async with (
+        response_server(delay=None) as endpoint,
+        Client(endpoint, timeout=0.05, retry_policy=TransportRetryPolicy(max_attempts=1)) as client,
+    ):
+        if operation == "control":
+            request = client.health()
+        elif operation == "discovery":
+            request = client.get_cluster_info()
+        else:
+            request = client.complete_workflow_task(
+                task_id="synthetic-timeout-task",
+                lease_owner="synthetic-timeout-worker",
+                workflow_task_attempt=1,
+                commands=[],
+            )
+        with pytest.raises(httpx.ReadTimeout):
+            await asyncio.wait_for(request, timeout=2)
+
+
+@pytest.mark.asyncio
+async def test_explicit_poll_timeout_overrides_a_shorter_client_default() -> None:
+    async with (
+        response_server(delay=0.1) as endpoint,
+        Client(endpoint, timeout=0.01, retry_policy=TransportRetryPolicy(max_attempts=1)) as client,
+    ):
+        task = await client.poll_workflow_task(
+            worker_id="synthetic-timeout-worker",
+            task_queue="synthetic-timeout-queue",
+            timeout=0,
+        )
+        assert task is None

{durable_workflow-2.3.7 → durable_workflow-2.3.9}/tests/test_worker.py

@@ -711,7 +711,14 @@ class TestWorkerRegistration:
         )
 
     @pytest.mark.asyncio
-    async def test_register_keeps_http_timeout_above_server_long_poll(self, mock_client: AsyncMock) -> None:
+    @pytest.mark.parametrize(("poll_loop", "poll_method"), [
+        ("_poll_workflow_tasks", "poll_workflow_task"),
+        ("_poll_activity_tasks", "poll_activity_task"),
+        ("_poll_query_tasks", "poll_query_task"),
+    ])
+    async def test_registration_preserves_configured_poll_window(
+        self, mock_client: AsyncMock, poll_loop: str, poll_method: str,
+    ) -> None:
         mock_client.get_cluster_info = AsyncMock(
             return_value=compatible_cluster_info(
                 worker_protocol={
@@ -736,12 +743,12 @@ class TestWorkerRegistration:
             worker._stop.set()
             return None
 
-        mock_client.poll_workflow_task.side_effect = poll_once
+        getattr(mock_client, poll_method).side_effect = poll_once
 
         await worker._register()
-        await worker._poll_workflow_tasks()
+        await getattr(worker, poll_loop)()
 
-        assert mock_client.poll_workflow_task.call_args.kwargs["timeout"] == 17.0
+        assert getattr(mock_client, poll_method).call_args.kwargs["timeout"] == 0.01
 
     @pytest.mark.asyncio
     async def test_register_keeps_baseline_capabilities_when_server_does_not_support_query_tasks(