auto-coder 0.1.305__py3-none-any.whl → 0.1.306__py3-none-any.whl

autocoder/common/code_auto_generate_strict_diff.py

@@ -6,12 +6,16 @@ from autocoder.utils.queue_communicate import queue_communicate, CommunicateEven
 from autocoder.common import sys_prompt
 from concurrent.futures import ThreadPoolExecutor
 import json
-from autocoder.common.utils_code_auto_generate import chat_with_continue
+from autocoder.common.utils_code_auto_generate import chat_with_continue,stream_chat_with_continue,ChatWithContinueResult
+from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
+from autocoder.common.stream_out_type import CodeGenerateStreamOutType
+from autocoder.common.auto_coder_lang import get_message_with_format
 from autocoder.common.printer import Printer
 from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.privacy.model_filter import ModelPathFilter
+from autocoder.memory.active_context_manager import ActiveContextManager
 class CodeAutoGenerateStrictDiff:
     def __init__(
         self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs, action=None
@@ -31,7 +35,7 @@ class CodeAutoGenerateStrictDiff:
 
     @byzerllm.prompt(llm=lambda self: self.llm)
     def multi_round_instruction(
-        self, instruction: str, content: str, context: str = ""
+        self, instruction: str, content: str, context: str = "", package_context: str = ""
     ) -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件，写出类似于 unified diff 的更改，就像`diff -U0`会产生的那样。
@@ -124,6 +128,13 @@ class CodeAutoGenerateStrictDiff:
         </files>
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
         {%- if context %}
         <extra_context>
         {{ context }}
@@ -152,7 +163,7 @@ class CodeAutoGenerateStrictDiff:
 
     @byzerllm.prompt(llm=lambda self: self.llm)
     def single_round_instruction(
-        self, instruction: str, content: str, context: str = ""
+        self, instruction: str, content: str, context: str = "", package_context: str = ""
     ) -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件，写出类似于 unified diff 的更改，就像`diff -U0`会产生的那样。
@@ -248,6 +259,13 @@ class CodeAutoGenerateStrictDiff:
         </files>
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
         {%- if context %}
         <extra_context>
         {{ context }}
@@ -278,9 +296,28 @@ class CodeAutoGenerateStrictDiff:
         llm_config = {"human_as_model": self.args.human_as_model}
         source_content = source_code_list.to_str()
 
+        # 获取包上下文信息
+        package_context = ""
+        
+        if self.args.enable_active_context:
+            # 初始化活动上下文管理器
+            active_context_manager = ActiveContextManager(self.llm, self.args)
+            # 获取活动上下文信息
+            result = active_context_manager.load_active_contexts_for_files(
+                [source.module_name for source in source_code_list.sources]
+            )
+            # 将活动上下文信息格式化为文本
+            if result.contexts:
+                package_context_parts = []
+                for dir_path, context in result.contexts.items():
+                    package_context_parts.append(f"<package_info>{context.content}</package_info>")
+                
+                package_context = "\n".join(package_context_parts)
+
         if self.args.template == "common":
             init_prompt = self.single_round_instruction.prompt(
-                instruction=query, content=source_content, context=self.args.context
+                instruction=query, content=source_content, context=self.args.context,
+                package_context=package_context
             )
         elif self.args.template == "auto_implement":
             init_prompt = self.auto_implement_function.prompt(
@@ -336,10 +373,39 @@ class CodeAutoGenerateStrictDiff:
                         if model_names_list:
                             model_name = model_names_list[0]                                                    
                         
-                        for _ in range(self.generate_times_same_model):
+                        for i in range(self.generate_times_same_model):
                             model_names.append(model_name)
-                            futures.append(executor.submit(
-                                chat_with_continue, llm=llm, conversations=conversations, llm_config=llm_config))
+                            if i==0:
+                                def job():
+                                    stream_generator = stream_chat_with_continue(
+                                        llm=llm, 
+                                        conversations=conversations, 
+                                        llm_config=llm_config,
+                                        args=self.args
+                                    )
+                                    full_response, last_meta = stream_out(
+                                    stream_generator,
+                                    model_name=model_name,
+                                    title=get_message_with_format(
+                                        "code_generate_title", model_name=model_name),
+                                    args=self.args,
+                                    extra_meta={
+                                        "stream_out_type": CodeGenerateStreamOutType.CODE_GENERATE.value
+                                    })
+                                    return ChatWithContinueResult(
+                                        content=full_response,
+                                        input_tokens_count=last_meta.input_tokens_count,
+                                        generated_tokens_count=last_meta.generated_tokens_count
+                                    )
+                                futures.append(executor.submit(job))
+                            else:                                
+                                futures.append(executor.submit(
+                                    chat_with_continue, 
+                                    llm=llm, 
+                                    conversations=conversations, 
+                                    llm_config=llm_config,
+                                    args=self.args
+                                ))
                             
                 temp_results = [future.result() for future in futures]
                 for result in temp_results:
@@ -356,7 +422,12 @@ class CodeAutoGenerateStrictDiff:
                     conversations + [{"role": "assistant", "content": result}])
         else:            
             for _ in range(self.args.human_model_num):
-                single_result = chat_with_continue(llm=self.llms[0], conversations=conversations, llm_config=llm_config)                
+                single_result = chat_with_continue(
+                    llm=self.llms[0], 
+                    conversations=conversations, 
+                    llm_config=llm_config,
+                    args=self.args
+                )                
                 results.append(single_result.content)
                 input_tokens_count += single_result.input_tokens_count
                 generated_tokens_count += single_result.generated_tokens_count
@@ -404,9 +475,28 @@ class CodeAutoGenerateStrictDiff:
         result = []
         source_content = source_code_list.to_str()
 
+        # 获取包上下文信息
+        package_context = ""
+        
+        if self.args.enable_active_context:
+            # 初始化活动上下文管理器
+            active_context_manager = ActiveContextManager(self.llm, self.args)
+            # 获取活动上下文信息
+            result = active_context_manager.load_active_contexts_for_files(
+                [source.module_name for source in source_code_list.sources]
+            )
+            # 将活动上下文信息格式化为文本
+            if result.contexts:
+                package_context_parts = []
+                for dir_path, context in result.contexts.items():
+                    package_context_parts.append(f"<package_info>{context.content}</package_info>")
+                
+                package_context = "\n".join(package_context_parts)
+
         if self.args.template == "common":
             init_prompt = self.multi_round_instruction.prompt(
-                instruction=query, content=source_content, context=self.args.context
+                instruction=query, content=source_content, context=self.args.context,
+                package_context=package_context
             )
         elif self.args.template == "auto_implement":
             init_prompt = self.auto_implement_function.prompt(

autocoder/common/code_auto_merge.py

@@ -11,6 +11,7 @@ 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
+from autocoder.memory.active_context_manager import ActiveContextManager
 
 class PathAndCode(pydantic.BaseModel):
     path: str
@@ -211,4 +212,11 @@ class CodeAutoMerge:
             if not update_yaml_success:                        
                 self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
             
+            if self.args.enable_active_context:
+                active_context_manager = ActiveContextManager(self.llm, self.args)
+                task_id = active_context_manager.process_changes()
+                self.printer.print_in_terminal("active_context_background_task", 
+                                             style="blue",
+                                             task_id=task_id)
+            
             git_utils.print_commit_info(commit_result=commit_result)

autocoder/common/code_auto_merge_diff.py

@@ -9,6 +9,7 @@ from autocoder.common.printer import Printer
 import hashlib
 from pathlib import Path
 from itertools import groupby
+from autocoder.memory.active_context_manager import ActiveContextManager
 from autocoder.common.search_replace import (
     SearchTextNotUnique,
     all_preprocs,
@@ -593,6 +594,13 @@ class CodeAutoMergeDiff:
             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)    
+            
+            if self.args.enable_active_context:
+                active_context_manager = ActiveContextManager(self.llm, self.args)
+                task_id = active_context_manager.process_changes()
+                self.printer.print_in_terminal("active_context_background_task", 
+                                             style="blue",
+                                             task_id=task_id)
                           
             git_utils.print_commit_info(commit_result=commit_result)
         else:

autocoder/common/code_auto_merge_editblock.py

@@ -3,6 +3,7 @@ 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.memory.active_context_manager import ActiveContextManager
 from autocoder.utils.queue_communicate import (
     queue_communicate,
     CommunicateEvent,
@@ -442,6 +443,12 @@ class CodeAutoMergeEditBlock:
                     if not update_yaml_success:                        
                         self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
 
+                    if self.args.enable_active_context:
+                        active_context_manager = ActiveContextManager(self.llm, self.args)
+                        task_id = active_context_manager.process_changes()
+                        self.printer.print_in_terminal("active_context_background_task", 
+                                                     style="blue",
+                                                     task_id=task_id)
                     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

@@ -12,6 +12,7 @@ from pathlib import Path
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
 from autocoder.common.code_modification_ranker import CodeModificationRanker
 from autocoder.common import files as  FileUtils
+from autocoder.memory.active_context_manager import ActiveContextManager
 
 class PathAndCode(pydantic.BaseModel):
     path: str
@@ -301,6 +302,10 @@ class CodeAutoMergeStrictDiff:
             if not update_yaml_success:                        
                 self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
             
+            if self.args.enable_active_context:
+                active_context_manager = ActiveContextManager(self.llm, self.args)
+                active_context_manager.process_changes()
+            
             git_utils.print_commit_info(commit_result=commit_result)
         else:
             # Print diff blocks for review

autocoder/common/code_modification_ranker.py

@@ -163,7 +163,8 @@ class CodeModificationRanker:
                                     stream_chat_with_continue,
                                     llm,
                                     [{"role": "user", "content": query}],
-                                    {}
+                                    {},
+                                    self.args
                                 )
                             )
                         else:    
@@ -172,7 +173,8 @@ class CodeModificationRanker:
                                     chat_with_continue,
                                     llm,
                                     [{"role": "user", "content": query}],
-                                    {}
+                                    {},
+                                    self.args
                                 )
                             )
 

