From 3de39975caa3b29d92282aff061e134147f739f0 Mon Sep 17 00:00:00 2001 From: wqy Date: Sun, 25 Sep 2022 01:27:35 +0800 Subject: [PATCH] Update valve api and test --- api/__init__.py | 4 +- api/s6_pumps.py | 95 ---------------------------------- api/s7_valves.py | 126 ++++++++++++++++++++++++++++++++++++++++++++++ test_tjnetwork.py | 79 +++++++++++++++-------------- tjnetwork.py | 33 ++++-------- 5 files changed, 176 insertions(+), 161 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 3025bf3..543fa84 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -31,8 +31,6 @@ from .s5_pipes import get_pipe_schema, add_pipe, get_pipe, set_pipe, delete_pipe from .s6_pumps import get_pump_schema, add_pump, get_pump, set_pump, delete_pump 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 add_valve, delete_valve -from .s7_valves import set_valve_node1, set_valve_node2, set_valve_diameter, set_valve_type, set_valve_setting, set_valve_minor_loss -from .s7_valves import get_valve_property_names, get_valve_properties +from .s7_valves import get_valve_schema, add_valve, get_valve, set_valve, delete_valve # from .s24_coordinates import get_node_coord, set_node_coord \ No newline at end of file diff --git a/api/s6_pumps.py b/api/s6_pumps.py index 9682950..f4cde9a 100644 --- a/api/s6_pumps.py +++ b/api/s6_pumps.py @@ -111,98 +111,3 @@ def delete_pump(name: str, id: str) -> ChangeSet: write(name, sql) add_operation(name, sql.replace("'", "''"), undo, 'delete_pump', API_DELETE, PUMP, id) return get_current_change_set(name) - - -''' -def add_pump(name: str, id: str, node1: str, node2: str) -> ChangeSet: - if not is_node(name, node1): - return ChangeSet() - if not is_node(name, node2): - return ChangeSet() - if node1 == node2: - return ChangeSet() - - sql = f"insert into pumps (id, node1, node2) values ('{id}', '{node1}', '{node2}');" - undo_sql = f'delete from pumps where id = "{id}";' - return add_link(name, PUMP, id, sql, undo_sql) - - -def _get_pump(name: str, id: str) -> Row | None: - return query(name, f"select node1, node2 from pumps where id = '{id}'") - - -def delete_pump(name: str, id: str) -> ChangeSet: - if not is_pump(name, id): - return ChangeSet() - - row = _get_pump(name, id) - if row == None: - return ChangeSet() - - node1, node2 = row['node1'], row['node2'] - - sql = f"delete from pumps where id = '{id}';" - undo_sql = f'insert into pumps (id, node1, node2) values ("{id}", "{node1}", "{node2}");' - - return delete_link(name, PUMP, id, sql, undo_sql) - - -def _get_pump_node1(name: str, id: str) -> str | None: - row = _get_pump(name, id) - return row['node1'] if row != None else None - - -def _get_pump_node2(name: str, id: str) -> str | None: - row = _get_pump(name, id) - return row['node2'] if row != None else None - - -def _set_pump(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet: - if not is_pump(name, id): - return ChangeSet() - - row = _get_pump(name, id) - if row == None: - return ChangeSet() - - return update(name, PUMP, 'pumps', 'id', id, key, key_type, row[key], value, optional) - - -def set_pump_node1(name: str, id: str, node1: str) -> ChangeSet: - if not is_node(name, node1): - return ChangeSet() - if _get_pump_node2(name, id) == node1: - return ChangeSet() - - return _set_pump(name, id, 'node1', 'str', str(node1)) - - -def set_pump_node2(name: str, id: str, node2: str) -> ChangeSet: - if not is_node(name, node2): - return ChangeSet() - if _get_pump_node1(name, id) == node2: - return ChangeSet() - - return _set_pump(name, id, 'node2', 'str', str(node2)) - - -def set_pump_power(name: str, id: str) -> ChangeSet: pass -def set_pump_speed(name: str, id: str) -> ChangeSet: pass -def set_pump_head(name: str, id: str) -> ChangeSet: pass -def set_pump_pattern(name: str, id: str) -> ChangeSet: pass - - -def get_pump_property_names(name: str) -> list[str]: - return ['node1', 'node2'] - - -def get_pump_properties(name: str, id: str) -> dict[str, Any] | None: - row = _get_pump(name, id) - if row == None: - return None - - ps: dict[str, str] = {} - ps['node1'] = row['node1'] if row != None else None - ps['node2'] = row['node2'] if row != None else None - return ps -''' \ No newline at end of file diff --git a/api/s7_valves.py b/api/s7_valves.py index 64dd5c1..8007a21 100644 --- a/api/s7_valves.py +++ b/api/s7_valves.py @@ -2,7 +2,9 @@ from typing import Any from psycopg.rows import Row from .s0_base import * from .change_set import ChangeSet +from .s24_coordinates import * from .utility import * +from .schema import * VALVES_TYPE_PRV = 'prv' @@ -13,6 +15,129 @@ VALVES_TYPE_TCV = 'tcv' VALVES_TYPE_GPV = 'gpv' +schema: dict[str, dict[str, Any]] = { \ + 'id' : define_property(str_type, False, True), \ + 'node1' : define_property(str_type), \ + 'node2' : define_property(str_type), \ + 'diameter' : define_property(float_type), \ + 'type' : define_property(str_type), \ + 'setting' : define_property(float_type), \ + 'minor_loss': define_property(float_type)} + + +def get_valve_schema(name: str) -> dict[str, dict[str, Any]]: + return schema + + +def _query_valve(name: str, id: str) -> Row | None: + return read(name, f"select * from valves where id = '{id}'") + + +def _get_valve_node1(name: str, id: str) -> str | None: + row = _query_valve(name, id) + return row['node1'] if row != None else None + + +def _get_valve_node2(name: str, id: str) -> str | None: + row = _query_valve(name, id) + return row['node2'] if row != None else None + + +def add_valve(name: str, id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: + if is_valve(name, id): + return ChangeSet() + if not is_node(name, node1): + return ChangeSet() + if not is_node(name, node2): + return ChangeSet() + if node1 == node2: + return ChangeSet() + if type != VALVES_TYPE_PRV and type != VALVES_TYPE_PSV and type != VALVES_TYPE_PBV and type != VALVES_TYPE_FCV and type != VALVES_TYPE_TCV and type != VALVES_TYPE_GPV: + return ChangeSet() + + sql = f"insert into _link (id, type) values ('{id}', '{VALVE}');" + sql += f"\ninsert into valves (id, node1, node2, diameter, type, setting, minor_loss) values ('{id}', '{node1}', '{node2}', {diameter}, '{type}', {setting}, {minor_loss});" + + undo = f"delete from valves where id = ''{id}'';" + undo += f"\ndelete from _link where id = ''{id}'';" + + write(name, sql) + add_operation(name, sql.replace("'", "''"), undo, 'add_valve', API_ADD, VALVE, id) + return get_current_change_set(name) + + +def get_valve(name: str, id: str) -> dict[str, Any] | None: + row = _query_valve(name, id) + if row == None: + return None + + ps: dict[str, str] = {} + ps['id'] = id + ps['node1'] = row['node1'] + ps['node2'] = row['node2'] + ps['diameter'] = float(row['diameter']) + ps['type'] = row['type'] + ps['setting'] = float(row['setting']) + ps['minor_loss'] = float(row['minor_loss']) + return ps + + +def set_valve(name: str, id: str, properties: dict[str, Any]) -> ChangeSet: + if not is_valve(name, id): + return ChangeSet() + if 'node1' in properties: + if not is_node(name, properties['node1']) or _get_valve_node2(name, id) == properties['node1']: + return ChangeSet() + if 'node2' in properties: + if not is_node(name, properties['node2']) or _get_valve_node1(name, id) == properties['node2']: + return ChangeSet() + if 'node1' in properties and 'node2' in properties: + if properties['node1'] == properties['node2']: + return ChangeSet() + if 'type' in properties: + t = properties['type'] + if t != VALVES_TYPE_PRV and t != VALVES_TYPE_PSV and t != VALVES_TYPE_PBV and t != VALVES_TYPE_FCV and t != VALVES_TYPE_TCV and t != VALVES_TYPE_GPV: + return ChangeSet() + + old = Serialize(get_valve(name, id), schema).to_storage() + + new = get_valve(name, id) + ps: list[str] = [] + for key in properties: + if key in schema and schema[key]['readonly'] == False: + new[key] = properties[key] + ps.append(key) + new = Serialize(new, schema).to_execution() + + sql = f"update valves set node1 = {new['node1']}, node2 = {new['node2']}, \ + diameter = {new['diameter']}, type = {new['type']}, setting = {new['setting']}, minor_loss = {new['minor_loss']} where id = '{id}';" + undo = f"update valves set node1 = {old['node1']}, node2 = {old['node2']}, \ + diameter = {old['diameter']}, type = {old['type']}, setting = {old['setting']}, minor_loss = {old['minor_loss']} where id = ''{id}'';" + + write(name, sql) + add_operation(name, sql.replace("'", "''"), undo, 'set_valve', API_UPDATE, VALVE, id, ps) + return get_current_change_set(name) + + +def delete_valve(name: str, id: str) -> ChangeSet: + row = get_valve(name, id) + if row == None: + return ChangeSet() + + old = Serialize(get_valve(name, id), schema).to_storage() + + sql = f"delete from valves where id = '{id}';" + sql += f"\ndelete from _link where id = '{id}';" + + undo = f"insert into _link (id, type) values (''{id}'', ''{VALVE}'');" + undo += f"\ninsert into valves (id, node1, node2, diameter, type, setting, minor_loss) \ + values (''{id}'', {old['node1']}, {old['node2']}, {old['diameter']}, {old['type']}, {old['setting']}, {old['minor_loss']});" + + write(name, sql) + add_operation(name, sql.replace("'", "''"), undo, 'delete_valve', API_DELETE, VALVE, id) + return get_current_change_set(name) + +''' def add_valve(name: str, id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: if not is_node(name, node1): return ChangeSet() @@ -123,3 +248,4 @@ def get_valve_properties(name: str, id: str) -> dict[str, Any] | None: ps['setting'] = float(row['setting']) if row != None else None ps['minor_loss'] = float(row['minor_loss']) if row != None else None return ps +''' \ No newline at end of file diff --git a/test_tjnetwork.py b/test_tjnetwork.py index e3ed0c1..7623f59 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -142,17 +142,17 @@ class TestApi: nodes = get_nodes(p) assert len(nodes) == 0 - self.leave(p) + add_junction(p, 'j1', 0.0, 0.0, 0.0) + add_junction(p, 'j2', 10.0, 10.0, 10.0) + add_junction(p, 'j3', 10.0, 10.0, 10.0) + add_pipe(p, 'p1', 'j1', 'j2') + add_pump(p, 'p2', 'j1', 'j2') + add_valve(p, 'v1', 'j2', 'j3') + assert get_junction(p, 'j1')['links'] == ['p1', 'p2'] + assert get_junction(p, 'j2')['links'] == ['p1', 'p2', 'v1'] + assert get_junction(p, 'j3')['links'] == ['v1'] - # add_junction(p, 'j1', 0.0, 0.0, 0.0) - # add_junction(p, 'j2', 10.0, 10.0, 10.0) - # add_junction(p, 'j3', 10.0, 10.0, 10.0) - # add_pipe(p, 'p1', 'j1', 'j2') - # add_pump(p, 'p2', 'j1', 'j2') - # add_valve(p, 'v1', 'j2', 'j3') - # assert get_junction(p, 'j1')['links'] == ['p1', 'p2'] - # assert get_junction(p, 'j2')['links'] == ['p1', 'p2', 'v1'] - # assert get_junction(p, 'j3')['links'] == ['v1'] + self.leave(p) def test_reservoir(self): @@ -544,7 +544,7 @@ class TestApi: self.leave(p) -''' + def test_valve(self): p = "test_valve" self.enter(p) @@ -581,68 +581,68 @@ class TestApi: valves = get_links(p) assert len(valves) == 1 - assert get_valve_properties(p, 'v1')['node1'] == 'j1' - assert get_valve_properties(p, 'v1')['node2'] == 'j2' - assert get_valve_properties(p, 'v1')['diameter'] == 10.0 - assert get_valve_properties(p, 'v1')['type'] == VALVES_TYPE_FCV - assert get_valve_properties(p, 'v1')['setting'] == 10.0 - assert get_valve_properties(p, 'v1')['minor_loss'] == 10.0 + assert get_valve(p, 'v1')['node1'] == 'j1' + assert get_valve(p, 'v1')['node2'] == 'j2' + assert get_valve(p, 'v1')['diameter'] == 10.0 + assert get_valve(p, 'v1')['type'] == VALVES_TYPE_FCV + assert get_valve(p, 'v1')['setting'] == 10.0 + assert get_valve(p, 'v1')['minor_loss'] == 10.0 - change_set = set_valve_node1(p, 'v1', 'j2') + change_set = set_valve(p, 'v1', {'node1': 'j2'}) assert len(change_set.operations) == 0 - change_set = set_valve_node2(p, 'v1', 'j1') + change_set = set_valve(p, 'v1', {'node2': 'j1'}) assert len(change_set.operations) == 0 - change_set = set_valve_type(p, 'v1', "XXX") + change_set = set_valve(p, 'v1', {'type': "XXX"}) assert len(change_set.operations) == 0 - change_set = set_valve_node1(p, 'v1', 'j3') + change_set = set_valve(p, 'v1', {'node1': 'j3'}) assert len(change_set.operations) == 1 assert change_set.operations[0]['operation'] == 'update' assert change_set.operations[0]['type'] == VALVE assert change_set.operations[0]['id'] == 'v1' - assert change_set.operations[0]['properties'] == 'node1' + assert change_set.operations[0]['properties'] == ['node1'] - change_set = set_valve_node2(p, 'v1', 'j4') + change_set = set_valve(p, 'v1', {'node2': 'j4'}) assert len(change_set.operations) == 1 assert change_set.operations[0]['operation'] == 'update' assert change_set.operations[0]['type'] == VALVE assert change_set.operations[0]['id'] == 'v1' - assert change_set.operations[0]['properties'] == 'node2' + assert change_set.operations[0]['properties'] == ['node2'] - change_set = set_valve_diameter(p, 'v1', 100.0) + change_set = set_valve(p, 'v1', {'diameter': 100.0}) assert len(change_set.operations) == 1 assert change_set.operations[0]['operation'] == 'update' assert change_set.operations[0]['type'] == VALVE assert change_set.operations[0]['id'] == 'v1' - assert change_set.operations[0]['properties'] == 'diameter' + assert change_set.operations[0]['properties'] == ['diameter'] - change_set = set_valve_type(p, 'v1', VALVES_TYPE_GPV) + change_set = set_valve(p, 'v1', {'type': VALVES_TYPE_GPV}) assert len(change_set.operations) == 1 assert change_set.operations[0]['operation'] == 'update' assert change_set.operations[0]['type'] == VALVE assert change_set.operations[0]['id'] == 'v1' - assert change_set.operations[0]['properties'] == 'type' + assert change_set.operations[0]['properties'] == ['type'] - change_set = set_valve_setting(p, 'v1', 100.0) + change_set = set_valve(p, 'v1', {'setting': 100.0}) assert len(change_set.operations) == 1 assert change_set.operations[0]['operation'] == 'update' assert change_set.operations[0]['type'] == VALVE assert change_set.operations[0]['id'] == 'v1' - assert change_set.operations[0]['properties'] == 'setting' + assert change_set.operations[0]['properties'] == ['setting'] - change_set = set_valve_minor_loss(p, 'v1', 100.0) + change_set = set_valve(p, 'v1', {'minor_loss': 100.0}) assert len(change_set.operations) == 1 assert change_set.operations[0]['operation'] == 'update' assert change_set.operations[0]['type'] == VALVE assert change_set.operations[0]['id'] == 'v1' - assert change_set.operations[0]['properties'] == 'minor_loss' + assert change_set.operations[0]['properties'] == ['minor_loss'] - assert get_valve_properties(p, 'v1')['node1'] == 'j3' - assert get_valve_properties(p, 'v1')['node2'] == 'j4' - assert get_valve_properties(p, 'v1')['diameter'] == 100.0 - assert get_valve_properties(p, 'v1')['type'] == VALVES_TYPE_GPV - assert get_valve_properties(p, 'v1')['setting'] == 100.0 - assert get_valve_properties(p, 'v1')['minor_loss'] == 100.0 + assert get_valve(p, 'v1')['node1'] == 'j3' + assert get_valve(p, 'v1')['node2'] == 'j4' + assert get_valve(p, 'v1')['diameter'] == 100.0 + assert get_valve(p, 'v1')['type'] == VALVES_TYPE_GPV + assert get_valve(p, 'v1')['setting'] == 100.0 + assert get_valve(p, 'v1')['minor_loss'] == 100.0 change_set = add_valve(p, 'v2', 'j1', 'j2', 10.0, VALVES_TYPE_FCV, 10.0, 10.0) assert len(change_set.operations) == 1 @@ -674,6 +674,7 @@ class TestApi: assert change_set.operations[0]['id'] == "v2" self.leave(p) -''' + + if __name__ == '__main__': pytest.main() diff --git a/tjnetwork.py b/tjnetwork.py index d3b0937..c5176c5 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -232,7 +232,7 @@ def delete_pipe(name: str, pipe_id: str) -> ChangeSet: # pump 4.[PUMPS] ############################################################ -def get_pump_schema(name: str) -> list[str]: +def get_pump_schema(name: str) -> dict[str, dict[str, Any]]: return api.get_pump_schema(name) def add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet: @@ -252,32 +252,17 @@ def delete_pump(name: str, pump_id: str) -> ChangeSet: # valve 4.[VALVES] ############################################################ -def get_valve_property_names(name: str) -> list[str]: - return api.get_valve_property_names(name) +def get_valve_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_valve_schema(name) def add_valve(name: str, valve_id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: return api.add_valve(name, valve_id, node1, node2, diameter, type, setting, minor_loss) +def get_valve(name: str, valve_id: str) -> dict[str, Any] | None: + return api.get_valve(name, valve_id) + +def set_valve(name: str, valve_id: str, properties: dict[str, Any]) -> ChangeSet: + return api.set_valve(name, valve_id, properties) + def delete_valve(name: str, valve_id: str) -> ChangeSet: return api.delete_valve(name, valve_id) - -def set_valve_node1(name: str, valve_id: str, node1: str) -> ChangeSet: - return api.set_valve_node1(name, valve_id, node1) - -def set_valve_node2(name: str, valve_id: str, node2: str) -> ChangeSet: - return api.set_valve_node2(name, valve_id, node2) - -def set_valve_diameter(name: str, valve_id: str, diameter: float) -> ChangeSet: - return api.set_valve_diameter(name, valve_id, diameter) - -def set_valve_type(name: str, valve_id: str, type: str) -> ChangeSet: - return api.set_valve_type(name, valve_id, type) - -def set_valve_setting(name: str, valve_id: str, setting: float) -> ChangeSet: - return api.set_valve_setting(name, valve_id, setting) - -def set_valve_minor_loss(name: str, valve_id: str, minor_loss: float) -> ChangeSet: - return api.set_valve_minor_loss(name, valve_id, minor_loss) - -def get_valve_properties(name: str, pump_id: str) -> dict[str, Any] | None: - return api.get_valve_properties(name, pump_id)