python-rako-2025 0.3.7__tar.gz → 0.3.9__tar.gz

{python_rako_2025-0.3.7 → python_rako_2025-0.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.3.7
+Version: 0.3.9
 Summary: Asynchronous Python client for Rako Controls Lighting
 Author-email: Simon Leigh <simonleigh@users.noreply.github.com>
 Project-URL: Homepage, https://github.com/simonleigh/python-rako

python_rako_2025-0.3.9/python_rako/__version__.py

@@ -0,0 +1 @@
+0.3.9

{python_rako_2025-0.3.7 → python_rako_2025-0.3.9}/python_rako/bridge.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
+import threading
 from collections.abc import AsyncGenerator, Generator
 from typing import Any
 
@@ -32,15 +33,16 @@ from python_rako.model import (
     CommandUDP,
     EOFResponse,
     LevelCache,
-    Light,
     RoomLight,
     RoomVentilation,
     SceneCache,
-    Ventilation,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
+# Thread lock for XML parsing to ensure concurrency safety
+_XML_PARSE_LOCK = threading.Lock()
+
 
 class _BridgeCommander:
     def __init__(self, host: str, port: int):
@@ -150,64 +152,76 @@ class Bridge:
         )
         self.level_cache: LevelCache = LevelCache()
         self.scene_cache: SceneCache = SceneCache()
+        self._cached_xml: str | None = None
 
     @property
     def _discovery_url(self) -> str:
         return f"http://{self.host}/rako.xml"
 
-    async def get_rako_xml(self, session: aiohttp.ClientSession) -> str:
-        async with session.get(self._discovery_url) as response:
-            rako_xml: str = await response.text()
-        return rako_xml
+    async def get_rako_xml(
+        self, session: aiohttp.ClientSession, force_refresh: bool = False
+    ) -> str:
+        if self._cached_xml is None or force_refresh:
+            async with session.get(self._discovery_url) as response:
+                self._cached_xml = await response.text()
+        assert self._cached_xml is not None
+        return self._cached_xml
 
     async def discover_devices(
-        self, session: aiohttp.ClientSession
-    ) -> tuple[list[Light], list[Ventilation]]:
+        self, session: aiohttp.ClientSession, force_refresh: bool = False
+    ) -> tuple[
+        list[RoomLight | ChannelLight], list[RoomVentilation | ChannelVentilation]
+    ]:
         """Discover all devices by fetching XML once and parsing all device types.
 
         Returns a tuple of (lights, ventilation) to avoid race conditions.
         """
-        rako_xml = await self.get_rako_xml(session)
+        rako_xml = await self.get_rako_xml(session, force_refresh)
 
-        lights: list[Light] = []
-        ventilation: list[Ventilation] = []
+        lights: list[RoomLight | ChannelLight] = []
+        ventilation: list[RoomVentilation | ChannelVentilation] = []
 
         for device in self.get_devices_from_discovery_xml(rako_xml):
             if isinstance(device, (RoomLight, ChannelLight)):
-                lights.append(device)  # type: ignore[arg-type]
+                lights.append(device)
             elif isinstance(device, (RoomVentilation, ChannelVentilation)):
-                ventilation.append(device)  # type: ignore[arg-type]
+                ventilation.append(device)
 
         return lights, ventilation
 
     async def discover_lights(
-        self, session: aiohttp.ClientSession
-    ) -> AsyncGenerator[RoomLight | ChannelLight, None]:
+        self, session: aiohttp.ClientSession, force_refresh: bool = False
+    ) -> AsyncGenerator[RoomLight | ChannelLight]:
         """Discover lights by fetching XML once and filtering for lights."""
-        rako_xml = await self.get_rako_xml(session)
-        for light in self.get_lights_from_discovery_xml(rako_xml):
+        lights, _ = await self.discover_devices(session, force_refresh)
+        for light in lights:
             yield light
 
     async def discover_ventilation(
-        self, session: aiohttp.ClientSession
-    ) -> AsyncGenerator[RoomVentilation | ChannelVentilation, None]:
+        self, session: aiohttp.ClientSession, force_refresh: bool = False
+    ) -> AsyncGenerator[RoomVentilation | ChannelVentilation]:
         """Discover ventilation by fetching XML once and filtering for ventilation."""
