pycoze 0.1.212__tar.gz → 0.1.214__tar.gz

{pycoze-0.1.212 → pycoze-0.1.214}/PKG-INFO

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

{pycoze-0.1.212 → pycoze-0.1.214}/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-0.1.214/pycoze/bot/bot.py

@@ -0,0 +1,24 @@
+from langchain_core.messages import HumanMessage, AIMessage
+import threading
+import json
+from .agent import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
+from .agent_chat import agent_chat
+import asyncio
+
+
+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 = 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):
+    result = asyncio.run(agent_chat(bot_setting_file, [HumanMessage(input_text)]))
+    return result

{pycoze-0.1.212 → pycoze-0.1.214}/pycoze/ui/ui_def.py

@@ -184,3 +184,16 @@ def multi_video_select(
 
 def seed(name, default=0, tip="", hide_if="", style="", cls="") -> int:
     return useDefault(name, default)
+
+
+
+_cache_button_ui = get_ui()
+def button( name, tip="", hide_if="")->bool:
+    value = useDefault(name, -1)
+    if value is None: #value==None只会发生在在首次打开UI，后续每次运行都不会进入这里
+        value = _cache_button_ui[name]
+    if value != _cache_button_ui[name]:
+        _cache_button_ui[name] = value  # 更新last_value的值
+        return True
+    return False
+    

{pycoze-0.1.212 → pycoze-0.1.214}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.212 → pycoze-0.1.214}/setup.py

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

pycoze-0.1.212/pycoze/bot/bot.py

@@ -1,39 +0,0 @@
-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
-            
-
-
-
-
-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"]