agentengine-sdk-python 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

ksadk/deployment/__init__.py

@@ -7,62 +7,61 @@
 - serverless: 金山云 Serverless 计算引擎
 """
 
+# 导入并注册所有 Provider
+from ksadk.deployment import providers as providers
 from ksadk.deployment.base import (
     BaseDeployProvider,
-    DeployTarget,
     DeployResult,
     DeployStatus,
+    DeployTarget,
+    NetworkConfig,
     PackageInfo,
     ResourceSpec,
     ScalingConfig,
-    NetworkConfig,
 )
 from ksadk.deployment.registry import DeployProviderRegistry
 
-# 导入并注册所有 Provider
-from ksadk.deployment import providers
-
 
 class DeploymentManager:
     """部署管理器 - 统一入口
-    
+
     使用方式:
         manager = DeploymentManager()
         provider = manager.get_provider("docker")
         result = await provider.deploy(package_info, target)
     """
-    
+
     @staticmethod
-    def get_provider(name: str, config: dict = None) -> BaseDeployProvider:
+    def get_provider(name: str, config: dict | None = None) -> BaseDeployProvider:
         """获取部署 Provider
-        
+
         Args:
             name: Provider 名称 (docker, k8s, serverless)
             config: Provider 配置
-            
+
         Returns:
             Provider 实例
         """
         return DeployProviderRegistry.get(name, config)
-    
+
     @staticmethod
     def list_providers() -> list:
         """列出所有可用 Provider"""
         return DeployProviderRegistry.get_provider_info()
-    
+
     @staticmethod
     def has_provider(name: str) -> bool:
         """检查 Provider 是否存在"""
         return DeployProviderRegistry.has_provider(name)
-    
+
     # 向后兼容: create() 方法
     @classmethod
-    def create(cls, target: str) -> DeployTarget:
+    def create(cls, target: str) -> BaseDeployProvider:
         """创建部署目标
-        
+
         Args:
             target: 部署目标 (docker, k8s, serverless)
-            
+
         Returns:
             部署目标实例
         """

ksadk/deployment/agent_access.py

@@ -5,7 +5,6 @@ import inspect
 from contextlib import nullcontext
 from typing import Any, Awaitable, Callable, Mapping, Sequence
 
-
 AgentAccessDetailFetcher = Callable[[str, bool], Awaitable[dict[str, Any]]]
 AgentAccessErrorHandler = Callable[[Exception], None]
 
@@ -16,16 +15,13 @@ def canonicalize_agent_access_detail(detail: Mapping[str, Any] | None) -> dict[s
         return {}
 
     normalized = dict(detail)
-    basic = normalized.get("basic") if isinstance(normalized.get("basic"), Mapping) else {}
-    quick = (
-        normalized.get("quick_access")
-        if isinstance(normalized.get("quick_access"), Mapping)
-        else {}
-    )
-    deployment = (
-        normalized.get("deployment")
-        if isinstance(normalized.get("deployment"), Mapping)
-        else {}
+    basic_value = normalized.get("basic")
+    basic: Mapping[str, Any] = basic_value if isinstance(basic_value, Mapping) else {}
+    quick_value = normalized.get("quick_access")
+    quick: Mapping[str, Any] = quick_value if isinstance(quick_value, Mapping) else {}
+    deployment_value = normalized.get("deployment")
+    deployment: Mapping[str, Any] = (
+        deployment_value if isinstance(deployment_value, Mapping) else {}
     )
 
     def _pick(*values: Any) -> Any:
@@ -74,9 +70,8 @@ def is_agent_not_visible_yet_error(exc: Exception) -> bool:
     text = str(exc or "").lower()
     if not text:
         return False
-    return (
-        ("http 404" in text or "status=404" in text or "code: 404" in text)
-        and ("未找到对应的 agent" in text or "not found" in text)
+    return ("http 404" in text or "status=404" in text or "code: 404" in text) and (
+        "未找到对应的 agent" in text or "not found" in text
     )
 
 
@@ -99,7 +94,7 @@ def is_agent_not_found_error(exc: Exception) -> bool:
     if isinstance(details, Mapping):
         http_status = details.get("http_status")
         try:
-            if int(http_status) == 404:
+            if http_status is not None and int(http_status) == 404:
                 return True
         except (TypeError, ValueError):
             pass
@@ -174,11 +169,7 @@ async def get_latest_agent_access(
 
     fetcher = detail_fetcher or _default_detail_fetcher
     retry_delay_values = [float(item) for item in (retry_delays or ())]
-    attempts = (
-        1 + len(retry_delay_values)
-        if retry_delay_values
-        else max(1, int(attempts or 1))
-    )
+    attempts = 1 + len(retry_delay_values) if retry_delay_values else max(1, int(attempts or 1))
     last_exc: Exception | None = None
 
     suppress_ctx = nullcontext()
@@ -205,9 +196,7 @@ async def get_latest_agent_access(
                 if delay > 0:
                     await asyncio.sleep(delay)
             try:
-                detail = canonicalize_agent_access_detail(
-                    await fetcher(agent_ref, include_api_key)
-                )
+                detail = canonicalize_agent_access_detail(await fetcher(agent_ref, include_api_key))
             except Exception as exc:
                 last_exc = exc
                 if attempt < attempts - 1 and is_agent_not_visible_yet_error(exc):

ksadk/deployment/base.py

@@ -3,13 +3,15 @@
 """
 
 from abc import ABC, abstractmethod
-from typing import Dict, Any, Optional, List
-from pydantic import BaseModel, Field
 from enum import Enum
+from typing import Any, Dict, List, Optional
+
+from pydantic import BaseModel, Field
 
 
 class DeployStatus(str, Enum):
     """部署状态"""
