pycoze 0.1.333__py3-none-any.whl → 0.1.335__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, 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, bot_setting)
+            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)
@@ -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, has_any_tool, bot_setting, 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, has_any_tool, bot_setting)
             )
 
         output("assistant", CHAT_DATA["info"])
@@ -85,14 +86,15 @@ def get_chat_response(bot_setting_file: str, user_input: 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,
         }
     ]
     asyncio.run(
-        handle_user_inputs(conversation_history, user_input, cwd, abilities, bot_setting)
+        handle_user_inputs(conversation_history, user_input, cwd, abilities, has_any_tool, bot_setting)
     )
 
     return 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, has_any_tool, bot_setting):
     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

@@ -99,7 +99,7 @@ def get_system_prompt(abilities, bot_setting):
     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.333.dist-info → pycoze-0.1.335.dist-info}/METADATA

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

{pycoze-0.1.333.dist-info → pycoze-0.1.335.dist-info}/RECORD

@@ -12,9 +12,9 @@ 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=ldT9zEXzAVr3XUGs965LHD8R-SO5C4jbytj6nPnYoL8,7210
+pycoze/bot/chat.py,sha256=s12X8iOZa8MK-5VUd9JfzIA-gLxY80FJfphcfEx3b_s,3414
+pycoze/bot/chat_base.py,sha256=yPskzKHBdbTiNB2E-FUZfTHdxgDxwYa-AeF2cSh6Ids,9242
+pycoze/bot/lib.py,sha256=smigeWuhl8esHE-Y5l_9bpjJkEJ5OqrxTyPcO8JIubM,7224
 pycoze/bot/message.py,sha256=Zq-_k8HztBMOUIs3hbOvWvwHBNopn4UJJBliCROIGcc,718
 pycoze/bot/prompt.md,sha256=XHP8EdtzmnlMbM0xTe5GKnjAIFq7KauUARiNly2atz4,15777
 pycoze/bot/tools.py,sha256=j8l0sXEPn_yjTllHcmYEr_auVDuOicXdDco4bhZVIIA,9694
@@ -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.333.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.333.dist-info/METADATA,sha256=-uEQHEdXURdiEaD_eWQmILs9_yZsvBgzMfIW9Wbotjc,854
-pycoze-0.1.333.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.333.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.333.dist-info/RECORD,,
+pycoze-0.1.335.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.335.dist-info/METADATA,sha256=KZRVSeVzkAJS2p1s4Zu385igwaArfwRH1oKe1BWyWeA,854
+pycoze-0.1.335.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.335.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.335.dist-info/RECORD,,