conson-xp 1.52.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

xp/term/homekit.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from typing import Any, Optional
 
 from textual.app import App, ComposeResult
+from textual.widgets import DataTable
 
 from xp.services.term.homekit_service import HomekitService
 from xp.term.widgets.room_list import RoomListWidget
@@ -14,11 +15,13 @@ class HomekitApp(App[None]):
     """
     Textual app for HomeKit accessory monitoring.
 
-    Displays rooms and accessories with real-time state updates
-    and toggle control via action keys.
+    Displays rooms and accessories with real-time state updates.
+    Select accessory with action key, then perform action on selection.
 
     Attributes:
         homekit_service: HomekitService for accessory state operations.
+        selected_accessory_id: Currently selected accessory ID.
+        _last_cursor_row: Last cursor row for direction detection.
         CSS_PATH: Path to CSS stylesheet file.
         BINDINGS: Keyboard bindings for app actions.
         TITLE: Application title displayed in header.
@@ -32,7 +35,12 @@ class HomekitApp(App[None]):
     BINDINGS = [
         ("Q", "quit", "Quit"),
         ("C", "toggle_connection", "Connect"),
-        ("r", "refresh_all", "Refresh"),
+        ("R", "refresh_all", "Refresh"),
+        ("space", "toggle_selected", "Toggle"),
+        ("full_stop", "turn_on_selected", "On"),
+        ("minus", "turn_off_selected", "Off"),
+        ("plus", "dim_up", "Dim+"),
+        ("quotation_mark", "dim_down", "Dim-"),
     ]
 
     def __init__(self, homekit_service: HomekitService) -> None:
@@ -44,6 +52,8 @@ class HomekitApp(App[None]):
         """
         super().__init__()
         self.homekit_service: HomekitService = homekit_service
+        self.selected_accessory_id: Optional[str] = None
+        self._last_cursor_row: int = 0
         self.room_list_widget: Optional[RoomListWidget] = None
         self.footer_widget: Optional[StatusFooterWidget] = None
 
@@ -87,17 +97,114 @@ class HomekitApp(App[None]):
 
     def on_key(self, event: Any) -> None:
         """
-        Handle key press events for action keys.
+        Handle key press events for selection and action keys.
 
-        Intercepts a-z keys to toggle accessories.
+        Selection keys (a-z0-9): Select accessory row.
+        Action keys (on selected accessory):
+        - Space: Toggle
+        - . : Turn ON
+        - - : Turn OFF
+        - + : Dim up
+        - " : Dim down
 
         Args:
             event: Key press event.
         """
-        key = event.key.lower()
-        if len(key) == 1 and "a" <= key <= "z":
-            if self.homekit_service.toggle_accessory(key):
+        key = event.key
+
+        # Selection keys (a-z0-9)
+        if len(key) == 1 and (("a" <= key <= "z") or ("0" <= key <= "9")):
+            accessory_id = self.homekit_service.select_accessory(key)
+            if accessory_id:
+                self.selected_accessory_id = accessory_id
+                self._select_row(key)
                 event.prevent_default()
