pycoze 0.1.212__py3-none-any.whl → 0.1.213__py3-none-any.whl

pycoze/bot/agent_chat.py

@@ -1,12 +1,13 @@
 import json
 from langchain_openai import ChatOpenAI
-from .agent import run_agent, Runnable, output
+from .agent import run_agent, Runnable, output, CHAT_DATA, clear_chat_data
 import asyncio
 from pycoze import utils
 from pycoze.reference.bot import ref_bot
 from pycoze.reference.tool import ref_tools
 from pycoze.reference.workflow import ref_workflow
 from langchain_core.utils.function_calling import convert_to_openai_tool
+import os
 
 cfg = utils.read_json_file("llm.json")
 
@@ -34,6 +35,36 @@ def load_abilities(bot_setting_file: str):
     return abilities
 
 
+async def check_interrupt_file(interval, interrupt_file,agent_task):
+    while True:
+        await asyncio.sleep(interval)
+        if os.path.exists(interrupt_file):
+            os.remove(interrupt_file)
+            agent_task.cancel()
+            break 
+        
+async def run_with_interrupt_check(agent, history, tool_compatibility_mode, interrupt_file, check_interval=1):
+    clear_chat_data()
+    try:
+        agent_task = asyncio.create_task(run_agent(agent, history, tool_compatibility_mode))
+        check_task = asyncio.create_task(check_interrupt_file(check_interval, interrupt_file, agent_task))
+        result = await agent_task
+        return result
+    except asyncio.CancelledError:
+        return CHAT_DATA['info']
+    except Exception as e:
+        import traceback
+        print(traceback.format_exc())
+        return None  # 返回 None 或者处理异常后的结果
+    finally:
+        # 确保即使发生异常也会取消检查任务
+        if not check_task.done():
+            check_task.cancel()
+            try:
+                await check_task
+            except asyncio.CancelledError:
+                pass  # 忽略取消错误
+
 async def agent_chat(bot_setting_file, history):
     role_setting = load_role_setting(bot_setting_file)
     abilities = load_abilities(bot_setting_file)
@@ -77,9 +108,11 @@ async def agent_chat(bot_setting_file, history):
         assistant_message=prompt,
         tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
-    try:
+    params = utils.read_params_file()
+    if "interruptFile" in params:
+        interrupt_file_path = params["interruptFile"]
+        result = await run_with_interrupt_check(agent, history, cfg["toolCompatibilityMode"], interrupt_file_path)
+    else:
         result = await run_agent(agent, history, cfg["toolCompatibilityMode"])
-        return result
-    except KeyboardInterrupt:
-        return CHAT_DATA["info"]
-        
+    return result
+

pycoze/bot/bot.py

@@ -1,39 +1,24 @@
 from langchain_core.messages import HumanMessage, AIMessage
 import threading
-import queue
 import json
 from .agent import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
 from .agent_chat import agent_chat
 import asyncio
 
-class PeekableQueue(queue.Queue):
-    def peek(self):
-        try:
-            return self._get()
-        except queue.Empty:
-            return None
-
 
 def chat(bot_setting_file: str):
     history = []
     while True:
-        try:
-            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 = asyncio.run(agent_chat(bot_setting_file, history))
-            history.append(AIMessage(result))
-        except KeyboardInterrupt:
-            pass
-            
-
-
+        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 = asyncio.run(agent_chat(bot_setting_file, history))
+        output("assistant", result)
+        history.append(AIMessage(result))
 
 
 def get_chat_response(bot_setting_file: str, input_text: str):
-    history = [HumanMessage(input_text)]
-    clear_chat_data()
-    asyncio.run(agent_chat(bot_setting_file, history))
-    return CHAT_DATA["output"]
+    result = asyncio.run(agent_chat(bot_setting_file, [HumanMessage(input_text)]))
+    return result

{pycoze-0.1.212.dist-info → pycoze-0.1.213.dist-info}/METADATA

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

{pycoze-0.1.212.dist-info → pycoze-0.1.213.dist-info}/RECORD

@@ -5,8 +5,8 @@ pycoze/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 pycoze/automation/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/automation/browser/edge_driver_manager.py,sha256=gpgseunph5owZH6EskSYthuhey2SU3UP204gY0yIcuI,3022
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/agent_chat.py,sha256=4J-y7lSM2ULQQYIUB0L4i94m0KyeB4Gdf2U3zhVMOG4,3033
-pycoze/bot/bot.py,sha256=mD5Zb-rTvRyyIECvdcHrxwAlzuzWaNv6lt_bbQ6xyGc,1160
+pycoze/bot/agent_chat.py,sha256=uukxrfzyOyGTymhTA3u0o4JdDUoKPDUfPN0LE5VWdKY,4432
+pycoze/bot/bot.py,sha256=fmcgnWcYTFeOxDuAwqWhFhOJzv4mAyJGLqbod-nkhJE,862
 pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
 pycoze/bot/agent/agent.py,sha256=chUgNZh6v6375L_Y2dBEAaLJyfmw4SygYjVVrDN8VIk,3548
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
@@ -28,8 +28,8 @@ pycoze/utils/__init__.py,sha256=Gi5EnrWZGMD2JRejgV4c_VLCXyvA2wwBFI_niDF5MUE,110
 pycoze/utils/arg.py,sha256=GtfGbMTMdaK75Fwh6MpUe1pCA5X6Ep4LFG7a72YrzjI,525
 pycoze/utils/env.py,sha256=W04lhvTHhAAC6EldP6kk2xrctqtu8K6kl1vDLZDNeh8,561
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.212.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.212.dist-info/METADATA,sha256=XXM2_xITLKg9LfaKv5JIrQmJlmSNXh2YCHNiyeycjoY,726
-pycoze-0.1.212.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.212.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.212.dist-info/RECORD,,
+pycoze-0.1.213.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.213.dist-info/METADATA,sha256=ri60xG0hbqLctzLvRq_r8PSdP87pcOcuWds0DVeIcQ0,726
+pycoze-0.1.213.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.213.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.213.dist-info/RECORD,,