Update pump api and test
This commit is contained in:
wqy
@@ -26,11 +26,9 @@ from .s4_tanks import OVERFLOW_YES, OVERFLOW_NO
|
||||
from .s4_tanks import get_tank_schema, add_tank, get_tank, set_tank, delete_tank
|
||||
|
||||
from .s5_pipes import PIPE_STATUS_OPEN, PIPE_STATUS_CLOSED, PIPE_STATUS_CV
|
||||
from .s5_pipes import add_pipe, get_pipe, set_pipe, delete_pipe
|
||||
from .s5_pipes import get_pipe_schema, add_pipe, get_pipe, set_pipe, delete_pipe
|
||||
|
||||
from .s6_pumps import add_pump, delete_pump
|
||||
from .s6_pumps import set_pump_node1, set_pump_node2
|
||||
from .s6_pumps import get_pump_property_names, get_pump_properties
|
||||
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
|
||||
|
||||
120
api/s5_pipes.py
120
api/s5_pipes.py
@@ -134,123 +134,3 @@ def delete_pipe(name: str, id: str) -> ChangeSet:
|
||||
write(name, sql)
|
||||
add_operation(name, sql.replace("'", "''"), undo, 'delete_pipe', API_DELETE, PIPE, id)
|
||||
return get_current_change_set(name)
|
||||
|
||||
|
||||
'''
|
||||
def add_pipe(name: str, id: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minor_loss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet:
|
||||
if not is_node(name, node1):
|
||||
return ChangeSet()
|
||||
if not is_node(name, node2):
|
||||
return ChangeSet()
|
||||
if node1 == node2:
|
||||
return ChangeSet()
|
||||
|
||||
if status != PIPE_STATUS_OPEN and status != PIPE_STATUS_CLOSED and status != PIPE_STATUS_CV:
|
||||
return ChangeSet()
|
||||
|
||||
sql = f"insert into pipes (id, node1, node2, length, diameter, roughness, minor_loss, status) values ('{id}', '{node1}', '{node2}', {length}, {diameter}, {roughness}, {minor_loss}, '{status}');"
|
||||
undo_sql = f'delete from pipes where id = "{id}";'
|
||||
return add_link(name, PIPE, id, sql, undo_sql)
|
||||
|
||||
|
||||
def _get_pipe(name: str, id: str) -> Row | None:
|
||||
return query(name, f"select node1, node2, length, diameter, roughness, minor_loss, status from pipes where id = '{id}'")
|
||||
|
||||
|
||||
def delete_pipe(name: str, id: str) -> ChangeSet:
|
||||
if not is_pipe(name, id):
|
||||
return ChangeSet()
|
||||
|
||||
row = _get_pipe(name, id)
|
||||
if row == None:
|
||||
return ChangeSet()
|
||||
|
||||
node1, node2, length, diameter, roughness, minor_loss, status = row['node1'], row['node2'], row['length'], row['diameter'], row['roughness'], row['minor_loss'], row['status']
|
||||
|
||||
sql = f"delete from pipes where id = '{id}';"
|
||||
undo_sql = f'insert into pipes (id, node1, node2, length, diameter, roughness, minor_loss, status) values ("{id}", "{node1}", "{node2}", {length}, {diameter}, {roughness}, {minor_loss}, "{status}");'
|
||||
|
||||
return delete_link(name, PIPE, id, sql, undo_sql)
|
||||
|
||||
|
||||
def _get_pipe_node1(name: str, id: str) -> str | None:
|
||||
row = _get_pipe(name, id)
|
||||
return row['node1'] if row != None else None
|
||||
|
||||
|
||||
def _get_pipe_node2(name: str, id: str) -> str | None:
|
||||
row = _get_pipe(name, id)
|
||||
return row['node2'] if row != None else None
|
||||
|
||||
|
||||
def _set_pipe(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:
|
||||
if not is_pipe(name, id):
|
||||
return ChangeSet()
|
||||
|
||||
row = _get_pipe(name, id)
|
||||
if row == None:
|
||||
return ChangeSet()
|
||||
|
||||
return update(name, PIPE, 'pipes', 'id', id, key, key_type, row[key], value, optional)
|
||||
|
||||
|
||||
def set_pipe_node1(name: str, id: str, node1: str) -> ChangeSet:
|
||||
if not is_node(name, node1):
|
||||
return ChangeSet()
|
||||
if _get_pipe_node2(name, id) == node1:
|
||||
return ChangeSet()
|
||||
|
||||
return _set_pipe(name, id, 'node1', 'str', str(node1))
|
||||
|
||||
|
||||
def set_pipe_node2(name: str, id: str, node2: str) -> ChangeSet:
|
||||
if not is_node(name, node2):
|
||||
return ChangeSet()
|
||||
if _get_pipe_node1(name, id) == node2:
|
||||
return ChangeSet()
|
||||
|
||||
return _set_pipe(name, id, 'node2', 'str', str(node2))
|
||||
|
||||
|
||||
def set_pipe_length(name: str, id: str, length: float) -> ChangeSet:
|
||||
return _set_pipe(name, id, 'length', 'float', str(length))
|
||||
|
||||
|
||||
def set_pipe_diameter(name: str, id: str, diameter: float) -> ChangeSet:
|
||||
return _set_pipe(name, id, 'diameter', 'float', str(diameter))
|
||||
|
||||
|
||||
def set_pipe_roughness(name: str, id: str, roughness: float) -> ChangeSet:
|
||||
return _set_pipe(name, id, 'roughness', 'float', str(roughness))
|
||||
|
||||
|
||||
def set_pipe_minor_loss(name: str, id: str, minor_loss: float) -> ChangeSet:
|
||||
return _set_pipe(name, id, 'minor_loss', 'float', str(minor_loss))
|
||||
|
||||
|
||||
def set_pipe_status(name: str, id: str, status: float) -> ChangeSet:
|
||||
if status != PIPE_STATUS_OPEN and status != PIPE_STATUS_CLOSED and status != PIPE_STATUS_CV:
|
||||
return ChangeSet()
|
||||
|
||||
return _set_pipe(name, id, 'status', 'str', str(status))
|
||||
|
||||
|
||||
def get_pipe_property_names(name: str) -> list[str]:
|
||||
return ['node1', 'node2', 'length', 'diameter', 'roughness', 'minor_loss', 'status']
|
||||
|
||||
|
||||
def get_pipe_properties(name: str, id: str) -> dict[str, Any] | None:
|
||||
row = _get_pipe(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
|
||||
ps['length'] = float(row['length']) if row != None else None
|
||||
ps['diameter'] = float(row['diameter']) if row != None else None
|
||||
ps['roughness'] = float(row['roughness']) if row != None else None
|
||||
ps['minor_loss'] = float(row['minor_loss']) if row != None else None
|
||||
ps['status'] = row['status'] if row != None else None
|
||||
return ps
|
||||
'''
|
||||
110
api/s6_pumps.py
110
api/s6_pumps.py
@@ -2,9 +2,118 @@ 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 *
|
||||
|
||||
|
||||
schema: dict[str, dict[str, Any]] = { \
|
||||
'id' : define_property(str_type, False, True), \
|
||||
'node1' : define_property(str_type), \
|
||||
'node2' : define_property(str_type)}
|
||||
|
||||
|
||||
def get_pump_schema(name: str) -> dict[str, dict[str, Any]]:
|
||||
return schema
|
||||
|
||||
|
||||
def _query_pump(name: str, id: str) -> Row | None:
|
||||
return read(name, f"select * from pumps where id = '{id}'")
|
||||
|
||||
|
||||
def _get_pump_node1(name: str, id: str) -> str | None:
|
||||
row = _query_pump(name, id)
|
||||
return row['node1'] if row != None else None
|
||||
|
||||
|
||||
def _get_pump_node2(name: str, id: str) -> str | None:
|
||||
row = _query_pump(name, id)
|
||||
return row['node2'] if row != None else None
|
||||
|
||||
|
||||
def add_pump(name: str, id: str, node1: str, node2: str) -> ChangeSet:
|
||||
if is_pump(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()
|
||||
|
||||
sql = f"insert into _link (id, type) values ('{id}', '{PUMP}');"
|
||||
sql += f"\ninsert into pumps (id, node1, node2) values ('{id}', '{node1}', '{node2}');"
|
||||
|
||||
undo = f"delete from pumps where id = ''{id}'';"
|
||||
undo += f"\ndelete from _link where id = ''{id}'';"
|
||||
|
||||
write(name, sql)
|
||||
add_operation(name, sql.replace("'", "''"), undo, 'add_pump', API_ADD, PUMP, id)
|
||||
return get_current_change_set(name)
|
||||
|
||||
|
||||
def get_pump(name: str, id: str) -> dict[str, Any] | None:
|
||||
row = _query_pump(name, id)
|
||||
if row == None:
|
||||
return None
|
||||
|
||||
ps: dict[str, str] = {}
|
||||
ps['id'] = id
|
||||
ps['node1'] = row['node1']
|
||||
ps['node2'] = row['node2']
|
||||
return ps
|
||||
|
||||
|
||||
def set_pump(name: str, id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
if not is_pump(name, id):
|
||||
return ChangeSet()
|
||||
if 'node1' in properties:
|
||||
if not is_node(name, properties['node1']) or _get_pump_node2(name, id) == properties['node1']:
|
||||
return ChangeSet()
|
||||
if 'node2' in properties:
|
||||
if not is_node(name, properties['node2']) or _get_pump_node1(name, id) == properties['node2']:
|
||||
return ChangeSet()
|
||||
if 'node1' in properties and 'node2' in properties:
|
||||
if properties['node1'] == properties['node2']:
|
||||
return ChangeSet()
|
||||
|
||||
old = Serialize(get_pump(name, id), schema).to_storage()
|
||||
|
||||
new = get_pump(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 pumps set node1 = {new['node1']}, node2 = {new['node2']} where id = '{id}';"
|
||||
undo = f"update pumps set node1 = {old['node1']}, node2 = {old['node2']} where id = ''{id}'';"
|
||||
|
||||
write(name, sql)
|
||||
add_operation(name, sql.replace("'", "''"), undo, 'set_pump', API_UPDATE, PUMP, id, ps)
|
||||
return get_current_change_set(name)
|
||||
|
||||
|
||||
def delete_pump(name: str, id: str) -> ChangeSet:
|
||||
row = get_pump(name, id)
|
||||
if row == None:
|
||||
return ChangeSet()
|
||||
|
||||
old = Serialize(get_pump(name, id), schema).to_storage()
|
||||
|
||||
sql = f"delete from pumps where id = '{id}';"
|
||||
sql += f"\ndelete from _link where id = '{id}';"
|
||||
|
||||
undo = f"insert into _link (id, type) values (''{id}'', ''{PUMP}'');"
|
||||
undo += f"\ninsert into pumps (id, node1, node2) values (''{id}'', {old['node1']}, {old['node2']});"
|
||||
|
||||
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()
|
||||
@@ -96,3 +205,4 @@ def get_pump_properties(name: str, id: str) -> dict[str, Any] | None:
|
||||
ps['node1'] = row['node1'] if row != None else None
|
||||
ps['node2'] = row['node2'] if row != None else None
|
||||
return ps
|
||||
'''
|
||||
@@ -454,7 +454,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
'''
|
||||
|
||||
def test_pump(self):
|
||||
p = "test_pump"
|
||||
self.enter(p)
|
||||
@@ -488,30 +488,30 @@ class TestApi:
|
||||
pumps = get_links(p)
|
||||
assert len(pumps) == 1
|
||||
|
||||
assert get_pump_properties(p, 'p1')['node1'] == 'j1'
|
||||
assert get_pump_properties(p, 'p1')['node2'] == 'j2'
|
||||
assert get_pump(p, 'p1')['node1'] == 'j1'
|
||||
assert get_pump(p, 'p1')['node2'] == 'j2'
|
||||
|
||||
change_set = set_pump_node1(p, 'p1', 'j2')
|
||||
change_set = set_pump(p, 'p1', {'node1': 'j2'})
|
||||
assert len(change_set.operations) == 0
|
||||
change_set = set_pump_node2(p, 'p1', 'j1')
|
||||
change_set = set_pump(p, 'p1', {'node2': 'j1'})
|
||||
assert len(change_set.operations) == 0
|
||||
|
||||
change_set = set_pump_node1(p, 'p1', 'j3')
|
||||
change_set = set_pump(p, 'p1', {'node1': 'j3'})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PUMP
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['properties'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == ['node1']
|
||||
|
||||
change_set = set_pump_node2(p, 'p1', 'j4')
|
||||
change_set = set_pump(p, 'p1', {'node2': 'j4'})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PUMP
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['properties'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == ['node2']
|
||||
|
||||
assert get_pump_properties(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pump_properties(p, 'p1')['node2'] == 'j4'
|
||||
assert get_pump(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pump(p, 'p1')['node2'] == 'j4'
|
||||
|
||||
change_set = add_pump(p, 'p2', 'j1', 'j2')
|
||||
assert len(change_set.operations) == 1
|
||||
@@ -544,7 +544,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
|
||||
'''
|
||||
def test_valve(self):
|
||||
p = "test_valve"
|
||||
self.enter(p)
|
||||
|
||||
19
tjnetwork.py
19
tjnetwork.py
@@ -232,24 +232,21 @@ def delete_pipe(name: str, pipe_id: str) -> ChangeSet:
|
||||
# pump 4.[PUMPS]
|
||||
############################################################
|
||||
|
||||
def get_pump_property_names(name: str) -> list[str]:
|
||||
return api.get_pump_property_names(name)
|
||||
def get_pump_schema(name: str) -> list[str]:
|
||||
return api.get_pump_schema(name)
|
||||
|
||||
def add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet:
|
||||
return api.add_pump(name, pump_id, node1, node2)
|
||||
|
||||
def get_pump(name: str, pump_id: str) -> dict[str, Any] | None:
|
||||
return api.get_pump(name, pump_id)
|
||||
|
||||
def set_pump(name: str, pump_id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
return api.set_pump(name, pump_id, properties)
|
||||
|
||||
def delete_pump(name: str, pump_id: str) -> ChangeSet:
|
||||
return api.delete_pump(name, pump_id)
|
||||
|
||||
def set_pump_node1(name: str, pump_id: str, node1: str) -> ChangeSet:
|
||||
return api.set_pump_node1(name, pump_id, node1)
|
||||
|
||||
def set_pump_node2(name: str, pump_id: str, node2: str) -> ChangeSet:
|
||||
return api.set_pump_node2(name, pump_id, node2)
|
||||
|
||||
def get_pump_properties(name: str, pump_id: str) -> dict[str, Any] | None:
|
||||
return api.get_pump_properties(name, pump_id)
|
||||
|
||||
|
||||
############################################################
|
||||
# valve 4.[VALVES]
|
||||
|
||||
Reference in New Issue
Block a user