openhands-agent-server 1.7.2__tar.gz → 1.7.4__tar.gz

{openhands_agent_server-1.7.2 → openhands_agent_server-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.7.2
+Version: 1.7.4
 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.2 → openhands_agent_server-1.7.4}/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
@@ -208,6 +209,32 @@ class ConversationService:
             )
             return conversation_info, False
 
+        # Dynamically register tools from client's registry
+        if request.tool_module_qualnames:
+            import importlib
+
+            for tool_name, module_qualname in request.tool_module_qualnames.items():
+                try:
+                    # Import the module to trigger tool auto-registration
+                    importlib.import_module(module_qualname)
+                    logger.debug(
+                        f"Tool '{tool_name}' registered via module '{module_qualname}'"
+                    )
+                except ImportError as e:
+                    logger.warning(
+                        f"Failed to import module '{module_qualname}' for tool "
+                        f"'{tool_name}': {e}. Tool will not be available."
+                    )
+                    # Continue even if some tools fail to register
+                    # The agent will fail gracefully if it tries to use unregistered
+                    # tools
+            if request.tool_module_qualnames:
+                logger.info(
+                    f"Dynamically registered {len(request.tool_module_qualnames)} "
+                    f"tools for conversation {conversation_id}: "
+                    f"{list(request.tool_module_qualnames.keys())}"
+                )
+
         stored = StoredConversation(id=conversation_id, **request.model_dump())
         event_service = await self._start_event_service(stored)
         initial_message = request.initial_message
@@ -378,6 +405,34 @@ class ConversationService:
                         "cipher": self.cipher,
                     },
                 )
+                # Dynamically register tools when resuming persisted conversations
+                if stored.tool_module_qualnames:
+                    for (
+                        tool_name,
+                        module_qualname,
+                    ) in stored.tool_module_qualnames.items():
+                        try:
+                            # Import the module to trigger tool auto-registration
+                            importlib.import_module(module_qualname)
+                            logger.debug(
+                                f"Tool '{tool_name}' registered via module "
+                                f"'{module_qualname}' when resuming conversation "
+                                f"{stored.id}"
+                            )
+                        except ImportError as e:
+                            logger.warning(
+                                f"Failed to import module '{module_qualname}' for "
+                                f"tool '{tool_name}' when resuming conversation "
+                                f"{stored.id}: {e}. Tool will not be available."
+                            )
+                            # Continue even if some tools fail to register
+                    if stored.tool_module_qualnames:
+                        logger.info(
+                            f"Dynamically registered "
+                            f"{len(stored.tool_module_qualnames)} tools when "
+                            f"resuming conversation {stored.id}: "
+                            f"{list(stored.tool_module_qualnames.keys())}"
+                        )
                 await self._start_event_service(stored)
             except Exception:
                 logger.exception(
@@ -447,6 +502,9 @@ class ConversationService:
 
         try:
             await event_service.start()
+            # Save metadata immediately after successful start to ensure persistence
+            # even if the system is not shut down gracefully
+            await event_service.save_meta()
         except Exception:
             # Clean up the event service if startup fails
             await event_service.close()

{openhands_agent_server-1.7.2 → openhands_agent_server-1.7.4}/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-1.7.2 → openhands_agent_server-1.7.4}/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-1.7.2 → openhands_agent_server-1.7.4}/openhands/agent_server/models.py

@@ -98,6 +98,14 @@ class StartConversationRequest(BaseModel):
         default_factory=dict,
         description="Secrets available in the conversation",
     )
+    tool_module_qualnames: dict[str, str] = Field(
+        default_factory=dict,
+        description=(
+            "Mapping of tool names to their module qualnames from the client's "
+            "registry. These modules will be dynamically imported on the server "
+            "to register the tools for this conversation."
+        ),
+    )
 
 
 class StoredConversation(StartConversationRequest):

{openhands_agent_server-1.7.2 → openhands_agent_server-1.7.4}/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.2 → openhands_agent_server-1.7.4}/openhands_agent_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openhands-agent-server
-Version: 1.7.2
+Version: 1.7.4
 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.2 → openhands_agent_server-1.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openhands-agent-server"
-version = "1.7.2"
+version = "1.7.4"
 description = "OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent"
 
 requires-python = ">=3.12"