Refine node getter api

api/s3_reservoirs.py

@@ -1,3 +1,4 @@
+from typing import Any
 from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
@@ -32,23 +33,6 @@ def delete_reservoir(name: str, id: str) -> ChangeSet:
     return delete_node(name, RESERVOIR, id, sql, undo_sql)
 
 
-def get_reservoir_head(name: str, id: str) -> float | None:
-    row = _get_reservoir(name, id)
-    return float(row['head']) if row != None else None
-
-
-def get_reservoir_pattern(name: str, id: str) -> str | None:
-    row = _get_reservoir(name, id)
-    if row != None:
-        return row['pattern'] if row['pattern'] != None else 'NULL'
-    else:
-        return None
-
-
-def get_reservoir_coord(name: str, id: str) -> dict[str, float] | None:
-    return get_node_coord(name, id)
-
-
 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()
@@ -76,3 +60,20 @@ def set_reservoir_coord(name: str, id: str, x: float, y: float) -> ChangeSet:
         return ChangeSet()
 
     return set_node_coord(name, RESERVOIR, id, x, y)
+
+
+def get_reservoir_property_names(name: str) -> list[str]:
+    return ['head', 'pattern', 'coord']
+
+
+def get_reservoir_properties(name: str, id: str) -> dict[str, Any] | None:
+    row = _get_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['coord'] = get_node_coord(name, id)
+    ps['links'] = get_node_links(name, id)
+    return ps