python-rako-2025 0.1.0__tar.gz → 0.3.0__tar.gz

{python_rako_2025-0.1.0/python_rako_2025.egg-info → python_rako_2025-0.3.0}/PKG-INFO

@@ -1,15 +1,12 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.1.0
+Version: 0.3.0
 Summary: Asynchronous Python client for Rako Controls Lighting
-Home-page: https://github.com/simonleigh/python-rako
-Author: Simon Leigh
 Author-email: Simon Leigh <simonleigh@users.noreply.github.com>
 Project-URL: Homepage, https://github.com/simonleigh/python-rako
 Project-URL: Repository, https://github.com/simonleigh/python-rako
 Project-URL: Issues, https://github.com/simonleigh/python-rako/issues
 Keywords: rako,controls,api,async,client
-Platform: any
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers
@@ -28,11 +25,7 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3.10.0
 Requires-Dist: asyncio-dgram>=2.2.0
 Requires-Dist: xmltodict>=0.13.0
-Dynamic: author
-Dynamic: home-page
 Dynamic: license-file
-Dynamic: platform
-Dynamic: requires-python
 
 # Python: Rako Controls API Client
 

{python_rako_2025-0.1.0 → python_rako_2025-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-rako-2025"
-version = "0.1.0"
+dynamic = ["version"]
 description = "Asynchronous Python client for Rako Controls Lighting"
 readme = "README.md"
 keywords = ["rako", "controls", "api", "async", "client"]
@@ -44,6 +44,9 @@ include = ["python_rako*"]
 [tool.setuptools.package-data]
 python_rako = ["py.typed"]
 
+[tool.setuptools.dynamic]
+version = {file = "python_rako/__version__.py"}
+
 [tool.ruff]
 target-version = "py310"
 line-length = 100

python_rako_2025-0.3.0/python_rako/__version__.py

@@ -0,0 +1 @@
+0.3.0

{python_rako_2025-0.1.0 → python_rako_2025-0.3.0}/python_rako/bridge.py

@@ -160,9 +160,30 @@ class Bridge:
             rako_xml: str = await response.text()
         return rako_xml
 
+    async def discover_devices(
+        self, session: aiohttp.ClientSession
+    ) -> tuple[list[Light], list[Ventilation]]:
+        """
+        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)
+        
+        lights = []
+        ventilation = []
+        
+        for device in self.get_devices_from_discovery_xml(rako_xml):
+            if isinstance(device, (RoomLight, ChannelLight)):
+                lights.append(device)
+            elif isinstance(device, (RoomVentilation, ChannelVentilation)):
+                ventilation.append(device)
+        
+        return lights, ventilation
+
     async def discover_lights(
         self, session: aiohttp.ClientSession
     ) -> AsyncGenerator[Light]:
+        """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):
             yield light
@@ -170,11 +191,20 @@ class Bridge:
     async def discover_ventilation(
         self, session: aiohttp.ClientSession
     ) -> AsyncGenerator[Ventilation]:
+        """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
 
+    async def discover_all_devices(
+        self, session: aiohttp.ClientSession
+    ) -> AsyncGenerator[Light | Ventilation]:
+        """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
+
     async def get_info(self, session: aiohttp.ClientSession) -> BridgeInfo:
         try:
             rako_xml = await self.get_rako_xml(session)
@@ -209,22 +239,35 @@ class Bridge:
             if isinstance(device, (RoomLight, ChannelLight)):
                 yield device
 
