重构漏损识别请求,添加用户验证和输入准备
This commit is contained in:
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user