qolsys-controller 0.0.28__py3-none-any.whl → 0.0.51__py3-none-any.whl

qolsys_controller/controller.py

@@ -1,5 +1,10 @@
 #!/usr/bin/env python3
+from __future__ import annotations
+
 import logging
+from typing import TYPE_CHECKING
+
+from qolsys_controller.plugin import QolsysPlugin
 
 from .panel import QolsysPanel
 from .plugin_c4 import QolsysPluginC4
@@ -9,21 +14,27 @@ from .state import QolsysState
 
 LOGGER = logging.getLogger(__name__)
 
+if TYPE_CHECKING:
+    from .plugin import QolsysPlugin
 
 class QolsysController:
 
     def __init__(self) -> None:
 
         # QolsysController Information
-        self.plugin = None
-        self._state = QolsysState()
-        self._settings = QolsysSettings()
-        self._panel = QolsysPanel(settings=self.settings, state=self.state)
+        self._plugin: QolsysPlugin | None = None
+        self._state = QolsysState(self)
+        self._settings = QolsysSettings(self)
+        self._panel = QolsysPanel(self)
 
     @property
     def state(self) -> QolsysState:
         return self._state
 
+    @property
+    def plugin(self) -> QolsysPlugin:
+        return self._plugin
+
     @property
     def panel(self) -> QolsysPanel:
         return self._panel
@@ -38,13 +49,13 @@ class QolsysController:
 
             case "c4":
                 LOGGER.debug("C4 Plugin Selected")
-                self.plugin = QolsysPluginC4(self.state, self.panel, self.settings)
+                self._plugin = QolsysPluginC4(self)
                 return
 
             case "remote":
                 LOGGER.debug("Remote Plugin Selected")
-                self.plugin = QolsysPluginRemote(self.state, self.panel, self.settings)
+                self._plugin = QolsysPluginRemote(self)
                 return
 
             case _:
-                LOGGER.debug("Unknow Plugin Selected")
+                LOGGER.error("Unknow Plugin Selected")

qolsys_controller/database/db.py

@@ -237,6 +237,37 @@ class QolsysDB:
 
         return zones
 
+    def get_weather(self) -> list[dict]:
+        self.cursor.execute(f"SELECT * FROM {self.table_weather.table} ORDER BY _id")
+        self.db.commit()
+
+        weather_list = []
+        columns = [description[0] for description in self.cursor.description]
+        for row in self.cursor.fetchall():
+            row_dict = dict(zip(columns, row, strict=True))
+            weather_list.append(row_dict)
+
+        return weather_list
+
+    def get_powerg(self, short_id: str) -> dict:
+        try:
+            self.cursor.execute(f"SELECT * FROM {self.table_powerg_device.table} WHERE shortID = ?",(short_id,))
+            self.db.commit()
+
+            row = self.cursor.fetchone()
+
+            if row is None:
+                LOGGER.debug("%s value not found", short_id)
+                return None
+
+            columns = [description[0] for description in self.cursor.description]
+            return  dict(zip(columns, row, strict=True))
+
+        except sqlite3.Error:
+            LOGGER.exception("Error getting PowerG device info for shortID %s", short_id)
+            return None
+
+
     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"))

qolsys_controller/database/table.py

@@ -68,6 +68,7 @@ class QolsysTable:
                 raise error from err
 
     def insert(self, data: dict) -> None:
+
         try:
             if not self._implemented and data is not None:
                 LOGGER.warning("New Table format: %s", self.uri)
@@ -92,6 +93,7 @@ class QolsysTable:
 
             col_str = ", ".join(full_data.keys())
             placeholder_str = ", ".join([f":{key}" for key in full_data])
+
             query = f"INSERT OR IGNORE INTO {self.table} ({col_str}) VALUES ({placeholder_str})"
             self._cursor.execute(query, full_data)
             self._db.commit()
@@ -108,12 +110,18 @@ 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()])
+        if selection_argument == "":
+            LOGGER.debug("Update called with empty selection_argument")
+            LOGGER.debug("Table: %s", self.table)
+            LOGGER.debug("Selection: %s", selection)
+            LOGGER.debug("selection_argument: %s", selection_argument)
+            return
 
         # Selection Argument
         # Panel send selection_argument as list in Firmware 4.6.1
