qolsys-controller 0.0.30__py3-none-any.whl → 0.0.32__py3-none-any.whl

qolsys_controller/database/table.py

@@ -108,12 +108,13 @@ class QolsysTable:
 
     def update(self, selection: str, selection_argument: str, content_value: str) -> None:
         # selection: 'zone_id=?, parition_id=?'
+
+        # selection_argument:
         # Firmware 4.4.1: selection_argument: '[3,1]'
         # Firmware 4.6.1: selection_argument: ['3','1']
+
         # contentValues:{"partition_id":"0","sensorgroup":"safetymotion","sensorstatus":"Idle"}"
 
-        # New Values to update in table
-        db_value = ",".join([f"{key}='{value}'" for key, value in content_value.items()])
 
         # Selection Argument
         # Panel send selection_argument as list in Firmware 4.6.1
@@ -123,6 +124,24 @@ class QolsysTable:
             selection_argument = [item.strip() for item in selection_argument.split(",")]
 
         try:
+            full_data = {}
+            new_columns = []
+
+            for key, value in content_value.items():
+                if key in self._columns:
+                    full_data[key] = value
+                else:
+                    new_columns.append(key)
+
+            db_value = ",".join([f"{key}='{value}'" for key, value in full_data.items()])
+
+            # Warn if new column found in iq2meid database
+            if new_columns:
+                LOGGER.warning("New column found in iq2meid database")
+                LOGGER.warning("Table: %s", self.table)
+                LOGGER.warning("New Columns: %s", new_columns)
+                LOGGER.warning("Please Report")
+
             query = f"UPDATE {self.table} SET {db_value} WHERE {selection}"
             self._cursor.execute(query, selection_argument)
             self._db.commit()

qolsys_controller/database/table_sensor.py

@@ -42,6 +42,7 @@ class QolsysTableSensor(QolsysTable):
             "zone_reporting_enabled",
             "zone_feature1",
             "zone_feature2",
+            "zone_feature3",
             "battery_status",
             "created_date",
             "created_by",

qolsys_controller/enum.py

@@ -86,6 +86,9 @@ class ZoneSensorGroup(StrEnum):
     SAFETY_MOTION = "safetymotion"
     GLASS_BREAK = "glassbreak"
     GLASS_BREAK_AWAY_ONLY = "glassbreakawayonly"
+    SMOKE_HEAT = "smoke_heat"
+    CO = "co"
+
 
     # ENTRY_EXIT_NORMAL_DELAY = "" #TBD
     # ENTRY_EXIT_LONG_DELAY = "" #TBD
@@ -99,8 +102,6 @@ class ZoneSensorGroup(StrEnum):
     # STAY_INSTANT_MOTION = "" #TBD
     # STAY_DELAY_MOTION = "" #TBD
     # AWAY_DELAY_MOTION = "" #TBD
-    # SMOKE_HEAT = "" # TBD
-    # CO = "" # TBD
     # TAKEOVER = "" #TBD
     # GARAGE_TILT_SAFETY = "" # TBD
     # WATER_SENSOR = "" # TBD

qolsys_controller/partition.py

@@ -41,6 +41,7 @@ class QolsysPartition(QolsysObservable):
         self._command_exit_sounds = True
         self._command_arm_stay_instant = True
         self._command_arm_stay_silent_disarming = False
+        self._command_arm_entry_delay = True
 
     @property
     def id(self) -> int:
@@ -86,6 +87,10 @@ class QolsysPartition(QolsysObservable):
     def command_arm_stay_silent_disarming(self) -> bool:
         return self._command_arm_stay_silent_disarming
 
+    @property
+    def command_arm_entry_delay(self) -> bool:
+        return self._command_arm_entry_delay
+
     @system_status.setter
     def system_status(self, new_value: PartitionSystemStatus) -> None:
         if self._system_status != new_value:
