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

{auto_coder-0.1.304.dist-info → auto_coder-0.1.305.dist-info}/METADATA

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

{auto_coder-0.1.304.dist-info → auto_coder-0.1.305.dist-info}/RECORD

@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=U6AjVV8Rs1uLyjFCZ8sT6WWuNUxMBqkXXIOs4S120uk,14511
 autocoder/models.py,sha256=AyoZ-Pzy0oyYUmWCxOIRiOImsqboSfRET7LO9-UOuxI,11172
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=d3YmmmryiVVQ2h45ytNBl1OQ8PJLRr75GUbEFV3zbaU,23
+autocoder/version.py,sha256=5GWW6mtaPl30mzqFO3ZxXUWEcruPKj3ItmKpxg9QBvQ,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
@@ -28,8 +28,8 @@ autocoder/agent/planner.py,sha256=SZTSZHxHzDmuWZo3K5fs79RwvJLWurg-nbJRRNbX65o,91
 autocoder/agent/project_reader.py,sha256=tWLaPoLw1gI6kO_NzivQj28KbobU2ceOLuppHMbfGl8,18234
 autocoder/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/commands/auto_command.py,sha256=q_6hD0XHmVkoo0pj9vN-x7qoqgrXWF7rlLs9n2yMGNk,62628
-autocoder/commands/auto_web.py,sha256=_449f4rCoRG7Sv0SB0hIBRFLPLPJ5DgWW4DlI22a3XY,39383
+autocoder/commands/auto_command.py,sha256=mreV3kJTo1QwaM7kWY9kfol569pQTb8EHFq53B6BugI,62501
+autocoder/commands/auto_web.py,sha256=Cc0eb6JN3SvFy3GD_lpSLvIqj7F1eFDTcwg1t-zDcKg,39024
 autocoder/commands/tools.py,sha256=uSPyEcx6o1upuw6clHdL4yeqoXbywnvCxAPo2mt5rJk,28117
 autocoder/common/JupyterClient.py,sha256=O-wi6pXeAEYhAY24kDa0BINrLYvKS6rKyWe98pDClS0,2816
 autocoder/common/ShellClient.py,sha256=fM1q8t_XMSbLBl2zkCNC2J9xuyKN3eXzGm6hHhqL2WY,2286
@@ -38,7 +38,7 @@ autocoder/common/action_yml_file_manager.py,sha256=q0QBlptWtR9DhqguMBZJfHmmTP9fV
 autocoder/common/anything2images.py,sha256=0ILBbWzY02M-CiWB-vzuomb_J1hVdxRcenAfIrAXq9M,25283
 autocoder/common/anything2img.py,sha256=iZQmg8srXlD7N5uGl5b_ONKJMBjYoW8kPmokkG6ISF0,10118
 autocoder/common/audio.py,sha256=Kn9nWKQddWnUrAz0a_ZUgjcu4VUU_IcZBigT7n3N3qc,7439
-autocoder/common/auto_coder_lang.py,sha256=xAizNW6PIRAIhCfmmJg_2cnfJkyQu73PFdw-K3DieYo,36321
+autocoder/common/auto_coder_lang.py,sha256=NSVg3pJldxoyfqxD68mtj6VDsx-Dn-lCvEcPunmYKzM,36972
 autocoder/common/auto_configure.py,sha256=D4N-fl9v8bKM5-Ds-uhkC2uGDmHH_ZjLJ759F8KXMKs,13129
 autocoder/common/buildin_tokenizer.py,sha256=L7d5t39ZFvUd6EoMPXUhYK1toD0FHlRH1jtjKRGokWU,1236
 autocoder/common/chunk_validation.py,sha256=BrR_ZWavW8IANuueEE7hS8NFAwEvm8TX34WnPx_1hs8,3030
@@ -64,7 +64,7 @@ autocoder/common/context_pruner.py,sha256=HlU5BmxpCX7uVTJUsTFLlXvkwcOQuidI9uCKZa
 autocoder/common/conversation_pruner.py,sha256=pzmrQEa7pFzA66eYSS_h7VqP6ZwUABeooDQzm0PGu0A,5770
 autocoder/common/files.py,sha256=nPiKcnUcYZbSUn3TskKeTVnAxCJRtuehPuB_5d2imX8,4618
 autocoder/common/git_utils.py,sha256=EK8gekbXsG6BNDVrd1Nsan_7kJ71dd8_w9FiOFxjsVI,26276
