pycoze 0.1.402__py3-none-any.whl → 0.1.403__py3-none-any.whl

pycoze/ai/__init__.py

@@ -1,4 +1,3 @@
-from .vram_reserve import reserve_vram, reserve_vram_retry, unreserve_vram
 from .llm import (
     chat,
     chat_stream,
@@ -11,9 +10,6 @@ from .llm import (
 )
 
 __all__ = [
-    reserve_vram,
-    reserve_vram_retry,
-    unreserve_vram,
     chat,
     chat_stream,
     chat_async,

pycoze/bot/chat_base.py

@@ -86,6 +86,8 @@ def dumps_markdown_json(data):
 
 
 
+import re
+
 async def stream_openai_response(conversation_history, start_new_stream):
     """
     异步流式传输 OpenAI 聊天完成响应并处理结构化输出
@@ -118,24 +120,38 @@ async def stream_openai_response(conversation_history, start_new_stream):
                 if start_new_stream["value"]:
                     break  # 退出当前的 async for 循环，进入下一次 while 循环
 
-                # 处理 buffer 中的每一行
-                while "\n" in buffer:
-                    line, buffer = buffer.split("\n", 1)
+                # 处理 buffer 中的内容
+                while buffer:
                     if not in_json_block:
-                        if line.strip().lower().startswith("```json"):
-                            if text_content:
+                        # 查找 JSON 代码块的起始标记
+                        json_start_match = re.search(r"```json", buffer, re.IGNORECASE)
+                        if json_start_match:
+                            # 提取 JSON 代码块之前的文本
+                            text_content += buffer[:json_start_match.start()]
+                            if text_content.strip():
                                 yield ("text", text_content.strip())
                                 text_content = ""
+                            # 进入 JSON 代码块模式
                             in_json_block = True
+                            buffer = buffer[json_start_match.end():]
                         else:
-                            text_content += line + "\n"
+                            # 如果没有找到 JSON 代码块，直接处理为普通文本
+                            text_content += buffer
+                            buffer = ""
                     else:
-                        if line.strip().lower().startswith("```") and in_json_block:
+                        # 查找 JSON 代码块的结束标记
+                        json_end_match = re.search(r"```", buffer)
+                        if json_end_match:
+                            # 提取 JSON 代码块内容
+                            json_block_content += buffer[:json_end_match.start()]
                             yield ("json", json_block_content.strip())
                             json_block_content = ""
                             in_json_block = False
+                            buffer = buffer[json_end_match.end():]
                         else:
-                            json_block_content += line + "\n"
+                            # 如果没有找到结束标记，继续累积 JSON 内容
+                            json_block_content += buffer
+                            buffer = ""
 
             # 如果流正常结束，退出 while 循环
             break

{pycoze-0.1.402.dist-info → pycoze-0.1.403.dist-info}/METADATA

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

{pycoze-0.1.402.dist-info → pycoze-0.1.403.dist-info}/RECORD

@@ -1,6 +1,5 @@
 pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycoze/ai/__init__.py,sha256=_LAz1Ris-ygOiy3treJNKvIMAhu4N-x3DvHSFUleuU8,449
-pycoze/ai/vram_reserve.py,sha256=DRxKzqf89fLAts0DzU8e19z9kecIF8OdMkQnJlCKZV0,4244
+pycoze/ai/__init__.py,sha256=e8cRzp4bLXILIUVtOPqwpiV-szD2eKtaWIodYIuw-7s,312
 pycoze/ai/llm/__init__.py,sha256=7qmligvCSneLx5AFCjKYfGURIiI4KlB4hE19SxIr-Xk,342
 pycoze/ai/llm/chat.py,sha256=sQZT0ImvRW81fXdlKG0ZrHdDB8g5M4iudaWdG4Kpd6Q,6373
 pycoze/ai/llm/text_to_image_prompt.py,sha256=0bx2C_YRvjAo7iphHGp1-pmGKsKqwur7dM0t3SiA8kA,3398
@@ -12,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=u2TDvXwtxcboXq8zixck1A6HHgQ1kDEMXFMON--fBLM,10314
+pycoze/bot/chat_base.py,sha256=d9obNsYR0RRSILGy0m2lrKKzSJzy_NFI0fvjkxDyVkw,11209
 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 +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.402.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.402.dist-info/METADATA,sha256=ReBq_5ocEdh84y3vmkNUZQcoa40KcOqm_opFFSm37kw,854
-pycoze-0.1.402.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.402.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.402.dist-info/RECORD,,
+pycoze-0.1.403.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.403.dist-info/METADATA,sha256=oPdn1ujLGfPS5rhAADa_mOOngNcVlVybdrZwDVAsO4A,854
+pycoze-0.1.403.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.403.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.403.dist-info/RECORD,,

pycoze/ai/vram_reserve.py

@@ -1,144 +0,0 @@
-import subprocess
-import sqlite3
-import atexit
-import time
-import os
-import psutil
-import sys
-from pycoze import utils
-
-# 定义数据库连接和初始化
-params = utils.params
-if params:
-    DATABASE_PATH = params["appPath"] + "/vram_usage.db"
-else:
-    DATABASE_DIR = os.path.expanduser("~/pycoze")
-    os.makedirs(DATABASE_DIR, exist_ok=True)
-    DATABASE_PATH = os.path.join(DATABASE_DIR, "vram_usage.db")
-
-TABLE_NAME = "vram_usage"
-
-
-def initialize_db():
-    conn = sqlite3.connect(DATABASE_PATH)
-    cursor = conn.cursor()
-    cursor.execute(
-        f"""
-        CREATE TABLE IF NOT EXISTS {TABLE_NAME} (
-            id INTEGER PRIMARY KEY,
-            uid TEXT NOT NULL,
-            reserved_gb REAL NOT NULL
-        )
-    """
-    )
-    conn.commit()
-    conn.close()
-
-
-def get_vram_resources():
-    try:
-        # 使用nvidia-smi命令获取VRAM信息
-        result = subprocess.run(
-            ["nvidia-smi", "--query-gpu=memory.total", "--format=csv,noheader,nounits"],
-            stdout=subprocess.PIPE,
-            text=True,
-        )
-        total_memory_list = result.stdout.strip().split("\n")
-        total_memory = 0
-        for mem in total_memory_list:
-            try:
-                total_memory += float(mem)
-            except:
-                pass
-        return round(total_memory / 1024, 2)
-    except Exception as e:
-        print(f"Error getting VRAM resources: {e}")
-        return 0.0
-
-
-def reserve_vram(gb, uid=None):
-    if uid is None:
-        uid = f"pid:{os.getpid()}"
-    with sqlite3.connect(DATABASE_PATH) as conn:
-        cursor = conn.cursor()
-        cursor.execute(f"SELECT SUM(reserved_gb) FROM {TABLE_NAME}")
-        total_reserved = cursor.fetchone()[0]
-        if total_reserved is None:
-            total_reserved = 0.0
-        available_gb = get_vram_resources() - total_reserved
-        if available_gb >= gb:
-            cursor.execute(
-                f"INSERT INTO {TABLE_NAME} (uid, reserved_gb) VALUES (?, ?)",
-                (uid, gb),
-            )
-            conn.commit()
-            print(f"预留成功，剩余VRAM大小: {available_gb - gb} GB")
-            return True
-        else:
-            print(f"预留失败，剩余VRAM大小: {available_gb} GB")
-            return False
-
-
-def reserve_vram_retry(gb, retry=None, uid=None):
-    if retry is None:
-        # 接近无限重试，python中允许无限大的整数，尽管sys.maxsize不是真正的无限大，但足够大
-        retry = sys.maxsize
-    for i in range(retry):
-        time.sleep(1)
-        if i % 10 == 0 or i < 10 and i != 0:
-            print(f"重试第{i}次")
-        if reserve_vram(gb, uid):
-            return True
-    return False
-
-
-def unreserve_vram(uid=None):
-    if uid is None:
-        uid = f"pid:{os.getpid()}"
-    with sqlite3.connect(DATABASE_PATH) as conn:
-        cursor = conn.cursor()
-        cursor.execute(f"DELETE FROM {TABLE_NAME} WHERE uid = ?", (uid,))
-        conn.commit()
-
-
-# 注册退出时的清理函数
-def cleanup():
-    unreserve_vram()
-
-
-def initialize_and_check():
-    initialize_db()
-    with sqlite3.connect(DATABASE_PATH) as conn:
-        cursor = conn.cursor()
-        cursor.execute(f"SELECT uid, reserved_gb FROM {TABLE_NAME}")
-        rows = cursor.fetchall()
-        for row in rows:
-            uid, reserved_gb = row
-            try:
-                # 检查进程是否存在
-                if uid.startswith("pid:"):
-                    pid = int(uid.split(":")[1])
-                    psutil.Process(pid)
-            except psutil.NoSuchProcess:
-                # 进程不存在，删除对应的记录
-                cursor.execute(f"DELETE FROM {TABLE_NAME} WHERE uid = ?", (uid,))
-                print(f"进程 {uid} 不存在，已删除对应的预留记录")
-        conn.commit()
-
-
-# 在模块加载时执行初始化检查
-initialize_and_check()
-
-# 注册清理函数
-atexit.register(cleanup)
-
-if __name__ == "__main__":
-    if reserve_vram_retry(5):
-        print("(1)VRAM资源预留成功")
-        if reserve_vram_retry(5):
-            print("(2)VRAM资源预留成功")
-            time.sleep(100)
-            release_vram()
-            print("VRAM资源释放成功")
-    else:
-        print("VRAM资源不足，无法预留")