Merge pull request #41 from imonlinux/non-rpi_system_support

Make LED controller optional on non-RPi hosts and fix --list-output-devices exit code

linux_voice_assistant/__main__.py

@@ -171,16 +171,14 @@ def _init_basics() -> Tuple[Config, asyncio.AbstractEventLoop, EventBus]:
 
     if args.list_output_devices:
         print("Output devices\n" + "=" * 14)
-        exit_code = 0
         try:
             player = MpvMediaPlayer(loop=None)
             for speaker in player.player.audio_device_list:
                 print(speaker["name"] + ":", speaker["description"])
         except Exception as e:
             _LOGGER.error("Failed to list output devices: %s", e)
-            exit_code = 1
+            sys.exit(1)
-
+        sys.exit(0)
-        sys.exit(exit_code)
 
     config_path = args.config
     if not config_path.is_absolute():

linux_voice_assistant/led_controller.py

@@ -1,15 +1,25 @@
 import asyncio
 import logging
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import Any, Optional, Tuple
 
-import board
+_LOGGER = logging.getLogger(__name__)
+
+# ---------------------------------------------------------------------------
+# Optional hardware imports (board-safe)
+# ---------------------------------------------------------------------------
+try:
+    import board  # type: ignore[import]
+except Exception:
+    board = None  # type: ignore[assignment]
+    _LOGGER.warning(
+        "Adafruit 'board' module not available or unsupported on this platform; "
+        "hardware LEDs will be disabled."
+    )
 
 from .config import LedConfig
 from .event_bus import EventBus, EventHandler, subscribe
 from .models import Preferences
 
-_LOGGER = logging.getLogger(__name__)
-
 # Default Colors
 _OFF = (0, 0, 0)
 _BLUE = (0, 0, 255)
@@ -31,171 +41,378 @@ class LedController(EventHandler):
         super().__init__(event_bus)
         self.loop = loop
         self.num_leds = preferences.num_leds  # Get num_leds from preferences
-        self.current_task: Optional[asyncio.Task] = None
+        self.current_task: Optional[asyncio.Future] = None
         self._is_ready = False
         self.leds = None
-        
+
+        # Configured LED behavior
         self.configs = {
-            "idle":       {"effect": "off", "color": _PURPLE, "brightness": 0.5},
+            "idle":       {"effect": "off",           "color": _PURPLE, "brightness": 0.5},
-            "listening":  {"effect": "medium_pulse", "color": _BLUE,   "brightness": 0.5},
+            "listening":  {"effect": "medium_pulse",  "color": _BLUE,   "brightness": 0.5},
-            "thinking":   {"effect": "spin", "color": _YELLOW, "brightness": 0.8},
+            "thinking":   {"effect": "spin",          "color": _YELLOW, "brightness": 0.8},
-            "responding": {"effect": "medium_pulse", "color": _GREEN,  "brightness": 0.5},
+            "responding": {"effect": "medium_pulse",  "color": _GREEN,  "brightness": 0.5},
-            "error":      {"effect": "fast_blink", "color": _ORANGE, "brightness": 1.0},
+            "error":      {"effect": "fast_blink",    "color": _ORANGE, "brightness": 1.0},
         }
 
+        # Determine whether hardware LEDs should be used at all
+        config_enabled = getattr(config, "enabled", True)
+        self._enabled = bool(config_enabled) and (board is not None)
+
+        if not config_enabled:
+            _LOGGER.info(
+                "LEDs disabled in config (led.enabled = false); "
+                "LedController will run in no-op mode."
+            )
+        elif board is None:
+            _LOGGER.warning(
+                "LED hardware libraries not available on this platform; "
+                "LedController will run in no-op mode."
+            )
+
+        # Always subscribe to events so MQTT + state logic remains intact,
+        # even when LEDs are effectively disabled.
+        self._subscribe_all_methods()
+
+        # If LEDs are not enabled or board is unavailable, skip hardware init
+        if not self._enabled:
+            return
+
+        # -------------------------------------------------------------------
+        # Hardware initialization (Pi / supported boards only)
+        # -------------------------------------------------------------------
         try:
             if config.led_type == "neopixel":
                 if config.interface == "spi":
                     import busio
