pycoze 0.1.404__tar.gz → 0.1.405__tar.gz

{pycoze-0.1.404 → pycoze-0.1.405}/PKG-INFO

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

{pycoze-0.1.404 → pycoze-0.1.405}/pycoze/bot/chat_base.py

@@ -128,6 +128,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 +136,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 +145,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 +154,6 @@ async def stream_openai_response(conversation_history, start_new_stream):
                             # 如果没有找到结束标记，继续累积 JSON 内容
                             json_block_content += buffer
                             buffer = ""
-                    print(".")
 
             # 如果流正常结束，退出 while 循环
             break
@@ -162,16 +163,15 @@ async def stream_openai_response(conversation_history, start_new_stream):
             print(f"Error: {e}", style="bold red")
             break
 
-    # 处理 buffer 中剩余的内容
-    if buffer:
-        if in_json_block:
-            buffer = buffer.split("```")[0]
-            json_block_content += buffer
+    # 处理流结束后的剩余内容
+    if in_json_block:
+        # 如果仍在 JSON 代码块模式，处理剩余的 JSON 内容
+        if json_block_content.strip():
             yield ("json", json_block_content.strip())
-        else:
-            text_content += buffer
-            if text_content:
-                yield ("text", text_content.strip())
+    else:
+        # 如果不在 JSON 代码块模式，处理剩余的文本内容
+        if text_content.strip():
+            yield ("text", text_content.strip())
 
 
 async def handle_user_inputs(

{pycoze-0.1.404 → pycoze-0.1.405}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.404 → pycoze-0.1.405}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pycoze",
-    version="0.1.404",
+    version="0.1.405",
     packages=find_packages(),
     install_requires=[],
     author="Yuan Jie Xiong",