agentrun-inner-test 0.0.46__py3-none-any.whl → 0.0.56__py3-none-any.whl

agentrun/knowledgebase/model.py

@@ -0,0 +1,270 @@
+"""KnowledgeBase 模型定义 / KnowledgeBase Model Definitions
+
+定义知识库相关的数据模型和枚举。
+Defines data models and enumerations related to knowledge bases.
+"""
+
+from enum import Enum
+from typing import Any, Dict, List, Optional, Union
+
+from agentrun.utils.config import Config
+from agentrun.utils.model import BaseModel, PageableInput
+
+
+class KnowledgeBaseProvider(str, Enum):
+    """知识库提供商类型 / KnowledgeBase Provider Type"""
+
+    RAGFLOW = "ragflow"
+    """RagFlow 知识库 / RagFlow knowledge base"""
+    BAILIAN = "bailian"
+    """百炼知识库 / Bailian knowledge base"""
+
+
+# =============================================================================
+# RagFlow 配置模型 / RagFlow Configuration Models
+# =============================================================================
+
+
+class RagFlowProviderSettings(BaseModel):
+    """RagFlow 提供商设置 / RagFlow Provider Settings"""
+
+    base_url: str
+    """RagFlow 服务地址，http或https开头，最后不能有/
+    RagFlow service URL, starting with http or https, no trailing slash"""
+    dataset_ids: List[str]
+    """RagFlow 知识库 ID 列表，可以填写多个
+    List of RagFlow dataset IDs, multiple values allowed"""
+
+
+class RagFlowRetrieveSettings(BaseModel):
+    """RagFlow 检索设置 / RagFlow Retrieve Settings"""
+
+    similarity_threshold: Optional[float] = None
+    """相似度阈值 / Similarity threshold"""
+    vector_similarity_weight: Optional[float] = None
+    """向量相似度权重 / Vector similarity weight"""
+    cross_languages: Optional[List[str]] = None
+    """跨语言检索语言列表，如 ["English", "Chinese"]
+    Cross-language retrieval languages, e.g. ["English", "Chinese"]"""
+
+
+# =============================================================================
+# Bailian 配置模型 / Bailian Configuration Models
+# =============================================================================
+
+
+class BailianProviderSettings(BaseModel):
+    """百炼提供商设置 / Bailian Provider Settings"""
+
+    workspace_id: str
+    """百炼工作空间 ID / Bailian workspace ID"""
+    index_ids: List[str]
+    """绑定的知识库索引列表 / List of bound knowledge base index IDs"""
+
+
+class BailianRetrieveSettings(BaseModel):
+    """百炼检索设置 / Bailian Retrieve Settings"""
+
+    dense_similarity_top_k: Optional[int] = None
+    """稠密向量检索返回的 Top K 数量 / Dense similarity top K"""
+    sparse_similarity_top_k: Optional[int] = None
+    """稀疏向量检索返回的 Top K 数量 / Sparse similarity top K"""
+    rerank_min_score: Optional[float] = None
+    """重排序最低分数阈值 / Rerank minimum score threshold"""
+    rerank_top_n: Optional[int] = None
+    """重排序返回的 Top N 数量 / Rerank top N"""
+
+
+# =============================================================================
+# 联合类型定义 / Union Type Definitions
+# =============================================================================
+
+ProviderSettings = Union[
+    RagFlowProviderSettings, BailianProviderSettings, Dict[str, Any]
+]
+"""提供商设置联合类型 / Provider settings union type"""
+
+RetrieveSettings = Union[
+    RagFlowRetrieveSettings, BailianRetrieveSettings, Dict[str, Any]
+]
+"""检索设置联合类型 / Retrieve settings union type"""
+
+
+# =============================================================================
+# 知识库属性模型 / KnowledgeBase Property Models
+# =============================================================================
+
+
+class KnowledgeBaseMutableProps(BaseModel):
+    """知识库可变属性 / KnowledgeBase Mutable Properties"""
+
+    description: Optional[str] = None
+    """描述 / Description"""
+    credential_name: Optional[str] = None
+    """凭证名称 / Credential name"""
+    provider_settings: Optional[Union[ProviderSettings, Dict[str, Any]]] = None
+    """提供商设置 / Provider settings"""
+    retrieve_settings: Optional[Union[RetrieveSettings, Dict[str, Any]]] = None
+    """检索设置 / Retrieve settings"""
+
+
+class KnowledgeBaseImmutableProps(BaseModel):
+    """知识库不可变属性 / KnowledgeBase Immutable Properties"""
+
+    knowledge_base_name: Optional[str] = None
+    """知识库名称 / KnowledgeBase name"""
+    provider: Optional[Union[KnowledgeBaseProvider, str]] = None
+    """提供商 / Provider"""
+
+
+class KnowledgeBaseSystemProps(BaseModel):
+    """知识库系统属性 / KnowledgeBase System Properties"""
+
+    knowledge_base_id: Optional[str] = None
+    """知识库 ID / KnowledgeBase ID"""
+    created_at: Optional[str] = None
+    """创建时间 / Created at"""
+    last_updated_at: Optional[str] = None
+    """最后更新时间 / Last updated at"""
+
+
+# =============================================================================
+# API 输入输出模型 / API Input/Output Models
+# =============================================================================
+
+
+class KnowledgeBaseCreateInput(
+    KnowledgeBaseImmutableProps, KnowledgeBaseMutableProps
+):
+    """知识库创建输入参数 / KnowledgeBase Create Input"""
+
+    knowledge_base_name: str  # type: ignore
+    """知识库名称（必填）/ KnowledgeBase name (required)"""
+    provider: Union[KnowledgeBaseProvider, str]  # type: ignore
+    """提供商（必填）/ Provider (required)"""
+    provider_settings: Union[ProviderSettings, Dict[str, Any]]  # type: ignore
+    """提供商设置（必填）/ Provider settings (required)"""
+
+
+class KnowledgeBaseUpdateInput(KnowledgeBaseMutableProps):
+    """知识库更新输入参数 / KnowledgeBase Update Input"""
+
+    pass
+
+
+class KnowledgeBaseListInput(PageableInput):
+    """知识库列表查询输入参数 / KnowledgeBase List Input"""
+
+    provider: Optional[Union[KnowledgeBaseProvider, str]] = None
+    """提供商 / Provider"""
+
+
+class KnowledgeBaseListOutput(BaseModel):
+    """知识库列表查询输出 / KnowledgeBase List Output"""
+
+    knowledge_base_id: Optional[str] = None
+    """知识库 ID / KnowledgeBase ID"""
+    knowledge_base_name: Optional[str] = None
+    """知识库名称 / KnowledgeBase name"""
+    provider: Optional[Union[KnowledgeBaseProvider, str]] = None
+    """提供商 / Provider"""
+    description: Optional[str] = None
+    """描述 / Description"""
+    credential_name: Optional[str] = None
+    """凭证名称 / Credential name"""
+    provider_settings: Optional[Union[ProviderSettings, Dict[str, Any]]] = None
+    """提供商设置 / Provider settings"""
+    retrieve_settings: Optional[Union[RetrieveSettings, Dict[str, Any]]] = None
+    """检索设置 / Retrieve settings"""
+    created_at: Optional[str] = None
+    """创建时间 / Created at"""
+    last_updated_at: Optional[str] = None
+    """最后更新时间 / Last updated at"""
+
+    async def to_knowledge_base_async(self, config: Optional[Config] = None):
+        """转换为知识库对象（异步）/ Convert to KnowledgeBase object (async)
+
+        Args:
+            config: 配置 / Configuration
+
+        Returns:
+            KnowledgeBase: 知识库对象 / KnowledgeBase object
+        """
+        from .client import KnowledgeBaseClient
+
+        return await KnowledgeBaseClient(config).get_async(
+            self.knowledge_base_name or "", config=config
+        )
+
+    def to_knowledge_base(self, config: Optional[Config] = None):
+        """转换为知识库对象（同步）/ Convert to KnowledgeBase object (sync)
+
+        Args:
+            config: 配置 / Configuration
+
+        Returns:
+            KnowledgeBase: 知识库对象 / KnowledgeBase object
+        """
+        from .client import KnowledgeBaseClient
+
+        return KnowledgeBaseClient(config).get(
+            self.knowledge_base_name or "", config=config
+        )
+
+
+class RetrieveInput(BaseModel):
+    """知识库检索输入参数 / KnowledgeBase Retrieve Input
+
+    用于多知识库检索的输入参数。
+    Input parameters for multi-knowledge base retrieval.
+    """
+
+    knowledge_base_names: List[str]
+    """知识库名称列表 / List of knowledge base names"""
+    query: str
+    """查询文本 / Query text"""
+
+    knowledge_base_id: Optional[str] = None
+    """知识库 ID / KnowledgeBase ID"""
+    knowledge_base_name: Optional[str] = None
+    """知识库名称 / KnowledgeBase name"""
+    provider: Optional[str] = None
+    """提供商 / Provider"""
+    description: Optional[str] = None
+    """描述 / Description"""
+    credential_name: Optional[str] = None
+    """凭证名称 / Credential name"""
+    created_at: Optional[str] = None
+    """创建时间 / Created at"""
+    last_updated_at: Optional[str] = None
+    """最后更新时间 / Last updated at"""
+
+    async def to_knowledge_base_async(self, config: Optional[Config] = None):
+        """转换为知识库对象（异步）/ Convert to KnowledgeBase object (async)
+
+        Args:
+            config: 配置 / Configuration
+
+        Returns:
+            KnowledgeBase: 知识库对象 / KnowledgeBase object
+        """
+        from .client import KnowledgeBaseClient
+
+        return await KnowledgeBaseClient(config).get_async(
+            self.knowledge_base_name or "", config=config
+        )
+
+    def to_knowledge_base(self, config: Optional[Config] = None):
+        """转换为知识库对象（同步）/ Convert to KnowledgeBase object (sync)
+
+        Args:
+            config: 配置 / Configuration
+
+        Returns:
+            KnowledgeBase: 知识库对象 / KnowledgeBase object
+        """
+        from .client import KnowledgeBaseClient
+
+        return KnowledgeBaseClient(config).get(
+            self.knowledge_base_name or "", config=config
+        )

