qolsys-controller 0.0.23__tar.gz → 0.0.25__tar.gz

qolsys_controller-0.0.25/.github/workflows/pre-commit.yml

@@ -0,0 +1,14 @@
+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

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/.github/workflows/publish.yml

@@ -1,6 +1,7 @@
     name: Publish Python package to PyPI
 
     on:
+      workflow_dispatch:
       release:
         types: [published]
 

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "qolsys-controller"
-version = "0.0.23"
+version = "0.0.25"
 authors = [
   { name="Eric Hylands", email="" },
 ]
@@ -33,3 +33,5 @@ line-length = 88
 select = ['ALL']
 ignore = ["E501","S608","S311","S104","D100","D101", "D102","D107","ERA001", "FBT001","FBT002", "N802","N806","PERF401"]
 
+[tool.ruff.lint.mccabe]
+max-complexity = 25

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/database/table_dimmerlight.py

@@ -12,7 +12,7 @@ class QolsysTableDimmerLight(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.DimmerLightsContentProvider/dimmerlight"
         self._table = "dimmerlight"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/database/table_doorlock.py

@@ -12,7 +12,7 @@ class QolsysTableDoorLock(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.DoorLocksContentProvider/doorlock"
         self._table = "doorlock"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/database/table_qolsyssettings.py

@@ -12,7 +12,7 @@ class QolsysTableQolsysSettings(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.QolsysSettingsProvider/qolsyssettings"
         self._table = "qolsyssettings"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
 

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/database/table_sensor.py

@@ -40,6 +40,7 @@ class QolsysTableSensor(QolsysTable):
             "zone_supervised",
             "zone_two_way_voice_enabled",
             "zone_reporting_enabled",
+            "zone_feature1",
             "battery_status",
             "created_date",
             "created_by",

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/database/table_weather.py

@@ -12,7 +12,7 @@ class QolsysTableWeather(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.ForecastWeatherContentProvider/weather"
         self._table = "weather"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/database/table_zwave_node.py

@@ -12,7 +12,7 @@ class QolsysTableZwaveNode(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.ZwaveContentProvider/zwave_node"
         self._table = "zwave_node"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/plugin_remote.py

@@ -1,4 +1,5 @@
 import asyncio
+import base64
 import datetime
 import json
 import logging
@@ -192,7 +193,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
                 await self.aiomqtt.__aenter__()
 
-                LOGGER.debug("MQTT: Client Connected")
+                LOGGER.info("MQTT: Client Connected")
 
                 # Subscribe to panel internal databse updates
                 await self.aiomqtt.subscribe("iq2meid")
@@ -200,10 +201,13 @@ class QolsysPluginRemote(QolsysPlugin):
                 # Subscribte to MQTT commands response
                 await self.aiomqtt.subscribe("response_" + self.settings.random_mac, qos=self.settings.mqtt_qos)
 
-                # Only log mastermeid traffic for debug purposes
+                # Subscribe to Z-Wave response
+                await self.aiomqtt.subscribe("ZWAVE_RESPONSE", qos=self.settings.mqtt_qos)
+
+                # Only log all traffic for debug purposes
                 if self.log_mqtt_mesages:
                     # Subscribe to MQTT commands send to panel by other devices
-                    await self.aiomqtt.subscribe("mastermeid", qos=self.settings.mqtt_qos)
+                    #await self.aiomqtt.subscribe("mastermeid", qos=self.settings.mqtt_qos)
 
                     # Subscribe to all topics
                     await self.aiomqtt.subscribe("#", qos=self.settings.mqtt_qos)
@@ -282,6 +286,14 @@ class QolsysPluginRemote(QolsysPlugin):
                     data = json.loads(message.payload.decode())
                     self.panel.parse_iq2meid_message(data)
 
+                # Panel Z-Wave response
+                if message.topic.matches("ZWAVE_RESPONSE"):
+                    data = json.loads(message.payload.decode())
+                    zwave = data.get("ZWAVE_RESPONSE","")
+                    decoded_payload = base64.b64decode(zwave.get("ZWAVE_PAYLOAD","")).hex()
+                    LOGGER.debug("Z-Wave Response: Node(%s) - Status(%s) - Payload(%s)",zwave.get("NODE_ID",""),zwave.get("ZWAVE_COMMAND_STATUS",""),decoded_payload)
+
+
         except aiomqtt.MqttError as err:
             self.connected = False
             self.connected_observer.notify()
@@ -851,6 +863,67 @@ class QolsysPluginRemote(QolsysPlugin):
 
         return True
 
+    async def command_zwave_doorlock_set(self, node_id: int, locked:bool) -> None:
+        LOGGER.debug("MQTT: Sending zwave_doorlock_set command: EXPERIMENTAL")
+        LOGGER.debug("MQTT: Sending zwave_doorlock_set command - Node(%s) - Locked(%s)",node_id,locked)
+
+        command = 68
+
+        # 0 unlocked
+        # 255 lockeck
+        lock_mode = 0
+        if locked:
+            lock_mode = 255
+
+        ipcRequest = [{
+                "dataType": "int",
+                "dataValue": node_id,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [command,lock_mode],
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 106,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [0],
+            },
+        ]
+
+        topic = "mastermeid"
+        eventName = "ipcCall"
+        ipcServiceName = "qzwaveservice"
+        ipcInterfaceName = "android.os.IQZwaveService"
+        ipcTransactionID = 47
+        requestID = str(uuid.uuid4())
+        remoteMacAddress = self.settings.random_mac
+        responseTopic = "response_" + self.settings.random_mac
+
+        payload = {
+            "eventName": eventName,
+            "ipcServiceName": ipcServiceName,
+            "ipcInterfaceName": ipcInterfaceName,
+            "ipcTransactionID": ipcTransactionID,
+            "ipcRequest": ipcRequest,
+            "requestID": requestID,
+            "responseTopic": responseTopic,
+            "remoteMacAddress": remoteMacAddress,
+        }
+
+        await self.send_command(topic, payload, requestID)
+        LOGGER.debug("MQTT: Receiving zwave_doorlock_set command")
+
     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")
@@ -941,14 +1014,16 @@ class QolsysPluginRemote(QolsysPlugin):
         remoteMacAddress = self.settings.random_mac
         responseTopic = "response_" + self.settings.random_mac
 
-        payload = {"eventName": eventName,
-                   "ipcServiceName": ipcServiceName,
-                   "ipcInterfaceName": ipcInterfaceName,
-                   "ipcTransactionID": ipcTransactionID,
-                   "ipcRequest": ipcRequest,
-                   "requestID": requestID,
-                   "responseTopic": responseTopic,
-                   "remoteMacAddress": remoteMacAddress}
+        payload = {
+            "eventName": eventName,
+            "ipcServiceName": ipcServiceName,
+            "ipcInterfaceName": ipcInterfaceName,
+            "ipcTransactionID": ipcTransactionID,
+            "ipcRequest": ipcRequest,
+            "requestID": requestID,
+            "responseTopic": responseTopic,
+            "remoteMacAddress": remoteMacAddress
+        }
 
         await self.send_command(topic, payload, requestID)
         LOGGER.debug("MQTT: Receiving zwave_thermostat_mode_set command")

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/scene.py

@@ -53,7 +53,7 @@ class QolsysScene(QolsysObservable):
         return self._color
 
     @name.setter
-    def name(self, value: str) -> None: 
+    def name(self, value: str) -> None:
         if self._name != value:
             self._name = value
             self.notify()

{qolsys_controller-0.0.23 → qolsys_controller-0.0.25}/qolsys_controller/state.py

@@ -234,8 +234,8 @@ class QolsysState(QolsysObservable):
                             break
 
                         # zwave node_id has changed of node_type, delete and add again
-                        # self.zwave_delete(int(state_zwave.node_id))  # noqa: ERA001
-                        # self.zwave_add(db_zwave)  # noqa: ERA001
+                        # self.zwave_delete(int(state_zwave.node_id))
+                        # self.zwave_add(db_zwave)
 
         # Add new zwave device
         for db_zwave in db_zwaves: