diff --git a/api/s10_status.py b/api/s10_status.py index 823b232..9db45bb 100644 --- a/api/s10_status.py +++ b/api/s10_status.py @@ -99,7 +99,7 @@ def inp_in_status(section: list[str]) -> ChangeSet: cs = ChangeSet() for link, values in objs.items(): - obj_cs = {'operation': API_UPDATE, 'type': 'status', 'link' : link, 'status': None, 'setting': None} + obj_cs : dict[str, Any] = g_update_prefix | {'type': 'status', 'link' : link, 'status': None, 'setting': None} for obj in values: if obj.is_status: obj_cs['status'] = obj.status diff --git a/api/s11_patterns.py b/api/s11_patterns.py index f53e3ab..72b1f5f 100644 --- a/api/s11_patterns.py +++ b/api/s11_patterns.py @@ -115,7 +115,7 @@ def inp_in_pattern(section: list[str]) -> ChangeSet: cs = ChangeSet() for id, factors in patterns.items(): - cs.append({'operation': API_ADD, 'type': 'pattern', 'id' : id, 'factors' : factors}) + cs.append(g_add_prefix | {'type': 'pattern', 'id' : id, 'factors' : factors}) return cs diff --git a/api/s12_curves.py b/api/s12_curves.py index e429061..9bd9c2c 100644 --- a/api/s12_curves.py +++ b/api/s12_curves.py @@ -148,7 +148,7 @@ def inp_in_curve(section: list[str]) -> ChangeSet: cs = ChangeSet() for id, coords in curves.items(): c_type = types[id] if id in types else CURVE_TYPE_PUMP - cs.append({'operation': API_ADD, 'type': 'curve', 'id' : id, 'c_type': c_type, 'coords' : coords}) + cs.append(g_add_prefix | {'type': 'curve', 'id' : id, 'c_type': c_type, 'coords' : coords}) return cs diff --git a/api/s13_controls.py b/api/s13_controls.py index 6173167..c8098da 100644 --- a/api/s13_controls.py +++ b/api/s13_controls.py @@ -33,7 +33,7 @@ class InpControl: def inp_in_control(section: list[str]) -> ChangeSet: obj = InpControl(section) - cs = ChangeSet({'operation' : API_UPDATE, 'type': 'control', 'control' : obj.control}) + cs = ChangeSet(g_update_prefix | {'type': 'control', 'control' : obj.control}) return cs diff --git a/api/s14_rules.py b/api/s14_rules.py index e5d1834..4db3ae3 100644 --- a/api/s14_rules.py +++ b/api/s14_rules.py @@ -33,7 +33,7 @@ class InpRule: def inp_in_rule(section: list[str]) -> ChangeSet: obj = InpRule(section) - cs = ChangeSet({'operation' : API_UPDATE, 'type': 'rule', 'rule' : obj.rule}) + cs = ChangeSet(g_update_prefix | {'type': 'rule', 'rule' : obj.rule}) return cs diff --git a/api/s16_emitters.py b/api/s16_emitters.py index ae3040f..2b0c25d 100644 --- a/api/s16_emitters.py +++ b/api/s16_emitters.py @@ -78,7 +78,7 @@ def inp_in_emitter(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpEmitter(s) - cs.append({'operation': API_UPDATE, 'type': 'emitter', 'junction': obj.junction, 'coefficient': obj.coefficient}) + cs.append(g_update_prefix | {'type': 'emitter', 'junction': obj.junction, 'coefficient': obj.coefficient}) return cs diff --git a/api/s17_quality.py b/api/s17_quality.py index b1063b7..d373c12 100644 --- a/api/s17_quality.py +++ b/api/s17_quality.py @@ -78,7 +78,7 @@ def inp_in_quality(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpQuality(s) - cs.append({'operation': API_UPDATE, 'type': 'quality', 'node': obj.node, 'quality': obj.quality}) + cs.append(g_update_prefix | {'type': 'quality', 'node': obj.node, 'quality': obj.quality}) return cs diff --git a/api/s18_sources.py b/api/s18_sources.py index 42985a1..07839eb 100644 --- a/api/s18_sources.py +++ b/api/s18_sources.py @@ -121,7 +121,7 @@ def inp_in_source(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpSource(s) - cs.append({'operation': API_ADD, 'type': 'source', 'node': obj.node, 's_type': obj.s_type, 'strength': obj.strength, 'pattern': obj.pattern}) + cs.append(g_add_prefix | {'type': 'source', 'node': obj.node, 's_type': obj.s_type, 'strength': obj.strength, 'pattern': obj.pattern}) return cs diff --git a/api/s1_title.py b/api/s1_title.py index 4a74810..b521860 100644 --- a/api/s1_title.py +++ b/api/s1_title.py @@ -34,7 +34,7 @@ class InpTitle: def inp_in_title(section: list[str]) -> ChangeSet: obj = InpTitle(section) - cs = ChangeSet({'operation' : API_ADD, 'type': 'title', 'value' : obj.value}) + cs = ChangeSet(g_update_prefix | {'type': 'title', 'value' : obj.value}) return cs diff --git a/api/s20_mixing.py b/api/s20_mixing.py index 2ad4fba..48986e1 100644 --- a/api/s20_mixing.py +++ b/api/s20_mixing.py @@ -116,7 +116,7 @@ def inp_in_mixing(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpMixing(s) - cs.append({'operation': API_ADD, 'type': 'mixing', 'tank': obj.tank, 'model': obj.model, 'value': obj.value}) + cs.append(g_add_prefix | {'type': 'mixing', 'tank': obj.tank, 'model': obj.model, 'value': obj.value}) return cs diff --git a/api/s26_labels.py b/api/s26_labels.py index 8f3ea81..5a0b782 100644 --- a/api/s26_labels.py +++ b/api/s26_labels.py @@ -116,7 +116,7 @@ def inp_in_label(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpLabel(s) - cs.append({'operation': API_ADD, 'type': 'label', 'x': obj.x, 'y': obj.y, 'label': obj.label, 'node': obj.node}) + cs.append(g_add_prefix | {'type': 'label', 'x': obj.x, 'y': obj.y, 'label': obj.label, 'node': obj.node}) return cs diff --git a/api/s2_junctions.py b/api/s2_junctions.py index 40a5bd7..c2275fe 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -142,7 +142,7 @@ def inp_in_junction(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpJunction(s) - cs.append({'operation': API_ADD, 'type': 'junction', 'id': obj.id, 'elevation': obj.elevation, 'demand': obj.demand, 'pattern': obj.pattern}) + cs.append(g_add_prefix | {'type': 'junction', 'id': obj.id, 'elevation': obj.elevation, 'demand': obj.demand, 'pattern': obj.pattern}) return cs diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index d8422f5..01715ec 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -137,7 +137,7 @@ def inp_in_reservoir(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpReservoir(s) - cs.append({'operation': API_ADD, 'type': 'reservoir', 'id': obj.id, 'head': obj.head, 'pattern': obj.pattern}) + cs.append(g_add_prefix | {'type': 'reservoir', 'id': obj.id, 'head': obj.head, 'pattern': obj.pattern}) return cs diff --git a/api/s4_tanks.py b/api/s4_tanks.py index 401b1ba..826aaf2 100644 --- a/api/s4_tanks.py +++ b/api/s4_tanks.py @@ -171,7 +171,7 @@ def inp_in_tank(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpTank(s) - cs.append({'operation': API_ADD, 'type': 'tank', 'id': obj.id, 'elevation': obj.elevation, 'init_level': obj.init_level, 'min_level': obj.min_level, 'max_level': obj.max_level, 'diameter': obj.diameter, 'min_vol': obj.min_vol, 'vol_curve': obj.vol_curve, 'overflow': obj.overflow}) + cs.append(g_add_prefix | {'type': 'tank', 'id': obj.id, 'elevation': obj.elevation, 'init_level': obj.init_level, 'min_level': obj.min_level, 'max_level': obj.max_level, 'diameter': obj.diameter, 'min_vol': obj.min_vol, 'vol_curve': obj.vol_curve, 'overflow': obj.overflow}) return cs diff --git a/api/s5_pipes.py b/api/s5_pipes.py index 8b7a482..32e6015 100644 --- a/api/s5_pipes.py +++ b/api/s5_pipes.py @@ -150,7 +150,7 @@ def inp_in_pipe(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpPipe(s) - cs.append({'operation': API_ADD, 'type': 'pipe', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'length': obj.length, 'diameter': obj.diameter, 'roughness': obj.roughness, 'minor_loss': obj.minor_loss, 'status': obj.status}) + cs.append(g_add_prefix | {'type': 'pipe', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'length': obj.length, 'diameter': obj.diameter, 'roughness': obj.roughness, 'minor_loss': obj.minor_loss, 'status': obj.status}) return cs diff --git a/api/s6_pumps.py b/api/s6_pumps.py index 04781d2..5a07be8 100644 --- a/api/s6_pumps.py +++ b/api/s6_pumps.py @@ -142,7 +142,7 @@ def inp_in_pump(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpPump(s) - cs.append({'operation': API_ADD, 'type': 'pump', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'power': obj.power, 'head': obj.head, 'speed': obj.speed, 'pattern': obj.pattern}) + cs.append(g_add_prefix | {'type': 'pump', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'power': obj.power, 'head': obj.head, 'speed': obj.speed, 'pattern': obj.pattern}) return cs diff --git a/api/s7_valves.py b/api/s7_valves.py index b9cbe22..42ffd92 100644 --- a/api/s7_valves.py +++ b/api/s7_valves.py @@ -147,7 +147,7 @@ def inp_in_valve(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpValve(s) - cs.append({'operation': API_ADD, 'type': 'valve', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'diameter': obj.diameter, 'v_type': obj.v_type, 'setting': obj.setting, 'minor_loss': obj.minor_loss}) + cs.append(g_add_prefix | {'type': 'valve', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'diameter': obj.diameter, 'v_type': obj.v_type, 'setting': obj.setting, 'minor_loss': obj.minor_loss}) return cs diff --git a/api/s8_tags.py b/api/s8_tags.py index bed1862..5d47fb3 100644 --- a/api/s8_tags.py +++ b/api/s8_tags.py @@ -99,7 +99,7 @@ def inp_in_tag(section: list[str]) -> ChangeSet: if s.startswith(';'): continue obj = InpTag(s) - cs.append({'operation': API_UPDATE, 'type': 'tag', 't_type': obj.t_type, 'id': obj.id, 'tag': obj.tag}) + cs.append(g_update_prefix | {'type': 'tag', 't_type': obj.t_type, 'id': obj.id, 'tag': obj.tag}) return cs diff --git a/api/s9_demands.py b/api/s9_demands.py index 13fc0d7..83593f7 100644 --- a/api/s9_demands.py +++ b/api/s9_demands.py @@ -113,7 +113,7 @@ def inp_in_demand(section: list[str]) -> ChangeSet: cs = ChangeSet() for junction, demands in objs.items(): - obj_cs = {'operation': API_UPDATE, 'type': 'demand', 'junction' : junction, 'demands' : []} + obj_cs : dict[str, Any] = g_update_prefix | {'type': 'demand', 'junction' : junction, 'demands' : []} for obj in demands: obj_cs['demands'].append({'demand': obj.demand, 'pattern' : obj.pattern, 'category': obj.category}) cs.append(obj_cs)