auto-coder 0.1.300__py3-none-any.whl → 0.1.301__py3-none-any.whl

{auto_coder-0.1.300.dist-info → auto_coder-0.1.301.dist-info}/METADATA

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

{auto_coder-0.1.300.dist-info → auto_coder-0.1.301.dist-info}/RECORD

@@ -13,7 +13,7 @@ autocoder/command_args.py,sha256=9aYJ-AmPxP1sQh6ciw04FWHjSn31f2W9afXFwo8wgx4,304
 autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,10013
 autocoder/lang.py,sha256=U6AjVV8Rs1uLyjFCZ8sT6WWuNUxMBqkXXIOs4S120uk,14511
 autocoder/models.py,sha256=AyoZ-Pzy0oyYUmWCxOIRiOImsqboSfRET7LO9-UOuxI,11172
-autocoder/version.py,sha256=GTWRg4qGDuMEXj_MkMWJ-ZoZUfLMffvCJnZPrQLrT6c,23
+autocoder/version.py,sha256=8vsutezDX7FtnTgUbkxxSCmrd0M5CMXcXZ-buzH5bko,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/auto_demand_organizer.py,sha256=NWSAEsEk94vT3lGjfo25kKLMwYdPcpy9e-i21txPasQ,6942
 autocoder/agent/auto_filegroup.py,sha256=CW7bqp0FW1GIEMnl-blyAc2UGT7O9Mom0q66ITz1ckM,6635
@@ -27,13 +27,13 @@ autocoder/agent/planner.py,sha256=SZTSZHxHzDmuWZo3K5fs79RwvJLWurg-nbJRRNbX65o,91
 autocoder/agent/project_reader.py,sha256=tWLaPoLw1gI6kO_NzivQj28KbobU2ceOLuppHMbfGl8,18234
 autocoder/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/commands/auto_command.py,sha256=hXxqHL1zwzoLaKgxZ8ke4kSKDwitKbgZvAs4nuTghuM,56776
+autocoder/commands/auto_command.py,sha256=OqylAd4lLheVEk0XeYb85uBlWP8R6xQqW8_rKcDVEpQ,57616
 autocoder/commands/auto_web.py,sha256=_449f4rCoRG7Sv0SB0hIBRFLPLPJ5DgWW4DlI22a3XY,39383
 autocoder/commands/tools.py,sha256=4cNm_Mpjk9WNfSmKU7W0OjA89OqPC1mh8rSoSl8m4OE,27253
 autocoder/common/JupyterClient.py,sha256=O-wi6pXeAEYhAY24kDa0BINrLYvKS6rKyWe98pDClS0,2816
 autocoder/common/ShellClient.py,sha256=fM1q8t_XMSbLBl2zkCNC2J9xuyKN3eXzGm6hHhqL2WY,2286
-autocoder/common/__init__.py,sha256=WLBtBZi-F9e6WWvbzSCsMyQVVTJC31rBwvDBc2Gldgs,13806
-autocoder/common/action_yml_file_manager.py,sha256=v-fEWMTNQWg9ASChqnM9Gii70gq143pt9XM6qRacs54,13313
+autocoder/common/__init__.py,sha256=Do0ESMUr8OKZgOaD-9HpZh6cNJkWwFfL9QEgB8bxmaA,13893
+autocoder/common/action_yml_file_manager.py,sha256=0hXoG2kyYj_88hOk081TVw-7zm1ZQ3SohGFSTB_IJSE,15252
 autocoder/common/anything2images.py,sha256=0ILBbWzY02M-CiWB-vzuomb_J1hVdxRcenAfIrAXq9M,25283
 autocoder/common/anything2img.py,sha256=iZQmg8srXlD7N5uGl5b_ONKJMBjYoW8kPmokkG6ISF0,10118
 autocoder/common/audio.py,sha256=Kn9nWKQddWnUrAz0a_ZUgjcu4VUU_IcZBigT7n3N3qc,7439
