x

src/moldinsight/api/advanced_router.py

@@ -24,42 +24,49 @@ router = APIRouter()
 cad_exporter = CADExporter()
 storage_service = StorageIntegrationService()
 
-_api_routes_cache = {}
+_cached_instances = {}
 
 
-def _get_cached(key):
-    global _api_routes_cache
-    if key not in _api_routes_cache:
-        try:
-            from api import routes
-        except Exception as e:
-            logger.warning(f"api.routes 模块加载失败: {e}")
-            _api_routes_cache["__error__"] = str(e)
+def _get_cached_import(key: str):
+    """惰性导入核心模块，避免路由器模块级加载时的循环依赖。"""
+    if key in _cached_instances:
+        return _cached_instances[key]
+    try:
+        if key == "side_action_designer":
+            from moldinsight.core.side_action_designer import SideActionDesigner
+            instance = SideActionDesigner()
+        elif key == "cavity_layout_optimizer":
+            from moldinsight.core.cavity_layout_optimizer import CavityLayoutOptimizer
+            instance = CavityLayoutOptimizer()
+        elif key == "mold_system_designer":
+            from moldinsight.core.mold_system_designer import MoldSystemDesigner
+            instance = MoldSystemDesigner()
+        elif key == "mold_cam_designer":
+            from moldinsight.core.mold_cam import MoldCAMDesigner
+            instance = MoldCAMDesigner()
+        elif key == "collision_detector":
+            from moldinsight.core.mold_machining import CollisionDetector
+            instance = CollisionDetector()
+        elif key == "toolpath_optimizer":
+            from moldinsight.core.mold_machining import ToolpathOptimizer
+            instance = ToolpathOptimizer()
+        elif key == "edm_designer":
+            from moldinsight.core.mold_machining import EDMElectrodeDesigner
+            instance = EDMElectrodeDesigner()
+        elif key == "machining_simulator":
+            from moldinsight.core.mold_machining import MachiningSimulator
+            instance = MachiningSimulator()
+        else:
             return None
-        _api_routes_cache.clear()
-        _api_routes_cache.update({
-            "tasks": routes.tasks,
-            "cavity_layout_optimizer": routes.cavity_layout_optimizer,
-            "mold_system_designer": routes.mold_system_designer,
-            "side_action_designer": routes.side_action_designer,
-            "mold_cam_designer": routes.mold_cam_designer,
-            "collision_detector": routes.collision_detector,
-            "toolpath_optimizer": routes.toolpath_optimizer,
-            "edm_designer": routes.edm_designer,
-            "machining_simulator": routes.machining_simulator,
-            "cad_exporter": routes.cad_exporter,
-        })
-    return _api_routes_cache.get(key)
+        _cached_instances[key] = instance
+        return instance
+    except Exception as e:
+        logger.warning(f"核心模块 {key} 加载失败: {e}")
+        return None
 
 
 async def _get_task_data(task_id: str) -> dict:
-    task = await redis_task_manager.get_task(task_id)
-    if task:
-        return task
-    tasks = _get_cached("tasks")
-    if tasks and task_id in tasks:
-        return tasks[task_id]
-    return None
+    return await redis_task_manager.get_task(task_id)
 
 
 async def _ensure_task_access(
@@ -193,7 +200,7 @@ async def optimize_cavity_layout(
     layout_type = body.get("layout_type", "auto")
     if cavity_count < 1 or cavity_count > 64:
         raise HTTPException(400, "型腔数量必须在 1-64 之间")
-    optimizer = _get_cached("cavity_layout_optimizer")
+    optimizer = _get_cached_import("cavity_layout_optimizer")
     if not optimizer:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = optimizer.optimize_layout(
@@ -260,7 +267,7 @@ async def design_complete_mold_system(
     gate_type = body.get("gate_type", "auto")
     cycle_time_target = body.get("cycle_time_target")
     layout_positions = body.get("layout_positions")
-    ds = _get_cached("mold_system_designer")
+    ds = _get_cached_import("mold_system_designer")
     if not ds:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = ds.design_complete_system(
@@ -307,7 +314,7 @@ async def detect_undercuts(
     task_data = await _get_task_data(task_id)
     if not task_data:
         raise HTTPException(404, "任务不存在")
-    sd = _get_cached("side_action_designer")
+    sd = _get_cached_import("side_action_designer")
     if not sd:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = sd.analyze_and_design(
@@ -327,7 +334,7 @@ async def design_mold_cam(
     mold_steel = body.get("mold_steel", "P20")
     surface_quality = body.get("surface_quality", "standard")
     controller = body.get("controller", "fanuc")
-    cam = _get_cached("mold_cam_designer")
+    cam = _get_cached_import("mold_cam_designer")
     if not cam:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = cam.design_mold_cam(
@@ -348,7 +355,7 @@ async def check_toolpath_collision(
     tool = body.get("tool", {"diameter": 10, "flute_length": 30, "shank_diameter": 10})
     stock_bbox = body.get("stock_bbox", {"min": [-50, -50, -25], "max": [50, 50, 25]})
     clamp_positions = body.get("clamp_positions")
-    cd = _get_cached("collision_detector")
+    cd = _get_cached_import("collision_detector")
     if not cd:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = cd.check_toolpath_safety(toolpath_points, tool, stock_bbox, clamp_positions)
@@ -364,7 +371,7 @@ async def optimize_toolpath(
     toolpath_points = body.get("toolpath_points", [[0, 0, 50], [10, 10, -5], [20, 20, -10]])
     cutting_params = body.get("cutting_params", {"feed_rate_mm_min": 500})
     stock_bbox = body.get("stock_bbox")
-    to = _get_cached("toolpath_optimizer")
+    to = _get_cached_import("toolpath_optimizer")
     if not to:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = to.optimize_toolpath(toolpath_points, cutting_params, stock_bbox)
@@ -382,7 +389,7 @@ async def design_edm_electrodes(
     material = body.get("material", "copper")
     spark_gap = body.get("spark_gap", 0.05)
     overburn = body.get("overburn", 0.1)
-    ed = _get_cached("edm_designer")
+    ed = _get_cached_import("edm_designer")
     if not ed:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = ed.design_electrodes(undercut_regions, cavity_bbox, material, spark_gap, overburn)
@@ -398,7 +405,7 @@ async def simulate_machining(
     operations = body.get("operations", [{"strategy": "z_level_roughing", "levels": [{"z": -5}]}])
     stock_bbox = body.get("stock_bbox", {"dimensions": [100, 100, 50], "min": [-50, -50, -25], "max": [50, 50, 25]})
     resolution = body.get("resolution", 2.0)
-    ms = _get_cached("machining_simulator")
+    ms = _get_cached_import("machining_simulator")
     if not ms:
         raise HTTPException(503, "服务不可用：核心模块未加载")
     result = ms.simulate_machining(operations, stock_bbox, resolution)