-autocoder/common/global_cancel.py,sha256=hT7J7J5ChThIhk2x11_v4v9ASIn4HtwyPD26t2s-fwc,418
+autocoder/common/global_cancel.py,sha256=TyjYQPESwo04D1BOTmC9hH7IbkKDDM-b2zPacEHGIQ8,3264
 autocoder/common/image_to_page.py,sha256=yWiTJQ49Lm3j0FngiJhQ9u7qayqE_bOGb8Rk0TmSWx0,14123
 autocoder/common/index_import_export.py,sha256=h758AYY1df6JMTKUXYmMkSgxItfymDt82XT7O-ygEuw,4565
 autocoder/common/interpreter.py,sha256=62-dIakOunYB4yjmX8SHC0Gdy2h8NtxdgbpdqRZJ5vk,2833
@@ -96,10 +96,10 @@ autocoder/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/db/store.py,sha256=tFT66bP2ZKIqZip-uhLkHRSLaaOAUUDZfozJwcqix3c,1908
 autocoder/dispacher/__init__.py,sha256=YoA64dIxnx4jcE1pwSfg81sjkQtjDkhddkfac1-cMWo,1230
 autocoder/dispacher/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/dispacher/actions/action.py,sha256=neQQwF1q7M-HDYheyuIL-UfIqN_hPS0c6UEWKdRhZaI,28917
+autocoder/dispacher/actions/action.py,sha256=Bc_6Iwcd7KhNM6jbMB9zUt3uhzJz8QWRCsO0tfnz3OI,27865
 autocoder/dispacher/actions/copilot.py,sha256=2nQzKt8Sr40mIDOizZWyl4ekCwaHYklvgGlVfvhOlFM,13106
 autocoder/dispacher/actions/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/dispacher/actions/plugins/action_regex_project.py,sha256=ZZ3bca55Js45at_lXHFtha7j8LMLLpYUtZ7URmx6eEk,7886
+autocoder/dispacher/actions/plugins/action_regex_project.py,sha256=vH-O0rM2ig-5u-n-hlX1SvwQW8IjsGSl-dC4DUAwfII,7632
 autocoder/dispacher/actions/plugins/action_translate.py,sha256=GEn7dZA22jy5WyzINomjmzzB795p2Olg-CJla97lRF8,7744
 autocoder/events/__init__.py,sha256=1x_juwr9Ows2RADDa2LyI4QlmPxOVOXZeLO1cht-slM,1443
 autocoder/events/event_content.py,sha256=0unVmskGrfvnsniLvNXobco9KG-r6cv_C-gXK3L5zXQ,11557
@@ -110,7 +110,7 @@ autocoder/events/event_types.py,sha256=wONd3wC_BhGXTbXIlb4kFIr7gkhYSBjQE30JjTc8t
 autocoder/index/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/index/entry.py,sha256=a8KhkNd6tKuD6W9fh9ohdri2r4UYeZWswi14pVwpr-Q,15740
 autocoder/index/for_command.py,sha256=BFvljE4t6VaMBGboZAuhUCzVK0EitCy_n5D_7FEnihw,3204
-autocoder/index/index.py,sha256=3-SHlmeQMv6SFxNj7vVcNRDAYj9ZshuJJ1zXwBi0cDc,30873
+autocoder/index/index.py,sha256=Y72N_w6tdI-Lv3GhgGDeCKxKfSzhxpdVuZpSAdJTsDU,30831
 autocoder/index/symbols_utils.py,sha256=_EP7E_qWXxluAxq3FGZLlLfdrfwx3FmxCdulI8VGuac,2244
 autocoder/index/types.py,sha256=a2s_KV5FJlq7jqA2ELSo9E1sjuLwDB-JJYMhSpzBAhU,596
 autocoder/index/filter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -188,14 +188,14 @@ autocoder/utils/request_queue.py,sha256=nwp6PMtgTCiuwJI24p8OLNZjUiprC-TsefQrhMI-
 autocoder/utils/rest.py,sha256=hLBhr78y-WVnV0oQf9Rxc22EwqF78KINkScvYa1MuYA,6435
 autocoder/utils/stream_thinking.py,sha256=vbDObflBFW53eWEjMTEHf3nyL167_cqpDLh9zRx7Yk8,7015
 autocoder/utils/tests.py,sha256=BqphrwyycGAvs-5mhH8pKtMZdObwhFtJ5MC_ZAOiLq8,1340
