auto-coder 0.1.249__py3-none-any.whl → 0.1.251__py3-none-any.whl

{auto_coder-0.1.249.dist-info → auto_coder-0.1.251.dist-info}/METADATA

@@ -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.dist-info → auto_coder-0.1.251.dist-info}/RECORD

@@ -1,22 +1,22 @@
 autocoder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/auto_coder.py,sha256=J4X7KfkYS_3NmcLejg9SlROrIJfk4HzFLj8KKrAGtTM,62887
+autocoder/auto_coder.py,sha256=Rg5NveoL9m1BiWon_62EwtWUolbHqNTzi_ZXvmh89ns,63357
 autocoder/auto_coder_lang.py,sha256=Rtupq6N3_HT7JRhDKdgCBcwRaiAnyCOR_Gsp4jUomrI,3229
 autocoder/auto_coder_rag.py,sha256=illKgzP2bv-Tq50ujsofJnOHdI4pzr0ALtfR8NHHWdQ,22351
 autocoder/auto_coder_rag_client_mcp.py,sha256=WV7j5JUiQge0x4-B7Hp5-pSAFXLbvLpzQMcCovbauIM,6276
 autocoder/auto_coder_rag_mcp.py,sha256=-RrjNwFaS2e5v8XDIrKR-zlUNUE8UBaeOtojffBrvJo,8521
 autocoder/auto_coder_server.py,sha256=XU9b4SBH7zjPPXaTWWHV4_zJm-XYa6njuLQaplYJH_c,20290
 autocoder/benchmark.py,sha256=Ypomkdzd1T3GE6dRICY3Hj547dZ6_inqJbBJIp5QMco,4423
-autocoder/chat_auto_coder.py,sha256=H83C0FW5q51-Iq0MBAO-9xbr2tCfbF-LVRZddFhmOhM,104869
+autocoder/chat_auto_coder.py,sha256=Z3CgocPCOTkcqUJ8w0ttw7S9v0K45z9BUWQLH1PM3x0,104877
 autocoder/chat_auto_coder_lang.py,sha256=ffLIVhOrODHamiy4csir-1TD7q7P9NeuZoZ9VaHeuic,15880
 autocoder/command_args.py,sha256=9aYJ-AmPxP1sQh6ciw04FWHjSn31f2W9afXFwo8wgx4,30441
 autocoder/lang.py,sha256=U6AjVV8Rs1uLyjFCZ8sT6WWuNUxMBqkXXIOs4S120uk,14511
 autocoder/models.py,sha256=_9Kc8oS_tnnqKzRGnybgOfn1NOey7OXZ8y9qhBmgiB4,5517
-autocoder/version.py,sha256=qmVWj6FADq79FGrBV3amzjQGJ-kj4-b3hupW0TuXamY,23
+autocoder/version.py,sha256=-Gpqn1vE4FhgKFlZinRqJ2gdrAvVcUNbvB5efKuhuyk,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/auto_demand_organizer.py,sha256=NWSAEsEk94vT3lGjfo25kKLMwYdPcpy9e-i21txPasQ,6942
 autocoder/agent/auto_filegroup.py,sha256=CW7bqp0FW1GIEMnl-blyAc2UGT7O9Mom0q66ITz1ckM,6635
 autocoder/agent/auto_guess_query.py,sha256=rDSdhpPHcOGE5MuDXvIrhCXAPR4ARS1LqpyoLsx2Jhw,11374
-autocoder/agent/auto_review_commit.py,sha256=3_XgcOGNbpOnwq9WMj66rceZFEa4lEQvs9OZdKQi7co,7663
+autocoder/agent/auto_review_commit.py,sha256=7na6LiMg9jxtdX5hplJ2m-9tx2HzRBAEZ6h8lcsmasw,7591
 autocoder/agent/auto_tool.py,sha256=DBzip-P_T6ZtT2eHexPcusmKYD0h7ufzp7TLwXAY10E,11554
 autocoder/agent/coder.py,sha256=x6bdJwDuETGg9ebQnYlUWCxCtQcDGg73LtI6McpWslQ,72034
 autocoder/agent/designer.py,sha256=EpRbzO58Xym3GrnppIT1Z8ZFAlnNfgzHbIzZ3PX-Yv8,27037
@@ -25,26 +25,26 @@ autocoder/agent/project_reader.py,sha256=tWLaPoLw1gI6kO_NzivQj28KbobU2ceOLuppHMb
 autocoder/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/common/JupyterClient.py,sha256=O-wi6pXeAEYhAY24kDa0BINrLYvKS6rKyWe98pDClS0,2816
 autocoder/common/ShellClient.py,sha256=fM1q8t_XMSbLBl2zkCNC2J9xuyKN3eXzGm6hHhqL2WY,2286
