aioesphomeapi 45.2.2__tar.gz → 45.3.1__tar.gz

{aioesphomeapi-45.2.2/aioesphomeapi.egg-info → aioesphomeapi-45.3.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: aioesphomeapi
-Version: 45.2.2
+Version: 45.3.1
 Summary: Python API for interacting with ESPHome devices.
 Home-page: https://esphome.io/
-Download-URL: https://github.com/esphome/aioesphomeapi/archive/45.2.2.zip
+Download-URL: https://github.com/esphome/aioesphomeapi/archive/45.3.1.zip
 Author: Otto Winter
 Author-email: esphome@nabucasa.com
 License: MIT
@@ -12,7 +12,7 @@ License-File: LICENSE
 Requires-Dist: aiohappyeyeballs>=2.6.2
 Requires-Dist: async-interrupt>=1.2.2
 Requires-Dist: protobuf<8,>=6
-Requires-Dist: tzdata>=2024.2
+Requires-Dist: tzdata>=2026.2
 Requires-Dist: tzlocal<6,>=5.3.1
 Requires-Dist: zeroconf<2.0,>=0.149.16
 Requires-Dist: chacha20poly1305-reuseable>=0.13.2

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/aioesphomeapi/client.py

@@ -859,7 +859,7 @@ class APIClient(APIClientBase):
         """Set the Bluetooth scanner mode."""
         self._get_connection().send_message(BluetoothScannerSetModeRequest(mode=mode))
 
-    async def bluetooth_device_connect(  # noqa: C901  # pylint: disable=too-many-locals, too-many-branches
+    async def bluetooth_device_connect(  # noqa: C901  # pylint: disable=too-many-locals
         self,
         address: int,
         on_bluetooth_connection_state: Callable[[bool, int, int], None],
@@ -923,22 +923,16 @@ class APIClient(APIClientBase):
         timeout_handle = loop.call_at(
             loop.time() + timeout, handle_timeout, connect_future
         )
-        timeout_expired = False
-        connect_ok = False
-        unhandled_exception = False
         try:
             await connect_future
-            connect_ok = True
         except TimeoutError as err:
-            # If the timeout expires, make sure
-            # to unsub before calling _bluetooth_device_disconnect_guard_timeout
-            # so that the disconnect message is not propagated back to the caller
-            # since we are going to raise a TimeoutAPIError.
+            # Unsub before disconnecting so the disconnect message is not
+            # propagated back to the caller — we are going to raise a
+            # TimeoutAPIError instead.
             unsub()
-            timeout_expired = True
-            # Disconnect before raising the exception to ensure
-            # the slot is recovered before the timeout is raised
-            # to avoid race were we run out even though we have a slot.
+            # Disconnect before raising the exception so the slot is
+            # recovered before the timeout is raised, avoiding a race
+            # where we run out of slots even though we have one.
             addr = to_human_readable_address(address)
             if self._debug_enabled:
                 _LOGGER.debug("%s: Connecting timed out, waiting for disconnect", addr)
@@ -954,13 +948,14 @@ class APIClient(APIClientBase):
             )
             raise TimeoutAPIError(msg) from err
         except asyncio.CancelledError:
-            unhandled_exception = True
-            # Distinguish an outside cancellation of our task from
-            # a cancellation of the connect_future itself. If the
-            # current task is not actually being cancelled, convert
-            # the CancelledError into an APIConnectionError so that
-            # callers (and their retry logic) can handle it as a
-            # normal connection failure instead of aborting.
+            unsub()
+            self._bluetooth_disconnect_no_wait(address)
+            # Distinguish an outside cancellation of our task from a
+            # cancellation of the connect_future itself. If the current
+            # task is not actually being cancelled, convert the
+            # CancelledError into an APIConnectionError so callers (and
+            # their retry logic) can treat it as a normal connection
+            # failure instead of aborting.
             current_task = asyncio.current_task()
             if current_task is None or not current_task.cancelling():
                 addr = to_human_readable_address(address)
@@ -968,17 +963,11 @@ class APIClient(APIClientBase):
                 raise APIConnectionError(msg) from None
             raise
         except BaseException:
-            unhandled_exception = True
+            unsub()
+            self._bluetooth_disconnect_no_wait(address)
             raise
         finally:
-            if unhandled_exception or (not connect_ok and not timeout_expired):
-                unsub()
-            if not timeout_expired:
-                timeout_handle.cancel()
-            if unhandled_exception:
-                # Make sure to disconnect if we had an unhandled exception
-                # as otherwise the connection will be left open.
-                self._bluetooth_disconnect_no_wait(address)
+            timeout_handle.cancel()
 
         return unsub
 

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/aioesphomeapi/client_base.py

@@ -166,14 +166,7 @@ def on_bluetooth_gatt_notify_data_response(
 ) -> None:
     """Handle a BluetoothGATTNotifyDataResponse message."""
     if address == msg.address and handle == msg.handle:
-        try:
-            on_bluetooth_gatt_notify(handle, bytearray(msg.data))
-        except Exception:
-            _LOGGER.exception(
-                "Unexpected error in Bluetooth GATT notify callback for address %s, handle %s",
-                address,
-                handle,
-            )
+        on_bluetooth_gatt_notify(handle, bytearray(msg.data))
 
 
 def on_bluetooth_scanner_state_response(

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/aioesphomeapi/connection.py

@@ -1121,7 +1121,19 @@ class APIConnection:
             # type.
             handlers_copy = handlers.copy()
             for handler in handlers_copy:
-                handler(msg)
+                # Isolate user-callback exceptions so a buggy
+                # handler does not propagate through asyncio's
+                # data_received path and tear the whole session
+                # down. See issue #1755.
+                try:
+                    handler(msg)
+                except Exception:
+                    _LOGGER.exception(
+                        "%s: Unexpected error in message handler %r for %s",
+                        self.log_name,
+                        handler,
+                        type(msg).__name__,
+                    )
             return
 
         # Most common case, only one handler:
@@ -1130,7 +1142,15 @@ class APIConnection:
         # only one handler because Cython will
         # poorly optimize next(iter(handlers))
         for handler in handlers:
-            handler(msg)
+            try:
+                handler(msg)
+            except Exception:
+                _LOGGER.exception(
+                    "%s: Unexpected error in message handler %r for %s",
+                    self.log_name,
+                    handler,
+                    type(msg).__name__,
+                )
             break
 
     def _register_internal_message_handlers(self) -> None:

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/aioesphomeapi/model.py

@@ -84,6 +84,12 @@ class APIModelBase:
     def from_pb(cls, data: Any) -> Self:
         return cls(**{f.name: getattr(data, f.name) for f in cached_fields(cls)})  # type: ignore[arg-type]
 
+    @classmethod
+    def convert_list(cls, value: list[Any]) -> list[Self]:
+        return [
+            cls.from_dict(x) if isinstance(x, dict) else cls.from_pb(x) for x in value
+        ]
+
 
 def converter_field(*, converter: Callable[[Any], _V], **kwargs: Any) -> _V:
     metadata = kwargs.pop("metadata", {})
@@ -185,16 +191,6 @@ class AreaInfo(APIModelBase):
     area_id: int = 0
     name: str = ""
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[AreaInfo]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(AreaInfo.from_dict(x))
-            else:
-                ret.append(AreaInfo.from_pb(x))
-        return ret
-
     @classmethod
     def convert(cls, value: Any) -> AreaInfo:
         if isinstance(value, dict):
@@ -208,16 +204,6 @@ class SubDeviceInfo(APIModelBase):
     name: str = ""
     area_id: int = 0
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[SubDeviceInfo]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(SubDeviceInfo.from_dict(x))
-            else:
-                ret.append(SubDeviceInfo.from_pb(x))
-        return ret
-
 
 class SerialProxyPortType(APIIntEnum):
     TTL = 0
@@ -232,16 +218,6 @@ class SerialProxyInfo(APIModelBase):
         default=SerialProxyPortType.TTL, converter=SerialProxyPortType.convert
     )
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[SerialProxyInfo]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(SerialProxyInfo.from_dict(x))
-            else:
-                ret.append(SerialProxyInfo.from_pb(x))
-        return ret
-
 
 @_frozen_dataclass_decorator
 class DeviceInfo(APIModelBase):
@@ -1061,16 +1037,6 @@ class MediaPlayerSupportedFormat(APIModelBase):
     )
     sample_bytes: int = 0
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[MediaPlayerSupportedFormat]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(MediaPlayerSupportedFormat.from_dict(x))
-            else:
-                ret.append(MediaPlayerSupportedFormat.from_pb(x))
-        return ret
-
 
 @_frozen_dataclass_decorator
 class MediaPlayerInfo(EntityInfo):
@@ -1668,16 +1634,6 @@ class BluetoothGATTDescriptor(APIModelBase):
             data["uuid"] = _join_split_uuid(data["uuid"])
         return APIModelBase.from_dict.__func__(cls, data, ignore_missing=ignore_missing)  # type: ignore[attr-defined, no-any-return]
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[BluetoothGATTDescriptor]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(cls.from_dict(x))
-            else:
-                ret.append(cls.from_pb(x))
-        return ret
-
 
 @_frozen_dataclass_decorator
 class BluetoothGATTCharacteristic(APIModelBase):
@@ -1713,16 +1669,6 @@ class BluetoothGATTCharacteristic(APIModelBase):
             data["uuid"] = _join_split_uuid(data["uuid"])
         return APIModelBase.from_dict.__func__(cls, data, ignore_missing=ignore_missing)  # type: ignore[attr-defined, no-any-return]
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[BluetoothGATTCharacteristic]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(cls.from_dict(x))
-            else:
-                ret.append(cls.from_pb(x))
-        return ret
-
 
 @_frozen_dataclass_decorator
 class BluetoothGATTService(APIModelBase):
@@ -1757,16 +1703,6 @@ class BluetoothGATTService(APIModelBase):
             data["uuid"] = _join_split_uuid(data["uuid"])
         return APIModelBase.from_dict.__func__(cls, data, ignore_missing=ignore_missing)  # type: ignore[attr-defined, no-any-return]
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[BluetoothGATTService]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(cls.from_dict(x))
-            else:
-                ret.append(cls.from_pb(x))
-        return ret
-
 
 @_frozen_dataclass_decorator
 class BluetoothGATTServices(APIModelBase):
@@ -1877,16 +1813,6 @@ class VoiceAssistantWakeWord(APIModelBase):
     wake_word: str
     trained_languages: list[str]
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[VoiceAssistantWakeWord]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(VoiceAssistantWakeWord.from_dict(x))
-            else:
-                ret.append(VoiceAssistantWakeWord.from_pb(x))
-        return ret
-
 
 @_frozen_dataclass_decorator
 class VoiceAssistantExternalWakeWord(APIModelBase):
@@ -1898,16 +1824,6 @@ class VoiceAssistantExternalWakeWord(APIModelBase):
     model_hash: str
     url: str
 
-    @classmethod
-    def convert_list(cls, value: list[Any]) -> list[VoiceAssistantExternalWakeWord]:
-        ret = []
-        for x in value:
-            if isinstance(x, dict):
-                ret.append(VoiceAssistantExternalWakeWord.from_dict(x))
-            else:
-                ret.append(VoiceAssistantExternalWakeWord.from_pb(x))
-        return ret
-
 
 @_frozen_dataclass_decorator
 class VoiceAssistantConfigurationResponse(APIModelBase):
@@ -2066,3 +1982,161 @@ def build_unique_id(
 
 def message_types_to_names(msg_types: Iterable[type[message.Message]]) -> str:
     return ", ".join(t.__name__ for t in msg_types)
+
+
+__all__ = (
+    "COMPONENT_TYPE_TO_INFO",
+    "APIIntEnum",
+    "APIModelBase",
+    "APIVersion",
+    "AlarmControlPanelCommand",
+    "AlarmControlPanelEntityFeature",
+    "AlarmControlPanelEntityState",
+    "AlarmControlPanelInfo",
+    "AlarmControlPanelState",
+    "AreaInfo",
+    "BinarySensorInfo",
+    "BinarySensorState",
+    "BluetoothConnectionsFree",
+    "BluetoothDeviceClearCache",
+    "BluetoothDeviceConnection",
+    "BluetoothDevicePairing",
+    "BluetoothDeviceRequestType",
+    "BluetoothDeviceUnpairing",
+    "BluetoothGATTCharacteristic",
+    "BluetoothGATTDescriptor",
+    "BluetoothGATTError",
+    "BluetoothGATTRead",
+    "BluetoothGATTService",
+    "BluetoothGATTServices",
+    "BluetoothLEAdvertisement",
+    "BluetoothProxyFeature",
+    "BluetoothProxySubscriptionFlag",
+    "BluetoothScannerMode",
+    "BluetoothScannerState",
+    "BluetoothScannerStateResponse",
+    "ButtonInfo",
+    "CameraInfo",
+    "CameraState",
+    "ClimateAction",
+    "ClimateFanMode",
+    "ClimateFeature",
+    "ClimateInfo",
+    "ClimateMode",
+    "ClimatePreset",
+    "ClimateState",
+    "ClimateSwingMode",
+    "ColorMode",
+    "CommandProtoMessage",
+    "CoverInfo",
+    "CoverOperation",
+    "CoverState",
+    "DateInfo",
+    "DateState",
+    "DateTimeInfo",
+    "DateTimeState",
+    "DeviceInfo",
+    "ESPHomeBluetoothGATTServices",
+    "EntityCategory",
+    "EntityInfo",
+    "EntityState",
+    "Event",
+    "EventInfo",
+    "ExecuteServiceResponse",
+    "FanDirection",
+    "FanInfo",
+    "FanSpeed",
+    "FanState",
+    "HomeassistantActionResponse",
+    "HomeassistantServiceCall",
+    "InfraredCapability",
+    "InfraredInfo",
+    "InfraredRFReceiveEvent",
+    "LastResetType",
+    "LegacyCoverCommand",
+    "LegacyCoverState",
+    "LightColorCapability",
+    "LightInfo",
+    "LightState",
+    "LockCommand",
+    "LockEntityState",
+    "LockInfo",
+    "LockState",
+    "LogLevel",
+    "MediaPlayerCommand",
+    "MediaPlayerEntityFeature",
+    "MediaPlayerEntityState",
+    "MediaPlayerFormatPurpose",
+    "MediaPlayerInfo",
+    "MediaPlayerState",
+    "MediaPlayerSupportedFormat",
+    "NoiseEncryptionSetKeyRequest",
+    "NoiseEncryptionSetKeyResponse",
+    "NumberInfo",
+    "NumberMode",
+    "NumberState",
+    "RadioFrequencyCapability",
+    "RadioFrequencyInfo",
+    "RadioFrequencyModulation",
+    "SelectInfo",
+    "SelectState",
+    "SensorInfo",
+    "SensorState",
+    "SensorStateClass",
+    "SerialProxyDataReceived",
+    "SerialProxyInfo",
+    "SerialProxyModemPins",
+    "SerialProxyParity",
+    "SerialProxyPortType",
+    "SerialProxyRequestResponse",
+    "SerialProxyRequestType",
+    "SerialProxyStatus",
+    "SirenInfo",
+    "SirenState",
+    "SubDeviceInfo",
+    "SupportsResponseType",
+    "SwitchInfo",
+    "SwitchState",
+    "TemperatureUnit",
+    "TextInfo",
+    "TextMode",
+    "TextSensorInfo",
+    "TextSensorState",
+    "TextState",
+    "TimeInfo",
+    "TimeState",
+    "UpdateCommand",
+    "UpdateInfo",
+    "UpdateState",
+    "UserService",
+    "UserServiceArg",
+    "UserServiceArgType",
+    "ValveInfo",
+    "ValveOperation",
+    "ValveState",
+    "VoiceAssistantAnnounceFinished",
+    "VoiceAssistantAudioData",
+    "VoiceAssistantAudioSettings",
+    "VoiceAssistantCommand",
+    "VoiceAssistantCommandFlag",
+    "VoiceAssistantConfigurationRequest",
+    "VoiceAssistantConfigurationResponse",
+    "VoiceAssistantEventType",
+    "VoiceAssistantExternalWakeWord",
+    "VoiceAssistantFeature",
+    "VoiceAssistantSetConfiguration",
+    "VoiceAssistantSubscriptionFlag",
+    "VoiceAssistantTimerEventType",
+    "VoiceAssistantWakeWord",
+    "WaterHeaterCommandField",
+    "WaterHeaterFeature",
+    "WaterHeaterInfo",
+    "WaterHeaterMode",
+    "WaterHeaterState",
+    "WaterHeaterStateFlag",
+    "ZWaveProxyFeature",
+    "ZWaveProxyFrame",
+    "ZWaveProxyRequest",
+    "ZWaveProxyRequestType",
+    "build_unique_id",
+)

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/aioesphomeapi/timezone.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-from functools import cache
+from functools import cache, lru_cache
 from importlib import resources
 import logging
 
@@ -71,6 +71,7 @@ def _get_local_timezone() -> str:
         return ""
 
 
+@lru_cache(maxsize=64)
 def iana_to_posix_tz(iana_key: str) -> str:
     """Convert IANA timezone key to POSIX TZ string.
 
@@ -115,12 +116,7 @@ async def get_timezone(iana_key: str | None) -> str:
         Returns empty string if timezone cannot be determined.
 
     """
-    if iana_key:
-
-        @singleton(f"get_timezone_{iana_key}")
-        async def _get_iana_timezone() -> str:
-            loop = asyncio.get_running_loop()
-            return await loop.run_in_executor(None, iana_to_posix_tz, iana_key)
-
-        return await _get_iana_timezone()
-    return await get_local_timezone()
+    if not iana_key:
+        return await get_local_timezone()
+    loop = asyncio.get_running_loop()
+    return await loop.run_in_executor(None, iana_to_posix_tz, iana_key)

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1/aioesphomeapi.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: aioesphomeapi
-Version: 45.2.2
+Version: 45.3.1
 Summary: Python API for interacting with ESPHome devices.
 Home-page: https://esphome.io/
-Download-URL: https://github.com/esphome/aioesphomeapi/archive/45.2.2.zip
+Download-URL: https://github.com/esphome/aioesphomeapi/archive/45.3.1.zip
 Author: Otto Winter
 Author-email: esphome@nabucasa.com
 License: MIT
@@ -12,7 +12,7 @@ License-File: LICENSE
 Requires-Dist: aiohappyeyeballs>=2.6.2
 Requires-Dist: async-interrupt>=1.2.2
 Requires-Dist: protobuf<8,>=6
-Requires-Dist: tzdata>=2024.2
+Requires-Dist: tzdata>=2026.2
 Requires-Dist: tzlocal<6,>=5.3.1
 Requires-Dist: zeroconf<2.0,>=0.149.16
 Requires-Dist: chacha20poly1305-reuseable>=0.13.2

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/aioesphomeapi.egg-info/SOURCES.txt

@@ -61,6 +61,7 @@ tests/test_model_conversions.py
 tests/test_object_id.py
 tests/test_posix_tz.py
 tests/test_provide_time.py
+tests/test_public_api.py
 tests/test_reconnect_logic.py
 tests/test_singleton.py
 tests/test_state_log_formatter.py

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/aioesphomeapi.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiohappyeyeballs>=2.6.2
 async-interrupt>=1.2.2
 protobuf<8,>=6
-tzdata>=2024.2
+tzdata>=2026.2
 tzlocal<6,>=5.3.1
 zeroconf<2.0,>=0.149.16
 chacha20poly1305-reuseable>=0.13.2

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/pyproject.toml

@@ -128,7 +128,7 @@ combine-as-imports = true
 split-on-trailing-comma = false
 
 [build-system]
-requires = ['setuptools>=82.0.1', 'wheel', 'Cython>=3.2.4']
+requires = ['setuptools>=82.0.1', 'wheel', 'Cython>=3.2.5']
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/requirements/base.txt

@@ -1,7 +1,7 @@
 aiohappyeyeballs>=2.6.2
 async-interrupt>=1.2.2
 protobuf>=6,<8
-tzdata>=2024.2
+tzdata>=2026.2
 tzlocal>=5.3.1,<6
 zeroconf>=0.149.16,<2.0
 chacha20poly1305-reuseable>=0.13.2

{aioesphomeapi-45.2.2 → aioesphomeapi-45.3.1}/setup.py

@@ -42,7 +42,7 @@ with (here / "README.rst").open(encoding="utf-8") as readme_file:
     long_description = readme_file.read()
 
 
-VERSION = "45.2.2"
+VERSION = "45.3.1"
 PROJECT_NAME = "aioesphomeapi"
 PROJECT_PACKAGE_NAME = "aioesphomeapi"
 PROJECT_LICENSE = "MIT"