pycoze 0.1.161__py3-none-any.whl → 0.1.163__py3-none-any.whl

pycoze/bot/agent/__init__.py

@@ -1,5 +1,5 @@
 from .agent import run_agent
 from .assistant import Runnable
-from .chat import INPUT_MESSAGE,  CHAT_DATA, clear_chat_data, output, info
+from .chat import INPUT_MESSAGE, INTERRUPT_MESSAGE,  CHAT_DATA, clear_chat_data, output, info
 
-__all__ = [run_agent, Runnable, INPUT_MESSAGE, output]
+__all__ = [run_agent, Runnable, INPUT_MESSAGE, INTERRUPT_MESSAGE,  CHAT_DATA, clear_chat_data, output, info]

pycoze/bot/agent/chat.py

@@ -3,12 +3,13 @@ from langchain_core.messages import AIMessage
 
 
 INPUT_MESSAGE = "INPUT_MESSAGE=>"
+INTERRUPT_MESSAGE = "INTERRUPT_MESSAGE=>"
 _OUTPUT_MESSAGE = "OUTPUT_MESSAGE=>"
 _INFOMATION_MESSAGE = "INFOMATION_MESSAGE=>"
 _LOG = "LOG=>"
 
 
-CHAT_DATA = {"output":"","info":""}
+CHAT_DATA = {"output":"", "info":""}
 
 
 def log(content, *args, end="\n", **kwargs):
@@ -16,13 +17,13 @@ def log(content, *args, end="\n", **kwargs):
 
 
 def clear_chat_data():
-    CHAT_DATA = {"output":"","info":""}
+    CHAT_DATA = {"output":"", "info":""}
 
 
 def output(role, content):
     assert role == "assistant"
-    print(_OUTPUT_MESSAGE + json.dumps({"role": role, "content": content}))
     CHAT_DATA["output"] = content
+    print(_OUTPUT_MESSAGE + json.dumps({"role": role, "content": content}))
 
 def info(role, content):
     CHAT_DATA["info"] += content

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/bot/bot.py

@@ -1,27 +1,82 @@
 from langchain_core.messages import HumanMessage, AIMessage
-from .agent import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
+from .agent import INPUT_MESSAGE, INTERRUPT_MESSAGE, output, CHAT_DATA, clear_chat_data
 from .agent_chat import agent_chat
 import json
 import threading
+import queue
+import time
 
 
+class PeekableQueue(queue.Queue):
+    def peek(self):
+        with self.mutex:
+            if self.empty():
+                return None
+            return self.queue[0]
+        
+
 def chat(bot_setting_file: str):
     history = []
-    while True:
-        input_text = input()
-        if not input_text.startswith(INPUT_MESSAGE):
-            raise ValueError("Invalid message")
-        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))
-        agent_chat_thread.start()
-        agent_chat_thread.join()
-        history.append(AIMessage(content=CHAT_DATA["output"]))
+    input_queue = PeekableQueue()
+
+    def input_thread(input_queue: PeekableQueue):
+        while True:
+            input_text = input()
+            if input_text == INTERRUPT_MESSAGE:
+                break
+            if not input_text.startswith(INPUT_MESSAGE):
+                raise ValueError("Invalid message")
+            input_queue.put(input_text)
+
+    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()
+                    
+                    # 为每个线程创建一个独立的退出标志
+                    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 秒检查一次
+                    if next_input_text != INTERRUPT_MESSAGE:
+                        history.append(AIMessage(content=CHAT_DATA["output"]))
+                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()
+
 
 
 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.161.dist-info → pycoze-0.1.163.dist-info}/METADATA

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

{pycoze-0.1.161.dist-info → pycoze-0.1.163.dist-info}/RECORD

@@ -2,12 +2,12 @@ pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/ai/__init__.py,sha256=odM2lgYSnApxw4AzLV_5AyaxL5_MLfydOSB1VmLGFyA,75
 pycoze/ai/vram_reserve.py,sha256=QbqaA8qv87cnEpOVDMygi0BNMxuhLYwj1UKfR_D5BD4,4340
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/agent_chat.py,sha256=7duMif9tz5ewZJgbHsg8oGKY4vtiDUZ9MGtVQsY_HRw,2851
-pycoze/bot/bot.py,sha256=HiH8cT0pUEr8otiukYvUCWQzeEGpclFGhfcWSsZvBdg,993
-pycoze/bot/agent/__init__.py,sha256=FG5TAjc-P-yk2bS_lSyM-znvHLc5m_KkQHWbyCDiogI,192
+pycoze/bot/agent_chat.py,sha256=ZNSbXOmsAgd77DcDmhylMAbEFxZCM09kE8kPJ1uuvcY,3282
+pycoze/bot/bot.py,sha256=bKJgA3LyulMAJY7V34jlTbzfXRNuYcEc3E4hFXr2aME,3221
+pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
 pycoze/bot/agent/agent.py,sha256=Aue8nWeW_I7e1jo4o7cUjFFjrsV9NtVUiTX3EQYHmbA,3507
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
-pycoze/bot/agent/chat.py,sha256=_gjdzlBUFCkvmNh-6nYoaOLcmhujcW-Vva6rbixWCb4,702
+pycoze/bot/agent/chat.py,sha256=07WZEbre5LibRCuoFel7fWGQ9Yc7YFUrSuOWF9YkT24,746
 pycoze/bot/agent/agent_types/__init__.py,sha256=zmU2Kmrv5mCdfg-QlPn2H6pWxbGeq8s7YTqLhpzJC6k,179
 pycoze/bot/agent/agent_types/const.py,sha256=BfUKPrhAHREoMLHuFNG2bCIEkC1-f7K0LEqNg4RwiRE,70
 pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=SnEm5MODHn2uMsaMNqgzULM_91vqLHC0TU6ovwCOqLU,6675
@@ -23,8 +23,8 @@ pycoze/ui/ui_def.py,sha256=UhhU_yB3GV9ISbvTWT48hsHPHI250BhMILh6bu5Uioo,4206
 pycoze/utils/__init__.py,sha256=ET0W5wzq4zlY3dr1wHVbbeRKlKdC_zqHt9b0jZyHohw,94
 pycoze/utils/arg.py,sha256=orLVEGw3x2f3l7bZDbBPkkdDPSdqXo-_Rs-4ZhzmrEw,984
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.161.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.161.dist-info/METADATA,sha256=-6Wvyq5tBGXKanIppP-0yKZOZamz7429lkcBO-r6MAQ,726
-pycoze-0.1.161.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.161.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.161.dist-info/RECORD,,
+pycoze-0.1.163.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.163.dist-info/METADATA,sha256=4cOMkFtdFTivaZgSqRzEJk7jIWhhiZo40bIFn75C-wY,726
+pycoze-0.1.163.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.163.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.163.dist-info/RECORD,,