agent-api-server 2.2.1a3__tar.gz → 2.2.1a4__tar.gz

{agent_api_server-2.2.1a3 → agent_api_server-2.2.1a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-api-server
-Version: 2.2.1a3
+Version: 2.2.1a4
 Summary: A Langgraph agent API server that implements Langgraph agent's web capabilities and can interact with chatbot
 Keywords: fastapi,langgraph,agent,api-server
 Requires-Python: >=3.11,<3.14

{agent_api_server-2.2.1a3 → agent_api_server-2.2.1a4}/adapters/openclaw_adapter/openclaw_adapter.py

@@ -694,7 +694,7 @@ class OpenClawAgentAdapter(BaseAgentAdapter):
         content_parts: list[str] = []
         tool_calls: list[dict[str, Any]] = []
         last_message: ChatMessage | None = None
-        last_tool_message: ChatMessage | None = None
+        last_real_tool_message: ChatMessage | None = None
         event_iterator = agent.execute_stream_typed(query, options=options).__aiter__()
 
         while True:
@@ -708,12 +708,12 @@ class OpenClawAgentAdapter(BaseAgentAdapter):
                 break
             except asyncio.TimeoutError:
                 logger.warning(
-                    "OpenClaw run stream idle timeout without DoneEvent; agent=%s session=%s timeout_s=%s last_message_type=%s last_tool_message=%s",
+                    "OpenClaw run stream idle timeout without DoneEvent; agent=%s session=%s timeout_s=%s last_message_type=%s last_real_tool_message=%s",
                     self.agent_id,
                     session_name,
                     timeout,
                     last_message.type if last_message is not None else None,
-                    last_tool_message is not None,
+                    last_real_tool_message is not None,
                 )
                 break
 
@@ -750,8 +750,8 @@ class OpenClawAgentAdapter(BaseAgentAdapter):
                     session_name=session_name,
                 )
                 last_message = tool_message
-                if self._is_semantic_tool_message(tool_message):
-                    last_tool_message = tool_message
+                if self._is_real_tool_message(tool_message):
+                    last_real_tool_message = tool_message
                 continue
 
             if isinstance(event, DoneEvent):
@@ -773,7 +773,7 @@ class OpenClawAgentAdapter(BaseAgentAdapter):
                     session_name=session_name,
                     tool_calls=tool_calls,
                     last_message=last_message,
-                    last_tool_message=last_tool_message,
+                    last_real_tool_message=last_real_tool_message,
                     extra_metadata={"token_usage": serialize_data(event.token_usage), "stop_reason": event.stop_reason},
                 )
 
@@ -785,7 +785,7 @@ class OpenClawAgentAdapter(BaseAgentAdapter):
             session_name=session_name,
             tool_calls=tool_calls,
             last_message=last_message,
-            last_tool_message=last_tool_message,
+            last_real_tool_message=last_real_tool_message,
         )
 
     def _build_ai_message(
@@ -817,12 +817,12 @@ class OpenClawAgentAdapter(BaseAgentAdapter):
         session_name: str,
         tool_calls: list[dict[str, Any]],
         last_message: ChatMessage | None,
-        last_tool_message: ChatMessage | None,
+        last_real_tool_message: ChatMessage | None,
         extra_metadata: dict[str, Any] | None = None,
     ) -> ChatMessage:
-        if last_tool_message is not None:
-            return last_tool_message.model_copy(
-                update={"response_metadata": {**last_tool_message.response_metadata, **(extra_metadata or {})}}
+        if last_real_tool_message is not None:
+            return last_real_tool_message.model_copy(
+                update={"response_metadata": {**last_real_tool_message.response_metadata, **(extra_metadata or {})}}
             )
 
         if last_message is not None and last_message.type == "ai":
@@ -854,6 +854,21 @@ class OpenClawAgentAdapter(BaseAgentAdapter):
         )
         return not any(re.match(pattern, content) for pattern in low_signal_patterns)
 
+    @staticmethod
+    def _is_real_tool_message(message: ChatMessage) -> bool:
+        content = message.content.strip()
+        if not OpenClawAgentAdapter._is_semantic_tool_message(message):
+            return False
+        if message.content_type != "text":
+            return True
+
+        low_value_status_patterns = (
+            r"^(done|ok|success|completed)\.?$",
+            r"^(analysis|task|job) (done|completed|finished)\.?$",
+            r"^(saved|written) successfully\.?$",
+        )
+        return not any(re.match(pattern, content, re.IGNORECASE) for pattern in low_value_status_patterns)
+
     @staticmethod
     def _resolve_run_completion_idle_timeout_seconds(
         settings: dict[str, Any],

{agent_api_server-2.2.1a3 → agent_api_server-2.2.1a4}/api/thread.py

@@ -57,15 +57,34 @@ def _ensure_thread_ready(state: ThreadState, thread_id: str) -> None:
         )
 
 
