auto-coder 0.1.306__tar.gz → 0.1.307__tar.gz

{auto_coder-0.1.306 → auto_coder-0.1.307}/PKG-INFO

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

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/agent/auto_demand_organizer.py

@@ -6,6 +6,8 @@ import byzerllm
 import pydantic
 import git
 
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
+
 
 class DemandItem(pydantic.BaseModel):
     """单个需求项"""
@@ -44,6 +46,7 @@ class AutoDemandOrganizer:
             file_size_limit: 最多分析多少历史任务
         """
         self.project_dir = project_dir
+        self.action_file_manager = ActionYmlFileManager(project_dir)
         self.actions_dir = os.path.join(project_dir, "actions")
         self.llm = llm
         self.file_size_limit = file_size_limit
@@ -162,26 +165,16 @@ class AutoDemandOrganizer:
 
             if query and urls:
                 commit_diff = ""
-                if not self.skip_diff:
-                    # 计算文件的MD5用于匹配commit
-                    import hashlib
-                    file_md5 = hashlib.md5(open(yaml_path, 'rb').read()).hexdigest()
-                    response_id = f"auto_coder_{yaml_file}_{file_md5}"
-                    # 查找对应的commit                   
-                    try:
-                        for commit in repo.iter_commits():
-                            if response_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    commit_diff = repo.git.diff(
-                                        parent.hexsha, commit.hexsha)
-                                else:
-                                    commit_diff = repo.git.show(commit.hexsha)
-                                break
-                    except git.exc.GitCommandError as e:
-                        logger.error(f"Git命令执行错误: {str(e)}")
-                    except Exception as e:
-                        logger.error(f"获取commit diff时出错: {str(e)}")
+                if not self.skip_diff:                                    
+                    commit_id = self.action_file_manager.get_commit_id_from_file(yaml_file)
+                    commit = repo.commit(commit_id)
+                    if commit:
+                        if commit.parents:
+                            parent = commit.parents[0]
+                            commit_diff = repo.git.diff(
+                                parent.hexsha, commit.hexsha)
+                        else:
+                            commit_diff = repo.git.show(commit.hexsha)
 
                 querie_with_urls_and_diffs.append((query, urls, commit_diff))
 

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/agent/auto_filegroup.py

@@ -4,6 +4,7 @@ import yaml
 from loguru import logger
 import byzerllm
 import pydantic
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 
 
 class FileGroup(pydantic.BaseModel):
@@ -40,6 +41,7 @@ class AutoFileGroup:
             actions_dir: 包含YAML文件的目录
         """
         self.project_dir = project_dir
+        self.action_manager = ActionYmlFileManager(project_dir)
         self.actions_dir = os.path.join(project_dir, "actions")
         self.llm = llm
         self.file_size_limit = file_size_limit
@@ -152,23 +154,15 @@ class AutoFileGroup:
                 commit_diff = ""
                 if not self.skip_diff:
                     # 计算文件的MD5用于匹配commit
-                    file_md5 = hashlib.md5(open(yaml_path, 'rb').read()).hexdigest()
-                    response_id = f"auto_coder_{yaml_file}_{file_md5}"
+                    commit_id = self.action_manager.get_commit_id_from_file(yaml_file)
+                    commit = repo.commit(commit_id)                
                     # 查找对应的commit                   
-                    try:
-                        for commit in repo.iter_commits():
-                            if response_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    commit_diff = repo.git.diff(
-                                        parent.hexsha, commit.hexsha)
-                                else:
-                                    commit_diff = repo.git.show(commit.hexsha)
-                                break
-                    except git.exc.GitCommandError as e:
-                        logger.error(f"Git命令执行错误: {str(e)}")
-                    except Exception as e:
-                        logger.error(f"获取commit diff时出错: {str(e)}")
+                    if commit and commit.parents:
+                        parent = commit.parents[0]
+                        commit_diff = repo.git.diff(
+                            parent.hexsha, commit.hexsha)
+                    else:
+                        commit_diff = repo.git.show(commit.hexsha)                    
 
                 querie_with_urls_and_diffs.append((query, urls, commit_diff))
 

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/agent/auto_learn_from_commit.py

@@ -121,40 +121,30 @@ class AutoLearnFromCommit:
             if not self.skip_diff:
                 # 使用 ActionManager 获取 commit ID
                 commit_id = self.action_manager.get_commit_id_from_file(action_file)
