pycoze 0.1.414__py3-none-any.whl → 0.1.416__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -112,7 +112,7 @@ async def stream_openai_response(conversation_history, start_new_stream):
         # 使用 async for 迭代异步生成器
         try:
             async for chunk in stream:
-
+                print("chunk", chunk)
                 # 检查是否需要重新创建流
                 if start_new_stream["value"]:
                     break  # 退出当前的 async for 循环，进入下一次 while 循环
@@ -166,35 +166,26 @@ async def stream_openai_response(conversation_history, start_new_stream):
             print(f"Error: {e}", style="bold red")
             break
     
+    print("end", "buffer", buffer, "in_json_block", in_json_block, "json_block_content", json_block_content, "text_content", text_content )
+    # 处理 buffer 中剩余的内容
     if buffer:
         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())
-
-    # # 处理 buffer 中剩余的内容
-    # if buffer:
-    #     if in_json_block:
-    #         buffer = buffer.split("```")[0]
-    #         json_block_content += buffer
-    #     else:
-    #         text_content += buffer
-
-    # # 处理流结束后的剩余内容
-    # 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())
+
+    # 处理流结束后的剩余内容
+    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())
 
 
 

{pycoze-0.1.414.dist-info → pycoze-0.1.416.dist-info}/METADATA

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

{pycoze-0.1.414.dist-info → pycoze-0.1.416.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=phnMuOtLnJu_dUhPIVaTAZY_c-QOD1lpcqKTnBZtkHs,12268
+pycoze/bot/chat_base.py,sha256=9AWH1MBiEAELFmnP7zPKc3m1kgKWJEu4gxXFde8yEdY,12096
 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.414.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.414.dist-info/METADATA,sha256=b42DjPhoGoljdHRCoP7EQ0KyUCgGEYoi1T_F001GDhk,854
-pycoze-0.1.414.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.414.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.414.dist-info/RECORD,,
+pycoze-0.1.416.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.416.dist-info/METADATA,sha256=IoflAIvrdJ27SpOcatLivmdUS3xK8fssZcTuFSTkt4w,854
+pycoze-0.1.416.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.416.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.416.dist-info/RECORD,,