lite-agent 0.11.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

lite_agent/agent.py

@@ -41,6 +41,7 @@ class Agent:
         message_transfer: Callable[[RunnerMessages], RunnerMessages] | None = None,
         completion_condition: str = "stop",
         stop_before_tools: list[str] | list[Callable] | None = None,
+        termination_tools: list[str] | list[Callable] | None = None,
     ) -> None:
         self.name = name
         self.instructions = instructions
@@ -58,6 +59,20 @@ class Agent:
         else:
             self.stop_before_functions = set()
 
+        # Convert termination_tools to function names
+        if termination_tools:
+            self.termination_tools = set()
+            for func in termination_tools:
+                if isinstance(func, str):
+                    self.termination_tools.add(func)
+                elif callable(func):
+                    self.termination_tools.add(func.__name__)
+                else:
+                    msg = f"termination_tools must contain strings or callables, got {type(func)}"
+                    raise TypeError(msg)
+        else:
+            self.termination_tools = set()
+
         if isinstance(model, BaseLLMClient):
             # If model is a BaseLLMClient instance, use it directly
             self.client = model

lite_agent/context.py

@@ -0,0 +1,37 @@
+"""Context utilities for injecting history messages into tool calls."""
+
+from __future__ import annotations
+
+from typing import Any, Generic, TypeVar
+
+from pydantic import BaseModel
+
+T = TypeVar("T")
+
+
+class HistoryContext(BaseModel, Generic[T]):
+    """包含历史消息的上下文容器
+
+    这个类会自动被 Runner 用来包装用户的 context，确保工具函数能够访问历史消息。
+
+    Attributes:
+        history_messages: 工具调用前的所有历史消息
+        data: 用户自定义的上下文数据（可选）
+
+    Examples:
+        >>> # 只需要历史消息的工具
+        >>> async def count_messages(ctx: Context[HistoryContext[None]]) -> str:
+        ...     return f"总共 {len(ctx.value.history_messages)} 条消息"
+
+        >>> # 需要历史消息和用户数据的工具
+        >>> class UserData(BaseModel):
+        ...     user_id: str
+        >>>
+        >>> async def analyze_user(ctx: Context[HistoryContext[UserData]]) -> str:
+        ...     messages = ctx.value.history_messages
+        ...     user_id = ctx.value.data.user_id
+        ...     return f"用户 {user_id} 有 {len(messages)} 条消息"
+    """
+
+    history_messages: list[Any]
+    data: T | None = None

lite_agent/runner.py

@@ -1,12 +1,16 @@
 import json
+import inspect
 from collections.abc import AsyncGenerator, Sequence
 from datetime import datetime, timedelta, timezone
 from os import PathLike
 from pathlib import Path
-from typing import Any, Literal, cast
+from typing import Any, Literal, cast, get_args, get_origin
+
+from funcall import Context
 
 from lite_agent.agent import Agent
 from lite_agent.constants import CompletionMode, StreamIncludes, ToolName