-                if commit_id:
-                    try:
-                        for commit in repo.iter_commits():
-                            if commit_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    # 获取所有文件的前后内容
-                                    for diff_item in parent.diff(commit):
-                                        file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
-                                        
-                                        # 获取变更前内容
-                                        before_content = None
-                                        try:
-                                            if diff_item.a_blob:
-                                                before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能是新增的
+                commit = repo.commit(commit_id)                
+                if commit and commit.parents:
+                    parent = commit.parents[0]
+                    # 获取所有文件的前后内容
+                    for diff_item in parent.diff(commit):
+                        file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
+                        
+                        # 获取变更前内容
+                        before_content = None
+                        try:
+                            if diff_item.a_blob:
+                                before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
+                        except git.exc.GitCommandError:
+                            pass  # 文件可能是新增的
 
-                                        # 获取变更后内容
-                                        after_content = None
-                                        try:
-                                            if diff_item.b_blob:
-                                                after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能被删除
+                        # 获取变更后内容
+                        after_content = None
+                        try:
+                            if diff_item.b_blob:
+                                after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
+                        except git.exc.GitCommandError:
+                            pass  # 文件可能被删除
 
-                                        changes[file_path] = (before_content, after_content)
-                                break
-                    except git.exc.GitCommandError as e:
-                        printer = Printer()
-                        printer.print_in_terminal("git_command_error", style="red", error=str(e))
-                    except Exception as e:
-                        printer = Printer()
-                        printer.print_in_terminal("get_commit_changes_error", style="red", error=str(e))
+                        changes[file_path] = (before_content, after_content)
 
             querie_with_urls_and_changes.append((query, urls, changes))
 

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/agent/auto_review_commit.py

@@ -9,6 +9,7 @@ from autocoder.common.printer import Printer
 from autocoder.common import AutoCoderArgs
 from autocoder.common.utils_code_auto_generate import stream_chat_with_continue
 import hashlib
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 
 
 def load_yaml_config(yaml_file: str) -> Dict:
@@ -41,6 +42,7 @@ class AutoReviewCommit:
         self.llm = llm        
         self.skip_diff = skip_diff
         self.console = console or Console()
+        self.action_yml_manager = ActionYmlFileManager(source_dir=args.source_dir)
 
     @byzerllm.prompt()
     def review(self, querie_with_urls_and_changes: List[Tuple[str, List[str], Dict[str, Tuple[str, str]]]], query: str) -> Generator[str,None,None]:
@@ -141,66 +143,16 @@ class AutoReviewCommit:
             action_files = sorted(action_files, key=get_seq)
             action_files.reverse()   
         
+        if not action_files:
+            return []
+            
         action_file = action_files[0]
-
         querie_with_urls_and_changes = []
-        repo = git.Repo(self.project_dir)
-
-        # 收集所有query、urls和对应的文件变化
-        for yaml_file in [action_file]:
-            yaml_path = os.path.join(self.actions_dir, yaml_file)
-            config = load_yaml_config(yaml_path)
 
-            if not config:
-                continue
-
-            query = config.get('query', '')
-            urls = config.get('urls', [])
-
-            if query:
-                changes = {}
-                if not self.skip_diff:
-                    # 计算文件的MD5用于匹配commit   
-                    with open(yaml_path, 'r', encoding='utf-8') as f:
-                        yaml_content = f.read()                 
-                        file_md5 = hashlib.md5(yaml_content.encode("utf-8")).hexdigest()
-                    response_id = f"auto_coder_{yaml_file}_{file_md5}"
-                    # 查找对应的commit                   
-                    try:
-                        for commit in repo.iter_commits():
-                            if response_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    # 获取所有文件的前后内容
-                                    for diff_item in parent.diff(commit):
-                                        file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
-                                        
-                                        # 获取变更前内容
-                                        before_content = None
-                                        try:
-                                            if diff_item.a_blob:
-                                                before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能是新增的
-
-                                        # 获取变更后内容
-                                        after_content = None
-                                        try:
-                                            if diff_item.b_blob:
-                                                after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能被删除
-
-                                        changes[file_path] = (before_content, after_content)
-                                break
-                    except git.exc.GitCommandError as e:
-                        printer = Printer()
-                        printer.print_in_terminal("git_command_error", style="red", error=str(e))
-                    except Exception as e:
-                        printer = Printer()
-                        printer.print_in_terminal("get_commit_changes_error", style="red", error=str(e))
-
-                querie_with_urls_and_changes.append((query, urls, changes))
+        # 使用ActionYmlFileManager获取提交变更
+        changes = self.action_yml_manager.get_commit_changes(action_file)
+        if changes:
+            querie_with_urls_and_changes = changes
 
         return querie_with_urls_and_changes
     
@@ -289,14 +241,11 @@ class AutoReviewCommit:
         printer = Printer()
         commit_file_name = None
         if commit_id:
+            # 利用ActionYmlFileManager获取文件名
             repo = git.Repo(self.project_dir)
             commit = repo.commit(commit_id)
