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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentrun-inner-test
-Version: 0.0.12
+Version: 0.0.64
 Summary: Alibaba Cloud Agent Run SDK
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -13,11 +13,14 @@ 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>=5.2.0
 Requires-Dist: alibabacloud_tea_openapi>=0.4.2
+Requires-Dist: alibabacloud_bailian20231229>=2.6.2
+Requires-Dist: agentrun-mem0ai>=0.0.6
 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.64}/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.64"
 
 # Agent Runtime
 from agentrun.agent_runtime import (
@@ -53,6 +55,22 @@ from agentrun.credential import (
     CredentialUpdateInput,
     RelatedResource,
 )
+# Memory Collection
+from agentrun.memory_collection import (
+    EmbedderConfig,
+    EmbedderConfigConfig,
+    LLMConfig,
+    LLMConfigConfig,
+    MemoryCollection,
+    MemoryCollectionClient,
+    MemoryCollectionCreateInput,
+    MemoryCollectionListInput,
+    MemoryCollectionListOutput,
+    MemoryCollectionUpdateInput,
+    NetworkConfiguration,
+    VectorStoreConfig,
+    VectorStoreConfigConfig,
+)
 # Model Service
 from agentrun.model import (
     BackendType,
@@ -87,30 +105,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
@@ -151,6 +189,23 @@ __all__ = [
     "CredentialCreateInput",
     "CredentialUpdateInput",
     "CredentialListInput",
+    ######## Memory Collection ########
+    # base
+    "MemoryCollection",
+    "MemoryCollectionClient",
+    # inner model
+    "EmbedderConfig",
+    "EmbedderConfigConfig",
+    "LLMConfig",
+    "LLMConfigConfig",
+    "NetworkConfiguration",
+    "VectorStoreConfig",
+    "VectorStoreConfigConfig",
+    # api model
+    "MemoryCollectionCreateInput",
+    "MemoryCollectionUpdateInput",
+    "MemoryCollectionListInput",
+    "MemoryCollectionListOutput",
     ######## Model ########
     # base
     "ModelClient",
@@ -188,22 +243,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.64}/agentrun/agent_runtime/__endpoint_async_template.py

@@ -18,6 +18,7 @@ from agentrun.agent_runtime.model import (
     AgentRuntimeEndpointUpdateInput,
 )
 from agentrun.utils.config import Config
+from agentrun.utils.model import PageableInput
 from agentrun.utils.resource import ResourceBase
 
 
@@ -160,6 +161,45 @@ class AgentRuntimeEndpoint(
             config=config,
         )
 
+    @classmethod
+    async def _list_page_async(
+        cls,
+        page_input: PageableInput,
+        config: Optional[Config] = None,
+        **kwargs,
+    ) -> List["AgentRuntimeEndpoint"]:
+        """分页列出端点 / List endpoints by page
+
+        此方法是 ResourceBase 要求实现的抽象方法，用于支持分页查询。
+        This method is an abstract method required by ResourceBase to support pagination.
+
+        Args:
+            page_input: 分页参数 / Pagination parameters
+            config: 配置对象,可选 / Configuration object, optional
+            **kwargs: 其他参数，必须包含 agent_runtime_id / Other parameters, must include agent_runtime_id
+
+        Returns:
+            List[AgentRuntimeEndpoint]: 端点对象列表 / List of endpoint objects
+
+        Raises:
+            ValueError: 当 agent_runtime_id 未提供时 / When agent_runtime_id is not provided
+            HTTPError: HTTP 请求错误 / HTTP request error
+        """
+        agent_runtime_id = kwargs.get("agent_runtime_id")
+        if not agent_runtime_id:
+            raise ValueError(
+                "agent_runtime_id is required for listing endpoints"
+            )
+
+        return await cls.__get_client().list_endpoints_async(
+            agent_runtime_id,
+            AgentRuntimeEndpointListInput(
+                page_number=page_input.page_number,
+                page_size=page_input.page_size,
+            ),
+            config=config,
+        )
+
     @classmethod
     async def list_by_id_async(
         cls, agent_runtime_id: str, config: Optional[Config] = None

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.64}/agentrun/agent_runtime/api/control.py

@@ -35,7 +35,7 @@ from alibabacloud_agentrun20250910.models import (
 )
 from alibabacloud_tea_openapi.exceptions._client import ClientException
 from alibabacloud_tea_openapi.exceptions._server import ServerException
-from alibabacloud_tea_util.models import RuntimeOptions
+from darabonba.runtime import RuntimeOptions
 import pydash
 
 from agentrun.utils.config import Config

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.64}/agentrun/agent_runtime/endpoint.py

@@ -28,6 +28,7 @@ from agentrun.agent_runtime.model import (
     AgentRuntimeEndpointUpdateInput,
 )
 from agentrun.utils.config import Config
+from agentrun.utils.model import PageableInput
 from agentrun.utils.resource import ResourceBase
 
 
@@ -286,6 +287,84 @@ class AgentRuntimeEndpoint(
             config=config,
         )
 
+    @classmethod
+    async def _list_page_async(
+        cls,
+        page_input: PageableInput,
+        config: Optional[Config] = None,
+        **kwargs,
+    ) -> List["AgentRuntimeEndpoint"]:
+        """分页列出端点 / List endpoints by page
+
+        此方法是 ResourceBase 要求实现的抽象方法，用于支持分页查询。
+        This method is an abstract method required by ResourceBase to support pagination.
+
+        Args:
+            page_input: 分页参数 / Pagination parameters
+            config: 配置对象,可选 / Configuration object, optional
+            **kwargs: 其他参数，必须包含 agent_runtime_id / Other parameters, must include agent_runtime_id
+
+        Returns:
+            List[AgentRuntimeEndpoint]: 端点对象列表 / List of endpoint objects
+
+        Raises:
+            ValueError: 当 agent_runtime_id 未提供时 / When agent_runtime_id is not provided
+            HTTPError: HTTP 请求错误 / HTTP request error
+        """
+        agent_runtime_id = kwargs.get("agent_runtime_id")
+        if not agent_runtime_id:
+            raise ValueError(
+                "agent_runtime_id is required for listing endpoints"
+            )
+
+        return await cls.__get_client().list_endpoints_async(
+            agent_runtime_id,
+            AgentRuntimeEndpointListInput(
+                page_number=page_input.page_number,
+                page_size=page_input.page_size,
+            ),
+            config=config,
+        )
+
+    @classmethod
+    def _list_page(
+        cls,
+        page_input: PageableInput,
+        config: Optional[Config] = None,
+        **kwargs,
+    ) -> List["AgentRuntimeEndpoint"]:
+        """分页列出端点 / List endpoints by page
+
+        此方法是 ResourceBase 要求实现的抽象方法，用于支持分页查询。
+        This method is an abstract method required by ResourceBase to support pagination.
+
+        Args:
+            page_input: 分页参数 / Pagination parameters
+            config: 配置对象,可选 / Configuration object, optional
+            **kwargs: 其他参数，必须包含 agent_runtime_id / Other parameters, must include agent_runtime_id
+
+        Returns:
+            List[AgentRuntimeEndpoint]: 端点对象列表 / List of endpoint objects
+
+        Raises:
+            ValueError: 当 agent_runtime_id 未提供时 / When agent_runtime_id is not provided
+            HTTPError: HTTP 请求错误 / HTTP request error
+        """
+        agent_runtime_id = kwargs.get("agent_runtime_id")
+        if not agent_runtime_id:
+            raise ValueError(
+                "agent_runtime_id is required for listing endpoints"
+            )
+
+        return cls.__get_client().list_endpoints(
+            agent_runtime_id,
+            AgentRuntimeEndpointListInput(
+                page_number=page_input.page_number,
+                page_size=page_input.page_size,
+            ),
+            config=config,
+        )
+
     @classmethod
     async def list_by_id_async(
         cls, agent_runtime_id: str, config: Optional[Config] = None

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.64}/agentrun/credential/api/control.py

@@ -25,7 +25,7 @@ from alibabacloud_agentrun20250910.models import (
 )
 from alibabacloud_tea_openapi.exceptions._client import ClientException
 from alibabacloud_tea_openapi.exceptions._server import ServerException
-from alibabacloud_tea_util.models import RuntimeOptions
+from darabonba.runtime import RuntimeOptions
 import pydash
 
 from agentrun.utils.config import Config

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.64}/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.64}/agentrun/integration/agentscope/__init__.py

