From 35d2ce08e1733255e6c345a5b41650260185d64f Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Sat, 29 Apr 2023 15:01:11 +0800 Subject: [PATCH] Clean code --- api/batch_cmd.py | 244 +---------------------------------- api/del_cmd.py | 14 +- api/s10_status.py | 4 +- api/s11_patterns.py | 12 +- api/s12_curves.py | 12 +- api/s13_controls.py | 4 +- api/s14_rules.py | 4 +- api/s15_energy.py | 8 +- api/s16_emitters.py | 4 +- api/s17_quality.py | 4 +- api/s18_sources.py | 12 +- api/s19_reactions.py | 12 +- api/s1_title.py | 4 +- api/s20_mixing.py | 12 +- api/s21_times.py | 4 +- api/s25_vertices.py | 16 +-- api/s26_labels.py | 12 +- api/s27_backdrop.py | 4 +- api/s29_scada_device.py | 14 +- api/s2_junctions.py | 12 +- api/s30_scada_device_data.py | 14 +- api/s31_scada_element.py | 14 +- api/s3_reservoirs.py | 12 +- api/s4_tanks.py | 12 +- api/s5_pipes.py | 12 +- api/s6_pumps.py | 12 +- api/s7_valves.py | 12 +- api/s8_tags.py | 4 +- api/s9_demands.py | 4 +- 29 files changed, 133 insertions(+), 375 deletions(-) diff --git a/api/batch_cmd.py b/api/batch_cmd.py index c6d352f..0237171 100644 --- a/api/batch_cmd.py +++ b/api/batch_cmd.py @@ -1,267 +1,25 @@ from .sections import * from .database import API_ADD, API_UPDATE, API_DELETE, ChangeSet, DbChangeSet, execute_command -from .s1_title import set_title_cmd -from .s2_junctions import set_junction_cmd, add_junction_cmd, delete_junction_cmd -from .s3_reservoirs import set_reservoir_cmd, add_reservoir_cmd, delete_reservoir_cmd -from .s4_tanks import set_tank_cmd, add_tank_cmd, delete_tank_cmd -from .s5_pipes import set_pipe_cmd, add_pipe_cmd, delete_pipe_cmd -from .s6_pumps import set_pump_cmd, add_pump_cmd, delete_pump_cmd -from .s7_valves import set_valve_cmd, add_valve_cmd, delete_valve_cmd -from .s8_tags import set_tag_cmd -from .s9_demands import set_demand_cmd -from .s10_status import set_status_cmd -from .s11_patterns import set_pattern_cmd, add_pattern_cmd, delete_pattern_cmd -from .s12_curves import set_curve_cmd, add_curve_cmd, delete_curve_cmd -from .s13_controls import set_control_cmd -from .s14_rules import set_rule_cmd -from .s15_energy import set_energy_cmd, set_pump_energy_cmd -from .s16_emitters import set_emitter_cmd -from .s17_quality import set_quality_cmd -from .s18_sources import set_source_cmd, add_source_cmd, delete_source_cmd -from .s19_reactions import set_reaction_cmd, set_pipe_reaction_cmd, set_tank_reaction_cmd -from .s20_mixing import set_mixing_cmd, add_mixing_cmd, delete_mixing_cmd -from .s21_times import set_time_cmd -#from .s22_report import * from .s23_options_util import set_option_cmd, set_option_v3_cmd -#from .s24_coordinates import * -from .s25_vertices import set_vertex_cmd, add_vertex_cmd, delete_vertex_cmd -from .s26_labels import set_label_cmd, add_label_cmd, delete_label_cmd -from .s27_backdrop import set_backdrop_cmd -# from .s28_end import * -from .s29_scada_device import set_scada_device_cmd, add_scada_device_cmd, delete_scada_device_cmd -from .s30_scada_device_data import set_scada_device_data_cmd, add_scada_device_data_cmd, delete_scada_device_data_cmd -from .s31_scada_element import set_scada_element_cmd, add_scada_element_cmd, delete_scada_element_cmd from .del_cmd_raw import del_cascade_cmd def add_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: - type = cs.operations[0]['type'] - - if type == s1_title: - return None - if type == s2_junction: - return add_junction_cmd(name, cs) - elif type == s3_reservoir: - return add_reservoir_cmd(name, cs) - elif type == s4_tank: - return add_tank_cmd(name, cs) - elif type == s5_pipe: - return add_pipe_cmd(name, cs) - elif type == s6_pump: - return add_pump_cmd(name, cs) - elif type == s7_valve: - return add_valve_cmd(name, cs) - elif type == s8_tag: - return None - elif type == s9_demand: - return None - elif type == s10_status: - return None - elif type == s11_pattern: - return add_pattern_cmd(name, cs) - elif type == s12_curve: - return add_curve_cmd(name, cs) - elif type == s13_control: - return None - elif type == s14_rule: - return None - elif type == s15_energy: - return None - elif type == s15_pump_energy: - return None - elif type == s16_emitter: - return None - elif type == s17_quality: - return None - elif type == s18_source: - return add_source_cmd(name, cs) - elif type == s19_reaction: - return None - elif type == s19_pipe_reaction: - return None - elif type == s19_tank_reaction: - return None - elif type == s20_mixing: - return add_mixing_cmd(name, cs) - elif type == s21_time: - return None - elif type == s22_report: - return None - elif type == s23_option: - return None - elif type == s23_option_v3: - return None - elif type == s24_coordinate: - return None - elif type == s25_vertex: - return add_vertex_cmd(name, cs) - elif type == s26_label: - return add_label_cmd(name, cs) - elif type == s27_backdrop: - return None - elif type == s28_end: - return None - elif type == s29_scada_device: - return add_scada_device_cmd(name, cs) - elif type == s30_scada_device_data: - return add_scada_device_data_cmd(name, cs) - elif type == s31_scada_element: - return add_scada_element_cmd(name, cs) - return None def set_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: type = cs.operations[0]['type'] - if type == s1_title: - return set_title_cmd(name, cs) - if type == s2_junction: - return set_junction_cmd(name, cs) - elif type == s3_reservoir: - return set_reservoir_cmd(name, cs) - elif type == s4_tank: - return set_tank_cmd(name, cs) - elif type == s5_pipe: - return set_pipe_cmd(name, cs) - elif type == s6_pump: - return set_pump_cmd(name, cs) - elif type == s7_valve: - return set_valve_cmd(name, cs) - elif type == s8_tag: - return set_tag_cmd(name, cs) - elif type == s9_demand: - return set_demand_cmd(name, cs) - elif type == s10_status: - return set_status_cmd(name, cs) - elif type == s11_pattern: - return set_pattern_cmd(name, cs) - elif type == s12_curve: - return set_curve_cmd(name, cs) - elif type == s13_control: - return set_control_cmd(name, cs) - elif type == s14_rule: - return set_rule_cmd(name, cs) - elif type == s15_energy: - return set_energy_cmd(name, cs) - elif type == s15_pump_energy: - return set_pump_energy_cmd(name, cs) - elif type == s16_emitter: - return set_emitter_cmd(name, cs) - elif type == s17_quality: - return set_quality_cmd(name, cs) - elif type == s18_source: - return set_source_cmd(name, cs) - elif type == s19_reaction: - return set_reaction_cmd(name, cs) - elif type == s19_pipe_reaction: - return set_pipe_reaction_cmd(name, cs) - elif type == s19_tank_reaction: - return set_tank_reaction_cmd(name, cs) - elif type == s20_mixing: - return set_mixing_cmd(name, cs) - elif type == s21_time: - return set_time_cmd(name, cs) - elif type == s22_report: # no api now - return None - elif type == s23_option: + if type == s23_option: return set_option_cmd(name, cs) elif type == s23_option_v3: return set_option_v3_cmd(name, cs) - elif type == s24_coordinate: # do not support update here - return None - elif type == s25_vertex: - return set_vertex_cmd(name, cs) - elif type == s26_label: - return set_label_cmd(name, cs) - elif type == s27_backdrop: - return set_backdrop_cmd(name, cs) - elif type == s28_end: # end - return None - elif type == s29_scada_device: - return set_scada_device_cmd(name, cs) - elif type == s30_scada_device_data: - return set_scada_device_data_cmd(name, cs) - elif type == s31_scada_element: - return set_scada_element_cmd(name, cs) return None def del_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: - type = cs.operations[0]['type'] - - if type == s1_title: - return None - if type == s2_junction: - return delete_junction_cmd(name, cs) - elif type == s3_reservoir: - return delete_reservoir_cmd(name, cs) - elif type == s4_tank: - return delete_tank_cmd(name, cs) - elif type == s5_pipe: - return delete_pipe_cmd(name, cs) - elif type == s6_pump: - return delete_pump_cmd(name, cs) - elif type == s7_valve: - return delete_valve_cmd(name, cs) - elif type == s8_tag: - return None - elif type == s9_demand: - return None - elif type == s10_status: - return None - elif type == s11_pattern: - return delete_pattern_cmd(name, cs) - elif type == s12_curve: - return delete_curve_cmd(name, cs) - elif type == s13_control: - return None - elif type == s14_rule: - return None - elif type == s15_energy: - return None - elif type == s15_pump_energy: - return None - elif type == s16_emitter: - return None - elif type == s17_quality: - return None - elif type == s18_source: - return delete_source_cmd(name, cs) - elif type == s19_reaction: - return None - elif type == s19_pipe_reaction: - return None - elif type == s19_tank_reaction: - return None - elif type == s20_mixing: - return delete_mixing_cmd(name, cs) - elif type == s21_time: - return None - elif type == s22_report: - return None - elif type == s23_option: - return None - elif type == s23_option_v3: - return None - elif type == s24_coordinate: - return None - elif type == s25_vertex: - return delete_vertex_cmd(name, cs) - elif type == s26_label: - return delete_label_cmd(name, cs) - elif type == s27_backdrop: - return None - elif type == s28_end: - return None - elif type == s29_scada_device: - return delete_scada_device_cmd(name, cs) - elif type == s30_scada_device_data: - return delete_scada_device_data_cmd(name, cs) - elif type == s31_scada_element: - return delete_scada_element_cmd(name, cs) - return None diff --git a/api/del_cmd.py b/api/del_cmd.py index 1d20140..354c819 100644 --- a/api/del_cmd.py +++ b/api/del_cmd.py @@ -1,8 +1,8 @@ from .del_cmd_raw import * -from .batch_cmd import execute_batch_command -from .s29_scada_device import clean_scada_device_cmd -from .s30_scada_device_data import clean_scada_device_data_cmd -from .s31_scada_element import clean_scada_element_cmd +from .batch_cmds import execute_batch_command +from .s29_scada_device import clean_scada_device_cs +from .s30_scada_device_data import clean_scada_device_data_cs +from .s31_scada_element import clean_scada_element_cs def delete_junction_cascade(name: str, cs: ChangeSet) -> ChangeSet: @@ -54,12 +54,12 @@ def delete_curve_cascade(name: str, cs: ChangeSet) -> ChangeSet: def clean_scada_device(name: str) -> ChangeSet: - return execute_batch_command(name, clean_scada_device_cmd(name)) + return execute_batch_command(name, clean_scada_device_cs(name)) def clean_scada_device_data(name: str) -> ChangeSet: - return execute_batch_command(name, clean_scada_device_data_cmd(name)) + return execute_batch_command(name, clean_scada_device_data_cs(name)) def clean_scada_element(name: str) -> ChangeSet: - return execute_batch_command(name, clean_scada_element_cmd(name)) + return execute_batch_command(name, clean_scada_element_cs(name)) diff --git a/api/s10_status.py b/api/s10_status.py index 9aa61c4..cf07ccb 100644 --- a/api/s10_status.py +++ b/api/s10_status.py @@ -39,7 +39,7 @@ class Status(object): return { 'type': self.type, 'link': self.link, 'status': self.status, 'setting': self.setting } -def set_status_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_status(name: str, cs: ChangeSet) -> DbChangeSet: old = Status(get_status(name, cs.operations[0]['link'])) raw_new = get_status(name, cs.operations[0]['link']) @@ -65,7 +65,7 @@ def set_status_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_status(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_status_cmd(name, cs)) + return execute_command(name, _set_status(name, cs)) #-------------------------------------------------------------- diff --git a/api/s11_patterns.py b/api/s11_patterns.py index 236720c..382d554 100644 --- a/api/s11_patterns.py +++ b/api/s11_patterns.py @@ -21,7 +21,7 @@ def get_pattern(name: str, id: str) -> dict[str, Any]: return { 'id': id, 'factors': ps } -def set_pattern_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_pattern(name: str, cs: ChangeSet) -> DbChangeSet: id = cs.operations[0]['id'] f_id = f"'{id}'" @@ -53,10 +53,10 @@ def set_pattern(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pattern(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_pattern_cmd(name, cs)) + return execute_command(name, _set_pattern(name, cs)) -def add_pattern_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_pattern(name: str, cs: ChangeSet) -> DbChangeSet: id = cs.operations[0]['id'] f_id = f"'{id}'" @@ -81,10 +81,10 @@ def add_pattern(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pattern(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_pattern_cmd(name, cs)) + return execute_command(name, _add_pattern(name, cs)) -def delete_pattern_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_pattern(name: str, cs: ChangeSet) -> DbChangeSet: id = cs.operations[0]['id'] f_id = f"'{id}'" @@ -109,7 +109,7 @@ def delete_pattern(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pattern(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_pattern_cmd(name, cs)) + return execute_command(name, _delete_pattern(name, cs)) #-------------------------------------------------------------- diff --git a/api/s12_curves.py b/api/s12_curves.py index a615564..1ea6456 100644 --- a/api/s12_curves.py +++ b/api/s12_curves.py @@ -30,7 +30,7 @@ def get_curve(name: str, id: str) -> dict[str, Any]: return d -def set_curve_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_curve(name: str, cs: ChangeSet) -> DbChangeSet: id = cs.operations[0]['id'] f_id = f"'{id}'" @@ -72,10 +72,10 @@ def set_curve(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_curve(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_curve_cmd(name, cs)) + return execute_command(name, _set_curve(name, cs)) -def add_curve_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_curve(name: str, cs: ChangeSet) -> DbChangeSet: id = cs.operations[0]['id'] f_id = f"'{id}'" @@ -104,10 +104,10 @@ def add_curve(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_curve(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_curve_cmd(name, cs)) + return execute_command(name, _add_curve(name, cs)) -def delete_curve_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_curve(name: str, cs: ChangeSet) -> DbChangeSet: id = cs.operations[0]['id'] f_id = f"'{id}'" @@ -134,7 +134,7 @@ def delete_curve(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_curve(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_curve_cmd(name, cs)) + return execute_command(name, _delete_curve(name, cs)) #-------------------------------------------------------------- diff --git a/api/s13_controls.py b/api/s13_controls.py index 8f50de4..b3cf9b7 100644 --- a/api/s13_controls.py +++ b/api/s13_controls.py @@ -13,7 +13,7 @@ def get_control(name: str) -> dict[str, Any]: return { 'controls': ds } -def set_control_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_control(name: str, cs: ChangeSet) -> DbChangeSet: old = get_control(name) redo_sql = 'delete from controls;' @@ -31,7 +31,7 @@ def set_control_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_control(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_control_cmd(name, cs)) + return execute_command(name, _set_control(name, cs)) #-------------------------------------------------------------- diff --git a/api/s14_rules.py b/api/s14_rules.py index 49a47cf..b7f9e9a 100644 --- a/api/s14_rules.py +++ b/api/s14_rules.py @@ -13,7 +13,7 @@ def get_rule(name: str) -> dict[str, Any]: return { 'rules': ds } -def set_rule_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_rule(name: str, cs: ChangeSet) -> DbChangeSet: old = get_rule(name) redo_sql = 'delete from rules;' @@ -31,7 +31,7 @@ def set_rule_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_rule(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_rule_cmd(name, cs)) + return execute_command(name, _set_rule(name, cs)) #-------------------------------------------------------------- diff --git a/api/s15_energy.py b/api/s15_energy.py index 8bca11b..cc04c6c 100644 --- a/api/s15_energy.py +++ b/api/s15_energy.py @@ -19,7 +19,7 @@ def get_energy(name: str) -> dict[str, Any]: return d -def set_energy_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_energy(name: str, cs: ChangeSet) -> DbChangeSet: raw_old = get_energy(name) old = {} @@ -54,7 +54,7 @@ def set_energy_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_energy(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_energy_cmd(name, cs)) + return execute_command(name, _set_energy(name, cs)) def get_pump_energy_schema(name: str) -> dict[str, dict[str, Any]]: @@ -94,7 +94,7 @@ class PumpEnergy(object): return { 'type': self.type, 'pump': self.pump, 'price': self.price, 'pattern': self.pattern, 'effic': self.effic } -def set_pump_energy_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_pump_energy(name: str, cs: ChangeSet) -> DbChangeSet: old = PumpEnergy(get_pump_energy(name, cs.operations[0]['pump'])) raw_new = get_pump_energy(name, cs.operations[0]['pump']) @@ -128,7 +128,7 @@ def set_pump_energy_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_pump_energy(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_pump_energy_cmd(name, cs)) + return execute_command(name, _set_pump_energy(name, cs)) #-------------------------------------------------------------- diff --git a/api/s16_emitters.py b/api/s16_emitters.py index ee88df4..0bf06ad 100644 --- a/api/s16_emitters.py +++ b/api/s16_emitters.py @@ -30,7 +30,7 @@ class Emitter(object): return { 'type': self.type, 'junction': self.junction, 'coefficient': self.coefficient } -def set_emitter_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_emitter(name: str, cs: ChangeSet) -> DbChangeSet: old = Emitter(get_emitter(name, cs.operations[0]['junction'])) raw_new = get_emitter(name, cs.operations[0]['junction']) @@ -56,7 +56,7 @@ def set_emitter_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_emitter(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_emitter_cmd(name, cs)) + return execute_command(name, _set_emitter(name, cs)) #-------------------------------------------------------------- diff --git a/api/s17_quality.py b/api/s17_quality.py index a524e0c..1087863 100644 --- a/api/s17_quality.py +++ b/api/s17_quality.py @@ -30,7 +30,7 @@ class Quality(object): return { 'type': self.type, 'node': self.node, 'quality': self.quality } -def set_quality_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_quality(name: str, cs: ChangeSet) -> DbChangeSet: old = Quality(get_quality(name, cs.operations[0]['node'])) raw_new = get_quality(name, cs.operations[0]['node']) @@ -56,7 +56,7 @@ def set_quality_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_quality(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_quality_cmd(name, cs)) + return execute_command(name, _set_quality(name, cs)) #-------------------------------------------------------------- diff --git a/api/s18_sources.py b/api/s18_sources.py index dcc4db9..2ea3406 100644 --- a/api/s18_sources.py +++ b/api/s18_sources.py @@ -46,7 +46,7 @@ class Source(object): return { 'type': self.type, 'node': self.node } -def set_source_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_source(name: str, cs: ChangeSet) -> DbChangeSet: old = Source(get_source(name, cs.operations[0]['node'])) raw_new = get_source(name, cs.operations[0]['node']) @@ -67,10 +67,10 @@ def set_source_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_source(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_source_cmd(name, cs)) + return execute_command(name, _set_source(name, cs)) -def add_source_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_source(name: str, cs: ChangeSet) -> DbChangeSet: new = Source(cs.operations[0]) redo_sql = f"insert into sources (node, type, strength, pattern) values ({new.f_node}, {new.f_s_type}, {new.f_strength}, {new.f_pattern});" @@ -83,10 +83,10 @@ def add_source_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def add_source(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, add_source_cmd(name, cs)) + return execute_command(name, _add_source(name, cs)) -def delete_source_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_source(name: str, cs: ChangeSet) -> DbChangeSet: old = Source(get_source(name, cs.operations[0]['node'])) redo_sql = f"delete from sources where node = {old.f_node};" @@ -99,7 +99,7 @@ def delete_source_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def delete_source(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, delete_source_cmd(name, cs)) + return execute_command(name, _delete_source(name, cs)) #-------------------------------------------------------------- diff --git a/api/s19_reactions.py b/api/s19_reactions.py index 19b9c3f..8ebf7a7 100644 --- a/api/s19_reactions.py +++ b/api/s19_reactions.py @@ -22,7 +22,7 @@ def get_reaction(name: str) -> dict[str, Any]: return d -def set_reaction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_reaction(name: str, cs: ChangeSet) -> DbChangeSet: raw_old = get_reaction(name) old = {} @@ -57,7 +57,7 @@ def set_reaction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_reaction(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_reaction_cmd(name, cs)) + return execute_command(name, _set_reaction(name, cs)) def get_pipe_reaction_schema(name: str) -> dict[str, dict[str, Any]]: @@ -92,7 +92,7 @@ class PipeReaction(object): return { 'type': self.type, 'pipe': self.pipe, 'bulk': self.bulk, 'wall': self.wall } -def set_pipe_reaction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_pipe_reaction(name: str, cs: ChangeSet) -> DbChangeSet: old = PipeReaction(get_pipe_reaction(name, cs.operations[0]['pipe'])) raw_new = get_pipe_reaction(name, cs.operations[0]['pipe']) @@ -122,7 +122,7 @@ def set_pipe_reaction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_pipe_reaction(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_pipe_reaction_cmd(name, cs)) + return execute_command(name, _set_pipe_reaction(name, cs)) def get_tank_reaction_schema(name: str) -> dict[str, dict[str, Any]]: @@ -152,7 +152,7 @@ class TankReaction(object): return { 'type': self.type, 'tank': self.tank, 'value': self.value } -def set_tank_reaction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_tank_reaction(name: str, cs: ChangeSet) -> DbChangeSet: old = TankReaction(get_tank_reaction(name, cs.operations[0]['tank'])) raw_new = get_tank_reaction(name, cs.operations[0]['tank']) @@ -178,7 +178,7 @@ def set_tank_reaction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_tank_reaction(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_tank_reaction_cmd(name, cs)) + return execute_command(name, _set_tank_reaction(name, cs)) #-------------------------------------------------------------- diff --git a/api/s1_title.py b/api/s1_title.py index c897c62..a038857 100644 --- a/api/s1_title.py +++ b/api/s1_title.py @@ -10,7 +10,7 @@ def get_title(name: str) -> dict[str, Any]: return { 'value': title['value'] } -def set_title_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_title(name: str, cs: ChangeSet) -> DbChangeSet: new = cs.operations[0]['value'] old = get_title(name)['value'] @@ -24,7 +24,7 @@ def set_title_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_title(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_title_cmd(name ,cs)) + return execute_command(name, _set_title(name ,cs)) def inp_in_title(section: list[str]) -> str: diff --git a/api/s20_mixing.py b/api/s20_mixing.py index 1b8917c..db4c8d3 100644 --- a/api/s20_mixing.py +++ b/api/s20_mixing.py @@ -42,7 +42,7 @@ class Mixing(object): return { 'type': self.type, 'tank': self.tank } -def set_mixing_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_mixing(name: str, cs: ChangeSet) -> DbChangeSet: old = Mixing(get_mixing(name, cs.operations[0]['tank'])) raw_new = get_mixing(name, cs.operations[0]['tank']) @@ -67,10 +67,10 @@ def set_mixing(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_mixing(name, cs.operations[0]['tank']) == {}: return ChangeSet() - return execute_command(name, set_mixing_cmd(name, cs)) + return execute_command(name, _set_mixing(name, cs)) -def add_mixing_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_mixing(name: str, cs: ChangeSet) -> DbChangeSet: new = Mixing(cs.operations[0]) redo_sql = f"insert into mixing (tank, model, value) values ({new.f_tank}, {new.f_model}, {new.f_value});" @@ -87,10 +87,10 @@ def add_mixing(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_mixing(name, cs.operations[0]['tank']) != {}: return ChangeSet() - return execute_command(name, add_mixing_cmd(name, cs)) + return execute_command(name, _add_mixing(name, cs)) -def delete_mixing_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_mixing(name: str, cs: ChangeSet) -> DbChangeSet: old = Mixing(get_mixing(name, cs.operations[0]['tank'])) redo_sql = f"delete from mixing where tank = {old.f_tank};" @@ -107,7 +107,7 @@ def delete_mixing(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_mixing(name, cs.operations[0]['tank']) == {}: return ChangeSet() - return execute_command(name, delete_mixing_cmd(name, cs)) + return execute_command(name, _delete_mixing(name, cs)) #-------------------------------------------------------------- diff --git a/api/s21_times.py b/api/s21_times.py index 590e91d..16910d9 100644 --- a/api/s21_times.py +++ b/api/s21_times.py @@ -29,7 +29,7 @@ def get_time(name: str) -> dict[str, Any]: return d -def set_time_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_time(name: str, cs: ChangeSet) -> DbChangeSet: raw_old = get_time(name) old = {} @@ -64,7 +64,7 @@ def set_time_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_time(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_time_cmd(name, cs)) + return execute_command(name, _set_time(name, cs)) #-------------------------------------------------------------- diff --git a/api/s25_vertices.py b/api/s25_vertices.py index 96c381c..20f8cf5 100644 --- a/api/s25_vertices.py +++ b/api/s25_vertices.py @@ -16,7 +16,7 @@ def get_vertex(name: str, link: str) -> dict[str, Any]: return { 'link': link, 'coords': cs } -def set_vertex_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_vertex(name: str, cs: ChangeSet) -> DbChangeSet: link = cs.operations[0]['link'] old = get_vertex(name, link) @@ -44,34 +44,34 @@ def set_vertex_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_vertex(name: str, cs: ChangeSet) -> ChangeSet: - result = set_vertex_cmd(name, cs) + result = _set_vertex(name, cs) result.redo_cs[0] |= g_update_prefix result.undo_cs[0] |= g_update_prefix return execute_command(name, result) -def add_vertex_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - result = set_vertex_cmd(name, cs) +def _add_vertex(name: str, cs: ChangeSet) -> DbChangeSet: + result = _set_vertex(name, cs) result.redo_cs[0] |= g_add_prefix result.undo_cs[0] |= g_delete_prefix return result -def delete_vertex_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_vertex(name: str, cs: ChangeSet) -> DbChangeSet: cs.operations[0]['coords'] = [] - result = set_vertex_cmd(name, cs) + result = _set_vertex(name, cs) result.redo_cs[0] |= g_delete_prefix result.undo_cs[0] |= g_add_prefix return result def add_vertex(name: str, cs: ChangeSet) -> ChangeSet: - result = add_vertex_cmd(name, cs) + result = _add_vertex(name, cs) return execute_command(name, result) def delete_vertex(name: str, cs: ChangeSet) -> ChangeSet: - result = delete_vertex_cmd(name, cs) + result = _delete_vertex(name, cs) return execute_command(name, result) diff --git a/api/s26_labels.py b/api/s26_labels.py index 437bc0e..c7e7193 100644 --- a/api/s26_labels.py +++ b/api/s26_labels.py @@ -43,7 +43,7 @@ class Label(object): return { 'type': self.type, 'x': self.x, 'y': self.y } -def set_label_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_label(name: str, cs: ChangeSet) -> DbChangeSet: old = Label(get_label(name, cs.operations[0]['x'], cs.operations[0]['y'])) raw_new = get_label(name, cs.operations[0]['x'], cs.operations[0]['y']) @@ -64,10 +64,10 @@ def set_label_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_label(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_label_cmd(name, cs)) + return execute_command(name, _set_label(name, cs)) -def add_label_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_label(name: str, cs: ChangeSet) -> DbChangeSet: new = Label(cs.operations[0]) redo_sql = f"insert into labels (x, y, label, node) values ({new.f_x}, {new.f_y}, {new.f_label}, {new.f_node});" @@ -80,10 +80,10 @@ def add_label_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def add_label(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, add_label_cmd(name, cs)) + return execute_command(name, _add_label(name, cs)) -def delete_label_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_label(name: str, cs: ChangeSet) -> DbChangeSet: old = Label(get_label(name, cs.operations[0]['x'], cs.operations[0]['y'])) redo_sql = f"delete from labels where x = {old.f_x} and y = {old.f_y};" @@ -96,7 +96,7 @@ def delete_label_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def delete_label(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, delete_label_cmd(name, cs)) + return execute_command(name, _delete_label(name, cs)) def inp_in_label(line: str) -> str: diff --git a/api/s27_backdrop.py b/api/s27_backdrop.py index 9766948..18f938a 100644 --- a/api/s27_backdrop.py +++ b/api/s27_backdrop.py @@ -10,7 +10,7 @@ def get_backdrop(name: str) -> dict[str, Any]: return { 'content': e['content'] } -def set_backdrop_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_backdrop(name: str, cs: ChangeSet) -> DbChangeSet: old = get_backdrop(name) redo_sql = f"update backdrop set content = '{cs.operations[0]['content']}' where content = '{old['content']}';" @@ -23,7 +23,7 @@ def set_backdrop_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_backdrop(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_backdrop_cmd(name, cs)) + return execute_command(name, _set_backdrop(name, cs)) def inp_in_backdrop(section: list[str]) -> str: diff --git a/api/s29_scada_device.py b/api/s29_scada_device.py index 7d48978..c4fe561 100644 --- a/api/s29_scada_device.py +++ b/api/s29_scada_device.py @@ -56,7 +56,7 @@ class ScadaDevice(object): return { 'type': self.type, 'id': self.id } -def set_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_scada_device(name: str, cs: ChangeSet) -> DbChangeSet: old = ScadaDevice(get_scada_device(name, cs.operations[0]['id'])) raw_new = get_scada_device(name, cs.operations[0]['id']) @@ -79,10 +79,10 @@ def set_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_scada_device(name: str, cs: ChangeSet) -> ChangeSet: if get_scada_device(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_scada_device_cmd(name, cs)) + return execute_command(name, _set_scada_device(name, cs)) -def add_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_scada_device(name: str, cs: ChangeSet) -> DbChangeSet: new = ScadaDevice(cs.operations[0]) redo_sql = f"insert into scada_device (id, name, address, type) values ({new.f_id}, {new.f_name}, {new.f_address}, {new.f_sd_type});" @@ -97,10 +97,10 @@ def add_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def add_scada_device(name: str, cs: ChangeSet) -> ChangeSet: if get_scada_device(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_scada_device_cmd(name, cs)) + return execute_command(name, _add_scada_device(name, cs)) -def delete_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_scada_device(name: str, cs: ChangeSet) -> DbChangeSet: old = ScadaDevice(get_scada_device(name, cs.operations[0]['id'])) redo_sql = f"delete from scada_device where id = {old.f_id};" @@ -115,10 +115,10 @@ def delete_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def delete_scada_device(name: str, cs: ChangeSet) -> ChangeSet: if get_scada_device(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_scada_device_cmd(name, cs)) + return execute_command(name, _delete_scada_device(name, cs)) -def clean_scada_device_cmd(name: str) -> ChangeSet: +def clean_scada_device_cs(name: str) -> ChangeSet: cs = ChangeSet() rows = read_all(name, 'select id from scada_device acs') diff --git a/api/s2_junctions.py b/api/s2_junctions.py index a09f484..84164ea 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -44,7 +44,7 @@ class Junction(object): return { 'type': self.type, 'id': self.id } -def set_junction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_junction(name: str, cs: ChangeSet) -> DbChangeSet: old = Junction(get_junction(name, cs.operations[0]['id'])) raw_new = get_junction(name, cs.operations[0]['id']) @@ -72,10 +72,10 @@ def set_junction(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_junction(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_junction_cmd(name, cs)) + return execute_command(name, _set_junction(name, cs)) -def add_junction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_junction(name: str, cs: ChangeSet) -> DbChangeSet: new = Junction(cs.operations[0]) redo_sql = f"insert into _node (id, type) values ({new.f_id}, {new.f_type});" @@ -97,10 +97,10 @@ def add_junction(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_junction(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_junction_cmd(name, cs)) + return execute_command(name, _add_junction(name, cs)) -def delete_junction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_junction(name: str, cs: ChangeSet) -> DbChangeSet: old = Junction(get_junction(name, cs.operations[0]['id'])) redo_sql = sql_delete_coord(old.id) @@ -122,7 +122,7 @@ def delete_junction(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_junction(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_junction_cmd(name, cs)) + return execute_command(name, _delete_junction(name, cs)) #-------------------------------------------------------------- diff --git a/api/s30_scada_device_data.py b/api/s30_scada_device_data.py index e09b813..34ac4e1 100644 --- a/api/s30_scada_device_data.py +++ b/api/s30_scada_device_data.py @@ -16,7 +16,7 @@ def get_scada_device_data(name: str, device_id: str) -> dict[str, Any]: return { 'device_id': device_id, 'data': ds } -def set_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet: device_id = cs.operations[0]['device_id'] old = get_scada_device_data(name, device_id) @@ -45,10 +45,10 @@ def set_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_scada_device_data_cmd(name, cs)) + return execute_command(name, _set_scada_device_data(name, cs)) -def add_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet: values = cs.operations[0] device_id = values['device_id'] time = values['time'] @@ -66,10 +66,10 @@ def add_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'") if row != None: return ChangeSet() - return execute_command(name, add_scada_device_data_cmd(name, cs)) + return execute_command(name, _add_scada_device_data(name, cs)) -def delete_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_scada_device_data(name: str, cs: ChangeSet) -> DbChangeSet: values = cs.operations[0] device_id = values['device_id'] time = values['time'] @@ -87,10 +87,10 @@ def delete_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'") if row == None: return ChangeSet() - return execute_command(name, delete_scada_device_data_cmd(name, cs)) + return execute_command(name, _delete_scada_device_data(name, cs)) -def clean_scada_device_data_cmd(name: str) -> ChangeSet: +def clean_scada_device_data_cs(name: str) -> ChangeSet: cs = ChangeSet() rows = read_all(name, 'select distinct device_id from scada_device_data acs') diff --git a/api/s31_scada_element.py b/api/s31_scada_element.py index ab47316..798b013 100644 --- a/api/s31_scada_element.py +++ b/api/s31_scada_element.py @@ -114,7 +114,7 @@ class ScadaModel(object): return { 'type': self.type, 'id': self.id } -def set_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_scada_element(name: str, cs: ChangeSet) -> DbChangeSet: old = ScadaModel(get_scada_element(name, cs.operations[0]['id'])) raw_new = get_scada_element(name, cs.operations[0]['id']) @@ -139,10 +139,10 @@ def set_scada_element(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if _check_model(name, cs) == False: return ChangeSet() - return execute_command(name, set_scada_element_cmd(name, cs)) + return execute_command(name, _set_scada_element(name, cs)) -def add_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_scada_element(name: str, cs: ChangeSet) -> DbChangeSet: new = ScadaModel(cs.operations[0]) redo_sql = f"insert into scada_element (id, x, y, device_id, model_id, model_type, status) values ({new.f_id}, {new.f_x}, {new.f_y}, {new.f_device_id}, {new.f_model_id}, {new.f_model_type}, {new.f_status});" @@ -159,10 +159,10 @@ def add_scada_element(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if _check_model(name, cs) == False: return ChangeSet() - return execute_command(name, add_scada_element_cmd(name, cs)) + return execute_command(name, _add_scada_element(name, cs)) -def delete_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_scada_element(name: str, cs: ChangeSet) -> DbChangeSet: old = ScadaModel(get_scada_element(name, cs.operations[0]['id'])) redo_sql = f"delete from scada_element where id = {old.f_id};" @@ -177,10 +177,10 @@ def delete_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def delete_scada_element(name: str, cs: ChangeSet) -> ChangeSet: if get_scada_element(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_scada_element_cmd(name, cs)) + return execute_command(name, _delete_scada_element(name, cs)) -def clean_scada_element_cmd(name: str) -> ChangeSet: +def clean_scada_element_cs(name: str) -> ChangeSet: cs = ChangeSet() rows = read_all(name, 'select id from scada_element acs') diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index bac215d..992b50b 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -48,7 +48,7 @@ class Reservoir(object): return { 'type': self.type, 'id': self.id } -def set_reservoir_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_reservoir(name: str, cs: ChangeSet) -> DbChangeSet: old = Reservoir(get_reservoir(name, cs.operations[0]['id'])) raw_new = get_reservoir(name, cs.operations[0]['id']) @@ -76,10 +76,10 @@ def set_reservoir(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_reservoir(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_reservoir_cmd(name, cs)) + return execute_command(name, _set_reservoir(name, cs)) -def add_reservoir_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_reservoir(name: str, cs: ChangeSet) -> DbChangeSet: new = Reservoir(cs.operations[0]) redo_sql = f"insert into _node (id, type) values ({new.f_id}, {new.f_type});" @@ -101,10 +101,10 @@ def add_reservoir(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_reservoir(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_reservoir_cmd(name, cs)) + return execute_command(name, _add_reservoir(name, cs)) -def delete_reservoir_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_reservoir(name: str, cs: ChangeSet) -> DbChangeSet: old = Reservoir(get_reservoir(name, cs.operations[0]['id'])) redo_sql = sql_delete_coord(old.id) @@ -126,7 +126,7 @@ def delete_reservoir(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_reservoir(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_reservoir_cmd(name, cs)) + return execute_command(name, _delete_reservoir(name, cs)) #-------------------------------------------------------------- diff --git a/api/s4_tanks.py b/api/s4_tanks.py index 98ce2ea..837c9af 100644 --- a/api/s4_tanks.py +++ b/api/s4_tanks.py @@ -76,7 +76,7 @@ class Tank(object): return { 'type': self.type, 'id': self.id } -def set_tank_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_tank(name: str, cs: ChangeSet) -> DbChangeSet: old = Tank(get_tank(name, cs.operations[0]['id'])) raw_new = get_tank(name, cs.operations[0]['id']) @@ -104,10 +104,10 @@ def set_tank(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_tank(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_tank_cmd(name, cs)) + return execute_command(name, _set_tank(name, cs)) -def add_tank_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_tank(name: str, cs: ChangeSet) -> DbChangeSet: new = Tank(cs.operations[0]) redo_sql = f"insert into _node (id, type) values ({new.f_id}, {new.f_type});" @@ -129,10 +129,10 @@ def add_tank(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_tank(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_tank_cmd(name, cs)) + return execute_command(name, _add_tank(name, cs)) -def delete_tank_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_tank(name: str, cs: ChangeSet) -> DbChangeSet: old = Tank(get_tank(name, cs.operations[0]['id'])) redo_sql = sql_delete_coord(old.id) @@ -154,7 +154,7 @@ def delete_tank(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_tank(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_tank_cmd(name, cs)) + return execute_command(name, _delete_tank(name, cs)) #-------------------------------------------------------------- diff --git a/api/s5_pipes.py b/api/s5_pipes.py index 4c6c089..248e607 100644 --- a/api/s5_pipes.py +++ b/api/s5_pipes.py @@ -63,7 +63,7 @@ class Pipe(object): return { 'type': self.type, 'id': self.id } -def set_pipe_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_pipe(name: str, cs: ChangeSet) -> DbChangeSet: old = Pipe(get_pipe(name, cs.operations[0]['id'])) raw_new = get_pipe(name, cs.operations[0]['id']) @@ -88,10 +88,10 @@ def set_pipe(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pipe(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_pipe_cmd(name, cs)) + return execute_command(name, _set_pipe(name, cs)) -def add_pipe_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_pipe(name: str, cs: ChangeSet) -> DbChangeSet: new = Pipe(cs.operations[0]) redo_sql = f"insert into _link (id, type) values ({new.f_id}, {new.f_type});" @@ -111,10 +111,10 @@ def add_pipe(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pipe(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_pipe_cmd(name, cs)) + return execute_command(name, _add_pipe(name, cs)) -def delete_pipe_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_pipe(name: str, cs: ChangeSet) -> DbChangeSet: old = Pipe(get_pipe(name, cs.operations[0]['id'])) redo_sql = f"delete from pipes where id = {old.f_id};" @@ -134,7 +134,7 @@ def delete_pipe(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pipe(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_pipe_cmd(name, cs)) + return execute_command(name, _delete_pipe(name, cs)) #-------------------------------------------------------------- diff --git a/api/s6_pumps.py b/api/s6_pumps.py index 1f73cfb..d57a2c4 100644 --- a/api/s6_pumps.py +++ b/api/s6_pumps.py @@ -54,7 +54,7 @@ class Pump(object): return { 'type': self.type, 'id': self.id } -def set_pump_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_pump(name: str, cs: ChangeSet) -> DbChangeSet: old = Pump(get_pump(name, cs.operations[0]['id'])) raw_new = get_pump(name, cs.operations[0]['id']) @@ -79,10 +79,10 @@ def set_pump(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pump(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_pump_cmd(name, cs)) + return execute_command(name, _set_pump(name, cs)) -def add_pump_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_pump(name: str, cs: ChangeSet) -> DbChangeSet: new = Pump(cs.operations[0]) redo_sql = f"insert into _link (id, type) values ({new.f_id}, {new.f_type});" @@ -102,10 +102,10 @@ def add_pump(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pump(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_pump_cmd(name, cs)) + return execute_command(name, _add_pump(name, cs)) -def delete_pump_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_pump(name: str, cs: ChangeSet) -> DbChangeSet: old = Pump(get_pump(name, cs.operations[0]['id'])) redo_sql = f"delete from pumps where id = {old.f_id};" @@ -125,7 +125,7 @@ def delete_pump(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_pump(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_pump_cmd(name, cs)) + return execute_command(name, _delete_pump(name, cs)) #-------------------------------------------------------------- diff --git a/api/s7_valves.py b/api/s7_valves.py index c828916..64f79bc 100644 --- a/api/s7_valves.py +++ b/api/s7_valves.py @@ -62,7 +62,7 @@ class Valve(object): return { 'type': self.type, 'id': self.id } -def set_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_valve(name: str, cs: ChangeSet) -> DbChangeSet: old = Valve(get_valve(name, cs.operations[0]['id'])) raw_new = get_valve(name, cs.operations[0]['id']) @@ -87,10 +87,10 @@ def set_valve(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_valve(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, set_valve_cmd(name, cs)) + return execute_command(name, _set_valve(name, cs)) -def add_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _add_valve(name: str, cs: ChangeSet) -> DbChangeSet: new = Valve(cs.operations[0]) redo_sql = f"insert into _link (id, type) values ({new.f_id}, {new.f_type});" @@ -110,10 +110,10 @@ def add_valve(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_valve(name, cs.operations[0]['id']) != {}: return ChangeSet() - return execute_command(name, add_valve_cmd(name, cs)) + return execute_command(name, _add_valve(name, cs)) -def delete_valve_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _delete_valve(name: str, cs: ChangeSet) -> DbChangeSet: old = Valve(get_valve(name, cs.operations[0]['id'])) redo_sql = f"delete from valves where id = {old.f_id};" @@ -133,7 +133,7 @@ def delete_valve(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() if get_valve(name, cs.operations[0]['id']) == {}: return ChangeSet() - return execute_command(name, delete_valve_cmd(name, cs)) + return execute_command(name, _delete_valve(name, cs)) #-------------------------------------------------------------- diff --git a/api/s8_tags.py b/api/s8_tags.py index aa2ed7a..9f72610 100644 --- a/api/s8_tags.py +++ b/api/s8_tags.py @@ -53,7 +53,7 @@ class Tag(object): return { 'type': self.type, 't_type': self.t_type, 'id': self.id, 'tag': self.tag } -def set_tag_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_tag(name: str, cs: ChangeSet) -> DbChangeSet: old = Tag(get_tag(name, cs.operations[0]['t_type'], cs.operations[0]['id'])) raw_new = get_tag(name, cs.operations[0]['t_type'], cs.operations[0]['id']) @@ -89,7 +89,7 @@ def set_tag_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_tag(name: str, cs: ChangeSet) -> ChangeSet: if 't_type' not in cs.operations[0] or 'id' not in cs.operations[0] or 'tag' not in cs.operations[0]: return ChangeSet() - return execute_command(name, set_tag_cmd(name, cs)) + return execute_command(name, _set_tag(name, cs)) def inp_in_tag(line: str) -> str: diff --git a/api/s9_demands.py b/api/s9_demands.py index e1465e4..de3de41 100644 --- a/api/s9_demands.py +++ b/api/s9_demands.py @@ -20,7 +20,7 @@ def get_demand(name: str, junction: str) -> dict[str, Any]: return { 'junction': junction, 'demands': ds } -def set_demand_cmd(name: str, cs: ChangeSet) -> DbChangeSet: +def _set_demand(name: str, cs: ChangeSet) -> DbChangeSet: junction = cs.operations[0]['junction'] old = get_demand(name, junction) new = { 'junction': junction, 'demands': [] } @@ -56,7 +56,7 @@ def set_demand_cmd(name: str, cs: ChangeSet) -> DbChangeSet: def set_demand(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_demand_cmd(name, cs)) + return execute_command(name, _set_demand(name, cs)) #--------------------------------------------------------------