-            # auto_coder_000000001926_chat_action.yml_88614d5bd4046a068786c252fbc39c13
-            msg = commit.message
-            commit_file_info = msg.split("_")[0]
-            if commit_file_info.startswith("auto_coder_"):
-                commit_file_name = "_".join(msg.split("_",)[0:-1]) 
-
+            commit_file_name = self.action_yml_manager.get_file_name_from_commit_msg(commit.message)
+            
             if not commit_file_name:
                 raise ValueError(printer.get_message_from_key_with_format("no_commit_file_name",commit_id=commit_id))
         

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/auto_coder.py

@@ -27,7 +27,6 @@ from autocoder.utils.rest import HttpDoc
 from byzerllm.apps.byzer_storage.env import get_latest_byzer_retrieval_lib
 from autocoder.command_args import parse_args
 from autocoder.rag.api_server import serve, ServerArgs
-from autocoder.utils import open_yaml_file_in_editor, get_last_yaml_file
 from autocoder.utils.request_queue import (
     request_queue,
     RequestValue,
@@ -120,12 +119,10 @@ def main(input_args: Optional[List[str]] = None):
     #     args.request_id = str(uuid.uuid4())
 
     if raw_args.command == "revert":
-        repo_path = args.source_dir
-
         file_name = os.path.basename(args.file)
-        revert_result = git_utils.revert_changes(
-            repo_path, f"auto_coder_{file_name}"
-        )
+        action_file_manager = ActionYmlFileManager(source_dir=args.source_dir)
+        revert_result = action_file_manager.revert_file(file_name)
+        
         if revert_result:
             print(f"Successfully reverted changes for {args.file}")
         else:

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/auto_coder_runner.py

@@ -17,6 +17,7 @@ from contextlib import contextmanager
 from typing import List, Dict, Any, Optional
 from autocoder.common import AutoCoderArgs
 from pydantic import BaseModel
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.common.result_manager import ResultManager
 from autocoder.version import __version__
 from autocoder.auto_coder import main as auto_coder_main
@@ -695,9 +696,7 @@ def revert():
         
         if "Successfully reverted changes" in s:
             result_manager.append(content=s, meta={"action": "revert","success":False, "input":{                
-            }})
-                        
-            os.remove(file_path)
+            }})                                    
         else:
             result_manager.append(content=s, meta={"action": "revert","success":False, "input":{                
             }})
@@ -1428,12 +1427,33 @@ def commit(query: str):
             with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
                 f.write(yaml_content)
 
-            file_content = open(execute_file).read()
-            md5 = hashlib.md5(file_content.encode("utf-8")).hexdigest()
+            args.file = execute_file             
+            
             file_name = os.path.basename(execute_file)
             commit_result = git_utils.commit_changes(
                 ".", f"{commit_message}\nauto_coder_{file_name}"
             )
+
+            printer = Printer()
+
+            action_yml_file_manager = ActionYmlFileManager(args.source_dir)
+            action_file_name = os.path.basename(args.file)
+            add_updated_urls = []
+            commit_result.changed_files
+            for file in commit_result.changed_files:
+                add_updated_urls.append(os.path.join(args.source_dir, file))
+
+            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:                        
+                printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
+                        
+            if args.enable_active_context:                
+                active_context_manager = ActiveContextManager(llm, args.source_dir)
+                task_id = active_context_manager.process_changes(args)
+                printer.print_in_terminal("active_context_background_task", 
+                                             style="blue",
+                                             task_id=task_id)
             git_utils.print_commit_info(commit_result=commit_result)
             if commit_message:
                 printer.print_in_terminal("commit_message", style="green", model_name=target_model, message=commit_message)                
@@ -1800,17 +1820,29 @@ def active_context(query: str):
     if len(commands_infos) > 0:
         if "list" in commands_infos:
             command = "list"
+        if "run" in commands_infos:
+            command = "run"
     
     args = get_final_config()
+    printer = Printer()
     # 获取LLM实例    
     llm = get_single_llm(args.model,product_mode=args.product_mode)
+    action_file_manager = ActionYmlFileManager(args.source_dir)
     
     # 获取配置和参数
     
     
-    # 获取ActiveContextManager单例
-    active_context_manager = ActiveContextManager(llm, args)
-    
+    active_context_manager = ActiveContextManager(llm, args.source_dir)
+    if command == "run":
+        file_name = commands_infos["run"]["args"][-1]
+        args.file = action_file_manager.get_full_path_by_file_name(file_name)        
+        ## 因为更新了args.file
+        active_context_manager = ActiveContextManager(llm, args.source_dir)
+        task_id = active_context_manager.process_changes(args)
+        printer.print_in_terminal("active_context_background_task", 
+                                        style="blue",
+                                        task_id=task_id)
+
     # 处理不同的命令
     if command == "list":
         # 获取所有任务

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/commands/auto_command.py

