pycoze 0.1.161__tar.gz → 0.1.163__tar.gz

{pycoze-0.1.161 → pycoze-0.1.163}/PKG-INFO

@@ -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.163/pycoze/bot/agent/__init__.py

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

{pycoze-0.1.161 → pycoze-0.1.163}/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-0.1.161 → pycoze-0.1.163}/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-0.1.163/pycoze/bot/bot.py

@@ -0,0 +1,82 @@
+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 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 = []
+    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()
+    
+    # 为每个线程创建一个独立的退出标志
+    should_exit = threading.Event()
+    
+    # 使用 asyncio.run 来运行异步函数，并等待其完成
+    asyncio.run(agent_chat(bot_setting_file, history, should_exit))
+    
+    return CHAT_DATA["output"]

{pycoze-0.1.161 → pycoze-0.1.163}/pycoze.egg-info/PKG-INFO

@@ -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 → pycoze-0.1.163}/setup.py

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

pycoze-0.1.161/pycoze/bot/agent/__init__.py

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

pycoze-0.1.161/pycoze/bot/bot.py

@@ -1,27 +0,0 @@
-from langchain_core.messages import HumanMessage, AIMessage
-from .agent import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
-from .agent_chat import agent_chat
-import json
-import threading
-
-
-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"]))
-
-
-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"]