-                    import neopixel_spi 
+                    import neopixel_spi
-                    _LOGGER.debug(f"Initializing {self.num_leds} NeoPixel LEDs on hardware SPI")
+
+                    _LOGGER.debug(
+                        "Initializing %d NeoPixel LEDs on hardware SPI", self.num_leds
+                    )
                     spi = busio.SPI(board.SCLK, MOSI=board.MOSI)
-                    self.leds = neopixel_spi.NeoPixel_SPI(spi, self.num_leds, auto_write=False)
+                    self.leds = neopixel_spi.NeoPixel_SPI(
-                else: # GPIO
+                        spi, self.num_leds, auto_write=False
+                    )
+                else:  # GPIO
                     import neopixel
-                    _LOGGER.debug(f"Initializing {self.num_leds} NeoPixel LEDs on GPIO data={config.data_pin}")
+
+                    _LOGGER.debug(
+                        "Initializing %d NeoPixel LEDs on GPIO data=%s",
+                        self.num_leds,
+                        config.data_pin,
+                    )
                     pin_object = getattr(board, f"D{config.data_pin}")
-                    self.leds = neopixel.NeoPixel(pin_object, self.num_leds, auto_write=False)
+                    self.leds = neopixel.NeoPixel(
-            else: # dotstar
+                        pin_object, self.num_leds, auto_write=False
+                    )
+            else:  # dotstar
                 import adafruit_dotstar
+
                 if config.interface == "gpio":
-                    _LOGGER.debug(f"Initializing {self.num_leds} DotStar LEDs on GPIO data={config.data_pin}, clock={config.clock_pin}")
+                    _LOGGER.debug(
+                        "Initializing %d DotStar LEDs on GPIO data=%s, clock=%s",
+                        self.num_leds,
+                        config.data_pin,
+                        config.clock_pin,
+                    )
                     data_pin_obj = getattr(board, f"D{config.data_pin}")
                     clock_pin_obj = getattr(board, f"D{config.clock_pin}")
-                    self.leds = adafruit_dotstar.DotStar(clock_pin_obj, data_pin_obj, self.num_leds, auto_write=False)
+                    self.leds = adafruit_dotstar.DotStar(
-                else: # SPI
+                        clock_pin_obj, data_pin_obj, self.num_leds, auto_write=False
-                    _LOGGER.debug(f"Initializing {self.num_leds} DotStar LEDs on hardware SPI")
+                    )
-                    self.leds = adafruit_dotstar.DotStar(board.SCLK, board.MOSI, self.num_leds, auto_write=False)
+                else:  # SPI
-            
+                    _LOGGER.debug(
+                        "Initializing %d DotStar LEDs on hardware SPI", self.num_leds
+                    )
+                    self.leds = adafruit_dotstar.DotStar(
+                        board.SCLK, board.MOSI, self.num_leds, auto_write=False
+                    )
+
             self._is_ready = True
-            _LOGGER.info(f"LED Controller initialized for {self.num_leds} {config.led_type} LEDs.")
+            _LOGGER.info(
+                "LED Controller initialized for %d %s LEDs.",
+                self.num_leds,
+                config.led_type,
+            )
             self.run_action("startup_sequence")
 
         except Exception:
-            _LOGGER.exception("Failed to initialize LED controller. LEDs will be disabled.")
+            # Any hardware-related failure leaves us in no-op mode
+            self._is_ready = False
+            self.leds = None
+            _LOGGER.exception(
+                "Failed to initialize LED controller. LEDs will be disabled."
+            )
 
-        # Subscribe to events *after* __init__ is complete
+    # -----------------------------------------------------------------------
-        self._subscribe_all_methods()
+    # Internal helpers
+    # -----------------------------------------------------------------------
 
     def run_action(self, action_method_name: str, *args: Any) -> None:
-        if not self._is_ready: return
+        """Schedule an LED coroutine on the event loop."""
-        if self.current_task and not self.current_task.done(): self.current_task.cancel()
+        if not (self._enabled and self._is_ready):
-        
+            return
+
+        if self.current_task and not self.current_task.done():
+            self.current_task.cancel()
+
         coro = getattr(self, action_method_name)(*args)
         self.current_task = asyncio.run_coroutine_threadsafe(coro, self.loop)
 
     def _apply_state_effect(self, state_name: str, publish_state: bool = True):
         config = self.configs.get(state_name, self.configs["idle"])
