All-Hands-AI · tofarr · Mar 27, 2025 · Mar 27, 2025 · Mar 27, 2025 · Mar 27, 2025
diff --git a/openhands/runtime/impl/docker/docker_runtime.py b/openhands/runtime/impl/docker/docker_runtime.py
@@ -37,6 +37,16 @@
 APP_PORT_RANGE_2 = (55000, 59999)
 
 
+def _is_retryable_wait_until_alive_error(exception):
+    if isinstance(exception, tenacity.RetryError):
+        cause = exception.last_attempt.exception()
+        return _is_retryable_wait_until_alive_error(cause)
+
+    return isinstance(
+        exception, (ConnectionError, httpx.NetworkError, httpx.RemoteProtocolError)
+    )
+
+
 class DockerRuntime(ActionExecutionClient):
     """This runtime will subscribe the event stream.
 
@@ -347,7 +357,7 @@ def _attach_to_container(self):
 
     @tenacity.retry(
         stop=tenacity.stop_after_delay(120) | stop_if_should_exit(),
-        retry=tenacity.retry_if_exception_type((ConnectionError, httpx.NetworkError)),
+        retry=tenacity.retry_if_exception(_is_retryable_wait_until_alive_error),
         reraise=True,
         wait=tenacity.wait_fixed(2),
     )

diff --git a/frontend/src/hooks/query/use-settings.ts b/frontend/src/hooks/query/use-settings.ts
  // https://tanstack.com/query/latest/docs/framework/react/guides/initial-query-data#using-initialdata-to-prepopulate-a-query
  if (query.error?.status === 404) {
    return {
      ...query,
      data: DEFAULT_SETTINGS,
    };
  }
	// https://tanstack.com/query/latest/docs/framework/react/guides/initial-query-data#using-initialdata-to-prepopulate-a-query
	if (query.error?.status === 404) {
	return {
	...query,
Check warning on line 62 in frontend/src/hooks/query/use-settings.ts GitHub Actions / Lint frontend `Object rest destructuring on a query will observe all changes to the query, leading to excessive re-renders`
	data: DEFAULT_SETTINGS,
	};
	}