pycoze 0.1.198__py3-none-any.whl → 0.1.200__py3-none-any.whl

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/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,23 +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 秒检查一次
-                        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:
@@ -82,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.198.dist-info → pycoze-0.1.200.dist-info}/METADATA

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

{pycoze-0.1.198.dist-info → pycoze-0.1.200.dist-info}/RECORD

@@ -6,9 +6,9 @@ pycoze/automation/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 pycoze/automation/browser/edge_driver_manager.py,sha256=gpgseunph5owZH6EskSYthuhey2SU3UP204gY0yIcuI,3022
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
 pycoze/bot/agent_chat.py,sha256=hr0jGTd-lvLSe4vCcvaN2rKhB7BMBcVBtI1FpVa6ngs,3016
-pycoze/bot/bot.py,sha256=vRFLa3ABIqWHaWeuUhsTWzdas0SGpCRoe95D9C9IJ8c,3435
+pycoze/bot/bot.py,sha256=VX6SD-D8K--IA3Y5UJ7XHQ1lOJVdtAmg7LznvRHnGvs,3419
 pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
-pycoze/bot/agent/agent.py,sha256=7dyAsHSVnBmFUK9GR_BumkjSgrvQA0KLj0e3aDN_JU4,3592
+pycoze/bot/agent/agent.py,sha256=Ueste4xWvkQFk5Giklv4c-kcxiPL-D-KafzZ4DONosY,3613
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
 pycoze/bot/agent/chat.py,sha256=mubOCAHvA6VtyE6N40elI6KrP6A69uB_G6ihE3G_Vi4,860
 pycoze/bot/agent/agent_types/__init__.py,sha256=zmU2Kmrv5mCdfg-QlPn2H6pWxbGeq8s7YTqLhpzJC6k,179
@@ -28,8 +28,8 @@ pycoze/utils/__init__.py,sha256=Gi5EnrWZGMD2JRejgV4c_VLCXyvA2wwBFI_niDF5MUE,110
 pycoze/utils/arg.py,sha256=GtfGbMTMdaK75Fwh6MpUe1pCA5X6Ep4LFG7a72YrzjI,525
 pycoze/utils/env.py,sha256=W04lhvTHhAAC6EldP6kk2xrctqtu8K6kl1vDLZDNeh8,561
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.198.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.198.dist-info/METADATA,sha256=SKG3vhboHl-tWEMD9GAE57F47Lw-_NcjvVMCdVard0s,726
-pycoze-0.1.198.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.198.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.198.dist-info/RECORD,,
+pycoze-0.1.200.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.200.dist-info/METADATA,sha256=1hKkSBOzR7Rof3qx3IzysiIfilGXZg5iJZ6gVPl0zwA,726
+pycoze-0.1.200.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.200.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.200.dist-info/RECORD,,