1

video-gen-api/app/api/v1/admin.py

@@ -1712,6 +1712,15 @@ async def list_operation_logs(
     }
 
 
+def _build_param_out(model_map: dict[str, dict[str, int]]) -> list[VideoParamOut]:
+    """将 {模型: {标签: 数量}} 转为扁平列表，按模型+数量排序。"""
+    result: list[VideoParamOut] = []
+    for model, labels in model_map.items():
+        for label, count in sorted(labels.items(), key=lambda x: -x[1]):
+            result.append(VideoParamOut(model=model, label=label, count=count))
+    return result
+
+
 # ── Stats ────────────────────────────────────────────────
 
 @router.get("/stats", response_model=AdminStatsOut)
@@ -1951,11 +1960,18 @@ async def get_stats(
         for row in model_usage_rows
     ]
 
-    # ── 视频分辨率/比例/时长使用分布（基于 ChatGenerationTask）
+    # ── 视频分辨率/比例/时长使用分布（按模型分组）
     _video_gen_q = (
-        select(ChatGenerationTask.resolution, ChatGenerationTask.aspect_ratio, ChatGenerationTask.duration)
+        select(
+            func.coalesce(CreditRecord.engine_name, '未知').label('model'),
+            ChatGenerationTask.resolution,
+            ChatGenerationTask.aspect_ratio,
+            ChatGenerationTask.duration,
+        )
+        .join(CreditRecord, CreditRecord.related_id == ChatGenerationTask.id)
         .where(
             ChatGenerationTask.gen_type == "video",
+            CreditRecord.type == "consume",
             ChatGenerationTask.created_at >= date_start,
             ChatGenerationTask.created_at <= date_end,
             ChatGenerationTask.deleted_at.is_(None),
@@ -1963,21 +1979,25 @@ async def get_stats(
     )
     _video_rows = (await db.execute(_video_gen_q)).all()
 
-    _res_map: dict[str, int] = {}
-    _ratio_map: dict[str, int] = {}
-    _dur_map: dict[str, int] = {}
+    _res_map: dict[str, dict[str, int]] = {}
+    _ratio_map: dict[str, dict[str, int]] = {}
+    _dur_map: dict[str, dict[str, int]] = {}
     for row in _video_rows:
+        model = row.model or '未知'
         if row.resolution:
-            _res_map[row.resolution] = _res_map.get(row.resolution, 0) + 1
+            _res_map.setdefault(model, {})
+            _res_map[model][row.resolution] = _res_map[model].get(row.resolution, 0) + 1
         if row.aspect_ratio:
-            _ratio_map[row.aspect_ratio] = _ratio_map.get(row.aspect_ratio, 0) + 1
+            _ratio_map.setdefault(model, {})
+            _ratio_map[model][row.aspect_ratio] = _ratio_map[model].get(row.aspect_ratio, 0) + 1
         if row.duration:
             _k = f"{row.duration}秒"
-            _dur_map[_k] = _dur_map.get(_k, 0) + 1
+            _dur_map.setdefault(model, {})
+            _dur_map[model][_k] = _dur_map[model].get(_k, 0) + 1
 
-    video_resolution_usage = [VideoParamOut(label=k, count=v) for k, v in sorted(_res_map.items(), key=lambda x: -x[1])]
-    video_ratio_usage = [VideoParamOut(label=k, count=v) for k, v in sorted(_ratio_map.items(), key=lambda x: -x[1])]
-    video_duration_usage = [VideoParamOut(label=k, count=v) for k, v in sorted(_dur_map.items(), key=lambda x: -x[1])]
+    video_resolution_usage = _build_param_out(_res_map)
+    video_ratio_usage = _build_param_out(_ratio_map)
+    video_duration_usage = _build_param_out(_dur_map)
 
     return AdminStatsOut(
         total_users=total_users,