From 68b42ef2a03112ad4b53efe03d19cdd520a45359 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 17 Feb 2023 21:29:17 +0800 Subject: [PATCH 01/11] Add comment for scada data api --- tjnetwork.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tjnetwork.py b/tjnetwork.py index bbee25a..f03f2b8 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -808,8 +808,10 @@ def get_scada_data(name: str, device_id: str) -> dict[str, Any]: def set_scada_data(name: str, cs: ChangeSet) -> ChangeSet: return api.set_scada_data(name, cs) +# example: add_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-10 00:02:22', 'value': 100.0})) def add_scada_data(name: str, cs: ChangeSet) -> ChangeSet: return api.add_scada_data(name, cs) +# example: delete_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-12 00:02:22'})) def delete_scada_data(name: str, cs: ChangeSet) -> ChangeSet: return api.delete_scada_data(name, cs) From e88478fc13c54d18ab37fccbb3f899454e70cbf8 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 17 Feb 2023 21:35:08 +0800 Subject: [PATCH 02/11] Improve update snapshot --- api/database.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/database.py b/api/database.py index 4b64d74..474bf18 100644 --- a/api/database.py +++ b/api/database.py @@ -192,7 +192,10 @@ def take_snapshot(name: str, tag: str) -> int | None: def update_snapshot(name: str, operation: int, tag: str) -> None: if tag == None or tag == '': return None - write(name, f"update snapshot_operation set tag = '{tag}' where id = {operation}") + if have_snapshot_for_operation(name, operation): + write(name, f"update snapshot_operation set tag = '{tag}' where id = {operation}") + else: + take_snapshot_for_operation(name, operation, tag) def update_snapshot_for_current_operation(name: str, tag: str) -> None: From c3ae9b306f705e191bf1da0e30884cbfd07d0596 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 13:46:19 +0800 Subject: [PATCH 03/11] Fix snapshot api and test --- api/database.py | 4 ++-- test_tjnetwork.py | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/api/database.py b/api/database.py index 474bf18..3e17798 100644 --- a/api/database.py +++ b/api/database.py @@ -180,12 +180,12 @@ def take_snapshot_for_operation(name: str, operation: int, tag: str) -> None: write(name, f"insert into snapshot_operation (id, tag) values ({operation}, '{tag}')") -def take_snapshot_for_current_operation(name: str, tag: str) -> int | None: +def take_snapshot_for_current_operation(name: str, tag: str) -> None: take_snapshot_for_operation(name, get_current_operation(name), tag) # deprecated ! use take_snapshot_for_current_operation instead -def take_snapshot(name: str, tag: str) -> int | None: +def take_snapshot(name: str, tag: str) -> None: take_snapshot_for_current_operation(name, tag) diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 18a4310..837513b 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -77,18 +77,26 @@ class TestApi: add_junction(p, ChangeSet({'id': 'j3', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_junction(p, ChangeSet({'id': 'j4', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) - client_op = get_current_operation(p) - assert client_op == 4 - assert take_snapshot(p, 'x') == 4 + op_4 = get_current_operation(p) + assert op_4 == 4 + take_snapshot(p, 'x') + assert get_snapshot_by_operation(p, 4) == 'x' + assert get_operation_by_snapshot(p, 'x') == 4 + update_snapshot_for_current_operation(p, 'y') + assert get_snapshot_by_operation(p, 4) == 'y' execute_undo(p) execute_undo(p) add_junction(p, ChangeSet({'id': 'j5', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_junction(p, ChangeSet({'id': 'j6', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) - assert take_snapshot(p, 'xx') == 6 + op_6 = get_current_operation(p) + assert op_6 == 6 + take_snapshot(p, 'xx') + assert get_snapshot_by_operation(p, 6) == 'xx' + assert get_operation_by_snapshot(p, 'xx') == 6 - cs = sync_with_server(p, client_op).operations + cs = sync_with_server(p, op_4).operations cs[0]['operation'] = API_DELETE cs[0]['id'] = 'j4' cs[1]['operation'] = API_DELETE @@ -98,7 +106,7 @@ class TestApi: cs[3]['operation'] = API_ADD cs[3]['id'] = 'j6' - cs = pick_snapshot(p, 'x').operations + cs = pick_snapshot(p, 'y').operations cs[0]['operation'] = 'delete' cs[0]['id'] = 'j6' cs[1]['operation'] = 'delete' From cef631b41b151df63fa428f9d42a82c15630393d Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 13:47:24 +0800 Subject: [PATCH 04/11] Refine scada tables --- script/sql/create/29.scada_device.sql | 9 +++++++++ script/sql/create/29.scada_model.sql | 15 --------------- ...30.scada_data.sql => 30.scada_device_data.sql} | 4 ++-- script/sql/create/31.scada_element.sql | 11 +++++++++++ script/sql/drop/29.scada_device.sql | 3 +++ script/sql/drop/29.scada_model.sql | 5 ----- script/sql/drop/30.scada_data.sql | 1 - script/sql/drop/30.scada_device_data.sql | 1 + script/sql/drop/31.scada_element.sql | 3 +++ script/template.py | 10 ++++++---- 10 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 script/sql/create/29.scada_device.sql delete mode 100644 script/sql/create/29.scada_model.sql rename script/sql/create/{30.scada_data.sql => 30.scada_device_data.sql} (50%) create mode 100644 script/sql/create/31.scada_element.sql create mode 100644 script/sql/drop/29.scada_device.sql delete mode 100644 script/sql/drop/29.scada_model.sql delete mode 100644 script/sql/drop/30.scada_data.sql create mode 100644 script/sql/drop/30.scada_device_data.sql create mode 100644 script/sql/drop/31.scada_element.sql diff --git a/script/sql/create/29.scada_device.sql b/script/sql/create/29.scada_device.sql new file mode 100644 index 0000000..4f3cc3a --- /dev/null +++ b/script/sql/create/29.scada_device.sql @@ -0,0 +1,9 @@ +create type scada_device_type as enum ('PRESSURE', 'DEMAND', 'QUALITY', 'LEVEL', 'FLOW'); + +create table scada_device +( + id text primary key +, name text +, address text +, type scada_device_type +); diff --git a/script/sql/create/29.scada_model.sql b/script/sql/create/29.scada_model.sql deleted file mode 100644 index 1460b26..0000000 --- a/script/sql/create/29.scada_model.sql +++ /dev/null @@ -1,15 +0,0 @@ -create type scada_type as enum ('PRESSURE', 'DEMAND', 'QUALITY', 'LEVEL', 'FLOW'); -create type scada_status as enum ('OFF', 'ON'); - -create table scada_model -( - id text primary key -, x numeric not null -, y numeric not null -, device_id text not null unique -, device_name text -, address text -, type scada_type -, model_id varchar(32) -- add constraint in API -, status scada_status not null default 'OFF' -); diff --git a/script/sql/create/30.scada_data.sql b/script/sql/create/30.scada_device_data.sql similarity index 50% rename from script/sql/create/30.scada_data.sql rename to script/sql/create/30.scada_device_data.sql index 02c1643..8919bf6 100644 --- a/script/sql/create/30.scada_data.sql +++ b/script/sql/create/30.scada_device_data.sql @@ -1,6 +1,6 @@ -create table scada_data +create table scada_device_data ( - device_id text not null references scada_model(device_id) + device_id text not null references scada_device(id) , time timestamp not null , value numeric not null , primary key (device_id, time) diff --git a/script/sql/create/31.scada_element.sql b/script/sql/create/31.scada_element.sql new file mode 100644 index 0000000..6755f46 --- /dev/null +++ b/script/sql/create/31.scada_element.sql @@ -0,0 +1,11 @@ +create type scada_element_status as enum ('OFF', 'ON'); + +create table scada_element +( + id text primary key +, x numeric not null +, y numeric not null +, device_id text references scada_device(id) +, model_id varchar(32) -- add constraint in API +, status scada_element_status not null default 'OFF' +); diff --git a/script/sql/drop/29.scada_device.sql b/script/sql/drop/29.scada_device.sql new file mode 100644 index 0000000..d1ab139 --- /dev/null +++ b/script/sql/drop/29.scada_device.sql @@ -0,0 +1,3 @@ +drop table if exists scada_device; + +drop type if exists scada_device_type; diff --git a/script/sql/drop/29.scada_model.sql b/script/sql/drop/29.scada_model.sql deleted file mode 100644 index fe44555..0000000 --- a/script/sql/drop/29.scada_model.sql +++ /dev/null @@ -1,5 +0,0 @@ -drop table if exists scada_model; - -drop type if exists scada_status; - -drop type if exists scada_type; diff --git a/script/sql/drop/30.scada_data.sql b/script/sql/drop/30.scada_data.sql deleted file mode 100644 index daa81a0..0000000 --- a/script/sql/drop/30.scada_data.sql +++ /dev/null @@ -1 +0,0 @@ -drop table if exists scada_data; diff --git a/script/sql/drop/30.scada_device_data.sql b/script/sql/drop/30.scada_device_data.sql new file mode 100644 index 0000000..6771767 --- /dev/null +++ b/script/sql/drop/30.scada_device_data.sql @@ -0,0 +1 @@ +drop table if exists scada_device_data; diff --git a/script/sql/drop/31.scada_element.sql b/script/sql/drop/31.scada_element.sql new file mode 100644 index 0000000..5f467b8 --- /dev/null +++ b/script/sql/drop/31.scada_element.sql @@ -0,0 +1,3 @@ +drop table if exists scada_element; + +drop type if exists scada_element_status; diff --git a/script/template.py b/script/template.py index da61652..a15c882 100644 --- a/script/template.py +++ b/script/template.py @@ -30,15 +30,17 @@ sql_create = [ "sql/create/26.labels.sql", "sql/create/27.backdrop.sql", "sql/create/28.end.sql", - "sql/create/29.scada_model.sql", - "sql/create/30.scada_data.sql", + "sql/create/29.scada_device.sql", + "sql/create/30.scada_device_data.sql", + "sql/create/31.scada_element.sql", "sql/create/operation.sql" ] sql_drop = [ "sql/drop/operation.sql", - "sql/drop/30.scada_data.sql", - "sql/drop/29.scada_model.sql", + "sql/drop/31.scada_element.sql", + "sql/drop/30.scada_device_data.sql", + "sql/drop/29.scada_device.sql", "sql/drop/28.end.sql", "sql/drop/27.backdrop.sql", "sql/drop/26.labels.sql", From fd03105614ae6e3555cffe192a637254430c2ec7 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 13:47:59 +0800 Subject: [PATCH 05/11] Refine scada api --- api/__init__.py | 13 +++- api/del_cmd.py | 15 ++++ api/s29_scada_device.py | 120 ++++++++++++++++++++++++++++ api/s29_scada_model.py | 146 ----------------------------------- api/s30_scada_data.py | 93 ---------------------- api/s30_scada_device_data.py | 103 ++++++++++++++++++++++++ api/s31_scada_element.py | 146 +++++++++++++++++++++++++++++++++++ tjnetwork.py | 98 ++++++++++++++--------- 8 files changed, 456 insertions(+), 278 deletions(-) create mode 100644 api/s29_scada_device.py delete mode 100644 api/s29_scada_model.py delete mode 100644 api/s30_scada_data.py create mode 100644 api/s30_scada_device_data.py create mode 100644 api/s31_scada_element.py diff --git a/api/__init__.py b/api/__init__.py index a2b8022..6789d7d 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -104,8 +104,13 @@ from .s26_labels import get_label_schema, get_label, set_label, add_label, delet from .s27_backdrop import get_backdrop_schema, get_backdrop, set_backdrop -from .s29_scada_model import SCADA_TYPE_PRESSURE, SCADA_TYPE_DEMAND, SCADA_TYPE_QUALITY, SCADA_TYPE_LEVEL, SCADA_TYPE_FLOW -from .s29_scada_model import SCADA_STATUS_OFFLINE, SCADA_STATUS_ONLINE -from .s29_scada_model import get_scada_model_schema, get_scada_model, set_scada_model, add_scada_model, delete_scada_model +from .s29_scada_device import SCADA_DEVICE_TYPE_PRESSURE, SCADA_DEVICE_TYPE_DEMAND, SCADA_DEVICE_TYPE_QUALITY, SCADA_DEVICE_TYPE_LEVEL, SCADA_DEVICE_TYPE_FLOW +from .s29_scada_device import get_scada_device_schema, get_scada_device, set_scada_device, add_scada_device, delete_scada_device +from .del_cmd import clean_scada_device -from .s30_scada_data import get_scada_data_schema, get_scada_data, set_scada_data, add_scada_data, delete_scada_data +from .s30_scada_device_data import get_scada_device_data_schema, get_scada_device_data, set_scada_device_data, add_scada_device_data, delete_scada_device_data +from .del_cmd import clean_scada_device_data + +from .s31_scada_element import SCADA_ELEMENT_STATUS_OFFLINE, SCADA_ELEMENT_STATUS_ONLINE +from .s31_scada_element import get_scada_element_schema, get_scada_element, set_scada_element, add_scada_element, delete_scada_element +from .del_cmd import clean_scada_element diff --git a/api/del_cmd.py b/api/del_cmd.py index de58ecc..1d20140 100644 --- a/api/del_cmd.py +++ b/api/del_cmd.py @@ -1,5 +1,8 @@ from .del_cmd_raw import * from .batch_cmd import execute_batch_command +from .s29_scada_device import clean_scada_device_cmd +from .s30_scada_device_data import clean_scada_device_data_cmd +from .s31_scada_element import clean_scada_element_cmd def delete_junction_cascade(name: str, cs: ChangeSet) -> ChangeSet: @@ -48,3 +51,15 @@ def delete_curve_cascade(name: str, cs: ChangeSet) -> ChangeSet: cs.operations[0] |= { 'operation' : API_DELETE, 'type' : 'curve' } #raw_cmd = delete_curve_cascade_batch_cmd(name, cs) return execute_batch_command(name, cs) + + +def clean_scada_device(name: str) -> ChangeSet: + return execute_batch_command(name, clean_scada_device_cmd(name)) + + +def clean_scada_device_data(name: str) -> ChangeSet: + return execute_batch_command(name, clean_scada_device_data_cmd(name)) + + +def clean_scada_element(name: str) -> ChangeSet: + return execute_batch_command(name, clean_scada_element_cmd(name)) diff --git a/api/s29_scada_device.py b/api/s29_scada_device.py new file mode 100644 index 0000000..6143b6e --- /dev/null +++ b/api/s29_scada_device.py @@ -0,0 +1,120 @@ +from .database import * + + +SCADA_DEVICE_TYPE_PRESSURE = 'PRESSURE' +SCADA_DEVICE_TYPE_DEMAND = 'DEMAND' +SCADA_DEVICE_TYPE_QUALITY = 'QUALITY' +SCADA_DEVICE_TYPE_LEVEL = 'LEVEL' +SCADA_DEVICE_TYPE_FLOW = 'FLOW' + + +def get_scada_device_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'id' : {'type': 'str', 'optional': False, 'readonly': True }, + 'name' : {'type': 'str', 'optional': True , 'readonly': False}, + 'address': {'type': 'str', 'optional': True , 'readonly': False}, + 'sd_type': {'type': 'str', 'optional': True , 'readonly': False}} + + +def get_scada_device(name: str, id: str) -> dict[str, Any]: + sm = try_read(name, f"select * from scada_device where id = '{id}'") + if sm == None: + return {} + d = {} + d['id'] = str(sm['id']) + d['name'] = str(sm['name']) if sm['name'] != None else None + d['address'] = str(sm['address']) if sm['address'] != None else None + d['sd_type'] = str(sm['type']) if sm['type'] != None else None + return d + + +class ScadaDevice(object): + def __init__(self, input: dict[str, Any]) -> None: + self.type = 'scada_device' + self.id = str(input['id']) + self.name = str(input['name']) if 'name' in input and input['name'] != None else None + self.address = str(input['address']) if 'address' in input and input['address'] != None else None + self.sd_type = str(input['sd_type']) if 'sd_type' in input and input['sd_type'] != None else None + + self.f_type = f"'{self.type}'" + self.f_id = f"'{self.id}'" + self.f_name = f"'{self.name}'" if self.name != None else 'null' + self.f_address = f"'{self.address}'" if self.address != None else 'null' + self.f_sd_type = f"'{self.sd_type}'" if self.sd_type != None else 'null' + + def as_dict(self) -> dict[str, Any]: + return { 'type': self.type, 'id': self.id, 'name': self.name, 'address': self.address, 'sd_type': self.sd_type } + + def as_id_dict(self) -> dict[str, Any]: + return { 'type': self.type, 'id': self.id } + + +def set_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + old = ScadaDevice(get_scada_device(name, cs.operations[0]['id'])) + raw_new = get_scada_device(name, cs.operations[0]['id']) + + new_dict = cs.operations[0] + schema = get_scada_device_schema(name) + for key, value in schema.items(): + if key in new_dict and not value['readonly']: + raw_new[key] = new_dict[key] + new = ScadaDevice(raw_new) + + redo_sql = f"update scada_device set name = {new.f_name}, address = {new.f_address}, type = {new.f_sd_type} where id = {new.f_id};" + undo_sql = f"update scada_device set name = {old.f_name}, address = {old.f_address}, type = {old.f_sd_type} where id = {old.f_id};" + + redo_cs = g_update_prefix | new.as_dict() + undo_cs = g_update_prefix | old.as_dict() + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def set_scada_device(name: str, cs: ChangeSet) -> ChangeSet: + if get_scada_device(name, cs.operations[0]['id']) == {}: + return ChangeSet() + return execute_command(name, set_scada_device_cmd(name, cs)) + + +def add_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + new = ScadaDevice(cs.operations[0]) + + redo_sql = f"insert into scada_device (id, name, address, type) values ({new.f_id}, {new.f_name}, {new.f_address}, {new.f_sd_type});" + undo_sql = f"delete from scada_device where id = {new.f_id};" + + redo_cs = g_add_prefix | new.as_dict() + undo_cs = g_delete_prefix | new.as_id_dict() + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def add_scada_device(name: str, cs: ChangeSet) -> ChangeSet: + if get_scada_device(name, cs.operations[0]['id']) != {}: + return ChangeSet() + return execute_command(name, add_scada_device_cmd(name, cs)) + + +def delete_scada_device_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + old = ScadaDevice(get_scada_device(name, cs.operations[0]['id'])) + + redo_sql = f"delete from scada_device where id = {old.f_id};" + undo_sql = f"insert into scada_device (id, name, address, type) values ({old.f_id}, {old.f_name}, {old.f_address}, {old.f_sd_type});" + + redo_cs = g_delete_prefix | old.as_id_dict() + undo_cs = g_add_prefix | old.as_dict() + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def delete_scada_device(name: str, cs: ChangeSet) -> ChangeSet: + if get_scada_device(name, cs.operations[0]['id']) == {}: + return ChangeSet() + return execute_command(name, delete_scada_device_cmd(name, cs)) + + +def clean_scada_device_cmd(name: str) -> ChangeSet: + cs = ChangeSet() + + rows = read_all(name, 'select * from scada_device') + for row in rows: + cs.delete({ 'type': 'scada_device', 'id': row['id'] }) + + return cs diff --git a/api/s29_scada_model.py b/api/s29_scada_model.py deleted file mode 100644 index 825c05d..0000000 --- a/api/s29_scada_model.py +++ /dev/null @@ -1,146 +0,0 @@ -from .database import * -from .s0_base import is_node, is_link - -SCADA_TYPE_PRESSURE = 'PRESSURE' -SCADA_TYPE_DEMAND = 'DEMAND' -SCADA_TYPE_QUALITY = 'QUALITY' -SCADA_TYPE_LEVEL = 'LEVEL' -SCADA_TYPE_FLOW = 'FLOW' - -SCADA_STATUS_OFFLINE = 'OFF' -SCADA_STATUS_ONLINE = 'ON' - - -def _check_model_id(name: str, cs: ChangeSet) -> bool: - if 'model_id' not in cs.operations[0]: - return True - if cs.operations[0]['model_id'] == None: - return True - model_id = cs.operations[0]['model_id'] - return is_node(name, model_id) or is_link(name, model_id) - - -def get_scada_model_schema(name: str) -> dict[str, dict[str, Any]]: - return { 'id' : {'type': 'str' , 'optional': False , 'readonly': True }, - 'x' : {'type': 'float' , 'optional': False , 'readonly': False}, - 'y' : {'type': 'float' , 'optional': False , 'readonly': False}, - 'device_id' : {'type': 'str' , 'optional': False , 'readonly': False}, - 'device_name' : {'type': 'str' , 'optional': True , 'readonly': False}, - 'address' : {'type': 'str' , 'optional': True , 'readonly': False}, - 'sm_type' : {'type': 'str' , 'optional': True , 'readonly': False}, - 'model_id' : {'type': 'str' , 'optional': True , 'readonly': False}, - 'status' : {'type': 'str' , 'optional': True , 'readonly': False} } - - -def get_scada_model(name: str, id: str) -> dict[str, Any]: - sm = try_read(name, f"select * from scada_model where id = '{id}'") - if sm == None: - return {} - d = {} - d['id'] = str(sm['id']) - d['x'] = float(sm['x']) - d['y'] = float(sm['y']) - d['device_id'] = str(sm['device_id']) - d['device_name'] = str(sm['device_name']) if sm['device_name'] != None else None - d['address'] = str(sm['address']) if sm['address'] != None else None - d['sm_type'] = str(sm['type']) if sm['type'] != None else None - d['model_id'] = str(sm['model_id']) if sm['model_id'] != None else None - d['status'] = str(sm['status']) - return d - - -class ScadaModel(object): - def __init__(self, input: dict[str, Any]) -> None: - self.type = 'scada_model' - self.id = str(input['id']) - self.x = float(input['x']) - self.y = float(input['y']) - self.device_id = str(input['device_id']) - self.device_name = str(input['device_name']) if 'device_name' in input and input['device_name'] != None else None - self.address = str(input['address']) if 'address' in input and input['address'] != None else None - self.sm_type = str(input['sm_type']) if 'sm_type' in input and input['sm_type'] != None else None - self.model_id = str(input['model_id']) if 'model_id' in input and input['model_id'] != None else None - self.status = str(input['status']) if 'status' in input and input['status'] != None else SCADA_STATUS_OFFLINE - - self.f_type = f"'{self.type}'" - self.f_id = f"'{self.id}'" - self.f_x = self.x - self.f_y = self.y - self.f_device_id = f"'{self.device_id}'" - self.f_device_name = f"'{self.device_name}'" if self.device_name != None else 'null' - self.f_address = f"'{self.address}'" if self.address != None else 'null' - self.f_sm_type = f"'{self.sm_type}'" if self.sm_type != None else 'null' - self.f_model_id = f"'{self.model_id}'" if self.model_id != None else 'null' - self.f_status = f"'{self.status}'" - - def as_dict(self) -> dict[str, Any]: - return { 'type': self.type, 'id': self.id, 'x': self.x, 'y': self.y, 'device_id': self.device_id, 'device_name': self.device_name, 'address': self.address, 'sm_type': self.sm_type, 'model_id': self.model_id, 'status': self.status } - - def as_id_dict(self) -> dict[str, Any]: - return { 'type': self.type, 'id': self.id } - - -def set_scada_model_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - old = ScadaModel(get_scada_model(name, cs.operations[0]['id'])) - raw_new = get_scada_model(name, cs.operations[0]['id']) - - new_dict = cs.operations[0] - schema = get_scada_model_schema(name) - for key, value in schema.items(): - if key in new_dict and not value['readonly']: - raw_new[key] = new_dict[key] - new = ScadaModel(raw_new) - - redo_sql = f"update scada_model set x = {new.f_x}, y = {new.f_y}, device_id = {new.f_device_id}, device_name = {new.f_device_name}, address = {new.f_address}, type = {new.f_sm_type}, model_id = {new.f_model_id}, status = {new.f_status} where id = {new.f_id};" - undo_sql = f"update scada_model set x = {old.f_x}, y = {old.f_y}, device_id = {old.f_device_id}, device_name = {old.f_device_name}, address = {old.f_address}, type = {old.f_sm_type}, model_id = {old.f_model_id}, status = {old.f_status} where id = {old.f_id};" - - redo_cs = g_update_prefix | new.as_dict() - undo_cs = g_update_prefix | old.as_dict() - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def set_scada_model(name: str, cs: ChangeSet) -> ChangeSet: - if get_scada_model(name, cs.operations[0]['id']) == {}: - return ChangeSet() - if _check_model_id(name, cs) == False: - return ChangeSet() - return execute_command(name, set_scada_model_cmd(name, cs)) - - -def add_scada_model_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - new = ScadaModel(cs.operations[0]) - - redo_sql = f"insert into scada_model (id, x, y, device_id, device_name, address, type, model_id, status) values ({new.f_id}, {new.f_x}, {new.f_y}, {new.f_device_id}, {new.f_device_name}, {new.f_address}, {new.f_sm_type}, {new.f_model_id}, {new.f_status});" - undo_sql = f"delete from scada_model where id = {new.f_id};" - - redo_cs = g_add_prefix | new.as_dict() - undo_cs = g_delete_prefix | new.as_id_dict() - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def add_scada_model(name: str, cs: ChangeSet) -> ChangeSet: - if get_scada_model(name, cs.operations[0]['id']) != {}: - return ChangeSet() - if _check_model_id(name, cs) == False: - return ChangeSet() - return execute_command(name, add_scada_model_cmd(name, cs)) - - -def delete_scada_model_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - old = ScadaModel(get_scada_model(name, cs.operations[0]['id'])) - - redo_sql = f"delete from scada_model where id = {old.f_id};" - undo_sql = f"insert into scada_model (id, x, y, device_id, device_name, address, type, model_id, status) values ({old.f_id}, {old.f_x}, {old.f_y}, {old.f_device_id}, {old.f_device_name}, {old.f_address}, {old.f_sm_type}, {old.f_model_id}, {old.f_status});" - - redo_cs = g_delete_prefix | old.as_id_dict() - undo_cs = g_add_prefix | old.as_dict() - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def delete_scada_model(name: str, cs: ChangeSet) -> ChangeSet: - if get_scada_model(name, cs.operations[0]['id']) == {}: - return ChangeSet() - return execute_command(name, delete_scada_model_cmd(name, cs)) diff --git a/api/s30_scada_data.py b/api/s30_scada_data.py deleted file mode 100644 index 14f8f8b..0000000 --- a/api/s30_scada_data.py +++ /dev/null @@ -1,93 +0,0 @@ -from .database import * - - -def get_scada_data_schema(name: str) -> dict[str, dict[str, Any]]: - return { 'device_id' : {'type': 'str' , 'optional': False , 'readonly': True }, - 'data' : {'type': 'list' , 'optional': False , 'readonly': False, - 'element': { 'time' : {'type': 'str' , 'optional': False , 'readonly': False }, - 'value' : {'type': 'float' , 'optional': False , 'readonly': False } }}} - - -def get_scada_data(name: str, device_id: str) -> dict[str, Any]: - sds = read_all(name, f"select * from scada_data where device_id = '{device_id}' order by time") - ds = [] - for r in sds: - ds.append({ 'time': str(r['time']), 'value': float(r['value']) }) - return { 'device_id': device_id, 'data': ds } - - -def set_scada_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - device_id = cs.operations[0]['device_id'] - - old = get_scada_data(name, device_id) - new = { 'device_id': device_id, 'data': [] } - - f_device_id = f"'{device_id}'" - - # TODO: transaction ? - redo_sql = f"delete from scada_data where device_id = {f_device_id};" - for tv in cs.operations[0]['data']: - time, value = str(tv['time']), float(tv['value']) - f_time, f_value = f"'{time}'", value - redo_sql += f"\ninsert into scada_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" - new['data'].append({ 'time': time, 'value': value }) - - undo_sql = f"delete from scada_data where device_id = {f_device_id};" - for tv in old['data']: - time, value = str(tv['time']), float(tv['value']) - f_time, f_value = f"'{time}'", value - undo_sql += f"\ninsert into scada_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" - - redo_cs = { 'type': 'scada_data' } | new - undo_cs = { 'type': 'scada_data' } | old - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def set_scada_data(name: str, cs: ChangeSet) -> ChangeSet: - result = set_scada_data_cmd(name, cs) - result.redo_cs[0] |= g_update_prefix - result.undo_cs[0] |= g_update_prefix - return execute_command(name, result) - - -def add_scada_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - values = cs.operations[0] - device_id = values['device_id'] - time = values['time'] - value = float(values['value']) - - redo_sql = f"insert into scada_data (device_id, time, value) values ('{device_id}', '{time}', {value});" - undo_sql = f"delete from scada_data where device_id = '{device_id}' and time = '{time}';" - redo_cs = g_add_prefix | { 'type': 'scada_data', 'device_id': device_id, 'time': time, 'value': value } - undo_cs = g_delete_prefix | { 'type': 'scada_data', 'device_id': device_id, 'time': time } - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def add_scada_data(name: str, cs: ChangeSet) -> ChangeSet: - row = try_read(name, f"select * from scada_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'") - if row != None: - return ChangeSet() - return execute_command(name, add_scada_data_cmd(name, cs)) - - -def delete_scada_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - values = cs.operations[0] - device_id = values['device_id'] - time = values['time'] - value = float(read(name, f"select * from scada_data where device_id = '{device_id}' and time = '{time}'")['value']) - - redo_sql = f"delete from scada_data where device_id = '{device_id}' and time = '{time}';" - undo_sql = f"insert into scada_data (device_id, time, value) values ('{device_id}', '{time}', {value});" - redo_cs = g_delete_prefix | { 'type': 'scada_data', 'device_id': device_id, 'time': time } - undo_cs = g_add_prefix | { 'type': 'scada_data', 'device_id': device_id, 'time': time, 'value': value } - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def delete_scada_data(name: str, cs: ChangeSet) -> ChangeSet: - row = try_read(name, f"select * from scada_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'") - if row == None: - return ChangeSet() - return execute_command(name, delete_scada_data_cmd(name, cs)) diff --git a/api/s30_scada_device_data.py b/api/s30_scada_device_data.py new file mode 100644 index 0000000..b1f74b3 --- /dev/null +++ b/api/s30_scada_device_data.py @@ -0,0 +1,103 @@ +from .database import * + + +def get_scada_device_data_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'device_id' : {'type': 'str' , 'optional': False , 'readonly': True }, + 'data' : {'type': 'list' , 'optional': False , 'readonly': False, + 'element': { 'time' : {'type': 'str' , 'optional': False , 'readonly': False }, + 'value' : {'type': 'float' , 'optional': False , 'readonly': False } }}} + + +def get_scada_device_data(name: str, device_id: str) -> dict[str, Any]: + sds = read_all(name, f"select * from scada_device_data where device_id = '{device_id}' order by time") + ds = [] + for r in sds: + ds.append({ 'time': str(r['time']), 'value': float(r['value']) }) + return { 'device_id': device_id, 'data': ds } + + +def set_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + device_id = cs.operations[0]['device_id'] + + old = get_scada_device_data(name, device_id) + new = { 'device_id': device_id, 'data': [] } + + f_device_id = f"'{device_id}'" + + # TODO: transaction ? + redo_sql = f"delete from scada_device_data where device_id = {f_device_id};" + for tv in cs.operations[0]['data']: + time, value = str(tv['time']), float(tv['value']) + f_time, f_value = f"'{time}'", value + redo_sql += f"\ninsert into scada_device_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" + new['data'].append({ 'time': time, 'value': value }) + + undo_sql = f"delete from scada_device_data where device_id = {f_device_id};" + for tv in old['data']: + time, value = str(tv['time']), float(tv['value']) + f_time, f_value = f"'{time}'", value + undo_sql += f"\ninsert into scada_device_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" + + redo_cs = { 'type': 'scada_device_data' } | new + undo_cs = { 'type': 'scada_device_data' } | old + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: + result = set_scada_device_data_cmd(name, cs) + result.redo_cs[0] |= g_update_prefix + result.undo_cs[0] |= g_update_prefix + return execute_command(name, result) + + +def add_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + values = cs.operations[0] + device_id = values['device_id'] + time = values['time'] + value = float(values['value']) + + redo_sql = f"insert into scada_device_data (device_id, time, value) values ('{device_id}', '{time}', {value});" + undo_sql = f"delete from scada_device_data where device_id = '{device_id}' and time = '{time}';" + redo_cs = g_add_prefix | { 'type': 'scada_device_data', 'device_id': device_id, 'time': time, 'value': value } + undo_cs = g_delete_prefix | { 'type': 'scada_device_data', 'device_id': device_id, 'time': time } + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def add_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: + row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'") + if row != None: + return ChangeSet() + return execute_command(name, add_scada_device_data_cmd(name, cs)) + + +def delete_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + values = cs.operations[0] + device_id = values['device_id'] + time = values['time'] + value = float(read(name, f"select * from scada_device_data where device_id = '{device_id}' and time = '{time}'")['value']) + + redo_sql = f"delete from scada_device_data where device_id = '{device_id}' and time = '{time}';" + undo_sql = f"insert into scada_device_data (device_id, time, value) values ('{device_id}', '{time}', {value});" + redo_cs = g_delete_prefix | { 'type': 'scada_device_data', 'device_id': device_id, 'time': time } + undo_cs = g_add_prefix | { 'type': 'scada_device_data', 'device_id': device_id, 'time': time, 'value': value } + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def delete_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: + row = try_read(name, f"select * from scada_device_data where device_id = '{cs.operations[0]['device_id']}' and time = '{cs.operations[0]['time']}'") + if row == None: + return ChangeSet() + return execute_command(name, delete_scada_device_data_cmd(name, cs)) + + +def clean_scada_device_data_cmd(name: str) -> ChangeSet: + cs = ChangeSet() + + rows = read_all(name, 'select distinct device_id from scada_device_data') + for row in rows: + cs.update({ 'type': 'scada_device_data', 'device_id': row['device_id'], 'data': [] }) + + return cs diff --git a/api/s31_scada_element.py b/api/s31_scada_element.py new file mode 100644 index 0000000..04448a9 --- /dev/null +++ b/api/s31_scada_element.py @@ -0,0 +1,146 @@ +from .database import * +from .s0_base import is_node, is_link + + +SCADA_TYPE_PRESSURE = 'PRESSURE' +SCADA_TYPE_DEMAND = 'DEMAND' +SCADA_TYPE_QUALITY = 'QUALITY' +SCADA_TYPE_LEVEL = 'LEVEL' +SCADA_TYPE_FLOW = 'FLOW' + + +SCADA_ELEMENT_STATUS_OFFLINE = 'OFF' +SCADA_ELEMENT_STATUS_ONLINE = 'ON' + + +def _check_model_id(name: str, cs: ChangeSet) -> bool: + if 'model_id' not in cs.operations[0]: + return True + if cs.operations[0]['model_id'] == None: + return True + model_id = cs.operations[0]['model_id'] + return is_node(name, model_id) or is_link(name, model_id) + + +def get_scada_element_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'id' : {'type': 'str' , 'optional': False , 'readonly': True }, + 'x' : {'type': 'float' , 'optional': False , 'readonly': False}, + 'y' : {'type': 'float' , 'optional': False , 'readonly': False}, + 'device_id' : {'type': 'str' , 'optional': True , 'readonly': False}, + 'model_id' : {'type': 'str' , 'optional': True , 'readonly': False}, + 'status' : {'type': 'str' , 'optional': True , 'readonly': False} } + + +def get_scada_element(name: str, id: str) -> dict[str, Any]: + sm = try_read(name, f"select * from scada_element where id = '{id}'") + if sm == None: + return {} + d = {} + d['id'] = str(sm['id']) + d['x'] = float(sm['x']) + d['y'] = float(sm['y']) + d['device_id'] = str(sm['device_id']) if sm['device_id'] != None else None + d['model_id'] = str(sm['model_id']) if sm['model_id'] != None else None + d['status'] = str(sm['status']) + return d + + +class ScadaModel(object): + def __init__(self, input: dict[str, Any]) -> None: + self.type = 'scada_element' + self.id = str(input['id']) + self.x = float(input['x']) + self.y = float(input['y']) + self.device_id = str(input['device_id']) if 'device_id' in input and input['device_id'] != None else None + self.model_id = str(input['model_id']) if 'model_id' in input and input['model_id'] != None else None + self.status = str(input['status']) if 'status' in input and input['status'] != None else SCADA_ELEMENT_STATUS_OFFLINE + + self.f_type = f"'{self.type}'" + self.f_id = f"'{self.id}'" + self.f_x = self.x + self.f_y = self.y + self.f_device_id = f"'{self.device_id}'" if self.device_id != None else 'null' + self.f_model_id = f"'{self.model_id}'" if self.model_id != None else 'null' + self.f_status = f"'{self.status}'" + + def as_dict(self) -> dict[str, Any]: + return { 'type': self.type, 'id': self.id, 'x': self.x, 'y': self.y, 'device_id': self.device_id, 'model_id': self.model_id, 'status': self.status } + + def as_id_dict(self) -> dict[str, Any]: + return { 'type': self.type, 'id': self.id } + + +def set_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + old = ScadaModel(get_scada_element(name, cs.operations[0]['id'])) + raw_new = get_scada_element(name, cs.operations[0]['id']) + + new_dict = cs.operations[0] + schema = get_scada_element_schema(name) + for key, value in schema.items(): + if key in new_dict and not value['readonly']: + raw_new[key] = new_dict[key] + new = ScadaModel(raw_new) + + redo_sql = f"update scada_element set x = {new.f_x}, y = {new.f_y}, device_id = {new.f_device_id}, model_id = {new.f_model_id}, status = {new.f_status} where id = {new.f_id};" + undo_sql = f"update scada_element set x = {old.f_x}, y = {old.f_y}, device_id = {old.f_device_id}, model_id = {old.f_model_id}, status = {old.f_status} where id = {old.f_id};" + + redo_cs = g_update_prefix | new.as_dict() + undo_cs = g_update_prefix | old.as_dict() + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def set_scada_element(name: str, cs: ChangeSet) -> ChangeSet: + if get_scada_element(name, cs.operations[0]['id']) == {}: + return ChangeSet() + if _check_model_id(name, cs) == False: + return ChangeSet() + return execute_command(name, set_scada_element_cmd(name, cs)) + + +def add_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + new = ScadaModel(cs.operations[0]) + + redo_sql = f"insert into scada_element (id, x, y, device_id, model_id, status) values ({new.f_id}, {new.f_x}, {new.f_y}, {new.f_device_id}, {new.f_model_id}, {new.f_status});" + undo_sql = f"delete from scada_element where id = {new.f_id};" + + redo_cs = g_add_prefix | new.as_dict() + undo_cs = g_delete_prefix | new.as_id_dict() + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def add_scada_element(name: str, cs: ChangeSet) -> ChangeSet: + if get_scada_element(name, cs.operations[0]['id']) != {}: + return ChangeSet() + if _check_model_id(name, cs) == False: + return ChangeSet() + return execute_command(name, add_scada_element_cmd(name, cs)) + + +def delete_scada_element_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + old = ScadaModel(get_scada_element(name, cs.operations[0]['id'])) + + redo_sql = f"delete from scada_element where id = {old.f_id};" + undo_sql = f"insert into scada_element (id, x, y, device_id, model_id, status) values ({old.f_id}, {old.f_x}, {old.f_y}, {old.f_device_id}, {old.f_model_id}, {old.f_status});" + + redo_cs = g_delete_prefix | old.as_id_dict() + undo_cs = g_add_prefix | old.as_dict() + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def delete_scada_element(name: str, cs: ChangeSet) -> ChangeSet: + if get_scada_element(name, cs.operations[0]['id']) == {}: + return ChangeSet() + return execute_command(name, delete_scada_element_cmd(name, cs)) + + +def clean_scada_element_cmd(name: str) -> ChangeSet: + cs = ChangeSet() + + rows = read_all(name, 'select * from scada_element') + for row in rows: + cs.delete({ 'type': 'scada_element', 'id': row['id'] }) + + return cs diff --git a/tjnetwork.py b/tjnetwork.py index f03f2b8..78417f4 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -95,14 +95,14 @@ OPTION_QUALITY_CHEMICAL = api.OPTION_QUALITY_CHEMICAL OPTION_QUALITY_AGE = api.OPTION_QUALITY_AGE OPTION_QUALITY_TRACE = api.OPTION_QUALITY_TRACE -SCADA_TYPE_PRESSURE = api.SCADA_TYPE_PRESSURE -SCADA_TYPE_DEMAND = api.SCADA_TYPE_DEMAND -SCADA_TYPE_QUALITY = api.SCADA_TYPE_QUALITY -SCADA_TYPE_LEVEL = api.SCADA_TYPE_LEVEL -SCADA_TYPE_FLOW = api.SCADA_TYPE_FLOW +SCADA_DEVICE_TYPE_PRESSURE = api.SCADA_DEVICE_TYPE_PRESSURE +SCADA_DEVICE_TYPE_DEMAND = api.SCADA_DEVICE_TYPE_DEMAND +SCADA_DEVICE_TYPE_QUALITY = api.SCADA_DEVICE_TYPE_QUALITY +SCADA_DEVICE_TYPE_LEVEL = api.SCADA_DEVICE_TYPE_LEVEL +SCADA_DEVICE_TYPE_FLOW = api.SCADA_DEVICE_TYPE_FLOW -SCADA_STATUS_ONLINE = api.SCADA_STATUS_ONLINE -SCADA_STATUS_OFFLINE = api.SCADA_STATUS_OFFLINE +SCADA_ELEMENT_STATUS_ONLINE = api.SCADA_ELEMENT_STATUS_ONLINE +SCADA_ELEMENT_STATUS_OFFLINE = api.SCADA_ELEMENT_STATUS_OFFLINE ############################################################ @@ -185,11 +185,11 @@ def have_snapshot_for_current_operation(name: str) -> bool: def take_snapshot_for_operation(name: str, operation: int, tag: str) -> None: return api.take_snapshot_for_operation(name, operation, tag) -def take_snapshot_for_current_operation(name: str, tag: str) -> int | None: +def take_snapshot_for_current_operation(name: str, tag: str) -> None: return api.take_snapshot_for_current_operation(name, tag) # deprecated ! use take_snapshot_for_current_operation instead -def take_snapshot(name: str, tag: str) -> int | None: +def take_snapshot(name: str, tag: str) -> None: return api.take_snapshot(name, tag) def update_snapshot(name: str, operation: int, tag: str) -> None: @@ -773,45 +773,73 @@ def set_backdrop(name: str, cs: ChangeSet) -> ChangeSet: ############################################################ -# scada_model 29 +# scada_device 29 ############################################################ -def get_scada_model_schema(name: str) -> dict[str, dict[str, Any]]: - return api.get_scada_model_schema(name) +def get_scada_device_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_scada_device_schema(name) -def get_scada_model(name: str, id: str) -> dict[str, Any]: - return api.get_scada_model(name, id) +def get_scada_device(name: str, id: str) -> dict[str, Any]: + return api.get_scada_device(name, id) -def set_scada_model(name: str, cs: ChangeSet) -> ChangeSet: - return api.set_scada_model(name, cs) +def set_scada_device(name: str, cs: ChangeSet) -> ChangeSet: + return api.set_scada_device(name, cs) -# example: add_scada_model(p, ChangeSet({'id': 'sm', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device'})) -def add_scada_model(name: str, cs: ChangeSet) -> ChangeSet: - return api.add_scada_model(name, cs) +def add_scada_device(name: str, cs: ChangeSet) -> ChangeSet: + return api.add_scada_device(name, cs) -def delete_scada_model(name: str, cs: ChangeSet) -> ChangeSet: - return api.delete_scada_model(name, cs) +def delete_scada_device(name: str, cs: ChangeSet) -> ChangeSet: + return api.delete_scada_device(name, cs) + +def clean_scada_device(name: str) -> ChangeSet: + return api.clean_scada_device(name) ############################################################ -# scada_data 30 +# scada_device_data 30 ############################################################ -def get_scada_data_schema(name: str) -> dict[str, dict[str, Any]]: - return api.get_scada_data_schema(name) +def get_scada_device_data_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_scada_device_data_schema(name) -def get_scada_data(name: str, device_id: str) -> dict[str, Any]: - return api.get_scada_data(name, device_id) +def get_scada_device_data(name: str, device_id: str) -> dict[str, Any]: + return api.get_scada_device_data(name, device_id) -# example: set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }, { 'time': '2023-02-10 00:03:22', 'value': 200.0 }]})) +# example: set_scada_device_data(p, ChangeSet({'device_id': 'sm_device', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }, { 'time': '2023-02-10 00:03:22', 'value': 200.0 }]})) # time format must be 'YYYY-MM-DD HH:MM:SS' -def set_scada_data(name: str, cs: ChangeSet) -> ChangeSet: - return api.set_scada_data(name, cs) +def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: + return api.set_scada_device_data(name, cs) -# example: add_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-10 00:02:22', 'value': 100.0})) -def add_scada_data(name: str, cs: ChangeSet) -> ChangeSet: - return api.add_scada_data(name, cs) +# example: add_scada_device_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-10 00:02:22', 'value': 100.0})) +def add_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: + return api.add_scada_device_data(name, cs) -# example: delete_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-12 00:02:22'})) -def delete_scada_data(name: str, cs: ChangeSet) -> ChangeSet: - return api.delete_scada_data(name, cs) +# example: delete_scada_device_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-12 00:02:22'})) +def delete_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: + return api.delete_scada_device_data(name, cs) + +def clean_scada_device_data(name: str) -> ChangeSet: + return api.clean_scada_device_data(name) + + +############################################################ +# scada_element 31 +############################################################ + +def get_scada_element_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_scada_element_schema(name) + +def get_scada_element(name: str, id: str) -> dict[str, Any]: + return api.get_scada_element(name, id) + +def set_scada_element(name: str, cs: ChangeSet) -> ChangeSet: + return api.set_scada_element(name, cs) + +def add_scada_element(name: str, cs: ChangeSet) -> ChangeSet: + return api.add_scada_element(name, cs) + +def delete_scada_element(name: str, cs: ChangeSet) -> ChangeSet: + return api.delete_scada_element(name, cs) + +def clean_scada_element(name: str) -> ChangeSet: + return api.clean_scada_element(name) From db8329aa7008b65f07893c0d693ab7f4b43fa955 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 14:02:59 +0800 Subject: [PATCH 06/11] Support scada batch operation --- api/batch_cmd.py | 21 +++++++++++++++++++++ api/batch_cmds.py | 21 +++++++++++++++++++++ api/sections.py | 5 ++++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/api/batch_cmd.py b/api/batch_cmd.py index 1bc30cf..505912e 100644 --- a/api/batch_cmd.py +++ b/api/batch_cmd.py @@ -28,6 +28,9 @@ from .s25_vertices import set_vertex_cmd, add_vertex_cmd, delete_vertex_cmd from .s26_labels import set_label_cmd, add_label_cmd, delete_label_cmd from .s27_backdrop import set_backdrop_cmd # from .s28_end import * +from .s29_scada_device import set_scada_device_cmd, add_scada_device_cmd, delete_scada_device_cmd +from .s30_scada_device_data import set_scada_device_data_cmd, add_scada_device_data_cmd, delete_scada_device_data_cmd +from .s31_scada_element import set_scada_element_cmd, add_scada_element_cmd, delete_scada_element_cmd from .del_cmd_raw import del_cascade_cmd @@ -96,6 +99,12 @@ def add_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: return None elif type == s28_end: return None + elif type == s29_scada_device: + return add_scada_device_cmd(name, cs) + elif type == s30_scada_device_data: + return add_scada_device_data_cmd(name, cs) + elif type == s31_scada_element: + return add_scada_element_cmd(name, cs) return None @@ -165,6 +174,12 @@ def set_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: return set_backdrop_cmd(name, cs) elif type == s28_end: # end return None + elif type == s29_scada_device: + return set_scada_device_cmd(name, cs) + elif type == s30_scada_device_data: + return set_scada_device_data_cmd(name, cs) + elif type == s31_scada_element: + return set_scada_element_cmd(name, cs) return None @@ -234,6 +249,12 @@ def del_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: return None elif type == s28_end: return None + elif type == s29_scada_device: + return delete_scada_device_cmd(name, cs) + elif type == s30_scada_device_data: + return delete_scada_device_data_cmd(name, cs) + elif type == s31_scada_element: + return delete_scada_element_cmd(name, cs) return None diff --git a/api/batch_cmds.py b/api/batch_cmds.py index 1f8f77f..89625f2 100644 --- a/api/batch_cmds.py +++ b/api/batch_cmds.py @@ -28,6 +28,9 @@ from .s25_vertices import set_vertex, add_vertex, delete_vertex from .s26_labels import set_label, add_label, delete_label from .s27_backdrop import set_backdrop # from .s28_end import * +from .s29_scada_device import set_scada_device, add_scada_device, delete_scada_device +from .s30_scada_device_data import set_scada_device_data, add_scada_device_data, delete_scada_device_data +from .s31_scada_element import set_scada_element, add_scada_element, delete_scada_element from .del_cmd_raw import del_cascade_cmd @@ -96,6 +99,12 @@ def execute_add_command(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() elif type == s28_end: return ChangeSet() + elif type == s29_scada_device: + return add_scada_device(name, cs) + elif type == s30_scada_device_data: + return add_scada_device_data(name, cs) + elif type == s31_scada_element: + return add_scada_element(name, cs) return ChangeSet() @@ -165,6 +174,12 @@ def execute_update_command(name: str, cs: ChangeSet) -> ChangeSet: return set_backdrop(name, cs) elif type == s28_end: # end return ChangeSet() + elif type == s29_scada_device: + return set_scada_device(name, cs) + elif type == s30_scada_device_data: + return set_scada_device_data(name, cs) + elif type == s31_scada_element: + return set_scada_element(name, cs) return ChangeSet() @@ -234,6 +249,12 @@ def execute_delete_command(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() elif type == s28_end: return ChangeSet() + elif type == s29_scada_device: + return delete_scada_device(name, cs) + elif type == s30_scada_device_data: + return delete_scada_device_data(name, cs) + elif type == s31_scada_element: + return delete_scada_element(name, cs) return ChangeSet() diff --git a/api/sections.py b/api/sections.py index f56beab..e36ac0c 100644 --- a/api/sections.py +++ b/api/sections.py @@ -28,4 +28,7 @@ s24_coordinate = 'coordinate' s25_vertex = 'vertex' s26_label = 'label' s27_backdrop = 'backdrop' -s28_end = 'end' \ No newline at end of file +s28_end = 'end' +s29_scada_device = 'scada_device' +s30_scada_device_data = 'scada_device_data' +s31_scada_element = 'scada_element' From 6645c7341a91f5d87ec0c135a08c324bb3e053a6 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 14:05:02 +0800 Subject: [PATCH 07/11] Update build_db script --- build_db.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_db.py b/build_db.py index ef091ac..31f04b1 100644 --- a/build_db.py +++ b/build_db.py @@ -8,7 +8,7 @@ files = [ #'nanjing', #'net3', #'zj', - 'suzhouhe', + #'suzhouhe', ] def inp2db(): @@ -20,6 +20,7 @@ def db2inp(): dump_inp(file, f'./db_inp/{file}.db.inp') if __name__ == '__main__': - inp2db() + #inp2db() #db2inp() #print(run_inp('net3')) + pass From aac46ac056fb7f3719574f1e6312e5679937e764 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 14:43:02 +0800 Subject: [PATCH 08/11] Fix scada device update api --- api/s30_scada_device_data.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/api/s30_scada_device_data.py b/api/s30_scada_device_data.py index b1f74b3..e09b813 100644 --- a/api/s30_scada_device_data.py +++ b/api/s30_scada_device_data.py @@ -38,17 +38,14 @@ def set_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: f_time, f_value = f"'{time}'", value undo_sql += f"\ninsert into scada_device_data (device_id, time, value) values ({f_device_id}, {f_time}, {f_value});" - redo_cs = { 'type': 'scada_device_data' } | new - undo_cs = { 'type': 'scada_device_data' } | old + redo_cs = g_update_prefix | { 'type': 'scada_device_data' } | new + undo_cs = g_update_prefix | { 'type': 'scada_device_data' } | old return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) def set_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: - result = set_scada_device_data_cmd(name, cs) - result.redo_cs[0] |= g_update_prefix - result.undo_cs[0] |= g_update_prefix - return execute_command(name, result) + return execute_command(name, set_scada_device_data_cmd(name, cs)) def add_scada_device_data_cmd(name: str, cs: ChangeSet) -> DbChangeSet: @@ -96,7 +93,7 @@ def delete_scada_device_data(name: str, cs: ChangeSet) -> ChangeSet: def clean_scada_device_data_cmd(name: str) -> ChangeSet: cs = ChangeSet() - rows = read_all(name, 'select distinct device_id from scada_device_data') + rows = read_all(name, 'select distinct device_id from scada_device_data acs') for row in rows: cs.update({ 'type': 'scada_device_data', 'device_id': row['device_id'], 'data': [] }) From 0fb621112a2f74a0c10a49facbbf02345f78cef1 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 15:22:38 +0800 Subject: [PATCH 09/11] Optimize scada sql --- api/s29_scada_device.py | 2 +- api/s31_scada_element.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/s29_scada_device.py b/api/s29_scada_device.py index 6143b6e..6dd1dd8 100644 --- a/api/s29_scada_device.py +++ b/api/s29_scada_device.py @@ -113,7 +113,7 @@ def delete_scada_device(name: str, cs: ChangeSet) -> ChangeSet: def clean_scada_device_cmd(name: str) -> ChangeSet: cs = ChangeSet() - rows = read_all(name, 'select * from scada_device') + rows = read_all(name, 'select id from scada_device acs') for row in rows: cs.delete({ 'type': 'scada_device', 'id': row['id'] }) diff --git a/api/s31_scada_element.py b/api/s31_scada_element.py index 04448a9..816256e 100644 --- a/api/s31_scada_element.py +++ b/api/s31_scada_element.py @@ -139,7 +139,7 @@ def delete_scada_element(name: str, cs: ChangeSet) -> ChangeSet: def clean_scada_element_cmd(name: str) -> ChangeSet: cs = ChangeSet() - rows = read_all(name, 'select * from scada_element') + rows = read_all(name, 'select id from scada_element acs') for row in rows: cs.delete({ 'type': 'scada_element', 'id': row['id'] }) From 1e5cfbe595c90c96c6e872ff320ea072d53acc91 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 15:23:41 +0800 Subject: [PATCH 10/11] Test new scada api --- test_tjnetwork.py | 1091 +++++++++++++++++++++++++++++++-------------- 1 file changed, 749 insertions(+), 342 deletions(-) diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 837513b..6f05844 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -3661,410 +3661,817 @@ class TestApi: # 28 end - # 29 scada_model + # 29 scada_device - def test_scada_model(self): - p = 'test_scada_model' + def test_scada_device(self): + p = 'test_scada_device' + self.enter(p) + + d = get_scada_device(p, 'd0') + assert d == {} + + add_scada_device(p, ChangeSet({'id': 'd0'})) + d = get_scada_device(p, 'd0') + assert d['id'] == 'd0' + assert d['name'] == None + assert d['address'] == None + assert d['sd_type'] == None + + set_scada_device(p, ChangeSet({'id': 'd0', 'name': 'device0', 'address': 'x', 'sd_type': SCADA_DEVICE_TYPE_FLOW})) + d = get_scada_device(p, 'd0') + assert d['id'] == 'd0' + assert d['name'] == 'device0' + assert d['address'] == 'x' + assert d['sd_type'] == SCADA_DEVICE_TYPE_FLOW + + add_scada_device(p, ChangeSet({'id': 'd1', 'name': 'device1', 'address': 'x', 'sd_type': SCADA_DEVICE_TYPE_PRESSURE})) + d = get_scada_device(p, 'd1') + assert d['id'] == 'd1' + assert d['name'] == 'device1' + assert d['address'] == 'x' + assert d['sd_type'] == SCADA_DEVICE_TYPE_PRESSURE + + delete_scada_device(p, ChangeSet({'id': 'd0'})) + d = get_scada_device(p, 'd0') + assert d == {} + + delete_scada_device(p, ChangeSet({'id': 'd1'})) + d = get_scada_device(p, 'd1') + assert d == {} + + add_scada_device(p, ChangeSet({'id': 'd0'})) + d = get_scada_device(p, 'd0') + assert d['id'] == 'd0' + + add_scada_device(p, ChangeSet({'id': 'd1'})) + d = get_scada_device(p, 'd1') + assert d['id'] == 'd1' + + clean_scada_device(p) + d = get_scada_device(p, 'd0') + assert d == {} + d = get_scada_device(p, 'd1') + assert d == {} + + self.leave(p) + + + def test_scada_device_op(self): + p = 'test_scada_device_op' + + self.enter(p) + + cs = add_scada_device(p, ChangeSet({'id': 'd0'})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + + cs = set_scada_device(p, ChangeSet({'id': 'd0', 'name': 'device0', 'address': 'x', 'sd_type': SCADA_DEVICE_TYPE_FLOW})).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + assert cs['name'] == 'device0' + assert cs['address'] == 'x' + assert cs['sd_type'] == SCADA_DEVICE_TYPE_FLOW + + cs = add_scada_device(p, ChangeSet({'id': 'd1', 'name': 'device1', 'address': 'x', 'sd_type': SCADA_DEVICE_TYPE_PRESSURE})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + assert cs['name'] == 'device1' + assert cs['address'] == 'x' + assert cs['sd_type'] == SCADA_DEVICE_TYPE_PRESSURE + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + assert cs['name'] == 'device1' + assert cs['address'] == 'x' + assert cs['sd_type'] == SCADA_DEVICE_TYPE_PRESSURE + + cs = delete_scada_device(p, ChangeSet({'id': 'd0'})).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + assert cs['name'] == 'device0' + assert cs['address'] == 'x' + assert cs['sd_type'] == SCADA_DEVICE_TYPE_FLOW + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + + cs = delete_scada_device(p, ChangeSet({'id': 'd1'})).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + assert cs['name'] == 'device1' + assert cs['address'] == 'x' + assert cs['sd_type'] == SCADA_DEVICE_TYPE_PRESSURE + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + + cs = add_scada_device(p, ChangeSet({'id': 'd0'})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + + cs = add_scada_device(p, ChangeSet({'id': 'd1'})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + + css = clean_scada_device(p).operations + assert len(css) == 2 + cs = css[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + cs = css[1] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + + css = execute_undo(p).operations + assert len(css) == 2 + cs = css[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + cs = css[1] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + assert cs['name'] == None + assert cs['address'] == None + assert cs['sd_type'] == None + + css = execute_redo(p).operations + assert len(css) == 2 + cs = css[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd0' + cs = css[1] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device' + assert cs['id'] == 'd1' + + self.leave(p) + + + # 30 scada_device_data + + + def test_scada_device_data(self): + p = 'test_scada_device_data' + self.enter(p) + + add_scada_device(p, ChangeSet({'id': 'sd'})) + + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert sa['data'] == [] + + set_scada_device_data(p, ChangeSet({'device_id': 'sd', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }]})) + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert len(sa['data']) == 1 + assert sa['data'][0]['time'] == '2023-02-10 00:02:22' + assert sa['data'][0]['value'] == 100.0 + + set_scada_device_data(p, ChangeSet({'device_id': 'sd', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }, { 'time': '2023-02-10 00:03:22', 'value': 200.0 }]})) + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert len(sa['data']) == 2 + assert sa['data'][0]['time'] == '2023-02-10 00:02:22' + assert sa['data'][0]['value'] == 100.0 + assert sa['data'][1]['time'] == '2023-02-10 00:03:22' + assert sa['data'][1]['value'] == 200.0 + + add_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-10 00:02:22', 'value': 100.0})) + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert len(sa['data']) == 2 + assert sa['data'][0]['time'] == '2023-02-10 00:02:22' + assert sa['data'][0]['value'] == 100.0 + assert sa['data'][1]['time'] == '2023-02-10 00:03:22' + assert sa['data'][1]['value'] == 200.0 + + add_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-11 00:02:22', 'value': 100.0})) + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert len(sa['data']) == 3 + assert sa['data'][0]['time'] == '2023-02-10 00:02:22' + assert sa['data'][0]['value'] == 100.0 + assert sa['data'][1]['time'] == '2023-02-10 00:03:22' + assert sa['data'][1]['value'] == 200.0 + assert sa['data'][2]['time'] == '2023-02-11 00:02:22' + assert sa['data'][2]['value'] == 100.0 + + delete_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-12 00:02:22'})) + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert len(sa['data']) == 3 + assert sa['data'][0]['time'] == '2023-02-10 00:02:22' + assert sa['data'][0]['value'] == 100.0 + assert sa['data'][1]['time'] == '2023-02-10 00:03:22' + assert sa['data'][1]['value'] == 200.0 + assert sa['data'][2]['time'] == '2023-02-11 00:02:22' + assert sa['data'][2]['value'] == 100.0 + + delete_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-11 00:02:22'})) + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert len(sa['data']) == 2 + assert sa['data'][0]['time'] == '2023-02-10 00:02:22' + assert sa['data'][0]['value'] == 100.0 + assert sa['data'][1]['time'] == '2023-02-10 00:03:22' + assert sa['data'][1]['value'] == 200.0 + + set_scada_device_data(p, ChangeSet({'device_id': 'sd', 'data': []})) + sa = get_scada_device_data(p, 'sd') + assert sa['device_id'] == 'sd' + assert sa['data'] == [] + + add_scada_device(p, ChangeSet({'id': 'sd0'})) + add_scada_device_data(p, ChangeSet({'device_id': 'sd0', 'time': '2023-02-10 00:02:22', 'value': 100.0})) + add_scada_device_data(p, ChangeSet({'device_id': 'sd0', 'time': '2023-02-11 00:02:22', 'value': 200.0})) + add_scada_device_data(p, ChangeSet({'device_id': 'sd0', 'time': '2023-02-12 00:02:22', 'value': 300.0})) + + add_scada_device(p, ChangeSet({'id': 'sd1'})) + set_scada_device_data(p, ChangeSet({'device_id': 'sd1', 'data': [{'time': '2023-02-10 00:02:22', 'value': 100.0}, {'time': '2023-02-11 00:02:22', 'value': 200.0}, {'time': '2023-02-12 00:02:22', 'value': 300.0}]})) + + clean_scada_device_data(p) + sa = get_scada_device_data(p, 'sd0') + assert sa['device_id'] == 'sd0' + assert sa['data'] == [] + sa = get_scada_device_data(p, 'sd1') + assert sa['device_id'] == 'sd1' + assert sa['data'] == [] + + self.leave(p) + + + def test_scada_device_data_op(self): + p = 'test_scada_device_data_op' + self.enter(p) + + add_scada_device(p, ChangeSet({'id': 'sd'})) + + cs = set_scada_device_data(p, ChangeSet({'device_id': 'sd', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }]})).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert len(cs['data']) == 1 + assert cs['data'][0]['time'] == '2023-02-10 00:02:22' + assert cs['data'][0]['value'] == 100.0 + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['data'] == [] + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert len(cs['data']) == 1 + assert cs['data'][0]['time'] == '2023-02-10 00:02:22' + assert cs['data'][0]['value'] == 100.0 + + cs = set_scada_device_data(p, ChangeSet({'device_id': 'sd', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }, { 'time': '2023-02-10 00:03:22', 'value': 200.0 }]})).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert len(cs['data']) == 2 + assert cs['data'][0]['time'] == '2023-02-10 00:02:22' + assert cs['data'][0]['value'] == 100.0 + assert cs['data'][1]['time'] == '2023-02-10 00:03:22' + assert cs['data'][1]['value'] == 200.0 + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert len(cs['data']) == 1 + assert cs['data'][0]['time'] == '2023-02-10 00:02:22' + assert cs['data'][0]['value'] == 100.0 + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert len(cs['data']) == 2 + assert cs['data'][0]['time'] == '2023-02-10 00:02:22' + assert cs['data'][0]['value'] == 100.0 + assert cs['data'][1]['time'] == '2023-02-10 00:03:22' + assert cs['data'][1]['value'] == 200.0 + + cs = add_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-10 00:02:22', 'value': 100.0})) + assert len(cs.operations) == 0 + + cs = add_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-11 00:02:22', 'value': 100.0})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['time'] == '2023-02-11 00:02:22' + assert cs['value'] == 100.0 + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['time'] == '2023-02-11 00:02:22' + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['time'] == '2023-02-11 00:02:22' + assert cs['value'] == 100.0 + + cs = delete_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-12 00:02:22'})) + assert len(cs.operations) == 0 + + cs = delete_scada_device_data(p, ChangeSet({'device_id': 'sd', 'time': '2023-02-11 00:02:22'})).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['time'] == '2023-02-11 00:02:22' + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['time'] == '2023-02-11 00:02:22' + assert cs['value'] == 100.0 + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['time'] == '2023-02-11 00:02:22' + + cs = set_scada_device_data(p, ChangeSet({'device_id': 'sd', 'data': []})).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['data'] == [] + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert len(cs['data']) == 2 + assert cs['data'][0]['time'] == '2023-02-10 00:02:22' + assert cs['data'][0]['value'] == 100.0 + assert cs['data'][1]['time'] == '2023-02-10 00:03:22' + assert cs['data'][1]['value'] == 200.0 + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd' + assert cs['data'] == [] + + add_scada_device(p, ChangeSet({'id': 'sd0'})) + add_scada_device_data(p, ChangeSet({'device_id': 'sd0', 'time': '2023-02-10 00:02:22', 'value': 100.0})) + add_scada_device_data(p, ChangeSet({'device_id': 'sd0', 'time': '2023-02-11 00:02:22', 'value': 200.0})) + add_scada_device_data(p, ChangeSet({'device_id': 'sd0', 'time': '2023-02-12 00:02:22', 'value': 300.0})) + + add_scada_device(p, ChangeSet({'id': 'sd1'})) + set_scada_device_data(p, ChangeSet({'device_id': 'sd1', 'data': [{'time': '2023-02-10 00:02:22', 'value': 100.0}, {'time': '2023-02-11 00:02:22', 'value': 200.0}, {'time': '2023-02-12 00:02:22', 'value': 300.0}]})) + + css = clean_scada_device_data(p).operations + cs = css[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd0' + assert cs['data'] == [] + cs = css[1] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd1' + assert cs['data'] == [] + + css = execute_undo(p).operations + cs = css[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd1' + assert cs['data'][0] == {'time': '2023-02-10 00:02:22', 'value': 100.0} + assert cs['data'][1] == {'time': '2023-02-11 00:02:22', 'value': 200.0} + assert cs['data'][2] == {'time': '2023-02-12 00:02:22', 'value': 300.0} + cs = css[1] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd0' + assert cs['data'][0] == {'time': '2023-02-10 00:02:22', 'value': 100.0} + assert cs['data'][1] == {'time': '2023-02-11 00:02:22', 'value': 200.0} + assert cs['data'][2] == {'time': '2023-02-12 00:02:22', 'value': 300.0} + + css = execute_redo(p).operations + cs = css[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd0' + assert cs['data'] == [] + cs = css[1] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_device_data' + assert cs['device_id'] == 'sd1' + assert cs['data'] == [] + + self.leave(p) + + + # 31 scada_element + + + def test_scada_element(self): + p = 'test_scada_element' self.enter(p) add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_junction(p, ChangeSet({'id': 'j2', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_pipe(p, ChangeSet({'id': 'p1', 'node1': 'j1', 'node2': 'j2', 'length': 100.0, 'diameter': 10.0, 'roughness': 0.1, 'minor_loss': 0.5, 'status': PIPE_STATUS_OPEN })) + add_scada_device(p, ChangeSet({'id': 'sd0', 'name': 'device0', 'address': 'x0', 'sd_type': SCADA_DEVICE_TYPE_PRESSURE})) + add_scada_device(p, ChangeSet({'id': 'sd1', 'name': 'device1', 'address': 'x1', 'sd_type': SCADA_DEVICE_TYPE_FLOW})) - sm = get_scada_model(p, 'sm') + add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j0', 'status': SCADA_ELEMENT_STATUS_OFFLINE})) + sm = get_scada_element(p, 'sm0') assert sm == {} - - add_scada_model(p, ChangeSet({'id': 'sm', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device'})) - sm = get_scada_model(p, 'sm') - assert sm['id'] == 'sm' + add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'status': SCADA_ELEMENT_STATUS_OFFLINE})) + sm = get_scada_element(p, 'sm0') + assert sm['id'] == 'sm0' assert sm['x'] == 0.0 - assert sm['y'] == 10.0 - assert sm['device_id'] == 'sm_device' - assert sm['device_name'] == None - assert sm['address'] == None - assert sm['sm_type'] == None - assert sm['model_id'] == None - assert sm['status'] == SCADA_STATUS_OFFLINE - - add_scada_model(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device_0', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j0'})) - sm0 = get_scada_model(p, 'sm0') - assert sm0 == {} - - add_scada_model(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device_0', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'p0'})) - sm0 = get_scada_model(p, 'sm0') - assert sm0 == {} - - add_scada_model(p, ChangeSet({'id': 'sm1', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device_1', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1'})) - sm1 = get_scada_model(p, 'sm1') - assert sm1['id'] == 'sm1' - assert sm1['x'] == 0.0 - assert sm1['y'] == 10.0 - assert sm1['device_id'] == 'sm_device_1' - assert sm1['device_name'] == 'sm_device_name' - assert sm1['address'] == 'xxx' - assert sm1['sm_type'] == SCADA_TYPE_PRESSURE - assert sm1['model_id'] == 'j1' - assert sm1['status'] == SCADA_STATUS_OFFLINE - - add_scada_model(p, ChangeSet({'id': 'sm2', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device_2', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'p1', 'status': SCADA_STATUS_ONLINE})) - sm2 = get_scada_model(p, 'sm2') - assert sm2['id'] == 'sm2' - assert sm2['x'] == 0.0 - assert sm2['y'] == 10.0 - assert sm2['device_id'] == 'sm_device_2' - assert sm2['device_name'] == 'sm_device_name' - assert sm2['address'] == 'xxx' - assert sm2['sm_type'] == SCADA_TYPE_PRESSURE - assert sm2['model_id'] == 'p1' - assert sm2['status'] == SCADA_STATUS_ONLINE - - set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j0', 'status': SCADA_STATUS_ONLINE})) - sm = get_scada_model(p, 'sm') - assert sm['id'] == 'sm' - assert sm['x'] == 0.0 - assert sm['y'] == 10.0 - assert sm['device_id'] == 'sm_device' - assert sm['device_name'] == None - assert sm['address'] == None - assert sm['sm_type'] == None - assert sm['model_id'] == None - assert sm['status'] == SCADA_STATUS_OFFLINE - - set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1', 'status': SCADA_STATUS_ONLINE})) - sm = get_scada_model(p, 'sm') - assert sm['id'] == 'sm' - assert sm['x'] == 0.0 - assert sm['y'] == 10.0 - assert sm['device_id'] == 'sm_device' - assert sm['device_name'] == 'sm_device_name' - assert sm['address'] == 'xxx' - assert sm['sm_type'] == SCADA_TYPE_PRESSURE + assert sm['y'] == 1.0 + assert sm['device_id'] == 'sd0' assert sm['model_id'] == 'j1' - assert sm['status'] == SCADA_STATUS_ONLINE + assert sm['status'] == SCADA_ELEMENT_STATUS_OFFLINE - delete_scada_model(p, ChangeSet({'id': 'sm'})) - sm = get_scada_model(p, 'sm') + add_scada_element(p, ChangeSet({'id': 'sm1', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p0', 'status': SCADA_ELEMENT_STATUS_ONLINE})) + sm = get_scada_element(p, 'sm1') + assert sm == {} + add_scada_element(p, ChangeSet({'id': 'sm1', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p1', 'status': SCADA_ELEMENT_STATUS_ONLINE})) + sm = get_scada_element(p, 'sm1') + assert sm['id'] == 'sm1' + assert sm['x'] == 1.0 + assert sm['y'] == 2.0 + assert sm['device_id'] == 'sd1' + assert sm['model_id'] == 'p1' + assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE + + set_scada_element(p, ChangeSet({'id': 'sm0', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p1', 'status': SCADA_ELEMENT_STATUS_ONLINE})) + sm = get_scada_element(p, 'sm0') + assert sm['id'] == 'sm0' + assert sm['x'] == 1.0 + assert sm['y'] == 2.0 + assert sm['device_id'] == 'sd1' + assert sm['model_id'] == 'p1' + assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE + + set_scada_element(p, ChangeSet({'id': 'sm1', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'status': SCADA_ELEMENT_STATUS_OFFLINE})) + sm = get_scada_element(p, 'sm1') + assert sm['id'] == 'sm1' + assert sm['x'] == 0.0 + assert sm['y'] == 1.0 + assert sm['device_id'] == 'sd0' + assert sm['model_id'] == 'j1' + assert sm['status'] == SCADA_ELEMENT_STATUS_OFFLINE + + delete_scada_element(p, ChangeSet({'id': 'sm0'})) + sm = get_scada_element(p, 'sm0') assert sm == {} - delete_scada_model(p, ChangeSet({'id': 'sm1'})) - sm1 = get_scada_model(p, 'sm1') - assert sm1 == {} + delete_scada_element(p, ChangeSet({'id': 'sm1'})) + sm = get_scada_element(p, 'sm1') + assert sm == {} - delete_scada_model(p, ChangeSet({'id': 'sm2'})) - sm2 = get_scada_model(p, 'sm2') - assert sm2 == {} + add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'status': SCADA_ELEMENT_STATUS_OFFLINE})) + sm = get_scada_element(p, 'sm0') + assert sm['id'] == 'sm0' + assert sm['x'] == 0.0 + assert sm['y'] == 1.0 + assert sm['device_id'] == 'sd0' + assert sm['model_id'] == 'j1' + assert sm['status'] == SCADA_ELEMENT_STATUS_OFFLINE + + add_scada_element(p, ChangeSet({'id': 'sm1', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p1', 'status': SCADA_ELEMENT_STATUS_ONLINE})) + sm = get_scada_element(p, 'sm1') + assert sm['id'] == 'sm1' + assert sm['x'] == 1.0 + assert sm['y'] == 2.0 + assert sm['device_id'] == 'sd1' + assert sm['model_id'] == 'p1' + assert sm['status'] == SCADA_ELEMENT_STATUS_ONLINE + + clean_scada_element(p) + sm = get_scada_element(p, 'sm0') + assert sm == {} + sm = get_scada_element(p, 'sm1') + assert sm == {} self.leave(p) - def test_scada_model_op(self): - p = 'test_scada_model_op' - + def test_scada_element_op(self): + p = 'test_scada_element_op' self.enter(p) add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_junction(p, ChangeSet({'id': 'j2', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) + add_pipe(p, ChangeSet({'id': 'p1', 'node1': 'j1', 'node2': 'j2', 'length': 100.0, 'diameter': 10.0, 'roughness': 0.1, 'minor_loss': 0.5, 'status': PIPE_STATUS_OPEN })) + add_scada_device(p, ChangeSet({'id': 'sd0', 'name': 'device0', 'address': 'x0', 'sd_type': SCADA_DEVICE_TYPE_PRESSURE})) + add_scada_device(p, ChangeSet({'id': 'sd1', 'name': 'device1', 'address': 'x1', 'sd_type': SCADA_DEVICE_TYPE_FLOW})) - cs = add_scada_model(p, ChangeSet({'id': 'sm', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1', 'status': SCADA_STATUS_ONLINE})).operations[0] + css = add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j0', 'status': SCADA_ELEMENT_STATUS_OFFLINE})).operations + assert len(css) == 0 + cs = add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'status': SCADA_ELEMENT_STATUS_OFFLINE})).operations[0] assert cs['operation'] == API_ADD - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' assert cs['x'] == 0.0 - assert cs['y'] == 10.0 - assert cs['device_id'] == 'sm_device' - assert cs['device_name'] == 'sm_device_name' - assert cs['address'] == 'xxx' - assert cs['sm_type'] == SCADA_TYPE_PRESSURE + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' assert cs['model_id'] == 'j1' - assert cs['status'] == SCADA_STATUS_ONLINE + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE cs = execute_undo(p).operations[0] assert cs['operation'] == API_DELETE - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' cs = execute_redo(p).operations[0] assert cs['operation'] == API_ADD - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' assert cs['x'] == 0.0 - assert cs['y'] == 10.0 - assert cs['device_id'] == 'sm_device' - assert cs['device_name'] == 'sm_device_name' - assert cs['address'] == 'xxx' - assert cs['sm_type'] == SCADA_TYPE_PRESSURE + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' assert cs['model_id'] == 'j1' - assert cs['status'] == SCADA_STATUS_ONLINE + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE - cs = set_scada_model(p, ChangeSet({'id': 'sm', 'device_name': 'sm_device_name_', 'address': 'xxx_', 'sm_type': SCADA_TYPE_DEMAND, 'model_id': 'j2', 'status': SCADA_STATUS_OFFLINE})).operations[0] + css = add_scada_element(p, ChangeSet({'id': 'sm1', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p0', 'status': SCADA_ELEMENT_STATUS_ONLINE})).operations + assert len(css) == 0 + cs = add_scada_element(p, ChangeSet({'id': 'sm1', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p1', 'status': SCADA_ELEMENT_STATUS_ONLINE})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE + + cs = execute_undo(p).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE + + cs = set_scada_element(p, ChangeSet({'id': 'sm0', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p1', 'status': SCADA_ELEMENT_STATUS_ONLINE})).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' - assert cs['x'] == 0.0 - assert cs['y'] == 10.0 - assert cs['device_id'] == 'sm_device' - assert cs['device_name'] == 'sm_device_name_' - assert cs['address'] == 'xxx_' - assert cs['sm_type'] == SCADA_TYPE_DEMAND - assert cs['model_id'] == 'j2' - assert cs['status'] == SCADA_STATUS_OFFLINE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE cs = execute_undo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' assert cs['x'] == 0.0 - assert cs['y'] == 10.0 - assert cs['device_id'] == 'sm_device' - assert cs['device_name'] == 'sm_device_name' - assert cs['address'] == 'xxx' - assert cs['sm_type'] == SCADA_TYPE_PRESSURE + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' assert cs['model_id'] == 'j1' - assert cs['status'] == SCADA_STATUS_ONLINE + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE cs = execute_redo(p).operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE + + cs = set_scada_element(p, ChangeSet({'id': 'sm1', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'status': SCADA_ELEMENT_STATUS_OFFLINE})).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' assert cs['x'] == 0.0 - assert cs['y'] == 10.0 - assert cs['device_id'] == 'sm_device' - assert cs['device_name'] == 'sm_device_name_' - assert cs['address'] == 'xxx_' - assert cs['sm_type'] == SCADA_TYPE_DEMAND - assert cs['model_id'] == 'j2' - assert cs['status'] == SCADA_STATUS_OFFLINE - - cs = delete_scada_model(p, ChangeSet({'id': 'sm'})).operations[0] - assert cs['operation'] == API_DELETE - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' + assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE cs = execute_undo(p).operations[0] - assert cs['operation'] == API_ADD - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE + + cs = execute_redo(p).operations[0] + assert cs['operation'] == API_UPDATE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' assert cs['x'] == 0.0 - assert cs['y'] == 10.0 - assert cs['device_id'] == 'sm_device' - assert cs['device_name'] == 'sm_device_name_' - assert cs['address'] == 'xxx_' - assert cs['sm_type'] == SCADA_TYPE_DEMAND - assert cs['model_id'] == 'j2' - assert cs['status'] == SCADA_STATUS_OFFLINE + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' + assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE - cs = execute_redo(p).operations[0] + cs = delete_scada_element(p, ChangeSet({'id': 'sm0'})).operations[0] assert cs['operation'] == API_DELETE - assert cs['type'] == 'scada_model' - assert cs['id'] == 'sm' - - self.leave(p) - - - # 30 scada_data - - - def test_scada_data(self): - p = 'test_scada_data' - self.enter(p) - - add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) - - add_scada_model(p, ChangeSet({'id': 'sm', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1'})) - - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert sa['data'] == [] - - set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }]})) - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert len(sa['data']) == 1 - assert sa['data'][0]['time'] == '2023-02-10 00:02:22' - assert sa['data'][0]['value'] == 100.0 - - set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }, { 'time': '2023-02-10 00:03:22', 'value': 200.0 }]})) - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert len(sa['data']) == 2 - assert sa['data'][0]['time'] == '2023-02-10 00:02:22' - assert sa['data'][0]['value'] == 100.0 - assert sa['data'][1]['time'] == '2023-02-10 00:03:22' - assert sa['data'][1]['value'] == 200.0 - - add_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-10 00:02:22', 'value': 100.0})) - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert len(sa['data']) == 2 - assert sa['data'][0]['time'] == '2023-02-10 00:02:22' - assert sa['data'][0]['value'] == 100.0 - assert sa['data'][1]['time'] == '2023-02-10 00:03:22' - assert sa['data'][1]['value'] == 200.0 - - add_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-11 00:02:22', 'value': 100.0})) - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert len(sa['data']) == 3 - assert sa['data'][0]['time'] == '2023-02-10 00:02:22' - assert sa['data'][0]['value'] == 100.0 - assert sa['data'][1]['time'] == '2023-02-10 00:03:22' - assert sa['data'][1]['value'] == 200.0 - assert sa['data'][2]['time'] == '2023-02-11 00:02:22' - assert sa['data'][2]['value'] == 100.0 - - delete_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-12 00:02:22'})) - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert len(sa['data']) == 3 - assert sa['data'][0]['time'] == '2023-02-10 00:02:22' - assert sa['data'][0]['value'] == 100.0 - assert sa['data'][1]['time'] == '2023-02-10 00:03:22' - assert sa['data'][1]['value'] == 200.0 - assert sa['data'][2]['time'] == '2023-02-11 00:02:22' - assert sa['data'][2]['value'] == 100.0 - - delete_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-11 00:02:22'})) - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert len(sa['data']) == 2 - assert sa['data'][0]['time'] == '2023-02-10 00:02:22' - assert sa['data'][0]['value'] == 100.0 - assert sa['data'][1]['time'] == '2023-02-10 00:03:22' - assert sa['data'][1]['value'] == 200.0 - - set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': []})) - sa = get_scada_data(p, 'sm_device') - assert sa['device_id'] == 'sm_device' - assert sa['data'] == [] - - self.leave(p) - - - def test_scada_data_op(self): - p = 'test_scada_data_op' - self.enter(p) - - add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) - - add_scada_model(p, ChangeSet({'id': 'sm', 'x': 0.0, 'y': 10.0, 'device_id': 'sm_device', 'device_name': 'sm_device_name', 'address': 'xxx', 'sm_type': SCADA_TYPE_PRESSURE, 'model_id': 'j1'})) - - cs = set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }]})).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert len(cs['data']) == 1 - assert cs['data'][0]['time'] == '2023-02-10 00:02:22' - assert cs['data'][0]['value'] == 100.0 - - cs = execute_undo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['data'] == [] - - cs = execute_redo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert len(cs['data']) == 1 - assert cs['data'][0]['time'] == '2023-02-10 00:02:22' - assert cs['data'][0]['value'] == 100.0 - - cs = set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': [{ 'time': '2023-02-10 00:02:22', 'value': 100.0 }, { 'time': '2023-02-10 00:03:22', 'value': 200.0 }]})).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert len(cs['data']) == 2 - assert cs['data'][0]['time'] == '2023-02-10 00:02:22' - assert cs['data'][0]['value'] == 100.0 - assert cs['data'][1]['time'] == '2023-02-10 00:03:22' - assert cs['data'][1]['value'] == 200.0 - - cs = execute_undo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert len(cs['data']) == 1 - assert cs['data'][0]['time'] == '2023-02-10 00:02:22' - assert cs['data'][0]['value'] == 100.0 - - cs = execute_redo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert len(cs['data']) == 2 - assert cs['data'][0]['time'] == '2023-02-10 00:02:22' - assert cs['data'][0]['value'] == 100.0 - assert cs['data'][1]['time'] == '2023-02-10 00:03:22' - assert cs['data'][1]['value'] == 200.0 - - cs = add_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-10 00:02:22', 'value': 100.0})) - assert len(cs.operations) == 0 - - cs = add_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-11 00:02:22', 'value': 100.0})).operations[0] - assert cs['operation'] == API_ADD - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['time'] == '2023-02-11 00:02:22' - assert cs['value'] == 100.0 - - cs = execute_undo(p).operations[0] - assert cs['operation'] == API_DELETE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['time'] == '2023-02-11 00:02:22' - - cs = execute_redo(p).operations[0] - assert cs['operation'] == API_ADD - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['time'] == '2023-02-11 00:02:22' - assert cs['value'] == 100.0 - - cs = delete_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-12 00:02:22'})) - assert len(cs.operations) == 0 - - cs = delete_scada_data(p, ChangeSet({'device_id': 'sm_device', 'time': '2023-02-11 00:02:22'})).operations[0] - assert cs['operation'] == API_DELETE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['time'] == '2023-02-11 00:02:22' + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' cs = execute_undo(p).operations[0] assert cs['operation'] == API_ADD - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['time'] == '2023-02-11 00:02:22' - assert cs['value'] == 100.0 + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE cs = execute_redo(p).operations[0] assert cs['operation'] == API_DELETE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['time'] == '2023-02-11 00:02:22' + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' - cs = set_scada_data(p, ChangeSet({'device_id': 'sm_device', 'data': []})).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['data'] == [] + cs = delete_scada_element(p, ChangeSet({'id': 'sm1'})).operations[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' cs = execute_undo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert len(cs['data']) == 2 - assert cs['data'][0]['time'] == '2023-02-10 00:02:22' - assert cs['data'][0]['value'] == 100.0 - assert cs['data'][1]['time'] == '2023-02-10 00:03:22' - assert cs['data'][1]['value'] == 200.0 + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + assert cs['x'] == 0.0 + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' + assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE cs = execute_redo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'scada_data' - assert cs['device_id'] == 'sm_device' - assert cs['data'] == [] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + + cs = add_scada_element(p, ChangeSet({'id': 'sm0', 'x': 0.0, 'y': 1.0, 'device_id': 'sd0', 'model_id': 'j1', 'status': SCADA_ELEMENT_STATUS_OFFLINE})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' + assert cs['x'] == 0.0 + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' + assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE + + cs = add_scada_element(p, ChangeSet({'id': 'sm1', 'x': 1.0, 'y': 2.0, 'device_id': 'sd1', 'model_id': 'p1', 'status': SCADA_ELEMENT_STATUS_ONLINE})).operations[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE + + css = clean_scada_element(p).operations + cs = css[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' + cs = css[1] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + + css = execute_undo(p).operations + cs = css[0] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' + assert cs['x'] == 1.0 + assert cs['y'] == 2.0 + assert cs['device_id'] == 'sd1' + assert cs['model_id'] == 'p1' + assert cs['status'] == SCADA_ELEMENT_STATUS_ONLINE + cs = css[1] + assert cs['operation'] == API_ADD + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' + assert cs['x'] == 0.0 + assert cs['y'] == 1.0 + assert cs['device_id'] == 'sd0' + assert cs['model_id'] == 'j1' + assert cs['status'] == SCADA_ELEMENT_STATUS_OFFLINE + + css = execute_redo(p).operations + cs = css[0] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm0' + cs = css[1] + assert cs['operation'] == API_DELETE + assert cs['type'] == 'scada_element' + assert cs['id'] == 'sm1' self.leave(p) From 7aae885ef14269c0e0af82a06612a17b42cc78f5 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 24 Feb 2023 15:38:20 +0800 Subject: [PATCH 11/11] Add epanet version 2 --- epanet/__init__.py | 2 +- epanet/{epanet.py => epanet2.py} | 2 +- epanet/{error_code.py => epanet2_ec.py} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename epanet/{epanet.py => epanet2.py} (99%) rename epanet/{error_code.py => epanet2_ec.py} (100%) diff --git a/epanet/__init__.py b/epanet/__init__.py index 7aedf70..b2473ee 100644 --- a/epanet/__init__.py +++ b/epanet/__init__.py @@ -1 +1 @@ -from .epanet import run_project, run_inp, dump_output \ No newline at end of file +from .epanet2 import run_project, run_inp, dump_output \ No newline at end of file diff --git a/epanet/epanet.py b/epanet/epanet2.py similarity index 99% rename from epanet/epanet.py rename to epanet/epanet2.py index 86d216f..5f59584 100644 --- a/epanet/epanet.py +++ b/epanet/epanet2.py @@ -7,7 +7,7 @@ from typing import Any sys.path.append("..") from api import project from api import parser -from .error_code import * +from .epanet2_ec import * def _verify_platform(): _platform = platform.system() diff --git a/epanet/error_code.py b/epanet/epanet2_ec.py similarity index 100% rename from epanet/error_code.py rename to epanet/epanet2_ec.py