@@ -123,6 +131,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()
@@ -145,6 +171,14 @@ class QolsysTable:
         # Firmware 4.4.1: selection_argument: '[3,1]'
         # Firmware 4.6.1: selection_argument: ['3','1']
 
+
+        if selection_argument == "":
+            LOGGER.debug("Delete called with empty selection_argument")
+            LOGGER.debug("Table: %s", self.table)
+            LOGGER.debug("Selection: %s", selection)
+            LOGGER.debug("selection_argument: %s", selection_argument)
+            return
+
         # Selection Argument
         if(type(selection_argument) is not list):
             #Firmware 4.4.1, seletion_argument is sent as a string

qolsys_controller/database/table_doorlock.py

@@ -17,6 +17,7 @@ class QolsysTableDoorLock(QolsysTable):
 
         self._columns = [
             "_id",
+            "capabilities",
             "version",
             "opr",
             "partition_id",

qolsys_controller/database/table_eu_event.py

@@ -13,12 +13,21 @@ class QolsysTableEuEvent(QolsysTable):
         self._uri = "content://com.qolsys.qolsysprovider.EUEventContentProvider/eu_event"
         self._table = "eu_event"
         self._abort_on_error = False
-        self._implemented = False
+        self._implemented = True
 
 
         self._columns = [
             "_id",
+            "version",
+            "opr",
+            "partition_id",
+            "history_id",
+            "device_id",
+            "device",
+            "events",
+            "time",
+            "ack",
+            "type",
         ]
 
         self._create_table()
-

qolsys_controller/database/table_powerg_device.py

@@ -13,11 +13,35 @@ class QolsysTablePowerGDevice(QolsysTable):
         self._uri = "content://com.qolsys.qolsysprovider.PowerGDeviceContentProvider/powerg_device"
         self._table = "powerg_device"
         self._abort_on_error = False
-        self._implemented = False
+        self._implemented = True
 
 
         self._columns = [
             "_id",
+            "avg_link_quality",
+            "battery_voltage",
+            "capabilities",
+            "dealer_code",
+            "extras",
+            "firmware_version",
+            "led",
+            "light",
+            "link_quality",
+            "link_status",
+            "longID",
+            "manufacturing_id",
+            "notification_period",
+            "opr",
+            "parent_node",
+            "partition_id",
+            "radio_id",
+            "radio_version",
+            "shortID",
+            "status_data",
+            "supported_type",
+            "temperature",
+            "version",
+            "writeable_capabilities",
         ]
 
         self._create_table()

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",
@@ -61,6 +62,7 @@ class QolsysTableSensor(QolsysTable):
             "latestdBm",
             "averagedBm",
             "serial_number",
+            "secondary_panel_mac_address",
             "extras",
             "allowspeaker",
         ]

qolsys_controller/database/table_user.py

@@ -39,6 +39,7 @@ class QolsysTableUser(QolsysTable):
             "start_date",
             "tag_flag",
             "check_in_time",
+            "user_feature1",
         ]
 
         self._create_table()

qolsys_controller/database/table_zwave_node.py

@@ -57,6 +57,7 @@ class QolsysTableZwaveNode(QolsysTable):
             "last_rediscover_time",
             "neighbour_info",
             "last_node_test_time",
+            "notification_capabilities",
             "endpoint",
             "endpoint_details",
             "device_wakeup_time",

qolsys_controller/database/table_zwave_other.py

@@ -13,10 +13,23 @@ class QolsysTableZwaveOther(QolsysTable):
         self._uri = "content://com.qolsys.qolsysprovider.ZwaveOtherDeviceContentProvider/zwave_other"
         self._table = "zwave_other"
         self._abort_on_error = False
-        self._implemented = False
+        self._implemented = True
 
         self._columns = [
             "_id",
+            "created_date",
+            "device_name",
+            "device_params_1",
+            "device_params_2",
+            "endpoint",
+            "last_updated_date",
+            "node_id",
+            "node_type",
+            "opr",
+            "paired_status",
+            "partition_id",
+            "status",
+            "version",
         ]
 
         self._create_table()

qolsys_controller/enum.py

