agentrun-inner-test 0.0.12__tar.gz → 0.0.40__tar.gz

{agentrun_inner_test-0.0.12/agentrun_inner_test.egg-info → agentrun_inner_test-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentrun-inner-test
-Version: 0.0.12
+Version: 0.0.40
 Summary: Alibaba Cloud Agent Run SDK
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -13,11 +13,12 @@ Requires-Dist: typing-extensions>=4.15.0
 Requires-Dist: litellm>=1.79.3
 Requires-Dist: alibabacloud-devs20230714>=2.4.1
 Requires-Dist: pydash>=8.0.5
-Requires-Dist: alibabacloud-agentrun20250910>=4.0.1
+Requires-Dist: alibabacloud-agentrun20250910>=4.0.3
 Requires-Dist: alibabacloud_tea_openapi>=0.4.2
 Provides-Extra: server
 Requires-Dist: fastapi>=0.104.0; extra == "server"
 Requires-Dist: uvicorn>=0.24.0; extra == "server"
+Requires-Dist: ag-ui-protocol>=0.1.10; extra == "server"
 Provides-Extra: langchain
 Requires-Dist: langchain>=1.0.0; python_version >= "3.10" and extra == "langchain"
 Requires-Dist: langchain-openai>=1.0.0; python_version >= "3.10" and extra == "langchain"

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.40}/agentrun/__init__.py

@@ -16,7 +16,9 @@ Provides simple and easy-to-use APIs for managing AI Agent runtime environments,
 - Integration: 框架集成 / Framework integration
 """
 
-__version__ = "0.0.12"
+from typing import TYPE_CHECKING
+
+__version__ = "0.0.40"
 
 # Agent Runtime
 from agentrun.agent_runtime import (
@@ -87,30 +89,50 @@ from agentrun.sandbox import (
     SandboxClient,
     Template,
 )
-# Server
-from agentrun.server import (
-    AgentRequest,
-    AgentResponse,
-    AgentResult,
-    AgentRunServer,
-    AgentStreamIterator,
-    AgentStreamResponse,
-    AsyncInvokeAgentHandler,
-    InvokeAgentHandler,
-    Message,
-    MessageRole,
-    OpenAIProtocolHandler,
-    ProtocolHandler,
-    SyncInvokeAgentHandler,
-)
 # ToolSet
 from agentrun.toolset import ToolSet, ToolSetClient
+from agentrun.utils.config import Config
 from agentrun.utils.exception import (
     ResourceAlreadyExistError,
     ResourceNotExistError,
 )
 from agentrun.utils.model import Status
 
+# Server - 延迟导入以避免可选依赖问题
+# Type hints for IDE and type checkers
+if TYPE_CHECKING:
+    from agentrun.server import (
+        AgentEvent,
+        AgentEventItem,
+        AgentRequest,
+        AgentResult,
+        AgentResultItem,
+        AgentReturnType,
+        AgentRunServer,
+        AguiEventNormalizer,
+        AGUIProtocolConfig,
+        AGUIProtocolHandler,
+        AsyncAgentEventGenerator,
+        AsyncAgentResultGenerator,
+        AsyncInvokeAgentHandler,
+        BaseProtocolHandler,
+        EventType,
+        InvokeAgentHandler,
+        MergeOptions,
+        Message,
+        MessageRole,
+        OpenAIProtocolConfig,
+        OpenAIProtocolHandler,
+        ProtocolConfig,
+        ProtocolHandler,
+        ServerConfig,
+        SyncAgentEventGenerator,
+        SyncAgentResultGenerator,
+        SyncInvokeAgentHandler,
+        Tool,
+        ToolCall,
+    )
+
 __all__ = [
     ######## Agent Runtime ########
     # base
@@ -188,22 +210,116 @@ __all__ = [
     ######## ToolSet ########
     "ToolSetClient",
     "ToolSet",
-    ######## Server ########
+    ######## Server (延迟加载) ########
+    # Server
     "AgentRunServer",
+    # Config
+    "ServerConfig",
+    "ProtocolConfig",
+    "OpenAIProtocolConfig",
+    "AGUIProtocolConfig",
+    # Request/Response Models
     "AgentRequest",
-    "AgentResponse",
+    "AgentEvent",
     "AgentResult",
-    "AgentStreamResponse",
+    "Message",
+    "MessageRole",
+    "Tool",
+    "ToolCall",
+    # Event Types
+    "EventType",
+    # Type Aliases
+    "AgentEventItem",
+    "AgentResultItem",
+    "AgentReturnType",
+    "SyncAgentEventGenerator",
+    "SyncAgentResultGenerator",
+    "AsyncAgentEventGenerator",
+    "AsyncAgentResultGenerator",
     "InvokeAgentHandler",
     "AsyncInvokeAgentHandler",
     "SyncInvokeAgentHandler",
-    "Message",
-    "MessageRole",
+    # Protocol Base
     "ProtocolHandler",
+    "BaseProtocolHandler",
+    # Protocol - OpenAI
     "OpenAIProtocolHandler",
-    "AgentStreamIterator",
+    # Protocol - AG-UI
+    "AGUIProtocolHandler",
+    # Event Normalizer
+    "AguiEventNormalizer",
+    # Helpers
+    "MergeOptions",
     ######## Others ########
-    "Status",
     "ResourceNotExistError",
     "ResourceAlreadyExistError",
+    "Config",
 ]
+
+# Server 模块的所有导出
+_SERVER_EXPORTS = {
+    "AgentRunServer",
+    "ServerConfig",
+    "ProtocolConfig",
+    "OpenAIProtocolConfig",
+    "AGUIProtocolConfig",
+    "AgentRequest",
+    "AgentEvent",
+    "AgentResult",
+    "Message",
+    "MessageRole",
+    "Tool",
+    "ToolCall",
+    "EventType",
+    "AgentEventItem",
+    "AgentResultItem",
+    "AgentReturnType",
+    "SyncAgentEventGenerator",
+    "SyncAgentResultGenerator",
+    "AsyncAgentEventGenerator",
+    "AsyncAgentResultGenerator",
+    "InvokeAgentHandler",
+    "AsyncInvokeAgentHandler",
+    "SyncInvokeAgentHandler",
+    "ProtocolHandler",
+    "BaseProtocolHandler",
+    "OpenAIProtocolHandler",
+    "AGUIProtocolHandler",
+    "AguiEventNormalizer",
+    "MergeOptions",
+}
+
+# 可选依赖包映射：安装命令 -> 导入错误的包名列表
+# Optional dependency mapping: installation command -> list of import error package names
+# 将使用相同安装命令的包合并到一起 / Group packages with the same installation command
+_OPTIONAL_PACKAGES = {
+    "agentrun-sdk[server]": ["fastapi", "uvicorn", "ag_ui"],
+}
+
+
+def __getattr__(name: str):
+    """延迟加载 server 模块的导出，避免可选依赖导致导入失败
+
+    当用户访问 server 相关的类时，才尝试导入 server 模块。
+    如果 server 可选依赖未安装，会抛出清晰的错误提示。
+    """
+    if name in _SERVER_EXPORTS:
+        try:
+            from agentrun import server
+
+            return getattr(server, name)
+        except ImportError as e:
+            # 检查是否是缺少可选依赖导致的错误
+            error_str = str(e)
+            for install_cmd, package_names in _OPTIONAL_PACKAGES.items():
+                for package_name in package_names:
+                    if package_name in error_str:
+                        raise ImportError(
+                            f"'{name}' requires the 'server' optional"
+                            " dependencies. Install with: pip install"
+                            f" {install_cmd}\nOriginal error: {e}"
+                        ) from e
+            # 其他导入错误继续抛出
+            raise
+
+    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.40}/agentrun/credential/model.py

@@ -134,7 +134,7 @@ class CredentialConfig(CredentialConfigInner):
         cls,
         provider: str,
         access_key_id: str,
-        access_key_secred: str,
+        access_key_secret: str,
         account_id: str,
     ):
         """配置访问第三方工具的 ak/sk 凭证"""
@@ -148,7 +148,7 @@ class CredentialConfig(CredentialConfigInner):
                     "accountId": account_id,
                 },
             },
-            credential_secret=access_key_secred,
+            credential_secret=access_key_secret,
         )
 
     @classmethod

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.40}/agentrun/integration/agentscope/model_adapter.py

@@ -51,7 +51,7 @@ class AgentScopeModelAdapter(ModelAdapter):
         return OpenAIChatModel(
             model_name=info.model or "",
             api_key=info.api_key,
-            stream=False,
+            stream=True,
             client_args={
                 "base_url": info.base_url,
                 "http_client": AsyncClient(headers=info.headers),

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.40}/agentrun/integration/builtin/model.py

@@ -69,29 +69,25 @@ def model(
     backend_type = kwargs.get("backend_type")
     model = kwargs.get("model")
 
+    if isinstance(input, str):
+        from agentrun.model.client import ModelClient
+
+        client = ModelClient(config=config)
+        input = client.get(name=input, backend_type=backend_type, config=config)
+
     if isinstance(input, ModelProxy):
         return CommonModel(
-            model=model or "",
             model_obj=input,
             backend_type=BackendType.PROXY,
+            specific_model=model,
             config=config,
         )
     elif isinstance(input, ModelService):
         return CommonModel(
-            model=model or "",
             model_obj=input,
             backend_type=BackendType.SERVICE,
+            specific_model=model,
             config=config,
         )
-
-    from agentrun.model.client import ModelClient
-
-    client = ModelClient(config=config)
-    model_obj = client.get(name=input, backend_type=backend_type, config=config)
-
-    return CommonModel(
-        model=input,
-        model_obj=model_obj,
-        backend_type=backend_type,
-        config=config,
-    )
+    else:
+        raise TypeError("input must be str, ModelProxy or ModelService")

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.40}/agentrun/integration/google_adk/tool_adapter.py

@@ -6,6 +6,7 @@ from typing import Any, Dict, List, Optional
 
 from agentrun.integration.utils.adapter import ToolAdapter
 from agentrun.integration.utils.canonical import CanonicalTool
+from agentrun.integration.utils.tool import normalize_tool_name
 
 
 def _json_schema_to_google_schema(
@@ -179,7 +180,7 @@ class GoogleADKToolAdapter(ToolAdapter):
 
     def get_registered_tool(self, name: str) -> Optional[CanonicalTool]:
         """根据名称获取最近注册的工具定义 / Google ADK Tool Adapter"""
-        return self._registered_tools.get(name)
+        return self._registered_tools.get(normalize_tool_name(name))
 
     def from_canonical(self, tools: List[CanonicalTool]):
         """将标准格式转换为 Google ADK 工具 / Google ADK Tool Adapter