@@ -3,10 +3,11 @@
 提供 AgentRun 模型与沙箱工具的 AgentScope 适配入口。 / 提供 AgentRun 模型with沙箱工具的 AgentScope 适配入口。
 """
 
-from .builtin import model, sandbox_toolset, toolset
+from .builtin import knowledgebase_toolset, model, sandbox_toolset, toolset
 
 __all__ = [
     "model",
     "toolset",
     "sandbox_toolset",
+    "knowledgebase_toolset",
 ]

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.64}/agentrun/integration/agentscope/builtin.py

@@ -8,6 +8,9 @@ from typing import Any, Callable, List, Optional, Union
 
 from typing_extensions import Unpack
 
+from agentrun.integration.builtin import (
+    knowledgebase_toolset as _knowledgebase_toolset,
+)
 from agentrun.integration.builtin import model as _model
 from agentrun.integration.builtin import ModelArgs
 from agentrun.integration.builtin import sandbox_toolset as _sandbox_toolset
@@ -63,3 +66,23 @@ def sandbox_toolset(
         config=config,
         sandbox_idle_timeout_seconds=sandbox_idle_timeout_seconds,
     ).to_agentscope(prefix=prefix)
+
+
+def knowledgebase_toolset(
+    knowledge_base_names: List[str],
+    *,
+    prefix: Optional[str] = None,
+    modify_tool_name: Optional[Callable[[Tool], Tool]] = None,
+    filter_tools_by_name: Optional[Callable[[str], bool]] = None,
+    config: Optional[Config] = None,
+) -> List[Any]:
+    """将知识库检索封装为 AgentScope 工具列表。 / AgentScope Built-in Integration Functions"""
+
+    return _knowledgebase_toolset(
+        knowledge_base_names=knowledge_base_names,
+        config=config,
+    ).to_agentscope(
+        prefix=prefix,
+        modify_tool_name=modify_tool_name,
+        filter_tools_by_name=filter_tools_by_name,
+    )

{agentrun_inner_test-0.0.12 → agentrun_inner_test-0.0.64}/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.64}/agentrun/integration/builtin/__init__.py

@@ -4,6 +4,7 @@
 This module provides built-in integration functions for quickly creating models and tools.
 """
 
