pycoze 0.1.74__tar.gz → 0.1.76__tar.gz

{pycoze-0.1.74 → pycoze-0.1.76}/PKG-INFO

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

pycoze-0.1.76/pycoze/ai/__init__.py

@@ -0,0 +1 @@
+from .vram_reserve import reserve_vram_retry, release_vram, reserve_vram

pycoze-0.1.76/pycoze/ai/comfyui.py

@@ -0,0 +1,33 @@
+from .vram_reserve import reserve_vram_retry, release_vram
+
+
+class ComfyUI:
+    def __init__(self, file_path):
+        self.file_path = file_path
+
+    def load(self):
+        reserve_vram_retry(20)  # 20GB VRAM
+        with open(self.file_path, "r") as file:
+            return file.read()
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        clear_memory()
+        return None
+
+    def unload(self):
+        clear_memory()
+        return None
+
+
+def clear_memory():
+    import requests
+    import json
+
+    release_vram()
+
+    url = "http://127.0.0.1:8188/free"
+    data = {"unload_models": True, "free_memory": False}
+    response = requests.post(
+        url, data=json.dumps(data), headers={"Content-Type": "application/json"}
+    )
+    return response.status_code, response.text

pycoze-0.1.74/pycoze/gpu/gpu_reserve.py → pycoze-0.1.76/pycoze/ai/vram_reserve.py

@@ -12,14 +12,14 @@ try:
     # 定义数据库连接和初始化
     params = utils.arg.read_params_file()
     if params:
-        DATABASE_PATH = params["appPath"] + "/gpu_usage.db"
+        DATABASE_PATH = params["appPath"] + "/vram_usage.db"
     else:
         raise Exception("No params")
 except:
     DATABASE_DIR = os.path.expanduser("~/pycoze")
     os.makedirs(DATABASE_DIR, exist_ok=True)
-    DATABASE_PATH = os.path.join(DATABASE_DIR, "gpu_usage.db")
-TABLE_NAME = "gpu_usage"
+    DATABASE_PATH = os.path.join(DATABASE_DIR, "vram_usage.db")
+TABLE_NAME = "vram_usage"
 
 
 def initialize_db():
@@ -29,7 +29,7 @@ def initialize_db():
         f"""
         CREATE TABLE IF NOT EXISTS {TABLE_NAME} (
             id INTEGER PRIMARY KEY,
-            process_id TEXT NOT NULL,
+            uid TEXT NOT NULL,
             reserved_gb REAL NOT NULL
         )
     """
@@ -38,19 +38,23 @@ def initialize_db():
     conn.close()
 
 
-# 检测GPU资源
-def get_gpu_resources():
+def get_vram_resources():
     try:
-        # 使用nvidia-smi命令获取GPU信息
+        # 使用nvidia-smi命令获取VRAM信息
         result = subprocess.run(
             ["nvidia-smi", "--query-gpu=memory.free", "--format=csv,noheader,nounits"],
             stdout=subprocess.PIPE,
             text=True,
         )
         free_memory = result.stdout.strip().split("\n")
-        total_free_memory = sum(float(mem) for mem in free_memory)
+        total_free_memory = 0
+        for mem in free_memory:
+            try:
+                total_free_memory += float(mem)
+            except:
+                pass
 
