auto-coder 0.1.353__py3-none-any.whl → 0.1.355__py3-none-any.whl

autocoder/commands/auto_command.py

@@ -21,7 +21,7 @@ from autocoder.common import shells
 from loguru import logger
 from autocoder.utils import llms as llms_utils
 from autocoder.rag.token_counter import count_tokens
-from autocoder.common.global_cancel import global_cancel
+from autocoder.common.global_cancel import global_cancel,CancelRequestedException
 from autocoder.common.auto_configure import config_readme
 from autocoder.utils.auto_project_type import ProjectTypeAnalyzer
 from rich.text import Text
@@ -29,105 +29,10 @@ from autocoder.common.mcp_server import get_mcp_server, McpServerInfoRequest
 from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
+from autocoder.events.event_types import Event, EventType, EventMetadata
 from autocoder.run_context import get_run_context
 from autocoder.common.stream_out_type import AutoCommandStreamOutType
-class CommandMessage(BaseModel):
-    role: str
-    content: str
-
-
-class ExtendedCommandMessage(BaseModel):
-    message: CommandMessage
-    timestamp: str
-
-
-class CommandConversation(BaseModel):
-    history: Dict[str, ExtendedCommandMessage]
-    current_conversation: List[ExtendedCommandMessage]
-
-
-def load_memory_file(args: AutoCoderArgs) -> CommandConversation:
-    """Load command conversations from memory file"""
-
-    memory_dir = os.path.join(".auto-coder", "memory")
-    file_path = os.path.join(memory_dir, "command_chat_history.json")
-    if os.path.exists(file_path):
-        with open(file_path, "r", encoding="utf-8") as f:
-            try:
-                conversation = CommandConversation.model_validate_json(
-                    f.read())
-                return conversation
-            except Exception:
-                return CommandConversation(history={}, current_conversation=[])
-    return CommandConversation(history={}, current_conversation=[])
-
-
-class TimeBasedStrategy:
-    def __init__(self, max_idle_time=3600*24):  # 24 hour in seconds
-        self.max_idle_time = max_idle_time
-
-    def should_archive(self, last_message_time):
-        """Check if the conversation should be archived based on last message time"""
-        current_time = time.time()
-        return current_time - last_message_time > self.max_idle_time
-
-
-def save_to_memory_file(query: str, response: str):
-    """Save command conversation to memory file using CommandConversation structure"""
-    memory_dir = os.path.join(".auto-coder", "memory")
-    os.makedirs(memory_dir, exist_ok=True)
-    file_path = os.path.join(memory_dir, "command_chat_history.json")
-
-    # Initialize time-based strategy
-    time_strategy = TimeBasedStrategy()
-
-    # Create new message objects
-    current_time = time.time()
-    user_msg = CommandMessage(role="user", content=query)
-    assistant_msg = CommandMessage(role="assistant", content=response)
-
-    extended_user_msg = ExtendedCommandMessage(
-        message=user_msg,
-        timestamp=str(int(current_time))
-    )
-    extended_assistant_msg = ExtendedCommandMessage(
-        message=assistant_msg,
-        timestamp=str(int(current_time))
-    )
-
-    # Load existing conversation or create new
-    if os.path.exists(file_path):
-        with open(file_path, "r", encoding="utf-8") as f:
-            try:
-                existing_conv = CommandConversation.model_validate_json(
-                    f.read())
-                # Check if we should archive current conversation
-                if existing_conv.current_conversation:
-                    last_message_time = float(
-                        existing_conv.current_conversation[-1].timestamp)
-                    if time_strategy.should_archive(last_message_time):
-                        # Move current conversation to history
-                        timestamp = str(int(last_message_time))
-                        existing_conv.history[timestamp] = existing_conv.current_conversation
-                        existing_conv.current_conversation = []
-            except Exception:
-                existing_conv = CommandConversation(
-                    history={},
-                    current_conversation=[]
-                )
-    else:
-        existing_conv = CommandConversation(
-            history={},
-            current_conversation=[]
-        )
-
-    existing_conv.current_conversation.append(extended_user_msg)
-    existing_conv.current_conversation.append(extended_assistant_msg)
-    # Save updated conversation
-    with open(file_path, "w", encoding="utf-8") as f:
-        f.write(existing_conv.model_dump_json(indent=2))
-
-
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 class CommandSuggestion(BaseModel):
     command: str
     parameters: Dict[str, Any]
