pycoze 0.1.316__py3-none-any.whl → 0.1.334__py3-none-any.whl

pycoze/bot/chat.py

@@ -17,11 +17,11 @@ async def check_interrupt_file(interval, interrupt_file, chat_task):
             break
 
 
-async def run_with_interrupt_check(conversation_history, user_input, cwd: str, abilities, bot_setting, interrupt_file):
+async def run_with_interrupt_check(conversation_history, user_input, cwd: str, abilities, bot_setting, has_any_tool, interrupt_file):
     clear_chat_data()
     try:
         chat_task = asyncio.create_task(
-            handle_user_inputs(conversation_history, user_input, cwd, abilities, bot_setting)
+            handle_user_inputs(conversation_history, user_input, cwd, abilities, bot_setting, has_any_tool)
         )
         check_task = asyncio.create_task(
             check_interrupt_file(0.5, interrupt_file, chat_task)
@@ -52,10 +52,11 @@ def chat(bot_setting_file: str):
         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": get_system_prompt(abilities, bot_setting),
+            "content": system_prompt,
         }
     ]
     while True:
@@ -69,12 +70,12 @@ def chat(bot_setting_file: str):
         if "interruptFile" in params:
             asyncio.run(
                 run_with_interrupt_check(
-                    conversation_history, user_input, cwd, abilities, bot_setting, params["interruptFile"]
+                    conversation_history, user_input, cwd, abilities, bot_setting, has_any_tool, params["interruptFile"]
                 )
             )
         else:
             asyncio.run(
-                handle_user_inputs(conversation_history, user_input, cwd, abilities, bot_setting)
+                handle_user_inputs(conversation_history, user_input, cwd, abilities, bot_setting, has_any_tool)
             )
 
         output("assistant", CHAT_DATA["info"])

pycoze/bot/chat_base.py

@@ -145,7 +145,7 @@ 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, bot_setting):
+async def handle_user_inputs(conversation_history, user_input, cwd, abilities, bot_setting, has_any_tool):
     no_exit_if_incomplete = bot_setting["systemAbility"]['no_exit_if_incomplete']
     programmer_mode = bot_setting["systemAbility"]['programmer_mode']
 
@@ -174,7 +174,7 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, b
             conversation_history, start_new_stream
         ):
             if len(response) == 2:
-                if response[0] == "text" and response[1].strip() != "":
+                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]}
                     )

pycoze/bot/lib.py

@@ -68,28 +68,38 @@ def get_system_prompt(abilities, bot_setting):
 
 
     abilities_str = "\n".join([function_to_string(a) for a in abilities])
+
     context = {
         "prompt": bot_setting["prompt"],
         "system": system,
         "cd_prompt": cd_prompt,
         "abilities_str": abilities_str,
-        "programmer_mode": True,
-        "no_exit_if_incomplete": True,
-        "allow_read_file": True,
-        "allow_read_multiple_files": True,
-        "allow_execute_command": True,
-        "allow_write_or_overwrite_file": True,
-        "allow_replace_part_of_a_file": True,
-        "allow_search_files": True,
-        "allow_list_files": True,
-        "allow_access_webpage": True,
-        
+        "programmer_mode": False,
+        "no_exit_if_incomplete": False,
+        "allow_read_file": False,
+        "allow_read_multiple_files": False,
+        "allow_execute_command": False,
+        "allow_write_or_overwrite_file": False,
+        "allow_replace_part_of_a_file": False,
+        "allow_search_files": False,
+        "allow_list_files": False,
+        "allow_access_webpage": False,
     }
 
     context.update(bot_setting["systemAbility"])
+    
+    has_any_tool = False
+    if len(abilities) > 0:
+        has_any_tool = True
+    for key in bot_setting["systemAbility"]:
+        if key != "programmer_mode" and bot_setting["systemAbility"][key] == True:
+            has_any_tool = True
+            break
+            
+    context["has_any_tool"] = has_any_tool
     system_prompt = template.render(context)
 
-    return system_prompt
+    return system_prompt, has_any_tool
 
 
 def resolve_relative_path(cwd:str, path_str: str) -> str:

pycoze/bot/prompt.md

@@ -1,5 +1,6 @@
 {{ prompt }}
 
+{% if has_any_tool %}
 ==== Tool Usage
 You have access to a set of tools running on the {{ system }} system that are executed upon user approval. Only one tool can be used per message, and you will receive the result of the tool's execution in the user's response. You progressively use these tools to accomplish tasks, with each tool's usage being based on the outcome of the previous tool.
 
