auto-coder 0.1.300__tar.gz → 0.1.302__tar.gz

{auto_coder-0.1.300 → auto_coder-0.1.302}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.300
+Version: 0.1.302
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.300
+Version: 0.1.302
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/auto_coder.py

@@ -120,12 +120,9 @@ def main(input_args: Optional[List[str]] = None):
     if raw_args.command == "revert":
         repo_path = args.source_dir
 
-        file_content = open(args.file).read()
-        md5 = hashlib.md5(file_content.encode("utf-8")).hexdigest()
         file_name = os.path.basename(args.file)
-
         revert_result = git_utils.revert_changes(
-            repo_path, f"auto_coder_{file_name}_{md5}"
+            repo_path, f"auto_coder_{file_name}"
         )
         if revert_result:
             print(f"Successfully reverted changes for {args.file}")

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/auto_coder_runner.py

@@ -1402,7 +1402,7 @@ def commit(query: str):
             md5 = hashlib.md5(file_content.encode("utf-8")).hexdigest()
             file_name = os.path.basename(execute_file)
             commit_result = git_utils.commit_changes(
-                ".", f"{commit_message}\nauto_coder_{file_name}_{md5}"
+                ".", f"{commit_message}\nauto_coder_{file_name}"
             )
             git_utils.print_commit_info(commit_result=commit_result)
             if commit_message:
@@ -1542,7 +1542,7 @@ def coding(query: str):
             cmd = ["--file", execute_file]
             auto_coder_main(cmd)
             result_manager = ResultManager()