+from .knowledgebase import knowledgebase_toolset
 from .model import model, ModelArgs
 from .sandbox import sandbox_toolset
 from .toolset import toolset
@@ -13,4 +14,5 @@ __all__ = [
     "ModelArgs",
     "toolset",
     "sandbox_toolset",
+    "knowledgebase_toolset",
 ]

agentrun_inner_test-0.0.64/agentrun/integration/builtin/knowledgebase.py

@@ -0,0 +1,137 @@
+"""知识库工具集 / KnowledgeBase ToolSet
+
+提供知识库检索功能的工具集，支持多知识库联合检索。
+Provides toolset for knowledge base retrieval, supporting multi-knowledge-base search.
+"""
+
+from __future__ import annotations
+
+from typing import Any, Dict, List, Optional
+
+from agentrun.integration.utils.tool import CommonToolSet, tool
+from agentrun.knowledgebase import KnowledgeBase
+from agentrun.utils.config import Config
+
+
+class KnowledgeBaseToolSet(CommonToolSet):
+    """知识库工具集 / KnowledgeBase ToolSet
+
+    提供知识库检索功能，支持对多个知识库进行联合检索。
+    Provides knowledge base retrieval capabilities, supporting joint retrieval
+    across multiple knowledge bases.
+
+    使用指南 / Usage Guide:
+    ============================================================
+
+    ## 基本用法 / Basic Usage
+
+    1. **创建工具集 / Create ToolSet**:
+       - 使用 `knowledgebase_toolset` 函数创建工具集实例
+       - Use `knowledgebase_toolset` function to create a toolset instance
+       - 指定要检索的知识库名称列表
+       - Specify the list of knowledge base names to search
+
+    2. **执行检索 / Execute Search**:
+       - 调用 `search_document` 工具进行检索
+       - Call `search_document` tool to perform retrieval
+       - 返回所有指定知识库的检索结果
+       - Returns retrieval results from all specified knowledge bases
+
+    ## 示例 / Examples
+
+    ```python
+    from agentrun.integration.langchain import knowledgebase_toolset
+
+    # 创建工具集 / Create toolset
+    tools = knowledgebase_toolset(
+        knowledge_base_names=["kb-product-docs", "kb-faq"],
+    )
+
+    # 在 Agent 中使用 / Use in Agent
+    agent = create_react_agent(llm, tools)
+    ```
+    """
+
+    def __init__(
+        self,
+        knowledge_base_names: List[str],
+        config: Optional[Config] = None,
+    ) -> None:
+        """初始化知识库工具集 / Initialize KnowledgeBase ToolSet
+
+        Args:
+            knowledge_base_names: 知识库名称列表 / List of knowledge base names
+            config: 配置 / Configuration
+        """
+        super().__init__()
+
+        self.knowledge_base_names = knowledge_base_names
+        self.config = config
+
+    @tool(
+        name="search_document",
+        description=(
+            "Search and retrieve relevant documents from configured knowledge"
+            " bases. Use this tool when you need to find information from the"
+            " knowledge base to answer user questions. Returns relevant"
+            " document chunks with their content and metadata. The search is"
+            " performed across all configured knowledge bases and results are"
+            " grouped by knowledge base name."
+        ),
+    )
+    def search_document(self, query: str) -> Dict[str, Any]:
+        """检索文档 / Search documents
+
+        根据查询文本从配置的知识库中检索相关文档。
+        Retrieves relevant documents from configured knowledge bases based on query text.
+
+        Args:
+            query: 查询文本 / Query text
+
+        Returns:
+            Dict[str, Any]: 检索结果，包含各知识库的检索结果 /
+                           Retrieval results containing results from each knowledge base
+        """
+        return KnowledgeBase.multi_retrieve(
+            query=query,
+            knowledge_base_names=self.knowledge_base_names,
+            config=self.config,
+        )
+
+
+def knowledgebase_toolset(
+    knowledge_base_names: List[str],
+    *,
+    config: Optional[Config] = None,
+) -> KnowledgeBaseToolSet:
+    """创建知识库工具集 / Create KnowledgeBase ToolSet
+
+    将知识库检索功能封装为通用工具集，可转换为各框架支持的格式。
+    Wraps knowledge base retrieval functionality into a common toolset that can be
+    converted to formats supported by various frameworks.
+
+    Args:
+        knowledge_base_names: 知识库名称列表 / List of knowledge base names
+        config: 配置 / Configuration
+
+    Returns:
+        KnowledgeBaseToolSet: 知识库工具集实例 / KnowledgeBase toolset instance
+
+    Example:
+        >>> from agentrun.integration.builtin import knowledgebase_toolset
+        >>>
+        >>> # 创建工具集 / Create toolset
+        >>> kb_tools = knowledgebase_toolset(
+        ...     knowledge_base_names=["kb-docs", "kb-faq"],
+        ... )
+        >>>
+        >>> # 转换为 LangChain 格式 / Convert to LangChain format
+        >>> langchain_tools = kb_tools.to_langchain()
+        >>>
+        >>> # 转换为 Google ADK 格式 / Convert to Google ADK format
+        >>> adk_tools = kb_tools.to_google_adk()
+    """
+    return KnowledgeBaseToolSet(
+        knowledge_base_names=knowledge_base_names,
+        config=config,
+    )