pyg90alarm 2.5.0__py3-none-any.whl → 2.5.2__py3-none-any.whl

pyg90alarm/__init__.py

@@ -53,6 +53,7 @@ from .local.alarm_phones import G90AlarmPhones
 from .local.net_config import G90NetConfig, G90APNAuth
 from .local.history import G90History
 
+from .dataclass.load_save import DataclassLoadSave
 from .dataclass.validation import (
     get_field_validation_constraints,
 )
@@ -101,4 +102,6 @@ __all__ = [
     'G90History',
     # Dataclass validation
     'get_field_validation_constraints',
+    # Dataclass load/save
+    'DataclassLoadSave',
 ]

pyg90alarm/entities/base_list.py

@@ -68,6 +68,7 @@ class G90BaseList(Generic[T], ABC):
 
         :return: Async generator of entities
         """
+        # Placeholder to satisfy the abstractmethod
         yield cast(T, None)  # pragma: no cover
 
     @property
@@ -118,7 +119,11 @@ class G90BaseList(Generic[T], ABC):
                         )
 
                         existing_entity.update(entity)
-                        non_existing_entities.remove(existing_entity)
+                        # The entity might have already been removed if there
+                        # are duplicate entities from the `_fetch` method,
+                        # protect against that
+                        if existing_entity in non_existing_entities:
+                            non_existing_entities.remove(existing_entity)
 
                         # Invoke the list change callback for the existing
                         # entity to notify about the update

pyg90alarm/exceptions.py

@@ -32,7 +32,7 @@ class G90Error(Exception):
     """
 
 
