diff --git a/main.py b/main.py index 4f23157..9ee2cb5 100644 --- a/main.py +++ b/main.py @@ -106,37 +106,37 @@ async def fastapi_get_links(network: str) -> list[str]: return get_links(network) @app.get("/islink/") -def fastapi_is_link(network: str, link: str) -> bool: +async def fastapi_is_link(network: str, link: str) -> bool: return is_link(network, link) @app.get("/ispipe/") -def fastapi_is_pipe(network: str, link: str) -> bool: +async def fastapi_is_pipe(network: str, link: str) -> bool: return is_pipe(network, link) @app.get("/ispump/") -def fastapi_is_pump(network: str, link: str) -> bool: +async def fastapi_is_pump(network: str, link: str) -> bool: return is_pump(network, link) @app.get("/isvalve/") -def is_valve(network: str, link: str) -> bool: +async def is_valve(network: str, link: str) -> bool: return is_valve(network, link) # curve @app.get("/getcurves/") -def fastapi_get_curves(network: str) -> list[str]: +async def fastapi_get_curves(network: str) -> list[str]: return get_curves(network) @app.get("/iscurve/") -def fastapi_is_curve(network: str, curve: str) -> bool: +async def fastapi_is_curve(network: str, curve: str) -> bool: return is_curve(network, curve) # parttern @app.get("/getpatterns/") -def fastapi_get_patterns(network: str) -> list[str]: +async def fastapi_get_patterns(network: str) -> list[str]: return get_patterns(network) @app.get("/ispattern/") -def fastapi_is_curve(network: str, pattern: str) -> bool: +async def fastapi_is_curve(network: str, pattern: str) -> bool: return is_pattern(network, pattern) @@ -190,35 +190,35 @@ async def fastapi_set_junction_pattern(network: str, junction: str, pattern: str ############################################################ @app.post("addreservoir/") -def fastapi_add_reservoir(name: str, reservoir: str, x: float, y: float, head: float) -> ChangeSet: +async def fastapi_add_reservoir(name: str, reservoir: str, x: float, y: float, head: float) -> ChangeSet: return add_reservoir(name, reservoir, x, y, head) @app.post("/deletereservoir/") -def fastapi_delete_reservoir(name: str, reservoir: str) -> ChangeSet: +async def fastapi_delete_reservoir(name: str, reservoir: str) -> ChangeSet: return delete_reservoir(name, reservoir) @app.get("/getreservoirhead/") -def fastapi_get_reservoir_head(name: str, reservoir: str) -> float | None: +async def fastapi_get_reservoir_head(name: str, reservoir: str) -> float | None: return get_reservoir_head(name, reservoir) @app.get("/getreservoirpattern/") -def fastapi_get_reservoir_pattern(name: str, reservoir: str) -> str | None: +async def fastapi_get_reservoir_pattern(name: str, reservoir: str) -> str | None: return get_reservoir_pattern(name, reservoir) @app.get("/getreservoircoord/") -def fastapi_get_reservoir_coord(name: str, reservoir: str) -> dict[str, float] | None: +async def fastapi_get_reservoir_coord(name: str, reservoir: str) -> dict[str, float] | None: return get_reservoir_coord(name, reservoir) @app.post("/setreservoirhead/") -def fastapi_set_reservoir_head(name: str, reservoir: str, head: float) -> ChangeSet: +async def fastapi_set_reservoir_head(name: str, reservoir: str, head: float) -> ChangeSet: return set_reservoir_head(name, reservoir, head) @app.post("/setreservoirpattern/") -def fastapi_set_reservoir_pattern(name: str, reservoir: str, pattern: str) -> ChangeSet: +async def fastapi_set_reservoir_pattern(name: str, reservoir: str, pattern: str) -> ChangeSet: return set_reservoir_pattern(name, reservoir, pattern) @app.post("/setreservoircoord/") -def fastapi_set_reservoir_coord(name: str, reservoir: str, x: float, y: float) -> ChangeSet: +async def fastapi_set_reservoir_coord(name: str, reservoir: str, x: float, y: float) -> ChangeSet: return set_reservoir_coord(name, reservoir, x, y) @@ -227,83 +227,83 @@ def fastapi_set_reservoir_coord(name: str, reservoir: str, x: float, y: float) - ############################################################ @app.post("/addtank/") -def fastapi_add_tank(name: str, tank: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet: +async def fastapi_add_tank(name: str, tank: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet: return add_tank(name, tank, x, y, elevation, init_level, min_level, max_level, diameter, min_vol) @app.post("/deletetank/") -def fastapi_delete_tank(name: str, tank: str) -> ChangeSet: +async def fastapi_delete_tank(name: str, tank: str) -> ChangeSet: return delete_tank(name, tank) @app.get("/gettankelevation/") -def fastapi_get_tank_elevation(name: str, tank: str) -> float | None: +async def fastapi_get_tank_elevation(name: str, tank: str) -> float | None: return get_tank_elevation(name, tank) @app.get("/gettankinitlevel/") -def fastapi_get_tank_init_level(name: str, tank: str) -> float | None: +async def fastapi_get_tank_init_level(name: str, tank: str) -> float | None: return get_tank_init_level(name, tank) @app.get("/gettankminlevel/") -def fastapi_get_tank_min_level(name: str, tank: str) -> float | None: +async def fastapi_get_tank_min_level(name: str, tank: str) -> float | None: return get_tank_min_level(name, tank) @app.get("/gettankmaxlevel/") -def fastapi_get_tank_max_level(name: str, tank: str) -> float | None: +async def fastapi_get_tank_max_level(name: str, tank: str) -> float | None: return get_tank_max_level(name, tank) @app.get("/gettankdiameter/") -def fastapi_get_tank_diameter(name: str, tank: str) -> float | None: +async def fastapi_get_tank_diameter(name: str, tank: str) -> float | None: return get_tank_diameter(name, tank) @app.get("/gettankminvol/") -def fastapi_get_tank_min_vol(name: str, tank: str) -> float | None: +async def fastapi_get_tank_min_vol(name: str, tank: str) -> float | None: return get_tank_min_vol(name, tank) @app.get("/gettankvolcurve/") -def fastapi_get_tank_vol_curve(name: str, tank: str) -> str | None: +async def fastapi_get_tank_vol_curve(name: str, tank: str) -> str | None: return get_tank_vol_curve(name, tank) @app.get("/gettankoverflow/") -def fastapi_get_tank_overflow(name: str, tank: str) -> str | None: +async def fastapi_get_tank_overflow(name: str, tank: str) -> str | None: return get_tank_overflow(name, tank) @app.get("/gettankcoord/") -def fastapi_get_tank_coord(name: str, tank: str) -> dict[str, float] | None: +async def fastapi_get_tank_coord(name: str, tank: str) -> dict[str, float] | None: return get_tank_coord(name, tank) @app.post("/settankelevation/") -def fastapi_set_tank_elevation(name: str, tank: str, elevation: float) -> ChangeSet: +async def fastapi_set_tank_elevation(name: str, tank: str, elevation: float) -> ChangeSet: return set_tank_elevation(name, tank, elevation) @app.post("/settankinitlevel/") -def fastapi_set_tank_init_level(name: str, tank: str, init_level: float) -> ChangeSet: +async def fastapi_set_tank_init_level(name: str, tank: str, init_level: float) -> ChangeSet: return set_tank_init_level(name, tank, init_level) @app.post("/settankminlevel/") -def fastapi_set_tank_min_level(name: str, tank: str, min_level: float) -> ChangeSet: +async def fastapi_set_tank_min_level(name: str, tank: str, min_level: float) -> ChangeSet: return set_tank_min_level(name, tank, min_level) @app.post("/settankmaxlevel/") -def fastapi_set_tank_max_level(name: str, tank: str, max_level: float) -> ChangeSet: +async def fastapi_set_tank_max_level(name: str, tank: str, max_level: float) -> ChangeSet: return set_tank_max_level(name, tank, max_level) @app.post("settankdiameter//") -def fastapi_set_tank_diameter(name: str, tank: str, diameter: float) -> ChangeSet: +async def fastapi_set_tank_diameter(name: str, tank: str, diameter: float) -> ChangeSet: return set_tank_diameter(name, tank, diameter) @app.post("/settankminvol/") -def fastapi_set_tank_min_vol(name: str, tank: str, min_vol: float) -> ChangeSet: +async def fastapi_set_tank_min_vol(name: str, tank: str, min_vol: float) -> ChangeSet: return set_tank_min_vol(name, tank, min_vol) @app.post("/settankvolcurve/") -def fastapi_set_tank_vol_curve(name: str, tank: str, vol_curve: str) -> ChangeSet: +async def fastapi_set_tank_vol_curve(name: str, tank: str, vol_curve: str) -> ChangeSet: return set_tank_vol_curve(name, tank, vol_curve) @app.post("/settankoverflow/") -def fastapi_set_tank_overflow(name: str, tank: str, overflow: str) -> ChangeSet: +async def fastapi_set_tank_overflow(name: str, tank: str, overflow: str) -> ChangeSet: return set_tank_overflow(name, tank, overflow) @app.post("/settankcoord/") -def fastapi_set_tank_coord(name: str, tank: str, x: float, y: float) -> ChangeSet: +async def fastapi_set_tank_coord(name: str, tank: str, x: float, y: float) -> ChangeSet: return set_tank_coord(name, tank, x, y) ############################################################ @@ -311,67 +311,67 @@ def fastapi_set_tank_coord(name: str, tank: str, x: float, y: float) -> ChangeSe ############################################################ @app.post("/addpipe/") -def fastapi_add_pipe(network: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minorloss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet: +async def fastapi_add_pipe(network: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minorloss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet: return add_pipe(network, pipe, node1, node2, length, diameter, roughness, minorloss, status) @app.post("/deletepipe/") -def fastapi_delete_pipe(network: str, pipe: str) -> ChangeSet: +async def fastapi_delete_pipe(network: str, pipe: str) -> ChangeSet: return delete_pipe(network, pipe) @app.get("/getpipenode1/") -def fastapi_get_pipe_node1(name: str, pipe: str) -> str | None: +async def fastapi_get_pipe_node1(name: str, pipe: str) -> str | None: return get_pipe_node1(name, pipe) @app.get("/getpipenode2/") -def fastapi_get_pipe_node2(name: str, pipe: str) -> str | None: +async def fastapi_get_pipe_node2(name: str, pipe: str) -> str | None: return get_pipe_node2(name, pipe) @app.get("/getpipelength/") -def fastapi_get_pipe_length(name: str, pipe: str) -> float | None: +async def fastapi_get_pipe_length(name: str, pipe: str) -> float | None: return get_pipe_length(name, pipe) @app.get("/getpipediameter/") -def fastapi_get_pipe_diameter(name: str, pipe: str) -> float | None: +async def fastapi_get_pipe_diameter(name: str, pipe: str) -> float | None: return get_pipe_diameter(name, pipe) @app.get("/getpiperoughness/") -def fastapi_get_pipe_roughness(name: str, pipe: str) -> float | None: +async def fastapi_get_pipe_roughness(name: str, pipe: str) -> float | None: return get_pipe_roughness(name, pipe) @app.get("/getpipeminorloss/") -def fastapi_get_pipe_minor_loss(name: str, pipe: str) -> float | None: +async def fastapi_get_pipe_minor_loss(name: str, pipe: str) -> float | None: return get_pipe_minor_loss(name, pipe) @app.get("/getpipestatus/") -def fastapi_get_pipe_status(name: str, pipe: str) -> str | None: +async def fastapi_get_pipe_status(name: str, pipe: str) -> str | None: return get_pipe_status(name, pipe) @app.post("/setpipenode1/") -def fastapi_set_pipe_node1(name: str, pipe: str, node1: str) -> ChangeSet: +async def fastapi_set_pipe_node1(name: str, pipe: str, node1: str) -> ChangeSet: return set_pipe_node1(name, pipe, node1) @app.post("/setpipenode2/") -def fastapi_set_pipe_node2(name: str, pipe: str, node2: str) -> ChangeSet: +async def fastapi_set_pipe_node2(name: str, pipe: str, node2: str) -> ChangeSet: return set_pipe_node2(name, pipe, node2) @app.post("/setpipelength/") -def fastapi_set_pipe_length(name: str, pipe: str, length: float) -> ChangeSet: +async def fastapi_set_pipe_length(name: str, pipe: str, length: float) -> ChangeSet: return set_pipe_length(name, pipe, length) @app.post("/setpipediameter/") -def fastapi_set_pipe_diameter(name: str, pipe: str, diameter: float) -> ChangeSet: +async def fastapi_set_pipe_diameter(name: str, pipe: str, diameter: float) -> ChangeSet: return set_pipe_diameter(name, pipe, diameter) @app.post("/setpiperoughness/") -def fastapi_set_pipe_roughness(name: str, pipe: str, roughness: float) -> ChangeSet: +async def fastapi_set_pipe_roughness(name: str, pipe: str, roughness: float) -> ChangeSet: return set_pipe_roughness(name, pipe, roughness) @app.post("/setpipeminorloss/") -def fastapi_set_pipe_minor_loss(name: str, pipe: str, minor_loss: float) -> ChangeSet: +async def fastapi_set_pipe_minor_loss(name: str, pipe: str, minor_loss: float) -> ChangeSet: return set_pipe_minor_loss(name, pipe, minor_loss) @app.post("/setpipestatus/") -def fastapi_set_pipe_status(name: str, pipe: str, status: float) -> ChangeSet: +async def fastapi_set_pipe_status(name: str, pipe: str, status: float) -> ChangeSet: return set_pipe_status(name, pipe, status) @@ -380,27 +380,27 @@ def fastapi_set_pipe_status(name: str, pipe: str, status: float) -> ChangeSet: ############################################################ @app.post("/addpump/") -def fastapi_add_pump(network: str, pump: str, node1: str, node2: str) -> ChangeSet: +async def fastapi_add_pump(network: str, pump: str, node1: str, node2: str) -> ChangeSet: return add_pump(network, pump, node1, node2) @app.post("/deletepump/") -def fastapi_delete_pump(network: str, pump: str) -> ChangeSet: +async def fastapi_delete_pump(network: str, pump: str) -> ChangeSet: return delete_pump(network, pump) @app.get("/getpumpnode1/") -def fastapi_get_pump_node1(network: str, pump: str) -> str | None: +async def fastapi_get_pump_node1(network: str, pump: str) -> str | None: return get_pump_node1(network, pump) @app.get("/getpumpnode2/") -def fastapi_get_pump_node2(network: str, pump: str) -> str | None: +async def fastapi_get_pump_node2(network: str, pump: str) -> str | None: return get_pump_node2(network, pump) @app.post("/setpumpnode1/") -def fastapi_set_pump_node1(network: str, pump: str, node1: str) -> ChangeSet: +async def fastapi_set_pump_node1(network: str, pump: str, node1: str) -> ChangeSet: return set_pump_node1(network, pump, node1) @app.post("/setpumpnode2/") -def fastapi_set_pump_node2(network: str, pump: str, node2: str) -> ChangeSet: +async def fastapi_set_pump_node2(network: str, pump: str, node2: str) -> ChangeSet: return set_pump_node2(network, pump, node2) @@ -409,55 +409,55 @@ def fastapi_set_pump_node2(network: str, pump: str, node2: str) -> ChangeSet: ############################################################ @app.post("/addvalve/") -def fastapi_add_valve(name: str, valve: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: +async def fastapi_add_valve(name: str, valve: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: return add_valve(name, valve, node1, node2, diameter, type, setting, minor_loss) @app.post("/deletevalve/") -def fastapi_delete_valve(name: str, valve: str) -> ChangeSet: +async def fastapi_delete_valve(name: str, valve: str) -> ChangeSet: return delete_valve(name, valve) @app.get("/getvalvenode1/") -def fastapi_get_valve_node1(name: str, valve: str) -> str | None: +async def fastapi_get_valve_node1(name: str, valve: str) -> str | None: return get_valve_node1(name, valve) @app.get("/getvalvenode2/") -def fastapi_get_valve_node2(name: str, valve: str) -> str | None: +async def fastapi_get_valve_node2(name: str, valve: str) -> str | None: return get_valve_node2(name, valve) @app.get("/getvalvediameter/") -def fastapi_get_valve_diameter(name: str, valve: str) -> float | None: +async def fastapi_get_valve_diameter(name: str, valve: str) -> float | None: return get_valve_diameter(name, valve) @app.get("/getvalvetype/") -def fastapi_get_valve_type(name: str, valve: str) -> str | None: +async def fastapi_get_valve_type(name: str, valve: str) -> str | None: return get_valve_type(name, valve) @app.get("/getvalvesetting/") -def fastapi_get_valve_setting(name: str, valve: str) -> float | None: +async def fastapi_get_valve_setting(name: str, valve: str) -> float | None: return get_valve_setting(name, valve) @app.get("/getvalveminorloss/") -def fastapi_get_valve_minor_loss(name: str, valve: str) -> float | None: +async def fastapi_get_valve_minor_loss(name: str, valve: str) -> float | None: return get_valve_minor_loss(name, valve) @app.post("/setvalvenode1/") -def fastapi_set_valve_node1(name: str, valve: str, node1: str) -> ChangeSet: +async def fastapi_set_valve_node1(name: str, valve: str, node1: str) -> ChangeSet: return set_valve_node1(name, valve, node1) @app.post("/setvalvenode2/") -def fastapi_set_valve_node2(name: str, valve: str, node2: str) -> ChangeSet: +async def fastapi_set_valve_node2(name: str, valve: str, node2: str) -> ChangeSet: return set_valve_node2(name, valve, node2) @app.post("/setvalvenodediameter/") -def fastapi_set_valve_diameter(name: str, valve: str, diameter: float) -> ChangeSet: +async def fastapi_set_valve_diameter(name: str, valve: str, diameter: float) -> ChangeSet: return set_valve_diameter(name, valve, diameter) @app.post("/setvalvetype/") -def fastapi_set_valve_type(name: str, valve: str, type: str) -> ChangeSet: +async def fastapi_set_valve_type(name: str, valve: str, type: str) -> ChangeSet: return set_valve_type(name, valve, type) @app.post("/setvalvesetting/") -def fastapi_set_valve_setting(name: str, valve: str, setting: float) -> ChangeSet: +async def fastapi_set_valve_setting(name: str, valve: str, setting: float) -> ChangeSet: return set_valve_setting(name, valve, setting)