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

ksadk/builders/mcp_builder.py

@@ -10,66 +10,69 @@ import os
 import shutil
 import subprocess
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 import click
 
-from ksadk.builders.code_builder import CodeBuilder
 from ksadk.builders.base import BuildResult
+from ksadk.builders.code_builder import CodeBuilder
 from ksadk.builders.container_builder import ContainerBuilder, ensure_docker_running
 from ksadk.builders.requirements_utils import merge_requirement_lists, parse_requirements_text
-from ksadk.detection.mcp_detector import MCPDetector, MCPDetectionResult
+from ksadk.detection.mcp_detector import MCPDetectionResult, MCPDetector
 
 
 class MCPCodeBuilder(CodeBuilder):
     """MCP 代码构建器"""
-    
-    def __init__(self, project_dir: Path, config: dict = None):
+
+    def __init__(self, project_dir: Path, config: Optional[dict] = None):
         super().__init__(project_dir, config)
         self.build_dir = self.project_dir / ".agentengine" / "mcp_build"
         self.deps_dir = self.build_dir / "linux_deps"
-        self._mcp_detection: MCPDetectionResult = None
-    
+        self._mcp_detection: Optional[MCPDetectionResult] = None
+
     def build(self) -> BuildResult:
         """执行 MCP 构建"""
         self._load_dotenv()
         config = self._load_config()
-        
+
         # 检测 MCP 项目
         detector = MCPDetector(str(self.project_dir))
         detection_result = detector.detect()
         self._mcp_detection = detection_result
-        
+
         if not detection_result.is_valid:
-            return BuildResult(
-                success=False,
-                error_message="未检测到 FastMCP 项目"
-            )
-        
+            return BuildResult(success=False, error_message="未检测到 FastMCP 项目")
+
         click.echo(f"📦 MCP Server: {click.style(detection_result.name, fg='green')}")
         if detection_result.tools:
             click.echo(f"   工具: {', '.join(detection_result.tools[:5])}")
             if len(detection_result.tools) > 5:
                 click.echo(f"   ... 及其他 {len(detection_result.tools) - 5} 个")
-        
-        mcp_name = config.get('name', self.project_dir.name).replace('-', '_').replace('.', '_')
-        
+
+        mcp_name = config.get("name", self.project_dir.name).replace("-", "_").replace(".", "_")
+
         # 创建构建目录
         self.build_dir.mkdir(parents=True, exist_ok=True)
         zip_path = self.build_dir / f"{mcp_name}.zip"
-        
+
         # 检查是否需要重新构建
         no_cache = self.config.get("no_cache", False) if self.config else False
-        if zip_path.exists() and not no_cache and not self._need_rebuild(zip_path, detection_result):
+        if (
+            zip_path.exists()
+            and not no_cache
+            and not self._need_rebuild(zip_path, detection_result)
+        ):
             incompatibles = self._scan_incompatible_binaries_in_zip(zip_path)
             if incompatibles:
-                click.secho("\n⚠️ 检测到缓存 MCP 构建包含非 Linux 兼容关键二进制，自动重建...", fg='yellow')
+                click.secho(
+                    "\n⚠️ 检测到缓存 MCP 构建包含非 Linux 兼容关键二进制，自动重建...", fg="yellow"
+                )
                 for item in incompatibles[:5]:
                     click.echo(f"   - {item}")
             else:
                 self._save_input_fingerprint(zip_path, detection_result)
                 zip_size = zip_path.stat().st_size / (1024 * 1024)
-                click.secho(f"\n✅ 使用已有构建: {zip_path.name} ({zip_size:.2f} MB)", fg='green')
+                click.secho(f"\n✅ 使用已有构建: {zip_path.name} ({zip_size:.2f} MB)", fg="green")
                 return BuildResult(
                     success=True,
                     artifact_path=zip_path,
@@ -77,36 +80,34 @@ class MCPCodeBuilder(CodeBuilder):
                     metadata={
                         "mcp_name": mcp_name,
                         "mcp_variable": detection_result.mcp_variable,
-                        "tools": detection_result.tools
-                    }
+                        "tools": detection_result.tools,
+                    },
                 )
