pycoze 0.1.411__py3-none-any.whl → 0.1.413__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -5,6 +5,7 @@ from .message import info
 from pycoze.ai import chat_stream_async, extract
 from .tools import ToolExecutor
 from typing import List
+import re
 
 def guess_files_in_message(cwd: str, user_message: str) -> List[str]:
     try:
@@ -119,24 +120,43 @@ async def stream_openai_response(conversation_history, start_new_stream):
                 info("assistant", chunk)
                 buffer += chunk
 
-                # 处理 buffer 中的每一行
-                while "\n" in buffer:
-                    line, buffer = buffer.split("\n", 1)
+                # 处理 buffer 中的内容
+                while buffer:
+                    print("while buffer", buffer)
                     if not in_json_block:
-                        if line.strip().lower().startswith("```json"):
-                            if text_content:
+                        # 查找 JSON 代码块的起始标记
+                        json_start_match = re.search(r"```json", buffer, re.IGNORECASE)
+                        if json_start_match:
+                            # 提取 JSON 代码块之前的文本
+                            text_content += buffer[:json_start_match.start()]
+                            # 如果 text_content 不为空，先 yield 文本
+                            if text_content.strip():
+                                print("yield text", text_content.strip())
                                 yield ("text", text_content.strip())
                                 text_content = ""
+                            # 进入 JSON 代码块模式
                             in_json_block = True
+                            buffer = buffer[json_start_match.end():]
                         else:
-                            text_content += line + "\n"
+                            # 如果没有找到 JSON 代码块，继续累积到 text_content
+                            text_content += buffer
+                            buffer = ""
                     else:
-                        if line.strip().lower().startswith("```") and in_json_block:
+                        # 查找 JSON 代码块的结束标记
+                        json_end_match = re.search(r"```", buffer)
+                        if json_end_match:
+                            # 提取 JSON 代码块内容
+                            json_block_content += buffer[:json_end_match.start()]
+                            # yield JSON 代码块
+                            print("yield json", json_block_content.strip())
                             yield ("json", json_block_content.strip())
                             json_block_content = ""
                             in_json_block = False
+                            buffer = buffer[json_end_match.end():]
                         else:
-                            json_block_content += line + "\n"
+                            # 如果没有找到结束标记，继续累积 JSON 内容
+                            json_block_content += buffer
+                            buffer = ""
 
             # 如果流正常结束，退出 while 循环
             break
@@ -151,11 +171,21 @@ async def stream_openai_response(conversation_history, start_new_stream):
         if in_json_block:
             buffer = buffer.split("```")[0]
             json_block_content += buffer
-            yield ("json", json_block_content.strip())
         else:
             text_content += buffer
-            if text_content:
-                yield ("text", text_content.strip())
+
+    # 处理流结束后的剩余内容
+    if in_json_block:
+        # 如果仍在 JSON 代码块模式，处理剩余的 JSON 内容
+        if json_block_content.strip():
+            print("yield json", json_block_content.strip())
+            yield ("json", json_block_content.strip())
+    else:
+        # 如果不在 JSON 代码块模式，处理剩余的文本内容
+        if text_content.strip():
+            print("yield json", text_content.strip())
+            yield ("text", text_content.strip())
+
 
 
 async def handle_user_inputs(

{pycoze-0.1.411.dist-info → pycoze-0.1.413.dist-info}/METADATA

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

{pycoze-0.1.411.dist-info → pycoze-0.1.413.dist-info}/RECORD

@@ -12,7 +12,7 @@ pycoze/api/lib/window.py,sha256=dkzWfLwn5pE_L0DfQ38K8nx9tQyT5KO-GYyXi0rytFc,2073
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
 pycoze/bot/chat.py,sha256=qEuMxH0cVFU9QSU36FrOsjhRAxtsvOv7CQtuXvM3F6Y,6446
 pycoze/bot/chat_base copy.py,sha256=WZRB08zN4OeYAjSxccgu69Jb-k8tfbNwskqi5LmBF20,11979
-pycoze/bot/chat_base.py,sha256=yj9uyE6TcPWycNwAhldbrTdwMOazljTmqewU7UHyVQM,10315
+pycoze/bot/chat_base.py,sha256=AMcVMxCGT4N2BO9FMI22Ts82KxdeLkRTUD0T-ZtetEc,11915
 pycoze/bot/lib.py,sha256=_bQ52mKsWgFGAogFHnmRBJbvK_tPOwsAJ8NqJNMR5K4,7210
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
 pycoze/bot/prompt.md,sha256=t7NQdiiNe-jCDVfeVbvTPfq5WK5nF8CxFUQUFMyXJlo,13880
@@ -32,8 +32,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.411.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.411.dist-info/METADATA,sha256=oPl20z_YBtyyl4BNj_2TKExdlUDP4pAn-t-nX8t0CNE,854
-pycoze-0.1.411.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.411.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.411.dist-info/RECORD,,
+pycoze-0.1.413.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.413.dist-info/METADATA,sha256=pm_Vm50SG6OrA1ZZuSX3hrV28GkT8-mm9RlQuZ6flI4,854
+pycoze-0.1.413.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.413.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.413.dist-info/RECORD,,