auto-coder 0.1.330__py3-none-any.whl → 0.1.332__py3-none-any.whl

autocoder/common/v2/code_auto_generate_diff.py

@@ -281,6 +281,7 @@ class CodeAutoGenerateDiff:
         if not self.args.human_as_model:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
+                count = 0
                 for llm in self.llms:
                     
                     model_names_list = llm_utils.get_llm_names(llm) 
@@ -288,9 +289,9 @@ class CodeAutoGenerateDiff:
                     if model_names_list:
                         model_name = model_names_list[0]                    
 
-                    for i in range(self.generate_times_same_model):
+                    for _ in range(self.generate_times_same_model):
                         model_names.append(model_name)
-                        if i==0:
+                        if count == 0:
                             def job():
                                 stream_generator = stream_chat_with_continue(
                                     llm=llm, 
@@ -321,7 +322,7 @@ class CodeAutoGenerateDiff:
                                 llm_config=llm_config,
                                 args=self.args
                             ))
-                
+                        count += 1
                 temp_results = [future.result() for future in futures]
                 
                 for result,model_name in zip(temp_results,model_names):

autocoder/common/v2/code_auto_generate_editblock.py

@@ -15,6 +15,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
+from loguru import logger
 
 
 
@@ -298,6 +299,7 @@ class CodeAutoGenerateEditBlock:
         if not self.args.human_as_model:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
+                count = 0
                 for llm in self.llms:
                     
                     model_names_list = llm_utils.get_llm_names(llm) 
@@ -305,9 +307,10 @@ class CodeAutoGenerateEditBlock:
                     if model_names_list:
                         model_name = model_names_list[0]                    
 
-                    for i in range(self.generate_times_same_model):
-                        model_names.append(model_name)
-                        if i==0:
+                    for _ in range(self.generate_times_same_model):
+                        model_names.append(model_name)                          
+                        if count==0:
+                            logger.info(f"code generation with model(Stream): {model_name}")
                             def job():
                                 stream_generator = stream_chat_with_continue(
                                     llm=llm, 
@@ -330,7 +333,8 @@ class CodeAutoGenerateEditBlock:
                                     generated_tokens_count=last_meta.generated_tokens_count
                                 )
                             futures.append(executor.submit(job))
-                        else:                                
+                        else:    
+                            logger.info(f"code generation with model(Non-stream): {model_name}")
                             futures.append(executor.submit(
                                 chat_with_continue, 
                                 llm=llm, 
@@ -338,6 +342,7 @@ class CodeAutoGenerateEditBlock:
                                 llm_config=llm_config,
                                 args=self.args
                             ))
+                        count += 1
                 
                 temp_results = [future.result() for future in futures]
                 

autocoder/common/v2/code_auto_generate_strict_diff.py

@@ -2,17 +2,39 @@ from typing import List, Dict, Tuple
 from autocoder.common.types import Mode, CodeGenerateResult
 from autocoder.common import AutoCoderArgs
 import byzerllm
+from autocoder.utils.queue_communicate import queue_communicate, CommunicateEvent, CommunicateEventType
 from autocoder.common import sys_prompt
-from autocoder.common.v2.code_auto_generate import CodeAutoGenerate
+from concurrent.futures import ThreadPoolExecutor
+import json
+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
-
-class CodeAutoGenerateStrictDiff(CodeAutoGenerate):
-    """
-    A class that handles code generation in strict diff format.
-    """
+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
+    ) -> None:
+        self.llm = llm
+        self.args = args
+        self.action = action
+        self.llms = []
+        self.generate_times_same_model = args.generate_times_same_model
+        if not self.llm:
+            raise ValueError(
+                "Please provide a valid model instance to use for code generation."
+            )        
+        self.llms = self.llm.get_sub_client("code_model") or [self.llm]
+        if not isinstance(self.llms, list):
+            self.llms = [self.llms]
 
     @byzerllm.prompt(llm=lambda self: self.llm)
-    def single_round_instruction(
+    def multi_round_instruction(
         self, instruction: str, content: str, context: str = "", package_context: str = ""
     ) -> str:
         """
@@ -33,9 +55,6 @@ class CodeAutoGenerateStrictDiff(CodeAutoGenerate):
         Indentation matters in the diffs!
 
         To make a new file, show a diff from `--- /dev/null` to `+++ path/to/new/file.ext`.
-        The code part of the diff content should not contains any line number.
-
-        The path start with `---` or `+++` should be the absolute path of the file or relative path from the project root.
 
         下面我们来看一个例子：
 
@@ -125,6 +144,8 @@ class CodeAutoGenerateStrictDiff(CodeAutoGenerate):
         下面是用户的需求：
 
         {{ instruction }}
+
+        每次生成一个文件的diff，然后询问我是否继续，当我回复继续，继续生成下一个文件的diff。当没有后续任务时，请回复 "__完成__" 或者 "__EOF__"。
         """
         
         if not self.args.include_project_structure:
@@ -141,7 +162,7 @@ class CodeAutoGenerateStrictDiff(CodeAutoGenerate):
         }
 
     @byzerllm.prompt(llm=lambda self: self.llm)