-        _LOGGER.debug(f"Applying effect for state '{state_name}': {config['effect']}")
+        _LOGGER.debug(
+            "Applying effect for state '%s': %s", state_name, config["effect"]
+        )
         self.run_action(config["effect"], config["color"], config["brightness"])
-        
+
         if publish_state:
             config["state_name"] = state_name
             self.event_bus.publish("publish_state_to_mqtt", config)
-            
+
-    async def startup_sequence(self, color=None, brightness=None): await self.blink(_GREEN, 1.0)
+    # -----------------------------------------------------------------------
-    async def off(self, color, brightness): self.leds.fill(_OFF); self.leds.show()
+    # LED effect coroutines
-    async def solid(self, color: Tuple[int, int, int], brightness: float):
+    # -----------------------------------------------------------------------
-        r, g, b = color
+
-        self.leds.fill((int(r * brightness), int(g * brightness), int(b * brightness)))
+    async def startup_sequence(self, color=None, brightness=None):
+        await self.blink(_GREEN, 1.0)
+
+    async def off(self, color, brightness):
+        if not (self._enabled and self._is_ready):
+            return
+        self.leds.fill(_OFF)
         self.leds.show()
-    async def blink(self, color, brightness=1.0): await self.medium_blink(color, brightness)
+
-    
+    async def solid(self, color: Tuple[int, int, int], brightness: float):
-    async def _base_pulse(self, color: Tuple[int, int, int], brightness: float, speed: float):
+        if not (self._enabled and self._is_ready):
+            return
+        r, g, b = color
+        self.leds.fill(
+            (int(r * brightness), int(g * brightness), int(b * brightness))
+        )
+        self.leds.show()
+
+    async def blink(self, color, brightness=1.0):
+        await self.medium_blink(color, brightness)
+
+    async def _base_pulse(
+        self, color: Tuple[int, int, int], brightness: float, speed: float
+    ):
+        if not (self._enabled and self._is_ready):
+            return
         try:
             r, g, b = color
             while True:
                 for i in range(0, 101, 10):
                     mod = i / 100.0 * brightness
-                    self.leds.fill((int(r*mod), int(g*mod), int(b*mod))); self.leds.show(); await asyncio.sleep(speed)
+                    self.leds.fill(
+                        (int(r * mod), int(g * mod), int(b * mod))
+                    )
+                    self.leds.show()
+                    await asyncio.sleep(speed)
                 for i in range(100, -1, -10):
                     mod = i / 100.0 * brightness
-                    self.leds.fill((int(r*mod), int(g*mod), int(b*mod))); self.leds.show(); await asyncio.sleep(speed)
+                    self.leds.fill(
-        except asyncio.CancelledError: self.leds.fill(_OFF); self.leds.show()
+                        (int(r * mod), int(g * mod), int(b * mod))
-    async def slow_pulse(self, color, brightness): await self._base_pulse(color, brightness, 0.05)
+                    )
-    async def medium_pulse(self, color, brightness): await self._base_pulse(color, brightness, 0.02)
+                    self.leds.show()
-    async def fast_pulse(self, color, brightness): await self._base_pulse(color, brightness, 0.008)
+                    await asyncio.sleep(speed)
-    
+        except asyncio.CancelledError:
-    async def _base_blink(self, color: Tuple[int, int, int], brightness: float, speed: float):
+            if self._enabled and self._is_ready:
+                self.leds.fill(_OFF)
+                self.leds.show()
+
+    async def slow_pulse(self, color, brightness):
+        await self._base_pulse(color, brightness, 0.05)
+
+    async def medium_pulse(self, color, brightness):
+        await self._base_pulse(color, brightness, 0.02)
+
+    async def fast_pulse(self, color, brightness):
+        await self._base_pulse(color, brightness, 0.008)
+
+    async def _base_blink(
+        self, color: Tuple[int, int, int], brightness: float, speed: float
+    ):
+        if not (self._enabled and self._is_ready):
+            return
         try:
             r, g, b = color
-            bright_color = (int(r * brightness), int(g * brightness), int(b * brightness))
+            bright_color = (
+                int(r * brightness),
+                int(g * brightness),
+                int(b * brightness),
+            )
             while True:
