From 45c69033a872b783a420103bb55bb43dcc04f3a2 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Mon, 14 Nov 2022 20:38:05 +0800 Subject: [PATCH] Refine energy api --- api/__init__.py | 2 +- api/s15_energy.py | 102 +++++++++++++++----------- test_tjnetwork.py | 182 ++++++++++++++++------------------------------ tjnetwork.py | 12 +-- 4 files changed, 128 insertions(+), 170 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index e179134..79addc4 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -55,7 +55,7 @@ from .s13_controls import get_control_schema, get_control, set_control from .s14_rules import get_rule_schema, get_rule, set_rule -from .s15_energy import get_global_energy_schema, get_global_energy, set_global_energy +from .s15_energy import get_energy_schema, get_energy, set_energy from .s15_energy import get_pump_energy_schema, get_pump_energy, set_pump_energy from .s16_emitters import get_emitter_schema, get_emitter, set_emitter diff --git a/api/s15_energy.py b/api/s15_energy.py index ca7ed8e..4884984 100644 --- a/api/s15_energy.py +++ b/api/s15_energy.py @@ -1,63 +1,81 @@ from .operation import * -def get_global_energy_schema(name: str) -> dict[str, dict[str, Any]]: - return { 'price' : {'type': 'float' , 'optional': True , 'readonly': False}, - 'pattern' : {'type': 'str' , 'optional': True , 'readonly': False}, - 'effic' : {'type': 'float' , 'optional': True , 'readonly': False}, - 'demand_charge' : {'type': 'float' , 'optional': True , 'readonly': False} } +element_schema = {'type': 'str' , 'optional': True , 'readonly': False} -def get_global_energy(name: str) -> dict[str, Any]: - ge = read(name, f"select * from energy_global") +def get_energy_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'GLOBAL PRICE' : element_schema, + 'GLOBAL PATTERN' : element_schema, + 'GLOBAL EFFIC' : element_schema, + 'DEMAND CHARGE' : element_schema } + + +def get_energy(name: str) -> dict[str, Any]: + ts = read_all(name, f"select * from energy") d = {} - d['price'] = float(ge['price']) - d['pattern'] = str(ge['pattern']) if ge['pattern'] != None else None - d['effic'] = float(ge['effic']) - d['demand_charge'] = float(ge['demand_charge']) + for e in ts: + d[e['key']] = str(e['value']) return d -class GlobalEnergy(object): - def __init__(self, input: dict[str, Any]) -> None: - self.type = 'global_energy' - self.price = float(input['price']) if 'price' in input and input['price'] != None else 0.0 - self.pattern = str(input['pattern']) if 'pattern' in input and input['pattern'] != None else None - self.effic = float(input['effic']) if 'effic' in input and input['effic'] != None else 75 - self.demand_charge = float(input['demand_charge']) if 'demand_charge' in input and input['demand_charge'] != None else 0.0 +def set_energy_cache(name: str, cs: ChangeSet) -> SqlChangeSet: + raw_old = get_energy(name) - self.f_type = f"'{self.type}'" - self.f_price = self.price - self.f_pattern = f"'{self.pattern}'" if self.pattern != None else 'null' - self.f_effic = self.effic - self.f_demand_charge = self.demand_charge - - def as_dict(self) -> dict[str, Any]: - return { 'type': self.type, 'price': self.price, 'pattern': self.pattern, 'effic': self.effic, 'demand_charge': self.demand_charge } - - -def set_global_energy_cache(name: str, cs: ChangeSet) -> SqlChangeSet: - old = GlobalEnergy(get_global_energy(name)) - raw_new = get_global_energy(name) + old = {} + new = {} new_dict = cs.operations[0] - schema = get_global_energy_schema(name) - for key, value in schema.items(): - if key in new_dict and not value['readonly']: - raw_new[key] = new_dict[key] - new = GlobalEnergy(raw_new) + schema = get_energy_schema(name) + for key in schema.keys(): + if key in new_dict: + old[key] = str(raw_old[key]) + new[key] = str(new_dict[key]) - redo_sql = f"update energy_global set price = {new.f_price}, pattern = {new.f_pattern}, effic = {new.f_effic}, demand_charge = {new.f_demand_charge} where _no = 0;" - undo_sql = f"update energy_global set price = {old.f_price}, pattern = {old.f_pattern}, effic = {old.f_effic}, demand_charge = {old.f_demand_charge} where _no = 0;" + redo_cs = g_update_prefix | { 'type' : 'energy' } - redo_cs = g_update_prefix | new.as_dict() - undo_cs = g_update_prefix | old.as_dict() + redo_sql = '' + for key, value in new.items(): + if redo_sql != '': + redo_sql += '\n' + redo_sql += f"update energy set value = '{value}' where key = '{key}';" + redo_cs |= { key: value } + + undo_cs = g_update_prefix | { 'type' : 'energy' } + + undo_sql = '' + for key, value in old.items(): + if undo_sql != '': + undo_sql += '\n' + undo_sql += f"update energy set value = '{value}' where key = '{key}';" + undo_cs |= { key: value } return SqlChangeSet(redo_sql, undo_sql, redo_cs, undo_cs) -def set_global_energy(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_global_energy_cache(name, cs)) +def set_energy(name: str, cs: ChangeSet) -> ChangeSet: + return execute_command(name, set_energy_cache(name, cs)) + + +def inp_in_energy(section: list[str]) -> ChangeSet: + cs = g_update_prefix | { 'type' : 'energy' } + for s in section: + line = s.upper().strip() + for key in get_energy_schema('').keys(): + if line.startswith(key): + value = line.removeprefix(key).strip() + cs |= { key : value } + return ChangeSet(cs) + + +def inp_out_energy(name: str) -> list[str]: + lines = [] + objs = read_all(name, f"select * from energy") + for obj in objs: + key = obj['key'] + value = obj['value'] + lines.append(f'{key} {value}') + return lines def get_pump_energy_schema(name: str) -> dict[str, dict[str, Any]]: diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 0603442..4d3a099 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -1921,173 +1921,113 @@ class TestApi: # 15 energy - def test_global_energy(self): - p = 'test_global_energy' + def test_energy(self): + p = 'test_energy' self.enter(p) - ge = get_global_energy(p) - assert ge['price'] == 0.0 - assert ge['pattern'] == None - assert ge['effic'] == float(75) - assert ge['demand_charge'] == 0.0 + ge = get_energy(p) + assert ge['GLOBAL PRICE'] == '0' + assert ge['GLOBAL PATTERN'] == '' + assert ge['GLOBAL EFFIC'] == '75' + assert ge['DEMAND CHARGE'] == '0' - set_global_energy(p, ChangeSet({ 'price' : 10.0 })) - ge = get_global_energy(p) - assert ge['price'] == 10.0 - assert ge['pattern'] == None - assert ge['effic'] == float(75) - assert ge['demand_charge'] == 0.0 + set_energy(p, ChangeSet({ 'GLOBAL PRICE' : '10' })) + ge = get_energy(p) + assert ge['GLOBAL PRICE'] == '10' + assert ge['GLOBAL PATTERN'] == '' + assert ge['GLOBAL EFFIC'] == '75' + assert ge['DEMAND CHARGE'] == '0' add_pattern(p, ChangeSet({'id' : 'p0', 'factors': [1.0, 2.0, 3.0]})) - set_global_energy(p, ChangeSet({ 'pattern' : 'p0' })) - ge = get_global_energy(p) - assert ge['price'] == 10.0 - assert ge['pattern'] == 'p0' - assert ge['effic'] == float(75) - assert ge['demand_charge'] == 0.0 + set_energy(p, ChangeSet({ 'GLOBAL PATTERN' : 'p0' })) + ge = get_energy(p) + assert ge['GLOBAL PRICE'] == '10' + assert ge['GLOBAL PATTERN'] == 'p0' + assert ge['GLOBAL EFFIC'] == '75' + assert ge['DEMAND CHARGE'] == '0' - set_global_energy(p, ChangeSet({ 'effic' : 0.0 })) - ge = get_global_energy(p) - assert ge['price'] == 10.0 - assert ge['pattern'] == 'p0' - assert ge['effic'] == 0.0 - assert ge['demand_charge'] == 0.0 + set_energy(p, ChangeSet({ 'GLOBAL EFFIC' : '0' })) + ge = get_energy(p) + assert ge['GLOBAL PRICE'] == '10' + assert ge['GLOBAL PATTERN'] == 'p0' + assert ge['GLOBAL EFFIC'] == '0' + assert ge['DEMAND CHARGE'] == '0' - set_global_energy(p, ChangeSet({ 'demand_charge' : 10.0 })) - ge = get_global_energy(p) - assert ge['price'] == 10.0 - assert ge['pattern'] == 'p0' - assert ge['effic'] == 0.0 - assert ge['demand_charge'] == 10.0 + set_energy(p, ChangeSet({ 'DEMAND CHARGE' : '10' })) + ge = get_energy(p) + assert ge['GLOBAL PRICE'] == '10' + assert ge['GLOBAL PATTERN'] == 'p0' + assert ge['GLOBAL EFFIC'] == '0' + assert ge['DEMAND CHARGE'] == '10' self.leave(p) - def test_global_energy_op(self): - p = 'test_global_energy_op' + def test_energy_op(self): + p = 'test_energy_op' self.enter(p) add_pattern(p, ChangeSet({'id' : 'p0', 'factors': [1.0, 2.0, 3.0]})) - cs = set_global_energy(p, ChangeSet({ 'price' : 10.0 })).operations[0] + cs = set_energy(p, ChangeSet({ 'GLOBAL PRICE' : '10' })).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == None - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL PRICE'] == '10' cs = execute_undo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 0.0 - assert cs['pattern'] == None - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL PRICE'] == '0' cs = execute_redo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == None - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL PRICE'] == '10' - cs = set_global_energy(p, ChangeSet({ 'pattern' : 'p0' })).operations[0] + cs = set_energy(p, ChangeSet({ 'GLOBAL PATTERN' : 'p0' })).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL PATTERN'] == 'p0' cs = execute_undo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == None - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL PATTERN'] == '' cs = execute_redo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL PATTERN'] == 'p0' - cs = set_global_energy(p, ChangeSet({ 'effic' : 0.0 })).operations[0] + cs = set_energy(p, ChangeSet({ 'GLOBAL EFFIC' : '0' })).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == 0.0 - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL EFFIC'] == '0' cs = execute_undo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL EFFIC'] == '75' cs = execute_redo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == 0.0 - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['GLOBAL EFFIC'] == '0' - cs = set_global_energy(p, ChangeSet({ 'demand_charge' : 10.0 })).operations[0] + cs = set_energy(p, ChangeSet({ 'DEMAND CHARGE' : '10' })).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == 0.0 - assert cs['demand_charge'] == 10.0 + assert cs['type'] == 'energy' + assert cs['DEMAND CHARGE'] == '10' cs = execute_undo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == 0.0 - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['DEMAND CHARGE'] == '0' cs = execute_redo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == 0.0 - assert cs['demand_charge'] == 10.0 - - cs = set_global_energy(p, ChangeSet({ 'price' : 0.0, 'pattern' : None, 'effic' : float(75), 'demand_charge' : 0.0 })).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 0.0 - assert cs['pattern'] == None - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 - - cs = execute_undo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 10.0 - assert cs['pattern'] == 'p0' - assert cs['effic'] == 0.0 - assert cs['demand_charge'] == 10.0 - - cs = execute_redo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'global_energy' - assert cs['price'] == 0.0 - assert cs['pattern'] == None - assert cs['effic'] == float(75) - assert cs['demand_charge'] == 0.0 + assert cs['type'] == 'energy' + assert cs['DEMAND CHARGE'] == '10' self.leave(p) diff --git a/tjnetwork.py b/tjnetwork.py index 0a46c1e..07f1bf8 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -478,14 +478,14 @@ def set_rule(name: str, cs: ChangeSet) -> ChangeSet: # energy 15.[ENERGY] ############################################################ -def get_global_energy_schema(name: str) -> dict[str, dict[str, Any]]: - return api.get_global_energy_schema(name) +def get_energy_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_energy_schema(name) -def get_global_energy(name: str) -> dict[str, Any]: - return api.get_global_energy(name) +def get_energy(name: str) -> dict[str, Any]: + return api.get_energy(name) -def set_global_energy(name: str, cs: ChangeSet) -> ChangeSet: - return api.set_global_energy(name, cs) +def set_energy(name: str, cs: ChangeSet) -> ChangeSet: + return api.set_energy(name, cs) def get_pump_energy_schema(name: str) -> dict[str, dict[str, Any]]: return api.get_pump_energy_schema(name)