-        
+
         # Step 1: 准备依赖
         click.echo("\n📋 Step 1/3: 准备依赖清单...")
         requirements_path = self._prepare_mcp_requirements(detection_result)
-        
+
         # Step 2: 安装依赖（在 Mac 上安装后自动替换为 Linux 二进制，和 agent code 模式一致）
         click.echo("\n📦 Step 2/3: 安装依赖...")
         if self.deps_dir.exists():
             import shutil
+
             shutil.rmtree(self.deps_dir)
         self.deps_dir.mkdir(parents=True)
-        
+
         if not self._install_dependencies(requirements_path):
-            return BuildResult(
-                success=False,
-                error_message="依赖安装失败"
-            )
-        
+            return BuildResult(success=False, error_message="依赖安装失败")
+
         # Step 3: 打包
         click.echo("\n📦 Step 3/3: 打包 zip...")
         self._package_mcp_zip(zip_path, detection_result)
         self._save_input_fingerprint(zip_path, detection_result)
-        
+
         zip_size = zip_path.stat().st_size
         click.echo(f"   zip 文件: {zip_path}")
         click.echo(f"   大小: {zip_size / (1024 * 1024):.2f} MB")
-        
+
         return BuildResult(
             success=True,
             artifact_path=zip_path,
@@ -115,33 +116,33 @@ class MCPCodeBuilder(CodeBuilder):
                 "mcp_name": mcp_name,
                 "mcp_variable": detection_result.mcp_variable,
                 "tools": detection_result.tools,
-                "deps_dir": str(self.deps_dir)
-            }
+                "deps_dir": str(self.deps_dir),
+            },
         )
-    
+
     def _prepare_mcp_requirements(self, detection_result: MCPDetectionResult) -> Path:
         """准备 MCP 依赖"""
         base_deps = self._get_mcp_base_requirements()
         final_deps = list(base_deps)
-        
+
         # 合并用户依赖
         user_requirements = self.project_dir / "requirements.txt"
         if user_requirements.exists():
-            click.echo(f"   发现 requirements.txt，正在合并...")
+            click.echo("   发现 requirements.txt，正在合并...")
             user_content = user_requirements.read_text()
             user_deps = parse_requirements_text(user_content)
             final_deps = merge_requirement_lists(final_deps, user_deps)
         else:
-            click.echo(f"   使用默认 MCP 依赖")
-        
+            click.echo("   使用默认 MCP 依赖")
+
         # 写入构建目录
         requirements_path = self.build_dir / "requirements.txt"
         requirements_path.write_text("\n".join(final_deps))
-        
+
         click.echo(f"   共 {len(final_deps)} 个依赖包")
-        
+
         return requirements_path
-    
+
     def _get_mcp_base_requirements(self) -> List[str]:
         """MCP 基础依赖"""
         return [
@@ -154,40 +155,38 @@ class MCPCodeBuilder(CodeBuilder):
             "python-dotenv>=1.0.0",
             "pydantic>=2.0.0",
         ]
-    
+
     def _package_mcp_zip(self, zip_path: Path, detection_result: MCPDetectionResult) -> None:
         """打包 MCP zip"""
         import zipfile
-        
+
         file_count = 0
-        
-        with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zf:
+
+        with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zf:
             # 添加项目文件
             for file_path in self._iter_project_files():
                 arcname = file_path.relative_to(self.project_dir).as_posix()
                 zf.write(file_path, arcname)
                 file_count += 1
-            
+
             # 添加依赖（已替换为 Linux 二进制）
             deps_count = 0
-            for file_path in self.deps_dir.rglob('*'):
+            for file_path in self.deps_dir.rglob("*"):
                 if file_path.is_file():
                     arcname = str(file_path.relative_to(self.deps_dir))
                     zf.write(file_path, arcname)
                     deps_count += 1
-            
+
             # 生成 MCP entrypoint
             entrypoint_content = self._generate_mcp_entrypoint(detection_result)
             zf.writestr("entrypoint.py", entrypoint_content)
-        
+
         click.echo(f"   ✓ 打包完成: {file_count} 个项目文件 + {deps_count} 个依赖文件")
