pycoze 0.1.404__py3-none-any.whl → 0.1.406__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -86,6 +86,8 @@ def dumps_markdown_json(data):
 
 
 
+import re
+
 import re
 
 async def stream_openai_response(conversation_history, start_new_stream):
@@ -128,6 +130,7 @@ async def stream_openai_response(conversation_history, start_new_stream):
                         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 = ""
@@ -135,7 +138,7 @@ async def stream_openai_response(conversation_history, start_new_stream):
                             in_json_block = True
                             buffer = buffer[json_start_match.end():]
                         else:
-                            # 如果没有找到 JSON 代码块，直接处理为普通文本
+                            # 如果没有找到 JSON 代码块，继续累积到 text_content
                             text_content += buffer
                             buffer = ""
                     else:
@@ -144,6 +147,7 @@ async def stream_openai_response(conversation_history, start_new_stream):
                         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
@@ -152,7 +156,6 @@ async def stream_openai_response(conversation_history, start_new_stream):
                             # 如果没有找到结束标记，继续累积 JSON 内容
                             json_block_content += buffer
                             buffer = ""
-                    print(".")
 
             # 如果流正常结束，退出 while 循环
             break
@@ -167,11 +170,18 @@ 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():
+            yield ("json", json_block_content.strip())
+    else:
+        # 如果不在 JSON 代码块模式，处理剩余的文本内容
+        if text_content.strip():
+            yield ("text", text_content.strip())
 
 
 async def handle_user_inputs(

{pycoze-0.1.404.dist-info → pycoze-0.1.406.dist-info}/METADATA

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

{pycoze-0.1.404.dist-info → pycoze-0.1.406.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=cqy36OdyZC0XmUwxEgRuU8IyL4-UUIgZSDn6RPOAJVM,11240
+pycoze/bot/chat_base.py,sha256=L98zX_OdhS3WBLgw64XzRFsQdgw6POc9TqldbZbiB9c,11611
 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.404.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.404.dist-info/METADATA,sha256=iaKPJtSWZKAZkFsWdGzAxa_sGHN0qNP8BJcSskdialo,854
-pycoze-0.1.404.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.404.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.404.dist-info/RECORD,,
+pycoze-0.1.406.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.406.dist-info/METADATA,sha256=2fM6sojGeWG_En2N0r81dQy2-mpaxdMXwoLUYxtlOjY,854
+pycoze-0.1.406.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.406.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.406.dist-info/RECORD,,