pycoze 0.1.156__tar.gz → 0.1.158__tar.gz

{pycoze-0.1.156 → pycoze-0.1.158}/PKG-INFO

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

{pycoze-0.1.156 → pycoze-0.1.158}/pycoze/bot/agent/__init__.py

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

{pycoze-0.1.156 → pycoze-0.1.158}/pycoze/bot/agent/agent.py

@@ -1,7 +1,7 @@
 import asyncio
 import json
 from langchain_openai import ChatOpenAI
-from .chat import info
+from ..chat import info
 from .assistant import Runnable
 from langchain_core.messages import (
     HumanMessage,

{pycoze-0.1.156 → pycoze-0.1.158}/pycoze/bot/agent/chat.py

@@ -8,15 +8,24 @@ _INFOMATION_MESSAGE = "INFOMATION_MESSAGE=>"
 _LOG = "LOG=>"
 
 
+CHAT_DATA = {output:"",info:""}
+
+
 def log(content, *args, end="\n", **kwargs):
     print(_LOG + content, *args, end=end, **kwargs)
 
 
+def clear_chat_data():
+    CHAT_DATA = {output:"",info:""}
+
+
 def output(role, content):
     assert role == "assistant"
     print(_OUTPUT_MESSAGE + json.dumps({"role": role, "content": content}))
+    CHAT_DATA["output"] = content
     return AIMessage(content=content)
 
 
 def info(role, content):
+    CHAT_DATA["info"] += content
     print(_INFOMATION_MESSAGE + json.dumps({"role": role, "content": content}))

{pycoze-0.1.156 → pycoze-0.1.158}/pycoze/bot/agent_chat.py

@@ -1,6 +1,6 @@
 import json
 from langchain_openai import ChatOpenAI
-from .agent import run_agent, Runnable
+from .agent import run_agent, Runnable, output
 import asyncio
 from pycoze import utils
 from pycoze.reference.bot import ref_bot
@@ -32,7 +32,7 @@ def load_abilities(bot_setting_file: str):
     return abilities
 
 
-def agent_chat(bot_setting_file, history, result_queue):
+def agent_chat(bot_setting_file, history):
     role_setting = load_role_setting(bot_setting_file)
     abilities = load_abilities(bot_setting_file)
 
@@ -76,4 +76,4 @@ def agent_chat(bot_setting_file, history, result_queue):
         tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
     result = asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"]))
-    result_queue.put(result)
+    output("assistant", result)

{pycoze-0.1.156 → pycoze-0.1.158}/pycoze/bot/bot.py

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

{pycoze-0.1.156 → pycoze-0.1.158}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.156 → pycoze-0.1.158}/setup.py

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