-autocoder/utils/thread_utils.py,sha256=tv9fhFZOjI18AxVUJbpe_xjBGMpkqgDcOlz9pnDtNik,8583
+autocoder/utils/thread_utils.py,sha256=VQCDrkTdij_5-01FE_X2Fprz_0uA-GahUY4h7DnAlw0,5426
 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=Wh_KSjYIxE3r4cU4sdFuSoNVxqcUw9c4-V-DaTVYWvg,13131
+autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=A1ka4FVf_SKH7T6pez5R460qvGdEquzfIAjRR_TRxF8,15010
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.304.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.304.dist-info/METADATA,sha256=zG9ItZR6be3SWKK1w-9EF_vaq1Tf9tiQ1HuAv3NTvhs,2721
-auto_coder-0.1.304.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.304.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.304.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.304.dist-info/RECORD,,
+auto_coder-0.1.305.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.305.dist-info/METADATA,sha256=IM7ILt4a0lg_Lq7SHGZK0T0oPsi272WyLa9gLhSLjcE,2721
+auto_coder-0.1.305.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.305.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.305.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.305.dist-info/RECORD,,

autocoder/commands/auto_command.py

@@ -500,10 +500,7 @@ class CommandAutoTuner:
         result_manager = ResultManager()
 
         while True:
-            if global_cancel.requested:
-                printer = Printer(console)
-                printer.print_in_terminal("generation_cancelled")
-                break
+            global_cancel.check_and_raise()
             # 执行命令
             command = response.suggestions[0].command
             parameters = response.suggestions[0].parameters

autocoder/commands/auto_web.py

@@ -794,15 +794,7 @@ class AutoWebTuner:
             logger.info(f"开始执行迭代 {iterations}/{max_iterations}")
 
             # 检查是否需要取消操作
-            if global_cancel.requested:
-                logger.info("检测到取消请求，停止操作")
-                self.printer.print_in_terminal(
-                    "operation_cancelled", style="yellow")
-                return AutoWebResponse(
-                    explanation="操作已取消",
-                    overall_status="cancelled",
-                    actions=[]
-                )
+            global_cancel.check_and_raise()
 
             # 如果没有更多操作，认为任务完成
             if not plan.actions:

autocoder/common/auto_coder_lang.py

