pycoze 0.1.88__tar.gz → 0.1.90__tar.gz

{pycoze-0.1.88 → pycoze-0.1.90}/PKG-INFO

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

pycoze-0.1.90/pycoze/ai/__init__.py

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

{pycoze-0.1.88 → pycoze-0.1.90}/pycoze/ai/vram_reserve.py

@@ -42,44 +42,18 @@ def get_vram_resources():
     try:
         # 使用nvidia-smi命令获取VRAM信息
         result = subprocess.run(
-            ["nvidia-smi", "--query-gpu=memory.free", "--format=csv,noheader,nounits"],
+            ["nvidia-smi", "--query-gpu=memory.total", "--format=csv,noheader,nounits"],
             stdout=subprocess.PIPE,
             text=True,
         )
-        free_memory = result.stdout.strip().split("\n")
-        total_free_memory = 0
-        for mem in free_memory:
+        total_memory_list = result.stdout.strip().split("\n")
+        total_memory = 0
+        for mem in total_memory_list:
             try:
-                total_free_memory += float(mem)
+                total_memory += float(mem)
             except:
                 pass
-
-        # 获取正在使用VRAM的进程信息
-        process_result = subprocess.run(
-            [
-                "nvidia-smi",
-                "--query-compute-apps=pid,process_name,used_memory",
-                "--format=csv,noheader,nounits",
-            ],
-            stdout=subprocess.PIPE,
-            text=True,
-        )
-        process_info = process_result.stdout.strip().split("\n")
-
-        # 过滤掉进程名中包含"python"的进程
-        python_memory_usage = 0.0
-        for process in process_info:
-            pid, process_name, used_memory = process.split(", ")
-            if "python" in process_name.lower():
-                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)
+        return round(total_memory / 1024, 2)
     except Exception as e:
         print(f"Error getting VRAM resources: {e}")
         return 0.0
@@ -114,33 +88,25 @@ def reserve_vram_retry(gb, retry=None, uid=None):
         retry = sys.maxsize
     for i in range(retry):
         time.sleep(1)
-        if i % 10 == 0 or i < 10:
+        if i % 10 == 0 or i < 10 and i != 0:
             print(f"重试第{i}次")
         if reserve_vram(gb, uid):
             return True
     return False
 
 
-def release_vram(uid=None):
+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()
-        # 计算释放后的剩余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_vram_resources() - total_reserved
-        print(f"释放成功，剩余VRAM大小: {available_gb} GB")
 
 
 # 注册退出时的清理函数
 def cleanup():
-    release_vram()
-    print("程序退出，VRAM资源已释放")
+    unreserve_vram()
 
 
 def initialize_and_check():

{pycoze-0.1.88 → pycoze-0.1.90}/pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -64,23 +64,8 @@ def create_openai_func_call_agent_executor(
         last_message = messages[-1]
         if last_message.content.strip().endswith("```"):
             last_message.content = last_message.content + "\n\n"  # 避免影响阅读
-        # if not last_message.tool_calls:
-        #     if (
-        #         "接下来我将" in last_message.content
-        #         or "接下来，我将" in last_message.content
-        #     ):
-        #         print("deepseek的bug: “接下来我将” 模式，使用a_delay_function骗过llm")
-        #         last_message.additional_kwargs["tool_calls"] = (
-        #             last_message.tool_calls
-        #         ) = [
-        #             {
-        #                 "function": {"name": "a_delay_function", "arguments": "{}"},
-        #                 "id": random.randint(0, 1000000),
-        #             }
-        #         ]
-        #         return "continue"
         if '"name"' in last_message.content and '"parameters":' in last_message.content:
-            print("deepseek的bug: name 和 paremeters 模式")
+            print("name 和 paremeters 模式")
             all_json = get_all_markdown_json(last_message.content)
             tool_calls = []
             for tool_call in all_json:

{pycoze-0.1.88 → pycoze-0.1.90}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.88 → pycoze-0.1.90}/pycoze.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ 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-0.1.88 → pycoze-0.1.90}/setup.py

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

pycoze-0.1.88/pycoze/ai/__init__.py

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

pycoze-0.1.88/pycoze/ai/comfyui.py

@@ -1,33 +0,0 @@
-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