pycoze 0.1.73__tar.gz → 0.1.75__tar.gz

{pycoze-0.1.73 → pycoze-0.1.75}/PKG-INFO

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

{pycoze-0.1.73/pycoze/gpu → pycoze-0.1.75/pycoze/ai}/__init__.py

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

{pycoze-0.1.73/pycoze/gpu → pycoze-0.1.75/pycoze/ai}/gpu_reserve.py

@@ -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
         )
     """
@@ -48,7 +48,12 @@ def get_gpu_resources():
             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的进程信息
         process_result = subprocess.run(
@@ -67,8 +72,12 @@ 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_gpu_memory: ", total_free_memory)
+        print("python_gpu_memory_usage: ", python_memory_usage)
         # 计算排除python进程后的总空闲内存
         total_free_memory -= python_memory_usage
         return round(total_free_memory / 1024, 2)
@@ -78,8 +87,9 @@ def get_gpu_resources():
 
 
 # 预留GPU资源
-def reserve_gpu(gb):
-    process_id = str(os.getpid())
+def reserve_gpu(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}")
@@ -89,8 +99,8 @@ def reserve_gpu(gb):
         available_gb = get_gpu_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")
@@ -100,7 +110,7 @@ def reserve_gpu(gb):
             return False
 
 
-def reserve_gpu_retry(gb, retry=None):
+def reserve_gpu_retry(gb, retry=None, uid=None):
     if retry is None:
         # 接近无限重试，python中允许无限大的整数，尽管sys.maxsize不是真正的无限大，但足够大
         retry = sys.maxsize
@@ -108,17 +118,18 @@ 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_gpu(gb, uid):
             return True
     return False
 
 
 # 释放GPU资源
-def release_gpu():
-    process_id = str(os.getpid())
+def release_gpu(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大小
         cursor.execute(f"SELECT SUM(reserved_gb) FROM {TABLE_NAME}")
@@ -139,19 +150,19 @@ 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()
 
 

{pycoze-0.1.73 → pycoze-0.1.75}/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.73 → pycoze-0.1.75}/pycoze/ui/base.py

@@ -40,12 +40,7 @@ def get_ui():
                     return json.load(f)
             else:
                 assert by == "workflow"
-                workflow_file = params["uiData"]["workflowFile"]
-                node_id = params["uiData"]["nodeId"]
-                with open(workflow_file, "r", encoding="utf-8") as f:
-                    cells = json.load(f)["graph"]["cells"]
-                    node = [cell for cell in cells if cell["id"] == node_id][0]
-                    return json.loads(node["data"]["ui"])
+                return params["uiData"]["uiRecord"][match_ui_file]
         except Exception as e:
             if i == 9:
                 raise e

{pycoze-0.1.73 → pycoze-0.1.75}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.73 → pycoze-0.1.75}/pycoze.egg-info/SOURCES.txt

@@ -9,6 +9,8 @@ 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/gpu_reserve.py
 pycoze/bot/__init__.py
 pycoze/bot/bot.py
 pycoze/bot/agent/__init__.py
@@ -19,8 +21,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.73 → pycoze-0.1.75}/setup.py

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