-            result_manager.append(content="", meta={"commit_message": f"auto_coder_{latest_yaml_file}_{md5}","action": "coding", "input":{
+            result_manager.append(content="", meta={"commit_message": f"auto_coder_{latest_yaml_file}","action": "coding", "input":{
                 "query": query
             }})
 

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/commands/auto_command.py

@@ -25,7 +25,7 @@ from autocoder.common.auto_configure import config_readme
 from autocoder.utils.auto_project_type import ProjectTypeAnalyzer
 from rich.text import Text
 from autocoder.common.mcp_server import get_mcp_server,McpServerInfoRequest
-
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 class CommandMessage(BaseModel):
     role: str
     content: str
@@ -41,35 +41,52 @@ class CommandConversation(BaseModel):
     current_conversation: List[CommandMessage]
 
 
-def load_memory_file() -> CommandConversation:
-    """Load command conversations from memory file"""
+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:
-                return CommandConversation.model_validate_json(f.read())
+                conversation = CommandConversation.model_validate_json(f.read())
+                conversation.current_conversation = conversation.current_conversation
+                return conversation
             except Exception:
                 return CommandConversation(history={}, current_conversation=[])
     return CommandConversation(history={}, current_conversation=[])
 
 
+class TimeBasedStrategy:
+    def __init__(self, max_idle_time=3600):  # 1 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(time.time()))
+        timestamp=str(int(current_time))
     )
     extended_assistant_msg = ExtendedCommandMessage(
         message=assistant_msg,
-        timestamp=str(int(time.time()))
+        timestamp=str(int(current_time))
     )
 
     # Load existing conversation or create new
@@ -78,6 +95,14 @@ def save_to_memory_file(query: str, response: str):
             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={},
@@ -174,8 +199,8 @@ class CommandAutoTuner:
     
     def get_conversations(self) -> List[CommandMessage]:
         """Get conversation history from memory file"""
-        conversation = load_memory_file()
-        return [extended_msg for extended_msg in conversation.current_conversation]
+        conversation = load_memory_file(args=self.args)
+        return [command_message.message for command_message in conversation.current_conversation]
 
     @byzerllm.prompt()
     def _analyze(self, request: AutoCommandRequest) -> str:
@@ -284,7 +309,7 @@ class CommandAutoTuner:
             "command_combination_readme": self._command_combination_readme.prompt()
         }
     
-
+    @byzerllm.prompt()
     def _command_combination_readme(self) -> str:
         """
         <function_combination_readme>
@@ -311,12 +336,19 @@ class CommandAutoTuner:
         ### 关于对话大小的问题
         我们对话历史以及查看的内容累计不能超过 {{ conversation_safe_zone_tokens }} 个tokens,当你读取索引文件 (get_project_map) 的时候，你可以看到
         每个文件的tokens数，你可以根据这个信息来决定如何读取这个文件。如果不确定，使用 count_file_tokens 函数来获取文件的tokens数,再决定如何读取。
-        而对于分析一个超大文件推荐组合 read_files 带上 line_ranges 参数来读取，或者组合 read_file_withread_file_with_keyword_ranges 等来读取，
+        而对于分析一个超大文件推荐组合 read_files 带上 line_ranges 参数来读取，或者组合 read_file_with_keyword_ranges 等来读取，
         每个函数你还可以使用多次来获取更多信息。
         
         ### 善用脚本完成一些基本的操作
         根据操作系统，终端类型，脚本类型等各种信息，在涉及到路径或者脚本的时候，需要考虑平台差异性。
 
+        ### 关于查看文件的技巧
+        在使用 read_files 之前，如果你有明确的目标，比如查看这个文件某个函数在这个文件的实现，你可以先用 read_file_with_keyword_ranges 函数来大致定位,该函数会返回你看到的
+        内容的行号范围，你可以通过拓展这个行号范围继续使用 read_file_with_line_ranges 来查看完整函数信息，或者使用 read_files 函数带上 line_ranges 参数来精确读取。 
+
+        如果你没有明确目标，需要单纯查看这个文件获取必要的信息，可以先通过 count_file_tokens 函数来获取文件的tokens数，如果数目小于安全对话窗口的tokens数的1/2, 那么可以直接用
+        read_files 函数来读取，否则建议一次读取200-600行，多次读取直到找到合适的信息。
+        
         ## 其他一些注意事项
         1. 使用 read_files 时，一次性读取文件数量不要超过1个,每次只读取200行。如果发现读取的内容不够，则继续读取下面200行。
         2. 确实有必要才使用 get_project_structure 函数，否则可以多使用 list_files 函数来查看目录。
@@ -350,8 +382,16 @@ class CommandAutoTuner:
         # 获取 prompt 内容
         prompt = self._analyze.prompt(request)
         
+        # 获取对当前项目变更的最近8条历史人物
+        action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+        history_tasks = action_yml_file_manager.to_tasks_prompt(limit=8)
+        new_messages = []
+        if self.args.enable_task_history:
+            new_messages.append({"role": "user", "content": history_tasks})
+            new_messages.append({"role": "assistant", "content": "好的，我知道最近的任务对项目的变更了，我会参考这些来更好的理解你的需求。"})
+        
         # 构造对话上下文
-        conversations = [{"role": "user", "content": prompt}]
+        conversations = new_messages + [{"role": "user", "content": prompt}]
         
         # 使用 stream_out 进行输出
         printer = Printer()

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/common/__init__.py

@@ -406,6 +406,10 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     dynamic_urls: List[str] = []
 
+    add_updated_urls: List[str] = []
+
+    enable_task_history: Optional[bool] = False
+
     class Config:
         protected_namespaces = ()
 

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/common/action_yml_file_manager.py

@@ -5,7 +5,7 @@ import git
 from typing import List, Dict, Tuple, Optional, Union, Any
 from loguru import logger
 from autocoder.common.printer import Printer
-
+import byzerllm
 
 class ActionYmlFileManager:
     """
@@ -19,15 +19,15 @@ class ActionYmlFileManager:
     - 处理 commit 消息与 YAML 文件的关联
     """
     
-    def __init__(self, source_dir: str):
+    def __init__(self, source_dir: Optional[str] = None):
         """
         初始化 ActionYmlFileManager
         
         Args:
             source_dir: 项目根目录
         """
-        self.source_dir = source_dir
-        self.actions_dir = os.path.join(source_dir, "actions")
+        self.source_dir = source_dir or os.getcwd()
+        self.actions_dir = os.path.join(self.source_dir, "actions")
         self.printer = Printer()
         
     def ensure_actions_dir(self) -> bool:
@@ -249,7 +249,7 @@ class ActionYmlFileManager:
             with open(yaml_path, 'r', encoding='utf-8') as f:
                 yaml_content = f.read()
             file_md5 = hashlib.md5(yaml_content.encode("utf-8")).hexdigest()
-            return f"auto_coder_{file_name}_{file_md5}"
+            return f"auto_coder_{file_name}"
         except Exception as e:
             logger.error(f"Failed to calculate commit ID: {e}")
             return None
@@ -269,11 +269,11 @@ class ActionYmlFileManager:
             
         try:
             # auto_coder_000000001926_chat_action.yml_88614d5bd4046a068786c252fbc39c13
-            parts = commit_id.split("_")
-            # 去掉第一部分 "auto_coder_" 和最后一部分 hash 值
-            if len(parts) >= 3:
-                file_name_parts = parts[1:-1]
-                return "_".join(file_name_parts)
+            # auto_coder_000000001926_chat_action.yml
+            if commit_id.endswith("_chat_action.yml"):
+                return commit_id[len("auto_coder_"):]
+            else:
+                return "_".join(commit_id[len("auto_coder_"):].split("_")[0:-1])
             return None
         except Exception:
             return None
@@ -364,4 +364,69 @@ class ActionYmlFileManager:
                 yaml_content['file_name'] = file_name
                 history_tasks.append(yaml_content)
         
-        return history_tasks 
+        return history_tasks 
+    
+    @byzerllm.prompt()
+    def _to_tasks_prompt(self, history_tasks: List[Dict]) -> str:
+        """       
+        <history_tasks>                
+        最近的任务历史记录，从最新到最旧排序：
+        
+        {% for task in history_tasks %}
+        ## 任务 {{ loop.index }}: {{ task.file_name }}
+        
+        {% if task.query %}
+        **用户需求**: {{ task.query }}
+        {% endif %}
+        
+        {% if task.urls %}
+        **用户提供的相关文件**:
+        {% if task.urls is string %}
+        - {{ task.urls }}
+        {% else %}
+        {% for url in task.urls %}
+        - {{ url }}
+        {% endfor %}
+        {% endif %}
+        {% endif %}
+        
+        {% if task.dynamic_urls %}
+        **系统提取的相关文件**:
+        {% if task.dynamic_urls is string %}
+        - {{ task.dynamic_urls }}
+        {% else %}
+        {% for url in task.dynamic_urls %}
+        - {{ url }}
+        {% endfor %}
+        {% endif %}
+        {% endif %}
+        
+        {% if task.add_updated_urls %}
+        **变更的文件**:
+        {% if task.add_updated_urls is string %}
+        - {{ task.add_updated_urls }}
+        {% else %}
+        {% for url in task.add_updated_urls %}
+        - {{ url }}
+        {% endfor %}
+        {% endif %}
+        {% endif %}
+        
+        {% if task.how_to_reproduce %}
+        **变更过程**:
+        ```
+        {{ task.how_to_reproduce }}
+        ```
+        {% endif %}
+        
+        {% if not loop.last %}
+        ---
+        {% endif %}
+        {% endfor %}
+        </history_tasks>
+        请注意上述历史任务记录，以便更好地理解当前用户需求的上下文和连续性。
+        """
+    
+    def to_tasks_prompt(self, limit: int = 5) -> str:
+        history_tasks = self.parse_history_tasks(limit)
+        return self._to_tasks_prompt.prompt(history_tasks)

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/common/auto_coder_lang.py

@@ -195,7 +195,7 @@ MESSAGES = {
         "mcp_server_info_error": "Error getting MCP server info: {{ error }}",
         "mcp_server_info_title": "Connected MCP Server Info",
         "no_commit_file_name": "Cannot get the file name of the commit_id in the actions directory: {{commit_id}}",
-        "yaml_update_success": "✅ Successfully updated YAML file: {{yaml_file}} with how_to_reproduce field",
+        "yaml_update_success": "✅ Successfully updated YAML file: {{yaml_file}}",
         "yaml_save_error": "❌ Error saving YAML file {{yaml_file}}: {{error}}",
     },
     "zh": {
@@ -389,7 +389,7 @@ MESSAGES = {
         "mcp_server_info_error": "获取MCP服务器信息时出错: {{ error }}",
         "mcp_server_info_title": "已连接的MCP服务器信息",
         "no_commit_file_name": "无法获取commit_id关联的actions 目录下的文件名: {{commit_id}}",
-        "yaml_update_success": "✅ 成功更新YAML文件: {{yaml_file}}，添加了how_to_reproduce字段",
+        "yaml_update_success": "✅ 成功更新YAML文件: {{yaml_file}}",
         "yaml_save_error": "❌ 保存YAML文件出错 {{yaml_file}}: {{error}}",
     }}
 

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/common/code_auto_merge.py

@@ -10,6 +10,7 @@ import hashlib
 from autocoder.common import files as FileUtils
 from autocoder.common.printer import Printer
 from autocoder.common.auto_coder_lang import get_message
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 
 class PathAndCode(pydantic.BaseModel):
     path: str
@@ -196,5 +197,18 @@ class CodeAutoMerge:
 
         self.printer.print_in_terminal("files_merged", total=total)
         if not force_skip_git and not self.args.skip_commit:
-            commit_result = git_utils.commit_changes(self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}_{md5}")
+            commit_result = git_utils.commit_changes(self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}")
+            
+            action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+            action_file_name = os.path.basename(self.args.file)
+            add_updated_urls = []
+            commit_result.changed_files
+            for file in commit_result.changed_files:
+                add_updated_urls.append(os.path.join(self.args.source_dir, file))
+
+            self.args.add_updated_urls = add_updated_urls
+            update_yaml_success = action_yml_file_manager.update_yaml_field(action_file_name, "add_updated_urls", add_updated_urls)
+            if not update_yaml_success:                        
+                self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
+            
             git_utils.print_commit_info(commit_result=commit_result)

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/common/code_auto_merge_diff.py

@@ -4,6 +4,7 @@ from autocoder.common import AutoCoderArgs,git_utils
 from typing import List,Union,Tuple
 import pydantic
 import byzerllm
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.common.printer import Printer
 import hashlib
 from pathlib import Path
@@ -579,7 +580,20 @@ class CodeAutoMergeDiff:
 
         self.printer.print_in_terminal("files_merged_total", total=total)
         if not force_skip_git and not self.args.skip_commit:
-            commit_result = git_utils.commit_changes(self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}_{md5}")
+            commit_result = git_utils.commit_changes(self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}")
+
+            action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+            action_file_name = os.path.basename(self.args.file)
+            add_updated_urls = []
+            commit_result.changed_files
+            for file in commit_result.changed_files:
+                add_updated_urls.append(os.path.join(self.args.source_dir, file))
+
+            self.args.add_updated_urls = add_updated_urls
+            update_yaml_success = action_yml_file_manager.update_yaml_field(action_file_name, "add_updated_urls", add_updated_urls)
+            if not update_yaml_success:                        
+                self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)    
+                          
             git_utils.print_commit_info(commit_result=commit_result)
         else:
             # Print edits for review

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/common/code_auto_merge_editblock.py

@@ -1,6 +1,7 @@
 import os
 from byzerllm.utils.client import code_utils
 from autocoder.common import AutoCoderArgs, git_utils
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.common.text import TextSimilarity
 from autocoder.utils.queue_communicate import (
     queue_communicate,
@@ -426,8 +427,21 @@ class CodeAutoMergeEditBlock:
                 try:
                     commit_result = git_utils.commit_changes(
                         self.args.source_dir,
-                        f"{self.args.query}\nauto_coder_{file_name}_{md5}",
+                        f"{self.args.query}\nauto_coder_{file_name}",
                     )
+                    
+                    action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+                    action_file_name = os.path.basename(self.args.file)
+                    add_updated_urls = []
+                    commit_result.changed_files
+                    for file in commit_result.changed_files:
+                        add_updated_urls.append(os.path.join(self.args.source_dir, file))
+
+                    self.args.add_updated_urls = add_updated_urls
+                    update_yaml_success = action_yml_file_manager.update_yaml_field(action_file_name, "add_updated_urls", add_updated_urls)
+                    if not update_yaml_success:                        
+                        self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
+
                     git_utils.print_commit_info(commit_result=commit_result)
                 except Exception as e:
                     self.printer.print_str_in_terminal(

{auto_coder-0.1.300 → auto_coder-0.1.302}/src/autocoder/common/code_auto_merge_strict_diff.py

@@ -5,6 +5,7 @@ from autocoder.common import AutoCoderArgs, git_utils
 from typing import List,Tuple
 import pydantic
 import byzerllm
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.common.printer import Printer
 import hashlib
 from pathlib import Path
@@ -286,8 +287,20 @@ class CodeAutoMergeStrictDiff:
         self.printer.print_in_terminal("files_merged_total", total=total)
         if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(
-                self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}_{md5}"
+                self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}"
             )
+            action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+            action_file_name = os.path.basename(self.args.file)
+            add_updated_urls = []
+            commit_result.changed_files
+            for file in commit_result.changed_files:
+                add_updated_urls.append(os.path.join(self.args.source_dir, file))
+
+            self.args.add_updated_urls = add_updated_urls
+            update_yaml_success = action_yml_file_manager.update_yaml_field(action_file_name, "add_updated_urls", add_updated_urls)
+            if not update_yaml_success:                        
+                self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
+            
             git_utils.print_commit_info(commit_result=commit_result)
         else:
             # Print diff blocks for review

auto_coder-0.1.302/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.302"

auto_coder-0.1.300/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.300"