auto-coder 0.1.398__py3-none-any.whl → 0.1.399__py3-none-any.whl

autocoder/common/ac_style_command_parser/test_parser.py

@@ -0,0 +1,516 @@
+
+import pytest
+from typing import Dict, List, Any
+
+# 导入被测模块
+from .parser import (
+    CommandParser,
+    parse_query,
+    has_command,
+    get_command_args,
+    get_command_kwargs
+)
+
+
+class TestCommandParser:
+    """CommandParser类的单元测试"""
+    
+    @pytest.fixture
+    def parser(self):
+        """提供CommandParser实例"""
+        return CommandParser()
+    
+    def test_init(self, parser):
+        """测试CommandParser初始化"""
+        assert parser is not None
+        assert hasattr(parser, 'command_pattern')
+        assert hasattr(parser, 'key_value_pattern') 
+        assert hasattr(parser, 'path_pattern')
+    
+    def test_empty_query(self, parser):
+        """测试空查询字符串"""
+        assert parser.parse("") == {}
+        assert parser.parse("   ") == {}
+        assert parser.parse(None) == {}
+    
+    def test_single_command_no_args(self, parser):
+        """测试单个命令无参数"""
+        result = parser.parse("/help")
+        expected = {
+            "help": {
+                "args": [],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+    
+    def test_single_command_with_args(self, parser):
+        """测试单个命令带位置参数"""
+        result = parser.parse("/add file1.txt file2.py")
+        expected = {
+            "add": {
+                "args": ["file1.txt", "file2.py"],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+    
+    def test_single_command_with_kwargs(self, parser):
+        """测试单个命令带键值对参数"""
+        result = parser.parse("/config model=gpt-4 temperature=0.7")
+        expected = {
+            "config": {
+                "args": [],
+                "kwargs": {
+                    "model": "gpt-4",
+                    "temperature": "0.7"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_single_command_mixed_params(self, parser):
+        """测试单个命令混合参数"""
+        result = parser.parse("/deploy myapp env=prod version=1.0")
+        expected = {
+            "deploy": {
+                "args": ["myapp"],
+                "kwargs": {
+                    "env": "prod",
+                    "version": "1.0"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_quoted_args_double_quotes(self, parser):
+        """测试双引号参数"""
+        result = parser.parse('/say "hello world" "this is a test"')
+        expected = {
+            "say": {
+                "args": ["hello world", "this is a test"],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+    
+    def test_quoted_args_single_quotes(self, parser):
+        """测试单引号参数"""
+        result = parser.parse("/say 'hello world' 'this is a test'")
+        expected = {
+            "say": {
+                "args": ["hello world", "this is a test"],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+    
+    def test_quoted_kwargs(self, parser):
+        """测试带引号的键值对参数"""
+        result = parser.parse('/config message="hello world" path=\'/tmp/test dir\'')
+        expected = {
+            "config": {
+                "args": [],
+                "kwargs": {
+                    "message": "hello world",
+                    "path": "/tmp/test dir"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_multiple_commands(self, parser):
+        """测试多个命令"""
+        result = parser.parse("/add file1.txt /remove file2.txt")
+        expected = {
+            "add": {
+                "args": ["file1.txt"],
+                "kwargs": {}
+            },
+            "remove": {
+                "args": ["file2.txt"],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+    
+    def test_multiple_commands_with_mixed_params(self, parser):
+        """测试多个命令带混合参数"""
+        result = parser.parse("/deploy app1 env=prod /config model=gpt-4 /status")
+        expected = {
+            "deploy": {
+                "args": ["app1"],
+                "kwargs": {"env": "prod"}
+            },
+            "config": {
+                "args": [],
+                "kwargs": {"model": "gpt-4"}
+            },
+            "status": {
+                "args": [],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+    
+    def test_path_not_recognized_as_command(self, parser):
+        """测试路径不被识别为命令"""
+        result = parser.parse("/add /path/to/file.txt /config model=gpt-4")
+        expected = {
+            "add": {
+                "args": ["/path/to/file.txt"],
+                "kwargs": {}
+            },
+            "config": {
+                "args": [],
+                "kwargs": {"model": "gpt-4"}
+            }
+        }
+        assert result == expected
+    
+    def test_complex_path_handling(self, parser):
+        """测试复杂路径处理"""
+        result = parser.parse("/analyze /home/user/project/src/main.py /output /tmp/results")
+        expected = {
+            "analyze": {
+                "args": ["/home/user/project/src/main.py"],
+                "kwargs": {}
+            },
+            "output": {
+                "args": ["/tmp/results"],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+    
+    def test_command_with_dots_not_recognized(self, parser):
+        """测试带点的字符串不被识别为命令"""
+        result = parser.parse("check /config.json /setup.py")
+        # 不以/开头，所以没有命令被识别
+        assert result == {}
+    
+    def test_parse_command_existing(self, parser):
+        """测试解析特定存在的命令"""
+        query = "/add file1.txt /remove file2.txt mode=force"
+        result = parser.parse_command(query, "remove")
+        expected = {
+            "args": ["file2.txt"],
+            "kwargs": {"mode": "force"}
+        }
+        assert result == expected
+    
+    def test_parse_command_nonexistent(self, parser):
+        """测试解析不存在的命令"""
+        query = "/add file1.txt /remove file2.txt"
+        result = parser.parse_command(query, "deploy")
+        assert result is None
+    
+    def test_edge_case_empty_kwargs_value(self, parser):
+        """测试空的键值对值"""
+        result = parser.parse("/config key1= key2=value")
+        expected = {
+            "config": {
+                "args": [],
+                "kwargs": {
+                    "key1": "",
+                    "key2": "value"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_edge_case_special_characters_in_values(self, parser):
+        """测试值中包含特殊字符"""
+        result = parser.parse("/config url=https://api.example.com/v1 pattern='*.py'")
+        expected = {
+            "config": {
+                "args": [],
+                "kwargs": {
+                    "url": "https://api.example.com/v1",
+                    "pattern": "*.py"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_command_at_end_of_string(self, parser):
+        """测试字符串末尾的命令"""
+        result = parser.parse("some text /help")
+        expected = {
+            "help": {
+                "args": [],
+                "kwargs": {}
+            }
+        }
+        assert result == expected
+
+
+class TestConvenienceFunctions:
+    """测试便捷函数"""
+    
+    def test_parse_query_function(self):
+        """测试parse_query函数"""
+        result = parse_query("/add file1.txt mode=fast")
+        expected = {
+            "add": {
+                "args": ["file1.txt"],
+                "kwargs": {"mode": "fast"}
+            }
+        }
+        assert result == expected
+    
+    def test_has_command_true(self):
+        """测试has_command函数 - 命令存在"""
+        assert has_command("/add file1.txt /remove file2.txt", "add") == True
+        assert has_command("/add file1.txt /remove file2.txt", "remove") == True
+    
+    def test_has_command_false(self):
+        """测试has_command函数 - 命令不存在"""
+        assert has_command("/add file1.txt /remove file2.txt", "deploy") == False
+        assert has_command("no commands here", "add") == False
+        assert has_command("", "add") == False
+    
+    def test_get_command_args_existing(self):
+        """测试get_command_args函数 - 命令存在"""
+        query = "/add file1.txt file2.py /remove file3.txt"
+        assert get_command_args(query, "add") == ["file1.txt", "file2.py"]
+        assert get_command_args(query, "remove") == ["file3.txt"]
+    
+    def test_get_command_args_nonexistent(self):
+        """测试get_command_args函数 - 命令不存在"""
+        query = "/add file1.txt file2.py"
+        assert get_command_args(query, "remove") == []
+        assert get_command_args("", "add") == []
+    
+    def test_get_command_kwargs_existing(self):
+        """测试get_command_kwargs函数 - 命令存在"""
+        query = "/config model=gpt-4 temp=0.7 /deploy env=prod"
+        assert get_command_kwargs(query, "config") == {"model": "gpt-4", "temp": "0.7"}
+        assert get_command_kwargs(query, "deploy") == {"env": "prod"}
+    
+    def test_get_command_kwargs_nonexistent(self):
+        """测试get_command_kwargs函数 - 命令不存在"""
+        query = "/config model=gpt-4"
+        assert get_command_kwargs(query, "deploy") == {}
+        assert get_command_kwargs("", "config") == {}
+
+
+class TestComplexScenarios:
+    """测试复杂场景"""
+    
+    def test_real_world_scenario_1(self):
+        """测试真实场景1：文件操作命令"""
+        query = '/add "src/main.py" "tests/test_main.py" /config model="gpt-4" temperature=0.7 /deploy env=production version="1.2.3"'
+        result = parse_query(query)
+        
+        expected = {
+            "add": {
+                "args": ["src/main.py", "tests/test_main.py"],
+                "kwargs": {}
+            },
+            "config": {
+                "args": [],
+                "kwargs": {
+                    "model": "gpt-4",
+                    "temperature": "0.7"
+                }
+            },
+            "deploy": {
+                "args": [],
+                "kwargs": {
+                    "env": "production",
+                    "version": "1.2.3"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_real_world_scenario_2(self):
+        """测试真实场景2：包含路径的复杂命令"""
+        query = "/analyze /home/user/project/src /output /tmp/analysis.json format=json verbose=true"
+        result = parse_query(query)
+        
+        expected = {
+            "analyze": {
+                "args": ["/home/user/project/src"],
+                "kwargs": {}
+            },
+            "output": {
+                "args": ["/tmp/analysis.json"],
+                "kwargs": {
+                    "format": "json",
+                    "verbose": "true"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_real_world_scenario_3(self):
+        """测试真实场景3：混合引号和特殊字符"""
+        query = """/search pattern="*.py" path='/home/user/My Documents/project' /filter exclude="__pycache__" """
+        result = parse_query(query)
+        
+        expected = {
+            "search": {
+                "args": [],
+                "kwargs": {
+                    "pattern": "*.py",
+                    "path": "/home/user/My Documents/project"
+                }
+            },
+            "filter": {
+                "args": [],
+                "kwargs": {
+                    "exclude": "__pycache__"
+                }
+            }
+        }
+        assert result == expected
+    
+    def test_edge_case_consecutive_commands(self):
+        """测试连续命令"""
+        query = "/start /stop /restart mode=fast"
+        result = parse_query(query)
+        
+        expected = {
+            "start": {
+                "args": [],
+                "kwargs": {}
+            },
+            "stop": {
+                "args": [],
+                "kwargs": {}
+            },
+            "restart": {
+                "args": [],
+                "kwargs": {"mode": "fast"}
+            }
+        }
+        assert result == expected
+    
+    def test_edge_case_command_with_numbers_and_underscores(self):
+        """测试包含数字和下划线的命令"""
+        query = "/test_case_1 /deploy_v2 app_name=test123"
+        result = parse_query(query)
+        
+        expected = {
+            "test_case_1": {
+                "args": [],
+                "kwargs": {}
+            },
+            "deploy_v2": {
+                "args": [],
+                "kwargs": {"app_name": "test123"}
+            }
+        }
+        assert result == expected
+
+
+class TestErrorHandling:
+    """测试错误处理和边界情况"""
+    
+    def test_malformed_quotes(self):
+        """测试格式错误的引号"""
+        # 这些应该仍能部分解析，不会抛出异常
+        parser = CommandParser()
+        
+        # 未闭合的引号 - 应该被当作普通参数处理
+        result = parser.parse('/test "unclosed quote arg')
+        assert "test" in result
+        
+        # 混合引号
+        result = parser.parse('/test "mixed\' quotes"')
+        assert "test" in result
+    
+    def test_special_characters_in_commands(self):
+        """测试命令中的特殊字符"""
+        parser = CommandParser()
+        
+        # 命令名只能包含单词字符，所以这些不会被识别为命令
+        result = parser.parse("/test-command /test.command")
+        assert result == {}
+    
+    def test_whitespace_handling(self):
+        """测试空白字符处理"""
+        parser = CommandParser()
+        
+        query = "  /add    file1.txt    file2.py   key=value   "
+        result = parser.parse(query)
+        
+        expected = {
+            "add": {
+                "args": ["file1.txt", "file2.py"],
+                "kwargs": {"key": "value"}
+            }
+        }
+        assert result == expected
+    
+    def test_unicode_characters(self):
+        """测试Unicode字符"""
+        parser = CommandParser()
+        
+        query = '/test "中文参数" key="中文值"'
+        result = parser.parse(query)
+        
+        expected = {
+            "test": {
+                "args": ["中文参数"],
+                "kwargs": {"key": "中文值"}
+            }
+        }
+        assert result == expected
+
+    def test__command_with_path(self, parser):
+        """测试单个命令混合参数"""
+        result = parser.parse('/command "tdd/hello.md" name="威廉"')
+        expected = {
+            "command": {
+                "args": ["tdd/hello.md"],
+                "kwargs": {
+                    "name": "威廉"
+                }
+            }
+        }
+        assert result == expected    
+
+
+# 参数化测试用例
+@pytest.mark.parametrize("query,expected_commands", [
+    ("/help", ["help"]),
+    ("/add /remove", ["add", "remove"]),
+    ("/config model=gpt-4", ["config"]),
+    ("no commands", []),
+    ("/start /stop /restart", ["start", "stop", "restart"]),
+])
+def test_command_detection_parametrized(query, expected_commands):
+    """参数化测试命令检测"""
+    result = parse_query(query)
+    actual_commands = list(result.keys())
+    assert actual_commands == expected_commands
+
+
+@pytest.mark.parametrize("query,command,expected_args", [
+    ("/add file1 file2", "add", ["file1", "file2"]),
+    ("/remove", "remove", []),
+    ("/test arg1 'arg with spaces'", "test", ["arg1", "arg with spaces"]),
+    ("", "any", []),
+])
+def test_get_args_parametrized(query, command, expected_args):
+    """参数化测试获取参数"""
+    assert get_command_args(query, command) == expected_args
+
+
+@pytest.mark.parametrize("query,command,expected_kwargs", [
+    ("/config model=gpt-4 temp=0.7", "config", {"model": "gpt-4", "temp": "0.7"}),
+    ("/deploy", "deploy", {}),
+    ("/test key='value with spaces'", "test", {"key": "value with spaces"}),
+    ("", "any", {}),
+])
+def test_get_kwargs_parametrized(query, command, expected_kwargs):
+    """参数化测试获取键值对参数"""
+    assert get_command_kwargs(query, command) == expected_kwargs
+
+
+if __name__ == "__main__":
+    # 可以直接运行此文件进行测试
+    pytest.main([__file__, "-v"])

autocoder/common/command_completer_v2.py

@@ -22,7 +22,7 @@ COMMAND_HIERARCHY = {
     "/mcp": {"/add": {}, "/remove": {}, "/list": {}, "/list_running": {}, "/refresh": {}, "/info": {}},
     "/lib": {"/add": {}, "/remove": {}, "/list": {}, "/set-proxy": {}, "/refresh": {}, "/get": {}},
     "/models": {"/chat": {}, "/add": {}, "/add_model": {}, "/remove": {}, "/list": {}, "/speed": {}, "/speed-test": {}, "/input_price": {}, "/output_price": {}, "/activate": {}},
-    "/auto": {},
+    "/auto": {"/new": {}, "/id": {}, "/list": {}},
     "/shell": {"/chat": {}},
     "/active_context": {"/list": {}, "/run": {}},
     "/index": {"/query": {}, "/build": {}, "/export": {}, "/import": {}},

autocoder/common/command_file_manager/examples.py

@@ -9,7 +9,7 @@ import sys
 import json
 from typing import Dict, Set, List
 
-from autocoder.common.command_manager import (
+from autocoder.common.command_file_manager import (
     CommandManager, CommandFile, JinjaVariable, CommandFileAnalysisResult
 )
 
@@ -122,16 +122,30 @@ def get_all_variables_example(manager: CommandManager):
         print()
 
 
-def main():
-    """主函数"""
-    # 设置测试环境
+def initialization_examples():
+    """初始化示例"""
+    print("\n=== CommandManager 初始化示例 ===")
+    
+    # 方式1: 使用默认目录（工作目录下的.autocodercommands目录）
+    print("方式1: 使用默认目录")
+    default_manager = CommandManager()
+    print(f"默认命令目录: {default_manager.commands_dir}")
+    
+    # 方式2: 指定自定义目录
+    print("\n方式2: 指定自定义目录")
     test_dir = setup_test_environment()
-    print(f"测试目录: {test_dir}")
+    custom_manager = CommandManager(test_dir)
+    print(f"自定义命令目录: {custom_manager.commands_dir}")
     
-    # 创建命令管理器
-    manager = CommandManager(test_dir)
+    return custom_manager
+
+
+def main():
+    """主函数"""
+    # 展示初始化示例
+    manager = initialization_examples()
     
-    # 运行示例
+    # 运行其他示例
     list_command_files_example(manager)
     read_command_file_example(manager)
     analyze_command_file_example(manager)

autocoder/common/command_file_manager/manager.py

@@ -5,8 +5,9 @@
 """
 
 import os
-import logging
-from typing import Dict, List, Optional, Set, Tuple
+from loguru import logger
+from typing import Dict, List, Optional, Set, Tuple, Any
+from byzerllm.utils import format_str_jinja2
 
 from autocoder.common.command_file_manager.models import (
     CommandFile, JinjaVariable, CommandFileAnalysisResult, ListCommandsResult
@@ -16,19 +17,19 @@ from autocoder.common.command_file_manager.utils import (
     analyze_command_file, is_command_file
 )
 
-logger = logging.getLogger(__name__)
-
 
 class CommandManager:
     """命令管理器，提供高层次的API接口"""
     
-    def __init__(self, commands_dir: str):
+    def __init__(self, commands_dir: Optional[str] = None):
         """
         初始化命令管理器
         
         Args:
-            commands_dir: 命令文件目录路径
+            commands_dir: 命令文件目录路径，如果为None则默认使用工作目录下的.autocodercommands目录
         """
+        if commands_dir is None:
+            commands_dir = os.path.join(os.getcwd(), ".autocodercommands")
         self.commands_dir = os.path.abspath(commands_dir)
         
         # 确保目录存在
@@ -97,6 +98,36 @@ class CommandManager:
             logger.error(f"读取命令文件时出错: {str(e)}")
             return None
     
+    def read_command_file_with_render(self, file_name: str, render_variables: Dict[str, Any] = {}) -> Optional[str]:
+        """
+        读取指定的命令文件并使用 Jinja2 进行渲染
+        
+        Args:
+            file_name: 命令文件名或相对路径
+            render_variables: 用于 Jinja2 渲染的变量字典，如果为 None 则使用空字典
+            
+        Returns:
+            Optional[str]: 渲染后的文件内容，如果文件不存在或渲染失败则返回None
+        """
+        if render_variables is None:
+            render_variables = {}
+            
+        # 首先读取命令文件
+        command_file = self.read_command_file(file_name)
+        if command_file is None:
+            return None
+        
+        try:
+            # 使用 format_str_jinja2 进行渲染
+            rendered_content = format_str_jinja2(command_file.content, **render_variables)
+            
+            logger.info(f"成功渲染命令文件: {file_name}, 使用变量: {render_variables}")
+            return rendered_content
+            
+        except Exception as e:
+            logger.error(f"渲染命令文件时出错: {file_name}, 错误: {str(e)}")
+            return None
+    
     def analyze_command_file(self, file_name: str) -> Optional[CommandFileAnalysisResult]:
         """
         分析指定的命令文件，提取其中的Jinja2变量