+from lite_agent.context import HistoryContext
 from lite_agent.loggers import logger
 from lite_agent.types import (
     AgentChunk,
@@ -109,6 +113,59 @@ class Runner:
         """Normalize record_to parameter to Path object if provided."""
         return Path(record_to) if record_to else None
 
+    def _tool_expects_history_context(self, tool_calls: Sequence["ToolCall"]) -> bool:
+        """Check if any of the tool calls expect HistoryContext in their signatures.
+        
+        Returns True if any tool function has a Context[HistoryContext[...]] parameter,
+        False if they expect Context[...] without HistoryContext wrapper.
+        """
+        if not tool_calls:
+            return False
+            
+        for tool_call in tool_calls:
+            tool_func = self.agent.fc.function_registry.get(tool_call.function.name)
+            if not tool_func:
+                continue
+                
+            # Get function signature
+            sig = inspect.signature(tool_func)
+            
+            # Check each parameter for Context annotation
+            for param in sig.parameters.values():
+                if param.annotation == inspect.Parameter.empty:
+                    continue
+                    
+                # Check if parameter is Context[...]
+                origin = get_origin(param.annotation)
+                if origin is not None:
+                    # Check if it's Context type (compare by string name to handle import differences)
+                    origin_name = getattr(origin, '__name__', str(origin))
+                    if 'Context' in origin_name:
+                        args = get_args(param.annotation)
+                        if args:
+                            # Check if the Context contains HistoryContext
+                            inner_type = args[0]
+                            inner_origin = get_origin(inner_type)
+                            if inner_origin is not None:
+                                inner_name = getattr(inner_origin, '__name__', str(inner_origin))
+                                if 'HistoryContext' in inner_name:
+                                    logger.debug(f"Tool {tool_call.function.name} expects HistoryContext")
+                                    return True
+                            # Also check for direct HistoryContext class
+                            elif hasattr(inner_type, '__name__') and 'HistoryContext' in inner_type.__name__:
+                                logger.debug(f"Tool {tool_call.function.name} expects HistoryContext")
+                                return True
+                
+                # Also handle direct annotation checking
+                if hasattr(param.annotation, '__name__'):
+                    annotation_str = str(param.annotation)
+                    if 'HistoryContext' in annotation_str:
+                        logger.debug(f"Tool {tool_call.function.name} expects HistoryContext (direct)")
+                        return True
+                        
+        logger.debug("No tools expect HistoryContext")
+        return False
+
     async def _handle_tool_calls(self, tool_calls: "Sequence[ToolCall] | None", includes: Sequence[AgentChunkType], context: "Any | None" = None) -> AsyncGenerator[AgentChunk, None]:  # noqa: ANN401
         """Handle tool calls and yield appropriate chunks."""
         if not tool_calls:
@@ -181,6 +238,34 @@ class Runner:
                         )
             return  # Stop processing other tool calls after transfer
 
+        # Check if tools expect HistoryContext wrapper
+        expects_history = self._tool_expects_history_context(tool_calls)
+        
+        if expects_history:
+            # Auto-inject history messages into context for tools that expect HistoryContext
+            if context is not None and not isinstance(context, Context):
+                # If user provided a plain object, wrap it in Context first
+                context = Context(context)
+
+            if isinstance(context, Context):
+                # Extract original value and wrap in HistoryContext
+                original_value = context.value
+                wrapped = HistoryContext(
+                    history_messages=self.messages.copy(),
+                    data=original_value,
+                )
+                context = Context(wrapped)
+            else:
+                # No context provided, create HistoryContext with only history messages
+                wrapped = HistoryContext(history_messages=self.messages.copy())
+                context = Context(wrapped)
+        elif context is not None and not isinstance(context, Context):
+            # Tools don't expect HistoryContext, wrap user object in Context
+            context = Context(context)
+        elif context is None:
+            # Provide empty context for tools that don't expect HistoryContext
+            context = Context(None)
+
         async for tool_call_chunk in self.agent.handle_tool_calls(tool_calls, context=context):
             # if tool_call_chunk.type == "function_call" and tool_call_chunk.type in includes:
             #     yield tool_call_chunk
@@ -270,12 +355,18 @@ class Runner:
 
         def is_finish() -> bool:
             if completion_condition == CompletionMode.CALL:
-                # Check if wait_for_user was called in the last assistant message
+                # Check if any termination tool was called in the last assistant message
                 if self.messages and isinstance(self.messages[-1], NewAssistantMessage):
                     last_message = self.messages[-1]
                     for content_item in last_message.content:
-                        if isinstance(content_item, AssistantToolCallResult) and self._get_tool_call_name_by_id(content_item.call_id) == ToolName.WAIT_FOR_USER:
-                            return True
+                        if isinstance(content_item, AssistantToolCallResult):
+                            tool_name = self._get_tool_call_name_by_id(content_item.call_id)
+                            # Check custom termination tools first, then default wait_for_user
+                            if hasattr(self.agent, "termination_tools") and self.agent.termination_tools:
+                                if tool_name in self.agent.termination_tools:
+                                    return True
+                            elif tool_name == ToolName.WAIT_FOR_USER:
+                                return True
                 return False
             return finish_reason == CompletionMode.STOP
 
@@ -484,9 +575,10 @@ class Runner:
         max_steps: int = 20,
         includes: list[AgentChunkType] | None = None,
         record_to: PathLike | str | None = None,
+        context: Context | None = None,
     ) -> list[AgentChunk]:
         """Run the agent until it completes and return the final message."""