agentrun/model/api/control.py

@@ -32,7 +32,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/sandbox/aio_sandbox.py

@@ -763,8 +763,7 @@ class AioSandbox(Sandbox):
 
             except Exception as e:
                 logger.error(
-                    f"[{retry_count}/{max_retries}] Health check failed,"
-                    f" retrying: {e}"
+                    f"[{retry_count}/{max_retries}] Health check failed: {e}"
                 )
 
             if retry_count < max_retries:
@@ -806,8 +805,12 @@ class AioSandbox(Sandbox):
         """Check sandbox health status (async)."""
         return await self.data_api.check_health_async()
 
+    # ========================================
+    # Browser API Methods
+    # ========================================
+
     def check_health(self):
-        """Check sandbox health status (sync)."""
+        """Check sandbox health status (async)."""
         return self.data_api.check_health()
 
     # ========================================
@@ -868,8 +871,12 @@ class AioSandbox(Sandbox):
         """Delete a recording file (async)."""
         return await self.data_api.delete_recording_async(filename)
 
+    # ========================================
+    # Code Interpreter API Properties
+    # ========================================
+
     def delete_recording(self, filename: str):
-        """Delete a recording file (sync)."""
+        """Delete a recording file (async)."""
         return self.data_api.delete_recording(filename)
 
     # ========================================

