pycoze 0.1.162__py3-none-any.whl → 0.1.164__py3-none-any.whl

pycoze/bot/agent_chat.py

@@ -32,7 +32,7 @@ def load_abilities(bot_setting_file: str):
     return abilities
 
 
-def agent_chat(bot_setting_file, history):
+async def agent_chat(bot_setting_file, history, should_exit):
     role_setting = load_role_setting(bot_setting_file)
     abilities = load_abilities(bot_setting_file)
 
@@ -75,5 +75,20 @@ def agent_chat(bot_setting_file, history):
         assistant_message=prompt,
         tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
-    result = asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"]))
-    output("assistant", result)
+    
+    async def run_agent_with_exit_check():
+        result = await run_agent(agent, history, cfg["toolCompatibilityMode"])
+        if not should_exit.is_set():
+            output("assistant", result)
+
+    task = asyncio.create_task(run_agent_with_exit_check())
+
+    while not task.done():
+        if should_exit.is_set():
+            task.cancel()
+            try:
+                await task
+            except asyncio.CancelledError:
+                pass
+            break
+        await asyncio.sleep(0.1)

pycoze/bot/bot.py

@@ -5,6 +5,7 @@ import json
 import threading
 import queue
 import time
+import asyncio
 
 
 class PeekableQueue(queue.Queue):
@@ -36,18 +37,23 @@ def chat(bot_setting_file: str):
             if not input_queue.empty():
                 input_text = input_queue.get()
                 if input_text == INTERRUPT_MESSAGE:
-                    break
+                    continue
                 try:
                     message = json.loads(input_text[len(INPUT_MESSAGE):])
                     history.append(HumanMessage(message["content"]))
                     clear_chat_data()
-                    agent_chat_thread = threading.Thread(target=agent_chat, args=(bot_setting_file, history))
+                    
+                    # 为每个线程创建一个独立的退出标志
+                    should_exit = threading.Event()
+                    agent_chat_thread = threading.Thread(target=asyncio.run, args=(agent_chat(bot_setting_file, history, should_exit),))
                     agent_chat_thread.start()
+                    
                     next_input_text = ""
                     while agent_chat_thread.is_alive():
                         if not input_queue.empty():
                             next_input_text = input_queue.peek()
                             if next_input_text == INTERRUPT_MESSAGE:
+                                should_exit.set()  # 设置退出标志
                                 history.append(AIMessage(content=CHAT_DATA["info"]))
                                 break
                         time.sleep(0.1)  # 每隔 0.1 秒检查一次
@@ -67,5 +73,11 @@ def chat(bot_setting_file: str):
 def get_chat_response(bot_setting_file: str, input_text: str):
     history = [HumanMessage(input_text)]
     clear_chat_data()
-    agent_chat(bot_setting_file, history)
-    return CHAT_DATA["output"]
+    
+    # 为每个线程创建一个独立的退出标志
+    should_exit = threading.Event()
+    
+    # 使用 asyncio.run 来运行异步函数，并等待其完成
+    asyncio.run(agent_chat(bot_setting_file, history, should_exit))
+    
+    return CHAT_DATA["output"]

{pycoze-0.1.162.dist-info → pycoze-0.1.164.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.162
+Version: 0.1.164
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.162.dist-info → pycoze-0.1.164.dist-info}/RECORD

@@ -2,8 +2,8 @@ pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/ai/__init__.py,sha256=odM2lgYSnApxw4AzLV_5AyaxL5_MLfydOSB1VmLGFyA,75
 pycoze/ai/vram_reserve.py,sha256=QbqaA8qv87cnEpOVDMygi0BNMxuhLYwj1UKfR_D5BD4,4340
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/agent_chat.py,sha256=7duMif9tz5ewZJgbHsg8oGKY4vtiDUZ9MGtVQsY_HRw,2851
-pycoze/bot/bot.py,sha256=CoMbkvf98RnazBfn3bmEhQ8nNtKHQMIm1GgH_xA6elw,2745
+pycoze/bot/agent_chat.py,sha256=ZNSbXOmsAgd77DcDmhylMAbEFxZCM09kE8kPJ1uuvcY,3282
+pycoze/bot/bot.py,sha256=eCfKc1V-Cqj_1eK7zqnan5e03dur9Y_mNLO2TdZmcsA,3237
 pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
 pycoze/bot/agent/agent.py,sha256=Aue8nWeW_I7e1jo4o7cUjFFjrsV9NtVUiTX3EQYHmbA,3507
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
@@ -23,8 +23,8 @@ pycoze/ui/ui_def.py,sha256=UhhU_yB3GV9ISbvTWT48hsHPHI250BhMILh6bu5Uioo,4206
 pycoze/utils/__init__.py,sha256=ET0W5wzq4zlY3dr1wHVbbeRKlKdC_zqHt9b0jZyHohw,94
 pycoze/utils/arg.py,sha256=orLVEGw3x2f3l7bZDbBPkkdDPSdqXo-_Rs-4ZhzmrEw,984
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.162.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.162.dist-info/METADATA,sha256=LD7IEgGbt7mB96tbV0D5zZ8eTXy5pGi18BQ_WWFALi4,726
-pycoze-0.1.162.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.162.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.162.dist-info/RECORD,,
+pycoze-0.1.164.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.164.dist-info/METADATA,sha256=3d_eqypKaqxXewVhIOFGF6JhWWgfPJsRkjr0SN_EiRM,726
+pycoze-0.1.164.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.164.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.164.dist-info/RECORD,,