-        resp = self.run(user_input, max_steps, includes, record_to=record_to)
+        resp = self.run(user_input, max_steps, includes, record_to=record_to, context=context)
         return await self._collect_all_chunks(resp)
 
     def _analyze_last_assistant_message(self) -> tuple[list[AssistantToolCall], dict[str, str]]:

{lite_agent-0.11.0.dist-info → lite_agent-0.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lite-agent
-Version: 0.11.0
+Version: 0.13.0
 Summary: A lightweight, extensible framework for building AI agent.
 Author-email: Jianqi Pan <jannchie@gmail.com>
 License: MIT

{lite_agent-0.11.0.dist-info → lite_agent-0.13.0.dist-info}/RECORD

@@ -1,12 +1,13 @@
 lite_agent/__init__.py,sha256=Swuefee0etSiaDnn30K2hBNV9UI3hIValW3A-pRE7e0,338
-lite_agent/agent.py,sha256=UXmQY8vhi_2DIPcWkji0B_pCGlBvZLfx6YoNaUJO6Wc,18028
+lite_agent/agent.py,sha256=gMn-NeQxl0298uKmlJph_c9WP3QN8WeKMEEDuv5RdVw,18681
 lite_agent/chat_display.py,sha256=6gPgutMj7hCUOH6QBcC2f4Bhc93Gdq4vBa_1y6QKt2g,40793
 lite_agent/client.py,sha256=-9BXLhAp3bGJsdKJ02lLpPJeHQKyHKQwhebZ6WCYh_k,9988
 lite_agent/constants.py,sha256=_xIDdQwaJrWk8N_62o-KYEo3jj1waPJ0ZOd3hHybKNo,718
+lite_agent/context.py,sha256=qnqj4JVYL0pkle1YptwM_CXJUWTeLaYtI1_MGtJYaHI,1225
 lite_agent/loggers.py,sha256=XkNkdqwD_nQGfhQJ-bBWT7koci_mMkNw3aBpyMhOICw,57
 lite_agent/message_transfers.py,sha256=N9ViK7Gxqqa1sd3V_hkNuQ9fUipg7M95l-sVBBG2Id4,5357
 lite_agent/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lite_agent/runner.py,sha256=qcKS12JRnzwdBDzOlxn8TNJU9nf4Dz2ZzLvD_7yUt2s,43819
+lite_agent/runner.py,sha256=H6gOeynLyLFr-ZTeEvBReuGdURkCVuP6T919_3AQ1CE,48568
 lite_agent/processors/__init__.py,sha256=ybpAzpMBIE9v5I24wIBZRXeaOaPNTmoKH13aofgNI6Q,234
 lite_agent/processors/completion_event_processor.py,sha256=zoWvs8dfrIkCSITGtS-4Hpve3WFCA0UUsMvYifL2fw0,13010
 lite_agent/processors/response_event_processor.py,sha256=Jr3cj1ItJ8aq9UBhEEjDwWDnPNOZ2ZXjWJ3-g4ghkhM,8514
@@ -29,6 +30,6 @@ lite_agent/utils/message_builder.py,sha256=J-yycL9pXSO9MbgC5NEGqvoP1LC2Nxe9r2YRW
 lite_agent/utils/message_converter.py,sha256=5HmNncTl71TD2M_6Ezz1Tnfavzna8DQYb4-D47Du7mA,9165
 lite_agent/utils/message_state_manager.py,sha256=rFUyqyd_7NdJRtyqsAWGcfwrDIlD6gK2dBDSDx1eGBs,5766
 lite_agent/utils/metrics.py,sha256=RzOEhCWxbLmmIEkzaxOJ6tAdthI8dv2Foc98Lq8afOQ,1915
-lite_agent-0.11.0.dist-info/METADATA,sha256=WRwZ5xKujQt0pJdWvIBvhYQsnedrsW9WUqOseXQiVhU,3538
-lite_agent-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lite_agent-0.11.0.dist-info/RECORD,,
+lite_agent-0.13.0.dist-info/METADATA,sha256=dw2mkbA3X3ZY8bV1xxeW9ybNZnHcFFFXSeTdLl4vuyc,3538
+lite_agent-0.13.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lite_agent-0.13.0.dist-info/RECORD,,