Fixes

Author: Mateusz

src/core/app/controllers/chat_controller.py

@@ -523,6 +523,73 @@ def _ensure_openai_chat_schema(
 
                             return response.model_dump()
 
+                    if metadata and isinstance(metadata, dict):
+                        meta_role = metadata.get("role")
+                        if meta_role == "tool":
+                            import time as _time
+                            import uuid as _uuid
+
+                            tool_call_id = metadata.get("tool_call_id")
+                            finish_reason = metadata.get("finish_reason") or "stop"
+
+                            model_name = str(
+                                metadata.get("model")
+                                or getattr(domain_request, "model", "gpt-4")
+                            )
+                            response_id = str(
+                                metadata.get("id")
+                                or f"chatcmpl-{_uuid.uuid4().hex[:16]}"
+                            )
+                            created_ts = metadata.get("created")
+                            if isinstance(created_ts, int | float):
+                                created_val = int(created_ts)
+                            else:
+                                created_val = int(_time.time())
+
+                            message_metadata = {
+                                k: v
+                                for k, v in metadata.items()
+                                if k
+                                not in {
+                                    "role",
+                                    "tool_call_id",
+                                    "finish_reason",
+                                    "model",
+                                    "id",
+                                    "created",
+                                }
+                            }
+                            if not message_metadata:
+                                message_metadata = None  # type: ignore[assignment]
+
+                            message = ChatCompletionChoiceMessage(
+                                role="tool",
+                                content=str(content or ""),
+                                tool_call_id=(
+                                    str(tool_call_id) if tool_call_id else None
+                                ),
+                                metadata=message_metadata,
+                            )
+
+                            choice = ChatCompletionChoice(
+                                index=0,
+                                message=message,
+                                finish_reason=finish_reason,
+                            )
+
+                            response = ChatResponse(
+                                id=response_id,
+                                created=created_val,
+                                model=model_name,
+                                choices=[choice],
+                                usage=cast(
+                                    "dict[str, Any] | None",
+                                    metadata.get("usage"),
+                                ),
+                            )
+
+                            return response.model_dump()
+
                     # Check if content is a JSON string of tool calls (common backend response format)
                     if isinstance(content, str):
                         try:

src/core/domain/chat.py

@@ -208,13 +208,14 @@ def validate_tools(cls, v: Any) -> list[dict[str, Any]] | None:
         return result
 
 
-class ChatCompletionChoiceMessage(DomainModel):
-    """Represents the message content within a chat completion choice."""
-
-    role: str
-    content: str | None = None
-    tool_calls: list[ToolCall] | None = None
-    metadata: dict[str, Any] | None = None
+class ChatCompletionChoiceMessage(DomainModel):
+    """Represents the message content within a chat completion choice."""
+
+    role: str
+    content: str | None = None
+    tool_calls: list[ToolCall] | None = None
+    tool_call_id: str | None = None
+    metadata: dict[str, Any] | None = None
 
 
 class ChatCompletionChoice(DomainModel):

src/core/ports/streaming.py

@@ -42,15 +42,17 @@ def __init__(
         self.raw_data = raw_data
 
     @property
-    def is_empty(self) -> bool:
-        """Whether this chunk contains no actual content."""
-        if self.content:
-            return False
-        tool_calls = self.metadata.get("tool_calls")
-        if isinstance(tool_calls, list) and tool_calls:
-            return False
-        reasoning_content = self.metadata.get("reasoning_content")
-        if isinstance(reasoning_content, str) and reasoning_content.strip():
+    def is_empty(self) -> bool:
+        """Whether this chunk contains no actual content."""
+        if self.content:
+            return False
+        if self.metadata.get("role") == "tool":
+            return False
+        tool_calls = self.metadata.get("tool_calls")
+        if isinstance(tool_calls, list) and tool_calls:
+            return False
+        reasoning_content = self.metadata.get("reasoning_content")
+        if isinstance(reasoning_content, str) and reasoning_content.strip():
             return False
         reasoning = self.metadata.get("reasoning")
         return not (isinstance(reasoning, str) and reasoning.strip())
@@ -69,13 +71,36 @@ def to_bytes(self) -> bytes:
                 return f"data: {json.dumps(data)}\n\ndata: [DONE]\n\n".encode()
             return b"data: [DONE]\n\n"
 
-        # Simplified serialization for streaming
-        data = {"choices": [{"delta": {"content": self.content}}]}
-
-        # Add metadata if available
-        for key in ["id", "model", "created"]:
-            if key in self.metadata:
-                data[key] = self.metadata[key]
+        # Simplified serialization for streaming
+        delta: dict[str, Any] = {}
+
+        role = self.metadata.get("role")
+        if isinstance(role, str) and role:
+            delta["role"] = role
+
+        tool_call_id = self.metadata.get("tool_call_id")
+        if isinstance(tool_call_id, str) and tool_call_id:
+            delta["tool_call_id"] = tool_call_id
+
+        tool_calls = self.metadata.get("tool_calls")
+        if isinstance(tool_calls, list) and tool_calls:
+            delta["tool_calls"] = tool_calls
+
+        if self.content is not None:
+            delta["content"] = self.content
+
+        data = {"choices": [{"delta": delta}]}
+
+        finish_reason = self.metadata.get("finish_reason")
+        if finish_reason is not None:
+            data["choices"][0]["finish_reason"] = finish_reason
+        else:
+            data["choices"][0]["finish_reason"] = None
+
+        # Add metadata if available
+        for key in ["id", "model", "created"]:
+            if key in self.metadata:
+                data[key] = self.metadata[key]
 
         return f"data: {json.dumps(data)}\n\n".encode()
 

src/core/repositories/in_memory_session_repository.py

@@ -93,7 +93,10 @@ async def delete(self, id: str) -> bool:
             # Remove from user tracking
             for user_id, session_ids in list(self._user_sessions.items()):
                 if id in session_ids:
-                    session_ids.remove(id)
+                    try:
+                        session_ids.remove(id)
+                    except ValueError:
+                        pass  # Already removed, consistent state is the goal
                     if not session_ids:
                         del self._user_sessions[user_id]
 
@@ -106,7 +109,10 @@ async def delete(self, id: str) -> bool:
             # Remove from client session tracking
             for client_key, session_ids in list(self._client_sessions.items()):
                 if id in session_ids:
-                    session_ids.remove(id)
+                    try:
+                        session_ids.remove(id)
+                    except ValueError:
+                        pass  # Already removed
                     if not session_ids:
                         del self._client_sessions[client_key]