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

pycoze/bot/chat_base.py

@@ -87,15 +87,86 @@ def dumps_markdown_json(data):
 
 
 
+class BufferProcessor:
+    def __init__(self):
+        self.buffer = ""
+        self.in_json_block = False
+        self.json_block_content = ""
+        self.text_content = ""
+
+    def process_buffer(self):
+        """
+        处理 buffer 中的内容，并返回生成的内容类型和内容。
+        返回格式为 (type, content)，其中 type 可以是 "text" 或 "json"。
+        """
+        results = []
+        while self.buffer:
+            if not self.in_json_block:
+                # 查找 JSON 代码块的起始标记
+                json_start_match = re.search(r"```json", self.buffer, re.IGNORECASE)
+                if json_start_match:
+                    # 提取 JSON 代码块之前的文本
+                    self.text_content += self.buffer[:json_start_match.start()]
+                    # 如果 text_content 不为空，先 yield 文本
+                    if self.text_content.strip():
+                        results.append(("text", self.text_content.strip()))
+                        self.text_content = ""
+                    # 进入 JSON 代码块模式
+                    self.in_json_block = True
+                    self.buffer = self.buffer[json_start_match.end():]
+                else:
+                    # 如果没有找到 JSON 代码块，继续累积到 text_content
+                    self.text_content += self.buffer
+                    self.buffer = ""
+            else:
+                # 查找 JSON 代码块的结束标记
+                json_end_match = re.search(r"```", self.buffer)
+                if json_end_match:
+                    # 提取 JSON 代码块内容
+                    self.json_block_content += self.buffer[:json_end_match.start()]
+                    # yield JSON 代码块
+                    results.append(("json", self.json_block_content.strip()))
+                    self.json_block_content = ""
+                    self.in_json_block = False
+                    self.buffer = self.buffer[json_end_match.end():]
+                else:
+                    # 如果没有找到结束标记，继续累积 JSON 内容
+                    self.json_block_content += self.buffer
+                    self.buffer = ""
+        return results
+
+    def finalize(self):
+        """
+        处理流结束后的剩余内容。
+        返回格式为 (type, content)，其中 type 可以是 "text" 或 "json"。
+        """
+        results = []
+        if self.in_json_block:
+            # 如果仍在 JSON 代码块模式，处理剩余的 JSON 内容
+            if self.json_block_content.strip():
+                results.append(("json", self.json_block_content.strip()))
+        else:
+            # 如果不在 JSON 代码块模式，处理剩余的文本内容
+            if self.text_content.strip():
+                results.append(("text", self.text_content.strip()))
+        return results
+
+    def reset(self):
+        """
+        重置 buffer 处理器的状态。
+        """
+        self.buffer = ""
+        self.in_json_block = False
+        self.json_block_content = ""
+        self.text_content = ""
+
+
 async def stream_openai_response(conversation_history, start_new_stream):
     """
     异步流式传输 OpenAI 聊天完成响应并处理结构化输出
     """
     stream = None
-    buffer = ""
-    in_json_block = False
-    json_block_content = ""
-    text_content = ""
+    buffer_processor = BufferProcessor()
 
     while True:
         # 检查是否需要重新创建流
@@ -104,10 +175,7 @@ async def stream_openai_response(conversation_history, start_new_stream):
                 await stream.aclose()  # 关闭之前的流
             stream = chat_stream_async(conversation_history)  # 获取新的异步生成器
             start_new_stream["value"] = False  # 重置标志
-            buffer = ""
-            in_json_block = False
-            json_block_content = ""
-            text_content = ""
+            buffer_processor.reset()
 
         # 使用 async for 迭代异步生成器
         try:
@@ -117,44 +185,11 @@ async def stream_openai_response(conversation_history, start_new_stream):
                     break  # 退出当前的 async for 循环，进入下一次 while 循环
 
                 info("assistant", chunk)
-                buffer += chunk
+                buffer_processor.buffer += chunk
 
-                if "\n" not in chunk: # 行为基本的处理单位
-                    continue
-                # 处理 buffer 中的内容
-                while 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 代码块的结束标记
-                        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 "\n" in chunk:
+                    for result in buffer_processor.process_buffer():
+                        yield result
 
             # 如果流正常结束，退出 while 循环
             break
@@ -163,50 +198,10 @@ async def stream_openai_response(conversation_history, start_new_stream):
             # 捕获其他异常（如网络错误）
             print(f"Error: {e}", style="bold red")
             break
-    
-    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 代码块的结束标记
-            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 内容
-        if json_block_content.strip():
-            yield ("json", json_block_content.strip())
-    else:
-        # 如果不在 JSON 代码块模式，处理剩余的文本内容
-        if text_content.strip():
-            yield ("text", text_content.strip())
+    for result in buffer_processor.finalize():
+        yield result
 
 
 

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

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

{pycoze-0.1.423.dist-info → pycoze-0.1.425.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=ezA8zTnA5lDhymA3mm2Hu3gRWj7Lg-wks_TsmjRgBb4,12993
+pycoze/bot/chat_base.py,sha256=_yAzwngBqEmgDmF8mV44gms6-MkDlu4HeboqGZole2w,12267
 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.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,,
+pycoze-0.1.425.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.425.dist-info/METADATA,sha256=r4rZ7Vt1KvP4uPnYTtdMX2h8XU2GLNqLNUEzNivUMQI,854
+pycoze-0.1.425.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.425.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.425.dist-info/RECORD,,