autocoder/common/command_completer.py

@@ -53,6 +53,9 @@ COMMANDS = {
     },
     "/shell": {
         "/chat": "",
+    },
+    "/active_context": {
+        "/list": ""
     }
 }
 
@@ -496,6 +499,15 @@ class CommandCompleter(Completer):
                     if command.startswith(current_word):
                         yield Completion(command, start_position=-len(current_word))            
 
+            elif words[0] == "/active_context":
+                new_text = text[len("/active_context"):]
+                parser = CommandTextParser(new_text, words[0])
+                parser.lib()
+                current_word = parser.current_word()
+                for command in parser.get_sub_commands():
+                    if command.startswith(current_word):
+                        yield Completion(command, start_position=-len(current_word))
+
             elif words[0] == "/conf":
                 new_words = text[len("/conf"):].strip().split()
                 is_at_space = text[-1] == " "

autocoder/common/command_generator.py

@@ -1,7 +1,7 @@
 import byzerllm
 from byzerllm.utils.client import code_utils
 from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
-from autocoder.common import detect_env
+from autocoder.common import detect_env,AutoCoderArgs
 from autocoder.common import shells
 from autocoder.common.printer import Printer
 from typing import Dict,Union
@@ -57,9 +57,9 @@ def _generate_shell_script(user_input: str) -> str:
     }
 
 
