Fixed setProperties error

This commit is contained in:
DingZQ
2022-10-19 19:23:06 +08:00
parent 0222a49cc3
commit 5a2d97b534

16
main.py
View File

@@ -351,7 +351,8 @@ async def fastapi_get_reservoir_properties(network: str, reservoir: str) -> dict
return get_reservoir(network, reservoir)
@app.post("/setreservoirproperties/")
async def fastapi_set_reservoir_properties(network: str, reservoir: str, props: dict[str, Any]) -> ChangeSet:
async def fastapi_set_reservoir_properties(network: str, reservoir: str, req: Request) -> ChangeSet:
props = await req.json()
ps = { 'id' : reservoir } | props
return set_reservoir(network, ChangeSet(ps))
@@ -511,11 +512,11 @@ async def fastapi_get_tank_properties(network: str, tank: str) -> dict[str, Any]
return get_tank(network, tank)
@app.post("/settankproperties/")
async def fastapi_set_tank_properties(network: str, tank: str, props: dict[str, Any]) -> ChangeSet:
async def fastapi_set_tank_properties(network: str, tank: str, req: Request) -> ChangeSet:
props = await req.json()
ps = { 'id' : tank } | props
return set_tank(network, ChangeSet(ps))
############################################################
# pipe 4.[PIPES]
############################################################
@@ -623,7 +624,8 @@ async def fastapi_get_pipe_properties(network: str, pipe: str) -> dict[str, Any]
return get_pipe(network, pipe)
@app.post("/setpipeproperties/")
async def fastapi_set_pipe_properties(network: str, pipe: str, props: dict[str, Any]) -> ChangeSet:
async def fastapi_set_pipe_properties(network: str, pipe: str, req: Request) -> ChangeSet:
props = await req.json()
ps = { 'id' : pipe } | props
return set_pipe(network, ChangeSet(ps))
@@ -674,7 +676,8 @@ async def fastapi_get_pump_properties(network: str, pump: str) -> dict[str, Any]
return get_pump(network, pump)
@app.post("/setpumpproperties/")
async def fastapi_set_pump_properties(network: str, pump: str, props: dict[str, Any]) -> ChangeSet:
async def fastapi_set_pump_properties(network: str, pump: str, req: Request) -> ChangeSet:
props = await req.json()
ps = { 'id' : pump } | props
return set_pump(network, ChangeSet(ps))
@@ -768,7 +771,8 @@ async def fastapi_get_valve_properties(network: str, valve: str) -> dict[str, An
return get_valve(network, valve)
@app.post("/setvalveproperties/")
async def fastapi_set_valve_properties(network: str, valve: str, props: dict[str, Any]) -> ChangeSet:
async def fastapi_set_valve_properties(network: str, valve: str, req: Request) -> ChangeSet:
props = await req.json()
ps = { 'id' : valve } | props
return set_valve(network, ChangeSet(ps))