@@ -26,6 +26,7 @@ class PartitionAlarmType(StrEnum):
     SILENT_AUXILIARY_EMERGENCY = "Silent Auxiliary Emergency"
     SILENT_POLICE_EMERGENCY = "Silent Police Emergency"
     GLASS_BREAK_AWAY_ONLY = "glassbreakawayonly"
+    GLASS_BREAK = "glassbreak"
 
 class ZoneStatus(StrEnum):
     ALARMED = "Alarmed"
@@ -46,6 +47,7 @@ class ZoneStatus(StrEnum):
 
 class ZoneSensorType(StrEnum):
     DOOR_WINDOW = "Door_Window"
+    DOORBELL = "Doorbell"
     MOTION = "Motion"
     GLASS_BREAK = "GlassBreak"
     KEY_FOB = "KeyFob"
@@ -61,7 +63,6 @@ class ZoneSensorType(StrEnum):
     SHOCK = "Shock"
     FREEZE = "Freeze"
     TILT = "Tilt"
-    DOORBELL = "Doorbell"
     SMOKE_M = "Smoke_M"
     # DOOR_WINDOW_M = "" #TBD
     # OCCUPANCY = ""  #TBD
@@ -72,35 +73,38 @@ class ZoneSensorType(StrEnum):
     BLUETOOTH = "Bluetooth"
     TAKEOVER_MODULE = "TakeoverModule"
     TRANSLATOR = "Translator"
+    TAMPER = "Tamper Sensor"
 
 
 class ZoneSensorGroup(StrEnum):
+    CO = "co"
     FIXED_INTRUSION = "fixedintrusion"
-    MOBILE_INTRUSION = "mobileintrusion"
     FIXED_SILENT = "fixedsilentkey"
+    MOBILE_INTRUSION = "mobileintrusion"
     MOBILE_SILENT = "mobilesilentkey"
     FIXED_AUXILIARY = "fixedmedical"
     FIXED_SILENT_AUXILIARY = "fixedsilentmedical"
+    LOCAL_SAFETY_SENSOR = "localsafety"
     MOBILE_AUXILIARY = "mobilemedical"
     MOBILE_SILENT_AUXILIARY = "mobilesilentmedical"
     SAFETY_MOTION = "safetymotion"
     GLASS_BREAK = "glassbreak"
     GLASS_BREAK_AWAY_ONLY = "glassbreakawayonly"
+    SMOKE_HEAT = "smoke_heat"
+    TAMPER_ZONE = "tamperzone"
+    SHOCK = "shock"
 
     # ENTRY_EXIT_NORMAL_DELAY = "" #TBD
     # ENTRY_EXIT_LONG_DELAY = "" #TBD
     # INSTANT_PERIMETER_DW = "" #TBD
     # INSTRANT_INTERIOR_DOOR = "" #TBD
     # AWAY_INSTANT_FOLLOWER_DELAY = "" #TBD
-    # LOCAL_SAFETY_SENSOR = "" #TBD
     # REPORTING_SAFETY_SENSOR = "" #TBD
     # DELAYED_REPORTING_SAFETY_SENSOR = "" #TBD
     # AWAY_INSTANT_MOTION = "" #TBD
     # 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/enum_zwave.py

@@ -34,4 +34,3 @@ class ThermostatFanMode(Enum):
     QUIET: 0x0400
     EXTERNAL_CIRCULATION: 0x0800
     MANUFACTURER_SPECEFIC: 0x1000
-

qolsys_controller/mdns.py

@@ -6,9 +6,14 @@ from zeroconf.asyncio import AsyncZeroconf
 
 class QolsysMDNS:
 
-    def __init__(self, ip: str, port: int) -> None:
-
-        self.azc = AsyncZeroconf()
+    def __init__(self, ip: str, port: int, external_zero_conf: AsyncZeroconf | None = None) -> None:
+
+        # Add possible external zeroconf instance provided by Home Assistant by example
+        # If no external instance is provided, create our own
+        if external_zero_conf:
+            self.azc = external_zero_conf
+        else:
+            self.azc = AsyncZeroconf()
 
         self.mdns_info = ServiceInfo(
             "_http._tcp.local.",