diff --git a/api/__init__.py b/api/__init__.py index 1d41200..9468af0 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -18,11 +18,8 @@ from .s0_base import get_node_links from .s1_title import set_title, get_title -from .s2_junctions import get_junction_schema, add_junction, delete_junction, get_junction, set_junction - -from .s3_reservoirs import add_reservoir, delete_reservoir -from .s3_reservoirs import set_reservoir_head, set_reservoir_pattern, set_reservoir_coord -from .s3_reservoirs import get_reservoir_property_names, get_reservoir_properties +from .s2_junctions import get_junction_schema, add_junction, get_junction, set_junction, delete_junction +from .s3_reservoirs import get_reservoir_schema, add_reservoir, get_reservoir, set_reservoir, delete_reservoir from .s4_tanks import OVERFLOW_YES, OVERFLOW_NO from .s4_tanks import add_tank, delete_tank diff --git a/api/s2_junctions.py b/api/s2_junctions.py index ac775c3..215271e 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -16,7 +16,7 @@ schema: dict[str, dict[str, Any]] = { \ 'links' : define_property(str_list_type, False, True)} -def get_junction_schema(name: str) -> dict[str, str]: +def get_junction_schema(name: str) -> dict[str, dict[str, Any]]: return schema @@ -47,6 +47,7 @@ def get_junction(name: str, id: str) -> dict[str, Any] | None: return None ps: dict[str, str] = {} + ps['id'] = id ps['elevation'] = float(row['elevation']) ps['demand'] = float(row['demand']) if row['demand'] != None else None ps['pattern'] = row['pattern'] @@ -55,26 +56,6 @@ def get_junction(name: str, id: str) -> dict[str, Any] | None: return ps -def delete_junction(name: str, id: str) -> ChangeSet: - row = get_junction(name, id) - if row == None: - return ChangeSet() - - old = Serialize(get_junction(name, id), schema).to_storage() - - sql = f"delete from coordinates where node = '{id}';" - sql += f"\ndelete from junctions where id = '{id}';" - sql += f"\ndelete from _node where id = '{id}';" - - undo = f"insert into _node (id, type) values (''{id}'', ''{JUNCTION}'');" - undo += f"\ninsert into junctions (id, elevation, demand, pattern) values (''{id}'', {old['elevation']}, {old['demand']}, {old['pattern']});" - undo += f"\ninsert into coordinates (node, coord) values (''{id}'', {old['coord']});" - - write(name, sql) - add_operation(name, sql.replace("'", "''"), undo, 'delete_junction', API_DELETE, JUNCTION, id) - return get_current_change_set(name) - - def set_junction(name: str, id: str, properties: dict[str, Any]) -> ChangeSet: if not is_junction(name, id): return ChangeSet() @@ -99,3 +80,23 @@ def set_junction(name: str, id: str, properties: dict[str, Any]) -> ChangeSet: write(name, sql) add_operation(name, sql.replace("'", "''"), undo, 'set_junction', API_UPDATE, JUNCTION, id, ps) return get_current_change_set(name) + + +def delete_junction(name: str, id: str) -> ChangeSet: + row = get_junction(name, id) + if row == None: + return ChangeSet() + + old = Serialize(get_junction(name, id), schema).to_storage() + + sql = f"delete from coordinates where node = '{id}';" + sql += f"\ndelete from junctions where id = '{id}';" + sql += f"\ndelete from _node where id = '{id}';" + + undo = f"insert into _node (id, type) values (''{id}'', ''{JUNCTION}'');" + undo += f"\ninsert into junctions (id, elevation, demand, pattern) values (''{id}'', {old['elevation']}, {old['demand']}, {old['pattern']});" + undo += f"\ninsert into coordinates (node, coord) values (''{id}'', {old['coord']});" + + write(name, sql) + add_operation(name, sql.replace("'", "''"), undo, 'delete_junction', API_DELETE, JUNCTION, id) + return get_current_change_set(name) diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index a8c5430..84c1001 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -4,76 +4,97 @@ from .s0_base import * from .change_set import ChangeSet from .s24_coordinates import * from .utility import * +from .schema import * + + +schema: dict[str, dict[str, Any]] = { \ + 'id' : define_property(str_type, False, True), \ + 'head' : define_property(float_type), \ + 'pattern' : define_property(str_type, True), \ + 'coord' : define_property(client_point_type), \ + 'links' : define_property(str_list_type, False, True)} + + +def get_reservoir_schema(name: str) -> dict[str, dict[str, Any]]: + return schema + + +def _query_reservoir(name: str, id: str) -> Row | None: + return read(name, f"select id, head, pattern from reservoirs where id = '{id}'") def add_reservoir(name: str, id: str, x: float, y: float, head: float) -> ChangeSet: - sql = f"insert into reservoirs (id, head) values ('{id}', {head});" - undo_sql = f'delete from reservoirs where id = "{id}";' - return add_node(name, RESERVOIR, id, x, y, sql, undo_sql) - - -def _get_reservoir(name: str, id: str) -> Row | None: - return query(name, f"select head, pattern from reservoirs where id = '{id}'") - - -def delete_reservoir(name: str, id: str) -> ChangeSet: - if not is_reservoir(name, id): + if is_reservoir(name, id): return ChangeSet() - row = _get_reservoir(name, id) - if row == None: - return ChangeSet() + sql = f"insert into _node (id, type) values ('{id}', '{RESERVOIR}');" + sql += f"\ninsert into reservoirs (id, head) values ('{id}', {head});" + sql += f"\ninsert into coordinates (node, coord) values ('{id}', '({x}, {y})');" - head = row['head'] - pattern = decorate(row['pattern'], 'str', True) + undo = f"delete from coordinates where node = ''{id}'';" + undo += f"\ndelete from reservoirs where id = ''{id}'';" + undo += f"\ndelete from _node where id = ''{id}'';" - sql = f"delete from reservoirs where id = '{id}';" - undo_sql = f'insert into reservoirs (id, head, pattern) values ("{id}", {head}, {pattern});' - - return delete_node(name, RESERVOIR, id, sql, undo_sql) + write(name, sql) + add_operation(name, sql.replace("'", "''"), undo, 'add_reservoir', API_ADD, RESERVOIR, id) + return get_current_change_set(name) -def _set_reservoir(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet: - if not is_reservoir(name, id): - return ChangeSet() - - row = _get_reservoir(name, id) - if row == None: - return ChangeSet() - - return update(name, RESERVOIR, 'reservoirs', 'id', id, key, key_type, row[key], value, optional) - - -def set_reservoir_head(name: str, id: str, head: float) -> ChangeSet: - return _set_reservoir(name, id, 'head', 'float', str(head)) - - -def set_reservoir_pattern(name: str, id: str, pattern: str) -> ChangeSet: - if not is_pattern(name, id): - return ChangeSet() - - return _set_reservoir(name, id, 'pattern', 'str', pattern, True) - - -def set_reservoir_coord(name: str, id: str, x: float, y: float) -> ChangeSet: - if not is_reservoir(name, id): - return ChangeSet() - - return set_node_coord(name, RESERVOIR, id, x, y) - - -def get_reservoir_property_names(name: str) -> list[str]: - return ['head', 'pattern', 'coord', 'links'] - - -def get_reservoir_properties(name: str, id: str) -> dict[str, Any] | None: - row = _get_reservoir(name, id) +def get_reservoir(name: str, id: str) -> dict[str, Any] | None: + row = _query_reservoir(name, id) if row == None: return None ps: dict[str, str] = {} - ps['head'] = float(row['head']) if row != None else None - ps['pattern'] = row['pattern'] if row != None and row['pattern'] != None else None + ps['id'] = id + ps['head'] = float(row['head']) + ps['pattern'] = row['pattern'] ps['coord'] = get_node_coord(name, id) ps['links'] = get_node_links(name, id) return ps + + +def set_reservoir(name: str, id: str, properties: dict[str, Any]) -> ChangeSet: + if not is_reservoir(name, id): + return ChangeSet() + + old = Serialize(get_reservoir(name, id), schema).to_storage() + + new = get_reservoir(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 reservoirs set head = {new['head']}, pattern = {new['pattern']} where id = '{id}';" + undo = "" + if 'coord' in ps: + sql += f"\nupdate coordinates set coord = {new['coord']} where node = '{id}';" + undo = f"update coordinates set coord = {old['coord']} where node = ''{id}'';" + undo += f"\nupdate reservoirs set head = {old['head']}, pattern = {old['pattern']} where id = ''{id}'';" + + write(name, sql) + add_operation(name, sql.replace("'", "''"), undo, 'set_reservoir', API_UPDATE, RESERVOIR, id, ps) + return get_current_change_set(name) + + +def delete_reservoir(name: str, id: str) -> ChangeSet: + row = get_reservoir(name, id) + if row == None: + return ChangeSet() + + old = Serialize(get_reservoir(name, id), schema).to_storage() + + sql = f"delete from coordinates where node = '{id}';" + sql += f"\ndelete from reservoirs where id = '{id}';" + sql += f"\ndelete from _node where id = '{id}';" + + undo = f"insert into _node (id, type) values (''{id}'', ''{RESERVOIR}'');" + undo += f"\ninsert into reservoirs (id, head, pattern) values (''{id}'', {old['head']}, {old['pattern']});" + undo += f"\ninsert into coordinates (node, coord) values (''{id}'', {old['coord']});" + + write(name, sql) + add_operation(name, sql.replace("'", "''"), undo, 'delete_reservoir', API_DELETE, RESERVOIR, id) + return get_current_change_set(name) diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 5b74dde..67e12f4 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -144,21 +144,17 @@ class TestApi: 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'] - -''' def test_reservoir(self): p = "test_reservoir" self.enter(p) @@ -172,21 +168,21 @@ class TestApi: change_set = add_reservoir(p, "r0", 0.0, 10.0, 20.0) assert len(change_set.operations) == 0 - assert get_reservoir_properties(p, 'r0')['head'] == 20.0 - assert get_reservoir_properties(p, 'r0')['head'] == 20.0 - change_set = set_reservoir_head(p, 'r0', 100.0) + assert get_reservoir(p, 'r0')['head'] == 20.0 + assert get_reservoir(p, 'r0')['head'] == 20.0 + change_set = set_reservoir(p, 'r0', {'head': 100.0}) assert change_set.operations[0]['type'] == RESERVOIR assert change_set.operations[0]['id'] == 'r0' - assert change_set.operations[0]['property'] == 'head' - assert get_reservoir_properties(p, 'r0')['head'] == 100.0 + assert 'head' in change_set.operations[0]['properties'] + assert get_reservoir(p, 'r0')['head'] == 100.0 - assert get_reservoir_properties(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 } - assert get_reservoir_properties(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 } - change_set = set_reservoir_coord(p, 'r0', 100.0, 200.0) + assert get_reservoir(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 } + assert get_reservoir(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 } + change_set = set_reservoir(p, 'r0', {'coord': {'x': 100.0, 'y': 200.0}}) assert change_set.operations[0]['type'] == RESERVOIR assert change_set.operations[0]['id'] == 'r0' - assert change_set.operations[0]['property'] == 'coord' - assert get_reservoir_properties(p, 'r0')['coord'] == { 'x': 100.0, 'y': 200.0 } + assert 'coord' in change_set.operations[0]['properties'] + assert get_reservoir(p, 'r0')['coord'] == { 'x': 100.0, 'y': 200.0 } # TODO: pattern @@ -201,7 +197,7 @@ class TestApi: self.leave(p) - +''' def test_tank(self): p = "test_tank" diff --git a/tjnetwork.py b/tjnetwork.py index 1939b63..9537d82 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -152,47 +152,41 @@ def get_title(name: str) -> str: # junction 2.[JUNCTIONS] ############################################################ -def get_junction_schema(name: str) -> dict[str, str]: +def get_junction_schema(name: str) -> dict[str, dict[str, Any]]: return api.get_junction_schema(name) def add_junction(name: str, junction_id: str, x: float, y: float, elevation: float) -> ChangeSet: return api.add_junction(name, junction_id, x, y, elevation) -def delete_junction(name: str, junction_id: str) -> ChangeSet: - return api.delete_junction(name, junction_id) - def get_junction(name: str, junction_id: str) -> dict[str, Any] | None: return api.get_junction(name, junction_id) def set_junction(name: str, junction_id: str, properties: dict[str, Any]) -> ChangeSet: return api.set_junction(name, junction_id, properties) +def delete_junction(name: str, junction_id: str) -> ChangeSet: + return api.delete_junction(name, junction_id) + ############################################################ # reservoir 3.[RESERVOIRS] ############################################################ -def get_reservoir_property_names(name: str) -> list[str]: - return api.get_reservoir_property_names(name) +def get_reservoir_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_reservoir_schema(name) def add_reservoir(name: str, reservoir_id: str, x: float, y: float, head: float) -> ChangeSet: return api.add_reservoir(name, reservoir_id, x, y, head) +def get_reservoir(name: str, reservoir_id: str) -> dict[str, Any] | None: + return api.get_reservoir(name, reservoir_id) + +def set_reservoir(name: str, junction_id: str, properties: dict[str, Any]) -> ChangeSet: + return api.set_reservoir(name, junction_id, properties) + def delete_reservoir(name: str, reservoir_id: str) -> ChangeSet: return api.delete_reservoir(name, reservoir_id) -def set_reservoir_head(name: str, reservoir_id: str, head: float) -> ChangeSet: - return api.set_reservoir_head(name, reservoir_id, head) - -def set_reservoir_pattern(name: str, reservoir_id: str, pattern: str) -> ChangeSet: - return api.set_reservoir_pattern(name, reservoir_id, pattern) - -def set_reservoir_coord(name: str, reservoir_id: str, x: float, y: float) -> ChangeSet: - return api.set_reservoir_coord(name, reservoir_id, x, y) - -def get_reservoir_properties(name: str, reservoir_id: str) -> dict[str, Any] | None: - return api.get_reservoir_properties(name, reservoir_id) - ############################################################ # tank 4.[TANKS]