pycoze 0.1.422__py3-none-any.whl → 0.1.423__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -164,38 +164,40 @@ async def stream_openai_response(conversation_history, start_new_stream):
             print(f"Error: {e}", style="bold red")
             break
     
-    if not in_json_block:
-        # 查找 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():
-                yield ("text", text_content.strip())
-                text_content = ""
-            # 进入 JSON 代码块模式
-            in_json_block = True
-            buffer = buffer[json_start_match.end():]
+    if buffer:
+        if not in_json_block:
+            # 查找 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():
+                    yield ("text", text_content.strip())
+                    text_content = ""
+                # 进入 JSON 代码块模式
+                in_json_block = True
+                buffer = buffer[json_start_match.end():]
+            else:
+                # 如果没有找到 JSON 代码块，继续累积到 text_content
+                text_content += buffer
+                buffer = ""
         else:
-            # 如果没有找到 JSON 代码块，继续累积到 text_content
-            text_content += buffer
-            buffer = ""
-    else:
-        # 查找 JSON 代码块的结束标记
-        json_end_match = re.search(r"```", buffer)
-        if json_end_match:
-            # 提取 JSON 代码块内容
-            json_block_content += buffer[:json_end_match.start()]
-            # yield JSON 代码块
-            yield ("json", json_block_content.strip())
-            json_block_content = ""
-            in_json_block = False
-            buffer = buffer[json_end_match.end():]
-        else:
-            # 如果没有找到结束标记，继续累积 JSON 内容
-            json_block_content += buffer
-            buffer = ""
+            # 查找 JSON 代码块的结束标记
+            json_end_match = re.search(r"```", buffer)
+            if json_end_match:
+                # 提取 JSON 代码块内容
+                json_block_content += buffer[:json_end_match.start()]
+                # yield JSON 代码块
+                yield ("json", json_block_content.strip())
+                json_block_content = ""
+                in_json_block = False
+                buffer = buffer[json_end_match.end():]
+            else:
+                # 如果没有找到结束标记，继续累积 JSON 内容
+                json_block_content += buffer
+                buffer = ""
+    
     # 处理流结束后的剩余内容
     if in_json_block:
         # 如果仍在 JSON 代码块模式，处理剩余的 JSON 内容

{pycoze-0.1.422.dist-info → pycoze-0.1.423.dist-info}/METADATA

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

{pycoze-0.1.422.dist-info → pycoze-0.1.423.dist-info}/RECORD

@@ -11,7 +11,7 @@ pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
 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.py,sha256=A68wiakJxlCjVSZxAPLpk0xdQg62_0T8Xf7gbT-R490,12845
+pycoze/bot/chat_base.py,sha256=ezA8zTnA5lDhymA3mm2Hu3gRWj7Lg-wks_TsmjRgBb4,12993
 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
@@ -31,8 +31,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.422.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.422.dist-info/METADATA,sha256=nc-lEVVpD_stwUoyiE6DDyOoSaBueNJP4DcdG7Q233g,854
-pycoze-0.1.422.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.422.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.422.dist-info/RECORD,,
+pycoze-0.1.423.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.423.dist-info/METADATA,sha256=oE3uAJ3Xa-psi-4qdE88527WUbAHt5KjbJ5WUWZ929I,854
+pycoze-0.1.423.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.423.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.423.dist-info/RECORD,,