@@ -17,6 +18,7 @@ Here's the translation in English:
   }
 }
 ```
+{% endif %}
 
 {% if allow_read_file %}
 For example:

pycoze/bot/tools.py

@@ -10,6 +10,7 @@ from pycoze.api import window, web
 import traceback
 
 
+
 class InvalidToolError(Exception):
     """无效工具错误"""
 
@@ -45,7 +46,7 @@ class ExecuteCommandTool(Tool):
                     "confirm",
                     f"Do you want to execute the command{self.params['command']}? ",
                 )
-                if approve.strip().lower().startswith("n"):
+                if not approve:
                     return "User does not wish to run the command."
             result = subprocess.run(
                 self.params["command"],
@@ -267,6 +268,7 @@ class ToolExecutor:
                 try:
                     result = func(**params)
                 except Exception as e:
+                    print("Execute tool error:", traceback.format_exc())
                     return False, traceback.format_exc()
                 return True, str(result)
             else:

pycoze/reference/lib.py

@@ -1,10 +1,42 @@
 import os
 import sys
 import importlib
-import types
 import functools
+import inspect
+import asyncio
+import nest_asyncio
 
+# 应用 nest_asyncio 补丁，以允许在已经运行的事件循环中再次运行事件循环
+nest_asyncio.apply() 
 
+def call_func(func, args=None, kwargs=None):
+    if args is None:
+        args = ()
+    if kwargs is None:
+        kwargs = {}
+
+    if inspect.isgeneratorfunction(func):
+        return list(func(*args, **kwargs))
+    elif inspect.iscoroutinefunction(func):
+        coro = func(*args, **kwargs) if inspect.iscoroutinefunction(func) else func
+        try:
+            # 尝试获取当前运行的事件循环
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            # 如果没有运行的事件循环，使用 asyncio.run()
+            return asyncio.run(coro)
+        else:
+            # 如果事件循环已经在运行，直接调度协程并等待结果
+            async def run_coro():
+                return await coro
+            # 在当前事件循环中调度任务并等待完成
+            future = asyncio.ensure_future(run_coro())
+            while not future.done():
+                loop.run_until_complete(asyncio.sleep(0.1))  # 避免阻塞
+            return future.result()
+    else:
+        return func(*args, **kwargs)
+    
 class ChangeDirectoryAndPath:
     """Context manager to change the current working directory and sys.path."""
 
@@ -19,7 +51,8 @@ class ChangeDirectoryAndPath:
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
-        sys.path.remove(self.module_path)
+        if self.module_path in sys.path:
+            sys.path.remove(self.module_path)
         os.chdir(self.old_path)
         
 
@@ -57,16 +90,16 @@ def wrapped_func(func, module_path):
         except:
             print(f"called unknown")
         with ChangeDirectoryAndPath(module_path):
-            result = func(*args, **kwargs)
-        try:
-            if isinstance(result, types.GeneratorType):
-                result = list(result)
-            print(f"{func.__name__} 调用完毕,结果为:", result)
-        except:
-            pass
+            try:
+                result = call_func(func, args, kwargs)
+            except Exception as e:
+                print(f"调用 {func.__name__} 时发生错误: {str(e)}")
+                raise
+        
+        print(f"{func.__name__} 调用完毕,结果为:", result)
+
         return result
     
     wrapped_function = functools.wraps(func)(_wrapped)
     return wrapped_function
 
-

{pycoze-0.1.316.dist-info → pycoze-0.1.334.dist-info}/METADATA

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

{pycoze-0.1.316.dist-info → pycoze-0.1.334.dist-info}/RECORD

@@ -12,15 +12,15 @@ 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=cYMXFe0hgN0CTcI5BiUtte2eTZwgYLKq1vBDQ-eqB5c,3246
-pycoze/bot/chat_base.py,sha256=czmOKUum3Rwo4lAOJtfslxaF8RKauWzj26s_WMmQa48,9180
-pycoze/bot/lib.py,sha256=IIihXPODCbM29TlxS0lhm2Fw3GWm2MzUeAn9LGa86lg,6889
+pycoze/bot/chat.py,sha256=ts2Qr7IZGyTFlnIccG8m04H7c8Yr1xtjPgzmjeQUzo4,3351
+pycoze/bot/chat_base.py,sha256=H6zLxblMbyDLsf5T13YYCoEfLl__axw67PbfM0vnYbg,9242
+pycoze/bot/lib.py,sha256=smigeWuhl8esHE-Y5l_9bpjJkEJ5OqrxTyPcO8JIubM,7224
 pycoze/bot/message.py,sha256=Zq-_k8HztBMOUIs3hbOvWvwHBNopn4UJJBliCROIGcc,718
-pycoze/bot/prompt.md,sha256=ehjdvZ-se9NaH0OSiDEvrFE9kvdj9MTZlWZUTxPY780,15743
-pycoze/bot/tools.py,sha256=987hUTy-kZfTwUUd3WStPhNUPkOIGCVm-JWL3Qh70pg,9648
+pycoze/bot/prompt.md,sha256=XHP8EdtzmnlMbM0xTe5GKnjAIFq7KauUARiNly2atz4,15777
+pycoze/bot/tools.py,sha256=j8l0sXEPn_yjTllHcmYEr_auVDuOicXdDco4bhZVIIA,9694
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
-pycoze/reference/lib.py,sha256=6jvowP2LqjyV21ppRhmtxHxnQJHCbHmlpbj9btV2RQ4,2191
+pycoze/reference/lib.py,sha256=ixiexCA6XWAda_G2ZVDSbFqTJmbkTvYLN47-nc5zyFU,3530
 pycoze/reference/tool.py,sha256=h7G3KSoZYWq5IJu6E0-shIQ3XiJeJsgSM85GxEnhF98,1107
 pycoze/reference/workflow.py,sha256=whQtw_FAxvlSbjow1oNFLdytPjjRs_pDBbQmNjaX6zc,1340
 pycoze/ui/__init__.py,sha256=uaXet23wUk64TcZjpBX8qOx4aUhwA_ucrmcxy7Q4Qr4,929
@@ -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.316.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.316.dist-info/METADATA,sha256=-Shyz80jC19pUcPlpYDC8TkkDYCmsYeOnQpNYxnEp7U,854
-pycoze-0.1.316.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.316.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.316.dist-info/RECORD,,
+pycoze-0.1.334.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.334.dist-info/METADATA,sha256=3ILPNMNEHtM9bWi3C9mmZvzCxaa0kxmz3_QGewzOUbk,854
+pycoze-0.1.334.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.334.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.334.dist-info/RECORD,,