@@ -66,6 +66,11 @@ MESSAGES = {
         "index_related_files_fail": "⚠️ Failed to find related files for chunk {{ chunk_count }}",
         "index_file_removed": "🗑️ Removed non-existent file index: {{ file_path }}",
         "index_file_saved": "💾 Saved index file, updated {{ updated_files }} files, removed {{ removed_files }} files, input_tokens: {{ input_tokens }}, output_tokens: {{ output_tokens }}, input_cost: {{ input_cost }}, output_cost: {{ output_cost }}",
+        "task_cancelled_by_user": "Task was cancelled by user",
+        "cancellation_requested": "Cancellation requested, waiting for thread to terminate...",
+        "force_terminating_thread": "Force terminating thread after timeout",
+        "force_raising_keyboard_interrupt": "Force raising KeyboardInterrupt after timeout",
+        "thread_terminated": "Thread terminated",
         "human_as_model_instructions": (
             "You are now in Human as Model mode. The content has been copied to your clipboard.\n"
             "The system is waiting for your input. When finished, enter 'EOF' on a new line to submit.\n"
@@ -156,7 +161,6 @@ MESSAGES = {
         "generated_shell_script": "Generated Shell Script",
         "confirm_execute_shell_script": "Do you want to execute this shell script?",
         "shell_script_not_executed": "Shell script was not executed",
-        "conf_not_found": "Configuration file not found: {{path}}",
         "index_export_success": "Index exported successfully: {{path}}",
         "index_import_success": "Index imported successfully: {{path}}",
         "edits_title": "edits",
@@ -279,6 +283,11 @@ MESSAGES = {
         "index_related_files_fail": "⚠️ 无法为块 {{ chunk_count }} 找到相关文件",
         "index_file_removed": "🗑️ 已移除不存在的文件索引：{{ file_path }}",
         "index_file_saved": "💾 已保存索引文件，更新了 {{ updated_files }} 个文件，移除了 {{ removed_files }} 个文件，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}, 输入成本: {{ input_cost }}, 输出成本: {{ output_cost }}",
+        "task_cancelled_by_user": "任务被用户取消",
+        "cancellation_requested": "已请求取消，正在等待线程终止...",
+        "force_terminating_thread": "线程超时强制终止",
+        "force_raising_keyboard_interrupt": "超时强制抛出键盘中断异常",
+        "thread_terminated": "线程已终止",
         "human_as_model_instructions": (
             "您现在处于人类作为模型模式。内容已复制到您的剪贴板。\n"
             "系统正在等待您的输入。完成后，在新行输入'EOF'提交。\n"

autocoder/common/global_cancel.py

@@ -1,21 +1,82 @@
 import threading
+from typing import Dict, Optional, Any
+
+class CancelRequestedException(Exception):
+    """当取消请求被触发时抛出的异常"""
+    def __init__(self, token: Optional[str] = None, message: str = "Operation was cancelled"):
+        self.token = token
+        self.message = message
+        super().__init__(self.message)
 
 class GlobalCancel:
     def __init__(self):
-        self._flag = False
+        self._global_flag = False
+        self._token_flags: Dict[str, bool] = {}
         self._lock = threading.Lock()
+        self._context: Dict[str, Any] = {}  # 存储与取消相关的上下文信息
     
     @property
-    def requested(self):
+    def requested(self) -> bool:
+        """检查是否请求了全局取消（向后兼容）"""
+        with self._lock:
+            return self._global_flag
+    
+    def is_requested(self, token: Optional[str] = None) -> bool:
+        """检查是否请求了特定token或全局的取消"""
         with self._lock:
-            return self._flag
+            # 全局标志总是优先
+            if self._global_flag:
+                return True
+            # 如果提供了token，检查该token的标志
+            if token is not None and token in self._token_flags:
+                return self._token_flags[token]
+            return False
     
-    def set(self):
+    def set(self, token: Optional[str] = None, context: Optional[Dict[str, Any]] = None) -> None:
+        """设置特定token或全局的取消标志"""
         with self._lock:
-            self._flag = True
+            if token is None:
+                self._global_flag = True
+            else:
+                self._token_flags[token] = True
+            
+            # 存储上下文
+            if context:
+                if token is None:
+                    self._context.update(context)
+                else:
+                    if "tokens" not in self._context:
+                        self._context["tokens"] = {}
+                    self._context["tokens"][token] = context
     
-    def reset(self):
+    def reset(self, token: Optional[str] = None) -> None:
+        """重置特定token或全局的取消标志"""
         with self._lock:
-            self._flag = False
+            if token is None:
+                # 全局重置
+                self._global_flag = False
+                self._token_flags.clear()
+                self._context.clear()
+            else:
+                # 特定token重置
+                if token in self._token_flags:
+                    del self._token_flags[token]
+                if "tokens" in self._context and token in self._context["tokens"]:
+                    del self._context["tokens"][token]
+    
+    def get_context(self, token: Optional[str] = None) -> Dict[str, Any]:
+        """获取与取消相关的上下文信息"""
+        with self._lock:
+            if token is None:
+                return self._context.copy()
+            if "tokens" in self._context and token in self._context["tokens"]:
+                return self._context["tokens"][token].copy()
+            return {}
+    
+    def check_and_raise(self, token: Optional[str] = None) -> None:
+        """检查是否请求了取消，如果是则抛出异常"""
+        if self.is_requested(token):
+            context = self.get_context(token)
+            raise CancelRequestedException(token, context.get("message", "Operation was cancelled"))
 
 global_cancel = GlobalCancel()

autocoder/dispacher/actions/action.py

@@ -112,10 +112,7 @@ class ActionTSProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -181,10 +178,7 @@ class ActionTSProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-            if global_cancel.requested:
-                printer = Printer()
-                raise Exception(printer.get_message_from_key(
-                    "generation_cancelled"))
+            global_cancel.check_and_raise()
 
             merge_result = None
             if args.execute and args.auto_merge:
@@ -249,10 +243,7 @@ class ActionPyScriptProject(BaseAction):
 
     def process_content(self, source_code_list: SourceCodeList):
         args = self.args
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -318,10 +309,7 @@ class ActionPyScriptProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-            if global_cancel.requested:
-                printer = Printer()
-                raise Exception(printer.get_message_from_key(
-                    "generation_cancelled"))
+            global_cancel.check_and_raise()
 
             merge_result = None
             if args.execute and args.auto_merge:
@@ -410,10 +398,7 @@ class ActionPyProject(BaseAction):
                     max_length=self.args.model_max_input_length
                 )
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -479,10 +464,7 @@ class ActionPyProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-            if global_cancel.requested:
-                printer = Printer()
-                raise Exception(printer.get_message_from_key(
-                    "generation_cancelled"))
+            global_cancel.check_and_raise()
 
             merge_result = None
             if args.execute and args.auto_merge:
@@ -563,10 +545,7 @@ class ActionSuffixProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -631,10 +610,7 @@ class ActionSuffixProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-        if global_cancel.requested:
-            printer = Printer()
-            raise Exception(printer.get_message_from_key(
-                "generation_cancelled"))
+        global_cancel.check_and_raise()
 
         merge_result = None
         if args.execute and args.auto_merge:

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -66,9 +66,7 @@ class ActionRegexProject:
 
         start_time = time.time()
         
-        if global_cancel.requested:
-            printer = Printer()            
-            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+        global_cancel.check_and_raise()
         
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -128,9 +126,7 @@ class ActionRegexProject:
                     action_file=self.args.file
                 ).to_dict())
 
-            if global_cancel.requested:
-                printer = Printer()            
-                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            global_cancel.check_and_raise()
             
             merge_result = None
             if args.execute and args.auto_merge:

autocoder/index/index.py

@@ -296,8 +296,7 @@ class IndexManager:
         return False
 
     def build_index_for_single_source(self, source: SourceCode):
-        if global_cancel.requested:
-            return None
+        global_cancel.check_and_raise()
 
         file_path = source.module_name
         if not os.path.exists(file_path):
@@ -552,8 +551,7 @@ class IndexManager:
                 for source in wait_to_build_files
             ]
             for future in as_completed(futures):
-                if global_cancel.requested:
-                    break
+                global_cancel.check_and_raise()
                 result = future.result()
                 if result is not None:
                     counter += 1

autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -13,7 +13,7 @@ from autocoder.utils.request_queue import request_queue
 import time
 from byzerllm.utils.types import SingleOutputMeta
 from autocoder.common import AutoCoderArgs
-from autocoder.common.global_cancel import global_cancel
+from autocoder.common.global_cancel import global_cancel, CancelRequestedException
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
 from autocoder.events.event_types import EventMetadata
@@ -68,23 +68,35 @@ class MultiStreamRenderer:
             
     def _process_stream(self, 
                        stream_idx: int, 
-                       stream_generator: Generator[Tuple[str, Dict[str, Any]], None, None]):
+                       stream_generator: Generator[Tuple[str, Dict[str, Any]], None, None],
+                       cancel_token: Optional[str] = None):
         """Process a single stream in a separate thread"""
         stream = self.streams[stream_idx]
         try:
             for content, meta in stream_generator:
+                try:
+                    # 使用新的异常机制检查取消请求
+                    global_cancel.check_and_raise(cancel_token)
+                except CancelRequestedException:
+                    break
+                    
                 if content:
                     stream.update(content)
+        except CancelRequestedException:
+            # 处理取消异常
+            stream.update("\n\n**Operation was cancelled**")
         finally:
             stream.complete()
 
     def render_streams(self, 
-                      stream_generators: List[Generator[Tuple[str, Dict[str, Any]], None, None]]) -> List[str]:
+                      stream_generators: List[Generator[Tuple[str, Dict[str, Any]], None, None]],
+                      cancel_token: Optional[str] = None) -> List[str]:
         """
         Render multiple streams simultaneously
         
         Args:
             stream_generators: List of stream generators to render
+            cancel_token: Optional cancellation token
             
         Returns:
             List of final content from each stream
@@ -94,7 +106,7 @@ class MultiStreamRenderer:
         # Start processing threads
         threads = []
         for i, generator in enumerate(stream_generators):
-            thread = Thread(target=self._process_stream, args=(i, generator))
+            thread = Thread(target=self._process_stream, args=(i, generator, cancel_token))
             thread.daemon = True
             thread.start()
             threads.append(thread)
@@ -102,6 +114,13 @@ class MultiStreamRenderer:
         try:
             with Live(self.layout, console=self.console, refresh_per_second=10) as live:
                 while any(not stream.is_complete for stream in self.streams):
+                    try:
+                        # 使用新的异常机制检查取消请求
+                        global_cancel.check_and_raise(cancel_token)
+                    except CancelRequestedException:
+                        print("\nCancelling streams...")
+                        break
+                        
                     # Update all panels
                     for i, stream in enumerate(self.streams):
                         panel = Panel(
@@ -116,7 +135,11 @@ class MultiStreamRenderer:
                     time.sleep(0.1)  # Prevent excessive CPU usage
                     
         except KeyboardInterrupt:
+            # 键盘中断时设置取消标志
+            global_cancel.set(cancel_token, {"message": "Keyboard interrupt"})
             print("\nStopping streams...")
+        except CancelRequestedException:
+            print("\nCancelling streams...")
             
         # Wait for all threads to complete
         for thread in threads:
@@ -128,7 +151,8 @@ def multi_stream_out(
     stream_generators: List[Generator[Tuple[str, Dict[str, Any]], None, None]],
     titles: List[str],
     layout: str = "horizontal",
-    console: Optional[Console] = None
+    console: Optional[Console] = None,
+    cancel_token: Optional[str] = None
 ) -> List[str]:
     """
     Render multiple streams with Rich