@@ -207,7 +208,7 @@ class GoogleADKToolAdapter(ToolAdapter):
 
             # 创建 FunctionDeclaration
             declaration = types.FunctionDeclaration(
-                name=tool.name,
+                name=normalize_tool_name(tool.name),
                 description=tool.description or "",
                 parameters=google_schema,
             )

agentrun_inner_test-0.0.40/agentrun/integration/langchain/__init__.py

@@ -0,0 +1,30 @@
+"""LangChain 集成模块
+
+使用 AgentRunConverter 将 LangChain 事件转换为 AG-UI 协议事件：
+
+    >>> from agentrun.integration.langchain import AgentRunConverter
+    >>>
+    >>> async def invoke_agent(request: AgentRequest):
+    ...     converter = AgentRunConverter()
+    ...     async for event in agent.astream_events(input_data, version="v2"):
+    ...         for item in converter.convert(event):
+    ...             yield item
+
+支持多种调用方式：
+- agent.astream_events(input, version="v2") - 支持 token by token
+- agent.stream(input, stream_mode="updates") - 按节点输出
+- agent.astream(input, stream_mode="updates") - 异步按节点输出
+"""
+
+from agentrun.integration.langgraph.agent_converter import (
+    AgentRunConverter,
+)  # 向后兼容
+
+from .builtin import model, sandbox_toolset, toolset
+
+__all__ = [
+    "AgentRunConverter",
+    "model",
+    "toolset",
+    "sandbox_toolset",
+]

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.40}/agentrun/integration/langchain/model_adapter.py

@@ -23,7 +23,6 @@ class LangChainModelAdapter(ModelAdapter):
 
     def wrap_model(self, common_model: Any) -> Any:
         """包装 CommonModel 为 LangChain BaseChatModel / LangChain Model Adapter"""
-        from httpx import AsyncClient
         from langchain_openai import ChatOpenAI
 
         info = common_model.get_model_info()  # 确保模型可用
@@ -32,6 +31,7 @@ class LangChainModelAdapter(ModelAdapter):
             api_key=info.api_key,
             model=info.model,
             base_url=info.base_url,
-            async_client=AsyncClient(headers=info.headers),
+            default_headers=info.headers,
             stream_usage=True,
+            streaming=True,  # 启用流式输出以支持 token by token
         )

agentrun_inner_test-0.0.40/agentrun/integration/langgraph/__init__.py

@@ -0,0 +1,35 @@
+"""LangGraph 集成模块
+
+使用 AgentRunConverter 将 LangGraph 事件转换为 AG-UI 协议事件：
+
+    >>> from agentrun.integration.langgraph import AgentRunConverter
+    >>>
+    >>> async def invoke_agent(request: AgentRequest):
+    ...     converter = AgentRunConverter()
+    ...     async for event in agent.astream_events(input_data, version="v2"):
+    ...         for item in converter.convert(event):
+    ...             yield item
+
+或使用静态方法（无状态）：
+
+    >>> from agentrun.integration.langgraph import AgentRunConverter
+    >>>
+    >>> async for event in agent.astream_events(input_data, version="v2"):
+    ...     for item in AgentRunConverter.to_agui_events(event):
+    ...         yield item
+
+支持多种调用方式：
+- agent.astream_events(input, version="v2") - 支持 token by token
+- agent.stream(input, stream_mode="updates") - 按节点输出
+- agent.astream(input, stream_mode="updates") - 异步按节点输出
+"""
+
+from .agent_converter import AgentRunConverter
+from .builtin import model, sandbox_toolset, toolset
+
+__all__ = [
+    "AgentRunConverter",
+    "model",
+    "toolset",
+    "sandbox_toolset",
+]