pycoze 0.1.200__tar.gz → 0.1.201__tar.gz

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

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

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

@@ -6,42 +6,62 @@ import threading
 import queue
 import time
 import asyncio
+import multiprocessing
+from multiprocessing import Queue, Event
 
-
-class PeekableQueue(queue.Queue):
+# 假设 PeekableQueue 类已经定义好了，如果没有，请自行实现或使用其他方式
+class PeekableQueue:
+    def __init__(self, maxsize=0):
+        self.queue = Queue(maxsize=maxsize)
+    
+    def put(self, item):
+        self.queue.put(item)
+    
+    def get(self):
+        return self.queue.get()
+    
     def peek(self):
-        try:
-            return self._get()
-        except queue.Empty:
-            return None
-        
+        with self.queue.mutex:
+            if self.queue.empty():
+                return None
+            return self.queue.queue[0]
+    
+    def empty(self):
+        return self.queue.empty()
 
-async def handle_input_queue(input_queue, should_exit, history):
+def input_process(input_queue: Queue, interrupt_event: Event):
+    while not interrupt_event.is_set():
+        input_text = input()
+        if input_text == INTERRUPT_MESSAGE or input_text.startswith(INPUT_MESSAGE):
+            input_queue.put(input_text)
+        else:
+            raise ValueError("Invalid message")
+
+async def handle_input_queue(input_queue: Queue, should_exit: asyncio.Event, history):
     while not should_exit.is_set():
-        if not input_queue.empty():
+        try:
             next_input_text = input_queue.get_nowait()
             if next_input_text == INTERRUPT_MESSAGE:
                 history.append(AIMessage(content=CHAT_DATA["info"]))
                 should_exit.set()  # 设置退出标志
                 break
+        except queue.Empty:
+            pass
         await asyncio.sleep(0.1)  # 非阻塞地等待一段时间
 
 def chat(bot_setting_file: str):
     history = []
     input_queue = PeekableQueue()
+    interrupt_event = Event()  # 用于中断输入进程的事件
 
-    def input_thread(input_queue: PeekableQueue):
-        while True:
-            input_text = input()
-            if input_text == INTERRUPT_MESSAGE or input_text.startswith(INPUT_MESSAGE):
-                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()
+    # 创建并启动输入进程
+    input_process_instance = multiprocessing.Process(target=input_process, args=(input_queue, interrupt_event))
+    input_process_instance.start()
 
     try:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+
         while True:
             if not input_queue.empty():
                 input_text = input_queue.get()
@@ -51,10 +71,6 @@ def chat(bot_setting_file: str):
                     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()
@@ -77,7 +93,9 @@ def chat(bot_setting_file: str):
                 except Exception as e:
                     print(f"An error occurred: {e}")
     finally:
-        input_thread_instance.join()
+        # 设置中断事件以停止输入进程
+        interrupt_event.set()
+        input_process_instance.join()
 
 
 

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

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

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

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