+            return
+
+        # Action keys (require selection)
+        if not self.selected_accessory_id:
+            return
+
+        if key == "space":
+            self.homekit_service.toggle_selected(self.selected_accessory_id)
+            event.prevent_default()
+        elif key in ("full_stop", "."):
+            self.homekit_service.turn_on_selected(self.selected_accessory_id)
+            event.prevent_default()
+        elif key in ("minus", "-"):
+            self.homekit_service.turn_off_selected(self.selected_accessory_id)
+            event.prevent_default()
+        elif key in ("plus", "+"):
+            self.homekit_service.increase_dimmer(self.selected_accessory_id)
+            event.prevent_default()
+        elif key in ("quotation_mark", '"'):
+            self.homekit_service.decrease_dimmer(self.selected_accessory_id)
+            event.prevent_default()
+
+    def _select_row(self, action_key: str) -> None:
+        """
+        Select row in RoomListWidget by action key.
+
+        Args:
+            action_key: Action key to select.
+        """
+        if self.room_list_widget:
+            self.room_list_widget.select_by_action_key(action_key)
+
+    def on_data_table_row_highlighted(self, event: DataTable.RowHighlighted) -> None:
+        """
+        Handle row highlight changes from arrow key navigation.
+
+        Updates selected_accessory_id when cursor moves via arrow keys.
+        Skips non-accessory rows (layout rows) automatically.
+
+        Args:
+            event: Row highlighted event from DataTable.
+        """
+        if not self.room_list_widget or not event.row_key:
+            return
+
+        accessory_id = self.room_list_widget.get_accessory_id_for_row(event.row_key)
+        if accessory_id:
+            self.selected_accessory_id = accessory_id
+            self._last_cursor_row = event.cursor_row
+        else:
+            # Non-accessory row (layout), skip to next valid row
+            self._skip_to_accessory_row(event.cursor_row)
+
+    def _skip_to_accessory_row(self, current_row: int) -> None:
+        """
+        Skip cursor to the nearest accessory row.
+
+        Args:
+            current_row: Current cursor row index.
+        """
+        if not self.room_list_widget or not self.room_list_widget.table:
+            return
+
+        table = self.room_list_widget.table
+        row_count = table.row_count
+
+        # Determine direction based on last position
+        direction = 1 if current_row >= self._last_cursor_row else -1
+
+        # Search for next accessory row in direction
+        next_row = current_row + direction
+        while 0 <= next_row < row_count:
+            row_key = self.room_list_widget.get_row_key_at_index(next_row)
+            if row_key and self.room_list_widget.get_accessory_id_for_row(row_key):
+                table.move_cursor(row=next_row)
+                return
+            next_row += direction
+
+        # If not found in direction, try opposite direction
+        next_row = current_row - direction
+        while 0 <= next_row < row_count:
+            row_key = self.room_list_widget.get_row_key_at_index(next_row)
+            if row_key and self.room_list_widget.get_accessory_id_for_row(row_key):
+                table.move_cursor(row=next_row)
+                return
+            next_row -= direction
 
     def action_toggle_connection(self) -> None:
         """
@@ -111,6 +218,31 @@ class HomekitApp(App[None]):
         """Refresh all module data on 'r' key press."""
         self.homekit_service.refresh_all()
 
+    def action_toggle_selected(self) -> None:
+        """Toggle selected accessory."""
+        if self.selected_accessory_id:
+            self.homekit_service.toggle_selected(self.selected_accessory_id)
+
+    def action_turn_on_selected(self) -> None:
+        """Turn on selected accessory."""
+        if self.selected_accessory_id:
+            self.homekit_service.turn_on_selected(self.selected_accessory_id)
+
+    def action_turn_off_selected(self) -> None:
+        """Turn off selected accessory."""
+        if self.selected_accessory_id:
+            self.homekit_service.turn_off_selected(self.selected_accessory_id)
+
+    def action_dim_up(self) -> None:
+        """Increase dimmer on selected accessory."""
+        if self.selected_accessory_id:
+            self.homekit_service.increase_dimmer(self.selected_accessory_id)
+
+    def action_dim_down(self) -> None:
+        """Decrease dimmer on selected accessory."""
+        if self.selected_accessory_id:
+            self.homekit_service.decrease_dimmer(self.selected_accessory_id)
+
     async def on_unmount(self) -> None:
         """Stop AccessoryDriver and clean up service when app unmounts."""
         await self.homekit_service.stop()

xp/term/homekit.tcss

@@ -45,13 +45,13 @@ DataTable > .datatable--header {
 }
 
 DataTable > .datatable--cursor {
-    background: $background;
-    color: $success;
+    background: $success;
+    color: $background;
 }
 
 DataTable:focus > .datatable--cursor {
-    background: $background;
-    color: $success;
+    background: $success;
+    color: $background;
 }
 
 /* Footer styling */

xp/term/widgets/room_list.py

@@ -41,6 +41,9 @@ class RoomListWidget(Static):
         self.service = service
         self.table: Optional[DataTable] = None
         self._row_keys: dict[str, Any] = {}  # Map accessory_id to row key
+        self._row_to_accessory: dict[Any, str] = {}  # Map row key to accessory_id
+        self._row_index_to_key: list[Any] = []  # Map row index to row key
+        self._action_to_row: dict[str, Any] = {}  # Map action key to row key
         self._current_room: str = ""
 
     def compose(self) -> ComposeResult:
@@ -93,15 +96,23 @@ class RoomListWidget(Static):
 
         self.table.clear()
         self._row_keys.clear()
+        self._row_to_accessory.clear()
+        self._row_index_to_key.clear()
+        self._action_to_row.clear()
         self._current_room = ""
 
         for state in accessory_states:
             # Add room header row if new room
             if state.room_name != self._current_room:
                 self._current_room = state.room_name
-                self.table.add_row()
-                self.table.add_row(Text(state.room_name, style="bold"))
-                self.table.add_row()
+                # Add layout rows (empty and header) - not selectable
+                self._row_index_to_key.extend(
+                    [
+                        self.table.add_row(),
+                        self.table.add_row(Text(state.room_name, style="bold")),
+                        self.table.add_row(),
+                    ]
+                )
 
             self._add_accessory_row(state)
 
@@ -160,6 +171,10 @@ class RoomListWidget(Static):
             Text(self._format_last_update(state.last_update), justify="center"),
         )
         self._row_keys[accessory_id] = row_key
+        self._row_to_accessory[row_key] = accessory_id
+        self._row_index_to_key.append(row_key)
+        if state.action:
+            self._action_to_row[state.action] = row_key
 
     def _format_dim(self, state: AccessoryState) -> str:
         """
