From 6f088bb2917d4c1b123964581a2c9bf50ba1b1f3 Mon Sep 17 00:00:00 2001 From: wqy Date: Thu, 22 Sep 2022 22:14:17 +0800 Subject: [PATCH] Refine link getter api --- api/__init__.py | 7 ++-- api/s5_pipes.py | 54 +++++++++++++-------------- api/s6_pumps.py | 30 ++++++++++----- api/s7_valves.py | 48 ++++++++++++------------ test_tjnetwork.py | 60 +++++++++++++++--------------- tjnetwork.py | 93 +++++++++++++++++------------------------------ 6 files changed, 135 insertions(+), 157 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index dbdcb6d..4cd493b 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -35,17 +35,16 @@ from .s4_tanks import get_tank_property_names, get_tank_properties from .s5_pipes import PIPE_STATUS_OPEN, PIPE_STATUS_CLOSED, PIPE_STATUS_CV from .s5_pipes import add_pipe, delete_pipe -from .s5_pipes import get_pipe_node1, get_pipe_node2, get_pipe_length, get_pipe_diameter, get_pipe_roughness, get_pipe_minor_loss, get_pipe_status from .s5_pipes import set_pipe_node1, set_pipe_node2, set_pipe_length, set_pipe_diameter, set_pipe_roughness, set_pipe_minor_loss, set_pipe_status +from .s5_pipes import get_pipe_property_names, get_pipe_properties from .s6_pumps import add_pump, delete_pump -from .s6_pumps import get_pump_node1, get_pump_node2 from .s6_pumps import set_pump_node1, set_pump_node2 -# TODO: more properties... +from .s6_pumps import get_pump_property_names, get_pump_properties 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 get_valve_node1, get_valve_node2, get_valve_diameter, get_valve_type, get_valve_setting, get_valve_minor_loss 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 .s24_coordinates import get_node_coord, set_node_coord \ No newline at end of file diff --git a/api/s5_pipes.py b/api/s5_pipes.py index 471a7ee..07ccc6c 100644 --- a/api/s5_pipes.py +++ b/api/s5_pipes.py @@ -1,3 +1,4 @@ +from typing import Any from psycopg.rows import Row from .s0_base import * from .change_set import ChangeSet @@ -45,41 +46,16 @@ def delete_pipe(name: str, id: str) -> ChangeSet: return delete_link(name, PIPE, id, sql, undo_sql) -def get_pipe_node1(name: str, id: str) -> str | None: +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: +def _get_pipe_node2(name: str, id: str) -> str | None: row = _get_pipe(name, id) return row['node2'] if row != None else None -def get_pipe_length(name: str, id: str) -> float | None: - row = _get_pipe(name, id) - return float(row['length']) if row != None else None - - -def get_pipe_diameter(name: str, id: str) -> float | None: - row = _get_pipe(name, id) - return float(row['diameter']) if row != None else None - - -def get_pipe_roughness(name: str, id: str) -> float | None: - row = _get_pipe(name, id) - return float(row['roughness']) if row != None else None - - -def get_pipe_minor_loss(name: str, id: str) -> float | None: - row = _get_pipe(name, id) - return float(row['minor_loss']) if row != None else None - - -def get_pipe_status(name: str, id: str) -> str | None: - row = _get_pipe(name, id) - return row['status'] 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() @@ -94,7 +70,7 @@ def _set_pipe(name: str, id: str, key: str, key_type: str, value: str, 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: + if _get_pipe_node2(name, id) == node1: return ChangeSet() return _set_pipe(name, id, 'node1', 'str', str(node1)) @@ -103,7 +79,7 @@ def set_pipe_node1(name: str, id: str, node1: str) -> ChangeSet: 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: + if _get_pipe_node1(name, id) == node2: return ChangeSet() return _set_pipe(name, id, 'node2', 'str', str(node2)) @@ -130,3 +106,23 @@ def set_pipe_status(name: str, id: str, status: float) -> ChangeSet: 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 \ No newline at end of file diff --git a/api/s6_pumps.py b/api/s6_pumps.py index 21d9569..1d1fdfa 100644 --- a/api/s6_pumps.py +++ b/api/s6_pumps.py @@ -1,3 +1,4 @@ +from typing import Any from psycopg.rows import Row from .s0_base import * from .change_set import ChangeSet @@ -37,22 +38,16 @@ def delete_pump(name: str, id: str) -> ChangeSet: return delete_link(name, PUMP, id, sql, undo_sql) -def get_pump_node1(name: str, id: str) -> str | None: +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: +def _get_pump_node2(name: str, id: str) -> str | None: row = _get_pump(name, id) return row['node2'] if row != None else None -def get_pump_power(name: str, id: str) -> str | None: pass -def get_pump_speed(name: str, id: str) -> str | None: pass -def get_pump_head(name: str, id: str) -> str | None: pass -def get_pump_pattern(name: str, id: str) -> str | None: pass - - 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() @@ -67,7 +62,7 @@ def _set_pump(name: str, id: str, key: str, key_type: str, value: str, 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: + if _get_pump_node2(name, id) == node1: return ChangeSet() return _set_pump(name, id, 'node1', 'str', str(node1)) @@ -76,7 +71,7 @@ def set_pump_node1(name: str, id: str, node1: str) -> ChangeSet: 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: + if _get_pump_node1(name, id) == node2: return ChangeSet() return _set_pump(name, id, 'node2', 'str', str(node2)) @@ -86,3 +81,18 @@ 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 diff --git a/api/s7_valves.py b/api/s7_valves.py index 74d3fb4..64dd5c1 100644 --- a/api/s7_valves.py +++ b/api/s7_valves.py @@ -1,3 +1,4 @@ +from typing import Any from psycopg.rows import Row from .s0_base import * from .change_set import ChangeSet @@ -47,36 +48,16 @@ def delete_valve(name: str, id: str) -> ChangeSet: return delete_link(name, VALVE, id, sql, undo_sql) -def get_valve_node1(name: str, id: str) -> str | None: +def _get_valve_node1(name: str, id: str) -> str | None: row = _get_valve(name, id) return row['node1'] if row != None else None -def get_valve_node2(name: str, id: str) -> str | None: +def _get_valve_node2(name: str, id: str) -> str | None: row = _get_valve(name, id) return row['node2'] if row != None else None -def get_valve_diameter(name: str, id: str) -> float | None: - row = _get_valve(name, id) - return float(row['diameter']) if row != None else None - - -def get_valve_type(name: str, id: str) -> str | None: - row = _get_valve(name, id) - return row['type'] if row != None else None - - -def get_valve_setting(name: str, id: str) -> float | None: - row = _get_valve(name, id) - return float(row['setting']) if row != None else None - - -def get_valve_minor_loss(name: str, id: str) -> float | None: - row = _get_valve(name, id) - return float(row['minor_loss']) if row != None else None - - def _set_valve(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet: if not is_valve(name, id): return ChangeSet() @@ -91,7 +72,7 @@ def _set_valve(name: str, id: str, key: str, key_type: str, value: str, optional def set_valve_node1(name: str, id: str, node1: str) -> ChangeSet: if not is_node(name, node1): return ChangeSet() - if get_valve_node2(name, id) == node1: + if _get_valve_node2(name, id) == node1: return ChangeSet() return _set_valve(name, id, 'node1', 'str', str(node1)) @@ -100,7 +81,7 @@ def set_valve_node1(name: str, id: str, node1: str) -> ChangeSet: def set_valve_node2(name: str, id: str, node2: str) -> ChangeSet: if not is_node(name, node2): return ChangeSet() - if get_valve_node1(name, id) == node2: + if _get_valve_node1(name, id) == node2: return ChangeSet() return _set_valve(name, id, 'node2', 'str', str(node2)) @@ -123,3 +104,22 @@ def set_valve_setting(name: str, id: str, setting: float) -> ChangeSet: def set_valve_minor_loss(name: str, id: str, minor_loss: float) -> ChangeSet: return _set_valve(name, id, 'minor_loss', 'float', str(minor_loss)) + + +def get_valve_property_names(name: str) -> list[str]: + return ['node1', 'node2', 'diameter', 'type', 'setting', 'minor_loss'] + + +def get_valve_properties(name: str, id: str) -> dict[str, Any] | None: + row = _get_valve(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['diameter'] = float(row['diameter']) if row != None else None + ps['type'] = row['type'] if row != None else 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 diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 4872736..7ab6a56 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -348,13 +348,13 @@ class TestApi: pipes = get_links(p) assert len(pipes) == 1 - assert get_pipe_node1(p, 'p1') == 'j1' - assert get_pipe_node2(p, 'p1') == 'j2' - assert get_pipe_length(p, 'p1') == 10.0 - assert get_pipe_diameter(p, 'p1') == 10.0 - assert get_pipe_roughness(p, 'p1') == 10.0 - assert get_pipe_minor_loss(p, 'p1') == 10.0 - assert get_pipe_status(p, 'p1') == PIPE_STATUS_CLOSED + assert get_pipe_properties(p, 'p1')['node1'] == 'j1' + assert get_pipe_properties(p, 'p1')['node2'] == 'j2' + assert get_pipe_properties(p, 'p1')['length'] == 10.0 + assert get_pipe_properties(p, 'p1')['diameter'] == 10.0 + assert get_pipe_properties(p, 'p1')['roughness'] == 10.0 + assert get_pipe_properties(p, 'p1')['minor_loss'] == 10.0 + assert get_pipe_properties(p, 'p1')['status'] == PIPE_STATUS_CLOSED change_set = set_pipe_node1(p, 'p1', 'j2') assert len(change_set.operations) == 0 @@ -412,13 +412,13 @@ class TestApi: assert change_set.operations[0]['id'] == 'p1' assert change_set.operations[0]['property'] == 'status' - assert get_pipe_node1(p, 'p1') == 'j3' - assert get_pipe_node2(p, 'p1') == 'j4' - assert get_pipe_length(p, 'p1') == 100.0 - assert get_pipe_diameter(p, 'p1') == 100.0 - assert get_pipe_roughness(p, 'p1') == 100.0 - assert get_pipe_minor_loss(p, 'p1') == 100.0 - assert get_pipe_status(p, 'p1') == PIPE_STATUS_OPEN + assert get_pipe_properties(p, 'p1')['node1'] == 'j3' + assert get_pipe_properties(p, 'p1')['node2'] == 'j4' + assert get_pipe_properties(p, 'p1')['length'] == 100.0 + assert get_pipe_properties(p, 'p1')['diameter'] == 100.0 + assert get_pipe_properties(p, 'p1')['roughness'] == 100.0 + assert get_pipe_properties(p, 'p1')['minor_loss'] == 100.0 + assert get_pipe_properties(p, 'p1')['status'] == PIPE_STATUS_OPEN change_set = add_pipe(p, 'p2', 'j1', 'j2', 10.0, 10.0, 10.0, 10.0, PIPE_STATUS_CLOSED) assert len(change_set.operations) == 1 @@ -485,8 +485,8 @@ class TestApi: pumps = get_links(p) assert len(pumps) == 1 - assert get_pump_node1(p, 'p1') == 'j1' - assert get_pump_node2(p, 'p1') == 'j2' + assert get_pump_properties(p, 'p1')['node1'] == 'j1' + assert get_pump_properties(p, 'p1')['node2'] == 'j2' change_set = set_pump_node1(p, 'p1', 'j2') assert len(change_set.operations) == 0 @@ -507,8 +507,8 @@ class TestApi: assert change_set.operations[0]['id'] == 'p1' assert change_set.operations[0]['property'] == 'node2' - assert get_pump_node1(p, 'p1') == 'j3' - assert get_pump_node2(p, 'p1') == 'j4' + assert get_pump_properties(p, 'p1')['node1'] == 'j3' + assert get_pump_properties(p, 'p1')['node2'] == 'j4' change_set = add_pump(p, 'p2', 'j1', 'j2') assert len(change_set.operations) == 1 @@ -578,12 +578,12 @@ class TestApi: valves = get_links(p) assert len(valves) == 1 - assert get_valve_node1(p, 'v1') == 'j1' - assert get_valve_node2(p, 'v1') == 'j2' - assert get_valve_diameter(p, 'v1') == 10.0 - assert get_valve_type(p, 'v1') == VALVES_TYPE_FCV - assert get_valve_setting(p, 'v1') == 10.0 - assert get_valve_minor_loss(p, 'v1') == 10.0 + 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 change_set = set_valve_node1(p, 'v1', 'j2') assert len(change_set.operations) == 0 @@ -634,12 +634,12 @@ class TestApi: assert change_set.operations[0]['id'] == 'v1' assert change_set.operations[0]['property'] == 'minor_loss' - assert get_valve_node1(p, 'v1') == 'j3' - assert get_valve_node2(p, 'v1') == 'j4' - assert get_valve_diameter(p, 'v1') == 100.0 - assert get_valve_type(p, 'v1') == VALVES_TYPE_GPV - assert get_valve_setting(p, 'v1') == 100.0 - assert get_valve_minor_loss(p, 'v1') == 100.0 + 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 change_set = add_valve(p, 'v2', 'j1', 'j2', 10.0, VALVES_TYPE_FCV, 10.0, 10.0) assert len(change_set.operations) == 1 diff --git a/tjnetwork.py b/tjnetwork.py index 054d84d..2ca8ed2 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -161,6 +161,9 @@ def get_title(name: str) -> str: # junction 2.[JUNCTIONS] ############################################################ +def get_junction_property_names(name: str) -> list[str]: + return api.get_junction_property_names(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) @@ -179,17 +182,17 @@ def set_junction_pattern(name: str, junction_id: str, pattern: str) -> ChangeSet def set_junction_coord(name: str, junction_id: str, x: float, y: float) -> ChangeSet: return api.set_junction_coord(name, junction_id, x, y) -def get_junction_property_names(name: str) -> list[str]: - return api.get_junction_property_names(name) - -def get_junction_properties(name: str, id: str) -> dict[str, Any] | None: - return api.get_junction_properties(name, id) +def get_junction_properties(name: str, junction_id: str) -> dict[str, Any] | None: + return api.get_junction_properties(name, junction_id) ############################################################ # reservoir 3.[RESERVOIRS] ############################################################ +def get_reservoir_property_names(name: str) -> list[str]: + return api.get_reservoir_property_names(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) @@ -205,17 +208,17 @@ def set_reservoir_pattern(name: str, reservoir_id: str, pattern: str) -> ChangeS 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_property_names(name: str) -> list[str]: - return api.get_reservoir_property_names(name) - -def get_reservoir_properties(name: str, id: str) -> dict[str, Any] | None: - return api.get_reservoir_properties(name, id) +def get_reservoir_properties(name: str, reservoir_id: str) -> dict[str, Any] | None: + return api.get_reservoir_properties(name, reservoir_id) ############################################################ # tank 4.[TANKS] ############################################################ +def get_tank_property_names(name: str) -> list[str]: + return api.get_tank_property_names(name) + def add_tank(name: str, tank_id: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet: return api.add_tank(name, tank_id, x, y, elevation, init_level, min_level, max_level, diameter, min_vol) @@ -249,44 +252,23 @@ def set_tank_overflow(name: str, tank_id: str, overflow: str) -> ChangeSet: def set_tank_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet: return api.set_tank_coord(name, tank_id, x, y) -def get_tank_property_names(name: str) -> list[str]: - return api.get_tank_property_names(name) - -def get_tank_properties(name: str, id: str) -> dict[str, Any] | None: - return api.get_tank_properties(name, id) +def get_tank_properties(name: str, tank_id: str) -> dict[str, Any] | None: + return api.get_tank_properties(name, tank_id) ############################################################ # pipe 4.[PIPES] ############################################################ +def get_pipe_property_names(name: str) -> list[str]: + return api.get_pipe_property_names(name) + def add_pipe(name: str, pipe_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: return api.add_pipe(name, pipe_id, node1, node2, length, diameter, roughness, minor_loss, status) def delete_pipe(name: str, pipe_id: str) -> ChangeSet: return api.delete_pipe(name, pipe_id) -def get_pipe_node1(name: str, pipe_id: str) -> str | None: - return api.get_pipe_node1(name, pipe_id) - -def get_pipe_node2(name: str, pipe_id: str) -> str | None: - return api.get_pipe_node2(name, pipe_id) - -def get_pipe_length(name: str, pipe_id: str) -> float | None: - return api.get_pipe_length(name, pipe_id) - -def get_pipe_diameter(name: str, pipe_id: str) -> float | None: - return api.get_pipe_diameter(name, pipe_id) - -def get_pipe_roughness(name: str, pipe_id: str) -> float | None: - return api.get_pipe_roughness(name, pipe_id) - -def get_pipe_minor_loss(name: str, pipe_id: str) -> float | None: - return api.get_pipe_minor_loss(name, pipe_id) - -def get_pipe_status(name: str, pipe_id: str) -> str | None: - return api.get_pipe_status(name, pipe_id) - def set_pipe_node1(name: str, pipe_id: str, node1: str) -> ChangeSet: return api.set_pipe_node1(name, pipe_id, node1) @@ -308,58 +290,46 @@ def set_pipe_minor_loss(name: str, pipe_id: str, minor_loss: float) -> ChangeSet def set_pipe_status(name: str, pipe_id: str, status: float) -> ChangeSet: return api.set_pipe_status(name, pipe_id, status) +def get_pipe_properties(name: str, pipe_id: str) -> dict[str, Any] | None: + return api.get_pipe_properties(name, pipe_id) + ############################################################ # pump 4.[PUMPS] ############################################################ +def get_pump_property_names(name: str) -> list[str]: + return api.get_pump_property_names(name) + def add_pump(name: str, pump_id: str, node1: str, node2: str) -> ChangeSet: return api.add_pump(name, pump_id, node1, node2) def delete_pump(name: str, pump_id: str) -> ChangeSet: return api.delete_pump(name, pump_id) -def get_pump_node1(name: str, pump_id: str) -> str | None: - return api.get_pump_node1(name, pump_id) - -def get_pump_node2(name: str, pump_id: str) -> str | None: - return api.get_pump_node2(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] ############################################################ +def get_valve_property_names(name: str) -> list[str]: + return api.get_valve_property_names(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 delete_valve(name: str, valve_id: str) -> ChangeSet: return api.delete_valve(name, valve_id) -def get_valve_node1(name: str, valve_id: str) -> str | None: - return api.get_valve_node1(name, valve_id) - -def get_valve_node2(name: str, valve_id: str) -> str | None: - return api.get_valve_node2(name, valve_id) - -def get_valve_diameter(name: str, valve_id: str) -> float | None: - return api.get_valve_diameter(name, valve_id) - -def get_valve_type(name: str, valve_id: str) -> str | None: - return api.get_valve_type(name, valve_id) - -def get_valve_setting(name: str, valve_id: str) -> float | None: - return api.get_valve_setting(name, valve_id) - -def get_valve_minor_loss(name: str, valve_id: str) -> float | None: - return api.get_valve_minor_loss(name, valve_id) - def set_valve_node1(name: str, valve_id: str, node1: str) -> ChangeSet: return api.set_valve_node1(name, valve_id, node1) @@ -377,3 +347,6 @@ def set_valve_setting(name: str, valve_id: str, setting: float) -> ChangeSet: 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)