auto-coder 0.1.264__py3-none-any.whl → 0.1.266__py3-none-any.whl

autocoder/chat_auto_coder.py

@@ -134,6 +134,7 @@ commands = [
     "/index/export",
     "/index/import",
     "/exclude_dirs",
+    "/exclude_files",
     "/help",
     "/shell",
     "/voice_input",
@@ -145,6 +146,8 @@ commands = [
     "/mcp",
     "/models",
     "/auto",
+    "/conf/export",
+    "/conf/import",
 ]
 
 
@@ -604,7 +607,7 @@ def get_symbol_list() -> List[SymbolItem]:
     index_file = os.path.join(".auto-coder", "index.json")
 
     if os.path.exists(index_file):
-        with open(index_file, "r") as file:
+        with open(index_file, "r",encoding="utf-8") as file:
             index_data = json.load(file)
     else:
         index_data = {}
@@ -641,7 +644,7 @@ def get_symbol_list() -> List[SymbolItem]:
 
 
 def save_memory():
-    with open(os.path.join(base_persist_dir, "memory.json"), "w") as f:
+    with open(os.path.join(base_persist_dir, "memory.json"), "w",encoding="utf-8") as f:
         json.dump(memory, f, indent=2, ensure_ascii=False)
     load_memory()
 
@@ -650,7 +653,7 @@ def load_memory():
     global memory
     memory_path = os.path.join(base_persist_dir, "memory.json")
     if os.path.exists(memory_path):
-        with open(memory_path, "r") as f:
+        with open(memory_path, "r", encoding="utf-8") as f:
             memory = json.load(f)
     completer.update_current_files(memory["current_files"]["files"])
 
@@ -1093,7 +1096,7 @@ def ask(query: str):
 
     execute_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(os.path.join(execute_file), "w") as f:
+    with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
         f.write(yaml_content)
 
     def execute_ask():
@@ -1141,7 +1144,7 @@ def get_llm_friendly_package_docs(
                                         if return_paths:
                                             docs.append(file_path)
                                         else:
-                                            with open(file_path, "r") as f:
+                                            with open(file_path, "r",encoding="utf-8") as f:
                                                 docs.append(f.read())
 
     return docs
@@ -1151,7 +1154,7 @@ def convert_yaml_to_config(yaml_file: str):
     from autocoder.auto_coder import AutoCoderArgs, load_include_files, Template
 
     args = AutoCoderArgs()
-    with open(yaml_file, "r") as f:
+    with open(yaml_file, "r",encoding="utf-8") as f:
         config = yaml.safe_load(f)
         config = load_include_files(config, yaml_file)
         for key, value in config.items():
@@ -1241,7 +1244,7 @@ def mcp(query: str):
 
     temp_yaml = os.path.join("actions", f"{uuid.uuid4()}.yml")
     try:
-        with open(temp_yaml, "w") as f:
+        with open(temp_yaml, "w",encoding="utf-8") as f:
             f.write(convert_yaml_config_to_str(yaml_config=yaml_config))
         args = convert_yaml_to_config(temp_yaml)
     finally:
@@ -1310,7 +1313,7 @@ def code_next(query: str):
 
     temp_yaml = os.path.join("actions", f"{uuid.uuid4()}.yml")
     try:
-        with open(temp_yaml, "w") as f:
+        with open(temp_yaml, "w",encoding="utf-8") as f:
             f.write(convert_yaml_config_to_str(yaml_config=yaml_config))
         args = convert_yaml_to_config(temp_yaml)
     finally:
@@ -1417,7 +1420,7 @@ def commit(query: str):
             # 临时保存yaml文件，然后读取yaml文件，转换为args
             temp_yaml = os.path.join("actions", f"{uuid.uuid4()}.yml")
             try:
-                with open(temp_yaml, "w") as f:
+                with open(temp_yaml, "w",encoding="utf-8") as f:
                     f.write(convert_yaml_config_to_str(
                         yaml_config=yaml_config))
                 args = convert_yaml_to_config(temp_yaml)
@@ -1444,7 +1447,7 @@ def commit(query: str):
 
             yaml_config["query"] = commit_message
             yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
-            with open(os.path.join(execute_file), "w") as f:
+            with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
                 f.write(yaml_content)
 
             file_content = open(execute_file).read()
@@ -1504,6 +1507,7 @@ def coding(query: str):
             "silence": conf.get("silence", "true") == "true",
             "include_project_structure": conf.get("include_project_structure", "true")
             == "true",
+            "exclude_files": conf.get("exclude_files", []),
         }
 
         yaml_config["context"] = ""        
@@ -1559,7 +1563,7 @@ def coding(query: str):
                 error_message()
                 return
 
-            with open(memory_file, "r") as f:
+            with open(memory_file, "r",encoding="utf-8") as f:
                 chat_history = json.load(f)
 
             if not chat_history["ask_conversation"]:
@@ -1583,7 +1587,7 @@ def coding(query: str):
         md5 = hashlib.md5(yaml_content.encode("utf-8")).hexdigest()
 
         execute_file = os.path.join("actions", latest_yaml_file)
-        with open(os.path.join(execute_file), "w") as f:
+        with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
             f.write(yaml_content)
 
         def execute_chat():
@@ -1632,6 +1636,7 @@ def chat(query: str):
         "skip_build_index": conf.get("skip_build_index", "true") == "true",
         "skip_confirm": conf.get("skip_confirm", "true") == "true",
         "silence": conf.get("silence", "true") == "true",
+        "exclude_files": conf.get("exclude_files", []),
     }
 
     current_files = memory["current_files"]["files"] + get_llm_friendly_package_docs(
@@ -1698,7 +1703,7 @@ def chat(query: str):
 
     execute_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(os.path.join(execute_file), "w") as f:
+    with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
         f.write(yaml_content)
 
     def execute_ask():
@@ -1722,7 +1727,7 @@ def summon(query: str):
     for file in current_files:
         if os.path.exists(file):
             try:
-                with open(file, "r") as f:
+                with open(file, "r",encoding="utf-8") as f:
                     content = f.read()
                     s = f"##File: {file}\n{content}\n\n"
                     file_contents.append(s)
@@ -1758,7 +1763,7 @@ def summon(query: str):
 
     execute_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(os.path.join(execute_file), "w") as f:
+    with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
         f.write(yaml_content)
 
     def execute_summon():
@@ -1805,7 +1810,7 @@ def design(query: str):
 
     execute_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(os.path.join(execute_file), "w") as f:
+    with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
         f.write(yaml_content)
 
     def execute_design():
@@ -1834,7 +1839,7 @@ def voice_input():
 
     execute_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(os.path.join(execute_file), "w") as f:
+    with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
         f.write(yaml_content)
 
     def execute_voice2text_command():
@@ -1842,7 +1847,7 @@ def voice_input():
 
     try:
         execute_voice2text_command()
-        with open(os.path.join(".auto-coder", "exchange.txt"), "r") as f:
+        with open(os.path.join(".auto-coder", "exchange.txt"), "r",encoding="utf-8") as f:
             return f.read()
     finally:
         os.remove(execute_file)
@@ -1864,12 +1869,12 @@ def generate_shell_command(input_text):
 
     execute_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(os.path.join(execute_file), "w") as f:
+    with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
         f.write(yaml_content)
 
     try:
         auto_coder_main(["agent", "generate_command", "--file", execute_file])
-        with open(os.path.join(".auto-coder", "exchange.txt"), "r") as f:
+        with open(os.path.join(".auto-coder", "exchange.txt"), "r",encoding="utf-8") as f:
             shell_script = f.read()
         result_manager = ResultManager()
         result_manager.add_result(content=shell_script,meta={
@@ -2265,18 +2270,61 @@ def manage_models(query: str):
 
 def exclude_dirs(dir_names: List[str]):
     new_dirs = dir_names
-    existing_dirs = memory.get("exclude_dirs", [])
+    existing_dirs = memory.get("exclude_dirs", [])    
     dirs_to_add = [d for d in new_dirs if d not in existing_dirs]
+    
     if dirs_to_add:
         existing_dirs.extend(dirs_to_add)
         if "exclude_dirs" not in memory:
             memory["exclude_dirs"] = existing_dirs
         print(f"Added exclude dirs: {dirs_to_add}")
+        exclude_files([f"regex://.*/{d}/*." for d in dirs_to_add])            
     else:
         print("All specified dirs are already in the exclude list.")
     save_memory()
     completer.refresh_files()
 
+def exclude_files(file_patterns: List[str]):
+    result_manager = ResultManager()
+    printer = Printer()
+    new_file_patterns = file_patterns
+    existing_file_patterns = memory.get("exclude_files", [])    
+    file_patterns_to_add = [f for f in new_file_patterns if f not in existing_file_patterns]
+
+    for file_pattern in file_patterns_to_add:
+        if not file_pattern.startswith("regex://"): 
+            result_manager.add_result(content=printer.get_message_from_key_with_format("invalid_file_pattern", file_pattern=file_pattern),meta={
+                "action": "exclude_files",
+                "input": {
+                    "query": file_pattern
+                }
+            })
+            raise ValueError(printer.get_message_from_key_with_format("invalid_file_pattern", file_pattern=file_pattern))
+
+    if file_patterns_to_add:
+        existing_file_patterns.extend(file_patterns_to_add)
+        if "exclude_files" not in memory:
+            memory["exclude_files"] = existing_file_patterns
+        
+        result_manager.add_result(content=f"Added exclude files: {file_patterns_to_add}",meta={
+            "action": "exclude_files",
+            "input": {
+                "query": file_patterns_to_add
+            }
+        })
+        save_memory()
+        print(f"Added exclude files: {file_patterns_to_add}")
+    else:
+        result_manager.add_result(content=f"All specified files are already in the exclude list.",meta={
+            "action": "exclude_files",
+            "input": {
+                "query": file_patterns_to_add
+            }
+        })
+        print("All specified files are already in the exclude list.")
+    
+    
+
 @run_in_raw_thread()
 def index_build():
     conf = memory.get("conf", {})
@@ -2292,7 +2340,7 @@ def index_build():
     yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
     yaml_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(yaml_file, "w") as f:
+    with open(yaml_file, "w",encoding="utf-8") as f:
         f.write(yaml_content)
     try:
         with redirect_stdout() as output:
@@ -2322,7 +2370,7 @@ def get_final_config()->AutoCoderArgs:
 
     temp_yaml = os.path.join("actions", f"{uuid.uuid4()}.yml")
     try:
-        with open(temp_yaml, "w") as f:
+        with open(temp_yaml, "w",encoding="utf-8") as f:
             f.write(convert_yaml_config_to_str(yaml_config=yaml_config))
         args = convert_yaml_to_config(temp_yaml)
     finally:
@@ -2339,26 +2387,26 @@ def help(query: str):
     auto_config_tuner.tune(AutoConfigRequest(query=query))    
 
 @run_in_raw_thread()
-def index_export(export_path: str):
+def index_export(path: str):
     from autocoder.common.index_import_export import export_index
     from autocoder.common.printer import Printer
     printer = Printer()
     project_root = os.getcwd()
-    if export_index(project_root, export_path):
-        printer.print_in_terminal("index_export_success", path=export_path)
+    if export_index(project_root, path):
+        printer.print_in_terminal("index_export_success", path=path)
     else:
-        printer.print_in_terminal("index_export_fail", path=export_path)
+        printer.print_in_terminal("index_export_fail", path=path)
 
 @run_in_raw_thread()
-def index_import(import_path: str):
+def index_import(path: str):
     from autocoder.common.index_import_export import import_index
     from autocoder.common.printer import Printer
     printer = Printer()
     project_root = os.getcwd()
-    if import_index(project_root, import_path):
-        printer.print_in_terminal("index_import_success", path=import_path)
+    if import_index(project_root, path):
+        printer.print_in_terminal("index_import_success", path=path)
     else:
-        printer.print_in_terminal("index_import_fail", path=import_path)
+        printer.print_in_terminal("index_import_fail", path=path)
 
 @run_in_raw_thread()
 def index_query(query: str):
@@ -2377,7 +2425,7 @@ def index_query(query: str):
     yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
     yaml_file = os.path.join("actions", f"{uuid.uuid4()}.yml")
 
-    with open(yaml_file, "w") as f:
+    with open(yaml_file, "w",encoding="utf-8") as f:
         f.write(yaml_content)
     try:
         with redirect_stdout() as output:
@@ -2409,10 +2457,30 @@ def list_files():
             )
         )
 
-@run_in_raw_thread()
-def execute_shell_command(command: str):
-    from autocoder.common.shells import execute_shell_command as shell_exec
-    shell_exec(command)
+
+def gen_and_exec_shell_command(query: str):
+    from rich.prompt import Confirm    
+    from autocoder.common.printer import Printer 
+    from rich.console import Console
+    
+    printer = Printer()
+    console = Console()
+    # Generate the shell script
+    shell_script = generate_shell_command(query)    
+
+    # Ask for confirmation using rich
+    if Confirm.ask(
+        printer.get_message_from_key("confirm_execute_shell_script"),
+        default=False
+    ):
+        execute_shell_command(shell_script)
+    else:
+        console.print(
+            Panel(
+                printer.get_message_from_key("shell_script_not_executed"),
+                border_style="yellow"
+            )
+        )
 
 
 def lib_command(args: List[str]):
@@ -2542,6 +2610,20 @@ def lib_command(args: List[str]):
     else:
         console.print(f"Unknown subcommand: {subcommand}")
 
+
+def execute_shell_command(command: str):
+    from autocoder.common.shells import execute_shell_command as shell_exec
+    shell_exec(command)
+
+
+def conf_export(path: str):
+    from autocoder.common.conf_import_export import export_conf
+    export_conf(os.getcwd(), path)
+
+def conf_import(path: str):
+    from autocoder.common.conf_import_export import import_conf
+    import_conf(os.getcwd(), path)
+
 @run_in_raw_thread()
 def auto_command(params,query: str):
     """处理/auto指令"""
@@ -2568,6 +2650,7 @@ def auto_command(params,query: str):
                                  commit=commit,
                                  help=help,
                                  exclude_dirs=exclude_dirs,
+                                 exclude_files=exclude_files,
                                  ask=ask,
                                  chat=chat,
                                  coding=coding,
@@ -2579,7 +2662,11 @@ def auto_command(params,query: str):
                                  index_build=index_build,
                                  index_query=index_query,  
                                  execute_shell_command=execute_shell_command,  
-                                 generate_shell_command=generate_shell_command                                                                                       
+                                 generate_shell_command=generate_shell_command,
+                                 conf_export=conf_export,
+                                 conf_import=conf_import,
+                                 index_export=index_export,
+                                 index_import=index_import                                                                                       
                              ))
 
     # 生成建议