-class G90TimeoutError(asyncio.TimeoutError):  # pylint:disable=R0903
+class G90TimeoutError(asyncio.TimeoutError, G90Error):
     """
     Raised when particular package class to report an operation (typically
     device command) has timed out.

pyg90alarm/local/host_config.py

@@ -35,6 +35,7 @@ class G90SpeechLanguage(IntEnum):
     """
     Supported speech languages.
     """
+    NONE = 0  # Some panels send the value, exact meaning is unknown
     ENGLISH_FEMALE = 1
     ENGLISH_MALE = 2
     CHINESE_FEMALE = 3

pyg90alarm/local/net_config.py

@@ -73,7 +73,7 @@ class G90NetConfig(DataclassLoadSave):
     # Access Point Name (APN) for GPRS connection, as provided by the cellular
     # operator
     apn_name: str = validated_string_field(
-        min_length=1, max_length=100, trust_initial_value=True
+        min_length=0, max_length=100, trust_initial_value=True
     )
     # User name for APN authentication, as provided by the cellular operator
     apn_user: str = validated_string_field(

{pyg90alarm-2.5.0.dist-info → pyg90alarm-2.5.2.dist-info}/METADATA

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

{pyg90alarm-2.5.0.dist-info → pyg90alarm-2.5.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-pyg90alarm/__init__.py,sha256=-sDi1njCH8ihdEY4zprzwOlkas4IHnc7aqQUg1b3gR0,3617
+pyg90alarm/__init__.py,sha256=ehUcPV8O2jBszU3hPAfI91nXjj2UXIfYjoREvL4QE2c,3719
 pyg90alarm/alarm.py,sha256=BDBVQ8qRa2Bx2-786uytShTw8znlFEWakxweCGvgxME,50130
 pyg90alarm/callback.py,sha256=9PVtjRs2MLn80AgiM-UJNL8ZJF4_PxcopJIpxMmB3vc,4707
 pyg90alarm/const.py,sha256=cpaMlb8rqE1EfvmUEh3Yd_29dNO0usIo_Y-esPBh8B0,8012
 pyg90alarm/event_mapping.py,sha256=hSmRWkkuA5hlauGvYakdOrw8QFt0TMNfUuDQ4J3vHpQ,3438
-pyg90alarm/exceptions.py,sha256=9LleQC2SkJXjv80FlWMeaHs9ZjXxCvZx9UtYdrvejyY,1951
+pyg90alarm/exceptions.py,sha256=9rSd5zIKALHtRHBBLD-R5zxW-5OBkHK04uVupCnAK8s,1937
 pyg90alarm/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/cloud/__init__.py,sha256=u7ZzrIwCsdgmBmgtpCe6c_Kipdo8nG8PEOEcaAHXCxI,1407
 pyg90alarm/cloud/const.py,sha256=FYUxkj0DSI7nnXZHsJMfv8RNQiXKV3TYKGHSdfHdMjg,2113
@@ -19,7 +19,7 @@ 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=vNP0T8qg7lgrES0IBs4zOggQM6Uxyfarfds46bbAnH0,9482
+pyg90alarm/entities/base_list.py,sha256=oyhCszJZuVUeIoDCmMi_1XkQ87HK297_bnbRJBpYLv0,9807
 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=pq4tARSKQC_AJlT_ZaBcqTDtaXKuyo5nz6BqmHohSQk,27649
@@ -31,10 +31,10 @@ pyg90alarm/local/base_cmd.py,sha256=f0PozHJjErIg08vn0sAacHbigJSFor8q5jdxfXiM27c,
 pyg90alarm/local/config.py,sha256=QYetAc6QLrAN8T-37D4Esifvao52w_uJ01nHciLbGME,1390
 pyg90alarm/local/discovery.py,sha256=8YVIXuNe57lhas0VSRf7QXZH83pEDGNj9oehNY4Kh2U,3576
 pyg90alarm/local/history.py,sha256=sL6_Z1BNYkuUwAZUi78d4p5hhcCfsXKw29i4Qu1O60M,10811
-pyg90alarm/local/host_config.py,sha256=KMtrkM7IPm2b38f_kCIVGxYvPOd9ZDoA3nIoT-2SBKg,7376
+pyg90alarm/local/host_config.py,sha256=RSvg2UXPTCzzwDW6Iz3CyFtjxPUzSSdlxRMqGpWA61M,7445
 pyg90alarm/local/host_info.py,sha256=4lFIaFEpYd3EvgNrDJmKijTrzX9i29nFISLLlXGnkmE,2759
 pyg90alarm/local/host_status.py,sha256=WHGtw-A0wHILqVWP4DnZhXj8DPRGyS26AV0bL1isTz4,1863
-pyg90alarm/local/net_config.py,sha256=x-hrisOktdy1ChacCoVBjaOq75KiDJ36nT1JsPGS42g,5453
+pyg90alarm/local/net_config.py,sha256=rK4dcC_kaalLQZcUp7FSOuV0eoj1oclvY7x_6lwYY0k,5453
 pyg90alarm/local/notifications.py,sha256=Vs6NQJciYqDALV-WwzH6wIcTGdX_UD4XBuHWjSOpCDY,4591
 pyg90alarm/local/paginated_cmd.py,sha256=5pPVP8f4ydjgu8Yq6MwqINJAUt52fFlD17wO4AI88Pc,4467
 pyg90alarm/local/paginated_result.py,sha256=p_e8QAVznp1Q5Xi9ifjb9Bx-S3ZiAkVlPKrY6r0bYLs,5483
@@ -43,8 +43,8 @@ pyg90alarm/local/user_data_crc.py,sha256=JQBOPY3RlOgVtvR55R-rM8OuKjYW-BPXQ0W4pi6
 pyg90alarm/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/notifications/base.py,sha256=d3N_zNPa_jcTX4QpA78jdgMHDhmrgwqyM3HdvuO14Jk,16682
 pyg90alarm/notifications/protocol.py,sha256=TlZQ3P8-N-E2X5bzkGefz432x4lBYyIBF9VriwYn9ds,4790
-pyg90alarm-2.5.0.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
-pyg90alarm-2.5.0.dist-info/METADATA,sha256=3PEKVWjqGrheDbXaFgGGApdIMVaF86b9acuQb3dWUB0,12568
-pyg90alarm-2.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyg90alarm-2.5.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
-pyg90alarm-2.5.0.dist-info/RECORD,,
+pyg90alarm-2.5.2.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
+pyg90alarm-2.5.2.dist-info/METADATA,sha256=p4czqnkSngTxWXKDioMg8r2RIfZmFFbDGiQiSjXTAN8,12568
+pyg90alarm-2.5.2.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+pyg90alarm-2.5.2.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
+pyg90alarm-2.5.2.dist-info/RECORD,,

{pyg90alarm-2.5.0.dist-info → pyg90alarm-2.5.2.dist-info}/WHEEL

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