pycoze 0.1.341__tar.gz → 0.1.342__tar.gz

{pycoze-0.1.341 → pycoze-0.1.342}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.341
+Version: 0.1.342
 Summary: Package for pycoze only!
 Home-page: UNKNOWN
 Author: Yuan Jie Xiong

{pycoze-0.1.341 → pycoze-0.1.342}/pycoze/bot/chat.py

@@ -1,100 +1,130 @@
-import json
-from .chat_base import handle_user_inputs
-from .lib import get_abilities, get_system_prompt
-from .message import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
-import os
-import asyncio
-from pycoze import utils
-import tempfile
-
-
-async def check_interrupt_file(interval, interrupt_file, chat_task):
-    while True:
-        await asyncio.sleep(interval)
-        if os.path.exists(interrupt_file):
-            os.remove(interrupt_file)
-            chat_task.cancel()
-            break
-
-
-async def run_with_interrupt_check(conversation_history, user_input, cwd: str, abilities, has_any_tool, bot_setting, interrupt_file):
-    clear_chat_data()
-    try:
-        chat_task = asyncio.create_task(
-            handle_user_inputs(conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting)
-        )
-        check_task = asyncio.create_task(
-            check_interrupt_file(0.5, interrupt_file, chat_task)
-        )
-        result = await chat_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 chat_task.done():
-            chat_task.cancel()
-        # 确保即使发生异常也会取消检查任务
-        if not check_task.done():
-            check_task.cancel()
-            try:
-                await check_task
-            except asyncio.CancelledError:
-                pass  # 忽略取消错误
-
-
-def chat(bot_setting_file: str):
-    with open(bot_setting_file, encoding="utf-8") as f:
-        bot_setting = json.load(f)
-    abilities = get_abilities(bot_setting)
-    cwd = tempfile.mkdtemp()
-    system_prompt, has_any_tool = get_system_prompt(abilities, bot_setting)
-    conversation_history = [
-        {
-            "role": "system",
-            "content": system_prompt,
-        }
-    ]
-    while True:
-        clear_chat_data()
-        input_text = input()
-        if not input_text.startswith(INPUT_MESSAGE):
-            raise ValueError("Invalid message")
-        message = json.loads(input_text[len(INPUT_MESSAGE) :])
-        user_input = message["content"]
-        params = utils.params
-        if "interruptFile" in params:
-            asyncio.run(
-                run_with_interrupt_check(
-                    conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting, params["interruptFile"]
-                )
-            )
-        else:
-            asyncio.run(
-                handle_user_inputs(conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting)
-            )
-
-        output("assistant", CHAT_DATA["info"])
-
-
-def get_chat_response(bot_setting_file: str, user_input: str):
-    with open(bot_setting_file, encoding="utf-8") as f:
-        bot_setting = json.load(f)
-    abilities = get_abilities(bot_setting)
-    cwd = tempfile.mkdtemp()
-    system_prompt, has_any_tool = get_system_prompt(abilities, bot_setting)
-    conversation_history = [
-        {
-            "role": "system",
-            "content": system_prompt,
-        }
-    ]
-    asyncio.run(
-        handle_user_inputs(conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting)
-    )
-
-    return CHAT_DATA["info"]
+import json
+from .chat_base import handle_user_inputs
+from .lib import get_abilities, get_system_prompt
+from .message import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
+import os
+import asyncio
+from pycoze import utils
+import tempfile
+
+
+async def check_interrupt_file(interval, interrupt_file, chat_task):
+    while True:
+        await asyncio.sleep(interval)
+        if os.path.exists(interrupt_file):
+            os.remove(interrupt_file)
+            chat_task.cancel()
+            break
+
+
+async def run_with_interrupt_check(
+    conversation_history,
+    user_input,
+    cwd: str,
+    abilities,
+    has_any_tool,
+    bot_setting,
+    interrupt_file,
+):
+    clear_chat_data()
+    try:
+        chat_task = asyncio.create_task(
+            handle_user_inputs(
+                conversation_history,
+                user_input,
+                cwd,
+                abilities,
+                has_any_tool,
+                bot_setting,
+            )
+        )
+        check_task = asyncio.create_task(
+            check_interrupt_file(0.5, interrupt_file, chat_task)
+        )
+        result = await chat_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 chat_task.done():
+            chat_task.cancel()
+        # 确保即使发生异常也会取消检查任务
+        if not check_task.done():
+            check_task.cancel()
+            try:
+                await check_task
+            except asyncio.CancelledError:
+                pass  # 忽略取消错误
+
+
+def chat(bot_setting_file: str):
+    with open(bot_setting_file, encoding="utf-8") as f:
+        bot_setting = json.load(f)
+    abilities = get_abilities(bot_setting)
+    cwd = tempfile.mkdtemp()
+    system_prompt, has_any_tool = get_system_prompt(abilities, bot_setting)
+    conversation_history = [
+        {
+            "role": "system",
+            "content": system_prompt,
+        }
+    ]
+    while True:
+        clear_chat_data()
+        input_text = input()
+        if not input_text.startswith(INPUT_MESSAGE):
+            raise ValueError("Invalid message")
+        message = json.loads(input_text[len(INPUT_MESSAGE) :])
+        user_input = message["content"]
+        params = utils.params
+        if "interruptFile" in params:
+            asyncio.run(
+                run_with_interrupt_check(
+                    conversation_history,
+                    user_input,
+                    cwd,
+                    abilities,
+                    has_any_tool,
+                    bot_setting,
+                    params["interruptFile"],
+                )
+            )
+        else:
+            asyncio.run(
+                handle_user_inputs(
+                    conversation_history,
+                    user_input,
+                    cwd,
+                    abilities,
+                    has_any_tool,
+                    bot_setting,
+                )
+            )
+        print("has_output")
+        output("assistant", CHAT_DATA["info"])
+
+
+def get_chat_response(bot_setting_file: str, user_input: str):
+    with open(bot_setting_file, encoding="utf-8") as f:
+        bot_setting = json.load(f)
+    abilities = get_abilities(bot_setting)
+    cwd = tempfile.mkdtemp()
+    system_prompt, has_any_tool = get_system_prompt(abilities, bot_setting)
+    conversation_history = [
+        {
+            "role": "system",
+            "content": system_prompt,
+        }
+    ]
+    asyncio.run(
+        handle_user_inputs(
+            conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting
+        )
+    )
+
+    return CHAT_DATA["info"]

{pycoze-0.1.341 → pycoze-0.1.342}/pycoze.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.341
+Version: 0.1.342
 Summary: Package for pycoze only!
 Home-page: UNKNOWN
 Author: Yuan Jie Xiong

{pycoze-0.1.341 → pycoze-0.1.342}/setup.py

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