Agent Server UUIDs without hyphens (#960)

Author: tofarr

openhands-agent-server/openhands/agent_server/conversation_service.py

@@ -22,7 +22,6 @@
 from openhands.agent_server.utils import utc_now
 from openhands.sdk import LLM, Event, Message
 from openhands.sdk.conversation.state import AgentExecutionStatus, ConversationState
-from openhands.sdk.utils.cipher import Cipher
 
 
 logger = logging.getLogger(__name__)
@@ -50,7 +49,6 @@ class ConversationService:
     conversations_dir: Path = field()
     webhook_specs: list[WebhookSpec] = field(default_factory=list)
     session_api_key: str | None = field(default=None)
-    cipher: Cipher | None = field(default=None)
     _event_services: dict[UUID, EventService] | None = field(default=None, init=False)
     _conversation_webhook_subscribers: list["ConversationWebhookSubscriber"] = field(
         default_factory=list, init=False
@@ -300,12 +298,7 @@ async def __aenter__(self):
                 if not meta_file.exists():
                     continue
                 json_str = meta_file.read_text()
-                stored = StoredConversation.model_validate_json(
-                    json_str,
-                    context={
-                        "cipher": self.cipher,
-                    },
-                )
+                stored = StoredConversation.model_validate_json(json_str)
                 await self._start_event_service(stored)
             except Exception:
                 logger.exception(
@@ -344,7 +337,6 @@ def get_instance(cls, config: Config) -> "ConversationService":
             session_api_key=(
                 config.session_api_keys[0] if config.session_api_keys else None
             ),
-            cipher=config.cipher,
         )
 
     async def _start_event_service(self, stored: StoredConversation) -> EventService:
@@ -355,7 +347,6 @@ async def _start_event_service(self, stored: StoredConversation) -> EventService
         event_service = EventService(
             stored=stored,
             conversations_dir=self.conversations_dir,
-            cipher=self.cipher,
         )
         # Create subscribers...
         await event_service.subscribe_to_events(_EventSubscriber(service=event_service))

openhands-agent-server/openhands/agent_server/models.py

@@ -2,11 +2,11 @@
 from datetime import datetime
 from enum import Enum
 from typing import Literal
-from uuid import UUID, uuid4
+from uuid import uuid4
 
 from pydantic import BaseModel, Field
 
-from openhands.agent_server.utils import utc_now
+from openhands.agent_server.utils import OpenHandsUUID, utc_now
 from openhands.sdk import LLM, AgentBase, Event, ImageContent, Message, TextContent
 from openhands.sdk.conversation.secret_source import SecretSource
 from openhands.sdk.conversation.state import AgentExecutionStatus, ConversationState
@@ -64,7 +64,7 @@ class StartConversationRequest(BaseModel):
         ...,
         description="Working directory for agent operations and tool execution",
     )
-    conversation_id: UUID | None = Field(
+    conversation_id: OpenHandsUUID | None = Field(
         default=None,
         description=(
             "Optional conversation ID. If not provided, a random UUID will be "
@@ -99,7 +99,7 @@ class StartConversationRequest(BaseModel):
 class StoredConversation(StartConversationRequest):
     """Stored details about a conversation"""
 
-    id: UUID
+    id: OpenHandsUUID
     title: str | None = Field(
         default=None, description="User-defined title for the conversation"
     )
@@ -190,7 +190,7 @@ class GenerateTitleResponse(BaseModel):
 class BashEventBase(DiscriminatedUnionMixin, ABC):
     """Base class for all bash event types"""
 
-    id: UUID = Field(default_factory=uuid4)
+    id: OpenHandsUUID = Field(default_factory=uuid4)
     timestamp: datetime = Field(default_factory=utc_now)
 
 
@@ -213,7 +213,7 @@ class BashOutput(BashEventBase):
     depending on how large the output is.
     """
 
-    command_id: UUID
+    command_id: OpenHandsUUID
     order: int = Field(
         default=0, description="The order for this output, sequentially starting with 0"
     )

openhands-agent-server/openhands/agent_server/utils.py

@@ -1,4 +1,8 @@
 from datetime import UTC, datetime
+from typing import Annotated
+from uuid import UUID
+
+from pydantic import PlainSerializer
 
 
 def utc_now():
@@ -177,3 +181,11 @@ def _patched_openapi(self):
     except (ImportError, AttributeError):
         # FastAPI not available or internal API changed
         pass
+
+
+def _uuid_to_hex(uuid_obj: UUID) -> str:
+    """Converts a UUID object to a hex string without hyphens."""
+    return uuid_obj.hex
+
+
+OpenHandsUUID = Annotated[UUID, PlainSerializer(_uuid_to_hex, when_used="json")]