-autocoder/common/__init__.py,sha256=fdXgU4PPTmb6enpLOOowMaU6gNmLgy2f6ViXO6jmBm8,11839
+autocoder/common/__init__.py,sha256=JSCoAH7NvKuYhHFmiUwFG4OCBXWHlnxMm0Bu-Fy_Ar8,11891
 autocoder/common/anything2images.py,sha256=0ILBbWzY02M-CiWB-vzuomb_J1hVdxRcenAfIrAXq9M,25283
 autocoder/common/anything2img.py,sha256=4TREa-sOA-iargieUy7MpyCYVUE-9Mmq0wJtwomPqnE,7662
 autocoder/common/audio.py,sha256=Kn9nWKQddWnUrAz0a_ZUgjcu4VUU_IcZBigT7n3N3qc,7439
-autocoder/common/auto_coder_lang.py,sha256=ljREsdH6VuAeV9cPHPFsQWGxDKIVW8-oFLb8yC4lMQ0,15525
+autocoder/common/auto_coder_lang.py,sha256=i7KN5VxbozvfJR5weCA3uAXwautAgq1YLapUhOWEYmo,16006
 autocoder/common/buildin_tokenizer.py,sha256=L7d5t39ZFvUd6EoMPXUhYK1toD0FHlRH1jtjKRGokWU,1236
 autocoder/common/chunk_validation.py,sha256=BrR_ZWavW8IANuueEE7hS8NFAwEvm8TX34WnPx_1hs8,3030
 autocoder/common/cleaner.py,sha256=NU72i8C6o9m0vXExab7nao5bstBUsfJFcj11cXa9l4U,1089
 autocoder/common/code_auto_execute.py,sha256=4KXGmiGObr_B1d6tzV9dwS6MifCSc3Gm4j2d6ildBXQ,6867
-autocoder/common/code_auto_generate.py,sha256=6rrtdEz8JhlKNutEqlWbgKUlACk90Lcm0UebtuAKEQ0,10320
-autocoder/common/code_auto_generate_diff.py,sha256=o5yeqpc3WXSRWlcLzhlwJNosKo7dcj0CeIsFh6Aibus,16248
-autocoder/common/code_auto_generate_editblock.py,sha256=QdUHUkGaervvQNCY8T2vQ_tfnQX_2kxxu4qq_QW_Nn8,17828
-autocoder/common/code_auto_generate_strict_diff.py,sha256=uteWDEHfIbrnVgwKgqC7qwrIeW0enJCXcHzZGa48yY8,14774
+autocoder/common/code_auto_generate.py,sha256=N_kENWW4eVPKmihpIQ4Q2ivYkugAuCWIPLDCKiarRWg,10818
+autocoder/common/code_auto_generate_diff.py,sha256=QAm-BVJgGl_wbw0VjY2RZigVCwOBO-l1W-90PrYDdOQ,16741
+autocoder/common/code_auto_generate_editblock.py,sha256=FuVH-sP4_Ys2MJk9SkWgHHLAKp51bKSxTwFzd7voilg,18356
+autocoder/common/code_auto_generate_strict_diff.py,sha256=kieVUx2KuR0BGtQHE0Ll7i8e_3Lb4xfFXHIXDttQACE,15274
 autocoder/common/code_auto_merge.py,sha256=8dtnz61l0B5gNbQmx26TZ4_jD825dsnnWtAFD_zs6es,7335
 autocoder/common/code_auto_merge_diff.py,sha256=yocfe8s3Pz6hTGDUl9wRIewY3NcTize_gEla64lsGT0,15331
 autocoder/common/code_auto_merge_editblock.py,sha256=sp7C0fZJMVcNgI8uWy43CKDk7gGXFTkMB9kbP2VdY8k,17485
 autocoder/common/code_auto_merge_strict_diff.py,sha256=9rm0NJ_n6M3LohEX7xl1Jym0xmm8UEYqj_ZTSO3oSlM,9519
 autocoder/common/code_modification_ranker.py,sha256=TycYdtxfNfde2N9-9jEB-9IL2Q3PoHS-k-r9JqZYD6s,6545
 autocoder/common/command_completer.py,sha256=SSeb8MDH0JPvfdyW-S2uaHnui4VBDfSQvQPLbv3ORPA,9314
-autocoder/common/command_generator.py,sha256=R4TNUMHQtZWCvDZ-jB6hCpxYMWc5qTeJ9GP3EjwxXrU,2107
+autocoder/common/command_generator.py,sha256=-hmbD_AnCa5HxL4BznuEfYAf_l8AxU5fAG5F0sM_fuE,2116
 autocoder/common/command_templates.py,sha256=mnB3n8i0yjH1mqzyClEg8Wpr9VbZV44kxky66Zu6OJY,8557
 autocoder/common/const.py,sha256=eTjhjh4Aj4CUzviJ81jaf3Y5cwqsLATySn2wJxaS6RQ,2911
 autocoder/common/files.py,sha256=CguxG9digkWBJpRaILErZmL_G5ryPRahPmPFWGB7X18,1973
