qolsys-controller 0.0.2__py3-none-any.whl → 0.0.5__py3-none-any.whl

qolsys_controller/controller.py

@@ -9,16 +9,16 @@ from .state import QolsysState
 
 LOGGER = logging.getLogger(__name__)
 
+
 class QolsysController:
 
-    def __init__(self,config_directory:str) -> None:
+    def __init__(self) -> None:
 
         # QolsysController Information
         self.plugin = None
-        self._config_directory = config_directory
         self._state = QolsysState()
-        self._panel = QolsysPanel(settings_directory=config_directory,state=self.state)
         self._settings = QolsysSettings()
+        self._panel = QolsysPanel(settings=self.settings, state=self.state)
 
     @property
     def state(self) -> QolsysState:
@@ -32,21 +32,19 @@ class QolsysController:
     def settings(self) -> QolsysSettings:
         return self._settings
 
-    def select_plugin(self,plugin: str) -> None:
+    def select_plugin(self, plugin: str) -> None:
 
         match plugin:
 
             case "c4":
                 LOGGER.debug("C4 Plugin Selected")
-                self.plugin = QolsysPluginC4(self.state,self.panel,self.settings)
+                self.plugin = QolsysPluginC4(self.state, self.panel, self.settings)
                 return
 
             case "remote":
                 LOGGER.debug("Remote Plugin Selected")
-                self.plugin = QolsysPluginRemote(self.state,self.panel,self.settings,self._config_directory)
+                self.plugin = QolsysPluginRemote(self.state, self.panel, self.settings)
                 return
 
             case _:
                 LOGGER.debug("Unknow Plugin Selected")
-
-

qolsys_controller/database/db.py

@@ -36,44 +36,45 @@ from .table_zwave_other import QolsysTableZwaveOther
 
 LOGGER = logging.getLogger(__name__)
 
+
 class QolsysDB:
 
     def __init__(self) -> None:  # noqa: PLR0915
 
