pyg90alarm 2.2.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

pyg90alarm/alarm.py

@@ -566,10 +566,11 @@ class G90Alarm(G90NotificationProtocol):
                 sensor._set_occupancy(False)
                 sensor.state_callback.invoke(sensor.occupancy)
 
+            alert_config_flags = await self.alert_config.flags
             # Determine if door close notifications are available for the given
             # sensor
-            door_close_alert_enabled = await self.alert_config.get_flag(
-                G90AlertConfigFlags.DOOR_CLOSE
+            door_close_alert_enabled = (
+                G90AlertConfigFlags.DOOR_CLOSE in alert_config_flags
             )
             # The condition intentionally doesn't account for cord sensors of
             # subtype door, since those won't send door open/close alerts, only
@@ -587,7 +588,7 @@ class G90Alarm(G90NotificationProtocol):
                               ' closing event will be emulated upon'
                               ' %s seconds',
                               name, sensor.type,
-                              await self.alert_config.flags,
+                              alert_config_flags,
                               self._reset_occupancy_interval)
                 G90Callback.invoke_delayed(
                     self._reset_occupancy_interval,
@@ -1230,6 +1231,7 @@ class G90Alarm(G90NotificationProtocol):
             local_port=notifications_local_port
         )
 
+    # pylint: disable=too-many-positional-arguments
     async def use_cloud_notifications(
         self, cloud_local_host: str = CLOUD_NOTIFICATIONS_HOST,
         cloud_local_port: int = CLOUD_NOTIFICATIONS_PORT,

pyg90alarm/cloud/notifications.py

@@ -69,7 +69,8 @@ class G90CloudNotifications(G90NotificationsBase, asyncio.Protocol):
     :param keep_single_connection: Whether to keep only a single device
      connection
     """
-    # pylint:disable=too-many-arguments
+    # pylint:disable=too-many-positional-arguments,too-many-arguments
+    # pylint:disable=too-many-statements
     def __init__(
         self,
         protocol_factory: Callable[[], G90NotificationProtocol],

pyg90alarm/entities/base_list.py

@@ -68,7 +68,7 @@ class G90BaseList(Generic[T], ABC):
 
         :return: Async generator of entities
         """
-        yield cast(T, None)
+        yield cast(T, None)  # pragma: no cover
 
     @property
     async def entities(self) -> List[T]:
@@ -231,25 +231,30 @@ class G90BaseList(Generic[T], ABC):
         # Collect indexes in use by the existing entities
         occupied_indexes = set(x.index for x in entities)
         # Generate a set of possible indexes from 0 to the maximum index in
-        # use
-        possible_indexes = set(range(0, max(occupied_indexes)))
+        # use, or provide an empty set if there are no existing entities
+        if occupied_indexes:
+            possible_indexes = set(range(0, max(occupied_indexes)))
+        else:
+            # No occupied indexes, so possible_indexes is empty
+            possible_indexes = set()
 
         try:
             # Find the first free index by taking difference between
             # possible indexes and occupied ones, and then taking the minimum
             # value off the difference
             free_idx = min(
-                set(possible_indexes).difference(occupied_indexes)
+                possible_indexes.difference(occupied_indexes)
             )
-            _LOGGER.debug(
-                'Found free index: %s out of occupied indexes: %s',
-                free_idx, occupied_indexes
-            )
-            return free_idx
         except ValueError:
             # If no gaps in existing indexes, then return the index next to
             # the last existing entity
-            return len(entities)
+            free_idx = len(entities)
+
+        _LOGGER.debug(
+            'Found free index=%s out of occupied indexes: %s',
+            free_idx, occupied_indexes
+        )
+        return free_idx
 
     @property
     def list_change_callback(self) -> Optional[ListChangeCallback[T]]:

pyg90alarm/local/base_cmd.py

@@ -59,11 +59,11 @@ class G90BaseCommand(DatagramProtocol):
     # Lock need to be shared across all of the class instances
     _sk_lock = asyncio.Lock()
 
+    # pylint: disable=too-many-positional-arguments,too-many-arguments
     def __init__(self, host: str, port: int, code: G90Commands,
                  data: Optional[G90BaseCommandData] = None,
                  local_port: Optional[int] = None,
                  timeout: float = 3.0, retries: int = 3) -> None:
-        # pylint: disable=too-many-arguments
         self._remote_host = host
         self._remote_port = port
         self._local_port = local_port

pyg90alarm/local/config.py

@@ -22,7 +22,7 @@
 Represents various configuration aspects of the alarm panel.
 """
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 import logging
 from dataclasses import dataclass
 from enum import IntFlag
@@ -79,22 +79,9 @@ class G90AlertConfig:
     Represents alert configuration as received from the alarm panel.
     """
     def __init__(self, parent: G90Alarm) -> None:
-        self._alert_config: Optional[G90AlertConfigData] = None
         self.parent = parent
 
     async def _get(self) -> G90AlertConfigData:
-        """
-        Retrieves the alert configuration flags from the device. Please note
-        the configuration is cached upon first call, so you need to
-        re-instantiate the class to reflect any updates there.
-
-        :return: The alerts configured
-        """
-        if not self._alert_config:
-            self._alert_config = await self._get_uncached()
-        return self._alert_config
-
-    async def _get_uncached(self) -> G90AlertConfigData:
         """
         Retrieves the alert configuration flags directly from the device.
 
@@ -110,22 +97,23 @@ class G90AlertConfig:
         return data
 
     async def set(self, flags: G90AlertConfigFlags) -> None:
+        """
+        .. deprecated:: 2.3.0
+
+        This method is deprecated and will always raise a RuntimeError.
+        Please use :meth:`set_flag` to set individual flags.
+        """
+        raise RuntimeError(
+            'The set() method is deprecated. Please use set_flag() to set'
+            ' individual flags instead.'
+        )
+
+    async def _set(self, flags: G90AlertConfigFlags) -> None:
         """
         Sets the alert configuration flags on the device.
         """
-        # Use uncached method retrieving the alert configuration, to ensure the
-        # actual value retrieved from the device
         _LOGGER.debug('Setting alert configuration to %s', repr(flags))
-        alert_config = await self._get_uncached()
-        if alert_config != self._alert_config:
-            _LOGGER.warning(
-                'Alert configuration changed externally,'
-                ' overwriting (read "%s", will be set to "%s")',
-                repr(alert_config), repr(flags)
-            )
         await self.parent.command(G90Commands.SETNOTICEFLAG, [flags.value])
-        # Update the alert configuration stored
-        (await self._get()).flags = flags
 
     async def get_flag(self, flag: G90AlertConfigFlags) -> bool:
         """
@@ -135,20 +123,31 @@ class G90AlertConfig:
 
     async def set_flag(self, flag: G90AlertConfigFlags, value: bool) -> None:
         """
+        Sets the given flag to the desired value.
+
+        Uses read-modify-write approach.
+
         :param flag: The flag to set
         :param value: The value to set
         """
+        # Retrieve current flags
+        current_flags = await self.flags
         # Skip updating the flag if it has the desired value
-        if await self.get_flag(flag) == value:
+        if (flag in current_flags) == value:
             _LOGGER.debug(
                 'Flag %s already set to %s, skipping update',
                 repr(flag), value
             )
             return
 
-        # Invert corresponding user flag and set it
-        flags = await self.flags ^ flag
-        await self.set(flags)
+        # Set or reset corresponding user flag depending on desired value
+        if value:
+            current_flags |= flag
+        else:
+            current_flags &= ~flag
+
+        # Set the updated flags
+        await self._set(current_flags)
 
     @property
     async def flags(self) -> G90AlertConfigFlags:

pyg90alarm/local/notifications.py

@@ -55,7 +55,8 @@ class G90LocalNotifications(G90NotificationsBase, DatagramProtocol):
     :param local_host: The host on which the local host is listening for
      notifications.
     """
-    def __init__(  # pylint:disable=too-many-arguments
+    # pylint:disable=too-many-positional-arguments,too-many-arguments
+    def __init__(
         self, protocol_factory: Callable[[], G90NotificationProtocol],
         port: int, host: str, local_port: int, local_host: str,
     ):

pyg90alarm/local/paginated_cmd.py

@@ -48,11 +48,11 @@ class G90PaginatedCommand(G90BaseCommand):
     """
     Implements paginated command for alarm panel protocol.
     """
+    # pylint: disable=too-many-positional-arguments,too-many-arguments
     def __init__(
         self, host: str, port: int, code: G90Commands, start: int, end: int,
         **kwargs: Any
     ) -> None:
-        # pylint: disable=too-many-arguments
         self._start = start
         self._end = end
         self._expected_nelems = end - start + 1

pyg90alarm/local/paginated_result.py

@@ -49,11 +49,11 @@ class G90PaginatedResult:
     Processes paginated response from G90 corresponding panel commands.
     """
     # pylint: disable=too-few-public-methods
+    # pylint: disable=too-many-positional-arguments,too-many-arguments
     def __init__(
         self, host: str, port: int, code: G90Commands, start: int = 1,
         end: Optional[int] = None, **kwargs: Any
     ):
-        # pylint: disable=too-many-arguments
         self._host = host
         self._port = port
         self._code = code

{pyg90alarm-2.2.0.dist-info → pyg90alarm-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg90alarm
-Version: 2.2.0
+Version: 2.3.1
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov

{pyg90alarm-2.2.0.dist-info → pyg90alarm-2.3.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyg90alarm/__init__.py,sha256=9RyHo4m46owUxAdPMFOkrr0VSd1lXK9QWyXMQlia7tM,3018
-pyg90alarm/alarm.py,sha256=Lyg1dWNHfUhEzmA_wSzZgR8NUQqK8MvT296L-_bAslY,46939
+pyg90alarm/alarm.py,sha256=Y80AsrC5-s4xfsCnFcVpNPKbIWBZ8yDo_bTCsthL4iM,47033
 pyg90alarm/callback.py,sha256=9PVtjRs2MLn80AgiM-UJNL8ZJF4_PxcopJIpxMmB3vc,4707
 pyg90alarm/const.py,sha256=w2BzsVRDxfdwOb9590zsntGMlVWEH80zbQ4djojft9U,6851
 pyg90alarm/exceptions.py,sha256=9LleQC2SkJXjv80FlWMeaHs9ZjXxCvZx9UtYdrvejyY,1951
@@ -7,7 +7,7 @@ pyg90alarm/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/cloud/__init__.py,sha256=u7ZzrIwCsdgmBmgtpCe6c_Kipdo8nG8PEOEcaAHXCxI,1407
 pyg90alarm/cloud/const.py,sha256=FYUxkj0DSI7nnXZHsJMfv8RNQiXKV3TYKGHSdfHdMjg,2113
 pyg90alarm/cloud/messages.py,sha256=L3cpP3IbDRdw3W6FeQxTPXoDlpUv7Fm4t-RkH9Uj4dg,18032
-pyg90alarm/cloud/notifications.py,sha256=4n0pIpv_TH_9EXZQyqTjNc_AOJPT8DmxlpiPAGz0D1o,15598
+pyg90alarm/cloud/notifications.py,sha256=0RxCBVcvDuwE0I1m3SLDXDQqCJimDcN4f45gr-Hvt1A,15669
 pyg90alarm/cloud/protocol.py,sha256=82l2IXSM12tv_iWkTrAQZ-aw5UR4tmWFQJKVcgBfIww,16159
 pyg90alarm/definitions/__init__.py,sha256=s0NZnkW_gMH718DJbgez28z9WA231CyszUf1O_ojUiI,68
 pyg90alarm/definitions/base.py,sha256=Q2DQXfFks9u-ke65_5xVTqCUXJmJGxBxFTeWnite1bw,6757
@@ -15,28 +15,28 @@ pyg90alarm/definitions/devices.py,sha256=K0DQnyE-1hlhIGwRfZojKJYMSmlJzmyWcZ_98ur
 pyg90alarm/definitions/sensors.py,sha256=bDecBGyUo7wFVNuD5Fu1JNZQHcMDv-234BuNKioaQQs,27426
 pyg90alarm/entities/__init__.py,sha256=hHb6AOiC4Tz--rOWiiICMdLaZDs1Tf_xpWk_HeS_gO4,66
 pyg90alarm/entities/base_entity.py,sha256=hNhhuuwNuir54uVMZzPbjE0N6WL8wKvoW_KZa4R8L8U,2680
-pyg90alarm/entities/base_list.py,sha256=Ot4kd44CUheSvYETjEQBQNT_HaOTWZhKa-4L5pr8LMI,9276
+pyg90alarm/entities/base_list.py,sha256=vNP0T8qg7lgrES0IBs4zOggQM6Uxyfarfds46bbAnH0,9482
 pyg90alarm/entities/device.py,sha256=eWE_N83hiDs5I-TT5F_W0Vb8sVugLldrDc9Lj9sgVLo,3700
 pyg90alarm/entities/device_list.py,sha256=PKnHEazeT3iUEaz70bW1OaWh0wq-7WOY-7dpV4FVCTc,5984
 pyg90alarm/entities/sensor.py,sha256=hunu-X-RhC8Wp52VMeanfqQg8rBSP8TG0qacJiFZEhg,27653
 pyg90alarm/entities/sensor_list.py,sha256=0S88bhTn91O45WgbIIMQ0iXaNjlUWmMBOOFwj2Hg73U,6993
 pyg90alarm/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyg90alarm/local/base_cmd.py,sha256=7n8vRyJ3jPjkTy8WD4GJJojDFuj4chFGj_L-KZQhy0E,10465
-pyg90alarm/local/config.py,sha256=nlcNNxOJ5QAJVzrCCckvjs_iS8J5nOmIENNJXYYJrts,5290
+pyg90alarm/local/base_cmd.py,sha256=f0PozHJjErIg08vn0sAacHbigJSFor8q5jdxfXiM27c,10491
+pyg90alarm/local/config.py,sha256=AYDswfeM1aZImoAr6ZB-4fVIvMuTiNgkF_bLIROVckI,4922
 pyg90alarm/local/discovery.py,sha256=8YVIXuNe57lhas0VSRf7QXZH83pEDGNj9oehNY4Kh2U,3576
 pyg90alarm/local/history.py,sha256=v_deRl62tHeysydyeLRvyHJwcBMnKonsEbXXSXb8XP8,9138
 pyg90alarm/local/host_info.py,sha256=4lFIaFEpYd3EvgNrDJmKijTrzX9i29nFISLLlXGnkmE,2759
 pyg90alarm/local/host_status.py,sha256=WHGtw-A0wHILqVWP4DnZhXj8DPRGyS26AV0bL1isTz4,1863
-pyg90alarm/local/notifications.py,sha256=HAyDQivc1AEtSjNwOWOws_1CP1OirZNI8Gu-3BsSTZg,4558
-pyg90alarm/local/paginated_cmd.py,sha256=bUCtuCYec2pWkufY43sx3gCYE0prysbFY7seegUtkRw,4441
-pyg90alarm/local/paginated_result.py,sha256=knvFKtpswtVnC-1Av5vbVYhL5bue60qKmo4p6FCv0_k,5448
+pyg90alarm/local/notifications.py,sha256=Vs6NQJciYqDALV-WwzH6wIcTGdX_UD4XBuHWjSOpCDY,4591
+pyg90alarm/local/paginated_cmd.py,sha256=5pPVP8f4ydjgu8Yq6MwqINJAUt52fFlD17wO4AI88Pc,4467
+pyg90alarm/local/paginated_result.py,sha256=2tW3kMYkfCoNIhXi0N8acoIAhGhZYIbWdc347CH-Pjg,5474
 pyg90alarm/local/targeted_discovery.py,sha256=Ik2C2VBtVLurf3-RKko4O2R3B6MrmFdOskd457uyASU,5516
 pyg90alarm/local/user_data_crc.py,sha256=JQBOPY3RlOgVtvR55R-rM8OuKjYW-BPXQ0W4pi6CEH0,1689
 pyg90alarm/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/notifications/base.py,sha256=_YX0kL9bqMAOdKBRZ5M-SIrwR4xotnZwgxqWoyEgxAk,16032
 pyg90alarm/notifications/protocol.py,sha256=mvn6hVNopOUgwQy4nWHKp7ydt5r84lsDWCCaWYJjL9Q,4422
-pyg90alarm-2.2.0.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
-pyg90alarm-2.2.0.dist-info/METADATA,sha256=jZSTiPv1k_NLibmwb-CrryWLg-_fajhEpWx3GBA9k2E,12568
-pyg90alarm-2.2.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-pyg90alarm-2.2.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
-pyg90alarm-2.2.0.dist-info/RECORD,,
+pyg90alarm-2.3.1.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
+pyg90alarm-2.3.1.dist-info/METADATA,sha256=2t6egkAMkWvJjEhBAK_4MYn7tlCnuQYq85WQOz0Vtx8,12568
+pyg90alarm-2.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyg90alarm-2.3.1.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
+pyg90alarm-2.3.1.dist-info/RECORD,,

{pyg90alarm-2.2.0.dist-info → pyg90alarm-2.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any