aiocomfoconnect 0.2.0__tar.gz → 0.3.0__tar.gz

{aiocomfoconnect-0.2.0 → aiocomfoconnect-0.3.0}/PKG-INFO

@@ -1,17 +1,15 @@
 Metadata-Version: 2.4
 Name: aiocomfoconnect
-Version: 0.2.0
+Version: 0.3.0
 Summary: aiocomfoconnect is an asyncio Python 3 library for communicating with a Zehnder ComfoAir Q350/450/600 ventilation system
 License-File: LICENSE
 Author: Michaël Arnauts
 Author-email: michael.arnauts@gmail.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.13,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: aiohttp (>=3.8.0,<4.0.0)
 Requires-Dist: protobuf (>=6.31,<8)
 Project-URL: Homepage, https://github.com/michaelarnauts/aiocomfoconnect
@@ -24,7 +22,7 @@ Description-Content-Type: text/markdown
 
 The [home-assistant-comfoconnect](https://github.com/michaelarnauts/home-assistant-comfoconnect) is using this library.
 
-It's compatible with Python 3.10 and higher.
+It's compatible with Python 3.13 and higher.
 
 ## Installation
 
@@ -65,7 +63,7 @@ $ python -m aiocomfoconnect get-property --host 192.168.1.213 1 1 8 9  # Unit 0x
 - `async register_sensor(sensor)`: Register a sensor.
 - `async deregister_sensor(sensor)`: Deregister a sensor.
 - `async get_mode()`: Get the ventilation mode.
-- `async set_mode(mode)`: Set the ventilation mode. (auto / manual)
+- `async set_mode(mode)`: Set the ventilation mode. (auto / manual) Selecting `auto` also cancels the temporary fan-speed override and returns control to the unit's schedule.
 - `async get_comfocool_mode()`: Get Comfocool mode
 - `async set_comfocool_mode()`: Set Comfocool mode. (auto / off)
 - `async get_speed()`: Get the ventilation speed.

{aiocomfoconnect-0.2.0 → aiocomfoconnect-0.3.0}/README.md

@@ -5,7 +5,7 @@
 
 The [home-assistant-comfoconnect](https://github.com/michaelarnauts/home-assistant-comfoconnect) is using this library.
 
-It's compatible with Python 3.10 and higher.
+It's compatible with Python 3.13 and higher.
 
 ## Installation
 
@@ -46,7 +46,7 @@ $ python -m aiocomfoconnect get-property --host 192.168.1.213 1 1 8 9  # Unit 0x
 - `async register_sensor(sensor)`: Register a sensor.
 - `async deregister_sensor(sensor)`: Deregister a sensor.
 - `async get_mode()`: Get the ventilation mode.
-- `async set_mode(mode)`: Set the ventilation mode. (auto / manual)
+- `async set_mode(mode)`: Set the ventilation mode. (auto / manual) Selecting `auto` also cancels the temporary fan-speed override and returns control to the unit's schedule.
 - `async get_comfocool_mode()`: Get Comfocool mode
 - `async set_comfocool_mode()`: Set Comfocool mode. (auto / off)
 - `async get_speed()`: Get the ventilation speed.

{aiocomfoconnect-0.2.0 → aiocomfoconnect-0.3.0}/aiocomfoconnect/bridge.py

@@ -13,9 +13,10 @@ from typing import Awaitable, Callable, Dict, Iterator, Optional, Set
 from google.protobuf.message import DecodeError
 from google.protobuf.message import Message as ProtobufMessage
 
-from .const import VENTILATION_UNIT_PRODUCT_IDS
+from .const import VENTILATION_UNIT_PRODUCT_IDS, PdoType
 from .exceptions import (
     AioComfoConnectNotConnected,
+    AioComfoConnectNotReachable,
     AioComfoConnectTimeout,
     ComfoConnectBadRequest,
     ComfoConnectError,
@@ -133,6 +134,7 @@ class Bridge:
         self._ventilation_node_found: Optional[asyncio.Event] = None
 
         self.__sensor_callback_fn: Optional[Callable[[int, int], None]] = None
+        self._sensor_pdo_types: Dict[int, int] = {}
         self.__alarm_callback_fn: Optional[Callable[[int, ProtobufMessage], None]] = None
 
         self._loop: Optional[asyncio.AbstractEventLoop] = loop
@@ -189,8 +191,13 @@ class Bridge:
         try:
             self._reader, self._writer = await asyncio.wait_for(asyncio.open_connection(self.host, self.PORT), TIMEOUT)
         except asyncio.TimeoutError as exc:
+            # Keep this before OSError, since TimeoutError is a subclass of it.
             _LOGGER.warning("Timeout while connecting to bridge %s", self.host)
             raise AioComfoConnectTimeout("Timeout while connecting to bridge") from exc
+        except OSError as exc:
+            # The bridge refused the connection, is gone from the network, or its hostname doesn't resolve.
+            _LOGGER.warning("Could not connect to bridge %s: %s", self.host, exc)
+            raise AioComfoConnectNotReachable(f"Could not connect to bridge: {exc}") from exc
 
         self._reference = itertools.count(1)
         self._local_uuid = uuid
@@ -418,7 +425,9 @@ class Bridge:
             # pylint: disable=no-member
             if message.cmd.type == zehnder_pb2.GatewayOperation.CnRpdoNotificationType:
                 if self.__sensor_callback_fn:
-                    self.__sensor_callback_fn(message.msg.pdid, int.from_bytes(message.msg.data, byteorder="little", signed=True))
+                    pdo_type = self._sensor_pdo_types.get(message.msg.pdid)
+                    signed = pdo_type not in (PdoType.TYPE_CN_UINT8, PdoType.TYPE_CN_UINT16, PdoType.TYPE_CN_UINT32)
+                    self.__sensor_callback_fn(message.msg.pdid, int.from_bytes(message.msg.data, byteorder="little", signed=signed))
                 else:
                     _LOGGER.info("Unhandled CnRpdoNotificationType since no callback is registered.")
 
@@ -566,6 +575,8 @@ class Bridge:
     def cmd_rpdo_request(self, pdid: int, pdo_type: int = 1, zone: int = 1, timeout=None) -> Awaitable[Message]:
         """Register a RPDO request."""
         _LOGGER.debug("CnRpdoRequest")
+        # Notifications can arrive before the subscription acknowledgement.
+        self._sensor_pdo_types[pdid] = pdo_type
         # pylint: disable=no-member
         return self._send(
             zehnder_pb2.CnRpdoRequest,

{aiocomfoconnect-0.2.0 → aiocomfoconnect-0.3.0}/aiocomfoconnect/comfoconnect.py

@@ -31,6 +31,7 @@ from aiocomfoconnect.const import (
 )
 from aiocomfoconnect.exceptions import (
     AioComfoConnectNotConnected,
+    AioComfoConnectNotReachable,
     AioComfoConnectTimeout,
     ComfoConnectNotAllowed,
     VentilationUnitNotFoundException,
@@ -180,6 +181,10 @@ class ComfoConnect(Bridge):
                 _LOGGER.warning("Connection timeout, retrying in 5 seconds...")
                 await asyncio.sleep(5)
 
+            except AioComfoConnectNotReachable as exc:
+                _LOGGER.warning("%s. Retrying in 5 seconds...", exc)
+                await asyncio.sleep(5)
+
             except VentilationUnitNotFoundException as exc:
                 _LOGGER.warning("%s, retrying in 5 seconds...", exc)
                 await asyncio.sleep(5)
@@ -296,9 +301,14 @@ class ComfoConnect(Bridge):
 
         self._sensors_values[sensor_id] = sensor_value
 
-        # Don't emit sensor values until we have received all the initial values.
+        # The bridge sends invalid (zero) values right after we subscribe to a sensor, so we hold them back.
+        # A non-zero value is a real value, so we can release the hold and emit it right away.
         if sensor_id in self._sensor_holds:
-            return
+            if not sensor_value:
+                return
+
+            _LOGGER.debug("Got a valid value for sensor %s, releasing the hold", sensor_id)
+            self._sensor_holds.pop(sensor_id).cancel()
 
         if sensor.value_fn:
             val = sensor.value_fn(sensor_value)
@@ -330,9 +340,10 @@ class ComfoConnect(Bridge):
         return VentilationMode.MANUAL if mode == 1 else VentilationMode.AUTO
 
     async def set_mode(self, mode: Literal["auto", "manual"]):
-        """Set the ventilation mode (auto / manual)."""
+        """Set ventilation mode, cancelling the temporary speed override for auto."""
         if mode == VentilationMode.AUTO:
             await self.cmd_rmi_request(bytes([0x85, UNIT_SCHEDULE, SUBUNIT_08, 0x01]))
+            await self.cmd_rmi_request(bytes([0x85, UNIT_SCHEDULE, SUBUNIT_01, 0x01]))
         elif mode == VentilationMode.MANUAL:
             await self.cmd_rmi_request(bytes([0x84, UNIT_SCHEDULE, SUBUNIT_08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01]))
         else:

{aiocomfoconnect-0.2.0 → aiocomfoconnect-0.3.0}/aiocomfoconnect/exceptions.py

@@ -50,6 +50,10 @@ class AioComfoConnectTimeout(Exception):
     """An error occurred because the bridge didn't reply in time."""
 
 
+class AioComfoConnectNotReachable(Exception):
+    """An error occurred because the bridge could not be reached, for example when it moved to another address."""
+
+
 class BridgeNotFoundException(Exception):
     """Exception raised when no bridge is found."""
 

{aiocomfoconnect-0.2.0 → aiocomfoconnect-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aiocomfoconnect"
-version = "0.2.0"
+version = "0.3.0"
 description = "aiocomfoconnect is an asyncio Python 3 library for communicating with a Zehnder ComfoAir Q350/450/600 ventilation system"
 authors = ["Michaël Arnauts <michael.arnauts@gmail.com>"]
 readme = "README.md"
@@ -10,7 +10,7 @@ homepage = "https://github.com/michaelarnauts/aiocomfoconnect"
 aiocomfoconnect = "aiocomfoconnect.__main__:main_cli"
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.13"
 aiohttp = "^3.8.0"
 protobuf = ">=6.31,<8"
 
@@ -20,8 +20,8 @@ dpkt = "^1.9.8"
 black = "^24.4.0"
 isort = "^5.10.1"
 pylint = "^3.2"
-pytest = "^8.2.0"
-pytest-asyncio = "^0.23.0"
+pytest = "^8.4"
+pytest-asyncio = "^1.4.0"
 
 [build-system]
 requires = ["poetry-core"]
@@ -31,7 +31,7 @@ build-backend = "poetry.core.masonry.api"
 profile = "black"
 
 [tool.black]
-target-version = ["py310"]
+target-version = ["py313"]
 line-length = 180
 
 [tool.pylint.MAIN]