+
     PENDING = "pending"
     PACKAGING = "packaging"
     BUILDING = "building"
@@ -26,12 +28,14 @@ class DeployStatus(str, Enum):
 
 class ResourceSpec(BaseModel):
     """资源规格"""
+
     cpu: str = "2"
     memory: str = "4Gi"
 
 
 class ScalingConfig(BaseModel):
     """扩缩容配置"""
+
     min_replicas: int = 1
     max_replicas: int = 10
     concurrency: int = 10
@@ -39,6 +43,7 @@ class ScalingConfig(BaseModel):
 
 class NetworkConfig(BaseModel):
     """网络配置"""
+
     access_type: str = "public"  # public | private
     enable_https: bool = True
     enable_public_access: Optional[bool] = None
@@ -58,10 +63,11 @@ class StorageSpec(BaseModel):
 
 class DeployTarget(BaseModel):
     """部署目标配置"""
-    provider: str                      # serverless | faas | k8s | docker
+
+    provider: str  # serverless | faas | k8s | docker
     region: str = "cn-north-1"
     project_id: str = "default"
-    
+
     # 通用配置
     resources: ResourceSpec = Field(default_factory=ResourceSpec)
     scaling: ScalingConfig = Field(default_factory=ScalingConfig)
@@ -74,22 +80,24 @@ class DeployTarget(BaseModel):
 
 class DeployResult(BaseModel):
     """部署结果"""
+
     status: DeployStatus = DeployStatus.UNKNOWN
     agent_id: Optional[str] = None
     agent_name: Optional[str] = None
     endpoint: Optional[str] = None
     api_key: Optional[str] = None
     message: str = ""
-    
+
     # 额外元数据
     metadata: Dict[str, Any] = Field(default_factory=dict)
-    
+
     def is_success(self) -> bool:
         return self.status in (DeployStatus.RUNNING, DeployStatus.DEPLOYING)
 
 
 class PackageInfo(BaseModel):
     """打包信息"""
+
     name: str
     framework: str
     build_dir: str
@@ -97,132 +105,137 @@ class PackageInfo(BaseModel):
     dockerfile: Optional[str] = None
     image: Optional[str] = None
     entry_point: str = "agent.py"
-    
+
     # 额外信息
     metadata: Dict[str, Any] = Field(default_factory=dict)
 
 
 class BaseDeployProvider(ABC):
     """部署 Provider 基类
-    
+
     所有部署 Provider 必须继承此类并实现抽象方法。
     """
-    
+
     # Provider 标识
     name: str = "base"
     display_name: str = "Base Provider"
     description: str = ""
-    
+
     # 能力标识
     supports_streaming: bool = False
     supports_scaling: bool = False
     requires_image_registry: bool = False
-    
-    def __init__(self, config: Dict[str, Any] = None):
+
+    def __init__(self, config: Optional[Dict[str, Any]] = None):
         """初始化 Provider
-        
+
         Args:
             config: Provider 级别配置 (如 API Key、区域默认值等)
         """
         self.config = config or {}
-    
+
     @abstractmethod
     async def validate_config(self, target: DeployTarget) -> tuple[bool, str]:
         """验证部署配置
-        
+
         Args:
             target: 部署目标配置
-            
+
         Returns:
             (is_valid, error_message)
         """
         pass
-    
+
     @abstractmethod
-    async def package(self, project_dir: str, detection_result: Any, config: Dict[str, Any] = None) -> PackageInfo:
+    async def package(
+        self,
+        project_dir: str,
+        detection_result: Any,
+        config: Optional[Dict[str, Any]] = None,
+    ) -> PackageInfo:
         """打包项目
-        
+
         Args:
             project_dir: 项目目录
             detection_result: 框架检测结果
             config: 项目配置 (agentengine.yaml)
-            
+
         Returns:
             打包信息
         """
         pass
-    
+
     @abstractmethod
     async def build(self, package_info: PackageInfo, target: DeployTarget) -> PackageInfo:
         """构建镜像/代码包
-        
+
         Args:
             package_info: 打包信息
             target: 部署目标
-            
+
         Returns:
             更新后的打包信息 (含镜像地址等)
         """
         pass
-    
+
     @abstractmethod
     async def deploy(self, package_info: PackageInfo, target: DeployTarget) -> DeployResult:
         """部署
-        
+
         Args:
             package_info: 打包信息
             target: 部署目标
-            
+
         Returns:
             部署结果
         """
         pass
-    
+
     @abstractmethod
     async def get_status(self, agent_id: str, target: DeployTarget) -> DeployResult:
         """获取部署状态
-        
+
         Args:
             agent_id: Agent ID
             target: 部署目标
-            
+
         Returns:
             部署状态
         """
         pass
-    
+
     @abstractmethod
     async def destroy(self, agent_id: str, target: DeployTarget) -> bool:
         """销毁部署
-        
+
         Args:
             agent_id: Agent ID
             target: 部署目标
-            
+
         Returns:
             是否成功
         """
         pass
-    
+
     async def list_agents(self, target: DeployTarget) -> List[DeployResult]:
         """列出所有 Agent (可选实现)
-        
+
         Args:
             target: 部署目标
-            
+
         Returns:
             Agent 列表
         """
         raise NotImplementedError(f"{self.name} does not support list_agents")
-    
+
     async def invoke(self, agent_id: str, message: str, target: DeployTarget) -> str:
         """调用 Agent (可选实现)
-        
+
         Args:
             agent_id: Agent ID
             message: 输入消息
             target: 部署目标
-            
+
         Returns:
             Agent 响应
         """