-        # 获取正在使用GPU的进程信息
+        # 获取正在使用VRAM的进程信息
         process_result = subprocess.run(
             [
                 "nvidia-smi",
@@ -67,40 +71,44 @@ def get_gpu_resources():
         for process in process_info:
             pid, process_name, used_memory = process.split(", ")
             if "python" in process_name.lower():
-                python_memory_usage += float(used_memory)
-
+                try:
+                    python_memory_usage += float(used_memory)
+                except:
+                    pass
+        print("total_free_vram_memory: ", total_free_memory)
+        print("python_vram_memory_usage: ", python_memory_usage)
         # 计算排除python进程后的总空闲内存
         total_free_memory -= python_memory_usage
         return round(total_free_memory / 1024, 2)
     except Exception as e:
-        print(f"Error getting GPU resources: {e}")
+        print(f"Error getting VRAM resources: {e}")
         return 0.0
 
 
-# 预留GPU资源
-def reserve_gpu(gb):
-    process_id = str(os.getpid())
+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_gpu_resources() - total_reserved
+        available_gb = get_vram_resources() - total_reserved
         if available_gb >= gb:
             cursor.execute(
-                f"INSERT INTO {TABLE_NAME} (process_id, reserved_gb) VALUES (?, ?)",
-                (process_id, gb),
+                f"INSERT INTO {TABLE_NAME} (uid, reserved_gb) VALUES (?, ?)",
+                (uid, gb),
             )
             conn.commit()
-            print(f"预留成功，剩余GPU大小: {available_gb - gb} GB")
+            print(f"预留成功，剩余VRAM大小: {available_gb - gb} GB")
             return True
         else:
-            print(f"预留失败，剩余GPU大小: {available_gb} GB")
+            print(f"预留失败，剩余VRAM大小: {available_gb} GB")
             return False
 
 
-def reserve_gpu_retry(gb, retry=None):
+def reserve_vram_retry(gb, retry=None, uid=None):
     if retry is None:
         # 接近无限重试，python中允许无限大的整数，尽管sys.maxsize不是真正的无限大，但足够大
         retry = sys.maxsize
@@ -108,50 +116,50 @@ def reserve_gpu_retry(gb, retry=None):
         time.sleep(1)
         if i % 10 == 0 or i < 10:
             print(f"重试第{i}次")
-        if reserve_gpu(gb):
+        if reserve_vram(gb, uid):
             return True
     return False
 
 
-# 释放GPU资源
-def release_gpu():
-    process_id = str(os.getpid())
+def release_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 process_id = ?", (process_id,))
+        cursor.execute(f"DELETE FROM {TABLE_NAME} WHERE uid = ?", (uid,))
         conn.commit()
-        # 计算释放后的剩余GPU大小
+        # 计算释放后的剩余VRAM大小
         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_gpu_resources() - total_reserved
-        print(f"释放成功，剩余GPU大小: {available_gb} GB")
+        available_gb = get_vram_resources() - total_reserved
+        print(f"释放成功，剩余VRAM大小: {available_gb} GB")
 
 
 # 注册退出时的清理函数
 def cleanup():
-    release_gpu()
-    print("程序退出，GPU资源已释放")
+    release_vram()
+    print("程序退出，VRAM资源已释放")
 
 
 def initialize_and_check():
     initialize_db()
     with sqlite3.connect(DATABASE_PATH) as conn:
         cursor = conn.cursor()
-        cursor.execute(f"SELECT process_id, reserved_gb FROM {TABLE_NAME}")
+        cursor.execute(f"SELECT uid, reserved_gb FROM {TABLE_NAME}")
         rows = cursor.fetchall()
         for row in rows:
-            process_id, reserved_gb = row
+            uid, reserved_gb = row
             try:
                 # 检查进程是否存在
-                psutil.Process(int(process_id))
+                if uid.startswith("pid:"):
+                    pid = int(uid.split(":")[1])
+                    psutil.Process(pid)
             except psutil.NoSuchProcess:
                 # 进程不存在，删除对应的记录
-                cursor.execute(
-                    f"DELETE FROM {TABLE_NAME} WHERE process_id = ?", (process_id,)
-                )
-                print(f"进程 {process_id} 不存在，已删除对应的预留记录")
+                cursor.execute(f"DELETE FROM {TABLE_NAME} WHERE uid = ?", (uid,))
+                print(f"进程 {uid} 不存在，已删除对应的预留记录")
         conn.commit()
 
 
@@ -162,12 +170,12 @@ initialize_and_check()
 atexit.register(cleanup)
 
 if __name__ == "__main__":
-    if reserve_gpu_retry(5):
-        print("(1)GPU资源预留成功")
-        if reserve_gpu_retry(5):
-            print("(2)GPU资源预留成功")
+    if reserve_vram_retry(5):
+        print("(1)VRAM资源预留成功")
+        if reserve_vram_retry(5):
+            print("(2)VRAM资源预留成功")
             time.sleep(100)
-            release_gpu()
-            print("GPU资源释放成功")
+            release_vram()
+            print("VRAM资源释放成功")
     else:
-        print("GPU资源不足，无法预留")
+        print("VRAM资源不足，无法预留")

{pycoze-0.1.74 → pycoze-0.1.76}/pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -150,16 +150,21 @@ def create_openai_func_call_agent_executor(
         # We call the tool_executor and get back a response
         responses = await tool_executor.abatch(actions, **kwargs)
         # We use the response to create a ToolMessage
-        tool_messages = [
-            ToolMessage(
+        tool_messages = []
+        for tool_call, response in zip(
+            last_message.additional_kwargs["tool_calls"], responses
+        ):
+            if not isinstance(response, (str, int, float, bool, list, tuple)):
+                response = repr(
+                    response
+                )  # 不支持其他类型，包括dict也不支持，因此需要转换为字符串
+
+            message = ToolMessage(
                 tool_call_id=tool_call["id"],
                 content=response,
                 additional_kwargs={"name": tool_call["function"]["name"]},
             )
-            for tool_call, response in zip(
-                last_message.additional_kwargs["tool_calls"], responses
-            )
-        ]
+            tool_messages.append(message)
         return tool_messages
 
     workflow = MessageGraph()

{pycoze-0.1.74 → pycoze-0.1.76}/pycoze/bot/bot.py

@@ -36,7 +36,7 @@ def agent_chat(bot_setting_file, history):
             model=cfg["model"],
             temperature=(
                 role_setting["temperature"] * 2
-                if cfg["model"].startswith("deepseek")
+                if cfg["model"].startswith("deepseek") or cfg["model"].startswith("yi-")
                 else role_setting["temperature"]
             ),
             stop_sequences=[
@@ -45,7 +45,11 @@ def agent_chat(bot_setting_file, history):
             ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
         )
     prompt = role_setting["prompt"]
-    if cfg["model"].startswith("deepseek") and len(tools) > 0:
+    if (
+        cfg["model"].startswith("deepseek")
+        or cfg["model"].startswith("yi-")
+        and len(tools) > 0
+    ):
         prompt += """
 如果需要调用工具，请使用以正确的json格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
 ```json

{pycoze-0.1.74 → pycoze-0.1.76}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.74 → pycoze-0.1.76}/pycoze.egg-info/SOURCES.txt

@@ -9,6 +9,9 @@ pycoze.egg-info/dependency_links.txt
 pycoze.egg-info/top_level.txt
 pycoze/access/__init__.py
 pycoze/access/tool_for_bot.py
+pycoze/ai/__init__.py
+pycoze/ai/comfyui.py
+pycoze/ai/vram_reserve.py
 pycoze/bot/__init__.py
 pycoze/bot/bot.py
 pycoze/bot/agent/__init__.py
@@ -19,8 +22,6 @@ pycoze/bot/agent/agent_types/__init__.py
 pycoze/bot/agent/agent_types/openai_func_call_agent.py
 pycoze/bot/agent/agent_types/react_agent.py
 pycoze/bot/agent/agent_types/react_prompt.py
-pycoze/gpu/__init__.py
-pycoze/gpu/gpu_reserve.py
 pycoze/ui/__init__.py
 pycoze/ui/base.py
 pycoze/ui/color.py

{pycoze-0.1.74 → pycoze-0.1.76}/setup.py

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

pycoze-0.1.74/pycoze/gpu/__init__.py

@@ -1 +0,0 @@
-from .gpu_reserve import reserve_gpu_retry, release_gpu, reserve_gpu_retry