auto-coder 1.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

autocoder/common/code_auto_generate_editblock.py

@@ -4,24 +4,28 @@ from autocoder.common import AutoCoderArgs
 import byzerllm
 from autocoder.common import sys_prompt
 from autocoder.privacy.model_filter import ModelPathFilter
-from autocoder.utils.queue_communicate import (
-    queue_communicate,
-    CommunicateEvent,
-    CommunicateEventType,
-)
 import json
 from concurrent.futures import ThreadPoolExecutor
-from autocoder.common.utils_code_auto_generate import chat_with_continue,stream_chat_with_continue,ChatWithContinueResult
+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.common.tokens import count_string_tokens as count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
-from autocoder.common.rulefiles.autocoderrules_utils import get_rules
-from autocoder.run_context import get_run_context,RunMode
+from autocoder.common.rulefiles import get_rules
+from autocoder.run_context import get_run_context, RunMode
+from autocoder.common.save_formatted_log import save_formatted_log
+import platform
+import os
+from datetime import datetime
+
 
 class CodeAutoGenerateEditBlock:
     def __init__(
@@ -64,7 +68,13 @@ class CodeAutoGenerateEditBlock:
         """
 
     @byzerllm.prompt()
-    def multi_round_instruction(self, instruction: str, content: str, context: str = "", package_context: str = "") -> str:
+    def multi_round_instruction(
+        self,
+        instruction: str,
+        content: str,
+        context: str = "",
+        package_context: str = "",
+    ) -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。
 
@@ -187,6 +197,12 @@ class CodeAutoGenerateEditBlock:
 
         现在让我们开始一个新的任务:
 
+        <env>
+        当前工作目录: {{ current_dir }}
+        操作系统: {{ os_info }}
+        当前时间: {{ current_time }}
+        </env>
+
         {%- if structure %}
         ====
         {{ structure }}
@@ -206,14 +222,14 @@ class CodeAutoGenerateEditBlock:
         <package_context>
         {{ package_context }}
         </package_context>
-        {%- endif %}     
+        {%- endif %}
 
         {%- if context %}
         ====
         <extra_context>
         {{ context }}
         </extra_context>
-        {%- endif %}     
+        {%- endif %}
 
         {%- if extra_docs %}
         ====
@@ -227,7 +243,7 @@ class CodeAutoGenerateEditBlock:
         ##File: {{ key }}
         {{ value }}
         </user_rule>
-        {% endfor %}        
+        {% endfor %}
         {% endif %}
 
         ====
@@ -238,14 +254,21 @@ class CodeAutoGenerateEditBlock:
 
         每次生成一个文件的*SEARCH/REPLACE* blocks，然后询问我是否继续，当我回复继续，继续生成下一个文件的*SEARCH/REPLACE* blocks。当没有后续任务时，请回复 "__完成__" 或者 "__EOF__"。
         """
+        # 收集环境信息
+        current_dir = os.getcwd()
+        os_info = f"{platform.system()} {platform.release()}"
+        current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
         if not self.args.include_project_structure:
             return {
                 "structure": "",
                 "fence_0": self.fence_0,
                 "fence_1": self.fence_1,
+                "current_dir": current_dir,
+                "os_info": os_info,
+                "current_time": current_time,
             }
-        
+
         extra_docs = get_rules()
 
         return {
@@ -257,14 +280,19 @@ class CodeAutoGenerateEditBlock:
             "fence_0": self.fence_0,
             "fence_1": self.fence_1,
             "extra_docs": extra_docs,
+            "current_dir": current_dir,
+            "os_info": os_info,
+            "current_time": current_time,
         }
 
     @byzerllm.prompt()
-    def single_round_instruction(self, instruction: str, 
-                                 content: str, 
-                                 context: str = "",
-                                 package_context: str = ""
-                                 ) -> str:
+    def single_round_instruction(
+        self,
+        instruction: str,
+        content: str,
+        context: str = "",
+        package_context: str = "",
+    ) -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。
 
@@ -408,18 +436,21 @@ class CodeAutoGenerateEditBlock:
         <extra_context>
         {{ context }}
         </extra_context>
-        {%- endif %}     
-
-        下面是用户的需求：
-
-        {{ instruction }}
-
+        {%- endif %}
         """
+        # 收集环境信息
+        current_dir = os.getcwd()
+        os_info = f"{platform.system()} {platform.release()}"
+        current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
         if not self.args.include_project_structure:
             return {
                 "structure": "",
                 "fence_0": self.fence_0,
                 "fence_1": self.fence_1,
+                "current_dir": current_dir,
+                "os_info": os_info,
+                "current_time": current_time,
             }
 
         return {
@@ -430,28 +461,34 @@ class CodeAutoGenerateEditBlock:
             ),
             "fence_0": self.fence_0,
             "fence_1": self.fence_1,
+            "current_dir": current_dir,
+            "os_info": os_info,
+            "current_time": current_time,
         }
 
     def single_round_run(
         self, query: str, source_code_list: SourceCodeList
     ) -> CodeGenerateResult:
-        
+
         # Apply model filter for code_llm
+
         printer = Printer()
+
+        filtered_sources = []
         for llm in self.llms:
             model_filter = ModelPathFilter.from_model_object(llm, self.args)
-            filtered_sources = []
             for source in source_code_list.sources:
-                if model_filter.is_accessible(source.module_name): 
+                if model_filter.is_accessible(source.module_name):
                     filtered_sources.append(source)
                 else:
-                    printer.print_in_terminal("index_file_filtered", 
-                                               style="yellow",
-                                               file_path=source.module_name, 
-                                               model_name=",".join(llm_utils.get_llm_names(llm)))
+                    printer.print_in_terminal(
+                        "index_file_filtered",
+                        style="yellow",
+                        file_path=source.module_name,
+                        model_name=",".join(llm_utils.get_llm_names(llm)),
+                    )
+            source_code_list = SourceCodeList(filtered_sources)
 
-        source_code_list = SourceCodeList(filtered_sources)
-        
         llm_config = {"human_as_model": self.args.human_as_model}
 
         source_content = source_code_list.to_str()
@@ -461,8 +498,11 @@ class CodeAutoGenerateEditBlock:
         if self.args.template == "common":
             # 获取包上下文信息
             package_context = ""
-            
-            if self.args.enable_active_context and self.args.enable_active_context_in_generate:
+
+            if (
+                self.args.enable_active_context
+                and self.args.enable_active_context_in_generate
+            ):
                 # 获取活动上下文信息
                 result = active_context_manager.load_active_contexts_for_files(
                     [source.module_name for source in source_code_list.sources]
@@ -471,32 +511,62 @@ class CodeAutoGenerateEditBlock:
                 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_parts.append(
+                            f"<package_info>{context.content}</package_info>"
+                        )
+
                     package_context = "\n".join(package_context_parts)
 
             init_prompt = self.single_round_instruction.prompt(
-                instruction=query, content=source_content, context=self.args.context, 
-                package_context=package_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(
                 instruction=query, content=source_content
             )
 
-        with open(self.args.target_file, "w",encoding="utf-8") as file:
+        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()})
+                {
+                    "role": "system",
+                    "content": sys_prompt.claude_sys_prompt.prompt()
+                    + "\n===\n"
+                    + init_prompt,
+                }
+            )
         elif self.args.system_prompt:
             conversations.append(
-                {"role": "system", "content": self.args.system_prompt})
-
-        conversations.append({"role": "user", "content": init_prompt})
+                {
+                    "role": "system",
+                    "content": self.args.system_prompt + "\n===\n" + init_prompt,
+                }
+            )
+        else:
+            conversations.append({"role": "system", "content": init_prompt})
+
+        conversations.append({"role": "user", "content": query})
+
+        # 保存 conversations 到 manuals 目录
+        try:
+            conversations_json = json.dumps(conversations, ensure_ascii=False, indent=2)
+            save_formatted_log(
+                project_root=self.args.source_dir,
+                json_text=conversations_json,
+                suffix="conversations",
+                log_subdir="manuals",
+            )
+        except Exception as e:
+            printer.print_in_terminal(
+                "conversations_save_failed", style="red", error=str(e)
+            )
 
         conversations_list = []
         results = []
@@ -510,94 +580,114 @@ class CodeAutoGenerateEditBlock:
 
         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="editblock"
-                                  )
+            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="editblock",
+        )
 
         if not self.args.human_as_model or get_run_context().mode == RunMode.WEB:
-            with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
+            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) 
+
+                    model_names_list = llm_utils.get_llm_names(llm)
                     model_name = None
                     if model_names_list:
-                        model_name = model_names_list[0]                    
+                        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=llm,
+                                    conversations=conversations,
                                     llm_config=llm_config,
-                                    args=self.args
+                                    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
-                                })
+                                    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
+                                    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
-                            ))
+                        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,model_name in zip(temp_results,model_names):
+
+                for result, model_name in zip(temp_results, model_names):
                     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)                    
+                    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
+                    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}])
+                    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=self.llms[0],
+                    conversations=conversations,
                     llm_config=llm_config,
-                    args=self.args
+                    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}])
+                    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
+            "generated_tokens_cost": generated_tokens_cost,
         }
 
-        return CodeGenerateResult(contents=results, conversations=conversations_list, metadata=statistics)
-    
+        return CodeGenerateResult(
+            contents=results, conversations=conversations_list, metadata=statistics
+        )