@@ -190,6 +195,12 @@ class QolsysPartition(QolsysObservable):
         LOGGER.debug("Partition%s (%s) - arm_stay_silent_disarming: %s", self._id, self._name, value)
         self.notify()
 
+    @command_arm_entry_delay.setter
+    def command_arm_entry_delay(self, value:bool) -> None:
+        self._command_arm_entry_delay = value
+        LOGGER.debug("Partition%s (%s) - command_arm_entry_delay: %s", self._id, self._name, value)
+
+
     def update_partition(self, data: dict) -> None:
         # Check if we are updating same partition_id
         partition_id_update = data.get("partition_id", "")

qolsys_controller/plugin_remote.py

@@ -299,6 +299,7 @@ class QolsysPluginRemote(QolsysPlugin):
             self.connected_observer.notify()
 
             LOGGER.debug("%s: Reconnecting in %s seconds ...", err, self.settings.mqtt_timeout)
+            self._task_manager.cancel(self.mqtt_ping_task)
             await asyncio.sleep(self.settings.mqtt_timeout)
             self._task_manager.run(self.mqtt_connect_task(reconnect=True), self._mqtt_task_connect_label)
 
@@ -374,7 +375,7 @@ class QolsysPluginRemote(QolsysPlugin):
         LOGGER.debug("Plugin Pairing Completed ")
         return True
 
