fix the PollingBatch with the current version of yagna (#302)

* fix the PollingBatch with the current version of yagna * use aiohttp's general `_request_timeout` * Set maximum client-side timeout to 5 seconds, continue on client-side and server-side timeouts. * Decrease timeout Co-authored-by: Filip <[email protected]>
golemfactory · Apr 7, 2021 · 0cc5b18 · 0cc5b18
1 parent 157e69e
commit 0cc5b18
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/yapapi/rest/activity.py b/yapapi/rest/activity.py
@@ -167,11 +167,13 @@ async def __aiter__(self) -> AsyncIterator[events.CommandEventContext]:
                 raise BatchTimeoutError()
             try:
                 results: List[yaa.ExeScriptCommandResult] = await self._api.get_exec_batch_results(
-                    self._activity_id, self._batch_id, timeout=timeout
+                    self._activity_id, self._batch_id, _request_timeout=min(timeout, 5)
                 )
+            except asyncio.TimeoutError:
+                continue
             except ApiException as err:
                 if err.status == 408:
-                    raise BatchTimeoutError()
+                    continue
                 raise
             any_new: bool = False
             results = results[last_idx:]
@@ -194,7 +196,7 @@ async def __aiter__(self) -> AsyncIterator[events.CommandEventContext]:
                 if result.is_batch_finished:
                     break
             if not any_new:
-                delay = min(10, max(0, self.seconds_left()))
+                delay = min(3, max(0, self.seconds_left()))
                 await asyncio.sleep(delay)