Update sync_cliproxy_cleanup.py

sync_cliproxy_cleanup.py

@@ -1,3 +1,4 @@
+```python
 import os
 import time
 import requests
@@ -15,7 +16,7 @@ SYNC_INTERVAL = int(os.environ.get("SYNC_INTERVAL_SECONDS", 3600))
 
 SYNC_TAG = "cliproxy-synced"
 MASTER_HEADERS = {"Authorization": f"Bearer {LITELLM_MASTER_KEY}"}
-UPDATE_MODEL_URL = f"{LITELLM_BASE_URL}/model/update"      # 用于更新已存在的模型
+UPDATE_MODEL_URL = f"{LITELLM_BASE_URL}/model/update"
 
 # ---------- 等待 LiteLLM 就绪 ----------
 def wait_for_litellm_ready(timeout: int = 180):
@@ -34,7 +35,6 @@ def wait_for_litellm_ready(timeout: int = 180):
 
 # ---------- 检查凭证是否可用 ----------
 def credential_exists(credential_name: str) -> bool:
-    """检查凭证是否存在，并输出详细的调试信息"""
     try:
         resp = requests.get(f"{LITELLM_BASE_URL}/credentials", headers=MASTER_HEADERS)
         if resp.status_code != 200:
@@ -76,22 +76,40 @@ def get_existing_model_ids() -> Set[str]:
     resp.raise_for_status()
     return {m["id"] for m in resp.json().get("data", [])}
 
-# ---------- 判断是否为同步模型 ----------
-def is_synced_model(model_id: str) -> bool:
-    if "/" not in model_id:
-        return False
-    prefix, name = model_id.split("/", 1)
-    return prefix != "openai" and len(name) > 0
+# ---------- 获取所有模型的完整信息（包含 tags）----------
+def get_existing_models_full() -> List[Dict]:
+    """返回完整的模型信息列表，用于判断标签"""
+    resp = requests.get(f"{LITELLM_BASE_URL}/v1/models", headers=MASTER_HEADERS)
+    resp.raise_for_status()
+    return resp.json().get("data", [])
+
+# ---------- 判断是否为同步模型（通过标签）----------
+def is_synced_model(model_id: str, models_full: List[Dict]) -> bool:
+    """通过模型的 owned_by 和 tags 判断是否由本脚本同步生成"""
+    for model in models_full:
+        if model["id"] == model_id:
+            # 如果有 tags 且包含 SYNC_TAG
+            if "tags" in model and SYNC_TAG in model["tags"]:
+                return True
+            # 退一步：owned_by 不是 openai 且包含斜杠
+            owner = model.get("owned_by", "unknown")
+            if "/" in model_id and owner != "openai":
+                return True
+    return False
 
-# ---------- 模型删除 ----------
-def delete_model(model_name: str):
-    # 使用 POST 方法，避免 405 错误
+# ---------- 模型删除 (接受200/204) ----------
+def delete_model(model_name: str) -> bool:
     resp = requests.post(
         f"{LITELLM_BASE_URL}/model/delete",
         json={"model_name": model_name},
         headers=MASTER_HEADERS,
     )
-    return resp.status_code
+    if resp.status_code in [200, 204]:
+        print(f"  🗑️ 成功删除模型: {model_name}")
+        return True
+    else:
+        print(f"  ❌ 删除模型 {model_name} 失败，状态码: {resp.status_code}, 响应: {resp.text}")
+        return False
 
 # ---------- 模型添加 ----------
 def add_model_to_litellm(original_id: str, owner: str, use_credential: bool) -> bool:
@@ -131,16 +149,15 @@ def add_model_to_litellm(original_id: str, owner: str, use_credential: bool) ->
 # ---------- 更新已存在模型为凭证模式 ----------
 def update_model_credential(model_name: str, use_credential: bool) -> bool:
     if not use_credential:
-        return True   # 未启用凭证，无需更新
+        return True
 
     update_payload = {
         "model_name": model_name,
         "litellm_params": {
-            "litellm_credential_name": CREDENTIAL_NAME,
-            "api_base": None,       # 清除旧的 api_base，防止凭证冲突
-            "api_key": None,        # 清除旧的 api_key
+            "litellm_credential_name": CREDENTIAL_NAME
         }
     }
+    
     try:
         resp = requests.post(UPDATE_MODEL_URL, json=update_payload, headers=MASTER_HEADERS)
         if resp.status_code in (200, 201):
@@ -192,31 +209,27 @@ def sync():
         cliproxy_map[new_name] = owner
 
     existing_ids = get_existing_model_ids()
+    existing_full = get_existing_models_full()
 
     added = 0
     migrated = 0
     for new_name, owner in cliproxy_map.items():
         if new_name not in existing_ids:
-            # 新模型：直接添加
             if add_model_to_litellm(new_name.split("/", 1)[1], owner, use_credential):
                 print(f"  ➕ 新增: {new_name}")
                 added += 1
         else:
-            # 已存在模型：如果启用了凭证，则尝试将其迁移到凭证模式
             if use_credential:
                 if update_model_credential(new_name, use_credential):
                     migrated += 1
 
-    # 删除失效模型
+    # 删除失效模型（使用标签识别）
     deleted = 0
-    for mid in list(existing_ids):
-        if is_synced_model(mid) and mid not in cliproxy_map:
-            status = delete_model(mid)
-            if status == 200:
-                print(f"  🗑️ 删除失效模型: {mid}")
+    for model_full in existing_full:
+        model_id = model_full["id"]
+        if is_synced_model(model_id, existing_full) and model_id not in cliproxy_map:
+            if delete_model(model_id):
                 deleted += 1
-            else:
-                print(f"  ❌ 删除 {mid} 失败 (status {status})")
 
     current_valid_models = list(cliproxy_map.keys())
     update_fallback_chain(current_valid_models)
@@ -229,4 +242,5 @@ if __name__ == "__main__":
     print("🚀 守护同步任务启动，间隔 " + str(SYNC_INTERVAL) + " 秒")
     while True:
         sync()
-        time.sleep(SYNC_INTERVAL)
+        time.sleep(SYNC_INTERVAL)
+```