-    async def handle_key_exchange_client(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
+    async def handle_key_exchange_client(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:  # noqa: PLR0915
 
         received_panel_mac = False
         received_signed_client_certificate = False
@@ -927,7 +928,7 @@ class QolsysPluginRemote(QolsysPlugin):
     async def command_zwave_thermostat_setpoint_set(self, node_id: int, mode:ThermostatMode, setpoint:float) -> None:
         # Command 67
         LOGGER.debug("MQTT: Sending zwave_thermostat_setpoint_set command: EXPERIMENTAL")
-        LOGGER.debug("MQTT: Sending zwave_thermostat_setpoint_set command")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_setpoint_set - Node(%s) - Mode(%s) - Setpoint(%s)",node_id,mode,setpoint)
         ipcRequest = [{
                 "dataType": "int",
                 "dataValue": node_id,
@@ -978,7 +979,7 @@ class QolsysPluginRemote(QolsysPlugin):
     async def command_zwave_thermostat_mode_set(self, node_id: int, mode:ThermostatMode) -> None:
         # Command 64
         LOGGER.debug("MQTT: Sending zwave_thermostat_mode_set command: EXPERIMENTAL")
-        LOGGER.debug("MQTT: Sending zwave_thermostat_mode_set command")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_mode_set command - Node(%s) - Mode(%s)",node_id,mode)
         ipcRequest = [{
                 "dataType": "int",
                 "dataValue": node_id,
@@ -1022,7 +1023,7 @@ class QolsysPluginRemote(QolsysPlugin):
             "ipcRequest": ipcRequest,
             "requestID": requestID,
             "responseTopic": responseTopic,
-            "remoteMacAddress": remoteMacAddress
+            "remoteMacAddress": remoteMacAddress,
         }
 
         await self.send_command(topic, payload, requestID)
@@ -1031,7 +1032,7 @@ class QolsysPluginRemote(QolsysPlugin):
     async def command_zwave_thermostat_fan_mode_set(self, node_id: int, fan_mode:ThermostatFanMode) -> None:
         # Command 68
         LOGGER.debug("MQTT: Sending zwave_thermostat_fan_mode_set command: EXPERIMENTAL")
-        LOGGER.debug("MQTT: Sending zwave_thermostat_fan_mode_set command")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_fan_mode_set command - Node(%s) - FanMode(%s)",node_id,fan_mode)
         ipcRequest = [{
                 "dataType": "int",
                 "dataValue": node_id,
@@ -1080,7 +1081,7 @@ class QolsysPluginRemote(QolsysPlugin):
         LOGGER.debug("MQTT: Receiving zwave_thermostat_fan_mode_set command")
 
     async def command_zwave_switch_multi_level(self, node_id: int, level: int) -> None:
-        LOGGER.debug("MQTT: Sending zwave_switch_multi_level command")
+        LOGGER.debug("MQTT: Sending zwave_switch_multi_level command  - Node(%s) - Level(%s)",node_id,level)
         ipcRequest = [{
                 "dataType": "int",  # Node ID
                 "dataValue": node_id,
@@ -1185,10 +1186,10 @@ class QolsysPluginRemote(QolsysPlugin):
 
 
     async def command_arm(self, partition_id: str, arming_type: str, user_code: str = "", exit_sounds: bool = False,
-                          instant_arm: bool = False) -> bool:
+                          instant_arm: bool = False, entry_delay: bool = True) -> bool:
 
-        LOGGER.debug("MQTT: Sending arm command: partition%s, arming_type:%s, secure_arm:%s",
-                     partition_id, arming_type, self.panel.SECURE_ARMING)
+        LOGGER.debug("MQTT: Sending arm command: partition%s, arming_type:%s, secure_arm:%s, exit_sounds:%s, instant_arm: %s, entry_delay:%s",
+                     partition_id, arming_type, self.panel.SECURE_ARMING,exit_sounds,instant_arm,entry_delay)
 
         user_id = 0
 
@@ -1223,13 +1224,17 @@ class QolsysPluginRemote(QolsysPlugin):
         if not exit_sounds:
             exitSoundValue = "OFF"
 
+        entryDelay = "ON"
+        if not entry_delay:
+            entryDelay = "OFF"
+
         arming_command = {
             "operation_name": mqtt_arming_type,
             "bypass_zoneid_set": "[]",
             "userID": user_id,
             "partitionID": int(partition_id),
             "exitSoundValue":  exitSoundValue,
-            "entryDelayValue": "OFF",
+            "entryDelayValue": entryDelay,
             "multiplePartitionsSelected": False,
             "instant_arming": instant_arm,
             "final_exit_arming_selected": False,

qolsys_controller/settings.py

@@ -52,6 +52,14 @@ class QolsysSettings:
     def panel_ip(self) -> str:
         return self._panel_ip
 
+    @property
+    def mqtt_timeout(self) -> int:
+        return self._mqtt_timeout
+
+    @property
+    def mqtt_ping(self) -> int:
+        return self._mqtt_ping
+
     @panel_ip.setter
     def panel_ip(self, panel_ip: str) -> None:
         self._panel_ip = panel_ip

qolsys_controller/state.py

@@ -193,7 +193,7 @@ class QolsysState(QolsysObservable):
         self.zwave_devices.remove(zwave)
         self.state_zwave_observer.notify()
 
-    def sync_zwave_devices_data(self, db_zwaves: list[QolsysZWaveDevice]) -> None:  # noqa: C901, PLR0912
+    def sync_zwave_devices_data(self, db_zwaves: list[QolsysZWaveDevice]) -> None:  # noqa: PLR0912
 
         db_zwave_list = []
         for db_zwave in db_zwaves:
@@ -279,7 +279,7 @@ class QolsysState(QolsysObservable):
                 LOGGER.debug("sync_data - add Scene%s", db_scene.scene_id)
                 self.scene_add(db_scene)
 
-    def sync_zones_data(self, db_zones: list[QolsysZone]) -> None:  # noqa: C901
+    def sync_zones_data(self, db_zones: list[QolsysZone]) -> None:
         db_zone_list = []
         for db_zone in db_zones:
             db_zone_list.append(db_zone.zone_id)
@@ -308,7 +308,7 @@ class QolsysState(QolsysObservable):
                 LOGGER.debug("sync_data - add Zone%s", db_zone.zone_id)
                 self.zone_add(db_zone)
 
-    def sync_partitions_data(self, db_partitions: list[QolsysPartition]) -> None:  # noqa: C901
+    def sync_partitions_data(self, db_partitions: list[QolsysPartition]) -> None:
         db_partition_list = []
         for db_partition in db_partitions:
             db_partition_list.append(db_partition.id)

qolsys_controller/task_manager.py

@@ -2,6 +2,8 @@ import asyncio
 import logging
 from collections.abc import Coroutine
 
+import aiomqtt
+
 LOGGER = logging.getLogger(__name__)
 
 
@@ -14,6 +16,16 @@ class QolsysTaskManager:
         self._tasks.add(task)
 
         def _done_callback(task: asyncio.Task) -> None:
+
+            try:
+                task.result()
+
+            except asyncio.CancelledError:
+                LOGGER.debug("Task Cancelled: %s",task.get_name())
+
+            except Exception as e:  # noqa: BLE001
+                LOGGER.debug("[Callback] Task failed with: %s",e)
+
             self._tasks.discard(task)
 
         task.add_done_callback(_done_callback)

qolsys_controller/zwave_device.py

@@ -74,7 +74,7 @@ class QolsysZWaveDevice(QolsysObservable):
         node_id_update = data.get("node_id", "")
         if node_id_update != self._node_id:
             LOGGER.error(
-                "Updating ZWave%s (%s) with ZWave%s (different node_id)", self.node_id, self.node_name, node_id_update
+                "Updating ZWave%s (%s) with ZWave%s (different node_id)", self.node_id, self.node_name, node_id_update,
             )
             return
 

qolsys_controller/zwave_lock.py

@@ -67,7 +67,7 @@ class QolsysLock(QolsysZWaveDevice):
             self._lock_paired_status = value
             self.notify()
 
-    def update_lock(self, data: dict) -> None:  # noqa: C901, PLR0912
+    def update_lock(self, data: dict) -> None:  # noqa: PLR0912
         # Check if we are updating same zoneid
         node_id_update = data.get("node_id", "")
         if node_id_update != self.lock_node_id:

{qolsys_controller-0.0.30.dist-info → qolsys_controller-0.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.30
+Version: 0.0.32
 Summary: A Python module that emulates a virtual IQ Remote device, enabling full local control of a Qolsys IQ Panel
 Project-URL: Homepage, https://github.com/EHylands/QolsysController
 Project-URL: Issues, https://github.com/EHylands/QolsysController/issues

{qolsys_controller-0.0.30.dist-info → qolsys_controller-0.0.32.dist-info}/RECORD

@@ -1,32 +1,32 @@
 qolsys_controller/__init__.py,sha256=TkjMFBP9VNyGLC84JQZ_tTeD8nJImkGgPMkQFGr2428,88
 qolsys_controller/controller.py,sha256=rLjMMZBJCPqrE9oY_vZRMFZAsIm5UlXyRtUao3F4Qr0,1309
-qolsys_controller/enum.py,sha256=j_-q4b-i3VprGtXIAVuA-HKiERVAcH-rL3IFZEGlmH8,3435
+qolsys_controller/enum.py,sha256=VjtHGSU1_JOZ3XO4QwmSzi6JjsUXGwW9L4v_QuPP-lM,3432
 qolsys_controller/enum_zwave.py,sha256=q10YtzOXW3wfYORU1o7_WhTfb3GpC_xstjHzQAitHJ0,740
 qolsys_controller/errors.py,sha256=Z_eVJ4XqWucdn1lu_83DPnEKEG4L3FMfjhz5iO6RuBM,1176
 qolsys_controller/mdns.py,sha256=3_d-_K5Fyxc-2s0Fo1advTSpD72P369Hou1Ko0z__Ag,606
 qolsys_controller/mqtt_command_queue.py,sha256=FjSbjK3_3SXV5eQPfQ-k8HOI5Tbu2aWzAxe4uXymK64,937
 qolsys_controller/observable.py,sha256=X7uMnBHGpklPTa-RHKldXA0Rq38Cs1yOIuxl8ODeKV4,1049
 qolsys_controller/panel.py,sha256=5aqRC2KSaClId4z_QCMr7thmlLPTWHcBo0_gDGrF51s,40272
-qolsys_controller/partition.py,sha256=j8FrWvA19_MpQvXDLKl5VvkqX_rcs4GWfFGwyQ2VFw4,8525
+qolsys_controller/partition.py,sha256=tRltH4ulIqiM2QyyafZ0Us_lND4TjPxR7yHNAFg1dbA,8920
 qolsys_controller/pki.py,sha256=_e0tiNF8Hypb37cHr7x8yqUZDaqbzRzP45AitTtmzk4,8663
 qolsys_controller/plugin.py,sha256=Qh0irFbuw9R2QF3jOFTJw70ceVxK1ld5_sW7VnpOrA8,819
 qolsys_controller/plugin_c4.py,sha256=71o5Y7Y13GO0vWCPIsCtpqXxrplryyqt8ua5L8F4StQ,382
-qolsys_controller/plugin_remote.py,sha256=mxRu08PZ0UpIqo0zgXC3VLWD44H2AIxgOHWplLlHjZY,49792
+qolsys_controller/plugin_remote.py,sha256=ZV41YJE2NfNCi2zYHvkiZWh7tt7vq-eFOyspFmXkjGE,50237
 qolsys_controller/scene.py,sha256=b_8pzAJ08L7Nc-vouzkDxZKkcDQ239pLnvSDnN4g_oQ,1899
-qolsys_controller/settings.py,sha256=ywtlSN4TNUi0NRDjw77lr28fcUD8qYPHNVP67dCuGiQ,5421
-qolsys_controller/state.py,sha256=8ZkHMY_mY--G8laxjrA96eTnPiG5AcFwE_MNgU9a3AQ,16874
-qolsys_controller/task_manager.py,sha256=IBFi1l9aId950wvRpvP6d4PHZhr3v1hnnt8NVulM3BI,1139
+qolsys_controller/settings.py,sha256=sy4n5SISyYQSpfDILz-bB0vWG1Yfvm4vgXiQQFoE7Cc,5583
+qolsys_controller/state.py,sha256=4xgVvKHv8KbTllDlasG2WWah7KZJg0BmhgBQeGiSudE,16840
+qolsys_controller/task_manager.py,sha256=7hCZYClCFByeYl5akuU5szbyP7hTc7HJnMXj2YGzjXQ,1433
 qolsys_controller/utils_mqtt.py,sha256=2hf9_BnQbsWi8t0KBiK5MSsDgGjlbWVJi-Sd3H5VVt0,575
 qolsys_controller/zone.py,sha256=edMudu58WqJ5wD1hwe2JYMiLMg_62mOYpKDvPQuC3NI,11361
-qolsys_controller/zwave_device.py,sha256=wMu89b1uJnjkGzaRqE7zryFJVPVfEgGZc6lfP16OrRA,9309
+qolsys_controller/zwave_device.py,sha256=AJZQqIN9fGHu0t5NNIfTyCkpsgt0ArvFObb0_qICJxI,9310
 qolsys_controller/zwave_dimmer.py,sha256=aOAolbptoDpmJCxcPwpn6cIqR5CE1AxCSfz1WxIQJZA,5153
 qolsys_controller/zwave_garagedoor.py,sha256=xoR1I_qm4S0Ir6XvOC2Q9asq69NeJnJ4ZkVy7VC1P6Q,189
 qolsys_controller/zwave_generic.py,sha256=gadtyUfPGsIzJaGc2zT5AQoFVxR_RsoagHE7x7knRzc,245
-qolsys_controller/zwave_lock.py,sha256=w76PjZjne4KN4XgIreXIwkLv4ClBkKfHQQHQao6eRiw,4977
+qolsys_controller/zwave_lock.py,sha256=nodvZyjVurP5Eezjam4yRoFSfgnqlDM0e0MyXUqTpsQ,4971
 qolsys_controller/zwave_outlet.py,sha256=lxGB-jth11dHPUkT7jC411GdLCGDdct4mAGu05SndCA,185
 qolsys_controller/zwave_thermostat.py,sha256=IVe6F16aTt3v7ibC0C5X77jzmZOgNWNtfElMwVC3VXU,14610
 qolsys_controller/database/db.py,sha256=Je1owq3HbSbd63hqx0U_fOBLLYRwMUpmtVpX74KVops,14510
-qolsys_controller/database/table.py,sha256=IBhNToCfLTum0Yu2cUcwaUGU7HvSm-oHu5lFVUgdFKQ,5871
+qolsys_controller/database/table.py,sha256=eIbHt1UvcNxVje2w3g_YMnQGIY85_nOtkOMxUlVtSVI,6451
 qolsys_controller/database/table_alarmedsensor.py,sha256=BZ6K9CQbcXRw0rf6WODS0NFf1wptu5CxuRtsLQrCsSQ,808
 qolsys_controller/database/table_automation.py,sha256=1qCdSIX2ALSdGxkZdMbHWT43VjqX4WgmNed4HcC7wc8,1287
 qolsys_controller/database/table_country_locale.py,sha256=OkjqGhYhYaGptZGN74eJI-dkRYSv_Cpex_zCs93v1Wo,1013
@@ -47,7 +47,7 @@ qolsys_controller/database/table_pgm_outputs.py,sha256=hZyR4tpTss1kP6UCVBBbJHH5L
 qolsys_controller/database/table_powerg_device.py,sha256=TpXcA9nGkMeVwUG7eo7DQr9M-kHiWLtgIM3MtyMj_Fg,576
 qolsys_controller/database/table_qolsyssettings.py,sha256=ryJylcS7vthhXlzEywwLRxbkkz2gmdnadMs0FkMD2yQ,685
 qolsys_controller/database/table_scene.py,sha256=DmUuWRSRUfpXxuFh_CzgYm_GkyyNe6DKQHhgl3AFkMs,846
-qolsys_controller/database/table_sensor.py,sha256=63lU7bfWY5eqlawo8NU18gPHCcLNs_BShT6OHzxnvOo,1823
+qolsys_controller/database/table_sensor.py,sha256=X8VvnqCRqHTnaMrk7wKQX7N00M0FzOafZ5gEbSlQHUI,1852
 qolsys_controller/database/table_shades.py,sha256=Gzbh3VH89O9jYW-4Gf0wY14Jl6eSVGT_-IerMZ4-OHo,550
 qolsys_controller/database/table_smartsocket.py,sha256=bSBkiwbtDsQzH3teDtDmLzjqsmRcsoj70jI10vh8WhY,571
 qolsys_controller/database/table_state.py,sha256=amHZB0jFm_Z_DEg-9ChSGIxkJeXC70AW8N247GB8yww,681
@@ -62,7 +62,7 @@ qolsys_controller/database/table_zwave_association_group.py,sha256=B8SHPU335a2wh
 qolsys_controller/database/table_zwave_history.py,sha256=iLCkRZOsQmc5TQT0-IngyNkrG78kQrEhITPChmNt1bM,942
 qolsys_controller/database/table_zwave_node.py,sha256=5YDHwG139qLUx9BwzCJaqovMgdCcXng0dWOTTa75kQs,2568
 qolsys_controller/database/table_zwave_other.py,sha256=RzWuWMQA3czUNRWAP8SaAk6tiTeUgGl3J97npzW6AA0,573
-qolsys_controller-0.0.30.dist-info/METADATA,sha256=-2vnRFU0SVDEo9pGRzhxs6TBZ-bjul63qG4W24uL3oA,4252
-qolsys_controller-0.0.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.30.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.30.dist-info/RECORD,,
+qolsys_controller-0.0.32.dist-info/METADATA,sha256=xM-xlQMovg8m5z9qnE7cMAtM54Ckhe1YBqm_4Jg21FU,4252
+qolsys_controller-0.0.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.32.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.32.dist-info/RECORD,,