pycoze 0.1.340__py3-none-any.whl → 0.1.342__py3-none-any.whl

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

@@ -7,10 +7,13 @@ from .tools import ToolExecutor
 from typing import List
 
 
-def guess_files_in_message(cwd:str, user_message: str) -> List[str]:
+def guess_files_in_message(cwd: str, user_message: str) -> List[str]:
 
-    value = extract({"includedFiles": ['relative path format', 'relative path format', '...']}, 
-                    'Please find the files mentioned in the text. If none, return {"includedFiles": []}:\n' + user_message)
+    value = extract(
+        {"includedFiles": ["relative path format", "relative path format", "..."]},
+        'Please find the files mentioned in the text. If none, return {"includedFiles": []}:\n'
+        + user_message,
+    )
     return [resolve_relative_path(cwd, p) for p in value["includedFiles"]]
 
 
@@ -25,9 +28,15 @@ def user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode
             if os.path.isfile(file_path):
                 file_marker = f"[[{file_path}]]'"
                 file_content = read_local_file(file_path)
-                if not any(file_marker in msg["content"] for msg in conversation_history):
+                if not any(
+                    file_marker in msg["content"] for msg in conversation_history
+                ):
                     content.append(f"{file_marker}\n{file_content}")
-        content_str = "Partial contents of files are as follows:" + "\n".join(content) if content else ""
+        content_str = (
+            "Partial contents of files are as follows:" + "\n".join(content)
+            if content
+            else ""
+        )
         return f"""
 <task>
 {user_input}
@@ -145,9 +154,11 @@ async def stream_openai_response(conversation_history, start_new_stream):
                 yield ("text", text_content.strip())
 
 
-async def handle_user_inputs(conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting):
-    no_exit_if_incomplete = bot_setting["systemAbility"]['no_exit_if_incomplete']
-    programmer_mode = bot_setting["systemAbility"]['programmer_mode']
+async def handle_user_inputs(
+    conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting
+):
+    no_exit_if_incomplete = bot_setting["systemAbility"]["no_exit_if_incomplete"]
+    programmer_mode = bot_setting["systemAbility"]["programmer_mode"]
 
     start_new_stream = {
         "value": False
@@ -160,7 +171,9 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, h
     conversation_history.append(
         {
             "role": "user",
-            "content": user_task_prompt(conversation_history, cwd, user_input, programmer_mode),
+            "content": user_task_prompt(
+                conversation_history, cwd, user_input, programmer_mode
+            ),
         }
     )
     need_break = False
@@ -174,7 +187,11 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, h
             conversation_history, start_new_stream
         ):
             if len(response) == 2:
-                if response[0] == "text" and response[1].strip() != "" or (response[0] == "json" and not has_any_tool):
+                if (
+                    response[0] == "text"
+                    and response[1].strip() != ""
+                    or (response[0] == "json" and not has_any_tool)
+                ):
                     conversation_history.append(
                         {"role": "assistant", "content": response[1]}
                     )
@@ -206,7 +223,9 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, h
                         )
                         continue
 
-                    ok, is_json_dumps, result = ToolExecutor.execute_tool(cwd, tool_request, abilities)
+                    ok, is_json_dumps, result = ToolExecutor.execute_tool(
+                        cwd, tool_request, abilities
+                    )
                     if ok:
                         info("assistant", "✅\n")
                     else:
@@ -218,13 +237,14 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, h
                         + result
                     )
                     if is_json_dumps:
-                        info("assistant", "```json\n" + result + "\n```\n\n")
+                        info("assistant", "\n```json\n" + result + "\n```\n\n")
                     else:
-                        info("assistant", "```text\n" + result + "\n```\n\n")
+                        info("assistant", "\n```text\n" + result + "\n```\n\n")
                     conversation_history.append(
                         {"role": "assistant", "content": assistant_content}
                     )
-                    if tool_name in ["complete_all_tasks", 'ask_follow_up_question']:
+                    if tool_name in ["complete_all_tasks", "ask_follow_up_question"]:
+                        print("need_break", need_break)
                         need_break = True
                         break
                     else:

{pycoze-0.1.340.dist-info → pycoze-0.1.342.dist-info}/METADATA

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

{pycoze-0.1.340.dist-info → pycoze-0.1.342.dist-info}/RECORD

@@ -12,8 +12,8 @@ pycoze/api/lib/view.py,sha256=_PIpTfeuTPPlMDKshMGsqFQYMq7ZiO4Hg5XwHwDoU60,7357
 pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
 pycoze/api/lib/window.py,sha256=bTkQCzQZ7i3pYXB70bUSTBNJ9C4TW_X3yMae1VkquGk,1944
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
-pycoze/bot/chat.py,sha256=s12X8iOZa8MK-5VUd9JfzIA-gLxY80FJfphcfEx3b_s,3414
-pycoze/bot/chat_base.py,sha256=7x1PhprjImWfzItm-1r3pwJyPEvXaQv8OKfqCPUwodw,9403
+pycoze/bot/chat.py,sha256=DB0fUb4B0EVRWWEavCzIa-cSXOpiZrxIusJnQYGPKG8,3765
+pycoze/bot/chat_base.py,sha256=d7rsp_E1woC8UFBsqPExicNfwMHAB0e50vsodL8ISGA,9722
 pycoze/bot/lib.py,sha256=smigeWuhl8esHE-Y5l_9bpjJkEJ5OqrxTyPcO8JIubM,7224
 pycoze/bot/message.py,sha256=Zq-_k8HztBMOUIs3hbOvWvwHBNopn4UJJBliCROIGcc,718
 pycoze/bot/prompt.md,sha256=OBxwUY6yiwEmusnUHhwixWYByrWX3BpwfxG_Gfas8UM,15783
@@ -33,8 +33,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.340.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.340.dist-info/METADATA,sha256=kLgmkro5V7i3b8aqOjUUmVG0moAiUX8TVKcp3r_OXIU,755
-pycoze-0.1.340.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-pycoze-0.1.340.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.340.dist-info/RECORD,,
+pycoze-0.1.342.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.342.dist-info/METADATA,sha256=n0QSg_AqHoz9DnUvyQOYb6qErvMiKX1lcq4mAWjLfwo,755
+pycoze-0.1.342.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+pycoze-0.1.342.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.342.dist-info/RECORD,,