Rename name to network

main.py

@@ -194,36 +194,36 @@ async def fastapi_set_junction_pattern(network: str, junction: str, pattern: str
 ############################################################
 
 @app.post("addreservoir/")
-async def fastapi_add_reservoir(name: str, reservoir: str, x: float, y: float, head: float) -> ChangeSet:
-    return add_reservoir(name, reservoir, x, y, head)
+async def fastapi_add_reservoir(network: str, reservoir: str, x: float, y: float, head: float) -> ChangeSet:
+    return add_reservoir(network, reservoir, x, y, head)
 
 @app.post("/deletereservoir/")
-async def fastapi_delete_reservoir(name: str, reservoir: str) -> ChangeSet:
-    return delete_reservoir(name, reservoir)
+async def fastapi_delete_reservoir(network: str, reservoir: str) -> ChangeSet:
+    return delete_reservoir(network, reservoir)
 
 @app.get("/getreservoirhead/")
-async def fastapi_get_reservoir_head(name: str, reservoir: str) -> float | None:
-    return get_reservoir_head(name, reservoir)
+async def fastapi_get_reservoir_head(network: str, reservoir: str) -> float | None:
+    return get_reservoir_head(network, reservoir)
 
 @app.get("/getreservoirpattern/")
-async def fastapi_get_reservoir_pattern(name: str, reservoir: str) -> str | None:
-    return get_reservoir_pattern(name, reservoir)
+async def fastapi_get_reservoir_pattern(network: str, reservoir: str) -> str | None:
+    return get_reservoir_pattern(network, reservoir)
 
 @app.get("/getreservoircoord/")
-async def fastapi_get_reservoir_coord(name: str, reservoir: str) -> dict[str, float] | None:
-    return get_reservoir_coord(name, reservoir)
+async def fastapi_get_reservoir_coord(network: str, reservoir: str) -> dict[str, float] | None:
+    return get_reservoir_coord(network, reservoir)
 
 @app.post("/setreservoirhead/")
-async def fastapi_set_reservoir_head(name: str, reservoir: str, head: float) -> ChangeSet:
-    return set_reservoir_head(name, reservoir, head)
+async def fastapi_set_reservoir_head(network: str, reservoir: str, head: float) -> ChangeSet:
+    return set_reservoir_head(network, reservoir, head)
 
 @app.post("/setreservoirpattern/")
-async def fastapi_set_reservoir_pattern(name: str, reservoir: str, pattern: str) -> ChangeSet:
-    return set_reservoir_pattern(name, reservoir, pattern)
+async def fastapi_set_reservoir_pattern(network: str, reservoir: str, pattern: str) -> ChangeSet:
+    return set_reservoir_pattern(network, reservoir, pattern)
 
 @app.post("/setreservoircoord/")
-async def fastapi_set_reservoir_coord(name: str, reservoir: str, x: float, y: float) -> ChangeSet:
-    return set_reservoir_coord(name, reservoir, x, y)
+async def fastapi_set_reservoir_coord(network: str, reservoir: str, x: float, y: float) -> ChangeSet:
+    return set_reservoir_coord(network, reservoir, x, y)
 
 
 ############################################################
@@ -231,84 +231,84 @@ async def fastapi_set_reservoir_coord(name: str, reservoir: str, x: float, y: fl
 ############################################################
 
 @app.post("/addtank/")
-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)
+async def fastapi_add_tank(network: 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(network, tank, x, y, elevation, init_level, min_level, max_level, diameter, min_vol)
 
 @app.post("/deletetank/")
-async def fastapi_delete_tank(name: str, tank: str) -> ChangeSet:
-    return delete_tank(name, tank)
+async def fastapi_delete_tank(network: str, tank: str) -> ChangeSet:
+    return delete_tank(network, tank)
 
 @app.get("/gettankelevation/")
-async def fastapi_get_tank_elevation(name: str, tank: str) -> float | None:
-    return get_tank_elevation(name, tank)
+async def fastapi_get_tank_elevation(network: str, tank: str) -> float | None:
+    return get_tank_elevation(network, tank)
 
 @app.get("/gettankinitlevel/")
-async def fastapi_get_tank_init_level(name: str, tank: str) -> float | None:
-    return get_tank_init_level(name, tank)
+async def fastapi_get_tank_init_level(network: str, tank: str) -> float | None:
+    return get_tank_init_level(network, tank)
 
 @app.get("/gettankminlevel/")
-async def fastapi_get_tank_min_level(name: str, tank: str) -> float | None:
-    return get_tank_min_level(name, tank)
+async def fastapi_get_tank_min_level(network: str, tank: str) -> float | None:
+    return get_tank_min_level(network, tank)
 
 @app.get("/gettankmaxlevel/")
-async def fastapi_get_tank_max_level(name: str, tank: str) -> float | None:
-    return get_tank_max_level(name, tank)
+async def fastapi_get_tank_max_level(network: str, tank: str) -> float | None:
+    return get_tank_max_level(network, tank)
 
 @app.get("/gettankdiameter/")
-async def fastapi_get_tank_diameter(name: str, tank: str) -> float | None:
-    return get_tank_diameter(name, tank)
+async def fastapi_get_tank_diameter(network: str, tank: str) -> float | None:
+    return get_tank_diameter(network, tank)
 
 @app.get("/gettankminvol/")
-async def fastapi_get_tank_min_vol(name: str, tank: str) -> float | None:
-    return get_tank_min_vol(name, tank)
+async def fastapi_get_tank_min_vol(network: str, tank: str) -> float | None:
+    return get_tank_min_vol(network, tank)
 
 @app.get("/gettankvolcurve/")
-async def fastapi_get_tank_vol_curve(name: str, tank: str) -> str | None:
-    return get_tank_vol_curve(name, tank)
+async def fastapi_get_tank_vol_curve(network: str, tank: str) -> str | None:
+    return get_tank_vol_curve(network, tank)
 
 @app.get("/gettankoverflow/")
-async def fastapi_get_tank_overflow(name: str, tank: str) -> str | None:
-    return get_tank_overflow(name, tank)
+async def fastapi_get_tank_overflow(network: str, tank: str) -> str | None:
+    return get_tank_overflow(network, tank)
 
 @app.get("/gettankcoord/")
-async def fastapi_get_tank_coord(name: str, tank: str) -> dict[str, float] | None:
-    return get_tank_coord(name, tank)
+async def fastapi_get_tank_coord(network: str, tank: str) -> dict[str, float] | None:
+    return get_tank_coord(network, tank)
 
 @app.post("/settankelevation/")
-async def fastapi_set_tank_elevation(name: str, tank: str, elevation: float) -> ChangeSet:
-    return set_tank_elevation(name, tank, elevation)
+async def fastapi_set_tank_elevation(network: str, tank: str, elevation: float) -> ChangeSet:
+    return set_tank_elevation(network, tank, elevation)
 
 @app.post("/settankinitlevel/")
-async def fastapi_set_tank_init_level(name: str, tank: str, init_level: float) -> ChangeSet:
-    return set_tank_init_level(name, tank, init_level)
+async def fastapi_set_tank_init_level(network: str, tank: str, init_level: float) -> ChangeSet:
+    return set_tank_init_level(network, tank, init_level)
 
 @app.post("/settankminlevel/")
-async def fastapi_set_tank_min_level(name: str, tank: str, min_level: float) -> ChangeSet:
-    return set_tank_min_level(name, tank, min_level)
+async def fastapi_set_tank_min_level(network: str, tank: str, min_level: float) -> ChangeSet:
+    return set_tank_min_level(network, tank, min_level)
 
 @app.post("/settankmaxlevel/")
-async def fastapi_set_tank_max_level(name: str, tank: str, max_level: float) -> ChangeSet:
-    return set_tank_max_level(name, tank, max_level)
+async def fastapi_set_tank_max_level(network: str, tank: str, max_level: float) -> ChangeSet:
+    return set_tank_max_level(network, tank, max_level)
 
 @app.post("settankdiameter//")
-async def fastapi_set_tank_diameter(name: str, tank: str, diameter: float) -> ChangeSet:
-    return set_tank_diameter(name, tank, diameter)
+async def fastapi_set_tank_diameter(network: str, tank: str, diameter: float) -> ChangeSet:
+    return set_tank_diameter(network, tank, diameter)
 
 @app.post("/settankminvol/")
-async def fastapi_set_tank_min_vol(name: str, tank: str, min_vol: float) -> ChangeSet:
-    return set_tank_min_vol(name, tank, min_vol)
+async def fastapi_set_tank_min_vol(network: str, tank: str, min_vol: float) -> ChangeSet:
+    return set_tank_min_vol(network, tank, min_vol)
 
 @app.post("/settankvolcurve/")
-async def fastapi_set_tank_vol_curve(name: str, tank: str, vol_curve: str) -> ChangeSet:
-    return set_tank_vol_curve(name, tank, vol_curve)
+async def fastapi_set_tank_vol_curve(network: str, tank: str, vol_curve: str) -> ChangeSet:
+    return set_tank_vol_curve(network, tank, vol_curve)
 
 @app.post("/settankoverflow/")
-async def fastapi_set_tank_overflow(name: str, tank: str, overflow: str) -> ChangeSet:
-    return set_tank_overflow(name, tank, overflow)
+async def fastapi_set_tank_overflow(network: str, tank: str, overflow: str) -> ChangeSet:
+    return set_tank_overflow(network, tank, overflow)
 
 @app.post("/settankcoord/")
-async def fastapi_set_tank_coord(name: str, tank: str, x: float, y: float) -> ChangeSet:
-    return set_tank_coord(name, tank, x, y)
+async def fastapi_set_tank_coord(network: str, tank: str, x: float, y: float) -> ChangeSet:
+    return set_tank_coord(network, tank, x, y)
 
 ############################################################
 # pipe 4.[PIPES]
@@ -413,56 +413,56 @@ async def fastapi_set_pump_node2(network: str, pump: str, node2: str) -> ChangeS
 ############################################################
 
 @app.post("/addvalve/")
-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)
+async def fastapi_add_valve(network: 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(network, valve, node1, node2, diameter, type, setting, minor_loss)
 
 @app.post("/deletevalve/")
-async def fastapi_delete_valve(name: str, valve: str) -> ChangeSet:
-    return delete_valve(name, valve)
+async def fastapi_delete_valve(network: str, valve: str) -> ChangeSet:
+    return delete_valve(network, valve)
 
 @app.get("/getvalvenode1/")
-async def fastapi_get_valve_node1(name: str, valve: str) -> str | None:
-    return get_valve_node1(name, valve)
+async def fastapi_get_valve_node1(network: str, valve: str) -> str | None:
+    return get_valve_node1(network, valve)
 
 @app.get("/getvalvenode2/")
-async def fastapi_get_valve_node2(name: str, valve: str) -> str | None:
-    return get_valve_node2(name, valve)
+async def fastapi_get_valve_node2(network: str, valve: str) -> str | None:
+    return get_valve_node2(network, valve)
 
 @app.get("/getvalvediameter/")
-async def fastapi_get_valve_diameter(name: str, valve: str) -> float | None:
-    return get_valve_diameter(name, valve)
+async def fastapi_get_valve_diameter(network: str, valve: str) -> float | None:
+    return get_valve_diameter(network, valve)
 
 @app.get("/getvalvetype/")
-async def fastapi_get_valve_type(name: str, valve: str) -> str | None:
-    return get_valve_type(name, valve)
+async def fastapi_get_valve_type(network: str, valve: str) -> str | None:
+    return get_valve_type(network, valve)
 
 @app.get("/getvalvesetting/")
-async def fastapi_get_valve_setting(name: str, valve: str) -> float | None:
-    return get_valve_setting(name, valve)
+async def fastapi_get_valve_setting(network: str, valve: str) -> float | None:
+    return get_valve_setting(network, valve)
 
 @app.get("/getvalveminorloss/")
-async def fastapi_get_valve_minor_loss(name: str, valve: str) -> float | None:
-    return get_valve_minor_loss(name, valve)
+async def fastapi_get_valve_minor_loss(network: str, valve: str) -> float | None:
+    return get_valve_minor_loss(network, valve)
 
 @app.post("/setvalvenode1/")
-async def fastapi_set_valve_node1(name: str, valve: str, node1: str) -> ChangeSet:
-    return set_valve_node1(name, valve, node1)
+async def fastapi_set_valve_node1(network: str, valve: str, node1: str) -> ChangeSet:
+    return set_valve_node1(network, valve, node1)
 
 @app.post("/setvalvenode2/")
-async def fastapi_set_valve_node2(name: str, valve: str, node2: str) -> ChangeSet:
-    return set_valve_node2(name, valve, node2)
+async def fastapi_set_valve_node2(network: str, valve: str, node2: str) -> ChangeSet:
+    return set_valve_node2(network, valve, node2)
 
 @app.post("/setvalvenodediameter/")
-async def fastapi_set_valve_diameter(name: str, valve: str, diameter: float) -> ChangeSet:
-    return set_valve_diameter(name, valve, diameter)
+async def fastapi_set_valve_diameter(network: str, valve: str, diameter: float) -> ChangeSet:
+    return set_valve_diameter(network, valve, diameter)
 
 @app.post("/setvalvetype/")
-async def fastapi_set_valve_type(name: str, valve: str, type: str) -> ChangeSet:
-    return set_valve_type(name, valve, type)
+async def fastapi_set_valve_type(network: str, valve: str, type: str) -> ChangeSet:
+    return set_valve_type(network, valve, type)
 
 @app.post("/setvalvesetting/")
-async def fastapi_set_valve_setting(name: str, valve: str, setting: float) -> ChangeSet:
-    return set_valve_setting(name, valve, setting)
+async def fastapi_set_valve_setting(network: str, valve: str, setting: float) -> ChangeSet:
+    return set_valve_setting(network, valve, setting)