-    def multi_round_instruction(
+    def single_round_instruction(
         self, instruction: str, content: str, context: str = "", package_context: str = ""
     ) -> str:
         """
@@ -162,6 +183,9 @@ class CodeAutoGenerateStrictDiff(CodeAutoGenerate):
         Indentation matters in the diffs!
 
         To make a new file, show a diff from `--- /dev/null` to `+++ path/to/new/file.ext`.
+        The code part of the diff content should not contains any line number.
+
+        The path start with `---` or `+++` should be the absolute path of the file or relative path from the project root.
 
         下面我们来看一个例子：
 
@@ -251,8 +275,6 @@ class CodeAutoGenerateStrictDiff(CodeAutoGenerate):
         下面是用户的需求：
 
         {{ instruction }}
-
-        每次生成一个文件的diff，然后询问我是否继续，当我回复继续，继续生成下一个文件的diff。当没有后续任务时，请回复 "__完成__" 或者 "__EOF__"。
         """
         
         if not self.args.include_project_structure:
@@ -266,4 +288,150 @@ class CodeAutoGenerateStrictDiff(CodeAutoGenerate):
                 if self.action
                 else ""
             )
-        } 
+        }
+
+    def single_round_run(
+        self, query: str, source_code_list: SourceCodeList
+    ) -> CodeGenerateResult:
+        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.source_dir)
+            # 获取活动上下文信息
+            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,
+                package_context=package_context
+            )
+        elif self.args.template == "auto_implement":
+            init_prompt = self.auto_implement_function.prompt(
+                instruction=query, content=source_content
+            )
+
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
+            file.write(init_prompt)
+
+        conversations = []
+
+        if self.args.system_prompt and self.args.system_prompt.strip() == "claude":
+            conversations.append(
+                {"role": "system", "content": sys_prompt.claude_sys_prompt.prompt()})
+        elif self.args.system_prompt:
+            conversations.append(
+                {"role": "system", "content": self.args.system_prompt})
+
+        conversations.append({"role": "user", "content": init_prompt})
+        
+        conversations_list = []
+        results = []
+        input_tokens_count = 0
+        generated_tokens_count = 0
+        input_tokens_cost = 0
+        generated_tokens_cost = 0
+        model_names = []
+
+        printer = Printer()
+        estimated_input_tokens = count_tokens(json.dumps(conversations, ensure_ascii=False))
+        printer.print_in_terminal("estimated_input_tokens_in_generate", style="yellow",
+                                  estimated_input_tokens_in_generate=estimated_input_tokens,
+                                  generate_mode="strict_diff"
+                                  )
+
+        if not self.args.human_as_model:
+            with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
+                futures = []
+                count = 0
+                for llm in self.llms:
+                    for _ in range(self.generate_times_same_model):
+                        
+                        model_names_list = llm_utils.get_llm_names(llm)
+                        model_name = None
+                        if model_names_list:
+                            model_name = model_names_list[0]                                                    
+                        
+                        for _ in range(self.generate_times_same_model):
+                            model_names.append(model_name)
+                            if count == 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
+                                ))
+                            count += 1
+                            
+                temp_results = [future.result() for future in futures]
+                for result in temp_results:
+                    results.append(result.content)
+                    input_tokens_count += result.input_tokens_count
+                    generated_tokens_count += result.generated_tokens_count
+                    model_info = llm_utils.get_model_info(model_name, self.args.product_mode)
+                    input_cost = model_info.get("input_price", 0) if model_info else 0
+                    output_cost = model_info.get("output_price", 0) if model_info else 0
+                    input_tokens_cost += input_cost * result.input_tokens_count / 1000000
+                    generated_tokens_cost += output_cost * result.generated_tokens_count / 1000000
+            for result in results:
+                conversations_list.append(
+                    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,
+                    args=self.args
+                )                
+                results.append(single_result.content)
+                input_tokens_count += single_result.input_tokens_count
+                generated_tokens_count += single_result.generated_tokens_count
+                conversations_list.append(conversations + [{"role": "assistant", "content": single_result.content}])
+        
+        statistics = {
+            "input_tokens_count": input_tokens_count,
+            "generated_tokens_count": generated_tokens_count,
+            "input_tokens_cost": input_tokens_cost,
+            "generated_tokens_cost": generated_tokens_cost
+        }        
+
+        return CodeGenerateResult(contents=results, conversations=conversations_list, metadata=statistics)
+