python-rako-2025 0.4.3__tar.gz → 0.4.4__tar.gz

{python_rako_2025-0.4.3 → python_rako_2025-0.4.4}/.claude/settings.local.json

@@ -6,7 +6,8 @@
       "mcp__ide__getDiagnostics",
       "WebFetch(domain:docs.python.org)",
       "Bash(python -m pytest tests/ -v)",
-      "Bash(pytest:*)"
+      "Bash(pytest:*)",
+      "Bash(git fetch:*)"
     ],
     "deny": []
   }

{python_rako_2025-0.4.3 → python_rako_2025-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-rako-2025
-Version: 0.4.3
+Version: 0.4.4
 Summary: Asynchronous Python client for Rako Controls Lighting
 Project-URL: Homepage, https://github.com/simonleigh/python-rako
 Project-URL: Repository, https://github.com/simonleigh/python-rako
@@ -48,11 +48,10 @@ Description-Content-Type: text/markdown
 [![Code Coverage][codecov-shield]][codecov]
 [![Code Quality][code-quality-shield]][code-quality]
 
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
 
 Asynchronous Python client for Rako Controls.
 
-**This is a modernized fork** that has been updated to Python 3.12+ best practices, includes async concurrency fixes for Home Assistant integration, and uses modern tooling (Ruff, Hatchling, etc.).
-
 ## About
 
 This package allows you to control and monitor Rako Controls devices
@@ -62,42 +61,23 @@ their behavior.
 ## Installation
 
 ```bash
-pip install python-rako-2025
+pip install python-rako
 ```
 
 ## Usage
 
 ```python
 import asyncio
-import aiohttp
-from python_rako import discover_bridge, Bridge
 
 
 async def main():
-    # Discover bridge on network
-    bridge_info = await discover_bridge()
-    print(f"Found bridge: {bridge_info}")
-
-    # Create bridge instance
-    bridge = Bridge(
-        host=bridge_info["host"],
-        port=bridge_info["port"],
-        name=bridge_info["name"],
-        mac=bridge_info["mac"]
-    )
-
-    # Get bridge information and discover devices
-    async with aiohttp.ClientSession() as session:
-        info = await bridge.get_info(session)
-        print(f"Bridge version: {info.version}")
-
-        # Discover all lights
-        async for light in bridge.discover_lights(session):
-            print(f"Found light: {light.title} (Room {light.room_id})")
+    # TODO
+    pass
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(main())
 ```
 
 ## Changelog & Releases
@@ -145,10 +125,11 @@ Asynchronous Python client for Rako Controls Lighting.
 Usage:
   make help                            Shows this message.
   make dev                             Set up a development environment.
-  make lint                            Run Ruff linting and formatting checks.
-  make format                          Format code with Ruff.
-  make typecheck                       Run type checking with MyPy.
-  make check                           Run all checks (linting, formatting, and type checking).
+  make lint                            Run all linters.
+  make lint-black                      Run linting using black & blacken-docs.
+  make lint-flake8                     Run linting using flake8 (pycodestyle/pydocstyle).
+  make lint-pylint                     Run linting using PyLint.
+  make lint-mypy                       Run linting using MyPy.
   make test                            Run tests quickly with the default Python.
   make coverage                        Check code coverage quickly with the default Python.
   make install                         Install the package to the active Python's site-packages.
@@ -159,17 +140,13 @@ Usage:
   make clean-test                      Removes test and coverage artifacts.
   make clean-venv                      Removes Python virtual environment artifacts.
   make dist                            Builds source and wheel package.
-  make release                         Release build on PyPI.
+  make release                         Release build on PyP
   make venv                            Create Python venv environment.
-  make bump-patch                      Bump patch version (x.y.Z) and commit.
-  make bump-minor                      Bump minor version (x.Y.z) and commit.
-  make bump-major                      Bump major version (X.y.z) and commit.
 ```
 
 ## Authors & contributors
 
 The original setup of this repository is by [Ben Marengo][marengaz].
-Currently maintained by [Simon Leigh][simonleigh].
 
 For a full list of all authors and contributors,
 check [the contributor's page][contributors].
@@ -178,19 +155,23 @@ check [the contributor's page][contributors].
 
 [License](LICENSE)
 
-[build-shield]: https://github.com/simonleigh/python-rako/workflows/Continuous%20Integration/badge.svg
-[build]: https://github.com/simonleigh/python-rako/actions
-[code-quality-shield]: https://img.shields.io/lgtm/grade/python/g/simonleigh/python-rako.svg?logo=lgtm&logoWidth=18
-[code-quality]: https://lgtm.com/projects/g/simonleigh/python-rako/context:python
-[codecov-shield]: https://codecov.io/gh/simonleigh/python-rako/branch/master/graph/badge.svg
-[codecov]: https://codecov.io/gh/simonleigh/python-rako
-[contributors]: https://github.com/simonleigh/python-rako/graphs/contributors
+[build-shield]: https://github.com/marengaz/python-rako/workflows/Continuous%20Integration/badge.svg
+[build]: https://github.com/marengaz/python-rako/actions
+[code-quality-shield]: https://img.shields.io/lgtm/grade/python/g/marengaz/python-rako.svg?logo=lgtm&logoWidth=18
+[code-quality]: https://lgtm.com/projects/g/marengaz/python-rako/context:python
+[codecov-shield]: https://codecov.io/gh/marengaz/python-rako/branch/master/graph/badge.svg
+[codecov]: https://codecov.io/gh/marengaz/python-rako
+[contributors]: https://github.com/marengaz/python-rako/graphs/contributors
 [marengaz]: https://github.com/marengaz
-[simonleigh]: https://github.com/simonleigh
 [keepchangelog]: http://keepachangelog.com/en/1.0.0/
-[license-shield]: https://img.shields.io/github/license/simonleigh/python-rako.svg
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2025.svg
-[project-stage-shield]: https://img.shields.io/badge/project%20stage-stable-green.svg
-[releases-shield]: https://img.shields.io/github/release/simonleigh/python-rako.svg
-[releases]: https://github.com/simonleigh/python-rako/releases
+[license-shield]: https://img.shields.io/github/license/marengaz/python-rako.svg
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2021.svg
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[releases-shield]: https://img.shields.io/github/release/marengaz/python-rako.svg
+[releases]: https://github.com/marengaz/python-rako/releases
 [semver]: http://semver.org/spec/v2.0.0.html
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/marengaz
+[github-actions-shield]: https://github.com/marengaz/rakomqtt/workflows/Test%20RakoMQTT/badge.svg?branch=master
+[github-actions]: https://github.com/marengaz/rakomqtt/actions?query=workflow%3A%22Test+RakoMQTT%22+branch%3Amaster

{python_rako_2025-0.4.3 → python_rako_2025-0.4.4}/README.md

@@ -9,11 +9,10 @@
 [![Code Coverage][codecov-shield]][codecov]
 [![Code Quality][code-quality-shield]][code-quality]
 
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
 
 Asynchronous Python client for Rako Controls.
 
-**This is a modernized fork** that has been updated to Python 3.12+ best practices, includes async concurrency fixes for Home Assistant integration, and uses modern tooling (Ruff, Hatchling, etc.).
-
 ## About
 
 This package allows you to control and monitor Rako Controls devices
@@ -23,42 +22,23 @@ their behavior.
 ## Installation
 
 ```bash
-pip install python-rako-2025
+pip install python-rako
 ```
 
 ## Usage
 
 ```python
 import asyncio
-import aiohttp
-from python_rako import discover_bridge, Bridge
 
 
 async def main():
-    # Discover bridge on network
-    bridge_info = await discover_bridge()
-    print(f"Found bridge: {bridge_info}")
-
-    # Create bridge instance
-    bridge = Bridge(
-        host=bridge_info["host"],
-        port=bridge_info["port"],
-        name=bridge_info["name"],
-        mac=bridge_info["mac"]
-    )
-
-    # Get bridge information and discover devices
-    async with aiohttp.ClientSession() as session:
-        info = await bridge.get_info(session)
-        print(f"Bridge version: {info.version}")
-
-        # Discover all lights
-        async for light in bridge.discover_lights(session):
-            print(f"Found light: {light.title} (Room {light.room_id})")
+    # TODO
+    pass
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(main())
 ```
 
 ## Changelog & Releases
@@ -106,10 +86,11 @@ Asynchronous Python client for Rako Controls Lighting.
 Usage:
   make help                            Shows this message.
   make dev                             Set up a development environment.
-  make lint                            Run Ruff linting and formatting checks.
-  make format                          Format code with Ruff.
-  make typecheck                       Run type checking with MyPy.
-  make check                           Run all checks (linting, formatting, and type checking).
+  make lint                            Run all linters.
+  make lint-black                      Run linting using black & blacken-docs.
+  make lint-flake8                     Run linting using flake8 (pycodestyle/pydocstyle).
+  make lint-pylint                     Run linting using PyLint.
+  make lint-mypy                       Run linting using MyPy.
   make test                            Run tests quickly with the default Python.
   make coverage                        Check code coverage quickly with the default Python.
   make install                         Install the package to the active Python's site-packages.
@@ -120,17 +101,13 @@ Usage:
   make clean-test                      Removes test and coverage artifacts.
   make clean-venv                      Removes Python virtual environment artifacts.
   make dist                            Builds source and wheel package.
-  make release                         Release build on PyPI.
+  make release                         Release build on PyP
   make venv                            Create Python venv environment.
-  make bump-patch                      Bump patch version (x.y.Z) and commit.
-  make bump-minor                      Bump minor version (x.Y.z) and commit.
-  make bump-major                      Bump major version (X.y.z) and commit.
 ```
 
 ## Authors & contributors
 
 The original setup of this repository is by [Ben Marengo][marengaz].
-Currently maintained by [Simon Leigh][simonleigh].
 
 For a full list of all authors and contributors,
 check [the contributor's page][contributors].
@@ -139,19 +116,23 @@ check [the contributor's page][contributors].
 
 [License](LICENSE)
 
-[build-shield]: https://github.com/simonleigh/python-rako/workflows/Continuous%20Integration/badge.svg
-[build]: https://github.com/simonleigh/python-rako/actions
-[code-quality-shield]: https://img.shields.io/lgtm/grade/python/g/simonleigh/python-rako.svg?logo=lgtm&logoWidth=18
-[code-quality]: https://lgtm.com/projects/g/simonleigh/python-rako/context:python
-[codecov-shield]: https://codecov.io/gh/simonleigh/python-rako/branch/master/graph/badge.svg
-[codecov]: https://codecov.io/gh/simonleigh/python-rako
-[contributors]: https://github.com/simonleigh/python-rako/graphs/contributors
+[build-shield]: https://github.com/marengaz/python-rako/workflows/Continuous%20Integration/badge.svg
+[build]: https://github.com/marengaz/python-rako/actions
+[code-quality-shield]: https://img.shields.io/lgtm/grade/python/g/marengaz/python-rako.svg?logo=lgtm&logoWidth=18
+[code-quality]: https://lgtm.com/projects/g/marengaz/python-rako/context:python
+[codecov-shield]: https://codecov.io/gh/marengaz/python-rako/branch/master/graph/badge.svg
+[codecov]: https://codecov.io/gh/marengaz/python-rako
+[contributors]: https://github.com/marengaz/python-rako/graphs/contributors
 [marengaz]: https://github.com/marengaz
-[simonleigh]: https://github.com/simonleigh
 [keepchangelog]: http://keepachangelog.com/en/1.0.0/
-[license-shield]: https://img.shields.io/github/license/simonleigh/python-rako.svg
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2025.svg
-[project-stage-shield]: https://img.shields.io/badge/project%20stage-stable-green.svg
-[releases-shield]: https://img.shields.io/github/release/simonleigh/python-rako.svg
-[releases]: https://github.com/simonleigh/python-rako/releases
+[license-shield]: https://img.shields.io/github/license/marengaz/python-rako.svg
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2021.svg
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[releases-shield]: https://img.shields.io/github/release/marengaz/python-rako.svg
+[releases]: https://github.com/marengaz/python-rako/releases
 [semver]: http://semver.org/spec/v2.0.0.html
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/marengaz
+[github-actions-shield]: https://github.com/marengaz/rakomqtt/workflows/Test%20RakoMQTT/badge.svg?branch=master
+[github-actions]: https://github.com/marengaz/rakomqtt/actions?query=workflow%3A%22Test+RakoMQTT%22+branch%3Amaster

python_rako_2025-0.4.4/python_rako/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.4.4"

{python_rako_2025-0.4.3 → python_rako_2025-0.4.4}/python_rako/bridge.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import logging
 import threading
+import time
 from typing import TYPE_CHECKING, Any, cast
 
 import aiohttp
@@ -15,7 +16,7 @@ from python_rako.const import (
     MessageType,
     RequestType,
 )
-from python_rako.exceptions import RakoBridgeError
+from python_rako.exceptions import RakoBridgeError, RakoConnectionError, RakoCommandError
 from python_rako.helpers import (
     command_to_byte_list,
     deserialise_byte_list,
@@ -87,22 +88,36 @@ class BridgeCommanderUDP(_BridgeCommander):
         await self._send_command(command)
 
     async def _send_command(self, command: CommandUDP) -> None:
+        """Send command with retry logic."""
+        await self._send_command_with_retry(command, max_retries=2)
+
+    async def _send_command_with_retry(self, command: CommandUDP, max_retries: int = 2) -> bool:
+        """Send command with retry logic."""
         _LOGGER.debug("Sending command: %s", command)
         byte_list = command_to_byte_list(command)
-        async with get_dg_commander(self.host, self.port) as dg_client:
-            _LOGGER.debug("Sending command bytes: %s", byte_list)
-            await dg_client.send(bytes(byte_list))
-            data, _ = await dg_client.recv()
-
-        # Rako bridges return responses in Windows-1252 encoding, not UTF-8
-        try:
-            decoded_data = data.decode("windows-1252").strip()
-        except UnicodeDecodeError:
-            # Fallback to latin-1 which accepts all byte values
-            decoded_data = data.decode("latin-1").strip()
-
-        if decoded_data != COMMAND_SUCCESS_RESPONSE:
-            _LOGGER.warning("Bad response after command %s %s", command, data)
+        
+        for attempt in range(max_retries + 1):
+            try:
+                async with get_dg_commander(self.host, self.port) as dg_client:
+                    _LOGGER.debug("Sending command bytes: %s (attempt %d)", byte_list, attempt + 1)
+                    await dg_client.send(bytes(byte_list))
+                    try:
+                        # Add timeout to prevent indefinite blocking
+                        data, _ = await asyncio.wait_for(dg_client.recv(), timeout=3.0)
+                        if data.decode("utf8").strip() != COMMAND_SUCCESS_RESPONSE:
+                            _LOGGER.warning("Bad response after command %s: %s", command, data)
+                        return True
+                    except TimeoutError:
+                        # Many bridges don't send consistent responses, just log and continue
+                        _LOGGER.debug("No response received for command %s (timeout after 3s)", command)
+                        return True  # Consider timeout as success for UDP commands
+            except (ConnectionError, OSError) as e:
+                if attempt == max_retries:
+                    _LOGGER.error("Command failed after %d attempts: %s", max_retries + 1, e)
+                    raise RakoConnectionError(f"Failed to send command after {max_retries + 1} attempts: {e}") from e
+                _LOGGER.warning("Command attempt %d failed, retrying: %s", attempt + 1, e)
+                await asyncio.sleep(0.5 * (2 ** attempt))  # Exponential backoff
+        return False
 
 
 class BridgeCommanderHTTP(_BridgeCommander):
@@ -158,6 +173,7 @@ class Bridge:
         self.scene_cache: SceneCache = SceneCache()
         self._cached_xml: str | None = None
         self._xml_fetch_lock = asyncio.Lock()
+        self._last_cache_refresh: float = 0
 
     @property
     def _discovery_url(self) -> str:
@@ -342,6 +358,17 @@ class Bridge:
 
         return level_cache, scene_cache
 
+    async def refresh_cache_if_stale(self, max_age_seconds: int = 300) -> None:
+        """Refresh level and scene cache if older than max_age_seconds."""
+        current_time = time.time()
+        if current_time - self._last_cache_refresh > max_age_seconds:
+            try:
+                self.level_cache, self.scene_cache = await self.get_cache_state()
+                self._last_cache_refresh = current_time
+                _LOGGER.debug("📚 Cache refreshed for bridge %s", self.mac)
+            except Exception as e:
+                _LOGGER.warning("Failed to refresh cache for bridge %s: %s", self.mac, e)
+
     async def set_room_scene(self, room_id: int, scene: int) -> None:
         """Set the scene of a room."""
         await self._bridge_commander.set_room_scene(room_id, scene)

python_rako_2025-0.4.4/python_rako/exceptions.py

@@ -0,0 +1,12 @@
+class RakoBridgeError(Exception):
+    pass
+
+
+class RakoConnectionError(RakoBridgeError):
+    """Raised when bridge connection fails."""
+    pass
+
+
+class RakoCommandError(RakoBridgeError):
+    """Raised when command execution fails."""
+    pass

{python_rako_2025-0.4.3 → python_rako_2025-0.4.4}/python_rako/helpers.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
+import asyncio
 import logging
+import socket
+import time
 from contextlib import asynccontextmanager
 from typing import TYPE_CHECKING
 
@@ -38,7 +41,13 @@ _LOGGER = logging.getLogger(__name__)
 async def get_dg_listener(port: int, listen_host: str = "0.0.0.0") -> AsyncIterator[DatagramServer]:
     server: DatagramServer | None = None
     try:
-        server = await asyncio_dgram.bind((listen_host, port))
+        # Create socket with broadcast capability for receiving status messages
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        sock.bind((listen_host, port))
+        
+        server = await asyncio_dgram.from_socket(sock)
         yield server
     finally:
         if server:
@@ -194,3 +203,38 @@ def convert_to_scene(brightness: int) -> int:
 
     scene = next(k for k, v in _scene_windows.items() if v["low"] <= brightness < v["high"])
     return scene
+
+
+def get_predicted_channel_brightness(level_cache: LevelCache, room: int, channel: int, scene: int) -> int:
+    """Predict channel brightness from scene using cache, fallback to conversion."""
+    # Try cache first
+    cached_brightness = level_cache.get_channel_level(
+        RoomChannel(room, channel), scene
+    )
+    if cached_brightness > 0:
+        return cached_brightness
+    
+    # Fallback to scene-to-brightness conversion
+    return convert_to_brightness(scene)
+
+
+class UDPMessageRateLimit:
+    """Rate limiter for UDP message processing to prevent flooding."""
+    
+    def __init__(self, max_messages_per_second: int = 50):
+        self.max_messages = max_messages_per_second
+        self.message_times: list[float] = []
+        self.lock = asyncio.Lock()
+    
+    async def should_process_message(self) -> bool:
+        """Rate limit UDP message processing."""
+        async with self.lock:
+            now = time.time()
+            # Remove messages older than 1 second
+            self.message_times = [t for t in self.message_times if now - t < 1.0]
+            
+            if len(self.message_times) >= self.max_messages:
+                return False
+            
+            self.message_times.append(now)
+            return True

python_rako_2025-0.4.3/python_rako/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.4.3"

python_rako_2025-0.4.3/python_rako/exceptions.py

@@ -1,2 +0,0 @@
-class RakoBridgeError(Exception):
-    pass