Update scripts/sync_bailian_models.py

scripts/sync_bailian_models.py

@@ -4,7 +4,7 @@ import sys
 import sqlite3
 import json
 import urllib.request
-import subprocess          # 新增：用于调用备份脚本
+import subprocess
 from datetime import datetime
 
 DB_PATH = "/app/server/data/freeapi.db"
@@ -15,6 +15,7 @@ def get_table_columns(conn, table):
     return [row[1] for row in cursor.fetchall()]
 
 def ensure_provider_table(conn):
+    # 检查是否存在 providers 或 channels 表，如果没有则创建
     cursor = conn.cursor()
     cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name IN ('providers', 'channels')")
     tables = [row[0] for row in cursor.fetchall()]
@@ -23,7 +24,6 @@ def ensure_provider_table(conn):
     elif 'channels' in tables:
         return 'channels'
     else:
-        # 创建 providers 表
         cursor.execute("""
             CREATE TABLE providers (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -73,34 +73,64 @@ def main():
     provider_table = ensure_provider_table(conn)
     provider_id = get_or_create_bailian_provider(conn, provider_table)
 
+    # 获取 models 表的列
     model_columns = get_table_columns(conn, "models")
     print(f"models table columns: {model_columns}")
 
-    insert_cols = [col for col in ['id', 'provider_id', 'enabled', 'created_at', 'name'] if col in model_columns]
+    # 根据实际列名动态构建插入语句
+    # 我们期望的映射：模型ID -> 可能的列名
+    id_col_candidates = ['model_id', 'id', 'name']
+    id_col = None
+    for col in id_col_candidates:
+        if col in model_columns:
+            id_col = col
+            break
+    if not id_col:
+        print("❌ models table missing id column")
+        return 1
+
+    # 其他可用列
+    insert_cols = [id_col]
+    if 'platform' in model_columns:
+        insert_cols.append('platform')
+    if 'provider_id' in model_columns:
+        insert_cols.append('provider_id')
+    if 'enabled' in model_columns:
+        insert_cols.append('enabled')
+    if 'created_at' in model_columns:
+        insert_cols.append('created_at')
+    # 如果有 display_name 列，可以用作显示名称
+    if 'display_name' in model_columns:
+        insert_cols.append('display_name')
+
     if not insert_cols:
-        print("❌ models table missing expected columns")
+        print("❌ No columns to insert")
         return 1
 
     placeholders = ','.join(['?' for _ in insert_cols])
     cursor = conn.cursor()
     added = 0
     for model_id in models:
-        cursor.execute("SELECT 1 FROM models WHERE id = ?", (model_id,))
+        # 检查是否存在
+        cursor.execute(f"SELECT 1 FROM models WHERE {id_col} = ?", (model_id,))
         if cursor.fetchone():
             print(f"⏭️ Already exists: {model_id}")
             continue
+
         values = []
         for col in insert_cols:
-            if col == 'id':
+            if col == id_col:
                 values.append(model_id)
+            elif col == 'platform':
+                values.append('bailian')
             elif col == 'provider_id':
                 values.append(provider_id)
             elif col == 'enabled':
                 values.append(1)
             elif col == 'created_at':
                 values.append(datetime.utcnow().isoformat())
-            elif col == 'name':
-                values.append(model_id)
+            elif col == 'display_name':
+                values.append(model_id)  # 或更友好的名称
         sql = f"INSERT INTO models ({','.join(insert_cols)}) VALUES ({placeholders})"
         cursor.execute(sql, values)
         added += 1
@@ -110,16 +140,11 @@ def main():
     conn.close()
     print(f"✅ Sync completed. New models added: {added}")
 
-    # 如果有新增模型，立即触发一次备份，确保重启后不丢失
     if added > 0:
         print("Triggering immediate backup to persist new models...")
         backup_script = "/app/scripts/backup_to_dataset.py"
         if os.path.exists(backup_script):
-            result = subprocess.run(["python3", backup_script])
-            if result.returncode == 0:
-                print("Backup completed successfully.")
-            else:
-                print("Backup failed, but models were added.")
+            subprocess.run(["python3", backup_script])
         else:
             print("Backup script not found, skipping immediate backup.")