auto-coder 0.1.354__py3-none-any.whl → 0.1.356__py3-none-any.whl

autocoder/rag/long_context_rag.py

@@ -27,7 +27,7 @@ from autocoder.rag.relevant_utils import (
     DocFilterResult
 )
 from autocoder.rag.token_checker import check_token_limit
-from autocoder.rag.token_counter import RemoteTokenCounter, TokenCounter
+from autocoder.rag.token_counter import RemoteTokenCounter, TokenCounter,count_tokens
 from autocoder.rag.token_limiter import TokenLimiter
 from tokenizers import Tokenizer
 from autocoder.rag.variable_holder import VariableHolder
@@ -782,7 +782,7 @@ class LongContextRAG:
                 )
 
             # 记录令牌统计
-            request_tokens = sum([doc.tokens for doc in relevant_docs])
+            request_tokens = sum([count_tokens(doc.source_code) for doc in relevant_docs])
             target_model = target_llm.default_model_name
             logger.info(
                 f"=== LLM Request ===\n"

autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -230,9 +230,8 @@ def stream_out(
             refresh_per_second=4,
             console=console
         ) as live:
-            for res in stream_generator:
-                global_cancel.check_and_raise(cancel_token)
-                    
+            for res in stream_generator:  
+                global_cancel.check_and_raise(args.event_file)                                  
                 last_meta = res[1]                
                 content = res[0]
 
@@ -241,7 +240,7 @@ def stream_out(
                     reasoning_content = last_meta.reasoning_content
 
                 if reasoning_content == "" and content == "":
-                    continue
+                    continue             
                 
                 if first_token_time == 0.0:
                     first_token_time = time.time() - first_token_time_start

autocoder/utils/model_provider_selector.py

@@ -26,7 +26,7 @@ PROVIDER_INFO_LIST = [
         name="volcano",
         endpoint="https://ark.cn-beijing.volces.com/api/v3",   
         r1_model="deepseek-r1-250120",
-        v3_model="deepseek-v3-241226",
+        v3_model="deepseek-v3-250324",
         api_key="",
         r1_input_price=2.0,
         r1_output_price=8.0,
@@ -55,6 +55,17 @@ PROVIDER_INFO_LIST = [
         v3_input_price=2.0,
         v3_output_price=8.0,
     ),
+    ProviderInfo(
+        name="openrouter",
+        endpoint="https://openrouter.ai/api/v1",
+        r1_model="deepseek/deepseek-r1",
+        v3_model="deepseek/deepseek-chat-v3-0324",
+        api_key="",
+        r1_input_price=0.0,
+        r1_output_price=0.0,
+        v3_input_price=0.0,
+        v3_output_price=0.0,
+    )
 ]
 
 dialog_style = Style.from_dict({
@@ -147,7 +158,8 @@ class ModelProviderSelector:
             values=[
                 ("volcano", self.printer.get_message_from_key("model_provider_volcano")),
                 ("siliconflow", self.printer.get_message_from_key("model_provider_siliconflow")),
-                ("deepseek", self.printer.get_message_from_key("model_provider_deepseek"))
+                ("deepseek", self.printer.get_message_from_key("model_provider_deepseek")),
+                ("openrouter", self.printer.get_message_from_key("model_provider_openrouter"))
             ],
             style=dialog_style
         ).run()

autocoder/utils/thread_utils.py

@@ -36,9 +36,7 @@ def run_in_raw_thread(token: Optional[str] = None, context: Optional[Dict[str, A
         def wrapper(*args, **kwargs):
             # Store thread results
             result = []
-            exception_raised = [None]  # 存储工作线程中的异常
-            thread_token = token
-            thread_context = context or {}
+            exception_raised = [None]  # 存储工作线程中的异常            
             thread_terminated = threading.Event()  # 用于标记线程是否已终止
             
             def worker():
@@ -53,9 +51,7 @@ def run_in_raw_thread(token: Optional[str] = None, context: Optional[Dict[str, A
                 except Exception as e:
                     # 存储其他异常
                     exception_raised[0] = e
-                finally:
-                    # 无论如何执行完毕后，重置取消标志并标记线程已终止
-                    global_cancel.reset(thread_token)
+                finally:                                                            
                     thread_terminated.set()
             
             # Create and start thread with a meaningful name
@@ -72,18 +68,7 @@ def run_in_raw_thread(token: Optional[str] = None, context: Optional[Dict[str, A
                 
                 while thread.is_alive():
                     # 每次等待较短时间，以便能够及时响应中断
-                    thread.join(0.1)
-                    
-                    # 检查是否已经超过最大等待时间（仅适用于已取消的情况）
-                    elapsed_time = time.time() - wait_start_time
-                    if cancelled_by_keyboard and elapsed_time > max_wait_time:
-                        printer.print_in_terminal("force_terminating_thread")
-                        break
-                    
-                    # 检查线程间的取消请求
-                    if global_cancel.is_requested(thread_token):
-                        # 传播取消请求到工作线程
-                        raise CancelRequestedException(thread_token)
+                    thread.join(0.1)                                                                          
 
                 # 如果工作线程出现了异常，在主线程中重新抛出
                 if exception_raised[0] is not None:
@@ -92,15 +77,12 @@ def run_in_raw_thread(token: Optional[str] = None, context: Optional[Dict[str, A
                 # 返回结果
                 return result[0] if result else None            
                 
-            except KeyboardInterrupt:
-                # 设置取消标志
-                cancel_context = {"message": get_message("task_cancelled_by_user"), "source": "keyboard_interrupt"}
-                cancel_context.update(thread_context)
-                global_cancel.set(thread_token, cancel_context)
-                printer.print_in_terminal("cancellation_requested")
-
-                # 标记为键盘中断取消
-                cancelled_by_keyboard = True
+            except KeyboardInterrupt:            
+                # 取消所有任务    
+                for token in global_cancel.get_active_tokens():
+                    print(f"Cancelling job: {token}")
+                global_cancel.set_active_tokens()
+                printer.print_in_terminal("cancellation_requested")                
                 wait_start_time = time.time()
                 
                 # 等待线程终止或检测到取消

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.354"
+__version__ = "0.1.356"