-        self._db:sqlite3.Connection = sqlite3.connect(":memory:")
-        self._cursor:sqlite3.Cursor = self._db.cursor()
-
-        self.table_alarmedsensor = QolsysTableAlarmedSensor(self.db,self.cursor)
-        self.table_automation = QolsysTableAutomation(self.db,self.cursor)
-        self.table_country_locale = QolsysTableCountryLocale(self.db,self.cursor)
-        self.table_dashboard_msgs = QolsysTableDashboardMsgs(self.db,self.cursor)
-        self.table_dimmer = QolsysTableDimmerLight(self.db,self.cursor)
-        self.table_doorlock = QolsysTableDoorLock(self.db,self.cursor)
-        self.table_eu_event = QolsysTableEuEvent(self.db,self.cursor)
-        self.table_heat_map = QolsysTableHeatMap(self.db,self.cursor)
-        self.table_history = QolsysTableHistory(self.db,self.cursor)
-        self.table_iqremotesettings = QolsysTableIqRemoteSettings(self.db,self.cursor)
-        self.table_iqrouter_network_config = QolsysTableIqRouterNetworkConfig(self.db,self.cursor)
-        self.table_iqrouter_user_device = QolsysTableIqRouterUserDevice(self.db,self.cursor)
-        self.table_master_slave = QolsysTableMasterSlave(self.db,self.cursor)
-        self.table_partition = QolsysTablePartition(self.db,self.cursor)
-        self.table_powerg_device = QolsysTablePowerGDevice(self.db,self.cursor)
-        self.table_sensor = QolsysTableSensor(self.db,self.cursor)
-        self.table_smartsocket = QolsysTableSmartSocket(self.db,self.cursor)
-        self.table_qolsyssettings = QolsysTableQolsysSettings(self.db,self.cursor)
-        self.table_scene = QolsysTableScene(self.db,self.cursor)
-        self.table_state = QolsysTableState(self.db,self.cursor)
-        self.table_tcc = QolsysTableTcc(self.db,self.cursor)
-        self.table_thermostat = QolsysTableThermostat(self.db,self.cursor)
-        self.table_trouble_conditions = QolsysTableTroubleConditions(self.db,self.cursor)
-        self.table_user = QolsysTableUser(self.db,self.cursor)
-        self.table_virtual_device = QolsysTableVirtualDevice(self.db,self.cursor)
-        self.table_weather = QolsysTableWeather(self.db,self.cursor)
-        self.table_zigbee_device = QolsysTableZigbeeDevice(self.db,self.cursor)
-        self.table_zwave_association_goup = QolsysTableZwaveAssociationGroup(self.db,self.cursor)
-        self.table_zwave_history = QolsysTableZwaveHistory(self.db,self.cursor)
-        self.table_zwave_node = QolsysTableZwaveNode(self.db,self.cursor)
-        self.table_zwave_other = QolsysTableZwaveOther(self.db,self.cursor)
+        self._db: sqlite3.Connection = sqlite3.connect(":memory:")
+        self._cursor: sqlite3.Cursor = self._db.cursor()
+
+        self.table_alarmedsensor = QolsysTableAlarmedSensor(self.db, self.cursor)
+        self.table_automation = QolsysTableAutomation(self.db, self.cursor)
+        self.table_country_locale = QolsysTableCountryLocale(self.db, self.cursor)
+        self.table_dashboard_msgs = QolsysTableDashboardMsgs(self.db, self.cursor)
+        self.table_dimmer = QolsysTableDimmerLight(self.db, self.cursor)
+        self.table_doorlock = QolsysTableDoorLock(self.db, self.cursor)
+        self.table_eu_event = QolsysTableEuEvent(self.db, self.cursor)
+        self.table_heat_map = QolsysTableHeatMap(self.db, self.cursor)
+        self.table_history = QolsysTableHistory(self.db, self.cursor)
+        self.table_iqremotesettings = QolsysTableIqRemoteSettings(self.db, self.cursor)
+        self.table_iqrouter_network_config = QolsysTableIqRouterNetworkConfig(self.db, self.cursor)
+        self.table_iqrouter_user_device = QolsysTableIqRouterUserDevice(self.db, self.cursor)
+        self.table_master_slave = QolsysTableMasterSlave(self.db, self.cursor)
+        self.table_partition = QolsysTablePartition(self.db, self.cursor)
+        self.table_powerg_device = QolsysTablePowerGDevice(self.db, self.cursor)
+        self.table_sensor = QolsysTableSensor(self.db, self.cursor)
+        self.table_smartsocket = QolsysTableSmartSocket(self.db, self.cursor)
+        self.table_qolsyssettings = QolsysTableQolsysSettings(self.db, self.cursor)
+        self.table_scene = QolsysTableScene(self.db, self.cursor)
+        self.table_state = QolsysTableState(self.db, self.cursor)
+        self.table_tcc = QolsysTableTcc(self.db, self.cursor)
+        self.table_thermostat = QolsysTableThermostat(self.db, self.cursor)
+        self.table_trouble_conditions = QolsysTableTroubleConditions(self.db, self.cursor)
+        self.table_user = QolsysTableUser(self.db, self.cursor)
+        self.table_virtual_device = QolsysTableVirtualDevice(self.db, self.cursor)
+        self.table_weather = QolsysTableWeather(self.db, self.cursor)
+        self.table_zigbee_device = QolsysTableZigbeeDevice(self.db, self.cursor)
+        self.table_zwave_association_goup = QolsysTableZwaveAssociationGroup(self.db, self.cursor)
+        self.table_zwave_history = QolsysTableZwaveHistory(self.db, self.cursor)
+        self.table_zwave_node = QolsysTableZwaveNode(self.db, self.cursor)
+        self.table_zwave_other = QolsysTableZwaveOther(self.db, self.cursor)
 
         self._table_array = []
         self._table_array.append(self.table_sensor)
