Return empty change set

api/s7_valves.py

@@ -14,9 +14,9 @@ VALVES_TYPE_GPV = 'gpv'
 
 def add_valve(name: str, id: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet:
     if not is_node(name, node1):
-        return
+        return ChangeSet()
     if not is_node(name, node2):
-        return
+        return ChangeSet()
 
     sql = f"insert into valves (id, node1, node2, diameter, type, setting, minor_loss) values ('{id}', '{node1}', '{node2}', {diameter}, '{type}', {setting}, {minor_loss});"
     undo_sql = f'delete from valves where id = "{id}";'
@@ -29,11 +29,11 @@ def _get_valve(name: str, id: str) -> Row | None:
 
 def delete_valve(name: str, id: str) -> ChangeSet:
     if not is_valve(name, id):
-        return
+        return ChangeSet()
 
     row = _get_valve(name, id)
     if row == None:
-        return
+        return ChangeSet()
 
     node1, node2, diameter, type, setting, minor_loss = row['node1'], row['node2'], row['diameter'], row['type'], row['setting'], row['minor_loss']
 
@@ -86,31 +86,27 @@ 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
+        return ChangeSet()
 
     return _set_valve(name, id, 'node1', 'str', str(node1))
 
 
 def set_valve_node2(name: str, id: str, node2: str) -> ChangeSet:
     if not is_node(name, node2):
-        return
+        return ChangeSet()
 
     return _set_valve(name, id, 'node2', 'str', str(node2))
 
 
-def set_valve_length(name: str, id: str, length: float) -> ChangeSet:
-    return _set_valve(name, id, 'length', 'float', str(length))
-
-
 def set_valve_diameter(name: str, id: str, diameter: float) -> ChangeSet:
     return _set_valve(name, id, 'diameter', 'float', str(diameter))
 
 
-def set_valve_type(name: str, id: str, type: float) -> ChangeSet:
+def set_valve_type(name: str, id: str, type: str) -> ChangeSet:
     if type != VALVES_TYPE_PRV and type != VALVES_TYPE_PSV and type != VALVES_TYPE_PBV and type != VALVES_TYPE_FCV and type != VALVES_TYPE_TCV and type != VALVES_TYPE_GPV:
         return ChangeSet()
 
-    return _set_valve(name, id, 'type', 'str', str(type))
+    return _set_valve(name, id, 'type', 'str', type)
 
 
 def set_valve_setting(name: str, id: str, setting: float) -> ChangeSet: