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

pycoze/bot/agent/agent.py

@@ -1,7 +1,7 @@
 import asyncio
 import json
 from langchain_openai import ChatOpenAI
-from .chat import info
+from . import info
 from .assistant import Runnable
 from langchain_core.messages import (
     HumanMessage,
@@ -13,10 +13,13 @@ from langchain_core.agents import AgentFinish
 from .agent_types.const import HumanToolString
 
 
-async def run_agent(agent, inputs: list, tool_compatibility_mode:bool):
+async def run_agent(agent, inputs: list, tool_compatibility_mode: bool, should_exit):
     exist_ids = set()
     content_list = []
     async for event in agent.astream_events(inputs, version="v2"):
+        if should_exit.is_set():
+            break
+
         kind = event["event"]
         if kind == "on_chain_end":
             if "data" in event:
@@ -30,7 +33,7 @@ async def run_agent(agent, inputs: list, tool_compatibility_mode:bool):
                     for msg in input_list:
                         if isinstance(msg, HumanMessage) or isinstance(msg, SystemMessage):
                             if not tool_compatibility_mode or not msg.content.startswith(HumanToolString):
-                                content_list = [] # 防止内容重复
+                                content_list = []  # 防止内容重复
                         if isinstance(msg, AIMessage) and not isinstance(
                             msg, AIMessageChunk
                         ):
@@ -87,4 +90,4 @@ if __name__ == "__main__":
     )
 
     inputs = [HumanMessage(content="计算根号7+根号88")]
-    print(asyncio.run(run_agent(agent, inputs, True)))
+    print(asyncio.run(run_agent(agent, inputs, True, threading.Event())))

pycoze/bot/agent/chat.py

@@ -9,7 +9,7 @@ _INFOMATION_MESSAGE = "INFOMATION_MESSAGE=>"
 _LOG = "LOG=>"
 
 
-CHAT_DATA = {"output":"", "info":""}
+CHAT_DATA = {"output":""}
 
 
 def log(content, *args, end="\n", **kwargs):
@@ -17,7 +17,7 @@ def log(content, *args, end="\n", **kwargs):
 
 
 def clear_chat_data():
-    CHAT_DATA = {"output":"", "info":""}
+    CHAT_DATA = {"output":""}
 
 
 def output(role, content):
@@ -26,5 +26,4 @@ def output(role, content):
     print(_OUTPUT_MESSAGE + json.dumps({"role": role, "content": content}))
 
 def info(role, content):
-    CHAT_DATA["info"] += content
     print(_INFOMATION_MESSAGE + json.dumps({"role": role, "content": content}))

pycoze/bot/agent_chat.py

@@ -75,20 +75,5 @@ async def agent_chat(bot_setting_file, history, should_exit):
         assistant_message=prompt,
         tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
-    
-    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)
+    result = asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"], should_exit))
+    output("assistant", result)

pycoze/bot/bot.py

@@ -5,6 +5,7 @@ import json
 import threading
 import queue
 import time
+import asyncio
 
 
 class PeekableQueue(queue.Queue):
@@ -53,11 +54,9 @@ def chat(bot_setting_file: str):
                             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"]))
+                    history.append(AIMessage(content=CHAT_DATA["output"]))
                 except json.JSONDecodeError:
                     print("Invalid JSON format in input message.")
                 except KeyError:
@@ -72,11 +71,6 @@ def chat(bot_setting_file: str):
 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.163.dist-info → pycoze-0.1.165.dist-info}/METADATA

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

{pycoze-0.1.163.dist-info → pycoze-0.1.165.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=ZNSbXOmsAgd77DcDmhylMAbEFxZCM09kE8kPJ1uuvcY,3282
-pycoze/bot/bot.py,sha256=bKJgA3LyulMAJY7V34jlTbzfXRNuYcEc3E4hFXr2aME,3221
+pycoze/bot/agent_chat.py,sha256=QhhWIurzPVRp2hVakcn0aZH3EUotiWvn3rGKp_tNZuY,2883
+pycoze/bot/bot.py,sha256=2nNpSiO1petkTtKFV-wb8kG4SVCZq3XSLETNtzrN1sM,2942
 pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
-pycoze/bot/agent/agent.py,sha256=Aue8nWeW_I7e1jo4o7cUjFFjrsV9NtVUiTX3EQYHmbA,3507
+pycoze/bot/agent/agent.py,sha256=VvdnyVygU2S5tscAaZZl_VnhT9xN_XglmF4GnbkVD0c,3588
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
-pycoze/bot/agent/chat.py,sha256=07WZEbre5LibRCuoFel7fWGQ9Yc7YFUrSuOWF9YkT24,746
+pycoze/bot/agent/chat.py,sha256=fgsQGYXGSB_TO4iKfWMr85Rx3tqW4MFawid2dgcXrE4,691
 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.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,,
+pycoze-0.1.165.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.165.dist-info/METADATA,sha256=uLYu_9Z-lvv-qU3sMjPnK16p1n26JGTZMtJbuza_aPI,726
+pycoze-0.1.165.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.165.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.165.dist-info/RECORD,,