@@ -143,108 +144,111 @@ class QolsysDB:
         return self._cursor
 
     def get_partitions(self) -> list[dict]:
-        self.cursor.execute(f"SELECT * FROM {self.table_partition.table} ORDER BY partition_id" )
+        self.cursor.execute(f"SELECT * FROM {self.table_partition.table} ORDER BY partition_id")
         self.db.commit()
 
         partitions = []
         columns = [description[0] for description in self.cursor.description]
-        for row in  self.cursor.fetchall():
+        for row in self.cursor.fetchall():
             row_dict = dict(zip(columns, row, strict=True))
             partitions.append(row_dict)
 
         return partitions
 
     def get_zwave_devices(self) -> list[dict]:
-        self.cursor.execute(f"SELECT * FROM {self.table_zwave_node.table} ORDER BY node_id" )
+        self.cursor.execute(f"SELECT * FROM {self.table_zwave_node.table} ORDER BY node_id")
         self.db.commit()
 
         devices = []
         columns = [description[0] for description in self.cursor.description]
-        for row in  self.cursor.fetchall():
+        for row in self.cursor.fetchall():
             row_dict = dict(zip(columns, row, strict=True))
             devices.append(row_dict)
 
         return devices
 
     def get_locks(self) -> list[dict]:
-        self.cursor.execute(f"SELECT * FROM {self.table_doorlock.table} ORDER BY node_id" )
+        self.cursor.execute(f"SELECT * FROM {self.table_doorlock.table} ORDER BY node_id")
         self.db.commit()
 
         locks = []
         columns = [description[0] for description in self.cursor.description]
-        for row in  self.cursor.fetchall():
+        for row in self.cursor.fetchall():
             row_dict = dict(zip(columns, row, strict=True))
             locks.append(row_dict)
 
         return locks
 
     def get_thermostats(self) -> list[dict]:
-        self.cursor.execute(f"SELECT * FROM {self.table_thermostat.table} ORDER BY node_id" )
+        self.cursor.execute(f"SELECT * FROM {self.table_thermostat.table} ORDER BY node_id")
         self.db.commit()
 
         thermostats = []
         columns = [description[0] for description in self.cursor.description]
-        for row in  self.cursor.fetchall():
+        for row in self.cursor.fetchall():
             row_dict = dict(zip(columns, row, strict=True))
             thermostats.append(row_dict)
 
         return thermostats
 
     def get_dimmers(self) -> list[dict]:
-        self.cursor.execute(f"SELECT * FROM {self.table_dimmer.table} ORDER BY node_id" )
+        self.cursor.execute(f"SELECT * FROM {self.table_dimmer.table} ORDER BY node_id")
         self.db.commit()
 
         dimmers = []
         columns = [description[0] for description in self.cursor.description]
-        for row in  self.cursor.fetchall():
+        for row in self.cursor.fetchall():
             row_dict = dict(zip(columns, row, strict=True))
             dimmers.append(row_dict)
 
         return dimmers
 
     def get_zones(self) -> list[dict]:
-        self.cursor.execute(f"SELECT * FROM {self.table_sensor.table} ORDER BY zoneid" )
+        self.cursor.execute(f"SELECT * FROM {self.table_sensor.table} ORDER BY zoneid")
         self.db.commit()
 
         zones = []
         columns = [description[0] for description in self.cursor.description]
-        for row in  self.cursor.fetchall():
+        for row in self.cursor.fetchall():
             row_dict = dict(zip(columns, row, strict=True))
             zones.append(row_dict)
 
         return zones
 
-    def get_setting_panel(self,setting:str) -> str:
-        self.cursor.execute(f"SELECT value FROM {self.table_qolsyssettings.table} WHERE name = ? and partition_id  = ? ", (setting,"0"))
+    def get_setting_panel(self, setting: str) -> str:
+        self.cursor.execute(f"""SELECT value FROM {self.table_qolsyssettings.table}
+                             WHERE name = ? and partition_id  = ? """, (setting, "0"))
         row = self.cursor.fetchone()
 
         if row is None:
-            LOGGER.debug("%s value not found",setting)
+            LOGGER.debug("%s value not found", setting)
             return None
 
         return row[0]
 
-    def get_setting_partition(self,setting:str,partition_id:str) -> str | None:
-        self.cursor.execute(f"SELECT value FROM {self.table_qolsyssettings.table} WHERE name = ? and partition_id  = ? ", (setting,partition_id))
+    def get_setting_partition(self, setting: str, partition_id: str) -> str | None:
+        self.cursor.execute(f"""SELECT value FROM {self.table_qolsyssettings.table}
+                             WHERE name = ? and partition_id  = ? """, (setting, partition_id))
         row = self.cursor.fetchone()
 
         if row is None:
-            LOGGER.debug("%s value not found",setting)
+            LOGGER.debug("%s value not found", setting)
             return None
 
         return row[0]
 
-    def get_state_partition(self,state:str,partition_id:str) -> str | None:
-        self.cursor.execute(f"SELECT value FROM {self.table_state.table} WHERE name = ? and partition_id  = ? ", (state,partition_id))
+    def get_state_partition(self, state: str, partition_id: str) -> str | None:
+        self.cursor.execute(
+            f"""SELECT value FROM {self.table_state.table} WHERE name = ? and partition_id  = ? """, (state, partition_id))
         row = self.cursor.fetchone()
 
         if row is None:
-            LOGGER.debug("%s value not found",state)
+            LOGGER.debug("%s value not found", state)
             return None
 
         return row[0]
 
-    def get_alarm_type(self,partition_id:str) -> list[str]:
+    def get_alarm_type(self, partition_id: str) -> list[str]:
         alarm_type = []
         self.cursor.execute(f"SELECT sgroup FROM {self.table_alarmedsensor.table} WHERE partition_id  = ? ", (partition_id))
         rows = self.cursor.fetchall()
@@ -258,14 +262,14 @@ class QolsysDB:
         for table in self._table_array:
             table.clear()
 
-    def get_table(self,uri:str) -> QolsysTable | None:
+    def get_table(self, uri: str) -> QolsysTable | None:
         for table in self._table_array:
             if uri == table.uri:
                 return table
 
         return None
 
-    def load_db(self,database:dict) -> None:
+    def load_db(self, database: dict) -> None:
 
         self.clear_db()
 

qolsys_controller/database/table.py

@@ -5,19 +5,21 @@ from qolsys_controller.errors import QolsysSqlError
 
 LOGGER = logging.getLogger(__name__)
 
+
 class QolsysTable:
 
-    def __init__(self,db:sqlite3.Connection,cursor:sqlite3.Cursor) -> None:
-        self._db:sqlite3.Connection = db
-        self._cursor:sqlite3.Cursor = cursor
-        self._uri:str = ""
-        self._table:str = ""
-        self._columns:list[str] = []
-        self._abort_on_error:bool = False
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        self._db: sqlite3.Connection = db
+        self._cursor: sqlite3.Cursor = cursor
+        self._uri: str = ""
+        self._table: str = ""
+        self._columns: list[str] = []
+        self._abort_on_error: bool = False
 
     @property
     def uri(self) -> str:
         return self._uri
+
     @property
     def table(self) -> str:
         return self._table
@@ -62,21 +64,20 @@ class QolsysTable:
             })
 
             if self._abort_on_error:
-               raise error from err
+                raise error from err
 
-    def update(self,selection:str,selection_argument:str,content_value:str) -> None:
-        # selection: 'zone_id=?, parition_id=?'  # noqa: ERA001
-        # selection_argument: '[3,1]'  # noqa: ERA001
+    def update(self, selection: str, selection_argument: str, content_value: str) -> None:
+        # selection: 'zone_id=?, parition_id=?'
+        # selection_argument: '[3,1]'
         #  "contentValues":{"partition_id":"0","sensorgroup":"safetymotion","sensorstatus":"Idle"}"
 
         # Panel is sending query parameter for db update in text string
         # Have not found a way to make it work with parametrized query yet
         # Using f string concat for moment ...
 