+def _thread_agent_conflict(thread_id: str, existing_graph_name: str, requested_graph_name: str) -> HTTPException:
+    return HTTPException(
+        status_code=status.HTTP_409_CONFLICT,
+        detail={
+            "error": "thread_agent_conflict",
+            "message": "Thread is already bound to a different agent",
+            "thread_id": thread_id,
+            "existing_graph_name": existing_graph_name,
+            "requested_graph_name": requested_graph_name,
+        },
+    )
+
+
+def _ensure_thread_matches_graph(
+    state: ThreadState,
+    *,
+    thread_id: str,
+    requested_graph_name: str | None = None,
+) -> None:
+    if requested_graph_name and state.graph_name != requested_graph_name:
+        raise _thread_agent_conflict(thread_id, state.graph_name, requested_graph_name)
+
+
 async def _resolve_thread_for_execution(thread_id: str, request: Request) -> ThreadState:
     graph_name = request.headers.get("X-Agent-Name", "")
     state = await _get_or_create_thread(thread_id, graph_name)
     _ensure_thread_ready(state, thread_id)
-
-    if graph_name:
-        logger.info("Graph name overridden by header: %s", graph_name)
-        state.graph_name = graph_name
-
+    _ensure_thread_matches_graph(state, thread_id=thread_id, requested_graph_name=graph_name or None)
     return state
 
 
@@ -114,6 +133,7 @@ async def _get_or_create_thread(thread_id: str, graph_name: Optional[str] = "")
     storage = AsyncRedisThreadStorage.get_worker_instance()
     thread_data = await storage.get_thread(thread_id)
     if thread_data:
+        _ensure_thread_matches_graph(thread_data, thread_id=thread_id, requested_graph_name=graph_name or None)
         return thread_data
 
     if not graph_name:
@@ -248,10 +268,12 @@ async def create_thread(graph_name: str, thread_id: Optional[str] = None) -> Thr
     if thread_id:
         try:
             state = await _get_existing_thread_or_404(thread_id)
+            _ensure_thread_matches_graph(state, thread_id=thread_id, requested_graph_name=graph_name)
             logger.info("%s already exists, returning existing thread", thread_id)
             return _thread_info(state)
-        except HTTPException:
-            pass
+        except HTTPException as exc:
+            if exc.status_code != status.HTTP_404_NOT_FOUND:
+                raise
 
     storage = None
     thread_state = None

{agent_api_server-2.2.1a3 → agent_api_server-2.2.1a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-api-server"
-version = "2.2.1-alpha3"
+version = "2.2.1-alpha4"
 description = "A Langgraph agent API server that implements Langgraph agent's web capabilities and can interact with chatbot"
 authors = []
 readme = "README.md"

{agent_api_server-2.2.1a3 → agent_api_server-2.2.1a4}/sdk/client.py

@@ -1,4 +1,5 @@
 from typing import Any, AsyncIterator, Iterator
+from uuid import uuid4
 
 from core import AgentDefinition, AgentExecutionContext, AgentFramework, AgentManager, get_agent_manager
 from core import BaseAgentAdapter
@@ -177,6 +178,10 @@ class AgentSDK:
             await self.manager.get_definition(resolved_agent_name)
         return {}
 
+    @staticmethod
+    def _resolve_thread_id(thread_id: str | None) -> str:
+        return thread_id or f"sdk-{uuid4().hex}"
+
     @staticmethod
     def _build_context(
         agent_name: str,
@@ -201,7 +206,7 @@ class AgentSDK:
         self,
         agent_name: str,
         query: str | dict[str, Any],
-        thread_id: str,
+        thread_id: str | None,
         ts_tenant: str | None,
         ei_token: str | None,
         attachments: list[dict[str, Any]] | None,
@@ -209,9 +214,10 @@ class AgentSDK:
         use_system_llm: bool | str | None,
     ) -> tuple[dict[str, Any], AgentExecutionContext]:
         inputs, normalized_attachments = normalize_agent_query(query, attachments)
+        resolved_thread_id = self._resolve_thread_id(thread_id)
         context = self._build_context(
             agent_name=agent_name,
-            thread_id=thread_id,
+            thread_id=resolved_thread_id,
             ts_tenant=ts_tenant,
             ei_token=ei_token,
             attachments=normalized_attachments,
@@ -225,7 +231,7 @@ class AgentSDK:
         agent_name: str | dict[str, Any] | None = None,
         query: str | dict[str, Any] | None = None,
         *,
-        thread_id: str = "sdk",
+        thread_id: str | None = None,
         ts_tenant: str | None = None,
         ei_token: str | None = None,
         attachments: list[dict[str, Any]] | None = None,
@@ -251,7 +257,7 @@ class AgentSDK:
         agent_name: str | dict[str, Any] | None = None,
         query: str | dict[str, Any] | None = None,
         *,
-        thread_id: str = "sdk",
+        thread_id: str | None = None,
         ts_tenant: str | None = None,
         ei_token: str | None = None,
         attachments: list[dict[str, Any]] | None = None,
@@ -277,7 +283,7 @@ class AgentSDK:
         agent_name: str | dict[str, Any] | None = None,
         query: str | dict[str, Any] | None = None,
         *,
-        thread_id: str = "sdk",
+        thread_id: str | None = None,
         ts_tenant: str | None = None,
         ei_token: str | None = None,
         attachments: list[dict[str, Any]] | None = None,
@@ -304,7 +310,7 @@ class AgentSDK:
         agent_name: str | dict[str, Any] | None = None,
         query: str | dict[str, Any] | None = None,
         *,
-        thread_id: str = "sdk",
+        thread_id: str | None = None,
         ts_tenant: str | None = None,
         ei_token: str | None = None,
         attachments: list[dict[str, Any]] | None = None,