mofox-plugin-dev-toolkit 0.2.2__tar.gz → 0.2.7__tar.gz

{mofox_plugin_dev_toolkit-0.2.2/mofox_plugin_dev_toolkit.egg-info → mofox_plugin_dev_toolkit-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mofox-plugin-dev-toolkit
-Version: 0.2.2
+Version: 0.2.7
 Summary: 开发工具集，用于快速创建、开发和测试 MoFox-Bot 插件
 Author-email: MoFox-Studio <mofox.studio@example.com>
 License: GPL-3.0-or-later
@@ -28,6 +28,7 @@ Requires-Dist: tomli-w>=1.0.0
 Requires-Dist: pydantic>=2.5.0
 Requires-Dist: watchdog>=3.0.0
 Requires-Dist: websockets>=12.0
+Requires-Dist: libcst>=1.8.6
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: uvicorn>=0.24.0
 Requires-Dist: fastapi>=0.104.0

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7/mofox_plugin_dev_toolkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mofox-plugin-dev-toolkit
-Version: 0.2.2
+Version: 0.2.7
 Summary: 开发工具集，用于快速创建、开发和测试 MoFox-Bot 插件
 Author-email: MoFox-Studio <mofox.studio@example.com>
 License: GPL-3.0-or-later
@@ -28,6 +28,7 @@ Requires-Dist: tomli-w>=1.0.0
 Requires-Dist: pydantic>=2.5.0
 Requires-Dist: watchdog>=3.0.0
 Requires-Dist: websockets>=12.0
+Requires-Dist: libcst>=1.8.6
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: uvicorn>=0.24.0
 Requires-Dist: fastapi>=0.104.0

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7}/mofox_plugin_dev_toolkit.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ mpdt/templates/prompt_template.py
 mpdt/templates/router_template.py
 mpdt/templates/tool_template.py
 mpdt/utils/__init__.py
+mpdt/utils/code_parser.py
 mpdt/utils/color_printer.py
 mpdt/utils/config_loader.py
 mpdt/utils/config_manager.py

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7}/mofox_plugin_dev_toolkit.egg-info/requires.txt

@@ -8,6 +8,7 @@ tomli-w>=1.0.0
 pydantic>=2.5.0
 watchdog>=3.0.0
 websockets>=12.0
+libcst>=1.8.6
 aiohttp>=3.9.0
 uvicorn>=0.24.0
 fastapi>=0.104.0

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7}/mpdt/__init__.py

@@ -4,7 +4,7 @@ MoFox Plugin Dev Toolkit
 一个用于 MoFox-Bot 插件开发的工具集
 """
 
-__version__ = "0.1.7"
+__version__ = "0.2.7"
 __author__ = "MoFox-Studio"
 __license__ = "GPL-3.0-or-later"
 

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7}/mpdt/cli.py

@@ -209,7 +209,7 @@ def config_show() -> None:
         table.add_column("值", style="green")
 
         table.add_row("配置文件", str(config.config_path))
-        table.add_row("mmc 路径", str(config.mmc_path) if config.mmc_path else "[red]未配置[/red]")
+        table.add_row("MoFox-Bot 路径", str(config.mmc_path) if config.mmc_path else "[red]未配置[/red]")
         table.add_row("虚拟环境类型", config.venv_type)
         table.add_row("虚拟环境路径", str(config.venv_path) if config.venv_path else "[dim]无[/dim]")
         table.add_row("自动重载", "是" if config.auto_reload else "否")

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7}/mpdt/commands/check.py

@@ -114,19 +114,41 @@ def check_plugin(
         _print_validation_summary(result, verbose)
 
     # 自动修复（如果启用）
+    auto_fixer = None
     if auto_fix:
         print_info("正在应用自动修复...")
         auto_fixer = AutoFixValidator(path)
-        fix_result = auto_fixer.validate()
-        all_results.append(fix_result)
-        _print_validation_summary(fix_result, verbose)
+        fix_result = auto_fixer.fix_issues(all_results)
+        
+        # 从原始结果中移除已修复的问题（使用对象 id 比较）
+        fixed_issue_ids = {id(issue) for issue in auto_fixer.fixed_issues}
+        for result in all_results:
+            result.issues = [issue for issue in result.issues if id(issue) not in fixed_issue_ids]
+            # 更新计数
+            result._update_counts()
+        
+        # 显示修复摘要
+        if auto_fixer.fixes_applied:
+            print_success(f"  ✓ 成功修复 {len(auto_fixer.fixes_applied)} 个问题")
+            if verbose:
+                for fix in auto_fixer.fixes_applied:
+                    console.print(f"    [green]✓[/green] {fix}")
+        
+        if auto_fixer.fixes_failed:
+            print_warning(f"  ⚠ {len(auto_fixer.fixes_failed)} 个问题修复失败")
+            if verbose:
+                for fail in auto_fixer.fixes_failed:
+                    console.print(f"    [yellow]✗[/yellow] {fail}")
+        
+        if not auto_fixer.fixes_applied and not auto_fixer.fixes_failed:
+            print_info("  ℹ 未发现可自动修复的问题")
 
     # 生成总体报告
-    _print_overall_report(all_results, level)
+    _print_overall_report(all_results, level, auto_fixer)
 
     # 保存报告（如果需要）
     if output_path:
-        _save_report(all_results, output_path, report_format)
+        _save_report(all_results, output_path, report_format, auto_fixer)
 
 
 def _print_validation_summary(result: ValidationResult, verbose: bool = False) -> None:
@@ -181,12 +203,13 @@ def _print_issue(issue) -> None:
         console.print(f"      [dim]💡 {issue.suggestion}[/dim]")
 
 
-def _print_overall_report(results: list[ValidationResult], level: str) -> None:
+def _print_overall_report(results: list[ValidationResult], level: str, auto_fixer: AutoFixValidator | None = None) -> None:
     """打印总体报告
 
     Args:
         results: 所有验证结果
         level: 显示级别
+        auto_fixer: 自动修复器对象（如果启用了自动修复）
     """
     console.print()
     console.print("=" * 60)
@@ -236,44 +259,85 @@ def _print_overall_report(results: list[ValidationResult], level: str) -> None:
 
     # 总结
     console.print()
+    if auto_fixer:
+        console.print("[bold cyan]═══ 修复统计 ═══[/bold cyan]")
+        console.print()
+        
+        if auto_fixer.fixes_applied:
+            console.print(f"[green]✓ 成功修复: {len(auto_fixer.fixes_applied)} 个[/green]")
+            for fix in auto_fixer.fixes_applied:
+                console.print(f"  [green]•[/green] {fix}")
+            console.print()
+        
+        if auto_fixer.fixes_failed:
+            console.print(f"[yellow]✗ 修复失败: {len(auto_fixer.fixes_failed)} 个[/yellow]")
+            for fail in auto_fixer.fixes_failed:
+                console.print(f"  [yellow]•[/yellow] {fail}")
+            console.print()
+        
+        if not auto_fixer.fixes_applied and not auto_fixer.fixes_failed:
+            console.print("[blue]ℹ 未发现可自动修复的问题[/blue]")
+            console.print()
+    
+    console.print("[bold cyan]═══ 最终结果 ═══[/bold cyan]")
+    console.print()
     if total_errors > 0:
-        print_error(f"发现 {total_errors} 个错误，{total_warnings} 个警告")
+        print_error(f"剩余 {total_errors} 个错误，{total_warnings} 个警告")
     elif total_warnings > 0:
-        print_warning(f"发现 {total_warnings} 个警告")
+        print_warning(f"剩余 {total_warnings} 个警告")
     else:
         print_success("所有检查通过！")
 
 
-def _save_report(results: list[ValidationResult], output_path: str, report_format: str) -> None:
+def _save_report(results: list[ValidationResult], output_path: str, report_format: str, auto_fixer: AutoFixValidator | None = None) -> None:
     """保存检查报告
 
     Args:
         results: 验证结果列表
         output_path: 输出路径
         report_format: 报告格式
+        auto_fixer: 自动修复器对象（如果启用了自动修复）
     """
     if report_format == "markdown":
-        _save_markdown_report(results, output_path)
+        _save_markdown_report(results, output_path, auto_fixer)
     else:
         print_warning(f"不支持的报告格式: {report_format}")
 
 
-def _save_markdown_report(results: list[ValidationResult], output_path: str) -> None:
+def _save_markdown_report(results: list[ValidationResult], output_path: str, auto_fixer: AutoFixValidator | None = None) -> None:
     """保存 Markdown 格式的报告
 
     Args:
         results: 验证结果列表
         output_path: 输出路径
+        auto_fixer: 自动修复器对象（如果启用了自动修复）
     """
-    lines = ["# 插件检查报告\n"]
+    lines = ["# 插件检查报告\n\n"]
 
     # 统计
     total_errors = sum(r.error_count for r in results)
     total_warnings = sum(r.warning_count for r in results)
+    total_info = sum(r.info_count for r in results)
 
-    lines.append("## 摘要\n")
+    lines.append("## 摘要\n\n")
     lines.append(f"- 错误: {total_errors}\n")
     lines.append(f"- 警告: {total_warnings}\n")
+    lines.append(f"- 信息: {total_info}\n")
+    
+    # 修复统计
+    if auto_fixer:
+        lines.append("\n### 自动修复统计\n\n")
+        if auto_fixer.fixes_applied:
+            lines.append(f"- ✅ 成功修复: {len(auto_fixer.fixes_applied)} 个\n")
+            for fix in auto_fixer.fixes_applied:
+                lines.append(f"  - {fix}\n")
+        if auto_fixer.fixes_failed:
+            lines.append(f"- ❌ 修复失败: {len(auto_fixer.fixes_failed)} 个\n")
+            for fail in auto_fixer.fixes_failed:
+                lines.append(f"  - {fail}\n")
+        if not auto_fixer.fixes_applied and not auto_fixer.fixes_failed:
+            lines.append("- ℹ️ 未发现可自动修复的问题\n")
+    
     lines.append("\n")
 
     # 详细结果
@@ -307,6 +371,20 @@ def _save_markdown_report(results: list[ValidationResult], output_path: str) ->
 
             lines.append("\n")
 
+    # 总结
+    lines.append("## 总结\n\n")
+    if auto_fixer and auto_fixer.fixes_applied:
+        lines.append(f"✅ 成功修复 {len(auto_fixer.fixes_applied)} 个问题\n\n")
+        if auto_fixer.fixes_failed:
+            lines.append(f"⚠️ {len(auto_fixer.fixes_failed)} 个问题修复失败\n\n")
+    
+    if total_errors > 0:
+        lines.append(f"❌ 剩余 {total_errors} 个错误，{total_warnings} 个警告\n")
+    elif total_warnings > 0:
+        lines.append(f"⚠️ 剩余 {total_warnings} 个警告\n")
+    else:
+        lines.append("✅ 所有检查通过！\n")
+
     # 写入文件
     try:
         with open(output_path, "w", encoding="utf-8") as f:

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7}/mpdt/commands/generate.py

@@ -5,9 +5,11 @@
 from pathlib import Path
 from typing import Any
 
+import libcst as cst
 import questionary
 
 from mpdt.templates import prepare_component_context
+from mpdt.utils.plugin_parser import extract_plugin_name
 from mpdt.utils.color_printer import (
     console,
     print_error,
@@ -264,7 +266,7 @@ def _update_plugin_registration(
     verbose: bool,
 ) -> bool:
     """
-    更新插件注册代码
+    更新插件注册代码 (使用 AST 解析)
 
     Args:
         work_dir: 工作目录
@@ -281,45 +283,30 @@ def _update_plugin_registration(
         return False
 
     try:
-        content = plugin_file.read_text(encoding="utf-8")
-
-        # 添加 import 语句
-        import_line = f"from {context['plugin_name']}.components.{component_type}s.{component_name} import {context['class_name']}\n"
-
-        # 检查是否已导入
-        if import_line.strip() not in content:
-            # 找到合适的位置插入 import (在最后一个 import 之后,class 定义之前)
-            lines = content.split("\n")
-            import_insert_index = -1
-            last_import_index = -1
-
-            for i, line in enumerate(lines):
-                if line.startswith("from") or line.startswith("import"):
-                    last_import_index = i
-                elif line.startswith("class") or line.startswith("@"):
-                    # 在 class 或装饰器之前插入
-                    import_insert_index = last_import_index + 1 if last_import_index >= 0 else i
-                    break
-
-            if import_insert_index > 0:
-                # 确保插入位置后有空行
-                if import_insert_index < len(lines) and lines[import_insert_index].strip():
-                    lines.insert(import_insert_index, "")
-                lines.insert(import_insert_index, import_line.rstrip())
-                content = "\n".join(lines)
-
-        # 在 get_plugin_components 中添加组件注册
-        # 根据组件类型生成正确的注册代码
-        registration_code = _generate_registration_code(component_type, context)
-
-        if "get_plugin_components" in content and registration_code not in content:
-            # 找到 return components 前插入注册代码
-            content = content.replace(
-                "return components",
-                f"{registration_code}\n        return components"
-            )
-
-        plugin_file.write_text(content, encoding="utf-8")
+        # 使用 plugin_parser 验证插件名称
+        parsed_plugin_name = extract_plugin_name(work_dir)
+        if not parsed_plugin_name:
+            if verbose:
+                console.print("[dim]⚠  无法解析插件名称[/dim]")
+            return False
+
+        # 读取源代码
+        source_code = plugin_file.read_text(encoding="utf-8")
+        source_tree = cst.parse_module(source_code)
+
+        # 创建转换器
+        transformer = PluginRegistrationTransformer(
+            plugin_name=parsed_plugin_name,
+            component_type=component_type,
+            component_name=component_name,
+            class_name=context["class_name"],
+        )
+
+        # 应用转换
+        modified_tree = source_tree.visit(transformer)
+
+        # 写回文件
+        plugin_file.write_text(modified_tree.code, encoding="utf-8")
 
         if verbose:
             console.print(f"[dim]✓ 更新插件注册: {plugin_file}[/dim]")
@@ -332,35 +319,111 @@ def _update_plugin_registration(
         return False
 
 
-def _generate_registration_code(component_type: str, context: dict) -> str:
-    """
-    根据组件类型生成正确的注册代码
-
-    Args:
-        component_type: 组件类型
-        context: 模板上下文
-
-    Returns:
-        注册代码字符串
-    """
-    class_name = context['class_name']
-
-    # 根据组件类型生成对应的 get_xxx_info() 方法调用
-    info_method_map = {
-        "action": "get_action_info",
-        "tool": "get_tool_info",
-        "event": "get_event_handler_info",
-        "adapter": "get_adapter_info",
-        "prompt": "get_prompt_info",
-        "plus_command": "get_command_info",
-        "chatter": "get_chatter_info",
-        "router": "get_router_info",
-    }
+class PluginRegistrationTransformer(cst.CSTTransformer):
+    """用于添加组件导入和注册的 CST 转换器"""
 
-    info_method = info_method_map.get(component_type, "get_component_info")
-
-    registration = f"""
-        # 注册 {class_name}
-        components.append(({class_name}.{info_method}(), {class_name}))"""
-
-    return registration
+    def __init__(
+        self,
+        plugin_name: str,
+        component_type: str,
+        component_name: str,
+        class_name: str,
+    ):
+        self.plugin_name = plugin_name
+        self.component_type = component_type
+        self.component_name = component_name
+        self.class_name = class_name
+        self.import_added = False
+        self.registration_added = False
+
+    def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> cst.Module:
+        """在模块级别添加导入语句"""
+        if self.import_added:
+            return updated_node
+
+        # 构建导入语句
+        import_statement = cst.parse_statement(
+            f"from {self.plugin_name}.components.{self.component_type}s.{self.component_name} import {self.class_name}"
+        )
+
+        # 检查是否已存在相同的导入
+        for stmt in updated_node.body:
+            if isinstance(stmt, cst.SimpleStatementLine):
+                for s in stmt.body:
+                    if isinstance(s, cst.ImportFrom) and s.module:
+                        module_str = cst.Module([]).code_for_node(s.module)
+                        target_module = f"{self.plugin_name}.components.{self.component_type}s.{self.component_name}"
+                        if module_str == target_module:
+                            self.import_added = True
+                            return updated_node
+
+        # 找到最后一个导入语句的位置
+        last_import_idx = -1
+        for idx, stmt in enumerate(updated_node.body):
+            if isinstance(stmt, cst.SimpleStatementLine):
+                for s in stmt.body:
+                    if isinstance(s, (cst.Import, cst.ImportFrom)):
+                        last_import_idx = idx
+
+        # 在最后一个导入后添加新导入
+        if last_import_idx >= 0:
+            new_body = list(updated_node.body)
+            new_body.insert(last_import_idx + 1, import_statement)
+            self.import_added = True
+            return updated_node.with_changes(body=new_body)
+
+        return updated_node
+
+    def leave_FunctionDef(
+        self, original_node: cst.FunctionDef, updated_node: cst.FunctionDef
+    ) -> cst.FunctionDef:
+        """在 get_plugin_components 函数中添加注册代码"""
+        if updated_node.name.value != "get_plugin_components":
+            return updated_node
+
+        if self.registration_added:
+            return updated_node
+
+        # 根据组件类型生成对应的 get_xxx_info() 方法调用
+        info_method_map = {
+            "action": "get_action_info",
+            "tool": "get_tool_info",
+            "event": "get_event_handler_info",
+            "adapter": "get_adapter_info",
+            "prompt": "get_prompt_info",
+            "plus_command": "get_command_info",
+            "chatter": "get_chatter_info",
+            "router": "get_router_info",
+        }
+        info_method = info_method_map.get(self.component_type, "get_component_info")
+
+        # 构建注册代码
+        registration_code = f"""# 注册 {self.class_name}
+        components.append(({self.class_name}.{info_method}(), {self.class_name}))"""
+
+        # 检查是否已存在注册代码
+        function_code = cst.Module([]).code_for_node(updated_node)
+        if self.class_name in function_code and info_method in function_code:
+            self.registration_added = True
+            return updated_node
+
+        # 找到 return 语句并在其前面插入注册代码
+        new_body = []
+        for stmt in updated_node.body.body:
+            # 如果是 return 语句，在前面插入注册代码
+            if isinstance(stmt, cst.SimpleStatementLine):
+                for s in stmt.body:
+                    if isinstance(s, cst.Return):
+                        # 插入注册代码
+                        for line in registration_code.split("\n"):
+                            if line.strip():
+                                new_body.append(cst.parse_statement(line))
+                        self.registration_added = True
+
+            new_body.append(stmt)
+
+        if self.registration_added:
+            new_function_body = updated_node.body.with_changes(body=new_body)
+            return updated_node.with_changes(body=new_function_body)
+
+        return updated_node

{mofox_plugin_dev_toolkit-0.2.2 → mofox_plugin_dev_toolkit-0.2.7}/mpdt/commands/init.py

@@ -106,12 +106,14 @@ def init_plugin(
     print_tree(
         plugin_name,
         {
-            ".gitignore":None,
+            ".gitignore": None,
             "__init__.py": None,
-            "plugin.py": None,
-            "config": ["config.toml"],
-            "components": ["actions", "commands", "tools", "events"],
-            "utils": ["__init__.py"],
+            plugin_name: {
+                "__init__.py": None,
+                "plugin.py": None,
+                "components": ["actions", "plus_command", "tools", "events"],
+                "utils": ["__init__.py"],
+            },
             "docs": ["README.md"] if with_docs else [],
             "pyproject.toml": None,
             "requirements.txt": None,
@@ -198,17 +200,22 @@ def _create_plugin_structure(
     # 创建主目录
     ensure_dir(plugin_dir)
 
-    # 创建 __init__.py
-    init_content = _generate_init_file(plugin_name, author, license_type)
-    safe_write_file(plugin_dir / "__init__.py", init_content)
+    # 创建根目录下的 __init__.py (给 MoFox-Plugin-Repo读取)
+    root_init_content = _generate_init_file(plugin_name, author, license_type)
+    safe_write_file(plugin_dir / "__init__.py", root_init_content)
+
+    # 创建插件代码子目录
+    plugin_code_dir = ensure_dir(plugin_dir / plugin_name)
+
+    # 创建插件代码目录下的 __init__.py (给插件系统读取，内容与根目录的相同)
+    safe_write_file(plugin_code_dir / "__init__.py", root_init_content)
 
     # 创建 plugin.py
     plugin_content = _generate_plugin_file(plugin_name, template)
-    safe_write_file(plugin_dir / "plugin.py", plugin_content)
-
+    safe_write_file(plugin_code_dir / "plugin.py", plugin_content)
 
     # 创建 components 目录
-    components_dir = ensure_dir(plugin_dir / "components")
+    components_dir = ensure_dir(plugin_code_dir / "components")
     safe_write_file(components_dir / "__init__.py", '"""\n组件模块\n"""\n')
 
     for comp_type in ["actions", "plus_command", "tools", "events"]:
@@ -216,7 +223,7 @@ def _create_plugin_structure(
         safe_write_file(comp_dir / "__init__.py", f'"""\n{comp_type.title()} 组件\n"""\n')
 
     # 创建 utils 目录
-    utils_dir = ensure_dir(plugin_dir / "utils")
+    utils_dir = ensure_dir(plugin_code_dir / "utils")
     safe_write_file(utils_dir / "__init__.py", '"""\n工具函数\n"""\n')
 
     # 创建文档目录
@@ -357,7 +364,7 @@ MoFox-Bot 插件
 
 ## 安装
 
-将插件目录放入 `plugins/` 目录中。
+将{plugin_name}文件夹放入 `plugins/` 目录中。
 
 ## 配置