address feedback

Author: vdusek

.gitignore

@@ -28,7 +28,6 @@ __pycache__
 
 # Virtual envs
 .direnv
-.env
 .envrc
 .python-version
 .venv
@@ -80,3 +79,5 @@ storage/
 
 # Tmp dir
 tmp/
+config.bat
+node_modules

src/apify_client/_http_clients/_base.py

@@ -168,15 +168,15 @@ def _parse_params(params: dict[str, Any] | None) -> dict[str, Any] | None:
     def _compute_timeout(self, timeout: Timeout, attempt: int) -> int | float | None:
         """Resolve a timeout tier and compute the timeout for a request attempt with exponential increase.
 
-        For `'no_timeout'`, returns `None`. For tier literals and explicit `timedelta` values, doubles the timeout
-        with each attempt but caps at `timeout_max`.
+        For `no_timeout`, returns `None` to indicate no timeout. For tier literals and explicit `timedelta` values,
+        doubles the timeout with each attempt but caps at `timeout_max`.
 
         Args:
             timeout: The timeout specification to resolve (tier literal or explicit `timedelta`).
             attempt: Current attempt number (1-indexed).
 
         Returns:
-            Timeout in seconds, or `None` for `'no_timeout'`.
+            Timeout in seconds, or `None` for no timeout.
         """
         if timeout == 'no_timeout':
             return None

src/apify_client/_http_clients/_impit.py

@@ -200,12 +200,18 @@ def _make_request(
         try:
             url_with_params = self._build_url_with_params(url, params)
 
+            # Impit treats timeout=None as "use client default (30s)", not "no timeout".
+            # Use a large value (24 hours) to effectively disable the timeout.
+            # This can be removed once impit updates its behaviour: https://github.com/apify/impit/issues/401
+            computed_timeout = self._compute_timeout(timeout, attempt)
+            impit_timeout = 86_400 if computed_timeout is None else computed_timeout
+
             response = self._impit_client.request(
                 method=method,
                 url=url_with_params,
                 headers=headers,
                 content=content,
-                timeout=self._compute_timeout(timeout, attempt),
+                timeout=impit_timeout,
                 stream=stream or False,
             )
 
@@ -436,12 +442,18 @@ async def _make_request(
         try:
             url_with_params = self._build_url_with_params(url, params)
 
+            # Impit treats timeout=None as "use client default (30s)", not "no timeout".
+            # Use a large value (24 hours) to effectively disable the timeout.
+            # This can be removed once impit updates its behaviour: https://github.com/apify/impit/issues/401
+            computed_timeout = self._compute_timeout(timeout, attempt)
+            impit_timeout = 86_400 if computed_timeout is None else computed_timeout
+
             response = await self._impit_async_client.request(
                 method=method,
                 url=url_with_params,
                 headers=headers,
                 content=content,
-                timeout=self._compute_timeout(timeout, attempt),
+                timeout=impit_timeout,
                 stream=stream or False,
             )
 

src/apify_client/_resource_clients/request_queue.py

@@ -828,6 +828,7 @@ async def _batch_add_requests_worker(
         self,
         queue: asyncio.Queue[Iterable[dict]],
         request_params: dict,
+        timeout: Timeout,
     ) -> BatchAddResponse:
         """Worker function to process a batch of requests.
 
@@ -852,7 +853,7 @@ async def _batch_add_requests_worker(
                     method='POST',
                     params=request_params,
                     json=list(request_batch),
-                    timeout='medium',
+                    timeout=timeout,
                 )
 
                 result = response_to_dict(response)
@@ -879,7 +880,7 @@ async def batch_add_requests(
         max_parallel: int = 5,
         max_unprocessed_requests_retries: int | None = None,
         min_delay_between_unprocessed_requests_retries: timedelta | None = None,
-        timeout: Timeout = 'medium',  # noqa: ARG002
+        timeout: Timeout = 'medium',
     ) -> BatchAddResult:
         """Add requests to the request queue in batches.
 
@@ -926,7 +927,7 @@ async def batch_add_requests(
             async with asyncio.TaskGroup() as tg:
                 workers = [
                     tg.create_task(
-                        self._batch_add_requests_worker(asyncio_queue, request_params),
+                        self._batch_add_requests_worker(asyncio_queue, request_params, timeout),
                         name=f'batch_add_requests_worker_{i}',
                     )
                     for i in range(max_parallel)

tests/unit/test_client_timeouts.py

@@ -34,24 +34,24 @@ async def mock_request_async(*args: Any, **kwargs: Any) -> None:
     monkeypatch.undo()
 
 
-def test_no_timeout_passes_none_to_impit_sync(patch_request: list) -> None:
-    """Test that `'no_timeout'` passes `timeout=None` to impit (uses client-level default)."""
+def test_no_timeout_passes_large_value_to_impit_sync(patch_request: list) -> None:
+    """Test that `no_timeout` passes a large timeout to impit to effectively disable the timeout."""
     client = ImpitHttpClient(timeout_short=timedelta(seconds=10))
 
     with pytest.raises(EndOfTestError):
         client.call(method='GET', url='http://placeholder.url/no_timeout', timeout='no_timeout')
 
-    assert patch_request == [None]
+    assert patch_request == [86_400]
 
 
-async def test_no_timeout_passes_none_to_impit_async(patch_request: list) -> None:
-    """Test that `'no_timeout'` passes `timeout=None` to impit (uses client-level default)."""
+async def test_no_timeout_passes_large_value_to_impit_async(patch_request: list) -> None:
+    """Test that `no_timeout` passes a large timeout to impit to effectively disable the timeout."""
     client = ImpitHttpClientAsync(timeout_short=timedelta(seconds=10))
 
     with pytest.raises(EndOfTestError):
         await client.call(method='GET', url='http://placeholder.url/no_timeout', timeout='no_timeout')
 
-    assert patch_request == [None]
+    assert patch_request == [86_400]
 
 
 def test_default_timeout_uses_medium_tier_sync(patch_request: list) -> None: