pycoze 0.1.156__py3-none-any.whl → 0.1.158__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, output
+from .chat import INPUT_MESSAGE,  CHAT_DATA, clear_chat_data, output, info
 
 __all__ = [run_agent, Runnable, INPUT_MESSAGE, output]

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/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/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/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.dist-info → pycoze-0.1.158.dist-info}/METADATA

@@ -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.dist-info → pycoze-0.1.158.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=JxSlfOmpI3bOxY3MVRqjmq7xhoAsMG-G6JdWdA8_Tqg,2854
-pycoze/bot/bot.py,sha256=89q2kUlPjg8nbM3ZQqrhw2fHQQCPzCKIWvSfygDiaDU,1045
-pycoze/bot/agent/__init__.py,sha256=YR9vpkEQn1e4937r_xFPJXUCPBEJ0SFzEQDBe2x3-YA,157
-pycoze/bot/agent/agent.py,sha256=Aue8nWeW_I7e1jo4o7cUjFFjrsV9NtVUiTX3EQYHmbA,3507
+pycoze/bot/agent_chat.py,sha256=7duMif9tz5ewZJgbHsg8oGKY4vtiDUZ9MGtVQsY_HRw,2851
+pycoze/bot/bot.py,sha256=VJHKnJnI8Fi5AFO_luLDpDwLI7dEu1ShgGd2Wb3nTl0,984
+pycoze/bot/agent/__init__.py,sha256=FG5TAjc-P-yk2bS_lSyM-znvHLc5m_KkQHWbyCDiogI,192
+pycoze/bot/agent/agent.py,sha256=vZx7ljQuslyugcQATDYvTlRA23rQj1Bo3hfj2EvW71k,3508
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
-pycoze/bot/agent/chat.py,sha256=kc0qgcrBSXdiMy49JwThZTV-0PAvzAhiUvbI5ILiSnU,571
+pycoze/bot/agent/chat.py,sha256=qI4nLW1JDFl-dQXAtIPuopOGkrUIp-YMFtDa7m0qpm4,733
 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.156.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.156.dist-info/METADATA,sha256=vXrAkQULX5VL1kC1skHNfqodUl8rhUSjoGoJ7x9bHK4,726
-pycoze-0.1.156.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.156.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.156.dist-info/RECORD,,
+pycoze-0.1.158.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.158.dist-info/METADATA,sha256=QLIBzNvK70MiZ-4oXM6S___uYBPUaVs15sWSqlcpdWg,726
+pycoze-0.1.158.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.158.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.158.dist-info/RECORD,,