@@ -203,17 +108,14 @@ class CommandAutoTuner:
             self.mcp_server_info = mcp_server_info_response.result
         except Exception as e:
             logger.error(f"Error getting MCP server info: {str(e)}")
-            self.mcp_server_info = ""
-
-    def get_conversations(self) -> List[CommandMessage]:
-        """Get conversation history from memory file"""
-        conversation = load_memory_file(args=self.args)
-        return [command_message.message for command_message in conversation.current_conversation]
+            self.mcp_server_info = ""    
 
     @byzerllm.prompt()
     def _analyze(self, request: AutoCommandRequest) -> str:
         """
         你是 auto-coder.chat 软件，帮助用户完成编程方面的需求。我们的目标是根据用户输入和当前上下文，组合多个函数来完成用户的需求。
+        
+        ====
 
         ## 当前用户环境信息如下:
         <os_info>
@@ -254,6 +156,8 @@ class CommandAutoTuner:
         {{ current_conf }}
         </current_conf>
 
+        ====
+
         ## 可用函数列表:
         {{ available_commands }}
 
@@ -263,6 +167,8 @@ class CommandAutoTuner:
         ## 函数组合说明：        
         {{ command_combination_readme }}
 
+        ====
+
         ## active-context 项目追踪文档系统
         
         在 {{ current_project }}/.auto-coder/active-context 下,我们提供了对该项目每个文件目录的追踪。
@@ -279,9 +185,10 @@ class CommandAutoTuner:
         - query: 用户需求
         - urls： 用户提供的上下文文件列表
         - dynamic_urls： auto-coder.chat 自动感知的一些文件列表
-        - add_updated_urls: 这次需求发生变更的文件列表        
-        
+        - add_updated_urls: 这次需求发生变更的文件列表                        
+
         {% if conversation_history %}
+        ====
         ## 历史对话:
         <conversation_history>
         {% for conv in conversation_history %}
@@ -289,6 +196,18 @@ class CommandAutoTuner:
         {% endfor %}
         </conversation_history>
         {% endif %}
+        
+        {% if rules %}
+        ====
+        
+        用户提供的规则文件，你必须严格遵守。
+        {% for key, value in rules.items() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
 
         ## 用户需求: 
         <user_input>
@@ -326,7 +245,8 @@ class CommandAutoTuner:
         return {
             "user_input": request.user_input,
             "current_files": self.memory_config.memory["current_files"]["files"],
-            "conversation_history": self.get_conversations(),
+            "conversation_history": [],
+            "rules": get_rules(),
             "available_commands": self._command_readme.prompt(),
             "current_conf": json.dumps(self.memory_config.memory["conf"], indent=2),
             "env_info": env_info,
@@ -461,7 +381,8 @@ class CommandAutoTuner:
             display_func=extract_command_response,
             args=self.args,
             extra_meta={
-                "stream_out_type": AutoCommandStreamOutType.COMMAND_SUGGESTION.value
+                "stream_out_type": AutoCommandStreamOutType.COMMAND_SUGGESTION.value,
+                "path": "/agentic/agent/command_suggestion"
             }
         )
 
@@ -515,16 +436,11 @@ class CommandAutoTuner:
         conversations.append({"role": "assistant", "content": result})
         # 提取 JSON 并转换为 AutoCommandResponse
         response = to_model(result, AutoCommandResponse)
-
-        # 保存对话记录
-        save_to_memory_file(
-            query=request.user_input,
-            response=response.model_dump_json(indent=2)
-        )
+        
         result_manager = ResultManager()
 
         while True:
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             # 执行命令
             command = response.suggestions[0].command
             parameters = response.suggestions[0].parameters
@@ -539,7 +455,11 @@ class CommandAutoTuner:
                                                            EventContentCreator.ResultCommandPrepareStatContent(
                                                                command=command,
                                                                parameters=parameters
-                                                           ).to_dict()))                           
+                                                           ).to_dict()),metadata=EventMetadata(
+                                                               stream_out_type="command_prepare",
+                                                               path="/agentic/agent/command_prepare",
+                                                               action_file=self.args.file
+                                                           ).to_dict())
             
             self.execute_auto_command(command, parameters)
             content = ""
@@ -566,7 +486,13 @@ class CommandAutoTuner:
                         "auto_command_action_break", command=command, action=action)
                     printer.print_str_in_terminal(temp_content,style="yellow")
                     get_event_manager(self.args.event_file).write_result(
-                        EventContentCreator.create_result(content=temp_content))
+                        EventContentCreator.create_result(content=temp_content),
+                        metadata=EventMetadata(
+                            stream_out_type="command_break",
+                            path="/agentic/agent/command_break",
+                            action_file=self.args.file
+                        ).to_dict()
+                    )
                     break
 
                 if command == "response_user":
@@ -576,7 +502,12 @@ class CommandAutoTuner:
                     EventContentCreator.create_result(content=EventContentCreator.ResultCommandExecuteStatContent(
                         command=command,
                         content=content
-                    ).to_dict()))
+                    ).to_dict()),metadata=EventMetadata(
+                        stream_out_type="command_execute",
+                        path="/agentic/agent/command_execute",
+                        action_file=self.args.file
+                    ).to_dict()
+                    )
 
                 # 打印执行结果
                 console = Console()
@@ -678,17 +609,18 @@ class CommandAutoTuner:
                 # 提取 JSON 并转换为 AutoCommandResponse
                 response = to_model(result, AutoCommandResponse)
                 if not response or not response.suggestions:
-                    break
-
-                save_to_memory_file(
-                    query=request.user_input,
-                    response=response.model_dump_json(indent=2)
-                )                                               
+                    break                                                             
             else:
                 temp_content = printer.get_message_from_key_with_format("auto_command_break",  command=command)
                 printer.print_str_in_terminal(temp_content,style="yellow")
                 get_event_manager(self.args.event_file).write_result(
-                    EventContentCreator.create_result(content=temp_content))
+                    EventContentCreator.create_result(content=temp_content),
+                    metadata=EventMetadata(
+                        stream_out_type="command_break",
+                        path="/agentic/agent/command_break",
+                        action_file=self.args.file
+                    ).to_dict()
+                )
                 break
 
         return response
@@ -1517,18 +1449,14 @@ class CommandAutoTuner:
                 command_map[command](**parameters)
             else:
                 command_map[command]()
+        except CancelRequestedException as e:
+            raise e        
 
         except Exception as e:
             error_msg = str(e)
             self.printer.print_in_terminal(
                 "auto_command_failed", style="red", command=command, error=error_msg)
-
-            # Save failed command execution
-            save_to_memory_file(
-                query=f"Command: {command} Parameters: {json.dumps(parameters) if parameters else 'None'}",
-                response=f"Command execution failed: {error_msg}"
-            )
-
+            
             self.result_manager = ResultManager()
             result = f"command {command} with parameters {parameters} execution failed with error {error_msg}"
             self.result_manager.add_result(content=result, meta={

autocoder/commands/auto_web.py

@@ -794,7 +794,7 @@ class AutoWebTuner:
             logger.info(f"开始执行迭代 {iterations}/{max_iterations}")
 
             # 检查是否需要取消操作
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
 
             # 如果没有更多操作，认为任务完成
             if not plan.actions:

autocoder/commands/tools.py

@@ -48,7 +48,7 @@ from autocoder.common.mcp_server_types import (
     McpListRunningRequest, McpRefreshRequest
 )
 
-from autocoder.ignorefiles.ignore_file_utils import should_ignore
+from autocoder.common.ignorefiles.ignore_file_utils import should_ignore
 
 
 @byzerllm.prompt()

autocoder/common/__init__.py

@@ -304,6 +304,8 @@ class AutoCoderArgs(pydantic.BaseModel):
     rag_duckdb_query_similarity: Optional[float] = 0.1  # DuckDB 向量化检索 相似度 阈值
     rag_duckdb_query_top_k: Optional[int] = 10000  # DuckDB 向量化检索 返回 TopK个结果(且大于相似度)
     rag_index_build_workers: Optional[int] = 10
+    rag_emb_dim: Optional[int] = 1024
+    rag_emb_text_size: Optional[int] = 1024
     # rag 本地图床地址
     local_image_host: Optional[str] = ""
     rag_recall_max_queries: Optional[int] = 5
@@ -368,7 +370,7 @@ class AutoCoderArgs(pydantic.BaseModel):
     segment_ratio: Optional[float] = 0.2
     buff_ratio: Optional[float] = 0.1
 
-    disable_inference_enhance: Optional[bool] = False
+    disable_inference_enhance: Optional[bool] = True
     inference_deep_thought: Optional[bool] = False
     inference_slow_without_deep_thought: Optional[bool] = False
     inference_compute_precision: int = 64

autocoder/common/command_completer.py

@@ -1,10 +1,12 @@
+import os
+import pydantic
+from typing import Callable,Dict,Any # Added import
+from pydantic import BaseModel,SkipValidation # Added import
 from prompt_toolkit.completion import Completer, Completion, CompleteEvent
 from prompt_toolkit.document import Document
-import pydantic
-from typing import Callable,Dict,Any
-from pydantic import BaseModel,SkipValidation
-from autocoder.common import AutoCoderArgs
-import os
+
+from autocoder import models as models_module # Import models module
+from autocoder.common import AutoCoderArgs # Ensure AutoCoderArgs is imported
 
 COMMANDS = {
     "/add_files": {
@@ -78,7 +80,7 @@ class MemoryConfig(BaseModel):
     """
     A model to encapsulate memory configuration and operations.
     """
-    memory: Dict[str, Any]
+    get_memory_func: SkipValidation[Callable]
     save_memory_func: SkipValidation[Callable]
 
     class Config:
@@ -366,10 +368,13 @@ class CommandCompleter(Completer):
         self.file_system_model = file_system_model
         self.memory_model = memory_model
         self.all_file_names = file_system_model.get_all_file_names_in_project()
-        self.all_files = file_system_model.get_all_file_in_project()
-        self.all_dir_names = file_system_model.get_all_dir_names_in_project()
-        self.all_files_with_dot = file_system_model.get_all_file_in_project_with_dot()
-        self.symbol_list = file_system_model.get_symbol_list()
+        self.all_files = self.file_system_model.get_all_file_in_project()
+        self.all_dir_names = self.file_system_model.get_all_dir_names_in_project()
+        self.all_files_with_dot = self.file_system_model.get_all_file_in_project_with_dot()
+        self.symbol_list = self.file_system_model.get_symbol_list()
+        # Refresh model names if they can change dynamically (optional)
+        self.all_model_names = [m['name'] for m in models_module.load_models()]
+        self.all_model_names = [m['name'] for m in models_module.load_models()] # Load model names
         self.current_file_names = []
 
     def get_completions(self, document, complete_event):
@@ -544,9 +549,49 @@ class CommandCompleter(Completer):
                         for field_name in AutoCoderArgs.model_fields.keys()
                         if field_name.startswith(current_word)
                     ]
-
+                # /conf key:[cursor] or /conf key:v[cursor]
+                elif ":" in text: # Check if colon exists anywhere after /conf
+                    parts = text[len("/conf"):].strip().split(":", 1)
+                    if len(parts) == 2:
+                        key = parts[0].strip()
+                        value_part = parts[1] # This is the part after the colon
+
+                        # Determine the word being completed (part after colon)
+                        # Find the start of the current word after the colon
+                        space_pos = value_part.rfind(" ")
+                        if space_pos != -1:
+                            current_value_word = value_part[space_pos + 1:]
+                        else:
+                            current_value_word = value_part
+
+                        # Model name completion
+                        if "model" in key:
+                            for model_name in self.all_model_names:
+                                if model_name.startswith(current_value_word):
+                                    yield Completion(model_name, start_position=-len(current_value_word))
+                            # Prioritize model completion if key matches
+                            return # Exit after providing model completions
+
+                        # Boolean completion
+                        bool_keys = {name for name, field in AutoCoderArgs.model_fields.items() if field.annotation == bool}
+                        if key in bool_keys:
+                            if "true".startswith(current_value_word):
+                                yield Completion("true", start_position=-len(current_value_word))
+                            if "false".startswith(current_value_word):
+                                yield Completion("false", start_position=-len(current_value_word))
+                            # Prioritize boolean completion if key matches
+                            return # Exit after providing boolean completions
+
+                        # Add other value completions based on key if needed here
+
+                        # No specific value completions matched, so no yield from here
+                        return # Exit if we were trying value completion
+
+                # Default completion for keys or /drop if no value completion logic was triggered above
                 for completion in completions:
-                    yield Completion(completion, start_position=-len(current_word))
+                     # Adjust start_position based on whether we are completing key or /drop
+                     yield Completion(completion, start_position=-len(current_word))
+
             elif words[0] in ["/chat", "/coding","/auto"]:
                 image_extensions = (
                     ".png",
@@ -895,6 +940,7 @@ class CommandCompleter(Completer):
     def update_current_files(self, files):
         self.current_file_names = [f for f in files]
 
+
     def refresh_files(self):
         self.all_file_names = self.file_system_model.get_all_file_names_in_project()
         self.all_files = self.file_system_model.get_all_file_in_project()