-def generate_shell_script(user_input: str, llm: Union[byzerllm.ByzerLLM,byzerllm.SimpleByzerLLM]) -> str:
+def generate_shell_script(args: AutoCoderArgs, llm: Union[byzerllm.ByzerLLM,byzerllm.SimpleByzerLLM]) -> str:
     # 获取 prompt 内容
-    prompt = _generate_shell_script.prompt(user_input=user_input)
+    prompt = _generate_shell_script.prompt(user_input=args.query)
     if llm.get_sub_client("chat_model"):
         shell_llm = llm.get_sub_client("chat_model")                
     else:
@@ -74,7 +74,8 @@ def generate_shell_script(user_input: str, llm: Union[byzerllm.ByzerLLM,byzerllm
     result, _ = stream_out(
         shell_llm.stream_chat_oai(conversations=conversations, delta_mode=True),
         model_name=llm.default_model_name,
-        title=title        
+        title=title,
+        args=args       
     )
     
     # 提取代码块

autocoder/common/git_utils.py

@@ -213,13 +213,18 @@ def get_uncommitted_changes(repo_path: str) -> str:
         # 处理未暂存的变更
         for diff_item in diff_index:
             file_path = diff_item.a_path
-            diff_content = repo.git.diff(None, file_path)            
-            if diff_item.new_file:
-                changes['new'].append((file_path, diff_content))
-            elif diff_item.deleted_file:
-                changes['deleted'].append((file_path, diff_content))
-            else:
-                changes['modified'].append((file_path, diff_content))
+            try:
+                diff_content = repo.git.diff(None, '--', file_path)            
+                if diff_item.new_file:
+                    changes['new'].append((file_path, diff_content))
+                elif diff_item.deleted_file:
+                    changes['deleted'].append((file_path, diff_content))
+                else:
+                    changes['modified'].append((file_path, diff_content))
+            except GitCommandError as e:
+                logger.error(f"Error getting diff for file {file_path}: {e}")
+                # 继续处理下一个文件，不中断整个流程
+                continue
                 
         # 处理未追踪的文件    
         for file_path in untracked:
@@ -229,6 +234,7 @@ def get_uncommitted_changes(repo_path: str) -> str:
                 changes['new'].append((file_path, f'+++ {file_path}\n{content}'))
             except Exception as e:
                 logger.error(f"Error reading file {file_path}: {e}")
+                # 继续处理下一个文件
                 
         # 生成markdown报告
         report = ["# Git Changes Report\n"]

autocoder/common/stream_out_type.py

@@ -4,4 +4,8 @@ class AutoCommandStreamOutType(Enum):
     COMMAND_SUGGESTION = "command_suggestion"
 
 class IndexFilterStreamOutType(Enum):
-    FILE_NUMBER_LIST = "file_number_list"
+    FILE_NUMBER_LIST = "file_number_list"
+
+
+class CodeGenerateStreamOutType(Enum):
+    CODE_GENERATE = "code_generate"

autocoder/common/utils_code_auto_generate.py

@@ -2,6 +2,8 @@ from byzerllm import ByzerLLM,SimpleByzerLLM
 from typing import Generator, List, Any, Union, Optional, Callable
 from pydantic import BaseModel
 from loguru import logger
+from autocoder.common import AutoCoderArgs
+from autocoder.common.auto_coder_lang import get_message_with_format
 
 class ChatWithContinueResult(BaseModel):
     content: str
@@ -9,7 +11,12 @@ class ChatWithContinueResult(BaseModel):
     generated_tokens_count: int
     
 
-def chat_with_continue(llm: Union[ByzerLLM,SimpleByzerLLM], conversations: List[dict], llm_config: dict) -> ChatWithContinueResult:
+def chat_with_continue(
+        llm: Union[ByzerLLM,SimpleByzerLLM], 
+        conversations: List[dict], 
+        llm_config: dict,
+        args: AutoCoderArgs
+    ) -> ChatWithContinueResult:
     final_result = ChatWithContinueResult(content="", input_tokens_count=0, generated_tokens_count=0)
     v = llm.chat_oai(
         conversations=conversations, llm_config=llm_config)
@@ -32,6 +39,15 @@ def chat_with_continue(llm: Union[ByzerLLM,SimpleByzerLLM], conversations: List[
         final_result.input_tokens_count += metadata.get("input_tokens_count", 0)
         final_result.generated_tokens_count += metadata.get("generated_tokens_count", 0)
         count += 1
+
+    if count >= args.generate_max_rounds:
+        warning_message = get_message_with_format(
+            "generate_max_rounds_reached",
+            count=count,
+            max_rounds=args.generate_max_rounds,
+            generated_tokens=final_result.generated_tokens_count
+        )
+        logger.warning(warning_message)        
     
     # if count >= 2:
     #   logger.info(f"The code generation is exceed the max length, continue to generate the code {count -1 } times")
@@ -41,7 +57,8 @@ def chat_with_continue(llm: Union[ByzerLLM,SimpleByzerLLM], conversations: List[
 def stream_chat_with_continue(
     llm: Union[ByzerLLM, SimpleByzerLLM], 
     conversations: List[dict], 
-    llm_config: dict    
+    llm_config: dict,
+    args: AutoCoderArgs
 ) -> Generator[Any, None, None]:
     """
     流式处理并继续生成内容，直到完成。
@@ -87,7 +104,16 @@ def stream_chat_with_continue(
         temp_conversations.append({"role": "assistant", "content": current_content})
         
         # 检查是否需要继续生成
-        if current_metadata.finish_reason != "length" or count >= 5:
+        if current_metadata.finish_reason != "length" or count >= args.generate_max_rounds:
+            if count >= args.generate_max_rounds:
+                warning_message = get_message_with_format(
+                    "generate_max_rounds_reached",
+                    count=count,
+                    max_rounds=args.generate_max_rounds,
+                    generated_tokens=current_metadata.generated_tokens_count
+                )
+                logger.warning(warning_message)
             break
         
+        
         count += 1

autocoder/dispacher/__init__.py

@@ -1,30 +1,29 @@
-
 from autocoder.common import AutoCoderArgs
 from autocoder.dispacher.actions.copilot import ActionCopilot
-from autocoder.dispacher.actions.action import ActionTSProject, ActionPyScriptProject, ActionPyProject, ActionSuffixProject
-from autocoder.dispacher.actions.plugins.action_translate import ActionTranslate
+from autocoder.dispacher.actions.action import (
+    ActionTSProject,
+    ActionPyProject,
+    ActionSuffixProject,
+)
 from autocoder.dispacher.actions.plugins.action_regex_project import ActionRegexProject
 from typing import Optional
 import byzerllm
-import re
 
-class Dispacher():
-    def __init__(self, args:AutoCoderArgs,llm:Optional[byzerllm.ByzerLLM]=None):
+
+class Dispacher:
+    def __init__(self, args: AutoCoderArgs, llm: Optional[byzerllm.ByzerLLM] = None):
         self.args = args
-        self.llm = llm 
+        self.llm = llm
 
     def dispach(self):
-        args = self.args        
-        actions = [ActionTranslate(args=args,llm=self.llm),
-                    ActionTSProject(args=args,llm=self.llm),
-                    ActionPyScriptProject(args=args,llm=self.llm),
-                    ActionPyProject(args=args,llm=self.llm),
-                    ActionCopilot(args=args,llm=self.llm),
-                    ActionRegexProject(args=args,llm=self.llm),
-                    ActionSuffixProject(args=args,llm=self.llm)
-                    ]
+        args = self.args
+        actions = [            
+            ActionTSProject(args=args, llm=self.llm),
+            ActionPyProject(args=args, llm=self.llm),
+            ActionCopilot(args=args, llm=self.llm),
+            ActionRegexProject(args=args, llm=self.llm),
+            ActionSuffixProject(args=args, llm=self.llm),
+        ]
         for action in actions:
             if action.run():
-                return                
-        
-    
+                return

autocoder/dispacher/actions/action.py

@@ -221,138 +221,6 @@ class ActionTSProject(BaseAction):
                     )
 
 
-class ActionPyScriptProject(BaseAction):
-    def __init__(
-        self, args: AutoCoderArgs, llm: Optional[byzerllm.ByzerLLM] = None
-    ) -> None:
-        self.args = args
-        self.llm = llm
-        self.printer = Printer()
-
-    def run(self) -> bool:
-        args = self.args
-        if args.project_type != "py-script":
-            return False
-        pp = Level1PyProject(
-            script_path=args.script_path, package_name=args.package_name
-        )
-        pp.run()
-        source_code_list = SourceCodeList(pp.sources)
-        self.process_content(source_code_list)
-        return True
-
-    def process_content(self, source_code_list: SourceCodeList):
-        args = self.args
-        global_cancel.check_and_raise()
-
-        if args.execute:
-            self.printer.print_in_terminal("code_generation_start")
-            start_time = time.time()
-            if args.auto_merge == "diff":
-                generate = CodeAutoGenerateDiff(
-                    llm=self.llm, args=self.args, action=self
-                )
-            elif args.auto_merge == "strict_diff":
-                generate = CodeAutoGenerateStrictDiff(
-                    llm=self.llm, args=self.args, action=self
-                )
-            elif args.auto_merge == "editblock":
-                generate = CodeAutoGenerateEditBlock(
-                    llm=self.llm, args=self.args, action=self
-                )
-            else:
-                generate = CodeAutoGenerate(
-                    llm=self.llm, args=self.args, action=self)
-            if self.args.enable_multi_round_generate:
-                generate_result = generate.multi_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-            else:
-                generate_result = generate.single_round_run(
-                    query=args.query, source_code_list=source_code_list
-                )
-
-            elapsed_time = time.time() - start_time
-            speed = generate_result.metadata.get(
-                'generated_tokens_count', 0) / elapsed_time if elapsed_time > 0 else 0
-            model_names = ",".join(get_llm_names(generate.llms))
-            input_tokens_cost = generate_result.metadata.get(
-                'input_tokens_cost', 0)
-            generated_tokens_cost = generate_result.metadata.get(
-                'generated_tokens_cost', 0)
-            self.printer.print_in_terminal(
-                "code_generation_complete",
-                duration=elapsed_time,
-                input_tokens=generate_result.metadata.get(
-                    'input_tokens_count', 0),
-                output_tokens=generate_result.metadata.get(
-                    'generated_tokens_count', 0),
-                input_cost=input_tokens_cost,
-                output_cost=generated_tokens_cost,
-                speed=round(speed, 2),
-                model_names=model_names,
-                sampling_count=len(generate_result.contents)
-            )
-
-            get_event_manager(self.args.event_file).write_result(
-                EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
-                    model_name=model_names,
-                    elapsed_time=elapsed_time,
-                    input_tokens=generate_result.metadata.get(
-                        'input_tokens_count', 0),
-                    output_tokens=generate_result.metadata.get(
-                        'generated_tokens_count', 0),
-                    input_cost=input_tokens_cost,
-                    output_cost=generated_tokens_cost,
-                    speed=round(speed, 2)
-                )).to_dict(),metadata=EventMetadata(
-                    action_file=self.args.file
-                ).to_dict())
-
-            global_cancel.check_and_raise()
-
-            merge_result = None
-            if args.execute and args.auto_merge:
-                self.printer.print_in_terminal("code_merge_start")
-                if args.auto_merge == "diff":
-                    code_merge = CodeAutoMergeDiff(
-                        llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-                elif args.auto_merge == "strict_diff":
-                    code_merge = CodeAutoMergeStrictDiff(
-                        llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-                elif args.auto_merge == "editblock":
-                    code_merge = CodeAutoMergeEditBlock(
-                        llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-                else:
-                    code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
-                    merge_result = code_merge.merge_code(
-                        generate_result=generate_result)
-
-                content = merge_result.contents[0]
-
-                store_code_model_conversation(
-                    args=self.args,
-                    instruction=self.args.query,
-                    conversations=merge_result.conversations[0],
-                    model=self.llm.default_model_name,
-                )
-            else:
-                content = generate_result.contents[0]
-
-                store_code_model_conversation(
-                    args=self.args,
-                    instruction=self.args.query,
-                    conversations=generate_result.conversations[0],
-                    model=self.llm.default_model_name,
-                )
-
-
 class ActionPyProject(BaseAction):
     def __init__(
         self, args: AutoCoderArgs, llm: Optional[byzerllm.ByzerLLM] = None