@@ -47,10 +47,10 @@ autocoder/common/code_auto_generate.py,sha256=i0f0BPTvt8QN5-arC2PqfMs4sukGJqFw58
 autocoder/common/code_auto_generate_diff.py,sha256=EYGHf24fVAk3M8kXllXukdUvzo2I2Fb8qNrTiU_Qtug,18759
 autocoder/common/code_auto_generate_editblock.py,sha256=1XmoLZl-XrrPOyHkSfqe0pOxi0Lp4d69oDQX6zzqs_c,20523
 autocoder/common/code_auto_generate_strict_diff.py,sha256=68fAks4S6Hz0wAeXrdI1PjdeCiy0gXRhgEeIlgxB04E,17539
-autocoder/common/code_auto_merge.py,sha256=wFxv0iHciqTwzy8osGPmyF0LcdK7ysFwnzXnsWr-gwM,8642
-autocoder/common/code_auto_merge_diff.py,sha256=clVxvDlo-SN3QxARipUfOFiSEomTrC41ha7_AOmufI4,17948
-autocoder/common/code_auto_merge_editblock.py,sha256=JzVTAqvqxVMkXOOPY5Ti2Wc_nL4YABYi470sCHKTOgg,20335
-autocoder/common/code_auto_merge_strict_diff.py,sha256=oYVEs1dmObBqK_1PgFX0LeuVti7es2IZtD00iNOn91g,12116
+autocoder/common/code_auto_merge.py,sha256=QsK4wdPxmxVDtIuaTGVhCEmLHYSVX0oa-Gq3xCoSd6g,9460
+autocoder/common/code_auto_merge_diff.py,sha256=dHvgVk4V7O2J31d1JVnXezHcfvuhrS68poUvzDLRYUg,18770
+autocoder/common/code_auto_merge_editblock.py,sha256=bx32Ew9Ih-cNqdbUlcczvNi1hAtYnxKyEtle-NqE04E,21229
+autocoder/common/code_auto_merge_strict_diff.py,sha256=z6gt7an81xlE_Xdaw0jZD_qf093_V0FI78hkbdzP980,12921
 autocoder/common/code_modification_ranker.py,sha256=e1i8oNPN_PfG4O8HQnQWxh9tyOd-ur6jFTXfkHPVXYo,13152
 autocoder/common/command_completer.py,sha256=xuCxYGKDccaozmzB6p3q0QI6mlzyM180g9mnVG5zvIk,35284
 autocoder/common/command_generator.py,sha256=t1o1d7xEyfnPvY_MpG5usyx0eKW7WCUR0urKoqCex60,2761
@@ -185,9 +185,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=lkJ_A-sYU36JMzjFWkk3pR6uos8oZHYt9GPsPe_CPAo,11766
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.300.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.300.dist-info/METADATA,sha256=Qhp1ZjqoWJBHBlH0cV0CKD0P802svC1tUHU4ir4YOzE,2689
-auto_coder-0.1.300.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.300.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.300.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.300.dist-info/RECORD,,
+auto_coder-0.1.301.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.301.dist-info/METADATA,sha256=U4lqu_7Roy09MdHghi_sNNQy0QSEq69xxPOxzEULgHo,2689
+auto_coder-0.1.301.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.301.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.301.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.301.dist-info/RECORD,,

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,14 +41,17 @@ 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=[])
@@ -174,8 +177,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 +287,7 @@ class CommandAutoTuner:
             "command_combination_readme": self._command_combination_readme.prompt()
         }
     
-
+    @byzerllm.prompt()
     def _command_combination_readme(self) -> str:
         """
         <function_combination_readme>
@@ -350,8 +353,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()

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 = ()
 

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:
@@ -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)

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
@@ -197,4 +198,17 @@ 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}")
+            
+            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)

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
@@ -580,6 +581,19 @@ 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}")
+
+            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

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,
@@ -428,6 +429,19 @@ class CodeAutoMergeEditBlock:
                         self.args.source_dir,
                         f"{self.args.query}\nauto_coder_{file_name}_{md5}",
                     )
+                    
+                    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(

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
@@ -288,6 +289,18 @@ class CodeAutoMergeStrictDiff:
             commit_result = git_utils.commit_changes(
                 self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}_{md5}"
             )
+            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

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.300"
+__version__ = "0.1.301"