@@ -2780,17 +2867,11 @@ def main():
 
             elif user_input.startswith("/index/export"):
                 export_path = user_input[len("/index/export"):].strip()
-                if not export_path:
-                    print("Please specify the export path")
-                else:
-                    index_export(export_path)
+                index_export(export_path)                    
 
             elif user_input.startswith("/index/import"):
-                import_path = user_input[len("/index/import"):].strip()
-                if not import_path:
-                    print("Please specify the import path")
-                else:
-                    index_import(import_path)
+                import_path  = user_input[len("/index/import"):].strip()
+                index_import(import_path)                    
 
             elif user_input.startswith("/list_files"):
                 list_files()
@@ -2808,7 +2889,17 @@ def main():
                     print(memory["mode"])
                 else:
                     memory["mode"] = conf                    
-
+            
+            elif user_input.startswith("/conf/export"):
+                from autocoder.common.conf_import_export import export_conf
+                export_path = user_input[len("/conf/export"):].strip()
+                export_conf(os.getcwd(), export_path)                    
+            
+            elif user_input.startswith("/conf/import"):
+                from autocoder.common.conf_import_export import import_conf
+                import_path = user_input[len("/conf/import"):].strip()
+                import_conf(os.getcwd(), import_path)                    
+                    
             elif user_input.startswith("/conf"):
                 conf = user_input[len("/conf"):].strip()
                 if not conf:
@@ -2831,6 +2922,12 @@ def main():
                 dir_names = user_input[len(
                     "/exclude_dirs"):].strip().split(",")
                 exclude_dirs(dir_names)
+
+            elif user_input.startswith("/exclude_files"):
+                file_patterns = user_input[len(
+                    "/exclude_files"):].strip().split(",")
+                exclude_files(file_patterns)
+
             elif user_input.startswith("/ask"):
                 query = user_input[len("/ask"):].strip()
                 if not query:
@@ -2893,12 +2990,16 @@ def main():
             # elif user_input.startswith("/shell"):
             else:
                 command = user_input
-                if user_input.startswith("/shell"):
+                if user_input.startswith("/shell"):                    
                     command = user_input[len("/shell"):].strip()
                     if not command:
                         print("Please enter a shell command to execute.")
                     else:
-                        execute_shell_command(command)
+                        if command.startswith("/chat"):
+                            command = command[len("/chat"):].strip()
+                            gen_and_exec_shell_command(command)
+                        else:
+                            execute_shell_command(command)
 
         except KeyboardInterrupt:
             continue

autocoder/commands/auto_command.py

@@ -138,6 +138,11 @@ class CommandConfig(BaseModel):
     lib: SkipValidation[Callable]
     execute_shell_command: SkipValidation[Callable]
     generate_shell_command: SkipValidation[Callable]