-                self.leds.fill(bright_color); self.leds.show(); await asyncio.sleep(speed)
+                self.leds.fill(bright_color)
-                self.leds.fill(_OFF); self.leds.show(); await asyncio.sleep(speed)
+                self.leds.show()
-        except asyncio.CancelledError: self.leds.fill(_OFF); self.leds.show()
+                await asyncio.sleep(speed)
-    async def slow_blink(self, color, brightness): await self._base_blink(color, brightness, 1.0)
+                self.leds.fill(_OFF)
-    async def medium_blink(self, color, brightness): await self._base_blink(color, brightness, 0.5)
+                self.leds.show()
-    async def fast_blink(self, color, brightness): await self._base_blink(color, brightness, 0.1)
+                await asyncio.sleep(speed)
+        except asyncio.CancelledError:
+            if self._enabled and self._is_ready:
+                self.leds.fill(_OFF)
+                self.leds.show()
 
-    async def spin(self, color: Tuple[int, int, int], brightness: float, speed: float = 0.1):
+    async def slow_blink(self, color, brightness):
+        await self._base_blink(color, brightness, 1.0)
+
+    async def medium_blink(self, color, brightness):
+        await self._base_blink(color, brightness, 0.5)
+
+    async def fast_blink(self, color, brightness):
+        await self._base_blink(color, brightness, 0.1)
+
+    async def spin(
+        self, color: Tuple[int, int, int], brightness: float, speed: float = 0.1
+    ):
+        if not (self._enabled and self._is_ready):
+            return
         try:
             i = 0
-            bright_color = (int(color[0] * brightness), int(color[1] * brightness), int(color[2] * brightness))
+            bright_color = (
+                int(color[0] * brightness),
+                int(color[1] * brightness),
+                int(color[2] * brightness),
+            )
             while True:
-                self.leds.fill(_OFF); self.leds[i % self.num_leds] = bright_color; self.leds.show(); i += 1; await asyncio.sleep(speed)
+                self.leds.fill(_OFF)
-        except asyncio.CancelledError: self.leds.fill(_OFF); self.leds.show()
+                self.leds[i % self.num_leds] = bright_color
+                self.leds.show()
+                i += 1
+                await asyncio.sleep(speed)
+        except asyncio.CancelledError:
+            if self._enabled and self._is_ready:
+                self.leds.fill(_OFF)
+                self.leds.show()
+
+    # -----------------------------------------------------------------------
+    # State Subscriptions
+    # -----------------------------------------------------------------------
 
-    # --- State Subscriptions ---
     @subscribe
-    def voice_idle(self, data: dict): self._apply_state_effect("idle")
+    def voice_idle(self, data: dict):
+        self._apply_state_effect("idle")
+
     @subscribe
-    def voice_listen(self, data: dict): self._apply_state_effect("listening")
+    def voice_listen(self, data: dict):
+        self._apply_state_effect("listening")
+
     @subscribe
-    def voice_thinking(self, data: dict): self._apply_state_effect("thinking")
+    def voice_thinking(self, data: dict):
+        self._apply_state_effect("thinking")
+
     @subscribe
-    def voice_responding(self, data: dict): self._apply_state_effect("responding")
+    def voice_responding(self, data: dict):
+        self._apply_state_effect("responding")
+
     @subscribe
-    def voice_error(self, data: dict): self._apply_state_effect("error")
+    def voice_error(self, data: dict):
+        self._apply_state_effect("error")
+
     @subscribe
-    def mic_muted(self, data: dict): self.run_action("solid", _DIM_RED, 1.0)
+    def mic_muted(self, data: dict):
+        self.run_action("solid", _DIM_RED, 1.0)
+
     @subscribe
-    def mic_unmuted(self, data: dict): self._apply_state_effect("idle")
+    def mic_unmuted(self, data: dict):
-    
+        self._apply_state_effect("idle")
-    # --- MQTT Config Subscriptions ---
+
-    
+    # -----------------------------------------------------------------------
+    # MQTT Config Subscriptions
+    # -----------------------------------------------------------------------
+
     def _update_config(self, state_name: str, data: dict, apply: bool):
-        config = self.configs[state_name]; changed = False; is_retained = data.get("retained", False)
+        config = self.configs[state_name]
+        changed = False
+        is_retained = data.get("retained", False)
+
         new_effect = data.get("effect")
