pycoze 0.1.199__tar.gz → 0.1.200__tar.gz

{pycoze-0.1.199 → pycoze-0.1.200}/PKG-INFO

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

{pycoze-0.1.199 → pycoze-0.1.200}/pycoze/bot/agent/agent.py

@@ -70,6 +70,7 @@ async def run_agent(agent, inputs: list, tool_compatibility_mode: bool, should_e
 
 if __name__ == "__main__":
     from langchain_experimental.tools import PythonREPLTool
+    import threading
 
     llm_file = r"C:\Users\aiqqq\AppData\Roaming\pycoze\JsonStorage\llm.json"
     with open(llm_file, "r", encoding="utf-8") as f:

{pycoze-0.1.199 → pycoze-0.1.200}/pycoze/bot/bot.py

@@ -6,7 +6,6 @@ import threading
 import queue
 import time
 import asyncio
-import multiprocessing
 
 
 class PeekableQueue(queue.Queue):
@@ -15,14 +14,17 @@ class PeekableQueue(queue.Queue):
             return self._get()
         except queue.Empty:
             return None
+        
 
-
-def run_agent_chat(bot_setting_file, history, should_exit):
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-    loop.run_until_complete(agent_chat(bot_setting_file, history, should_exit))
-    loop.close()
-
+async def handle_input_queue(input_queue, should_exit, history):
+    while not should_exit.is_set():
+        if not input_queue.empty():
+            next_input_text = input_queue.get_nowait()
+            if next_input_text == INTERRUPT_MESSAGE:
+                history.append(AIMessage(content=CHAT_DATA["info"]))
+                should_exit.set()  # 设置退出标志
+                break
+        await asyncio.sleep(0.1)  # 非阻塞地等待一段时间
 
 def chat(bot_setting_file: str):
     history = []
@@ -35,7 +37,6 @@ def chat(bot_setting_file: str):
                 input_queue.put(input_text)
             else:
                 raise ValueError("Invalid message")
-            
 
     input_thread_instance = threading.Thread(target=input_thread, args=(input_queue,))
     input_thread_instance.start()
@@ -51,22 +52,24 @@ def chat(bot_setting_file: str):
                     history.append(HumanMessage(message["content"]))
                     clear_chat_data()
                     
-                    # 创建进程退出标志
-                    should_exit = multiprocessing.Event()
-                    agent_chat_process = multiprocessing.Process(target=run_agent_chat, args=(bot_setting_file, history, should_exit)) # 需要是独立进程，不然无法创建新进程
-                    agent_chat_process.start()
-                    
-                    next_input_text = ""
-                    while agent_chat_process.is_alive():
-                        if not input_queue.empty():
-                            next_input_text = input_queue.peek()
-                            if next_input_text == INTERRUPT_MESSAGE:
-                                history.append(AIMessage(content=CHAT_DATA["info"]))
-                                should_exit.set()  # 设置退出标志
-                                break
-                        time.sleep(0.1)  # 每隔 0.1 秒检查一次
-                    if next_input_text != INTERRUPT_MESSAGE:
+                    # 创建一个异步事件循环
+                    loop = asyncio.new_event_loop()
+                    asyncio.set_event_loop(loop)
+
+                    # 创建一个 Event 对象用于中断
+                    should_exit = asyncio.Event()
+
+                    # 并发运行 agent_chat 和 handle_input_queue
+                    agent_chat_task = loop.create_task(agent_chat(bot_setting_file, history, should_exit))
+                    input_handler_task = loop.create_task(handle_input_queue(input_queue, should_exit, history))
+
+                    # 运行所有任务
+                    loop.run_until_complete(asyncio.gather(agent_chat_task, input_handler_task))
+
+                    # 如果没有中断，则添加 AI 的响应到历史记录
+                    if not should_exit.is_set():
                         history.append(AIMessage(content=CHAT_DATA["output"]))
+
                 except json.JSONDecodeError:
                     print("Invalid JSON format in input message.")
                 except KeyError:
@@ -81,6 +84,6 @@ def chat(bot_setting_file: str):
 def get_chat_response(bot_setting_file: str, input_text: str):
     history = [HumanMessage(input_text)]
     clear_chat_data()
-    should_exit = multiprocessing.Event()
+    should_exit = threading.Event()
     asyncio.run(agent_chat(bot_setting_file, history, should_exit))
     return CHAT_DATA["output"]

{pycoze-0.1.199 → pycoze-0.1.200}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.199 → pycoze-0.1.200}/setup.py

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