@@ -230,3 +245,46 @@ class RoomListWidget(Static):
                         justify="center",
                     ),
                 )
+
+    def select_by_action_key(self, action_key: str) -> None:
+        """
+        Select and highlight row by action key.
+
+        Moves the table cursor to the row corresponding to the action key.
+
+        Args:
+            action_key: Action key (a-z0-9) to select.
+        """
+        if not self.table:
+            return
+
+        row_key = self._action_to_row.get(action_key)
+        if row_key is not None:
+            row_index = self.table.get_row_index(row_key)
+            self.table.move_cursor(row=row_index)
+
+    def get_accessory_id_for_row(self, row_key: Any) -> Optional[str]:
+        """
+        Get accessory ID for a row key.
+
+        Args:
+            row_key: DataTable row key.
+
+        Returns:
+            Accessory ID if found, None otherwise.
+        """
+        return self._row_to_accessory.get(row_key)
+
+    def get_row_key_at_index(self, index: int) -> Optional[Any]:
+        """
+        Get row key at a given index.
+
+        Args:
+            index: Row index.
+
+        Returns:
+            Row key if valid index, None otherwise.
+        """
+        if 0 <= index < len(self._row_index_to_key):
+            return self._row_index_to_key[index]
+        return None

xp/utils/dependencies.py

@@ -1,9 +1,7 @@
 """Dependency injection container for XP services."""
 
 import punq
-from bubus import EventBus
 from twisted.internet import asyncioreactor
-from twisted.internet.interfaces import IConnector
 from twisted.internet.posixbase import PosixReactorBase
 
 from xp.models import ConbusClientConfig
@@ -55,19 +53,9 @@ from xp.services.conbus.conbus_raw_service import ConbusRawService
 from xp.services.conbus.conbus_receive_service import ConbusReceiveService
 from xp.services.conbus.conbus_scan_service import ConbusScanService
 from xp.services.conbus.write_config_service import WriteConfigService
-from xp.services.homekit.homekit_cache_service import HomeKitCacheService
-from xp.services.homekit.homekit_conbus_service import HomeKitConbusService
-from xp.services.homekit.homekit_dimminglight_service import HomeKitDimmingLightService
-from xp.services.homekit.homekit_hap_service import HomekitHapService
-from xp.services.homekit.homekit_lightbulb_service import HomeKitLightbulbService
-from xp.services.homekit.homekit_module_service import HomekitModuleService
-from xp.services.homekit.homekit_outlet_service import HomeKitOutletService
-from xp.services.homekit.homekit_service import HomeKitService
 from xp.services.log_file_service import LogFileService
 from xp.services.module_type_service import ModuleTypeService
 from xp.services.protocol import ConbusEventProtocol
-from xp.services.protocol.protocol_factory import TelegramFactory
-from xp.services.protocol.telegram_protocol import TelegramProtocol
 from xp.services.reverse_proxy_service import ReverseProxyService
 from xp.services.server.device_service_factory import DeviceServiceFactory
 from xp.services.server.server_service import ServerService
