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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.3.9
+Version: 0.3.11
 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.11/python_rako/__version__.py

@@ -0,0 +1 @@
+0.3.11

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

@@ -153,6 +153,7 @@ class Bridge:
         self.level_cache: LevelCache = LevelCache()
         self.scene_cache: SceneCache = SceneCache()
         self._cached_xml: str | None = None
+        self._xml_fetch_lock = asyncio.Lock()
 
     @property
     def _discovery_url(self) -> str:
@@ -161,9 +162,10 @@ class Bridge:
     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()
+        async with self._xml_fetch_lock:
+            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
 
@@ -205,18 +207,6 @@ class Bridge:
         for vent in ventilation:
             yield vent
 
-    async def discover_all_devices(
-        self, session: aiohttp.ClientSession, force_refresh: bool = False
-    ) -> AsyncGenerator[
-        RoomLight | ChannelLight | RoomVentilation | ChannelVentilation
-    ]:
-        """Discover all devices by fetching XML once."""
-        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, force_refresh: bool = False
     ) -> BridgeInfo:
@@ -248,21 +238,6 @@ class Bridge:
             charset=config.get("charset"),
         )
 
-    @staticmethod
-    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]:
-        """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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.3.9
+Version: 0.3.11
 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_2025-0.3.11}/tests/test_bridge.py

@@ -9,7 +9,7 @@ from python_rako.model import (
 
 
 def test_get_lights_from_discovery_xml(rako_xml):
-    lights = Bridge.get_lights_from_discovery_xml(rako_xml)
+    lights = list(Bridge.get_devices_from_discovery_xml(rako_xml, "Lights"))
 
     expected_lights = [
         RoomLight(room_id=5, room_title="Living Room", channel_id=0),
@@ -87,7 +87,7 @@ def test_get_bridge_info_from_discovery_xml2(rako_xml2):
 
 
 def test_get_lights_from_discovery_xml2(rako_xml2):
-    lights = Bridge.get_lights_from_discovery_xml(rako_xml2)
+    lights = list(Bridge.get_devices_from_discovery_xml(rako_xml2, "Lights"))
 
     expected_lights = [
         RoomLight(room_id=112, room_title="Bedroom 1", channel_id=0),
@@ -145,7 +145,7 @@ def test_ventilation_command_compatibility():
 
 def test_get_all_devices_from_discovery_xml(rako_xml3):
     """Test discovering all device types from XML"""
-    all_devices = list(Bridge.get_all_devices_from_discovery_xml(rako_xml3))
+    all_devices = list(Bridge.get_devices_from_discovery_xml(rako_xml3))
 
     # Should contain both lights and ventilation
     lights = [dev for dev in all_devices if isinstance(dev, (RoomLight, ChannelLight))]
@@ -212,7 +212,7 @@ def test_get_devices_all_parameter_variants(rako_xml3):
     """Test different ways to get all devices"""
     all_devices_none = list(Bridge.get_devices_from_discovery_xml(rako_xml3, None))
     all_devices_all = list(Bridge.get_devices_from_discovery_xml(rako_xml3, "All"))
-    all_devices_method = list(Bridge.get_all_devices_from_discovery_xml(rako_xml3))
+    all_devices_method = list(Bridge.get_devices_from_discovery_xml(rako_xml3))
 
     # All should return the same devices
     assert all_devices_none == all_devices_all == all_devices_method

python_rako_2025-0.3.9/python_rako/__version__.py

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