fix:批量修复了一些问题

src/api/routes/predict.py

@@ -42,7 +42,7 @@ async def predict(req: PredictRequest):
         if m.match_status == "finished":
             raise HTTPException(400, "该比赛已完赛,不再支持预测")
 
-    # 2. LLM 调用(不持有任何 DB 连接)
+    # 2. 预测调用(不持有任何 DB 连接)
     try:
         result = await predict_match(
             req.match_id,
@@ -63,32 +63,77 @@ async def predict(req: PredictRequest):
         logger.exception("predict unexpected error")
         raise HTTPException(500, "预测失败,请查看服务器日志")
 
+    # baseline 模式:结果已是 dict,需独立落库(prediction_id)
+    if req.mode == "baseline":
+        prediction_id = await _persist_baseline(req.match_id, result)
+    else:
+        prediction_id = result.prediction_id
+
     # 3. 结果映射(无 DB 访问)
     logger.info(
         "预测完成 match=%s mode=%s pred=%s:%s (%s)",
-        req.match_id, req.mode, result.pred_home_goals, result.pred_away_goals, result.pred_1x2,
+        req.match_id, req.mode,
+        result.get("pred_home_goals") if isinstance(result, dict) else result.pred_home_goals,
+        result.get("pred_away_goals") if isinstance(result, dict) else result.pred_away_goals,
+        result.get("pred_1x2") if isinstance(result, dict) else result.pred_1x2,
     )
 
+    result_dict = result if isinstance(result, dict) else None
+
     return PredictOut(
-        prediction_id=result.prediction_id,
-        provider=result.provider,
-        model=result.model,
-        prompt_version=getattr(result, "prompt_version", None),
-        mode=getattr(result, "mode", "single"),
-        pred_home_goals=result.pred_home_goals,
-        pred_away_goals=result.pred_away_goals,
-        alt_pred_home_goals=result.alt_pred_home_goals,
-        alt_pred_away_goals=result.alt_pred_away_goals,
-        pred_1x2=result.pred_1x2,
-        subjective_confidence=result.subjective_confidence,
-        reasoning=result.reasoning,
-        agent_outputs=getattr(result, "agent_outputs", None),
-        agent_weights=getattr(result, "agent_weights", None),
-        context=result.context,
-        latency_ms=result.latency_ms,
+        prediction_id=prediction_id,
+        provider=result.get("provider") if result_dict else result.provider,
+        model=result.get("model") if result_dict else result.model,
+        prompt_version=result.get("prompt_version") if result_dict else getattr(result, "prompt_version", None),
+        mode=req.mode,
+        pred_home_goals=result.get("pred_home_goals") if result_dict else result.pred_home_goals,
+        pred_away_goals=result.get("pred_away_goals") if result_dict else result.pred_away_goals,
+        alt_pred_home_goals=result.get("alt_pred_home_goals") if result_dict else result.alt_pred_home_goals,
+        alt_pred_away_goals=result.get("alt_pred_away_goals") if result_dict else result.alt_pred_away_goals,
+        pred_1x2=result.get("pred_1x2") if result_dict else result.pred_1x2,
+        subjective_confidence=result.get("subjective_confidence") if result_dict else result.subjective_confidence,
+        reasoning=result.get("reasoning") if result_dict else result.reasoning,
+        status=result.get("status", "success") if result_dict else getattr(result, "status", "success"),
+        agent_outputs=result.get("agent_outputs") if result_dict else getattr(result, "agent_outputs", None),
+        agent_weights=result.get("agent_weights") if result_dict else getattr(result, "agent_weights", None),
+        context=result.get("context", "") if result_dict else result.context,
+        latency_ms=result.get("latency_ms", 0) if result_dict else result.latency_ms,
+        prompt_tokens=result.get("prompt_tokens") if result_dict else getattr(result, "prompt_tokens", None),
+        completion_tokens=result.get("completion_tokens") if result_dict else getattr(result, "completion_tokens", None),
+        rate_limit_remaining=_predict_limiter.remaining(get_client_ip(request)),
     )
 
 
+async def _persist_baseline(match_id: int, baseline: dict) -> int:
+    """将基线预测结果写入 prediction 表,复用 upsert 语义。"""
+    from src.db.unit_of_work import get_uow
+    from src.llm.predict import _upsert_prediction
+
+    async with get_uow() as session:
+        pred = await _upsert_prediction(
+            session,
+            match_id=match_id,
+            provider_name="baseline",
+            model="baseline",
+            mode="baseline",
+            run_type="baseline",
+            values={
+                "prompt_version": "baseline_v1",
+                "prompt_tokens": 0,
+                "completion_tokens": 0,
+                "latency_ms": 0,
+                "pred_home_goals": baseline["pred_home_goals"],
+                "pred_away_goals": baseline["pred_away_goals"],
+                "pred_1x2": baseline["pred_1x2"],
+                "subjective_confidence": baseline["subjective_confidence"],
+                "reasoning": baseline["reasoning"],
+                "raw_response": baseline.get("raw", baseline),
+                "status": "success",
+            },
+        )
+        return pred.id
+
+
 @router.get("/predictions", response_model=list[PredictionOut], dependencies=[Depends(require_admin)])
 async def list_predictions(
     match_id: int | None = None,
@@ -110,10 +155,14 @@ async def list_predictions(
             mode=p.mode or "single",
             pred_home_goals=p.pred_home_goals,
             pred_away_goals=p.pred_away_goals,
+            alt_pred_home_goals=p.alt_pred_home_goals,
+            alt_pred_away_goals=p.alt_pred_away_goals,
             pred_1x2=p.pred_1x2,
             subjective_confidence=p.subjective_confidence,
             reasoning=p.reasoning,
+            status=p.status or "success",
             agent_outputs=p.agent_outputs,
+            agent_weights=p.agent_weights,
             created_at=p.created_at,
             actual_home_goals=p.actual_home_goals,
             actual_away_goals=p.actual_away_goals,
@@ -137,10 +186,14 @@ async def get_prediction(prediction_id: int, db: AsyncSession = Depends(get_db_r
         mode=p.mode or "single",
         pred_home_goals=p.pred_home_goals,
         pred_away_goals=p.pred_away_goals,
+        alt_pred_home_goals=p.alt_pred_home_goals,
+        alt_pred_away_goals=p.alt_pred_away_goals,
         pred_1x2=p.pred_1x2,
         subjective_confidence=p.subjective_confidence,
         reasoning=p.reasoning,
+        status=p.status or "success",
         agent_outputs=p.agent_outputs,
+        agent_weights=p.agent_weights,
         created_at=p.created_at,
         actual_home_goals=p.actual_home_goals,
         actual_away_goals=p.actual_away_goals,