agentrun/sandbox/api/control.py

@@ -30,7 +30,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/sandbox/browser_sandbox.py

@@ -51,7 +51,7 @@ class BrowserSandbox(Sandbox):
 
                 logger.debug(
                     f"[{retry_count}/{max_retries}] Health status:"
-                    f" {health.get('code')} { health.get('message')}",
+                    f" {health.get('code')} {health.get('message')}",
                 )
 
             except Exception as e:
@@ -88,7 +88,7 @@ class BrowserSandbox(Sandbox):
 
                 logger.debug(
                     f"[{retry_count}/{max_retries}] Health status:"
-                    f" {health.get('code')} { health.get('message')}",
+                    f" {health.get('code')} {health.get('message')}",
                 )
 
             except Exception as e:

agentrun/sandbox/model.py

@@ -337,19 +337,6 @@ class TemplateInput(BaseModel):
                     f"the current disk size is {self.disk_size}"
                 )
 
-        if (
-            self.template_type == TemplateType.CODE_INTERPRETER
-            or self.template_type == TemplateType.AIO
-        ):
-            if (
-                self.network_configuration
-                and self.network_configuration.network_mode
-                == TemplateNetworkMode.PRIVATE
-            ):
-                raise ValueError(
-                    "when template_type is CODE_INTERPRETER，"
-                    "network_mode cannot be PRIVATE"
-                )
         return self
 
 

agentrun/toolset/api/control.py

@@ -21,7 +21,7 @@ from alibabacloud_devs20230714.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/toolset/toolset.py

@@ -22,6 +22,7 @@ from agentrun.utils.config import Config
 from agentrun.utils.log import logger
 from agentrun.utils.model import BaseModel
 
+from .api.openapi import OpenAPI
 from .model import (
     MCPServerConfig,
     SchemaType,

agentrun/utils/__data_api_async_template.py

@@ -25,6 +25,7 @@ class ResourceType(Enum):
     Tool = "tool"
     Template = "template"
     Sandbox = "sandbox"
+    KnowledgeBase = "knowledgebase"
 
 
 class DataAPI:

agentrun/utils/config.py

@@ -61,6 +61,7 @@ class Config:
         "_control_endpoint",
         "_data_endpoint",
         "_devs_endpoint",
+        "_bailian_endpoint",
         "_headers",
         "__weakref__",
     )