+    conf_export: SkipValidation[Callable]
+    conf_import: SkipValidation[Callable]
+    index_export: SkipValidation[Callable]
+    index_import: SkipValidation[Callable]
+    exclude_files: SkipValidation[Callable]
 
     
 
@@ -298,6 +303,7 @@ class CommandAutoTuner:
             try:
                 response = to_model(content, AutoCommandResponse)  
                 if response.suggestions:
+                    print(response)
                     command = response.suggestions[0].command
                     parameters = response.suggestions[0].parameters                    
                     if parameters:
@@ -306,9 +312,9 @@ class CommandAutoTuner:
                         params_str = ""                    
                     return f"{command}({params_str})"
                 else:
-                    return printer.get_message_from_key("satisfied_prompt", style="green")                    
-            except Exception as e:
-                logger.error(f"Error extracting command response: {e}")
+                    return printer.get_message_from_key("satisfied_prompt")                    
+            except Exception as e:                
+                logger.error(f"Error extracting command response: {str(e)}")
                 return content
             
         model_name = ",".join(llms_utils.get_llm_names(self.llm))
@@ -635,9 +641,10 @@ class CommandAutoTuner:
         ## editblock_similarity: editblock相似度阈值
         - editblock相似度阈值，取值范围为0-1，默认值为0.9。如果设置的太低，虽然能合并进去，但是会引入错误。推荐不要修改该值。
 
