openhands-agent-server 1.7.3__py3-none-any.whl → 1.8.0__py3-none-any.whl

openhands/agent_server/conversation_service.py

@@ -1,4 +1,5 @@
 import asyncio
+import importlib
 import logging
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -406,8 +407,6 @@ class ConversationService:
                 )
                 # Dynamically register tools when resuming persisted conversations
                 if stored.tool_module_qualnames:
-                    import importlib
-
                     for (
                         tool_name,
                         module_qualname,

openhands/agent_server/env_parser.py

@@ -17,7 +17,10 @@ from uuid import UUID
 
 from pydantic import BaseModel, SecretStr, TypeAdapter
 
-from openhands.sdk.utils.models import DiscriminatedUnionMixin
+from openhands.sdk.utils.models import (
+    DiscriminatedUnionMixin,
+    get_known_concrete_subclasses,
+)
 
 
 # Define Missing type
@@ -268,6 +271,26 @@ class UnionEnvParser(EnvParser):
                 output.write("\n")
 
 
+@dataclass
+class DiscriminatedUnionEnvParser(EnvParser):
+    parsers: dict[str, EnvParser]
+
+    def from_env(self, key: str) -> JsonType:
+        kind = os.environ.get(f"{key}_KIND", MISSING)
+        if kind is MISSING:
+            return MISSING
+        assert isinstance(kind, str)
+        parser = self.parsers[kind]
+        parser_result = parser.from_env(key)
+        assert isinstance(parser_result, dict)
+        parser_result["kind"] = kind
+        return parser_result
+
+    def to_env(self, key: str, value: Any, output: IO):
+        parser = self.parsers[value.kind]
+        parser.to_env(key, value, output)
+
+
 @dataclass
 class DelayedParser(EnvParser):
     """Delayed parser for circular dependencies"""
@@ -341,9 +364,16 @@ def get_env_parser(target_type: type, parsers: dict[type, EnvParser]) -> EnvPars
     if issubclass(target_type, DiscriminatedUnionMixin) and (
         inspect.isabstract(target_type) or ABC in target_type.__bases__
     ):
-        serializable_type = target_type.get_serializable_type()
-        if serializable_type != target_type:
-            return get_env_parser(target_type.get_serializable_type(), parsers)
+        delayed = DelayedParser()
+        parsers[target_type] = delayed  # Prevent circular dependency
+        sub_parsers = {
+            c.__name__: get_env_parser(c, parsers)
+            for c in get_known_concrete_subclasses(target_type)
+        }
+        parser = DiscriminatedUnionEnvParser(sub_parsers)
+        delayed.parser = parser
+        parsers[target_type] = parser
+        return parser
     if issubclass(target_type, BaseModel):  # type: ignore
         delayed = DelayedParser()
         parsers[target_type] = delayed  # Prevent circular dependency

openhands/agent_server/event_service.py

@@ -19,6 +19,7 @@ from openhands.sdk.conversation.state import (
     ConversationExecutionStatus,
     ConversationState,
 )
+from openhands.sdk.event import AgentErrorEvent
 from openhands.sdk.event.conversation_state import ConversationStateUpdateEvent
 from openhands.sdk.event.llm_completion_log import LLMCompletionLogEvent
 from openhands.sdk.security.analyzer import SecurityAnalyzerBase
@@ -439,6 +440,26 @@ class EventService:
         # Setup stats streaming for remote execution
         self._setup_stats_streaming(self._conversation.agent)
 
+        # If the execution_status was "running" while serialized, then the
+        # conversation can't possibly be running - something is wrong
+        state = self._conversation.state
+        if state.execution_status == ConversationExecutionStatus.RUNNING:
+            state.execution_status = ConversationExecutionStatus.ERROR
+            # Add error event for the first unmatched action to inform the agent
+            unmatched_actions = ConversationState.get_unmatched_actions(state.events)
+            if unmatched_actions:
+                first_action = unmatched_actions[0]
+                error_event = AgentErrorEvent(
+                    tool_name=first_action.tool_name,
+                    tool_call_id=first_action.tool_call_id,
+                    error=(
+                        "A restart occurred while this tool was in progress. "
+                        "This may indicate a fatal memory error or system crash. "
+                        "The tool execution was interrupted and did not complete."
+                    ),
+                )
+                self._conversation._on_event(error_event)
+
         # Publish initial state update
         await self._publish_state_update()
 

openhands/agent_server/sockets.py

@@ -139,7 +139,7 @@ async def bash_events_socket(
 
 async def _send_event(event: Event, websocket: WebSocket):
     try:
-        dumped = event.model_dump()
+        dumped = event.model_dump(mode="json")
         await websocket.send_json(dumped)
     except Exception:
         logger.exception("error_sending_event:{event}", stack_info=True)
@@ -157,7 +157,7 @@ class _WebSocketSubscriber(Subscriber):
 
 async def _send_bash_event(event: BashEventBase, websocket: WebSocket):
     try:
-        dumped = event.model_dump()
+        dumped = event.model_dump(mode="json")
         await websocket.send_json(dumped)
     except Exception:
         logger.exception("error_sending_event:{event}", stack_info=True)

{openhands_agent_server-1.7.3.dist-info → openhands_agent_server-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.7.3
+Version: 1.8.0
 Summary: OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent
 Requires-Python: >=3.12
 Requires-Dist: aiosqlite>=0.19

{openhands_agent_server-1.7.3.dist-info → openhands_agent_server-1.8.0.dist-info}/RECORD

@@ -5,13 +5,13 @@ openhands/agent_server/bash_router.py,sha256=9aKNxzdKSlKoYJ3ngvdf4rjv1_iNNmpRoZk
 openhands/agent_server/bash_service.py,sha256=QgTSyQoxlk52BnZuo35xlX7u7-3xs5BvvaKU3AEva_w,14083
 openhands/agent_server/config.py,sha256=EQdoN39cOeI63zEpAQ7WyhMpo-9tHNTsLMalU0d4kHw,5479
 openhands/agent_server/conversation_router.py,sha256=lz-dnfPXrVBiGZ9GhYqfteCWJ4pq7AcnWqxsKWwCfc0,11178
-openhands/agent_server/conversation_service.py,sha256=g_DKR9NJo5RjSnlITMxKUctwUyTN5tLp6sD8Q1N0tsM,27079
+openhands/agent_server/conversation_service.py,sha256=Oj8IBSY9ZYbduOOBatd3I0H_kSyH7xi22Y_MyhfL5Tk,27058
 openhands/agent_server/dependencies.py,sha256=H3zyOc8uthpXseB3E7rWNccKIj7PlyfcgCYwFvmFq4c,2629
 openhands/agent_server/desktop_router.py,sha256=OaCmevO33eUo3jTwiXBmQ3uT3ONu4-tqgBfYpZWrHSA,1349
 openhands/agent_server/desktop_service.py,sha256=iCwQJXK4DvGuBXKOQ1oko60wXkf_pYHCubOzBsd2k60,7415
-openhands/agent_server/env_parser.py,sha256=iVoxrTy2VzGZAzZq7ODkOZ-iV5Qw-et6Xd0ojWeMzTk,14050
+openhands/agent_server/env_parser.py,sha256=NBa5p_JGYJVMMdCJJ_jicW1iAGS6h8AG_HVlcQ2dxaY,14929
 openhands/agent_server/event_router.py,sha256=XM46zcqPOXStISfihzsPXPfsW_23E50brmBHk04ncVI,6156
-openhands/agent_server/event_service.py,sha256=LblAF94qrZGBsAce4HUjlCn4BT5RHdWY8SzGqOTGJKY,24023
+openhands/agent_server/event_service.py,sha256=N-RKeXox4dMsZv-8brwYRtt5p2axfznPfd6C-8TKXk4,25189
 openhands/agent_server/file_router.py,sha256=ysDjIKzDNbi7m95JrH6kP6BYcBhTJhTpJVMkNtYVYhs,4011
 openhands/agent_server/git_router.py,sha256=g0cVeyJ_mUAuieZ3bbTl5Xvm94FnNwRt07iNBASiXgU,844
 openhands/agent_server/logging_config.py,sha256=DPPxIl1tUVGiui-JVSKgs73KXPFfDNX2ivGuZSkbLe4,1832
@@ -21,7 +21,7 @@ openhands/agent_server/openapi.py,sha256=RJWaOnM9NjzrH-fJi3PoIBv5d0sH5z8zZTdvYzS
 openhands/agent_server/pub_sub.py,sha256=yPB84Wub7A2uwUWsW_grbxomWmKaWyGuo6dVNUzg1FU,2755
 openhands/agent_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openhands/agent_server/server_details_router.py,sha256=LCa0NQ3SOw-IgJh3rDJL5GolFOpZcX_-XEbDLHF8dN4,950
-openhands/agent_server/sockets.py,sha256=WFx77Qp2FUStwdpLyONPENX3e_874IqkLjxzlNPb3e4,6584
+openhands/agent_server/sockets.py,sha256=pWjuRpWeqPw-T5svqb5mO7JCAVcCptQyHxc6lDYHhvY,6606
 openhands/agent_server/tool_preload_service.py,sha256=2QuFyn7jC4Ifq2aUhs9j8876wSBdY0eeoLo4qEVi-yA,2341
 openhands/agent_server/tool_router.py,sha256=vM_9UKUzfChLK9B9Z3DL4VtKNdDw4w635knu9N36y0c,676
 openhands/agent_server/utils.py,sha256=ajivE_kGCJ9qUhF9H3Qu7DUKg7uDvDQk16JcO3XntEs,1926
@@ -32,8 +32,8 @@ openhands/agent_server/docker/build.py,sha256=Egsge_yIVCeiJ_gvva6VyPeQtOp0WjZFsW
 openhands/agent_server/docker/wallpaper.svg,sha256=FR2g_b5mzz0x5EvRTKO93ASnWPagAyeS9RI3vRQBAsw,11532
 openhands/agent_server/vscode_extensions/openhands-settings/extension.js,sha256=xoCKZ6YXlzlTWnTC52HuzX0sn9s77Vma-47WgEibO88,858
 openhands/agent_server/vscode_extensions/openhands-settings/package.json,sha256=eCkuBBYEVArEjpp7c_m0H207OCLEygZhBLUEkeFNWOg,289
-openhands_agent_server-1.7.3.dist-info/METADATA,sha256=vmWo6337iN8ugke45vPY9Z7Lb3N44-lRwpCXkOdj7tI,468
-openhands_agent_server-1.7.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-openhands_agent_server-1.7.3.dist-info/entry_points.txt,sha256=uLQzPhqDqe85Dy9DvPiBE2CeqkwCryggr1Ty_mq65NA,70
-openhands_agent_server-1.7.3.dist-info/top_level.txt,sha256=jHgVu9I0Blam8BXFgedoGKfglPF8XvW1TsJFIjcgP4E,10
-openhands_agent_server-1.7.3.dist-info/RECORD,,
+openhands_agent_server-1.8.0.dist-info/METADATA,sha256=chQ_oAjxGloopDCBqk24HFowzXloGbIEv68tqZVG91k,468
+openhands_agent_server-1.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+openhands_agent_server-1.8.0.dist-info/entry_points.txt,sha256=uLQzPhqDqe85Dy9DvPiBE2CeqkwCryggr1Ty_mq65NA,70
+openhands_agent_server-1.8.0.dist-info/top_level.txt,sha256=jHgVu9I0Blam8BXFgedoGKfglPF8XvW1TsJFIjcgP4E,10
+openhands_agent_server-1.8.0.dist-info/RECORD,,