@@ -78,6 +79,7 @@ class Config:
         control_endpoint: Optional[str] = None,
         data_endpoint: Optional[str] = None,
         devs_endpoint: Optional[str] = None,
+        bailian_endpoint: Optional[str] = None,
         headers: Optional[Dict[str, str]] = None,
     ) -> None:
         """初始化配置 / Initialize configuration
@@ -135,6 +137,8 @@ class Config:
             data_endpoint = get_env_with_default("", "AGENTRUN_DATA_ENDPOINT")
         if devs_endpoint is None:
             devs_endpoint = get_env_with_default("", "DEVS_ENDPOINT")
+        if bailian_endpoint is None:
+            bailian_endpoint = get_env_with_default("", "BAILIAN_ENDPOINT")
 
         self._access_key_id = access_key_id
         self._access_key_secret = access_key_secret
@@ -147,6 +151,7 @@ class Config:
         self._control_endpoint = control_endpoint
         self._data_endpoint = data_endpoint
         self._devs_endpoint = devs_endpoint
+        self._bailian_endpoint = bailian_endpoint
         self._headers = headers or {}
 
     @classmethod
@@ -253,6 +258,13 @@ class Config:
 
         return f"https://devs.{self.get_region_id()}.aliyuncs.com"
 
+    def get_bailian_endpoint(self) -> str:
+        """获取百炼端点 / Get Bailian endpoint"""
+        if self._bailian_endpoint:
+            return self._bailian_endpoint
+
+        return "https://bailian.cn-beijing.aliyuncs.com"
+
     def get_headers(self) -> Dict[str, str]:
         """获取自定义请求头"""
         return self._headers or {}

agentrun/utils/control_api.py

@@ -7,6 +7,7 @@ This module defines the base class for control API.
 from typing import Optional
 
 from alibabacloud_agentrun20250910.client import Client as AgentRunClient
+from alibabacloud_bailian20231229.client import Client as BailianClient
 from alibabacloud_devs20230714.client import Client as DevsClient
 from alibabacloud_tea_openapi import utils_models as open_api_util_models
 
@@ -76,3 +77,29 @@ class ControlAPI:
                 read_timeout=cfg.get_read_timeout(),  # type: ignore
             )
         )
+
+    def _get_bailian_client(
+        self, config: Optional[Config] = None
+    ) -> "BailianClient":
+        """
+        获取百炼 API 客户端实例 / Get Bailian API client instance
+
+        Returns:
+            BailianClient: 百炼 API 客户端实例 / Bailian API client instance
+        """
+
+        cfg = Config.with_configs(self.config, config)
+        endpoint = cfg.get_bailian_endpoint()
+        if endpoint.startswith("http://") or endpoint.startswith("https://"):
+            endpoint = endpoint.split("://", 1)[1]
+        return BailianClient(
+            open_api_util_models.Config(
+                access_key_id=cfg.get_access_key_id(),
+                access_key_secret=cfg.get_access_key_secret(),
+                security_token=cfg.get_security_token(),
+                region_id=cfg.get_region_id(),
+                endpoint=endpoint,
+                connect_timeout=cfg.get_timeout(),  # type: ignore
+                read_timeout=cfg.get_read_timeout(),  # type: ignore
+            )
+        )

agentrun/utils/data_api.py

@@ -35,6 +35,7 @@ class ResourceType(Enum):
     Tool = "tool"
     Template = "template"
     Sandbox = "sandbox"
+    KnowledgeBase = "knowledgebase"
 
 
 class DataAPI:

{agentrun_inner_test-0.0.46.dist-info → agentrun_inner_test-0.0.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentrun-inner-test
-Version: 0.0.46
+Version: 0.0.56
 Summary: Alibaba Cloud Agent Run SDK
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -13,7 +13,7 @@ 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>=5.0.0
+Requires-Dist: alibabacloud-agentrun20250910>=5.0.1
 Requires-Dist: alibabacloud_tea_openapi>=0.4.2
 Provides-Extra: server
 Requires-Dist: fastapi>=0.104.0; extra == "server"
@@ -34,6 +34,8 @@ Provides-Extra: playwright
 Requires-Dist: playwright>=1.40.0; extra == "playwright"
 Provides-Extra: mcp
 Requires-Dist: mcp>=1.21.2; python_version >= "3.10" and extra == "mcp"
+Provides-Extra: knowledgebase
+Requires-Dist: alibabacloud_bailian20231229>=2.6.2; extra == "knowledgebase"
 Dynamic: license-file
 
 # AgentRun Python SDK