Refine link getter api

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