auto-coder 0.1.249__tar.gz → 0.1.251__tar.gz

{auto_coder-0.1.249 → auto_coder-0.1.251}/PKG-INFO

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

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/agent/auto_review_commit.py

@@ -5,7 +5,6 @@ import byzerllm
 import pydantic
 import git
 from rich.console import Console
-from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
 from autocoder.common.printer import Printer
 from autocoder.common import AutoCoderArgs
 from autocoder.common.utils_code_auto_generate import stream_chat_with_continue

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/auto_coder.py

@@ -45,6 +45,7 @@ from autocoder import models as models_module
 from autocoder.common.utils_code_auto_generate import stream_chat_with_continue
 from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
 from autocoder.common.printer import Printer
+from autocoder.rag.token_counter import count_tokens
 console = Console()
 
 
@@ -1333,6 +1334,13 @@ def main(input_args: Optional[List[str]] = None):
                 reviewer = AutoReviewCommit(llm=chat_llm, args=args)
                 v = reviewer.review_commit(query=args.query,conversations=loaded_conversations)
             else:                
+                # 预估token数量
+                estimated_input_tokens = count_tokens(json.dumps(loaded_conversations, ensure_ascii=False))
+                printer = Printer()
+                printer.print_in_terminal("estimated_chat_input_tokens", style="yellow",
+                                  estimated_input_tokens=estimated_input_tokens
+                                  )
+
                 v = stream_chat_with_continue(
                     llm=chat_llm,
                     conversations=loaded_conversations,
@@ -1348,7 +1356,8 @@ def main(input_args: Optional[List[str]] = None):
                     v, 
                     request_id=args.request_id,                    
                     console=console,
-                    model_name=model_name
+                    model_name=model_name,
+                    args=args
                 )
                                                                        
             # 打印耗时和token统计            

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/chat_auto_coder.py

@@ -2796,8 +2796,8 @@ def main():
                     command = user_input[len("/shell"):].strip()
                     if not command:
                         print("Please enter a shell command to execute.")
-                else:
-                    execute_shell_command(command)
+                    else:
+                        execute_shell_command(command)
 
         except KeyboardInterrupt:
             continue

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/__init__.py

@@ -357,6 +357,8 @@ class AutoCoderArgs(pydantic.BaseModel):
     enable_global_memory: Optional[bool] = True  
     product_mode: Optional[str] = "lite"
 
+    keep_reasoning_content: Optional[bool] = False
+
     in_code_apply: bool = False
 
     class Config:

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/auto_coder_lang.py

@@ -86,7 +86,9 @@ MESSAGES = {
         "git_init_required": "⚠️ auto_merge only applies to git repositories.\n\nPlease try using git init in the source directory:\n\n```shell\ncd {{ source_dir }}\ngit init.\n```\n\nThen run auto - coder again.\nError: {{ error }}",
         "quick_filter_reason": "Auto get(quick_filter mode)",
         "quick_filter_too_long": "⚠️ index file is too large ({{ tokens_len }}/{{ max_tokens }}). The query will be split into {{ split_size }} chunks.",
-        "quick_filter_tokens_len": "📊 Current index size: {{ tokens_len }} tokens"
+        "quick_filter_tokens_len": "📊 Current index size: {{ tokens_len }} tokens",
+        "estimated_chat_input_tokens": "Estimated chat input tokens: {{ estimated_input_tokens }}",
+        "estimated_input_tokens_in_generate": "Estimated input tokens in generate ({{ generate_mode }}): {{ estimated_input_tokens }}",
     },
     "zh": {
         "model_not_found": "未找到模型: {{model_name}}",
@@ -173,6 +175,8 @@ MESSAGES = {
         "quick_filter_stats": "Quick filter completed in {{ elapsed_time }} seconds, input tokens: {{ input_tokens }}, output tokens: {{ output_tokens }}",
         "quick_filter_title": "{{ model_name }} 正在分析如何筛选上下文...",
         "quick_filter_failed": "❌ 快速过滤器失败: {{ error }}. ",
+        "estimated_chat_input_tokens": "对话输入token预估为: {{ estimated_input_tokens }}",
+        "estimated_input_tokens_in_generate": "生成代码({{ generate_mode }})预计输入token数: {{ estimated_input_tokens_in_generate }}",
     },
 }
 

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/code_auto_generate.py

