pycoze 0.1.152__tar.gz → 0.1.154__tar.gz

{pycoze-0.1.152 → pycoze-0.1.154}/PKG-INFO

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

{pycoze-0.1.152 → pycoze-0.1.154}/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):
+def agent_chat(bot_setting_file, history, result_queue):
     role_setting = load_role_setting(bot_setting_file)
     abilities = load_abilities(bot_setting_file)
 
@@ -75,4 +75,5 @@ def agent_chat(bot_setting_file, history):
         assistant_message=prompt,
         tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
-    return asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"]))
+    result = asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"]))
+    result_queue.put(result_queue)

pycoze-0.1.154/pycoze/bot/bot.py

@@ -0,0 +1,30 @@
+from langchain_core.messages import HumanMessage
+from .agent import INPUT_MESSAGE, output
+from .agent_chat import agent_chat
+import json
+import queue
+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"]))
+        result_queue = queue.Queue()
+        agent_chat_thread = threading.Thread(target=agent_chat, args=(bot_setting_file, history, result_queue))
+        agent_chat_thread.start()
+        agent_chat_thread.join()
+        result = result_queue.get()
+        history.append(output("assistant", result))
+
+
+
+def get_chat_response(bot_setting_file: str, input_text: str):
+    history = [HumanMessage(input_text)]
+    result_queue = queue.Queue()
+    result = agent_chat(bot_setting_file, history, result_queue)
+    return result

{pycoze-0.1.152 → pycoze-0.1.154}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.152 → pycoze-0.1.154}/setup.py

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

pycoze-0.1.152/pycoze/bot/bot.py

@@ -1,40 +0,0 @@
-from langchain_core.messages import HumanMessage
-from .agent import INPUT_MESSAGE, output
-from .agent_chat import agent_chat
-import json
-import threading
-
-
-def chat(bot_setting_file: str):
-    history = []
-    stop_event = threading.Event()
-
-    def user_input_listener():
-        while not stop_event.is_set():
-            input_text = input()
-            if input_text:
-                stop_event.set()
-                if not input_text.startswith(INPUT_MESSAGE):
-                    raise ValueError("Invalid message")
-                message = json.loads(input_text[len(INPUT_MESSAGE):])
-                history.append(HumanMessage(message["content"]))
-                # 中断当前的机器人输出
-                print("User interrupted the bot.")
-                # 重新开始对话
-                chat(bot_setting_file)
-
-    input_thread = threading.Thread(target=user_input_listener)
-    input_thread.start()
-
-    while not stop_event.is_set():
-        result = agent_chat(bot_setting_file, history)
-        history.append(output("assistant", result))
-        print(result)  # 输出机器人回复
-
-    input_thread.join()
-
-
-def get_chat_response(bot_setting_file: str, input_text: str):
-    history = [HumanMessage(input_text)]
-    result = agent_chat(bot_setting_file, history)
-    return result