@@ -56,7 +56,7 @@ autocoder/common/mcp_hub.py,sha256=2ZyJv3Aiv4Y97UHut49oYhIFcu7ICR-mptDEBSgT3uE,1
 autocoder/common/mcp_server.py,sha256=QCFa-15kx7rbNsinwdGFFX2y47pww0fVdI-ldKFSSWI,12267
 autocoder/common/mcp_tools.py,sha256=KsLvRrB6pvmebqd-lDaSH6IBJR0AIxWRE-dtCEG_w9k,12485
 autocoder/common/memory_manager.py,sha256=2ZjYG7BPyvbYalZBF6AM_G5e10Qkw_zrqtD4Zd7GSsQ,3663
-autocoder/common/printer.py,sha256=TIqgGOq5YdWqH4_776QHwHmwfVpubZ9zzUq8rstNxuM,1911
+autocoder/common/printer.py,sha256=P1WU0QjlfnjqTP5uA55GkHZCpFzRPFkc34DMMandreg,2023
 autocoder/common/recall_validation.py,sha256=Avt9Q9dX3kG6Pf2zsdlOHmsjd-OeSj7U1PFBDp_Cve0,1700
 autocoder/common/screenshots.py,sha256=_gA-z1HxGjPShBrtgkdideq58MG6rqFB2qMUJKjrycs,3769
 autocoder/common/search.py,sha256=245iPFgWhMldoUK3CqCP89ltaxZiNPK73evoG6Fp1h8,16518
@@ -81,12 +81,12 @@ autocoder/dispacher/actions/plugins/action_translate.py,sha256=nVAtRSQpdGNmZxg1R
 autocoder/index/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/index/entry.py,sha256=hXSOi-jPgRBKQB55eqWkT95vxvWrbVHDuIMtDkqjNNw,12232
 autocoder/index/for_command.py,sha256=BFvljE4t6VaMBGboZAuhUCzVK0EitCy_n5D_7FEnihw,3204
-autocoder/index/index.py,sha256=xwh22nY0TtEJMJwYjOUd6xdRZozYXBt47YSwheZSP-4,20679
+autocoder/index/index.py,sha256=YJqMeysyF0FPXABMqS0Q2bQIXkE4VNMtrHcH0YfeYyA,20948
 autocoder/index/symbols_utils.py,sha256=CjcjUVajmJZB75Ty3a7kMv1BZphrm-tIBAdOJv6uo-0,2037
 autocoder/index/types.py,sha256=a2s_KV5FJlq7jqA2ELSo9E1sjuLwDB-JJYMhSpzBAhU,596
 autocoder/index/filter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/index/filter/normal_filter.py,sha256=APu34iSvWhtlLtWgkj8N3Vo4oW1TegtZQq2bwDX_cs4,8031
-autocoder/index/filter/quick_filter.py,sha256=MQqoSsUKX8VcfEmyHAnHbX-RTsMRCoFSX9WyotETC9I,9450
+autocoder/index/filter/quick_filter.py,sha256=rkRmDOxT2ZF2f2d-xOPtpzVxkSYiw2KWW7g7FY40A0E,9522
 autocoder/pyproject/__init__.py,sha256=dQ2_7YZ7guybT9BhfxSGn43eLQJGQN2zgeKa6--JlaQ,14403
 autocoder/rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/rag/api_server.py,sha256=dRbhAZVRAOlZ64Cnxf4_rKb4iJwHnrWS9Zr67IVORw0,7288
@@ -140,11 +140,11 @@ autocoder/utils/rest.py,sha256=hLBhr78y-WVnV0oQf9Rxc22EwqF78KINkScvYa1MuYA,6435
 autocoder/utils/tests.py,sha256=BqphrwyycGAvs-5mhH8pKtMZdObwhFtJ5MC_ZAOiLq8,1340
 autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=5MCtQwQDttvr0pRcYlYERFQpQAdi1Yvyf5Hm6F-_jvQ,9433
+autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=5kKOrPy1GWZ6qHjni-YNJJb2x0rD7_3Idl2M9sWxVfU,10481
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.249.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.249.dist-info/METADATA,sha256=RBwD1697yXW-whqe9SCtmlpuVKQo5mz8sotyxiLFILQ,2616
-auto_coder-0.1.249.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.249.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.249.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.249.dist-info/RECORD,,
+auto_coder-0.1.251.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.251.dist-info/METADATA,sha256=uvvt_OokvDoJt_FiYaaYtbmirw7mjFZ86bQBW2TGCbs,2616
+auto_coder-0.1.251.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.251.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.251.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.251.dist-info/RECORD,,

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

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统计            

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

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:

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 }}",
     },
 }
 

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 = []

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 = []

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,

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 = []

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

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):     

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)

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:

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(

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.249"
+__version__ = "0.1.251"