-        if new_effect is not None and config["effect"] != new_effect: config["effect"] = new_effect; changed = True
+        if new_effect is not None and config["effect"] != new_effect:
+            config["effect"] = new_effect
+            changed = True
+
         new_color_data = data.get("color")
         if new_color_data is not None:
-             new_color_tuple = (new_color_data.get("r"), new_color_data.get("g"), new_color_data.get("b"))
+            new_color_tuple = (
-             if config["color"] != new_color_tuple: config["color"] = new_color_tuple; changed = True
+                new_color_data.get("r"),
+                new_color_data.get("g"),
+                new_color_data.get("b"),
+            )
+            if config["color"] != new_color_tuple:
+                config["color"] = new_color_tuple
+                changed = True
+
         new_brightness = data.get("brightness")
         if new_brightness is not None:
             new_brightness_float = new_brightness / 255.0
-            if abs(config["brightness"] - new_brightness_float) > 0.001: config["brightness"] = new_brightness_float; changed = True
+            if abs(config["brightness"] - new_brightness_float) > 0.001:
+                config["brightness"] = new_brightness_float
+                changed = True
+
         if is_retained:
-            if changed and state_name == "idle": self._apply_state_effect("idle", publish_state=False)
+            if changed and state_name == "idle":
+                # Re-apply idle but don't republish back to MQTT
+                self._apply_state_effect("idle", publish_state=False)
             return
+
         if changed:
-            if apply: self._apply_state_effect(state_name)
+            if apply:
-            else: config["state_name"] = state_name; self.event_bus.publish("publish_state_to_mqtt", config)
+                self._apply_state_effect(state_name)
-    
+            else:
+                config["state_name"] = state_name
+                self.event_bus.publish("publish_state_to_mqtt", config)
+
     @subscribe
-    def set_idle_effect(self, data: dict): self._update_config("idle", data, True)
+    def set_idle_effect(self, data: dict):
+        self._update_config("idle", data, True)
+
     @subscribe
-    def set_idle_color(self, data: dict): self._update_config("idle", data, self.configs["idle"]["effect"] != "off")
+    def set_idle_color(self, data: dict):
+        self._update_config(
+            "idle",
+            data,
+            self.configs["idle"]["effect"] != "off",
+        )
+
     @subscribe
-    def set_listening_effect(self, data: dict): self._update_config("listening", data, False)
+    def set_listening_effect(self, data: dict):
+        self._update_config("listening", data, False)
+
     @subscribe
-    def set_listening_color(self, data: dict): self._update_config("listening", data, False)
+    def set_listening_color(self, data: dict):
+        self._update_config("listening", data, False)
+
     @subscribe
-    def set_thinking_effect(self, data: dict): self._update_config("thinking", data, False)
+    def set_thinking_effect(self, data: dict):
+        self._update_config("thinking", data, False)
+
     @subscribe
-    def set_thinking_color(self, data: dict): self._update_config("thinking", data, False)
+    def set_thinking_color(self, data: dict):
+        self._update_config("thinking", data, False)
+
     @subscribe
-    def set_responding_effect(self, data: dict): self._update_config("responding", data, False)
+    def set_responding_effect(self, data: dict):
+        self._update_config("responding", data, False)
+
     @subscribe
-    def set_responding_color(self, data: dict): self._update_config("responding", data, False)
+    def set_responding_color(self, data: dict):
+        self._update_config("responding", data, False)
+
     @subscribe
-    def set_error_effect(self, data: dict): self._update_config("error", data, False)
+    def set_error_effect(self, data: dict):
+        self._update_config("error", data, False)
+
     @subscribe
-    def set_error_color(self, data: dict): self._update_config("error", data, False)
+    def set_error_color(self, data: dict):
-    
+        self._update_config("error", data, False)
+
     @subscribe
     def set_num_leds(self, data: dict):
         num_leds = data.get("num_leds")
         if (num_leds is not None) and (self.num_leds != num_leds):
-             _LOGGER.info("Number of LEDs changed to %d. Please restart for change to take effect.", num_leds)
+            _LOGGER.info(
+                "Number of LEDs changed to %d. Please restart for change to take effect.",
+                num_leds,
+            )