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

autocoder/common/code_auto_generate.py

@@ -6,13 +6,17 @@ from autocoder.utils.queue_communicate import queue_communicate, CommunicateEven
 from autocoder.common import sys_prompt
 from concurrent.futures import ThreadPoolExecutor
 from autocoder.common.types import CodeGenerateResult
-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
 import json
 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 CodeAutoGenerate:
@@ -50,7 +54,7 @@ class CodeAutoGenerate:
 
     @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:
         """
         {%- if structure %}
@@ -64,6 +68,13 @@ class CodeAutoGenerate:
         </files>
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
         {%- if context %}
         <extra_context>
         {{ context }}
@@ -106,7 +117,7 @@ class CodeAutoGenerate:
 
     @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:
         """
         {%- if structure %}
@@ -119,6 +130,13 @@ class CodeAutoGenerate:
         {{ content }}
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
         {%- if context %}
         {{ context }}
         {%- endif %}
@@ -188,9 +206,28 @@ class CodeAutoGenerate:
                 ),
             )
 
+        # 获取包上下文信息
+        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(
@@ -228,17 +265,44 @@ class CodeAutoGenerate:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
                 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)
+                    model_names_list = llm_utils.get_llm_names(llm) 
+                    model_name = None
+                    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:
+                            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))
+                                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:
@@ -256,7 +320,12 @@ class CodeAutoGenerate:
                     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
@@ -287,9 +356,28 @@ class CodeAutoGenerate:
         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_generate_diff.py

@@ -7,11 +7,15 @@ 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.memory.active_context_manager import ActiveContextManager
 
 class CodeAutoGenerateDiff:
     def __init__(
@@ -32,7 +36,7 @@ class CodeAutoGenerateDiff:
 
     @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`会产生的那样。
@@ -141,6 +145,13 @@ class CodeAutoGenerateDiff:
         </files>
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
         {%- if context %}
         <extra_context>
         {{ context }}
@@ -169,7 +180,7 @@ class CodeAutoGenerateDiff:
 
     @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`会产生的那样。
@@ -278,6 +289,13 @@ class CodeAutoGenerateDiff:
         </files>
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
         {%- if context %}
         <extra_context>
         {{ context }}
@@ -308,14 +326,33 @@ class CodeAutoGenerateDiff:
         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(
                 instruction=query, content=source_content
-            )        
+            )
 
         conversations = []
 
@@ -362,10 +399,39 @@ class CodeAutoGenerateDiff:
                     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:
@@ -383,7 +449,12 @@ class CodeAutoGenerateDiff:
                     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
@@ -431,9 +502,29 @@ class CodeAutoGenerateDiff:
         llm_config = {"human_as_model": self.args.human_as_model}
         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_generate_editblock.py

@@ -11,11 +11,16 @@ from autocoder.utils.queue_communicate import (
 )
 import json
 from concurrent.futures import ThreadPoolExecutor
-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.memory.active_context_manager import ActiveContextManager
+
 
 
 class CodeAutoGenerateEditBlock:
@@ -59,7 +64,7 @@ class CodeAutoGenerateEditBlock:
         """
 
     @byzerllm.prompt()
-    def multi_round_instruction(self, instruction: str, content: str, context: str = "") -> str:
+    def multi_round_instruction(self, instruction: str, content: str, context: str = "", package_context: str = "") -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。
 
@@ -193,6 +198,13 @@ class CodeAutoGenerateEditBlock:
         </files>
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}     
+
         {%- if context %}
         <extra_context>
         {{ context }}
@@ -224,7 +236,11 @@ class CodeAutoGenerateEditBlock:
         }
 
     @byzerllm.prompt()
-    def single_round_instruction(self, instruction: str, content: str, context: str = "") -> str:
+    def single_round_instruction(self, instruction: str, 
+                                 content: str, 
+                                 context: str = "",
+                                 package_context: str = ""
+                                 ) -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。
 
@@ -357,6 +373,13 @@ class CodeAutoGenerateEditBlock:
         </files>
         {%- endif %}
 
+        {%- if package_context %}
+        下面是上面文件的一些信息（包括最近的变更情况）：
+        <package_context>
+        {{ package_context }}
+        </package_context>
+        {%- endif %}
+
         {%- if context %}
         <extra_context>
         {{ context }}
@@ -409,9 +432,28 @@ class CodeAutoGenerateEditBlock:
 
         source_content = source_code_list.to_str()
 
+        active_context_manager = ActiveContextManager(self.llm, self.args)
+
         if self.args.template == "common":
+            # 获取包上下文信息
+            package_context = ""
+            
+            if self.args.enable_active_context:
+                # 获取活动上下文信息
+                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)
+
             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(
@@ -470,10 +512,39 @@ class CodeAutoGenerateEditBlock:
                     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]
                 
@@ -493,7 +564,11 @@ class CodeAutoGenerateEditBlock:
         else:
             for _ in range(self.args.human_model_num):
                 single_result = chat_with_continue(
-                    llm=self.llms[0], conversations=conversations, llm_config=llm_config)
+                    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
@@ -525,9 +600,28 @@ class CodeAutoGenerateEditBlock:
         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(