pycoze 0.1.162__tar.gz → 0.1.164__tar.gz

{pycoze-0.1.162 → pycoze-0.1.164}/PKG-INFO

@@ -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 → pycoze-0.1.164}/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-0.1.162 → pycoze-0.1.164}/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 → pycoze-0.1.164}/pycoze.egg-info/PKG-INFO

@@ -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 → pycoze-0.1.164}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pycoze",
-    version="0.1.162",
+    version="0.1.164",
     packages=find_packages(),
     install_requires=[],
     author="Yuan Jie Xiong",