-
         # New Values to update in table
-        # To change for parametrized 
-        db_value = ",".join([f"{key}='{value}'" for key,value in content_value.items()])
+        # To change for parametrized
+        db_value = ",".join([f"{key}='{value}'" for key, value in content_value.items()])
 
         # Selection Argument
         selection_argument = selection_argument.strip("[]")
@@ -84,7 +85,7 @@ class QolsysTable:
 
         try:
             query = f"UPDATE {self.table} SET {db_value} WHERE {selection}"
-            self._cursor.execute(query,selection_argument)
+            self._cursor.execute(query, selection_argument)
             self._db.commit()
 
         except sqlite3.Error as err:
@@ -98,25 +99,25 @@ class QolsysTable:
             })
 
             if self._abort_on_error:
-               raise error from err
+                raise error from err
 
     def insert(self) -> None:
         pass
 
-    def delete(self,selection:str,selection_argument:str) -> None:
-        # selection: 'zone_id=?, parition_id=?'  # noqa: ERA001
-        # selection_argument: '[3,1]'  # noqa: ERA001
+    def delete(self, selection: str, selection_argument: str) -> None:
+        # selection: 'zone_id=?, parition_id=?'
+        # selection_argument: '[3,1]'
 
         selection_argument = selection_argument.strip("[]")
         selection_argument = [item.strip() for item in selection_argument.split(",")]
 
         # Replace '?' in selection string with selection_argument
-        #for i in selection_argument:
-        #    selection = selection.replace("?",f"'{i}'",1)  # noqa: ERA001
+        # for i in selection_argument:
+        #    selection = selection.replace("?",f"'{i}'",1)
 
         try:
             query = f"DELETE FROM {self.table} WHERE {selection}"
-            self._cursor.execute(query,selection_argument)
+            self._cursor.execute(query, selection_argument)
             self._db.commit()
 
         except sqlite3.Error as err:
@@ -129,6 +130,4 @@ class QolsysTable:
             })
 
             if self._abort_on_error:
-               raise error from err
-
-
+                raise error from err

qolsys_controller/database/table_alarmedsensor.py

@@ -5,10 +5,11 @@ from .table import QolsysTable
 
 LOGGER = logging.getLogger(__name__)
 
+
 class QolsysTableAlarmedSensor(QolsysTable):
 
-    def __init__(self,db:sqlite3.Connection,cursor:sqlite3.Cursor) -> None:
-        super().__init__(db,cursor)
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.AlarmedSensorProvider/alarmedsensor"
         self._table = "alarmedsensor"
         self._abort_on_error = True
@@ -28,18 +29,18 @@ class QolsysTableAlarmedSensor(QolsysTable):
 
         self._create_table()
 
-    def insert(self, data:dict) -> None:
-        self._cursor.execute(f"INSERT INTO {self.table} (_id,partition_id,silenced,zone_id,sgroup,action,timed_out,type,priority,aseb_type) VALUES (?,?,?,?,?,?,?,?,?,?)",(
+    def insert(self, data: dict) -> None:
+        self._cursor.execute(f"""INSERT INTO {self.table} (_id,partition_id,silenced,zone_id,sgroup,action,timed_out,type,
+                             priority,aseb_type) VALUES (?,?,?,?,?,?,?,?,?,?)""", (
             data.get("_id"),
-            data.get("partition_id",""),
-            data.get("silenced",""),
-            data.get("zone_id",""),
-            data.get("sgroup",""),
-            data.get("action",""),
-            data.get("timed_out",""),
-            data.get("type",""),
-            data.get("priority",""),
-            data.get("aseb_type","")))
+            data.get("partition_id", ""),
+            data.get("silenced", ""),
+            data.get("zone_id", ""),
+            data.get("sgroup", ""),
+            data.get("action", ""),
+            data.get("timed_out", ""),
+            data.get("type", ""),
+            data.get("priority", ""),
+            data.get("aseb_type", "")))
 
         self._db.commit()