@@ -138,12 +162,13 @@ def multi_stream_out(
         titles: List of titles for each stream
         layout: "horizontal" or "vertical"
         console: Optional Rich console instance
+        cancel_token: Optional cancellation token
         
     Returns:
         List of final content from each stream
     """
     renderer = MultiStreamRenderer(titles, layout, console)
-    return renderer.render_streams(stream_generators)
+    return renderer.render_streams(stream_generators, cancel_token)
 
 
 def stream_out(
@@ -155,7 +180,8 @@ def stream_out(
     final_title: Optional[str] = None,
     args: Optional[AutoCoderArgs] = None,
     display_func: Optional[Callable] = None,
-    extra_meta: Dict[str, Any] = {}
+    extra_meta: Dict[str, Any] = {},
+    cancel_token: Optional[str] = None
 ) -> Tuple[str, Optional[SingleOutputMeta]]:
     """
     处理流式输出事件并在终端中展示
@@ -167,6 +193,9 @@ def stream_out(
         model_name: 模型名称
         title: 面板标题，如果没有提供则使用默认值
         args: AutoCoderArgs对象
+        display_func: 可选的显示函数
+        extra_meta: 额外的元数据
+        cancel_token: 可选的取消令牌
     Returns:
         Tuple[str, Dict[SingleOutputMeta]]: 返回完整的响应内容和最后的元数据
     """
@@ -197,10 +226,8 @@ def stream_out(
             console=console
         ) as live:
             for res in stream_generator:
-                if global_cancel.requested:
-                    printer = Printer(console)
-                    printer.print_in_terminal("generation_cancelled")                    
-                    break
+                global_cancel.check_and_raise(cancel_token)
+                    
                 last_meta = res[1]                
                 content = res[0]
 
@@ -312,6 +339,24 @@ def stream_out(
                 )
             )            
             
+    except CancelRequestedException as cancel_exc:
+        # 捕获取消异常，显示取消信息
+        console.print(Panel(
+            "Generation was cancelled",  
+            title=f"Cancelled[ {panel_title} ]",
+            border_style="yellow"
+        ))
+        
+        if request_id and request_queue:
+            request_queue.add_request(
+                request_id,
+                RequestValue(
+                    value=StreamValue(value=["Operation was cancelled"]), 
+                    status=RequestOption.FAILED
+                ),
+            )
+        raise cancel_exc   
+    
     except Exception as e:
         console.print(Panel(
             f"Error: {str(e)}",  

autocoder/utils/thread_utils.py

@@ -1,161 +1,22 @@
-from concurrent.futures import ThreadPoolExecutor, TimeoutError, CancelledError
-from threading import Event
-from inspect import signature
 from functools import wraps
-from typing import Any, Optional
+from typing import Any, Optional, Dict, Callable
 import threading
-import logging
 import time
-from autocoder.common.global_cancel import global_cancel
+from autocoder.common.global_cancel import global_cancel, CancelRequestedException
+from autocoder.common.printer import Printer
+from autocoder.common.auto_coder_lang import get_message, get_message_with_format
+from autocoder.events.event_manager_singleton import get_event_manager
+from autocoder.events import event_content as EventContentCreator
+from autocoder.events.event_types import EventMetadata
 
-class CancellationRequested(Exception):
-    """Raised when a task is requested to be cancelled."""
-    pass
+printer = Printer()
 
-
-def run_in_thread(timeout: Optional[float] = None):
-    """Decorator that runs a function in a thread with signal handling.
-    
-    Args:
-        timeout (float, optional): Maximum time to wait for thread completion in seconds.
-            If None, will wait indefinitely.
-            
-    The decorated function will run in a separate thread and can be interrupted by
-    signals like Ctrl+C (KeyboardInterrupt). When interrupted, it will log the event
-    and clean up gracefully.
-    """
-    def decorator(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            with ThreadPoolExecutor(max_workers=1) as executor:
-                future = executor.submit(func, *args, **kwargs)
-                start_time = time.time()
-                
-                while True:
-                    try:
-                        # 使用较短的超时时间进行轮询，确保能够响应中断信号
-                        poll_timeout = 0.1
-                        if timeout is not None:
-                            remaining = timeout - (time.time() - start_time)
-                            if remaining <= 0:
-                                future.cancel()
-                                raise TimeoutError(f"Timeout after {timeout}s in {func.__name__}")
-                            poll_timeout = min(poll_timeout, remaining)
-                            
-                        try:
-                            return future.result(timeout=poll_timeout)
-                        except TimeoutError:
-                            continue  # 继续轮询
-                            
-                    except KeyboardInterrupt:
-                        logging.warning("KeyboardInterrupt received, attempting to cancel task...")
-                        future.cancel()
-                        raise
-                    except Exception as e:
-                        logging.error(f"Error occurred in thread: {str(e)}")
-                        raise
-        return wrapper
-    return decorator
-
-def run_in_thread_with_cancel(timeout: Optional[float] = None):
-    """Decorator that runs a function in a thread with explicit cancellation support.
-    
-    Args:
-        timeout (float, optional): Maximum time to wait for thread completion in seconds.
-            If None, will wait indefinitely.
-            
-    The decorated function MUST accept 'cancel_event' as its first parameter.
-    This cancel_event is a threading.Event object that can be used to check if
-    cancellation has been requested.
-    
-    The decorated function can be called with an external cancel_event passed as a keyword argument.
-    If not provided, a new Event will be created.
-    
-    Example:
-        @run_in_thread_with_cancel(timeout=10)
-        def long_task(cancel_event, arg1, arg2):
-            while not cancel_event.is_set():
-                # do work
-                if cancel_event.is_set():
-                    raise CancellationRequested()
-                    
-        # 使用外部传入的cancel_event
-        external_cancel = Event()
-        try:
-            result = long_task(arg1, arg2, cancel_event=external_cancel)
-        except CancelledError:
-            print("Task was cancelled")
-            
-        # 在其他地方取消任务
-        external_cancel.set()
-    """
-    def decorator(func):
-        # 检查函数签名
-        sig = signature(func)
-        params = list(sig.parameters.keys())
-        if not params or params[0] != 'cancel_event':
-            raise ValueError(
-                f"Function {func.__name__} must have 'cancel_event' as its first parameter. "
-                f"Current parameters: {params}"
-            )
-        
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            # 从kwargs中提取或创建cancel_event
-            cancel_event = kwargs.pop('cancel_event', None) or Event()
-            
-            def cancellable_task():
-                try:
-                    return func(cancel_event, *args, **kwargs)
-                except CancellationRequested:
-                    logging.info(f"Task {func.__name__} was cancelled")
-                    raise
-                except Exception as e:
-                    logging.error(f"Error in {func.__name__}: {str(e)}")
-                    raise
-            
-            with ThreadPoolExecutor(max_workers=1) as executor:
-                future = executor.submit(cancellable_task)
-                start_time = time.time()
-                
-                while True:
-                    try:
-                        # 使用较短的超时时间进行轮询，确保能够响应中断信号
-                        poll_timeout = 0.1
-                        if timeout is not None:
-                            remaining = timeout - (time.time() - start_time)
-                            if remaining <= 0:
-                                cancel_event.set()
-                                future.cancel()
-                                raise TimeoutError(f"Timeout after {timeout}s in {func.__name__}")
-                            poll_timeout = min(poll_timeout, remaining)
-                            
-                        try:
-                            return future.result(timeout=poll_timeout)
-                        except TimeoutError:
-                            continue  # 继续轮询
-                            
-                    except KeyboardInterrupt:
-                        logging.warning(f"KeyboardInterrupt received, cancelling {func.__name__}...")
-                        cancel_event.set()
-                        future.cancel()
-                        raise CancelledError("Task cancelled by user")
-                    except CancellationRequested:
-                        logging.info(f"Task {func.__name__} was cancelled")
-                        raise CancelledError("Task cancelled by request")
-                    except Exception as e:
-                        logging.error(f"Error occurred in thread: {str(e)}")
-                        raise
-                        
-        return wrapper
-    return decorator
-
-
-def run_in_raw_thread():
+def run_in_raw_thread(token: Optional[str] = None, context: Optional[Dict[str, Any]] = None):
     """A decorator that runs a function in a separate thread and handles exceptions.
     
     Args:
-        func: The function to run in a thread
+        token (Optional[str]): Optional cancellation token for this specific thread
+        context (Optional[Dict[str, Any]]): Optional context information for cancellation
         
     Returns:
         A wrapper function that executes the decorated function in a thread
@@ -166,28 +27,36 @@ def run_in_raw_thread():
     3. Propagate exceptions from the thread
     4. Support function arguments
     5. Preserve function metadata
+    6. Support token-based cancellation
+    7. Provide context information for cancellation
     """
-    def decorator(func):
+    def decorator(func: Callable):
 
         @wraps(func)
         def wrapper(*args, **kwargs):
             # Store thread results
             result = []
-            exception = []            
-            def worker():            
-                try:
-                    # 如果刚开始就遇到了,可能是用户中断的还没有释放
-                    # 等待五秒后强行释放
-                    if global_cancel.requested:
-                        time.sleep(5)
-                        global_cancel.reset()
-                    
+            exception_raised = [None]  # 存储工作线程中的异常
+            thread_token = token
+            thread_context = context or {}
+            thread_terminated = threading.Event()  # 用于标记线程是否已终止
+            
+            def worker():
+                try:                                        
+                    # 执行用户函数
                     ret = func(*args, **kwargs)
                     result.append(ret)
-                    global_cancel.reset()                
+                except CancelRequestedException as e:
+                    # 处理取消异常
+                    printer.print_in_terminal("generation_cancelled")
+                    exception_raised[0] = e
                 except Exception as e:
-                    global_cancel.reset()
-                    raise
+                    # 存储其他异常
+                    exception_raised[0] = e
+                finally:
+                    # 无论如何执行完毕后，重置取消标志并标记线程已终止
+                    global_cancel.reset(thread_token)
+                    thread_terminated.set()
             
             # Create and start thread with a meaningful name
             thread = threading.Thread(target=worker, name=f"{func.__name__}_thread")
@@ -195,16 +64,56 @@ def run_in_raw_thread():
             
             try:
                 thread.start()
+                
+                # Poll thread status with timeout to allow for interruption
+                cancelled_by_keyboard = False
+                max_wait_time = 30  # 最大等待时间（秒）
+                wait_start_time = time.time()
+                
                 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)
 
+                # 如果工作线程出现了异常，在主线程中重新抛出
+                if exception_raised[0] is not None:
+                    raise exception_raised[0]
+                    
+                # 返回结果
                 return result[0] if result else None            
-            except KeyboardInterrupt:  
-                global_cancel.set()                              
-                raise KeyboardInterrupt("Task was cancelled by user")
-            except Exception as e:
-                global_cancel.reset()
-                raise
+                
+            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
+                wait_start_time = time.time()
+                
+                # 等待线程终止或检测到取消
+                while thread.is_alive() and not thread_terminated.is_set():
+                    thread.join(0.5)
+                    elapsed_time = time.time() - wait_start_time
+                    if elapsed_time > max_wait_time:
+                        printer.print_in_terminal("force_raising_keyboard_interrupt")
+                        break
+                
+                # 如果线程已终止且有异常，优先抛出该异常
+                if exception_raised[0] is not None:
+                    raise exception_raised[0]                                                
                 
         return wrapper
     return decorator    

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.304"
+__version__ = "0.1.305"