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

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

@@ -1,15 +1,12 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.2.0
+Version: 0.3.7
 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.2.0 → python_rako_2025-0.3.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-rako-2025"
-version = "0.2.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.7/python_rako/__version__.py

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

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

@@ -160,16 +160,38 @@ 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: list[Light] = []
+        ventilation: list[Ventilation] = []
+
+        for device in self.get_devices_from_discovery_xml(rako_xml):
+            if isinstance(device, (RoomLight, ChannelLight)):
+                lights.append(device)  # type: ignore[arg-type]
+            elif isinstance(device, (RoomVentilation, ChannelVentilation)):
+                ventilation.append(device)  # type: ignore[arg-type]
+
+        return lights, ventilation
+
     async def discover_lights(
         self, session: aiohttp.ClientSession
-    ) -> AsyncGenerator[Light]:
+    ) -> AsyncGenerator[RoomLight | ChannelLight, None]:
+        """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
 
     async def discover_ventilation(
         self, session: aiohttp.ClientSession
-    ) -> AsyncGenerator[Ventilation]:
+    ) -> AsyncGenerator[RoomVentilation | ChannelVentilation, None]:
+        """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)):
@@ -177,7 +199,8 @@ class Bridge:
 
     async def discover_all_devices(
         self, session: aiohttp.ClientSession
-    ) -> AsyncGenerator[Light | Ventilation]:
+    ) -> AsyncGenerator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation, None]:
+        """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
@@ -211,20 +234,20 @@ class Bridge:
         )
 
     @staticmethod
-    def get_lights_from_discovery_xml(xml: str) -> Generator[Light]:
+    def get_lights_from_discovery_xml(xml: str) -> Generator[RoomLight | ChannelLight, None, None]:
         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[Light | Ventilation]:
+    def get_all_devices_from_discovery_xml(xml: str) -> Generator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation, None, None]:
         """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[Light | Ventilation]:
+    ) -> Generator[RoomLight | ChannelLight | RoomVentilation | ChannelVentilation, None, None]:
         # Handle different input types for backward compatibility
         if device_types is None or device_types == "All":
             target_types = {"Lights", "Ventilation"}
@@ -284,11 +307,12 @@ class Bridge:
         if not resp:
             return None
 
-        data, (remote_ip, _) = resp
+        data, addr = resp
+        remote_ip, _ = addr
         if remote_ip != self.host:
             return None
 
-        byte_list = list(data)
+        byte_list = list(data) if isinstance(data, (bytes, bytearray)) else [int(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.2.0 → python_rako_2025-0.3.7/python_rako_2025.egg-info}/PKG-INFO

@@ -1,15 +1,12 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.2.0
+Version: 0.3.7
 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.2.0 → python_rako_2025-0.3.7}/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.7/setup.py

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

python_rako_2025-0.2.0/python_rako/__version__.py

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

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

@@ -1 +0,0 @@
-

python_rako_2025-0.2.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.2.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",
-)