pycoze 0.1.152__py3-none-any.whl → 0.1.153__py3-none-any.whl

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/bot/bot.py

@@ -1,40 +1,29 @@
-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
+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))
+
+        result = agent_chat(bot_setting_file, history)
+        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.dist-info → pycoze-0.1.153.dist-info}/METADATA

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

{pycoze-0.1.152.dist-info → pycoze-0.1.153.dist-info}/RECORD

@@ -2,8 +2,8 @@ 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=Ey45GpBHmzILsMee-iXc90mpiQK3VAm_gomd1tSScOI,2808
-pycoze/bot/bot.py,sha256=kQrq5Inx6IQr14V00-KyHKWPyNPdJ32-LTt1ylbShp0,1313
+pycoze/bot/agent_chat.py,sha256=QtACf0MizZVv6PTzDreuZzQ6ktjddzqI3gAcZSwfWfs,2860
+pycoze/bot/bot.py,sha256=8lznSqBzEW6SROEdJ7wrIOA4z3zy1AUu3YyQYNSf1uw,994
 pycoze/bot/agent/__init__.py,sha256=YR9vpkEQn1e4937r_xFPJXUCPBEJ0SFzEQDBe2x3-YA,157
 pycoze/bot/agent/agent.py,sha256=Aue8nWeW_I7e1jo4o7cUjFFjrsV9NtVUiTX3EQYHmbA,3507
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
@@ -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.152.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.152.dist-info/METADATA,sha256=GABqnA8bFV7XDdbDRhfBZ5PdekFZQcxaV7cHqw-Re_o,726
-pycoze-0.1.152.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.152.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.152.dist-info/RECORD,,
+pycoze-0.1.153.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.153.dist-info/METADATA,sha256=7d3MikxtIkiLp7GUSyEPpMd5-WgkqEouJX6deGCPLiQ,726
+pycoze-0.1.153.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.153.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.153.dist-info/RECORD,,