x

src/moldinsight/api/batch_router.py

@@ -6,7 +6,7 @@ moldinsight/api/batch_router.py — 批量分析端点
 """
 import uuid
 from datetime import datetime
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Optional
 
 from fastapi import APIRouter, UploadFile, File, Form, HTTPException, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -19,13 +19,7 @@ from shared.services.redis_task_manager import redis_task_manager
 from shared.utils.file_handler import FileHandler
 from shared.utils.logger import get_logger
 from moldinsight.services.storage_integration_rustfs import StorageIntegrationService
-
-try:
-    from celery_tasks import process_stp_task
-    _use_celery = True
-except ImportError:
-    process_stp_task = None
-    _use_celery = False
+from moldinsight.services.task_dispatcher import dispatch_processing
 
 logger = get_logger(__name__)
 
@@ -37,6 +31,9 @@ file_handler = FileHandler()
 _BATCH_KEY_PREFIX = "batch:"
 _BATCH_TTL = 86400  # 24h
 
+# Redis 不可用时的进程内降级存储（同进程内可查，跨进程/重启不可见）
+_batch_meta_memory: Dict[str, dict] = {}
+
 
 def _batch_redis_key(batch_id: str) -> str:
     return f"{_BATCH_KEY_PREFIX}{batch_id}"
@@ -111,14 +108,7 @@ async def batch_upload(
             await redis_task_manager.set_task(task_id, task_info)
 
             # 调度处理
-            if _use_celery:
-                process_stp_task.delay(task_id, str(file_path), stp_file.id, process_params)
-            else:
-                import asyncio
-                from moldinsight.services.processing_service import processing_service
-                asyncio.create_task(processing_service.process_file_with_storage(
-                    task_id, str(file_path), stp_file.id, process_params
-                ))
+            dispatch_processing(task_id, str(file_path), stp_file.id, process_params)
 
             tasks.append({
                 "filename": file.filename,
@@ -139,7 +129,7 @@ async def batch_upload(
                 "error": str(exc),
             })
 
-    # 将 batch 元数据写入 Redis
+    # 将 batch 元数据写入 Redis；Redis 不可用时降级到进程内存储（任务状态本身有内存回退）
     batch_meta = {
         "batch_id": batch_id,
         "user_id": current_user.id,
@@ -148,11 +138,7 @@ async def batch_upload(
         "total": len(tasks),
         "params": process_params,
     }
-    await redis_task_manager.redis_client.set(
-        _batch_redis_key(batch_id),
-        __import__("json").dumps(batch_meta),
-        ex=_BATCH_TTL,
-    )
+    _save_batch_meta(batch_id, batch_meta)
 
     return {
         "batch_id": batch_id,
@@ -162,20 +148,47 @@ async def batch_upload(
     }
 
 
+def _save_batch_meta(batch_id: str, batch_meta: dict):
+    """批量元数据持久化：优先 Redis（跨进程、带 TTL），降级进程内 dict。"""
+    import json as _json
+
+    if redis_task_manager.is_connected:
+        try:
+            redis_task_manager.redis_client.set(
+                _batch_redis_key(batch_id),
+                _json.dumps(batch_meta),
+                ex=_BATCH_TTL,
+            )
+            return
+        except Exception as exc:
+            logger.warning(f"[BATCH] batch 元数据写 Redis 失败，降级内存: {exc}")
+    _batch_meta_memory[batch_id] = batch_meta
+
+
+async def _load_batch_meta(batch_id: str) -> Optional[dict]:
+    """读取批量元数据，Redis 优先，内存兜底；不存在返回 None。"""
+    import json as _json
+
+    if redis_task_manager.is_connected:
+        try:
+            raw = await redis_task_manager.redis_client.get(_batch_redis_key(batch_id))
+            if raw:
+                return _json.loads(raw)
+        except Exception as exc:
+            logger.warning(f"[BATCH] batch 元数据读 Redis 失败: {exc}")
+    return _batch_meta_memory.get(batch_id)
+
+
 @router.get("/batch/{batch_id}")
 async def get_batch_status(
     batch_id: str,
     current_user: User = Depends(get_current_active_user),
 ):
     """聚合查询批量任务进度"""
-    import json
-
-    raw = await redis_task_manager.redis_client.get(_batch_redis_key(batch_id))
-    if not raw:
+    batch_meta = await _load_batch_meta(batch_id)
+    if not batch_meta:
         raise HTTPException(404, "批量任务不存在或已过期")
 
-    batch_meta = json.loads(raw)
-
     # 权限检查
     if batch_meta.get("user_id") and batch_meta["user_id"] != current_user.id:
         raise HTTPException(403, "无权访问该批量任务")