From 76c598a167d5aa53963170b2bee4f5a80200c3e4 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Wed, 19 Oct 2022 12:39:28 +0800 Subject: [PATCH] Update reservoir set methods --- main.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index 3ed92d9..a6dd76b 100644 --- a/main.py +++ b/main.py @@ -319,32 +319,32 @@ async def fastapi_get_reservoir_y(network: str, reservoir: str) -> dict[str, flo async def fastapi_set_reservoir_head(network: str, reservoir: str, head: float) -> ChangeSet: ps = { 'id' : reservoir, 'head' : head } - return set_reservoir(network, reservoir, ps) + return set_reservoir(network, reservoir, ChangeSet(ps)) @app.post("/setreservoirpattern/") async def fastapi_set_reservoir_pattern(network: str, reservoir: str, pattern: str) -> ChangeSet: ps = { 'id' : reservoir, 'pattern' : pattern } - return set_reservoir(network, reservoir, ps) + return set_reservoir(network, reservoir, ChangeSet(ps)) @app.post("/setreservoirx/") async def fastapi_set_reservoir_x(network: str, reservoir: str, x: float) -> ChangeSet: ps = { 'id' : reservoir, 'x' : x } - return set_reservoir(network, reservoir, ps) + return set_reservoir(network, reservoir, ChangeSet(ps)) @app.post("/setreservoirx/") async def fastapi_set_reservoir_y(network: str, reservoir: str, y: float) -> ChangeSet: ps = { 'id' : reservoir, 'y' : y } - return set_reservoir(network, reservoir, ps) + return set_reservoir(network, reservoir, ChangeSet(ps)) @app.post("/setreservoircoord/") async def fastapi_set_reservoir_y(network: str, reservoir: str, x: float, y: float) -> ChangeSet: ps = { 'id' : reservoir, 'x' : x, 'y' : y } - return set_reservoir(network, reservoir, ps) + return set_reservoir(network, reservoir, ChangeSet(ps)) @app.get("/getreservoirproperties/") async def fastapi_get_reservoir_properties(network: str, reservoir: str) -> dict[str, Any]: @@ -526,8 +526,6 @@ async def fast_get_pipe_schema(network: str) -> dict[str, dict[str, Any]]: @app.post("/addpipe/") async def fastapi_add_pipe(network: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minor_loss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet: - print('add pipe add pipe') - ps = { 'id' : pipe, 'node1' : node1, 'node2' : node2,