-        rako_xml = await self.get_rako_xml(session)
-        for device in self.get_devices_from_discovery_xml(rako_xml, "Ventilation"):
-            if isinstance(device, (RoomVentilation, ChannelVentilation)):
-                yield device
+        _, ventilation = await self.discover_devices(session, force_refresh)
+        for vent in ventilation:
+            yield vent
 
     async def discover_all_devices(
-        self, session: aiohttp.ClientSession
-    ) -> AsyncGenerator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation, None]:
+        self, session: aiohttp.ClientSession, force_refresh: bool = False
+    ) -> AsyncGenerator[
+        RoomLight | ChannelLight | RoomVentilation | ChannelVentilation
+    ]:
         """Discover all devices by fetching XML once."""
-        rako_xml = await self.get_rako_xml(session)
-        for device in self.get_devices_from_discovery_xml(rako_xml):
-            yield device
+        lights, ventilation = await self.discover_devices(session, force_refresh)
+        for light in lights:
+            yield light
+        for vent in ventilation:
+            yield vent
 
-    async def get_info(self, session: aiohttp.ClientSession) -> BridgeInfo:
+    async def get_info(
+        self, session: aiohttp.ClientSession, force_refresh: bool = False
+    ) -> BridgeInfo:
         try:
-            rako_xml = await self.get_rako_xml(session)
+            rako_xml = await self.get_rako_xml(session, force_refresh)
             info = self.get_bridge_info_from_discovery_xml(rako_xml)
         except (KeyError, ValueError) as ex:
             raise RakoBridgeError(f"unsupported bridge: {ex}")
@@ -217,7 +231,8 @@ class Bridge:
 
     @staticmethod
     def get_bridge_info_from_discovery_xml(xml: str) -> BridgeInfo:
-        xml_dict = xmltodict.parse(xml)
+        with _XML_PARSE_LOCK:
+            xml_dict = xmltodict.parse(xml)
         info = xml_dict["rako"].get("info", dict())
         config = xml_dict["rako"].get("config", dict())
         return BridgeInfo(
@@ -234,20 +249,24 @@ class Bridge:
         )
 
     @staticmethod
-    def get_lights_from_discovery_xml(xml: str) -> Generator[RoomLight | ChannelLight, None, None]:
+    def get_lights_from_discovery_xml(
+        xml: str,
+    ) -> Generator[RoomLight | ChannelLight]:
         for device in Bridge.get_devices_from_discovery_xml(xml, "Lights"):
             if isinstance(device, (RoomLight, ChannelLight)):
                 yield device
 
     @staticmethod
-    def get_all_devices_from_discovery_xml(xml: str) -> Generator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation, None, None]:
+    def get_all_devices_from_discovery_xml(
+        xml: str,
+    ) -> Generator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation]:
         """Get all devices (lights and ventilation) from discovery XML."""
         return Bridge.get_devices_from_discovery_xml(xml)
 
     @staticmethod
     def get_devices_from_discovery_xml(
         xml: str, device_types: str | list[str] | None = None
-    ) -> Generator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation, None, None]:
+    ) -> Generator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation]:
         # Handle different input types for backward compatibility
         if device_types is None or device_types == "All":
             target_types = {"Lights", "Ventilation"}
@@ -256,7 +275,8 @@ class Bridge:
         else:
             target_types = set(device_types)
 
-        xml_dict = xmltodict.parse(xml, force_list={"Room"})
+        with _XML_PARSE_LOCK:
+            xml_dict = xmltodict.parse(xml, force_list={"Room"})
         for room in xml_dict["rako"]["rooms"]["Room"]:
             room_id = int(room["@id"])
             room_type = room.get("Type", "Lights")
@@ -312,7 +332,7 @@ class Bridge:
         if remote_ip != self.host:
             return None
 
-        byte_list = list(data) if isinstance(data, (bytes, bytearray)) else [int(data)]
+        byte_list = list(data)
         _LOGGER.debug("Received bytes: %s", byte_list)
         message = deserialise_byte_list(byte_list)
         _LOGGER.debug("Deserialised received message as: %s", message)

{python_rako_2025-0.3.7 → python_rako_2025-0.3.9}/python_rako_2025.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.3.7
+Version: 0.3.9
 Summary: Asynchronous Python client for Rako Controls Lighting
 Author-email: Simon Leigh <simonleigh@users.noreply.github.com>
 Project-URL: Homepage, https://github.com/simonleigh/python-rako

python_rako_2025-0.3.7/python_rako/__version__.py

@@ -1 +0,0 @@
-0.3.7