+    @staticmethod
+    def get_all_devices_from_discovery_xml(xml: str) -> Generator[Light | Ventilation]:
+        """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_type: str
+        xml: str, device_types: str | list[str] | None = None
     ) -> Generator[Light | Ventilation]:
+        # Handle different input types for backward compatibility
+        if device_types is None or device_types == "All":
+            target_types = {"Lights", "Ventilation"}
+        elif isinstance(device_types, str):
+            target_types = {device_types}
+        else:
+            target_types = set(device_types)
+
         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")
-            if room_type != device_type:
+            if room_type not in target_types:
                 continue
             room_title = room["Title"]
 
             # Yield room-level device
-            if device_type == "Lights":
+            if room_type == "Lights":
                 yield RoomLight(room_id, room_title)
-            elif device_type == "Ventilation":
+            elif room_type == "Ventilation":
                 yield RoomVentilation(room_id, room_title)
 
             # Yield channel-level devices
@@ -240,7 +283,7 @@ class Bridge:
                 channel_name = channel["Name"]
                 channel_levels = channel["Levels"]
 
-                if device_type == "Lights":
+                if room_type == "Lights":
                     yield ChannelLight(
                         room_id,
                         room_title,
@@ -249,7 +292,7 @@ class Bridge:
                         channel_name,
                         channel_levels,
                     )
-                elif device_type == "Ventilation":
+                elif room_type == "Ventilation":
                     yield ChannelVentilation(
                         room_id,
                         room_title,

{python_rako_2025-0.1.0 → python_rako_2025-0.3.0/python_rako_2025.egg-info}/PKG-INFO

@@ -1,15 +1,12 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.1.0
+Version: 0.3.0
 Summary: Asynchronous Python client for Rako Controls Lighting
-Home-page: https://github.com/simonleigh/python-rako
-Author: Simon Leigh
 Author-email: Simon Leigh <simonleigh@users.noreply.github.com>
 Project-URL: Homepage, https://github.com/simonleigh/python-rako
 Project-URL: Repository, https://github.com/simonleigh/python-rako
 Project-URL: Issues, https://github.com/simonleigh/python-rako/issues
 Keywords: rako,controls,api,async,client
-Platform: any
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers
@@ -28,11 +25,7 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3.10.0
 Requires-Dist: asyncio-dgram>=2.2.0
 Requires-Dist: xmltodict>=0.13.0
-Dynamic: author
-Dynamic: home-page
 Dynamic: license-file
-Dynamic: platform
-Dynamic: requires-python
 
 # Python: Rako Controls API Client
 

{python_rako_2025-0.1.0 → python_rako_2025-0.3.0}/python_rako_2025.egg-info/SOURCES.txt

@@ -13,7 +13,6 @@ python_rako/py.typed
 python_rako_2025.egg-info/PKG-INFO
 python_rako_2025.egg-info/SOURCES.txt
 python_rako_2025.egg-info/dependency_links.txt
-python_rako_2025.egg-info/not-zip-safe
 python_rako_2025.egg-info/requires.txt
 python_rako_2025.egg-info/top_level.txt
 tests/test_bridge.py

python_rako_2025-0.3.0/setup.py

@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()

{python_rako_2025-0.1.0 → python_rako_2025-0.3.0}/tests/test_bridge.py

@@ -141,3 +141,85 @@ def test_ventilation_command_compatibility():
     # Test that ventilation channel can use lighting level commands
     channel_level_command = CommandLevelHTTP(room=161, channel=1, level=128)
     assert channel_level_command.as_params() == {"room": 161, "ch": 1, "lev": 128}
+
+
+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))
+
+    # Should contain both lights and ventilation
+    lights = [dev for dev in all_devices if isinstance(dev, (RoomLight, ChannelLight))]
+    ventilation = [
+        dev
+        for dev in all_devices
+        if isinstance(dev, (RoomVentilation, ChannelVentilation))
+    ]
+
+    # Should have many lights and 2 ventilation devices
+    assert len(lights) > 10  # rako3.xml has many light rooms
+    assert len(ventilation) == 2  # 1 RoomVentilation + 1 ChannelVentilation
+
+    # Check specific ventilation devices are included
+    ventilation_room = next(
+        (dev for dev in ventilation if isinstance(dev, RoomVentilation)), None
+    )
+    assert ventilation_room is not None
+    assert ventilation_room.room_id == 161
+    assert ventilation_room.room_title == "Fans"
+
+
+def test_get_devices_with_specific_types(rako_xml3):
+    """Test discovering specific device types using list parameter"""
+    # Test with list of device types
+    lights_only = list(Bridge.get_devices_from_discovery_xml(rako_xml3, ["Lights"]))
+    ventilation_only = list(
+        Bridge.get_devices_from_discovery_xml(rako_xml3, ["Ventilation"])
+    )
+    both_types = list(
+        Bridge.get_devices_from_discovery_xml(rako_xml3, ["Lights", "Ventilation"])
+    )
+
+    # Verify filtering works correctly
+    assert all(isinstance(dev, (RoomLight, ChannelLight)) for dev in lights_only)
+    assert all(
+        isinstance(dev, (RoomVentilation, ChannelVentilation))
+        for dev in ventilation_only
+    )
+    assert len(both_types) == len(lights_only) + len(ventilation_only)
+
+
+def test_get_devices_backward_compatibility(rako_xml3):
+    """Test that existing string parameter still works"""
+    # Test backward compatibility with string parameter
+    lights_str = list(Bridge.get_devices_from_discovery_xml(rako_xml3, "Lights"))
+    lights_list = list(Bridge.get_devices_from_discovery_xml(rako_xml3, ["Lights"]))
+
+    # Should return the same devices
+    assert lights_str == lights_list
+
+    # Test ventilation backward compatibility
+    ventilation_str = list(
+        Bridge.get_devices_from_discovery_xml(rako_xml3, "Ventilation")
+    )
+    ventilation_list = list(
+        Bridge.get_devices_from_discovery_xml(rako_xml3, ["Ventilation"])
+    )
+
+    assert ventilation_str == ventilation_list
+
+
+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 should return the same devices
+    assert all_devices_none == all_devices_all == all_devices_method
+
+    # Should contain both lights and ventilation
+    assert any(isinstance(dev, (RoomLight, ChannelLight)) for dev in all_devices_none)
+    assert any(
+        isinstance(dev, (RoomVentilation, ChannelVentilation))
+        for dev in all_devices_none
+    )

python_rako_2025-0.1.0/python_rako/__version__.py

@@ -1,3 +0,0 @@
-"""AUTOGENERATED ON RELEASE."""
-
-__version__ = "0.1.0"

python_rako_2025-0.1.0/python_rako_2025.egg-info/not-zip-safe

@@ -1 +0,0 @@
-

python_rako_2025-0.1.0/setup.py

@@ -1,55 +0,0 @@
-import os
-
-from setuptools import find_packages, setup
-
-
-def read(*parts):
-    """Read file."""
-    filename = os.path.join(os.path.abspath(os.path.dirname(__file__)), *parts)
-    with open(filename, encoding="utf-8") as fp:
-        return fp.read()
-
-
-with open("README.md") as readme_file:
-    readme = readme_file.read()
-
-setup(
-    name="python-rako-2025",
-    version="0.1.0",
-    license="MIT",
-    url="https://github.com/simonleigh/python-rako",
-    author="Simon Leigh",
-    author_email="simonleigh@users.noreply.github.com",
-    description="Asynchronous Python client for Rako Controls Lighting.",
-    keywords=["rako", "controls", "api", "async", "client"],
-    long_description=readme,
-    long_description_content_type="text/markdown",
-    packages=find_packages(include=["python_rako"]),
-    zip_safe=False,
-    include_package_data=True,
-    platforms="any",
-    package_data={
-        "python_rako": ["py.typed"],
-    },
-    install_requires=[
-        "aiohttp>=3.10.0",
-        "asyncio-dgram>=2.2.0",
-        "xmltodict>=0.13.0",
-    ],
-    classifiers=[
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
-        "Natural Language :: English",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Framework :: AsyncIO",
-        "Development Status :: 4 - Beta",
-    ],
-    python_requires=">=3.10",
-)