Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Fix for critical regression where conversations will not start in OSS (#12347)

Tim O'Farrell778a1cf6091b
diff --git a/openhands/app_server/sandbox/docker_sandbox_service.py b/openhands/app_server/sandbox/docker_sandbox_service.py
index 26cc2c9861..82857ab098 100644
--- a/openhands/app_server/sandbox/docker_sandbox_service.py
+++ b/openhands/app_server/sandbox/docker_sandbox_service.py
@@ -3,7 +3,7 @@ import logging
import os
import socket
from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timedelta
from typing import AsyncGenerator
import base62
@@ -39,6 +39,7 @@ from openhands.app_server.utils.docker_utils import (
_logger = logging.getLogger(__name__)
SESSION_API_KEY_VARIABLE = 'OH_SESSION_API_KEYS_0'
WEBHOOK_CALLBACK_VARIABLE = 'OH_WEBHOOKS_0_BASE_URL'
+STARTUP_GRACE_SECONDS = 15
class VolumeMount(BaseModel):
@@ -80,6 +81,7 @@ class DockerSandboxService(SandboxService):
max_num_sandboxes: int
extra_hosts: dict[str, str] = field(default_factory=dict)
docker_client: docker.DockerClient = field(default_factory=get_docker_client)
+ startup_grace_seconds: int = STARTUP_GRACE_SECONDS
def _find_unused_port(self) -> int:
"""Find an unused port on the host machine."""
@@ -200,8 +202,16 @@ class DockerSandboxService(SandboxService):
except asyncio.CancelledError:
raise
except Exception as exc:
- _logger.info(f'Sandbox server not running: {app_server_url} : {exc}')
- sandbox_info.status = SandboxStatus.ERROR
+ # If the server is
+ if sandbox_info.created_at < utc_now() - timedelta(
+ seconds=self.startup_grace_seconds
+ ):
+ _logger.info(
+ f'Sandbox server not running: {app_server_url} : {exc}'
+ )
+ sandbox_info.status = SandboxStatus.ERROR
+ else:
+ sandbox_info.status = SandboxStatus.STARTING
sandbox_info.exposed_urls = None
sandbox_info.session_api_key = None
return sandbox_info
@@ -497,6 +507,13 @@ class DockerSandboxServiceInjector(SandboxServiceInjector):
'Format: {"hostname": "ip_or_gateway"}'
),
)
+ startup_grace_seconds: int = Field(
+ default=STARTUP_GRACE_SECONDS,
+ description=(
+ 'Number of seconds were no response from the agent server is acceptable'
+ 'before it is considered an error'
+ ),
+ )
async def inject(
self, state: InjectorState, request: Request | None = None
@@ -522,4 +539,5 @@ class DockerSandboxServiceInjector(SandboxServiceInjector):
httpx_client=httpx_client,
max_num_sandboxes=self.max_num_sandboxes,
extra_hosts=self.extra_hosts,
+ startup_grace_seconds=self.startup_grace_seconds,
)