@@ -213,6 +213,8 @@ class CommandAutoTuner:
     @byzerllm.prompt()
     def _analyze(self, request: AutoCommandRequest) -> str:
         """
+        你是 auto-coder.chat 软件，帮助用户完成编程方面的需求。我们的目标是根据用户输入和当前上下文，组合多个函数来完成用户的需求。
+
         ## 当前用户环境信息如下:
         <os_info>
         操作系统: {{ env_info.os_name }} {{ env_info.os_version }}
@@ -234,10 +236,11 @@ class CommandAutoTuner:
         {%- endif %}   
         </os_info>
 
-        我们的目标是根据用户输入和当前上下文，组合多个函数来完成用户的需求。
-
+        当前项目根目录：
+        {{ current_project }}
+    
         {% if current_files %}
-        ## 当前活跃区文件列表：
+        ## 当前用户手动添加关注的文件列表：
         <current_files>
         {% for file in current_files %}
         - {{ file }}
@@ -246,7 +249,7 @@ class CommandAutoTuner:
         {% endif %}
 
 
-        ## 当前用户的配置选项如下:
+        ## 这是用户对你的配置        
         <current_conf>
         {{ current_conf }}
         </current_conf>
@@ -260,6 +263,24 @@ class CommandAutoTuner:
         ## 函数组合说明：        
         {{ command_combination_readme }}
 
+        ## active-context 项目追踪文档系统
+        
+        在 {{ current_project }}/.auto-coder/active-context 下,我们提供了对该项目每个文件目录的追踪。
+        具体逻辑为：假设我们在当前项目有 ./src/package1/py1.py, 那么相应的在 .auto-coder/active-context 会有一个 ./src/package1 目录,
+        该目录下可能会有一个 active-context.md 文件，该文件记录了该目录下所有文件相关信息，可以帮你更好的理解这个目录下的文档，你可以通过 read_files 函数来读取
+        这个文件。注意，这个文件不一定存在。如果读取失败也是正常的。
+
+        ## 变更记录文档系统
+
+        在 {{ current_project }}/actions 目录下，会有格式类似 000000001201_chat_action.yml 的文件，该文件记录了最近10次对话，
+        你可以通过 read_files 函数来读取这些文件，从而更好的理解用户的需求。
+
+        下面是一些字段的简单介绍
+        - query: 用户需求
+        - urls： 用户提供的上下文文件列表
+        - dynamic_urls： auto-coder.chat 自动感知的一些文件列表
+        - add_updated_urls: 这次需求发生变更的文件列表        
+        
         {% if conversation_history %}
         ## 历史对话:
         <conversation_history>
@@ -314,7 +335,8 @@ class CommandAutoTuner:
             "conversation_safe_zone_tokens": self.args.conversation_prune_safe_zone_tokens,
             "os_distribution": shells.get_os_distribution(),
             "current_user": shells.get_current_username(),
-            "command_combination_readme": self._command_combination_readme.prompt()
+            "command_combination_readme": self._command_combination_readme.prompt(),
+            "current_project": os.path.abspath(self.args.source_dir)
         }
 
     @byzerllm.prompt()
@@ -337,8 +359,10 @@ class CommandAutoTuner:
         尽可通过了解项目后，多用 @文件和@@符号，这样 chat 函数可以更清晰的理解你关注的代码，文档和意图。
 
         ### 调用 coding 函数应该注意的事项
-        调用 coding 函数的时候，尽可能多的 @文件和@@符号，让需求更加清晰明了，建议多描述具体怎么完成对应的需求。
-        对于代码需求设计，尽可能使用 chat 函数。如果成功执行了 coding 函数， 最好再调用一次 chat("/review /commit")，方便总结这次代码变更。
+        调用 coding 函数的之前，你需要尽可能先了解用户需求，了解项目状态，包括读取 active_context 文件来了解项目。
+        然后清晰的描述自己的需求，完整的实现步骤，以及尽可能对@文件和@@符号需要参考以及修改的文件和符号。
+        对于比较复杂的需求，你还可以使用 chat 函数来进行讨论，从而获取一些有用的信息。
+        如果成功执行了 coding 函数， 最好再调用一次 chat("/review /commit")，方便总结这次代码变更。
         注意，review 完后，需要询问用户是否要做啥调整不，如果用户说不用，那么就停止。否则根据意图进行后续操作。
 
         ### 关于对话大小的问题

{auto_coder-0.1.306 → auto_coder-0.1.307}/src/autocoder/common/__init__.py

@@ -416,6 +416,8 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     generate_max_rounds: Optional[int] = 5
 
+    revert_commit_id: Optional[str] = None
+
     class Config:
         protected_namespaces = ()