pycoze 0.1.332__tar.gz → 0.1.334__tar.gz

{pycoze-0.1.332 → pycoze-0.1.334}/PKG-INFO

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

{pycoze-0.1.332 → pycoze-0.1.334}/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-0.1.332 → pycoze-0.1.334}/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-0.1.332 → pycoze-0.1.334}/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-0.1.332 → pycoze-0.1.334}/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-0.1.332 → pycoze-0.1.334}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.332 → pycoze-0.1.334}/setup.py

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