重构漏损识别请求，添加用户验证和输入准备

app/api/v1/endpoints/leakage.py

@@ -1,9 +1,11 @@
 from typing import Any
 from datetime import datetime
 
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter, Depends, HTTPException
 from pydantic import BaseModel
 
+from app.auth.dependencies import get_current_user
+from app.domain.schemas.user import UserInDB
 from app.services.leakage_identifier import (
     get_leakage_identify_scheme_detail,
     list_leakage_identify_schemes,
@@ -15,13 +17,15 @@ router = APIRouter()
 
 class LeakageIdentifyRequest(BaseModel):
     network: str
-    observed_pressure_data: str | dict[str, list[Any]] | list[dict[str, Any]] | None = None
+    observed_pressure_data: str | dict[str, list[Any]] | list[dict[str, Any]] | None = (
+        None
+    )
     start_time: float = 0
     duration: float = 24
     timestep: float = 5
     q_sum: float = 0.2
     q_sum_unit: str = "m3/s"
-    output_dir: str = "Results"
+    output_dir: str = "db_inp"
     pop_size: int = 50
     max_gen: int = 100
     output_flow_unit: str = "m3/s"
@@ -30,13 +34,16 @@ class LeakageIdentifyRequest(BaseModel):
     scada_end: datetime | None = None
     sensor_nodes: list[str] | None = None
     scheme_name: str | None = None
-    username: str = "admin"
 
 
 @router.post("/identify/")
-async def identify_leakage(data: LeakageIdentifyRequest) -> dict[str, Any]:
+async def identify_leakage(
+    data: LeakageIdentifyRequest, current_user: UserInDB = Depends(get_current_user)
+) -> dict[str, Any]:
     try:
-        return run_leakage_identification(**data.dict())
+        return run_leakage_identification(
+            **data.model_dump(), username=current_user.username
+        )
     except Exception as exc:
         raise HTTPException(status_code=400, detail=str(exc))
 
@@ -52,10 +59,10 @@ async def query_leakage_schemes(
 
 
 @router.get("/schemes/{scheme_name}")
-async def query_leakage_scheme_detail(
-    network: str, scheme_name: str
-) -> dict[str, Any]:
+async def query_leakage_scheme_detail(network: str, scheme_name: str) -> dict[str, Any]:
     try:
-        return get_leakage_identify_scheme_detail(network=network, scheme_name=scheme_name)
+        return get_leakage_identify_scheme_detail(
+            network=network, scheme_name=scheme_name
+        )
     except Exception as exc:
         raise HTTPException(status_code=400, detail=str(exc))

app/services/leakage_identifier.py

@@ -6,6 +6,7 @@ from typing import Any
 
 import numpy as np
 import pandas as pd
+import wntr
 
 from app.algorithms.leakage_identifier import LeakageIdentifier
 from app.infra.db.influxdb import api as influxdb_api
@@ -34,7 +35,7 @@ def run_leakage_identification(
     timestep: float = 5,
     q_sum: float = 0.2,
     q_sum_unit: str = "m3/s",
-    output_dir: str = "Results",
+    output_dir: str = "db_inp",
     pop_size: int = 50,
     max_gen: int = 100,
     output_flow_unit: str = "m3/s",
@@ -46,8 +47,7 @@ def run_leakage_identification(
     username: str = "admin",
 ) -> dict[str, Any]:
     os.makedirs(output_dir, exist_ok=True)
-    inp_path = os.path.join(output_dir, f"{network}.leakage.inp")
-    dump_inp(network, inp_path, "2")
+    inp_path = _prepare_leakage_inp(network)
 
     selected_sensor_nodes = (
         list(dict.fromkeys([node for node in (sensor_nodes or []) if node]))
@@ -500,3 +500,26 @@ def _to_datetime(value: datetime | str) -> datetime:
     if isinstance(value, datetime):
         return value
     return datetime.fromisoformat(value)
+
+
+def _prepare_leakage_inp(network: str) -> str:
+    project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
+    db_inp_dir = os.path.join(project_root, "db_inp")
+    os.makedirs(db_inp_dir, exist_ok=True)
+    inp_path = os.path.join(db_inp_dir, f"{network}.leakage.inp")
+    if _is_valid_inp_file(inp_path):
+        return inp_path
+    dump_inp(network, inp_path, "2")
+    if not _is_valid_inp_file(inp_path):
+        raise ValueError(f"漏损识别 INP 文件无效: {inp_path}")
+    return inp_path
+
+
+def _is_valid_inp_file(inp_path: str) -> bool:
+    if not os.path.isfile(inp_path) or os.path.getsize(inp_path) <= 0:
+        return False
+    try:
+        wntr.network.WaterNetworkModel(inp_path)
+        return True
+    except Exception:
+        return False