@@ -8,6 +8,8 @@ from concurrent.futures import ThreadPoolExecutor
 from autocoder.common.types import CodeGenerateResult
 from autocoder.common.utils_code_auto_generate import chat_with_continue
 import json
+from autocoder.common.printer import Printer
+from autocoder.rag.token_counter import count_tokens
 
 
 class CodeAutoGenerate:
@@ -191,6 +193,14 @@ class CodeAutoGenerate:
         results = []
         input_tokens_count = 0
         generated_tokens_count = 0
+
+        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="wholefile"
+                                  )
+
         if not self.args.human_as_model:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/code_auto_generate_diff.py

@@ -7,6 +7,8 @@ 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.printer import Printer
+from autocoder.rag.token_counter import count_tokens
 
 
 class CodeAutoGenerateDiff:
@@ -339,6 +341,14 @@ class CodeAutoGenerateDiff:
         results = []
         input_tokens_count = 0
         generated_tokens_count = 0
+
+        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="diff"
+                                  )
+
         if not self.args.human_as_model:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/code_auto_generate_editblock.py

@@ -11,6 +11,8 @@ 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.printer import Printer
+from autocoder.rag.token_counter import count_tokens
 
 
 class CodeAutoGenerateEditBlock:
@@ -421,35 +423,47 @@ class CodeAutoGenerateEditBlock:
         results = []
         input_tokens_count = 0
         generated_tokens_count = 0
+
+        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"
+                                  )
+
         if not self.args.human_as_model:
             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):
                         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))
                 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
-            
+
             for result in results:
                 conversations_list.append(
                     conversations + [{"role": "assistant", "content": result}])
-        else:            
+        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)
                 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_list.append(
+                    conversations + [{"role": "assistant", "content": single_result.content}])
+
         statistics = {
             "input_tokens_count": input_tokens_count,
             "generated_tokens_count": generated_tokens_count
-        }        
-    
+        }
+
         if self.args.request_id and not self.args.skip_events:
             _ = queue_communicate.send_event(
                 request_id=self.args.request_id,

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/code_auto_generate_strict_diff.py

@@ -7,6 +7,8 @@ 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.printer import Printer
+from autocoder.rag.token_counter import count_tokens
 
 class CodeAutoGenerateStrictDiff:
     def __init__(
@@ -309,6 +311,14 @@ class CodeAutoGenerateStrictDiff:
         results = []
         input_tokens_count = 0
         generated_tokens_count = 0
+
+        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 = []

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/command_generator.py

@@ -54,9 +54,9 @@ def generate_shell_script(user_input: str, llm: byzerllm.ByzerLLM) -> str:
     result, _ = stream_out(
         llm.stream_chat_oai(conversations=conversations, delta_mode=True),
         model_name=llm.default_model_name,
-        title=title
+        title=title        
     )
     
     # 提取代码块
-    code = code_utils.extract_code(result)[0][1]
+    code = code_utils.extract_code(result)[-1][1]
     return code

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/common/printer.py

@@ -32,7 +32,10 @@ class Printer:
             else:
                 self.console.print(format_str_jinja2(self.get_message_from_key(msg_key),**kwargs))
         except Exception as e:
-            print(self.get_message_from_key(msg_key))
+            try:
+                print(self.get_message_from_key(msg_key))
+            except Exception as e:
+                print(f"text key: {msg_key} not found")
 
     
     def print_str_in_terminal(self, content: str, style: str = None):     

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/index/filter/quick_filter.py

@@ -84,7 +84,8 @@ class QuickFilter():
                     full_response, _ = stream_out(
                         stream_generator,
                         model_name=model_name,
-                        title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name)
+                        title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name),
+                        args=self.args
                     )
                     file_number_list = to_model(full_response, FileNumberList)
                 else:
@@ -197,7 +198,8 @@ class QuickFilter():
             full_response, last_meta = stream_out(
                 stream_generator,
                 model_name=model_name,
-                title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name)
+                title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name),
+                args=self.args
             )                
             # 解析结果
             file_number_list = to_model(full_response, FileNumberList)

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/index/index.py

@@ -341,7 +341,11 @@ class IndexManager:
                     module_name = result["module_name"]
                     index_data[module_name] = result
                     updated_sources.append(module_name)
-
+                    if len(updated_sources) > 5:
+                        with open(self.index_file, "w") as file:
+                            json.dump(index_data, file, ensure_ascii=False, indent=2)
+                        updated_sources = []
+                        
         # 如果 updated_sources 或 keys_to_remove 有值，则保存索引文件
         if updated_sources or keys_to_remove:
             with open(self.index_file, "w") as file:

{auto_coder-0.1.249 → auto_coder-0.1.251}/src/autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -10,6 +10,7 @@ from autocoder.utils.request_queue import RequestValue, RequestOption, StreamVal
 from autocoder.utils.request_queue import request_queue
 import time
 from byzerllm.utils.types import SingleOutputMeta
+from autocoder.common import AutoCoderArgs
 
 MAX_HISTORY_LINES = 40  # 最大保留历史行数
 
@@ -144,7 +145,8 @@ def stream_out(
     request_id: Optional[str] = None,    
     console: Optional[Console] = None,
     model_name: Optional[str] = None,
-    title: Optional[str] = None
+    title: Optional[str] = None,
+    args: Optional[AutoCoderArgs] = None
 ) -> Tuple[str, Optional[SingleOutputMeta]]:
     """
     处理流式输出事件并在终端中展示
@@ -155,17 +157,22 @@ def stream_out(
         console: Rich Console对象
         model_name: 模型名称
         title: 面板标题，如果没有提供则使用默认值
+        args: AutoCoderArgs对象
     Returns:
-        Tuple[str, Dict[str, Any]]: 返回完整的响应内容和最后的元数据
+        Tuple[str, Dict[SingleOutputMeta]]: 返回完整的响应内容和最后的元数据
     """
     if console is None:
         console = Console(force_terminal=True, color_system="auto", height=None)
-        
+    
+    keep_reasoning_content = True
+    if args:
+        keep_reasoning_content = args.keep_reasoning_content            
+
     lines_buffer = []  # 存储历史行
     current_line = ""  # 当前行
     assistant_response = ""
     last_meta = None
-    panel_title = title if title is not None else f"Response[ {model_name} ]"
+    panel_title = title if title is not None else f"Response[ {model_name} ]"    
     try:        
         with Live(
             Panel("", title=panel_title, border_style="green"),
@@ -179,8 +186,22 @@ def stream_out(
 
                 if reasoning_content == "" and content == "":
                     continue
-            
-                assistant_response += content
+                
+                if keep_reasoning_content:
+                    # 处理思考内容
+                    if reasoning_content:
+                        if assistant_response == "":  # 首次遇到思考内容时添加开标签
+                            assistant_response = "<thinking>"
+                        assistant_response += reasoning_content
+                        
+                    # 处理正式内容
+                    if content:
+                        # 如果之前有思考内容,需要先关闭thinking标签
+                        if "</thinking>" not in assistant_response and "<thinking>" in assistant_response:
+                            assistant_response += "</thinking>"
+                        assistant_response += content
+                else:
+                    assistant_response += content
 
                 display_delta = reasoning_content if reasoning_content else content
                 
@@ -230,7 +251,7 @@ def stream_out(
                     title=f"Final {panel_title}",
                     border_style="blue"
                 )
-            )
+            )            
             
     except Exception as e:
         console.print(Panel(

auto_coder-0.1.251/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.251"

auto_coder-0.1.249/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.249"