Refine method name

main.py

@@ -558,7 +558,7 @@ async def fastapi_set_tank_properties(network: str, tank: str, req: Request) ->
 # pipe 4.[PIPES]
 ############################################################
 @app.get('/getpipeschema')
-async def fast_get_pipe_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_pipe_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_pipe_schema(network)
 
 @app.post("/addpipe/")
@@ -671,7 +671,7 @@ async def fastapi_set_pipe_properties(network: str, pipe: str, req: Request) ->
 # pump 4.[PUMPS]
 ############################################################
 @app.get('/getpumpschema')
-async def fast_get_pump_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_pump_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_pump_schema(network)
 
 @app.post("/addpump/")
@@ -725,7 +725,7 @@ async def fastapi_set_pump_properties(network: str, pump: str, req: Request) ->
 # valve 4.[VALVES]
 ############################################################
 @app.get('/getvalveschema')
-async def fast_get_valve_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_valve_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_valve_schema(network)
 
 @app.post("/addvalve/")
@@ -865,7 +865,7 @@ async def fastapi_set_tag(network: str, req: Request) -> ChangeSet:
 # demand 9.[DEMANDS]
 ############################################################
 @app.get('/getdemandschema')
-async def fast_get_demand_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_demand_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_demand_schema(network)
 
 @app.get("/getdemandproperties/")
@@ -883,7 +883,7 @@ async def fastapi_set_demand_properties(network: str, junction: str, req: Reques
 # status 10.[STATUS]  init_status
 ############################################################
 @app.get('/getstatusschema')
-async def fast_get_status_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_status_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_status_schema(network)
 
 @app.get("/getstatus/")
@@ -901,7 +901,7 @@ async def fastapi_set_status_properties(network: str, link: str, req: Request) -
 # pattern 11.[PATTERNS]
 ############################################################
 @app.get('/getpatternschema')
-async def fast_get_pattern_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_pattern_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_pattern_schema(network)
 
 @app.post("/addpattern/")
@@ -932,7 +932,7 @@ async def fastapi_set_pattern_properties(network: str, pattern: str, req: Reques
 # curve 12.[CURVES]
 ############################################################
 @app.get('/getcurveschema')
-async def fast_get_curve_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_curve_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_curve_schema(network)
 
 @app.post("/addcurve/")
@@ -1000,18 +1000,18 @@ async def fastapi_set_rule_properties(network: str, req: Request) -> ChangeSet:
 ############################################################
 # energy 15.[ENERGY]
 ############################################################
-@app.get("/getglobalenergyschema/")
+@app.get("/getenergyschema/")
-async def fastapi_get_global_energy_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_energy_schema(network: str) -> dict[str, dict[str, Any]]:
-    return get_global_energy_schema()
+    return get_energy_schema(network)
 
-@app.get("/getglobalenergyproperties/")
+@app.get("/getenergyproperties/")
-async def fastapi_get_global_energy_properties(network: str) -> dict[str, Any]:
+async def fastapi_get_energy_properties(network: str) -> dict[str, Any]:
-    return get_global_energy(network)
+    return get_energy(network)
 
-@app.post("/setglobalenergyproperties/")
+@app.post("/setenergyproperties/")
-async def fastapi_set_global_energy_properties(network: str, req: Request) -> ChangeSet:
+async def fastapi_set_energy_properties(network: str, req: Request) -> ChangeSet:
     props = await req.json()
-    return set_global_energy(network, ChangeSet(props))
+    return set_energy(network, ChangeSet(props))
 
 @app.get("/getpumpenergyschema/")
 async def fastapi_get_pump_energy_schema(network: str) -> dict[str, dict[str, Any]]:
@@ -1031,7 +1031,7 @@ async def fastapi_set_pump_energy_properties(network: str, pump: str, req: Reque
 # emitter 16.[EMITTERS]
 ############################################################
 @app.get('/getemitterschema')
-async def fast_get_emitter_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_emitter_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_emitter_schema(network)
 
 @app.get("/getemitterproperties/")
@@ -1140,26 +1140,26 @@ async def fastapi_set_tank_reaction(network: str, req: Request) -> ChangeSet:
 # mixing 20.[MIXING]
 ############################################################
 @app.get('/getmixingschema/')
-async def get_mixing_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_mixing_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_mixing_schema(network)
 
 @app.get('/getmixing/')
-async def get_mixing(network: str, tank: str) -> dict[str, Any]:
+async def fastapi_get_mixing(network: str, tank: str) -> dict[str, Any]:
     return get_mixing(network, tank)
 
 @app.post('/setmixing/')
-async def set_mixing(network: str, req: Request) -> ChangeSet:
+async def fastapi_set_mixing(network: str, req: Request) -> ChangeSet:
     props = await req.json()
     return api.set_mixing(network, ChangeSet(props))
 
 # example: add_mixing(p, ChangeSet({'tank': 't0', 'model': MIXING_MODEL_MIXED, 'value': 10.0}))
 @app.post('/addmixing/')
-async def add_mixing(network: str, req: Request) -> ChangeSet:
+async def fastapi_add_mixing(network: str, req: Request) -> ChangeSet:
     props = await req.json()
     return add_mixing(network, ChangeSet(props))
 
 @app.post('/deletemixing/')
-async def delete_mixing(network: str, req: Request) -> ChangeSet:
+async def fastapi_delete_mixing(network: str, req: Request) -> ChangeSet:
     props = await req.json()
     return delete_mixing(network, ChangeSet(props))
 
@@ -1168,7 +1168,7 @@ async def delete_mixing(network: str, req: Request) -> ChangeSet:
 # time 21.[TIME]
 ############################################################
 @app.get('/gettimeschema')
-async def fast_get_time_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_time_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_time_schema(network)
 
 @app.get("/gettimeproperties/")
@@ -1184,7 +1184,7 @@ async def fastapi_set_time_properties(network: str, time: str, req: Request) ->
 # option 23.[OPTIONS]
 ############################################################
 @app.get('/getoptionschema/')
-async def fast_get_option_schema(network: str) -> dict[str, dict[str, Any]]:
+async def fastapi_get_option_schema(network: str) -> dict[str, dict[str, Any]]:
     return get_option_schema(network)
 
 @app.get("/getoptionproperties/")
@@ -1217,7 +1217,7 @@ async def fastapi_get_vertex_properties(network: str, link: str) -> dict[str, An
 
 # set_vertex(p, ChangeSet({'link' : 'p0', 'coords': [{'x': 1.0, 'y': 2.0}, {'x': 2.0, 'y': 1.0}]}))
 @app.post('/setvertexproperties/')
-async def set_vertex_properties(network: str, req: Request) -> ChangeSet:
+async def fastapi_set_vertex_properties(network: str, req: Request) -> ChangeSet:
     props = await req.json()
     return set_vertex(network, ChangeSet(props))