Add mixing api and test

api/__init__.py

@@ -65,6 +65,9 @@ from .s17_quality import get_quality_schema, get_quality, set_quality
 from .s18_sources import SOURCE_TYPE_CONCEN, SOURCE_TYPE_MASS, SOURCE_TYPE_FLOWPACED, SOURCE_TYPE_SETPOINT
 from .s18_sources import get_source_schema, get_source, set_source, add_source, delete_source
 
+from .s20_mixing import MIXING_MODEL_MIXED, MIXING_MODEL_2COMP, MIXING_MODEL_FIFO, MIXING_MODEL_LIFO
+from .s20_mixing import get_mixing_schema, get_mixing, set_mixing, add_mixing, delete_mixing
+
 from .s21_times import TIME_STATISTIC_NONE, TIME_STATISTIC_AVERAGED, TIME_STATISTIC_MINIMUM, TIME_STATISTIC_MAXIMUM, TIME_STATISTIC_RANGE
 from .s21_times import get_time_schema, get_time, set_time
 

api/s20_mixing.py

@@ -0,0 +1,96 @@
+from .operation import *
+from .s0_base import *
+
+MIXING_MODEL_MIXED = 'MIXED'
+MIXING_MODEL_2COMP = '2COMP'
+MIXING_MODEL_FIFO = 'FIFO'
+MIXING_MODEL_LIFO = 'LIFO'
+
+def get_mixing_schema(name: str) -> dict[str, dict[str, Any]]:
+    return { 'tank'  : {'type': 'str'   , 'optional': False , 'readonly': True },
+             'model' : {'type': 'str'   , 'optional': False , 'readonly': False},
+             'value' : {'type': 'float' , 'optional': True ,  'readonly': False} }
+
+
+def get_mixing(name: str, tank: str) -> dict[str, Any]:
+    m = read(name, f"select * from mixing where tank = '{tank}'")
+    d = {}
+    d['tank'] = str(m['tank'])
+    d['model'] = str(m['model'])
+    d['value'] = float(m['value']) if m['value'] != None else None
+    return d
+
+
+class Mixing(object):
+    def __init__(self, input: dict[str, Any]) -> None:
+        self.type = 'mixing'
+        self.tank = str(input['tank'])
+        self.model = str(input['model'])
+        self.value = float(input['value']) if 'value' in input and input['value'] != None else None
+
+        self.f_type = f"'{self.type}'"
+        self.f_tank = f"'{self.tank}'"
+        self.f_model = f"'{self.model}'"
+        self.f_value = self.value if self.value != None else 'null'
+
+    def as_dict(self) -> dict[str, Any]:
+        return { 'type': self.type, 'tank': self.tank, 'model': self.model, 'value': self.value }
+
+    def as_id_dict(self) -> dict[str, Any]:
+        return { 'type': self.type, 'tank': self.tank }
+
+
+def set_mixing_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
+    old = Mixing(get_mixing(name, cs.operations[0]['tank']))
+    raw_new = get_mixing(name, cs.operations[0]['tank'])
+
+    new_dict = cs.operations[0]
+    schema = get_mixing_schema(name)
+    for key, value in schema.items():
+        if key in new_dict and not value['readonly']:
+            raw_new[key] = new_dict[key]
+    new = Mixing(raw_new)
+
+    redo_sql = f"update mixing set model = {new.f_model}, value = {new.f_value} where tank = {new.f_tank};"
+    undo_sql = f"update mixing set model = {old.f_model}, value = {old.f_value} where tank = {old.f_tank};"
+
+    redo_cs = g_update_prefix | new.as_dict()
+    undo_cs = g_update_prefix | old.as_dict()
+
+    return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
+
+
+def set_mixing(name: str, cs: ChangeSet) -> ChangeSet:
+    return execute_command(name, set_mixing_cache(name, cs))
+
+
+def add_mixing_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
+    new = Mixing(cs.operations[0])
+
+    redo_sql = f"insert into mixing (tank, model, value) values ({new.f_tank}, {new.f_model}, {new.f_value});"
+    undo_sql = f"delete from mixing where tank = {new.f_tank};"
+
+    redo_cs = g_add_prefix | new.as_dict()
+    undo_cs = g_delete_prefix | new.as_id_dict()
+
+    return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
+
+
+def add_mixing(name: str, cs: ChangeSet) -> ChangeSet:
+    return execute_command(name, add_mixing_cache(name, cs))
+
+
+def delete_mixing_cache(name: str, cs: ChangeSet) -> SqlChangeSet:
+    old = Mixing(get_mixing(name, cs.operations[0]['tank']))
+
+    redo_sql = f"delete from mixing where tank = {old.f_tank};"
+    undo_sql = f"insert into mixing (tank, model, value) values ({old.f_tank}, {old.f_model}, {old.f_value});"
+
+    redo_cs = g_delete_prefix | old.as_id_dict()
+    undo_cs = g_add_prefix | old.as_dict()
+
+    return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs)
+
+
+def delete_mixing(name: str, cs: ChangeSet) -> ChangeSet:
+    return execute_command(name, delete_mixing_cache(name, cs))