pycoze 0.1.202__py3-none-any.whl → 0.1.204__py3-none-any.whl

pycoze/bot/bot.py

@@ -1,84 +1,71 @@
-from langchain_core.messages import HumanMessage, AIMessage
-from .agent import INPUT_MESSAGE, INTERRUPT_MESSAGE, output, CHAT_DATA, clear_chat_data
-from .agent_chat import agent_chat
+import signal
+import sys
 import json
-import threading
-import queue
-import time
+from .agent import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
+from .agent_chat import agent_chat
+from multiprocessing import Process, Event
 import asyncio
-import multiprocessing
-from multiprocessing import Queue, Event
 
+# 用于标记中断请求
+interrupt_flag = False
 
-class PeekableQueue(queue.Queue):
-    def peek(self):
-        try:
-            return self._get()
-        except queue.Empty:
-            return None
-        
-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 handle_interrupt(signum, frame):
+    global interrupt_flag
+    interrupt_flag = True
+    print("Interrupt signal received. Waiting for the current operation to complete...")
 
-def chat(bot_setting_file: str):
-    history = []
-    input_queue = PeekableQueue()
+# 设置信号处理器
+signal.signal(signal.SIGINT, handle_interrupt)
 
-    def input_thread(input_queue: PeekableQueue):
-        while True:
+def read_input():
+    while True:
+        try:
             input_text = input()
-            if input_text == INTERRUPT_MESSAGE or input_text.startswith(INPUT_MESSAGE):
-                input_queue.put(input_text)
+            if input_text.startswith(INPUT_MESSAGE):
+                yield input_text
             else:
                 raise ValueError("Invalid message")
+        except EOFError:  # 如果输入流结束，则退出循环
+            break
 
-    input_thread_instance = threading.Thread(target=input_thread, args=(input_queue,))
-    input_thread_instance.start()
-
-    try:
-        while True:
-            if not input_queue.empty():
-                input_text = input_queue.get()
-                if input_text == INTERRUPT_MESSAGE:
-                    continue
-                try:
-                    message = json.loads(input_text[len(INPUT_MESSAGE):])
-                    history.append(HumanMessage(message["content"]))
-                    clear_chat_data()
-                    
-                    # 创建一个异步事件循环
-                    loop = asyncio.new_event_loop()
-                    asyncio.set_event_loop(loop)
-
-                    # 创建一个 Event 对象用于中断
-                    should_exit = asyncio.Event()
+def chat(bot_setting_file: str):
+    history = []
+    for input_text in read_input():
+        try:
+            message = json.loads(input_text[len(INPUT_MESSAGE):])
+            history.append(HumanMessage(message["content"]))
+            clear_chat_data()
 
-                    # 并发运行 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))
+            # 创建一个事件来控制子进程的退出
+            should_exit = Event()
+            
+            # 使用进程来运行 agent_chat
+            agent_chat_process = Process(target=asyncio.run, args=(agent_chat(bot_setting_file, history, should_exit),))
+            agent_chat_process.start()
 
-                    # 运行所有任务
-                    loop.run_until_complete(asyncio.gather(agent_chat_task, input_handler_task))
+            # 检查是否收到了中断信号
+            while agent_chat_process.is_alive():
+                if interrupt_flag:
+                    should_exit.set()  # 设置退出标志
+                    break
+                time.sleep(0.1)  # 每隔 0.1 秒检查一次
 
-                    # 如果没有中断，则添加 AI 的响应到历史记录
-                    if not should_exit.is_set():
-                        history.append(AIMessage(content=CHAT_DATA["output"]))
+            # 确保子进程已经退出
+            agent_chat_process.join()
 
-                except json.JSONDecodeError:
-                    print("Invalid JSON format in input message.")
-                except KeyError:
-                    print("Missing 'content' key in input message.")
-                except Exception as e:
-                    print(f"An error occurred: {e}")
-    finally:
-        input_thread_instance.join()
+            # 如果没有收到中断信号，记录输出
+            if not interrupt_flag:
+                history.append(AIMessage(content=CHAT_DATA["output"]))
+            
+            # 重置中断标志
+            interrupt_flag = False
+        except json.JSONDecodeError:
+            print("Invalid JSON format in input message.")
+        except KeyError:
+            print("Missing 'content' key in input message.")
+        except Exception as e:
+            print(f"An error occurred: {e}")
 
 
 def get_chat_response(bot_setting_file: str, input_text: str):

{pycoze-0.1.202.dist-info → pycoze-0.1.204.dist-info}/METADATA

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

{pycoze-0.1.202.dist-info → pycoze-0.1.204.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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=F4YI2RGruC31jX3MX1fLOTs6j81CRM_GZsU_xAyqKiY,3481
+pycoze/bot/bot.py,sha256=GFLB6YoebO2ozgx6Co76tAQTJt2939w7YZEtpq5txWk,2622
 pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
 pycoze/bot/agent/agent.py,sha256=Ueste4xWvkQFk5Giklv4c-kcxiPL-D-KafzZ4DONosY,3613
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
@@ -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.202.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.202.dist-info/METADATA,sha256=Eba5-C_KEnuUfCafG1RTxGyWGHiAIMaczsfgUeVQupo,726
-pycoze-0.1.202.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.202.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.202.dist-info/RECORD,,
+pycoze-0.1.204.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.204.dist-info/METADATA,sha256=hmJCpWK-dxGY1AaYShJI45WS5dy_4qtuwUGDtFbYd3g,726
+pycoze-0.1.204.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.204.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.204.dist-info/RECORD,,