@@ -169,7 +157,24 @@ class ServiceContainer:
         self.container.register(TelegramDatapointService, scope=punq.Scope.singleton)
         self.container.register(LinkNumberService, scope=punq.Scope.singleton)
 
+        # Reactor
+        self.container.register(
+            PosixReactorBase,
+            factory=lambda: reactor,
+            scope=punq.Scope.singleton,
+        )
+
         # Conbus services layer
+        self.container.register(
+            ConbusEventProtocol,
+            factory=lambda: ConbusEventProtocol(
+                cli_config=self.container.resolve(ConbusClientConfig),
+                reactor=self.container.resolve(PosixReactorBase),
+                telegram_service=self.container.resolve(TelegramService),
+            ),
+            scope=punq.Scope.singleton,
+        )
+
         self.container.register(
             ConbusDatapointService,
             factory=lambda: ConbusDatapointService(
@@ -196,16 +201,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        self.container.register(
-            ConbusEventProtocol,
-            factory=lambda: ConbusEventProtocol(
-                cli_config=self.container.resolve(ConbusClientConfig),
-                reactor=self.container.resolve(PosixReactorBase),
-                telegram_service=self.container.resolve(TelegramService),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
         self.container.register(
             ConbusDiscoverService,
             factory=lambda: ConbusDiscoverService(
@@ -268,6 +263,13 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
+        # HomeKit config
+        self.container.register(
+            HomekitConfig,
+            factory=lambda: HomekitConfig.from_yaml(self._homekit_config_path),
+            scope=punq.Scope.singleton,
+        )
+
         self.container.register(
             HomekitAccessoryDriver,
             factory=lambda: HomekitAccessoryDriver(
@@ -441,39 +443,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        # HomeKit services layer
-        self.container.register(
-            HomekitModuleService,
-            factory=lambda: HomekitModuleService(
-                conson_modules_config=self.container.resolve(ConsonModuleListConfig),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        # Create event bus
-        self.container.register(
-            EventBus,
-            factory=lambda: EventBus(max_history_size=500),
-            scope=punq.Scope.singleton,
-        )
-
-        # HomeKit conson config
-        self.container.register(
-            HomekitConfig,
-            factory=lambda: HomekitConfig.from_yaml(self._homekit_config_path),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomekitHapService,
-            factory=lambda: HomekitHapService(
-                homekit_config=self.container.resolve(HomekitConfig),
-                module_service=self.container.resolve(HomekitModuleService),
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
         # Log file services layer
         self.container.register(
             LogFileService,
@@ -536,105 +505,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        # Create protocol with built-in debouncing
-        self.container.register(
-            TelegramProtocol,
-            factory=lambda: TelegramProtocol(
-                event_bus=self.container.resolve(EventBus),
-                debounce_ms=50,
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            IConnector,
-            factory=lambda: reactor,
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            TelegramFactory,
-            factory=lambda: TelegramFactory(
-                event_bus=self.container.resolve(EventBus),
-                telegram_protocol=self.container.resolve(TelegramProtocol),
-                connector=self.container.resolve(IConnector),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            PosixReactorBase,
-            factory=lambda: reactor,
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitLightbulbService,
-            factory=lambda: HomeKitLightbulbService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitOutletService,
-            factory=lambda: HomeKitOutletService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitDimmingLightService,
-            factory=lambda: HomeKitDimmingLightService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        # Cache service must be registered BEFORE HomeKitConbusService
-        # so it intercepts ReadDatapointEvent first
-        self.container.register(
-            HomeKitCacheService,
-            factory=lambda: HomeKitCacheService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitConbusService,
-            factory=lambda: HomeKitConbusService(
-                event_bus=self.container.resolve(EventBus),
-                telegram_protocol=self.container.resolve(TelegramProtocol),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            TelegramService,
-            factory=TelegramService,
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitService,
-            factory=lambda: HomeKitService(
-                cli_config=self.container.resolve(ConbusClientConfig),
-                event_bus=self.container.resolve(EventBus),
-                telegram_factory=self.container.resolve(TelegramFactory),
-                reactor=self.container.resolve(PosixReactorBase),
-                lightbulb_service=self.container.resolve(HomeKitLightbulbService),
-                outlet_service=self.container.resolve(HomeKitOutletService),
-                dimminglight_service=self.container.resolve(HomeKitDimmingLightService),
-                cache_service=self.container.resolve(HomeKitCacheService),
-                conbus_service=self.container.resolve(HomeKitConbusService),
-                module_factory=self.container.resolve(HomekitHapService),
-                telegram_service=self.container.resolve(TelegramService),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
     def _load_protocol_keys(self) -> "ProtocolKeysConfig":
         """
         Load protocol keys from YAML config file.

xp/cli/commands/homekit/__init__.py

@@ -1,3 +0,0 @@
-"""HomeKit CLI commands package."""
-
-__all__ = []

xp/cli/commands/homekit/homekit.py

@@ -1,120 +0,0 @@
-"""HomeKit management CLI commands."""
-
-import click
-from click_help_colors import HelpColorsGroup
-
-from xp.cli.utils.decorators import service_command
-
-
-@click.group(
-    cls=HelpColorsGroup, help_headers_color="yellow", help_options_color="green"
-)
-def homekit() -> None:
-    """Manage the HomeKit server for XP Protocol operations."""
-    pass
-
-
-@homekit.group(
-    cls=HelpColorsGroup, help_headers_color="yellow", help_options_color="green"
-)
-def config() -> None:
-    """Manage HomeKit configuration."""
-    pass
-
-
-@config.command()
-@click.option(
-    "--conson-config",
-    default="conson.yml",
-    help="Path to conson.yml configuration file",
-)
-@click.option(
-    "--homekit-config",
-    default="homekit.yml",
-    help="Path to homekit.yml configuration file",
-)
-@service_command()
-def validate(conson_config: str, homekit_config: str) -> None:
-    """
-    Validate homekit.yml and conson.yml coherence.
-
-    Args:
-        conson_config: Path to conson.yml configuration file.
-        homekit_config: Path to homekit.yml configuration file.
-    """
-    from xp.services.homekit.homekit_config_validator import ConfigValidationService
-
-    try:
-        validator = ConfigValidationService(conson_config, homekit_config)
-        results = validator.validate_all()
-
-        if results["is_valid"]:
-            click.echo(click.style("✓ Configuration validation passed", fg="green"))
-        else:
-            click.echo(
-                click.style(
-                    f"✗ Configuration validation failed with {results['total_errors']} errors",
-                    fg="red",
-                )
-            )
-
-            if results["conson_errors"]:
-                click.echo(
-                    click.style("\nConson Configuration Errors:", fg="red", bold=True)
-                )
-                for error in results["conson_errors"]:
-                    click.echo(f"  - {error}")
-
-            if results["homekit_errors"]:
-                click.echo(
-                    click.style("\nHomeKit Configuration Errors:", fg="red", bold=True)
-                )
-                for error in results["homekit_errors"]:
-                    click.echo(f"  - {error}")
-
-            if results["cross_reference_errors"]:
-                click.echo(
-                    click.style("\nCross-Reference Errors:", fg="red", bold=True)
-                )
-                for error in results["cross_reference_errors"]:
-                    click.echo(f"  - {error}")
-
-            exit(1)
-
-    except Exception as e:
-        click.echo(click.style(f"✗ Validation failed: {e}", fg="red"))
-        exit(1)
-
-
-@config.command("show")
-@click.option(
-    "--conson-config",
-    default="conson.yml",
-    help="Path to conson.yml configuration file",
-)
-@click.option(
-    "--homekit-config",
-    default="homekit.yml",
-    help="Path to homekit.yml configuration file",
-)
-@service_command()
-def show_config(conson_config: str, homekit_config: str) -> None:
-    """
-    Display parsed configuration summary.
-
-    Args:
-        conson_config: Path to conson.yml configuration file.
-        homekit_config: Path to homekit.yml configuration file.
-    """
-    from xp.services.homekit.homekit_config_validator import ConfigValidationService
-
-    try:
-        validator = ConfigValidationService(conson_config, homekit_config)
-        summary = validator.print_config_summary()
-
-        click.echo(click.style("Configuration Summary:", fg="blue", bold=True))
-        click.echo(summary)
-
-    except Exception as e:
-        click.echo(click.style(f"✗ Failed to load configuration: {e}", fg="red"))
-        exit(1)