-    
+
     def _generate_mcp_entrypoint(self, detection_result: MCPDetectionResult) -> str:
         """生成 MCP 入口脚本"""
         # 确定包名
         entry_point = detection_result.entry_point
-        package_path = Path(detection_result.package_path)
-        
         # 计算模块路径
         if "/" in entry_point:
             # 如果入口在子目录，如 my_mcp/server.py
@@ -195,9 +194,9 @@ class MCPCodeBuilder(CodeBuilder):
         else:
             # 根目录
             module_path = entry_point.replace(".py", "")
-        
+
         mcp_variable = detection_result.mcp_variable
-        
+
         return f'''"""
 AgentEngine MCP 入口
 
@@ -244,15 +243,20 @@ except ImportError:
 from {module_path} import {mcp_variable}
 
 logger.info(f"MCP 实例: {mcp_variable}")
-logger.info(f"工具数量: {{len(getattr({mcp_variable}, '_tool_manager', {{}}).list_tools() if hasattr({mcp_variable}, '_tool_manager') else 'N/A')}}")
+tool_count = (
+    len(getattr({mcp_variable}, "_tool_manager", {{}}).list_tools())
+    if hasattr({mcp_variable}, "_tool_manager")
+    else "N/A"
+)
+logger.info(f"工具数量: {{tool_count}}")
 
 if __name__ == "__main__":
     port = int(os.environ.get("PORT", 8080))
     host = os.environ.get("HOST", "0.0.0.0")
-    
+
     logger.info(f"启动 HTTP Server: {{host}}:{{port}}")
     logger.info("MCP endpoint: /mcp")
-    
+
     {mcp_variable}.run(
         transport="http",
         host=host,
@@ -264,8 +268,14 @@ if __name__ == "__main__":
 class MCPContainerBuilder(ContainerBuilder):
     """FastMCP Docker 镜像构建器。"""
 
-    def __init__(self, project_dir: Path, config: dict = None,
-                 tag: str = None, registry: str = None, no_cache: bool = False):
+    def __init__(
+        self,
+        project_dir: Path,
+        config: Optional[dict] = None,
+        tag: Optional[str] = None,
+        registry: Optional[str] = None,
+        no_cache: bool = False,
+    ):
         super().__init__(project_dir, config=config, tag=tag, registry=registry, no_cache=no_cache)
 
     def build(self) -> BuildResult:
@@ -277,28 +287,25 @@ class MCPContainerBuilder(ContainerBuilder):
         result = detector.detect()
 
         if not result.is_valid:
-            return BuildResult(
-                success=False,
-                error_message="未检测到 FastMCP 项目"
-            )
+            return BuildResult(success=False, error_message="未检测到 FastMCP 项目")
 
         click.echo(f"📦 MCP Server: {click.style(result.name, fg='green')}")
 
-        image_name = config.get('name', self.project_dir.name).replace('-', '_').replace('.', '_')
+        image_name = config.get("name", self.project_dir.name).replace("-", "_").replace(".", "_")
 
         image_tag = self.tag
         if not image_tag:
-            image_tag = config.get('version', '')
+            image_tag = config.get("version", "")
         if not image_tag:
-            image_tag = config.get('image', {}).get('tag', 'latest')
+            image_tag = config.get("image", {}).get("tag", "latest")
 
         image_registry = self.registry
         if not image_registry:
-            image_registry = os.getenv('KCR_REGISTRY', '')
+            image_registry = os.getenv("KCR_REGISTRY", "")
         if not image_registry:
-            image_registry = config.get('image', {}).get('registry', '')
+            image_registry = config.get("image", {}).get("registry", "")
         if not image_registry:
-            image_registry = self._get_smart_kcr_endpoint(os.getenv('KSYUN_REGION', 'cn-beijing-6'))
+            image_registry = self._get_smart_kcr_endpoint(os.getenv("KSYUN_REGION", "cn-beijing-6"))
         else:
             image_registry = self._optimize_kcr_endpoint(image_registry)
 
@@ -310,22 +317,16 @@ class MCPContainerBuilder(ContainerBuilder):
             package_info = self._package_mcp_project(result)
             click.echo("✅ 打包完成")
         except Exception as e:
-            return BuildResult(
-                success=False,
-                error_message=f"打包失败: {e}"
-            )
+            return BuildResult(success=False, error_message=f"打包失败: {e}")
 
         if not ensure_docker_running():
-            return BuildResult(
-                success=False,
-                error_message="Docker 未运行"
-            )
+            return BuildResult(success=False, error_message="Docker 未运行")
 
         click.echo("\n🔨 构建 Docker 镜像 (目标平台: linux/amd64)...")
         try:
-            cmd = ['docker', 'build', '--platform', 'linux/amd64', '-t', full_image]
+            cmd = ["docker", "build", "--platform", "linux/amd64", "-t", full_image]
             if self.no_cache:
-                cmd.append('--no-cache')
+                cmd.append("--no-cache")
             cmd.append(package_info.build_dir)
 
             quiet_mode = os.getenv("AGENTENGINE_OUTPUT_MODE", "").strip().lower() == "json"
@@ -335,7 +336,7 @@ class MCPContainerBuilder(ContainerBuilder):
                 capture_output=quiet_mode,
                 text=quiet_mode,
             )
-            click.secho(f"\n✅ 镜像构建成功: {full_image}", fg='green')
+            click.secho(f"\n✅ 镜像构建成功: {full_image}", fg="green")
 
             return BuildResult(
                 success=True,
@@ -346,7 +347,7 @@ class MCPContainerBuilder(ContainerBuilder):
                     "build_dir": package_info.build_dir,
                     "mcp_variable": result.mcp_variable,
                     "tools": result.tools,
-                }
+                },
             )
         except subprocess.CalledProcessError as e:
             error_message = f"镜像构建失败: {e}"
@@ -356,10 +357,7 @@ class MCPContainerBuilder(ContainerBuilder):
                 detail = stderr or stdout
                 if detail:
                     error_message = f"{error_message}: {detail}"
-            return BuildResult(
-                success=False,
-                error_message=error_message
-            )
+            return BuildResult(success=False, error_message=error_message)
 
     def _package_mcp_project(self, detection_result: MCPDetectionResult):
         """复制项目并生成 FastMCP 容器运行所需文件。"""
@@ -372,16 +370,17 @@ class MCPContainerBuilder(ContainerBuilder):
         for item in project_path.iterdir():
             if CodeBuilder._is_real_dotenv_file(item.name):
                 continue
-            if (
-                (item.name.startswith('.') and item.name != '.env.example')
-                or item.name in ('__pycache__', '.git', 'node_modules')
+            if (item.name.startswith(".") and item.name != ".env.example") or item.name in (
+                "__pycache__",
+                ".git",
+                "node_modules",
             ):
                 continue
             dest = output_dir / item.name
             if item.is_dir():
                 if dest.exists():
                     shutil.rmtree(dest)
-                shutil.copytree(item, dest, ignore=shutil.ignore_patterns('__pycache__', '*.pyc'))
+                shutil.copytree(item, dest, ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
             else:
                 shutil.copy2(item, dest)
 
@@ -406,7 +405,7 @@ class MCPContainerBuilder(ContainerBuilder):
                 "entrypoint": str(entrypoint_path),
                 "mcp_variable": detection_result.mcp_variable,
                 "tools": detection_result.tools,
-            }
+            },
         )
 
     def _generate_mcp_requirements(self, project_path: Path) -> str:

ksadk/builders/requirements_utils.py

@@ -5,7 +5,6 @@ from typing import Iterable, List
 
 from packaging.requirements import InvalidRequirement, Requirement
 
-
 _NORMALIZED_NAME_RE = re.compile(r"[-_.]+")
 
 
@@ -47,10 +46,7 @@ def exclude_requirement_names(
     *,
     excluded_names: Iterable[str],
 ) -> List[str]:
-    excluded = {
-        _NORMALIZED_NAME_RE.sub("-", name).lower()
-        for name in excluded_names
-    }
+    excluded = {_NORMALIZED_NAME_RE.sub("-", name).lower() for name in excluded_names}
     filtered: List[str] = []
 
     for raw_requirement in requirements: