mofox-plugin-dev-toolkit 0.3.3__tar.gz → 0.3.5__tar.gz

{mofox_plugin_dev_toolkit-0.3.3/mofox_plugin_dev_toolkit.egg-info → mofox_plugin_dev_toolkit-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mofox-plugin-dev-toolkit
-Version: 0.3.3
+Version: 0.3.5
 Summary: 开发工具集，用于快速创建、开发和测试 MoFox-Bot 插件
 Author-email: MoFox-Studio <wwwww95915@qq.com>
 License: GPL-3.0-or-later

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5/mofox_plugin_dev_toolkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mofox-plugin-dev-toolkit
-Version: 0.3.3
+Version: 0.3.5
 Summary: 开发工具集，用于快速创建、开发和测试 MoFox-Bot 插件
 Author-email: MoFox-Studio <wwwww95915@qq.com>
 License: GPL-3.0-or-later

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/mpdt/__init__.py

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

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/mpdt/commands/generate.py

@@ -97,7 +97,6 @@ def generate_component(
         plugin_name=plugin_name,
         author=git_info.get("name", ""),
         description=description or f"{component_name} 组件",
-        is_async=True,  # 始终生成异步方法
     )
 
     # 生成组件文件

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/mpdt/commands/init.py

@@ -662,7 +662,6 @@ def _generate_example_components(
                 plugin_name=plugin_name,
                 author=author or "",
                 description=comp_desc,
-                is_async=True,
             )
 
             # 渲染模板

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/mpdt/templates/__init__.py

@@ -69,7 +69,6 @@ def prepare_component_context(
     plugin_name: str,
     author: str = "",
     description: str = "",
-    is_async: bool = False,
 ) -> dict[str, str]:
     """
     准备组件模板上下文
@@ -116,8 +115,8 @@ def prepare_component_context(
         "author": author,
         "description": description or f"{class_name} 组件",
         "date": date,
-        "async_keyword": "async " if is_async else "",
-        "await_keyword": "await " if is_async else "",
+        "async_keyword": "async " ,
+        "await_keyword": "await ",
         "component_type": component_type + "s",  # actions, tools, etc.
         "module_name": component_name,
         "method_name": _get_method_name(component_type),

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/mpdt/utils/config_loader.py

@@ -14,7 +14,7 @@ class ConfigLoader:
     def __init__(self, config_path: Path | str | None = None):
         """
         初始化配置加载器
-        
+
         Args:
             config_path: 配置文件路径
         """
@@ -27,7 +27,7 @@ class ConfigLoader:
     def load(self) -> dict[str, Any]:
         """
         加载配置文件
-        
+
         Returns:
             配置字典
         """
@@ -40,13 +40,13 @@ class ConfigLoader:
     def get(self, key: str, default: Any = None) -> Any:
         """
         获取配置项
-        
+
         支持点号分隔的嵌套键，例如: "mpdt.check.level"
-        
+
         Args:
             key: 配置键
             default: 默认值
-            
+
         Returns:
             配置值
         """
@@ -64,7 +64,7 @@ class ConfigLoader:
     def set(self, key: str, value: Any) -> None:
         """
         设置配置项
-        
+
         Args:
             key: 配置键
             value: 配置值
@@ -82,7 +82,7 @@ class ConfigLoader:
     def save(self, path: Path | str | None = None) -> None:
         """
         保存配置到文件
-        
+
         Args:
             path: 保存路径，如果为 None 则使用初始化时的路径
         """
@@ -100,14 +100,14 @@ class ConfigLoader:
 def load_mpdt_config(project_dir: Path | str = ".") -> ConfigLoader:
     """
     加载 MPDT 配置文件
-    
+
     优先级:
     1. .mpdtrc.toml
     2. pyproject.toml 中的 [tool.mpdt] 部分
-    
+
     Args:
         project_dir: 项目目录
-        
+
     Returns:
         ConfigLoader 对象
     """
@@ -134,7 +134,7 @@ def load_mpdt_config(project_dir: Path | str = ".") -> ConfigLoader:
 def get_default_config() -> dict[str, Any]:
     """
     获取默认配置
-    
+
     Returns:
         默认配置字典
     """

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/mpdt/utils/config_manager.py

@@ -27,7 +27,7 @@ class MPDTConfig:
 
     def __init__(self, config_path: Path | None = None):
         """初始化配置管理器
-        
+
         Args:
             config_path: 配置文件路径，默认为 ~/.mpdt/config.toml
         """
@@ -131,7 +131,7 @@ class MPDTConfig:
 
     def get_python_command(self) -> list[str]:
         """获取 Python 启动命令
-        
+
         Returns:
             Python 命令列表，例如:
             - ["E:/venv/Scripts/python.exe"]
@@ -169,7 +169,7 @@ class MPDTConfig:
 
     def validate(self) -> tuple[bool, list[str]]:
         """验证配置
-        
+
         Returns:
             (是否有效, 错误消息列表)
         """
@@ -212,7 +212,7 @@ def get_default_config() -> MPDTConfig:
 
 def interactive_config() -> MPDTConfig:
     """交互式配置向导
-    
+
     Returns:
         配置好的 MPDTConfig 实例
     """
@@ -223,16 +223,13 @@ def interactive_config() -> MPDTConfig:
     console = Console()
     config = MPDTConfig()
 
-    console.print(Panel.fit(
-        "[bold cyan]MPDT 配置向导[/bold cyan]\n\n"
-        "让我们配置 MoFox 主程序的路径和虚拟环境"
-    ))
+    console.print(Panel.fit("[bold cyan]MPDT 配置向导[/bold cyan]\n\n让我们配置 MoFox 主程序的路径和虚拟环境"))
 
     # 配置 mofox 路径
     while True:
         mofox_path_str = Prompt.ask(
             "\n[bold]请输入 mofox 主程序路径[/bold]",
-            default=str(Path.cwd().parent / "mofox") if Path.cwd().parent.name != "mofox" else str(Path.cwd())
+            default=str(Path.cwd().parent / "mofox") if Path.cwd().parent.name != "mofox" else str(Path.cwd()),
         )
         mofox_path = Path(mofox_path_str).expanduser().absolute()
 
@@ -255,9 +252,7 @@ def interactive_config() -> MPDTConfig:
     # 配置虚拟环境
     console.print("\n[bold]虚拟环境配置[/bold]")
     venv_type_choice = Prompt.ask(
-        "请选择虚拟环境类型",
-        choices=["venv", "uv", "conda", "poetry", "none"],
-        default="venv"
+        "请选择虚拟环境类型", choices=["venv", "uv", "conda", "poetry", "none"], default="venv"
     )
     config.venv_type = venv_type_choice
 
@@ -266,16 +261,14 @@ def interactive_config() -> MPDTConfig:
             console.print("[cyan]使用 poetry，将在 mofox 目录中执行命令[/cyan]")
             config.venv_path = config.mofox_path
         else:
+            assert config.mofox_path is not None
             default_venv_path = str(config.mofox_path.parent / "venv")
             if venv_type_choice == "uv":
                 default_venv_path = str(config.mofox_path.parent / ".venv")
             elif venv_type_choice == "conda":
                 default_venv_path = str(config.mofox_path.parent / "conda_env")
 
-            venv_path_str = Prompt.ask(
-                f"请输入 {venv_type_choice} 虚拟环境路径",
-                default=default_venv_path
-            )
+            venv_path_str = Prompt.ask(f"请输入 {venv_type_choice} 虚拟环境路径", default=default_venv_path)
             venv_path = Path(venv_path_str).expanduser().absolute()
 
             if not venv_path.exists():

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/mpdt/utils/file_ops.py

@@ -9,10 +9,10 @@ from pathlib import Path
 def ensure_dir(path: Path | str) -> Path:
     """
     确保目录存在，如果不存在则创建
-    
+
     Args:
         path: 目录路径
-        
+
     Returns:
         Path 对象
     """
@@ -24,15 +24,15 @@ def ensure_dir(path: Path | str) -> Path:
 def safe_write_file(path: Path | str, content: str, force: bool = False) -> bool:
     """
     安全地写入文件
-    
+
     Args:
         path: 文件路径
         content: 文件内容
         force: 是否覆盖已存在的文件
-        
+
     Returns:
         是否写入成功
-        
+
     Raises:
         FileExistsError: 文件已存在且 force=False
     """
@@ -52,12 +52,12 @@ def safe_write_file(path: Path | str, content: str, force: bool = False) -> bool
 def copy_directory(src: Path | str, dst: Path | str, force: bool = False) -> bool:
     """
     复制整个目录
-    
+
     Args:
         src: 源目录
         dst: 目标目录
         force: 是否覆盖已存在的目录
-        
+
     Returns:
         是否复制成功
     """
@@ -77,11 +77,11 @@ def copy_directory(src: Path | str, dst: Path | str, force: bool = False) -> boo
 def list_python_files(path: Path | str, recursive: bool = True) -> list[Path]:
     """
     列出目录中的所有 Python 文件
-    
+
     Args:
         path: 目录路径
         recursive: 是否递归搜索
-        
+
     Returns:
         Python 文件路径列表
     """
@@ -96,32 +96,34 @@ def list_python_files(path: Path | str, recursive: bool = True) -> list[Path]:
 def validate_plugin_name(name: str) -> bool:
     """
     验证插件名称是否符合规范
-    
+
     规范: 使用小写字母、数字和下划线，以字母开头
-    
+
     Args:
         name: 插件名称
-        
+
     Returns:
         是否符合规范
     """
     import re
+
     return bool(re.match(r"^[a-z][a-z0-9_]*$", name))
 
 
 def validate_component_name(name: str) -> bool:
     """
     验证组件名称是否符合规范
-    
+
     规范: 支持 snake_case 或 PascalCase
-    
+
     Args:
         name: 组件名称
-        
+
     Returns:
         是否符合规范
     """
     import re
+
     # 支持 snake_case 或 PascalCase
     return bool(re.match(r"^[a-zA-Z][a-zA-Z0-9_]*$", name))
 
@@ -129,7 +131,7 @@ def validate_component_name(name: str) -> bool:
 def get_git_user_info() -> dict[str, str]:
     """
     从 git config 获取用户信息
-    
+
     Returns:
         包含 name 和 email 的字典
     """
@@ -143,8 +145,8 @@ def get_git_user_info() -> dict[str, str]:
             capture_output=True,
             text=True,
             check=False,
-            encoding='utf-8',
-            errors='ignore'
+            encoding="utf-8",
+            errors="ignore",
         )
         if name.returncode == 0:
             result["name"] = name.stdout.strip()
@@ -154,8 +156,8 @@ def get_git_user_info() -> dict[str, str]:
             capture_output=True,
             text=True,
             check=False,
-            encoding='utf-8',
-            errors='ignore'
+            encoding="utf-8",
+            errors="ignore",
         )
         if email.returncode == 0:
             result["email"] = email.stdout.strip()
@@ -201,7 +203,8 @@ def to_snake_case(pascal_str: str) -> str:
         'test_command_handler'
     """
     import re
+
     # 在大写字母前插入下划线
-    s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', pascal_str)
+    s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", pascal_str)
     # 处理连续大写字母
-    return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
+    return re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1).lower()

mofox_plugin_dev_toolkit-0.3.5/mpdt/utils/plugin_parser.py

@@ -0,0 +1,137 @@
+"""
+插件名称解析器
+使用统一的 CodeParser 解析插件文件，提取运行时插件名称
+"""
+
+from pathlib import Path
+
+from .code_parser import CodeParser
+
+
+def extract_plugin_name(plugin_path: Path) -> str | None:
+    """从插件目录提取运行时插件名称
+
+    Args:
+        plugin_path: 插件目录路径
+
+    Returns:
+        插件名称，如果解析失败返回 None
+
+    Example:
+        >>> extract_plugin_name(Path("my_awesome_plugin"))
+        "awesome_plugin"  # 从 plugin.py 中的 plugin_name 属性读取
+    """
+    plugin_file = plugin_path / "plugin.py"
+
+    if not plugin_file.exists():
+        return None
+
+    try:
+        parser = CodeParser.from_file(plugin_file)
+        return parser.find_class_attribute(base_class="BasePlugin", attribute_name="plugin_name")
+    except Exception:
+        return None
+
+
+def get_plugin_info(plugin_path: Path) -> dict:
+    """获取插件详细信息
+
+    Args:
+        plugin_path: 插件目录路径
+
+    Returns:
+        包含插件信息的字典:
+        {
+            "dir_name": "my_awesome_plugin",
+            "plugin_name": "awesome_plugin",
+            "class_name": "MyAwesomePlugin",
+            "path": "/path/to/plugin",
+            "has_plugin_file": True,
+            "parse_success": True
+        }
+    """
+    info = {
+        "dir_name": plugin_path.name,
+        "plugin_name": None,
+        "class_name": None,
+        "path": str(plugin_path.absolute()),
+        "has_plugin_file": False,
+        "parse_success": False,
+    }
+
+    plugin_file = plugin_path / "plugin.py"
+
+    if not plugin_file.exists():
+        return info
+
+    info["has_plugin_file"] = True
+
+    try:
+        parser = CodeParser.from_file(plugin_file)
+
+        # 查找 BasePlugin 的子类
+        classes = parser.find_class(base_class="BasePlugin")
+
+        if classes:
+            # 获取第一个匹配的类
+            cls = classes[0]
+            info["class_name"] = cls.name.value
+
+            # 提取 plugin_name 属性
+            plugin_name = parser.find_class_attribute(base_class="BasePlugin", attribute_name="plugin_name")
+
+            if plugin_name:
+                info["plugin_name"] = plugin_name
+                info["parse_success"] = True
+
+        return info
+
+    except Exception as e:
+        info["error"] = str(e)
+        return info
+
+
+def validate_plugin_structure(plugin_path: Path) -> tuple[bool, list[str]]:
+    """验证插件目录结构
+
+    Args:
+        plugin_path: 插件目录路径
+
+    Returns:
+        (是否有效, 错误/警告消息列表)
+    """
+    messages = []
+
+    if not plugin_path.is_dir():
+        return False, ["路径不是一个目录"]
+
+    # 检查必需文件
+    required_files = {"plugin.py": "插件主文件", "__init__.py": "包初始化文件"}
+
+    for filename, description in required_files.items():
+        file_path = plugin_path / filename
+        if not file_path.exists():
+            messages.append(f"缺少 {description}: {filename}")
+
+    # 如果缺少必需文件，直接返回
+    if messages:
+        return False, messages
+
+    # 检查 plugin.py 是否可以解析
+    plugin_name = extract_plugin_name(plugin_path)
+    if not plugin_name:
+        messages.append("无法从 plugin.py 中提取 plugin_name")
+        messages.append("请确保有一个继承自 BasePlugin 的类，并定义了 plugin_name 属性")
+        return False, messages
+
+    # 检查推荐文件
+    recommended_files = {"config.toml": "配置文件", "README.md": "说明文档"}
+
+    for filename, description in recommended_files.items():
+        file_path = plugin_path / filename
+        if not file_path.exists():
+            messages.append(f"建议添加 {description}: {filename}")
+
+    # 如果只有建议性消息，仍然返回有效
+    has_errors = any("缺少" in msg or "无法" in msg for msg in messages)
+    return not has_errors, messages

{mofox_plugin_dev_toolkit-0.3.3 → mofox_plugin_dev_toolkit-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mofox-plugin-dev-toolkit"
-version = "0.3.3"
+version = "0.3.5"
 description = "开发工具集，用于快速创建、开发和测试 MoFox-Bot 插件"
 authors = [
     {name = "MoFox-Studio", email = "wwwww95915@qq.com"}

mofox_plugin_dev_toolkit-0.3.3/mpdt/utils/plugin_parser.py

@@ -1,195 +0,0 @@
-"""
-插件名称解析器
-使用 AST 解析插件文件，提取运行时插件名称
-"""
-
-import ast
-from pathlib import Path
-
-
-def extract_plugin_name(plugin_path: Path) -> str | None:
-    """从插件目录提取运行时插件名称
-
-    Args:
-        plugin_path: 插件目录路径
-
-    Returns:
-        插件名称，如果解析失败返回 None
-
-    Example:
-        >>> extract_plugin_name(Path("my_awesome_plugin"))
-        "awesome_plugin"  # 从 plugin.py 中的 plugin_name 属性读取
-    """
-    plugin_file = plugin_path / "plugin.py"
-
-    if not plugin_file.exists():
-        return None
-
-    try:
-        with open(plugin_file, encoding="utf-8") as f:
-            source = f.read()
-
-        tree = ast.parse(source)
-
-        # 查找 BasePlugin 的子类
-        for node in ast.walk(tree):
-            if isinstance(node, ast.ClassDef):
-                # 检查是否继承自 BasePlugin
-                is_base_plugin = False
-                for base in node.bases:
-                    if isinstance(base, ast.Name) and base.id == "BasePlugin":
-                        is_base_plugin = True
-                        break
-
-                if not is_base_plugin:
-                    continue
-
-                # 查找 plugin_name 属性
-                for item in node.body:
-                    # 处理普通赋值: plugin_name = "xxx"
-                    if isinstance(item, ast.Assign):
-                        for target in item.targets:
-                            if isinstance(target, ast.Name) and target.id == "plugin_name":
-                                if isinstance(item.value, ast.Constant):
-                                    return item.value.value
-
-                    # 处理带类型注解的赋值: plugin_name: str = "xxx"
-                    elif isinstance(item, ast.AnnAssign):
-                        if isinstance(item.target, ast.Name) and item.target.id == "plugin_name":
-                            if item.value and isinstance(item.value, ast.Constant):
-                                return item.value.value
-
-        return None
-
-    except Exception:
-        return None
-
-
-def get_plugin_info(plugin_path: Path) -> dict:
-    """获取插件详细信息
-
-    Args:
-        plugin_path: 插件目录路径
-
-    Returns:
-        包含插件信息的字典:
-        {
-            "dir_name": "my_awesome_plugin",
-            "plugin_name": "awesome_plugin",
-            "class_name": "MyAwesomePlugin",
-            "path": "/path/to/plugin",
-            "has_plugin_file": True,
-            "parse_success": True
-        }
-    """
-    info = {
-        "dir_name": plugin_path.name,
-        "plugin_name": None,
-        "class_name": None,
-        "path": str(plugin_path.absolute()),
-        "has_plugin_file": False,
-        "parse_success": False,
-    }
-
-    plugin_file = plugin_path / "plugin.py"
-
-    if not plugin_file.exists():
-        return info
-
-    info["has_plugin_file"] = True
-
-    try:
-        with open(plugin_file, encoding="utf-8") as f:
-            source = f.read()
-
-        tree = ast.parse(source)
-
-        # 查找 BasePlugin 的子类
-        for node in ast.walk(tree):
-            if isinstance(node, ast.ClassDef):
-                # 检查是否继承自 BasePlugin
-                is_base_plugin = False
-                for base in node.bases:
-                    if isinstance(base, ast.Name) and base.id == "BasePlugin":
-                        is_base_plugin = True
-                        break
-
-                if not is_base_plugin:
-                    continue
-
-                info["class_name"] = node.name
-
-                # 查找 plugin_name 属性
-                for item in node.body:
-                    # 处理普通赋值: plugin_name = "xxx"
-                    if isinstance(item, ast.Assign):
-                        for target in item.targets:
-                            if isinstance(target, ast.Name) and target.id == "plugin_name":
-                                if isinstance(item.value, ast.Constant):
-                                    info["plugin_name"] = item.value.value
-                                    info["parse_success"] = True
-                                    break
-
-                    # 处理带类型注解的赋值: plugin_name: str = "xxx"
-                    elif isinstance(item, ast.AnnAssign):
-                        if isinstance(item.target, ast.Name) and item.target.id == "plugin_name":
-                            if item.value and isinstance(item.value, ast.Constant):
-                                info["plugin_name"] = item.value.value
-                                info["parse_success"] = True
-                                break
-
-                # 找到 BasePlugin 子类后跳出
-                if info["class_name"]:
-                    break
-
-        return info
-
-    except Exception as e:
-        info["error"] = str(e)
-        return info
-
-
-def validate_plugin_structure(plugin_path: Path) -> tuple[bool, list[str]]:
-    """验证插件目录结构
-
-    Args:
-        plugin_path: 插件目录路径
-
-    Returns:
-        (是否有效, 错误/警告消息列表)
-    """
-    messages = []
-
-    if not plugin_path.is_dir():
-        return False, ["路径不是一个目录"]
-
-    # 检查必需文件
-    required_files = {"plugin.py": "插件主文件", "__init__.py": "包初始化文件"}
-
-    for filename, description in required_files.items():
-        file_path = plugin_path / filename
-        if not file_path.exists():
-            messages.append(f"缺少 {description}: {filename}")
-
-    # 如果缺少必需文件，直接返回
-    if messages:
-        return False, messages
-
-    # 检查 plugin.py 是否可以解析
-    plugin_name = extract_plugin_name(plugin_path)
-    if not plugin_name:
-        messages.append("无法从 plugin.py 中提取 plugin_name")
-        messages.append("请确保有一个继承自 BasePlugin 的类，并定义了 plugin_name 属性")
-        return False, messages
-
-    # 检查推荐文件
-    recommended_files = {"config.toml": "配置文件", "README.md": "说明文档"}
-
-    for filename, description in recommended_files.items():
-        file_path = plugin_path / filename
-        if not file_path.exists():
-            messages.append(f"建议添加 {description}: {filename}")
-
-    # 如果只有建议性消息，仍然返回有效
-    has_errors = any("缺少" in msg or "无法" in msg for msg in messages)
-    return not has_errors, messages