-        ## generate_times_same_model: 相同模型生成次数
+        ## generate_times_same_model: 相同模型生成次数,也叫采样数
         当进行生成代码时，大模型会对同一个需求生成多份代码，然后会使用 generate_rerank_model 模型对多份代码进行重排序，
         然后选择得分最高的代码。一般次数越多，最终得到正确的代码概率越高。默认值为1，推荐设置为3。但是设置值越多，可能速度就越慢，消耗的token也越多。
+        当用户提到，帮我采样数设置为3， 那么你就设置该参数即可。
 
         ## skip_filter_index: 是否跳过索引过滤
         是否跳过根据用户的query 自动查找上下文。推荐设置为 false
@@ -1111,7 +1118,72 @@ class CommandAutoTuner:
         </usage>
         </command>
 
-        </commands>        
+        <command>
+        <name>conf_export</name>
+        <description>配置管理命令，用于管理和控制配置。</description>
+        <usage>
+         该命令导出当前软件的配置，并保存到指定路径。
+         
+         使用例子：         
+         conf_export(path="导出路径,通常是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>conf_import</name>
+        <description>配置管理命令，用于管理和控制配置。</description>
+        <usage>
+         该命令导入指定路径的配置文件到当前软件。
+         
+         使用例子：         
+         conf_import(path="导入路径,通常是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>index_export</name>
+        <description>索引管理命令，用于管理和控制索引。</description>
+        <usage>
+         该命令导出当前软件的索引，并保存到指定路径。
+         
+         使用例子：         
+         index_export(path="导出路径,通常是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>index_import</name>
+        <description>索引管理命令，用于管理和控制索引。</description>
+        <usage>
+         该命令导入指定路径的索引文件到当前软件。
+         
+         使用例子：         
+         index_import(path="导入路径，通常最后是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>exclude_files</name>
+        <description>排除指定文件。</description>
+        <usage>
+         该命令接受一个参数 file_patterns, 为要排除的文件模式字符串列表。
+         
+         使用例子,比如你想要排除 package-lock.json 文件，你可以这样调用：
+        
+         exclude_files(file_patterns=["regex://.*/package-lock\.json"])
+         
+         注意：
+         - 文件模式字符串必须以 regex:// 开头
+         - regex:// 后面部分是标准的正则表达式         
+        </usage>
+        </command>
+        </commands>
+        
+        
         '''
 
     def execute_auto_command(self, command: str, parameters: Dict[str, Any]) -> None:
@@ -1135,6 +1207,11 @@ class CommandAutoTuner:
             "models": self.command_config.models,
             "execute_shell_command": self.command_config.execute_shell_command,
             "generate_shell_command": self.command_config.generate_shell_command,
+            "conf_export": self.command_config.conf_export,
+            "conf_import": self.command_config.conf_import,
+            "index_export": self.command_config.index_export,
+            "index_import": self.command_config.index_import,
+            "exclude_files": self.command_config.exclude_files,
 
             "run_python": self.tools.run_python_code,            
             "get_related_files_by_symbols": self.tools.get_related_files_by_symbols,
@@ -1146,6 +1223,7 @@ class CommandAutoTuner:
             "get_project_related_files": self.tools.get_project_related_files,
             "ask_user":self.tools.ask_user,
             "read_file_with_keyword_ranges": self.tools.read_file_with_keyword_ranges,
+
             
                         
         }