pycoze 0.1.458__py3-none-any.whl → 0.1.460__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -107,7 +107,7 @@ class BufferProcessor:
         """
         if not self.in_json_block:
             # 查找 JSON 代码块的起始标记
-            json_start_match = re.search(r"```json\n", self.buffer, re.IGNORECASE)
+            json_start_match = re.search(r"```json", self.buffer, re.IGNORECASE)
             if json_start_match:
                 # 提取 JSON 代码块之前的文本
                 self.text_content += self.buffer[:json_start_match.start()]
@@ -126,7 +126,7 @@ class BufferProcessor:
                 self.buffer = ""
         else:
             # 查找 JSON 代码块的结束标记
-            json_end_match = re.search(r"```\n", self.buffer)
+            json_end_match = re.search(r"```", self.buffer)
             if json_end_match:
                 # 提取 JSON 代码块内容
                 self.json_block_content += self.buffer[:json_end_match.start()]
@@ -196,7 +196,6 @@ async def stream_openai_response(conversation_history, start_new_stream):
                 
                 if buffer_processor.can_process():
                     result = buffer_processor.process_buffer()
-                    print("result", result)
                     if result:
                         yield result
 
@@ -300,12 +299,8 @@ async def handle_user_inputs(
                         cwd, tool_request, abilities
                     )
                     
-                    assistant_content = (
-                        dumps_markdown_json(tool_request)
-                        + "\n\n[Tool Result Begin]\n"
-                        + result
-                        + "\n[Tool Result End]\n"
-                    )
+                    assistant_content = dumps_markdown_json(tool_request)
+                    
                     lang = "json" if is_json_dumps else "text"
                     
                     if show_tool_results:
@@ -315,6 +310,9 @@ async def handle_user_inputs(
                     conversation_history.append(
                         {"role": "assistant", "content": assistant_content}
                     )
+                    conversation_history.append(
+                        {"role": "system", "content": "[Tool Result Begin]\n"+ result+ "\n[Tool Result End]"}
+                    )
                     if tool_name in ["complete_all_tasks", "ask_follow_up_question"]:
                         need_break = True
                         break

{pycoze-0.1.458.dist-info → pycoze-0.1.460.dist-info}/METADATA

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

{pycoze-0.1.458.dist-info → pycoze-0.1.460.dist-info}/RECORD

@@ -11,7 +11,7 @@ pycoze/api/lib/web.py,sha256=4HaOV_zYHq6-SSQQIc_O7REnC1asIlXIELxee-pU6zc,2421
 pycoze/api/lib/window.py,sha256=ZZacqnX0fvZUnLUhNVjbbjhBcKkYdi_6E0LswLp1MqM,2071
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
 pycoze/bot/chat.py,sha256=bScsMc0hGh2NlvhQxzWEbnA_WXU9JdAJv-rx27SpEB8,6554
-pycoze/bot/chat_base.py,sha256=drF1VBBngaCWavpp42rrolYjUw-e4ToHxGf7ceestWg,12645
+pycoze/bot/chat_base.py,sha256=cSBLnH7MaLqqgz_5bzxXsqCJAywEJAxkWpK6jiBH8d4,12614
 pycoze/bot/lib.py,sha256=WU4h3B7SG7vh9p9BxhtPlaJ7TkU9VsL3HyCn9hKhWOo,7753
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
 pycoze/bot/prompt.md,sha256=UtwZ31wFvNtvM9ZTA4BU2yT1Rb-qnUdU3Ny1O37Tt3Q,14077
@@ -33,8 +33,8 @@ pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/process.py,sha256=U2MURGmxfyWBqdbKfy5UvyV17M40B6HHlNELgWfgrTE,3824
 pycoze/utils/socket.py,sha256=4Wm4LlwdWXC_kAV0NnZbUc0Y3Kc6KRMyFRqSw79u-9w,2468
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.458.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.458.dist-info/METADATA,sha256=Ac4uU3jGJkYgeQBo9oig9E9U4GgFpKMZFDfD3Verd2I,854
-pycoze-0.1.458.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.458.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.458.dist-info/RECORD,,
+pycoze-0.1.460.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.460.dist-info/METADATA,sha256=k0nSJOjN5MTfJzoKsgbl1hWeuOgO1fd8tPrA3hAKoUg,854
+pycoze-0.1.460.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.460.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.460.dist-info/RECORD,,