Clean code

api/__init__.py

@@ -32,25 +32,25 @@ from .s0_base import get_node_links
 from .s1_title import get_title_schema, get_title, set_title
 
 from .s2_junctions import get_junction_schema, add_junction, get_junction, set_junction
-from .del_cmd import delete_junction_cascade
+from .api_batch import delete_junction_cascade
 
 from .s3_reservoirs import get_reservoir_schema, add_reservoir, get_reservoir, set_reservoir
-from .del_cmd import delete_reservoir_cascade
+from .api_batch import delete_reservoir_cascade
 
 from .s4_tanks import OVERFLOW_YES, OVERFLOW_NO
 from .s4_tanks import get_tank_schema, add_tank, get_tank, set_tank
-from .del_cmd import delete_tank_cascade
+from .api_batch import delete_tank_cascade
 
 from .s5_pipes import PIPE_STATUS_OPEN, PIPE_STATUS_CLOSED, PIPE_STATUS_CV
 from .s5_pipes import get_pipe_schema, add_pipe, get_pipe, set_pipe
-from .del_cmd import delete_pipe_cascade
+from .api_batch import delete_pipe_cascade
 
 from .s6_pumps import get_pump_schema, add_pump, get_pump, set_pump
-from .del_cmd import delete_pump_cascade
+from .api_batch import delete_pump_cascade
 
 from .s7_valves import VALVES_TYPE_PRV, VALVES_TYPE_PSV, VALVES_TYPE_PBV, VALVES_TYPE_FCV, VALVES_TYPE_TCV, VALVES_TYPE_GPV
 from .s7_valves import get_valve_schema, add_valve, get_valve, set_valve
-from .del_cmd import delete_valve_cascade
+from .api_batch import delete_valve_cascade
 
 from .s8_tags import TAG_TYPE_NODE, TAG_TYPE_LINK
 from .s8_tags import get_tag_schema, get_tags, get_tag, set_tag
@@ -61,11 +61,11 @@ from .s10_status import LINK_STATUS_OPEN, LINK_STATUS_CLOSED, LINK_STATUS_ACTIVE
 from .s10_status import get_status_schema, get_status, set_status
 
 from .s11_patterns import get_pattern_schema, get_pattern, set_pattern, add_pattern
-from .del_cmd import delete_pattern_cascade
+from .api_batch import delete_pattern_cascade
 
 from .s12_curves import CURVE_TYPE_PUMP, CURVE_TYPE_EFFICIENCY, CURVE_TYPE_VOLUME, CURVE_TYPE_HEADLOSS
 from .s12_curves import get_curve_schema, get_curve, set_curve, add_curve
-from .del_cmd import delete_curve_cascade
+from .api_batch import delete_curve_cascade
 
 from .s13_controls import get_control_schema, get_control, set_control
 
@@ -98,7 +98,7 @@ from .s23_options_util import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE
 from .s23_options_util import OPTION_DEMAND_MODEL_DDA, OPTION_DEMAND_MODEL_PDA
 from .s23_options_util import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE
 from .s23_options_util import get_option_schema, get_option
-from .s23_options import set_option
+from .api_batch import set_option_ex
 
 from .s23_options_util import OPTION_V3_FLOW_UNITS_CFS, OPTION_V3_FLOW_UNITS_GPM, OPTION_V3_FLOW_UNITS_MGD, OPTION_V3_FLOW_UNITS_IMGD, OPTION_V3_FLOW_UNITS_AFD, OPTION_V3_FLOW_UNITS_LPS, OPTION_V3_FLOW_UNITS_LPM, OPTION_V3_FLOW_UNITS_MLD, OPTION_V3_FLOW_UNITS_CMH, OPTION_V3_FLOW_UNITS_CMD
 from .s23_options_util import OPTION_V3_PRESSURE_UNITS_PSI, OPTION_V3_PRESSURE_UNITS_KPA, OPTION_V3_PRESSURE_UNITS_M
@@ -110,7 +110,7 @@ from .s23_options_util import OPTION_V3_LEAKAGE_MODEL_NONE, OPTION_V3_LEAKAGE_MO
 from .s23_options_util import OPTION_V3_QUALITY_MODEL_NONE, OPTION_V3_QUALITY_MODEL_CHEMICAL, OPTION_V3_QUALITY_MODEL_AGE, OPTION_V3_QUALITY_MODEL_TRACE
 from .s23_options_util import OPTION_V3_QUALITY_UNITS_HRS, OPTION_V3_QUALITY_UNITS_PCNT, OPTION_V3_QUALITY_UNITS_MGL, OPTION_V3_QUALITY_UNITS_UGL
 from .s23_options_util import get_option_v3_schema, get_option_v3
-from .s23_options_v3 import set_option_v3
+from .api_batch import set_option_v3_ex
 
 from .s24_coordinates import get_node_coord
 
@@ -122,14 +122,14 @@ from .s27_backdrop import get_backdrop_schema, get_backdrop, set_backdrop
 
 from .s29_scada_device import SCADA_DEVICE_TYPE_PRESSURE, SCADA_DEVICE_TYPE_DEMAND, SCADA_DEVICE_TYPE_QUALITY, SCADA_DEVICE_TYPE_LEVEL, SCADA_DEVICE_TYPE_FLOW
 from .s29_scada_device import get_scada_device_schema, get_scada_devices, get_scada_device, set_scada_device, add_scada_device, delete_scada_device
-from .del_cmd import clean_scada_device
+from .api_batch import clean_scada_device
 
 from .s30_scada_device_data import get_scada_device_data_schema, get_scada_device_data, set_scada_device_data, add_scada_device_data, delete_scada_device_data
-from .del_cmd import clean_scada_device_data
+from .api_batch import clean_scada_device_data
 
 from .s31_scada_element import SCADA_MODEL_TYPE_JUNCTION, SCADA_MODEL_TYPE_RESERVOIR, SCADA_MODEL_TYPE_TANK, SCADA_MODEL_TYPE_PIPE, SCADA_MODEL_TYPE_PUMP, SCADA_MODEL_TYPE_VALVE
 from .s31_scada_element import SCADA_ELEMENT_STATUS_OFFLINE, SCADA_ELEMENT_STATUS_ONLINE
 from .s31_scada_element import get_scada_element_schema, get_scada_elements, get_scada_element, set_scada_element, add_scada_element, delete_scada_element
-from .del_cmd import clean_scada_element
+from .api_batch import clean_scada_element
 
 from .s37_virtual_district import calculate_virtual_district