-

qolsys_controller/database/table_automation.py

@@ -5,10 +5,11 @@ from .table import QolsysTable
 
 LOGGER = logging.getLogger(__name__)
 
+
 class QolsysTableAutomation(QolsysTable):
 
-    def __init__(self,db:sqlite3.Connection,cursor:sqlite3.Cursor) -> None:
-        super().__init__(db,cursor)
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.AutomationDeviceContentProvider/automation"
         self._table = "automation"
         self._abort_on_error = False
@@ -42,32 +43,35 @@ class QolsysTableAutomation(QolsysTable):
 
         self._create_table()
 
-    def insert(self, data:dict) -> None:
-        self._cursor.execute(f"INSERT INTO {self.table} (_id,virtual_node_id,version,opr,partition_id,end_point,extras,is_autolocking_enabled,device_type,endpoint_secure_cmd_classes,automation_id,device_name,protocol,node_battery_level_value,state,last_updated_date,manufacturer_id,endpoint_cmd_classes,device_id,nodeid_cmd_classes,is_device_hidden,nodeid_secure_cmd_classes,created_date,status) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",(
+    def insert(self, data: dict) -> None:
+        self._cursor.execute(f"""INSERT INTO {self.table} (_id,virtual_node_id,version,opr,partition_id,end_point,extras,
+                             is_autolocking_enabled,device_type,endpoint_secure_cmd_classes,automation_id,device_name,
+                             protocol,node_battery_level_value,state,last_updated_date,manufacturer_id,
+                             endpoint_cmd_classes,device_id,nodeid_cmd_classes,is_device_hidden,nodeid_secure_cmd_classes,
+                             created_date,status) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)""", (
             data.get("_id"),
-            data.get("virtual_node_id",""),
-            data.get("version",""),
-            data.get("opr",""),
-            data.get("partition_id",""),
-            data.get("end_point",""),
-            data.get("extras",""),
-            data.get("is_autolocking_enabled",""),
-            data.get("device_type",""),
-            data.get("endpoint_secure_cmd_classes",""),
-            data.get("automation_id",""),
-            data.get("device_name",""),
-            data.get("protocol",""),
-            data.get("node_battery_level_value",""),
-            data.get("state",""),
-            data.get("last_updated_date",""),
-            data.get("manufacturer_id",""),
-            data.get("endpoint_cmd_classes",""),
-            data.get("device_id",""),
-            data.get("nodeid_cmd_classes",""),
-            data.get("is_device_hidden",""),
-            data.get("nodeid_secure_cmd_classes",""),
-            data.get("created_date",""),
-            data.get("status","")))
+            data.get("virtual_node_id", ""),
+            data.get("version", ""),
+            data.get("opr", ""),
+            data.get("partition_id", ""),
+            data.get("end_point", ""),
+            data.get("extras", ""),
+            data.get("is_autolocking_enabled", ""),
+            data.get("device_type", ""),
+            data.get("endpoint_secure_cmd_classes", ""),
+            data.get("automation_id", ""),
+            data.get("device_name", ""),
+            data.get("protocol", ""),
+            data.get("node_battery_level_value", ""),
+            data.get("state", ""),
+            data.get("last_updated_date", ""),
+            data.get("manufacturer_id", ""),
+            data.get("endpoint_cmd_classes", ""),
+            data.get("device_id", ""),
+            data.get("nodeid_cmd_classes", ""),
+            data.get("is_device_hidden", ""),
+            data.get("nodeid_secure_cmd_classes", ""),
+            data.get("created_date", ""),
+            data.get("status", "")))
 
         self._db.commit()
-

qolsys_controller/database/table_country_locale.py

@@ -5,10 +5,11 @@ from .table import QolsysTable
 
 LOGGER = logging.getLogger(__name__)
 
+
 class QolsysTableCountryLocale(QolsysTable):
 
-    def __init__(self,db:sqlite3.Connection,cursor:sqlite3.Cursor) -> None:
-        super().__init__(db,cursor)
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.CountryLocaleContentProvider/country_locale"
         self._table = "country_locale"
         self._abort_on_error = False
@@ -34,24 +35,26 @@ class QolsysTableCountryLocale(QolsysTable):
 
         self._create_table()
 
-    def insert(self, data:dict) -> None:
-        self._cursor.execute(f"INSERT INTO {self.table} (_id,version,opr,partition_id,country,language,alpha2_code,language_code,date_format_enum,hour_format,temp_format,is_active,date_separator,zwave_region_frequency_code,zwave_region_frequency,zwave_region_prop_values) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",(
+    def insert(self, data: dict) -> None:
+        self._cursor.execute(f"""INSERT INTO {self.table} (_id,version,opr,partition_id,country,language,alpha2_code,
+                             language_code,date_format_enum,hour_format,temp_format,is_active,date_separator,
+                             zwave_region_frequency_code,zwave_region_frequency,zwave_region_prop_values)
+                              VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)""", (
             data.get("_id"),
-            data.get("version",""),
-            data.get("opr",""),
-            data.get("partition_id",""),
-            data.get("country",""),
-            data.get("language",""),
-            data.get("alpha2_code",""),
-            data.get("language_code",""),
-            data.get("date_format_enum",""),
-            data.get("hour_format",""),
-            data.get("temp_format",""),
-            data.get("is_active",""),
-            data.get("date_separator",""),
-            data.get("zwave_region_frequency_code",""),
-            data.get("zwave_region_frequency",""),
-            data.get("zwave_region_prop_values","")))
+            data.get("version", ""),
+            data.get("opr", ""),
+            data.get("partition_id", ""),
+            data.get("country", ""),
+            data.get("language", ""),
+            data.get("alpha2_code", ""),
+            data.get("language_code", ""),
+            data.get("date_format_enum", ""),
+            data.get("hour_format", ""),
+            data.get("temp_format", ""),
+            data.get("is_active", ""),
+            data.get("date_separator", ""),
+            data.get("zwave_region_frequency_code", ""),
+            data.get("zwave_region_frequency", ""),
+            data.get("zwave_region_prop_values", "")))
 
         self._db.commit()
-

qolsys_controller/database/table_dashboard_msgs.py

@@ -5,10 +5,11 @@ from .table import QolsysTable
 
 LOGGER = logging.getLogger(__name__)
 
+
 class QolsysTableDashboardMsgs(QolsysTable):
 
-    def __init__(self,db:sqlite3.Connection,cursor:sqlite3.Cursor) -> None:
-        super().__init__(db,cursor)
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.DashboardMessagesContentProvider/dashboard_msgs"
         self._table = "dashboard_msgs"
         self._abort_on_error = False
@@ -30,8 +31,9 @@ class QolsysTableDashboardMsgs(QolsysTable):
 
         self._create_table()
 
-    def insert(self, data:dict) -> None:
-        self._cursor.execute(f"INSERT INTO {self.table} (_id,version,opr,partition_id,msg_id,title,description,received_time,start_time,end_time,read,mime_type) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)",(
+    def insert(self, data: dict) -> None:
+        self._cursor.execute(f"""INSERT INTO {self.table} (_id,version,opr,partition_id,msg_id,title,description,
+                             received_time,start_time,end_time,read,mime_type) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)""", (
             data.get("_id"),
             data.get("version"),
             data.get("opr"),
@@ -46,4 +48,3 @@ class QolsysTableDashboardMsgs(QolsysTable):
             data.get("mime_type")))
 
         self._db.commit()
-