qolsys-controller 0.0.31__tar.gz → 0.0.34__tar.gz

{qolsys_controller-0.0.31 → qolsys_controller-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.31
+Version: 0.0.34
 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.31 → qolsys_controller-0.0.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qolsys-controller"
-version = "0.0.31"
+version = "0.0.34"
 authors = [
   { name="Eric Hylands", email="" },
 ]

{qolsys_controller-0.0.31 → qolsys_controller-0.0.34}/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-0.0.31 → qolsys_controller-0.0.34}/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,14 @@ 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)
+        self.notify()
+
+
+
     def update_partition(self, data: dict) -> None:
         # Check if we are updating same partition_id
         partition_id_update = data.get("partition_id", "")

{qolsys_controller-0.0.31 → qolsys_controller-0.0.34}/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-0.0.31 → qolsys_controller-0.0.34}/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
@@ -83,13 +91,13 @@ class QolsysSettings:
     def key_size(self) -> int:
         return self._key_size
 
-    @property
-    def mqtt_timeout(self) -> int:
-        return self._mqtt_timeout
+    @mqtt_timeout.setter
+    def mqtt_timeout(self, value: int) -> None:
+        self._mqtt_timeout = value
 
-    @property
-    def mqtt_ping(self) -> int:
-        return self._mqtt_ping
+    @mqtt_ping.setter
+    def mqtt_ping(self, value: int) -> None:
+        self._mqtt_ping = value
 
     @mqtt_ping.setter
     def mqtt_ping(self, ping:int) -> None:

{qolsys_controller-0.0.31 → qolsys_controller-0.0.34}/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-0.0.31 → qolsys_controller-0.0.34}/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-0.0.31 → qolsys_controller-0.0.34}/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-0.0.31 → qolsys_controller-0.0.34}/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.31/.github/workflows/pre-commit.yml

@@ -1,14 +0,0 @@
-name: pre-commit
-
-on:
-  pull_request:
-  push:
-    branches: [main]
-
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3
-    - uses: pre-commit/action@v3.0.1