conson-xp 1.46.0__py3-none-any.whl → 1.48.0__py3-none-any.whl

xp/services/term/state_monitor_service.py

@@ -20,7 +20,8 @@ from xp.services.telegram.telegram_service import TelegramService
 
 
 class StateMonitorService:
-    """Service for module state monitoring in terminal interface.
+    """
+    Service for module state monitoring in terminal interface.
 
     Wraps ConbusEventProtocol and ConsonModuleListConfig to provide
     high-level module state tracking for the TUI.
@@ -48,7 +49,8 @@ class StateMonitorService:
         conson_config: ConsonModuleListConfig,
         telegram_service: TelegramService,
     ) -> None:
-        """Initialize the State Monitor service.
+        """
+        Initialize the State Monitor service.
 
         Args:
             conbus_protocol: ConbusEventProtocol instance.
@@ -109,7 +111,8 @@ class StateMonitorService:
 
     @property
     def connection_state(self) -> ConnectionState:
-        """Get current connection state.
+        """
+        Get current connection state.
 
         Returns:
             Current connection state.
@@ -118,7 +121,8 @@ class StateMonitorService:
 
     @property
     def server_info(self) -> str:
-        """Get server connection info (IP:port).
+        """
+        Get server connection info (IP:port).
 
         Returns:
             Server address in format "IP:port".
@@ -127,7 +131,8 @@ class StateMonitorService:
 
     @property
     def module_states(self) -> List[ModuleState]:
-        """Get all module states.
+        """
+        Get all module states.
 
         Returns:
             List of all module states.
@@ -172,10 +177,11 @@ class StateMonitorService:
             self.on_status_message.emit("Disconnected")
 
     def toggle_connection(self) -> None:
-        """Toggle connection state between connected and disconnected.
+        """
+        Toggle connection state between connected and disconnected.
 
-        Disconnects if currently connected or connecting.
-        Connects if currently disconnected or failed.
+        Disconnects if currently connected or connecting. Connects if currently
+        disconnected or failed.
         """
         if self._connection_state in (
             ConnectionState.CONNECTED,
@@ -186,10 +192,12 @@ class StateMonitorService:
             self.connect()
 
     def refresh_all(self) -> None:
-        """Refresh all module states.
+        """
+        Refresh all module states.
 
-        Queries module_output_state datapoint for eligible modules (XP24, XP33LR, XP33LED).
-        Updates outputs column and last_update timestamp for each queried module.
+        Queries module_output_state datapoint for eligible modules (XP24, XP33LR,
+        XP33LED). Updates outputs column and last_update timestamp for each queried
+        module.
         """
         self.on_status_message.emit("Refreshing module states...")
 
@@ -205,7 +213,8 @@ class StateMonitorService:
                 )
 
     def _query_module_output_state(self, serial_number: str) -> None:
-        """Query module output state datapoint.
+        """
+        Query module output state datapoint.
 
         Args:
             serial_number: Module serial number to query.
@@ -228,7 +237,8 @@ class StateMonitorService:
             self.on_module_list_updated.emit(self.module_states)
 
     def _on_connection_failed(self, failure: Exception) -> None:
-        """Handle connection failed event.
+        """
+        Handle connection failed event.
 
         Args:
             failure: Exception that caused the failure.
@@ -239,7 +249,8 @@ class StateMonitorService:
             self.on_status_message.emit(f"Connection failed: {failure}")
 
     def _on_telegram_received(self, event: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Routes telegrams to appropriate handlers based on type.
         Processes reply telegrams for datapoint queries and event telegrams for state changes.
@@ -254,7 +265,8 @@ class StateMonitorService:
             self._handle_event_telegram(event)
 
     def _handle_reply_telegram(self, event: TelegramReceivedEvent) -> None:
-        """Handle reply telegram for datapoint queries.
+        """
+        Handle reply telegram for datapoint queries.
 
         Args:
             event: Telegram received event.
@@ -290,7 +302,8 @@ class StateMonitorService:
         self.on_status_message.emit("Connection timeout")
 
     def _on_failed(self, failure: Exception) -> None:
-        """Handle protocol failure event.
+        """
+        Handle protocol failure event.
 
         Args:
             failure: Exception that caused the failure.
@@ -301,7 +314,8 @@ class StateMonitorService:
             self.on_status_message.emit(f"Protocol error: {failure}")
 
     def _find_module_by_link(self, link_number: int) -> Optional[ModuleState]:
-        """Find module state by link number.
+        """
+        Find module state by link number.
 
         Args:
             link_number: Link number to search for.
@@ -317,7 +331,8 @@ class StateMonitorService:
     def _update_output_bit(
         self, module_state: ModuleState, output_number: int, output_state: bool
     ) -> None:
-        """Update a single output bit in module state.
+        """
+        Update a single output bit in module state.
 
         Args:
             module_state: Module state to update.
@@ -338,7 +353,8 @@ class StateMonitorService:
         module_state.outputs = " ".join(outputs)
 
     def _handle_event_telegram(self, event: TelegramReceivedEvent) -> None:
-        """Handle event telegram for output state changes.
+        """
+        Handle event telegram for output state changes.
 
         Processes XP24 and XP33 output event telegrams to update module state in real-time.
         - XP24 output events use input_number 80-83 to represent outputs 0-3.
@@ -415,7 +431,8 @@ class StateMonitorService:
         self.logger.debug("StateMonitorService cleaned up")
 
     def __enter__(self) -> "StateMonitorService":
-        """Context manager entry.
+        """
+        Context manager entry.
 
         Returns:
             Self for context manager.
@@ -423,7 +440,8 @@ class StateMonitorService:
         return self
 
     def __exit__(self, _exc_type: object, _exc_val: object, _exc_tb: object) -> None:
-        """Context manager exit.
+        """
+        Context manager exit.
 
         Args:
             _exc_type: Exception type.

xp/term/protocol.py

@@ -13,7 +13,8 @@ from xp.term.widgets.status_footer import StatusFooterWidget
 
 
 class ProtocolMonitorApp(App[None]):
-    """Textual app for real-time protocol monitoring.
+    """
+    Textual app for real-time protocol monitoring.
 
     Displays live RX/TX telegram stream from Conbus server in an interactive
     terminal interface with keyboard shortcuts for control.
@@ -38,7 +39,8 @@ class ProtocolMonitorApp(App[None]):
     ]
 
     def __init__(self, protocol_service: ProtocolMonitorService) -> None:
-        """Initialize the Protocol Monitor app.
+        """
+        Initialize the Protocol Monitor app.
 
         Args:
             protocol_service: ProtocolMonitorService for protocol operations.
@@ -50,7 +52,8 @@ class ProtocolMonitorApp(App[None]):
         self.footer_widget: Optional[StatusFooterWidget] = None
 
     def compose(self) -> ComposeResult:
-        """Compose the app layout with widgets.
+        """
+        Compose the app layout with widgets.
 
         Yields:
             ProtocolLogWidget and Footer widgets.
@@ -71,7 +74,8 @@ class ProtocolMonitorApp(App[None]):
         yield self.footer_widget
 
     async def on_mount(self) -> None:
-        """Initialize app after UI is mounted.
+        """
+        Initialize app after UI is mounted.
 
         Delays connection by 0.5s to let UI render first.
         """
@@ -82,7 +86,8 @@ class ProtocolMonitorApp(App[None]):
         self.protocol_service.connect()
 
     def action_toggle_connection(self) -> None:
-        """Toggle connection on 'c' key press.
+        """
+        Toggle connection on 'c' key press.
 
         Connects if disconnected/failed, disconnects if connected/connecting.
         """
@@ -94,7 +99,8 @@ class ProtocolMonitorApp(App[None]):
             self.protocol_widget.clear_log()
 
     def on_key(self, event: Any) -> None:
-        """Handle key press events for protocol keys.
+        """
+        Handle key press events for protocol keys.
 
         Args:
             event: Key press event from Textual.

xp/term/state.py

@@ -11,7 +11,8 @@ from xp.term.widgets.status_footer import StatusFooterWidget
 
 
 class StateMonitorApp(App[None]):
-    """Textual app for module state monitoring.
+    """
+    Textual app for module state monitoring.
 
     Displays module states from Conson configuration in an interactive
     terminal interface with real-time updates.
@@ -35,7 +36,8 @@ class StateMonitorApp(App[None]):
     ]
 
     def __init__(self, state_service: StateMonitorService) -> None:
-        """Initialize the State Monitor app.
+        """
+        Initialize the State Monitor app.
 
         Args:
             state_service: StateMonitorService for module state operations.
@@ -46,7 +48,8 @@ class StateMonitorApp(App[None]):
         self.footer_widget: Optional[StatusFooterWidget] = None
 
     def compose(self) -> ComposeResult:
-        """Compose the app layout with widgets.
+        """
+        Compose the app layout with widgets.
 
         Yields:
             ModulesListWidget and StatusFooterWidget.
@@ -62,10 +65,11 @@ class StateMonitorApp(App[None]):
         yield self.footer_widget
 
     async def on_mount(self) -> None:
-        """Initialize app after UI is mounted.
+        """
+        Initialize app after UI is mounted.
 
-        Delays connection by 0.5s to let UI render first.
-        Sets up automatic screen refresh every second to update elapsed times.
+        Delays connection by 0.5s to let UI render first. Sets up automatic screen
+        refresh every second to update elapsed times.
         """
         import asyncio
 
@@ -82,7 +86,8 @@ class StateMonitorApp(App[None]):
             self.modules_widget.refresh_last_update_times()
 
     def action_toggle_connection(self) -> None:
-        """Toggle connection on 'c' key press.
+        """
+        Toggle connection on 'c' key press.
 
         Connects if disconnected/failed, disconnects if connected/connecting.
         """

xp/term/widgets/help_menu.py

@@ -11,7 +11,8 @@ if TYPE_CHECKING:
 
 
 class HelpMenuWidget(Vertical):
-    """Help menu widget displaying keyboard shortcuts and protocol keys.
+    """
+    Help menu widget displaying keyboard shortcuts and protocol keys.
 
     Displays a table of available keyboard shortcuts mapped to their
     corresponding protocol commands.
@@ -27,7 +28,8 @@ class HelpMenuWidget(Vertical):
         *args: Any,
         **kwargs: Any,
     ) -> None:
-        """Initialize the Help Menu widget.
+        """
+        Initialize the Help Menu widget.
 
         Args:
             service: ProtocolMonitorService instance.
@@ -42,7 +44,8 @@ class HelpMenuWidget(Vertical):
         self.border_title = "Help menu"
 
     def compose(self) -> ComposeResult:
-        """Compose the help menu layout.
+        """
+        Compose the help menu layout.
 
         Yields:
             DataTable widget with key mappings.

xp/term/widgets/modules_list.py

@@ -12,7 +12,8 @@ from xp.services.term.state_monitor_service import StateMonitorService
 
 
 class ModulesListWidget(Static):
-    """Widget displaying module states in a data table.
+    """
+    Widget displaying module states in a data table.
 
     Shows module information with real-time updates from StateMonitorService.
     Table displays: name, serial_number, module_type, link_number, outputs, report, status, last_update.
@@ -28,7 +29,8 @@ class ModulesListWidget(Static):
         *args: Any,
         **kwargs: Any,
     ) -> None:
-        """Initialize the Modules List widget.
+        """
+        Initialize the Modules List widget.
 
         Args:
             service: Optional StateMonitorService for signal subscriptions.
@@ -41,7 +43,8 @@ class ModulesListWidget(Static):
         self._row_keys: dict[str, Any] = {}  # Map serial_number to row key
 
     def compose(self) -> ComposeResult:
-        """Compose the widget layout.
+        """
+        Compose the widget layout.
 
         Yields:
             DataTable widget.
@@ -76,7 +79,8 @@ class ModulesListWidget(Static):
             self.service.on_module_state_changed.disconnect(self.update_module_state)
 
     def update_module_list(self, module_states: List[ModuleState]) -> None:
-        """Update entire module list from service.
+        """
+        Update entire module list from service.
 
         Clears existing table and repopulates with all modules.
 
@@ -95,7 +99,8 @@ class ModulesListWidget(Static):
             self._add_module_row(module_state)
 
     def update_module_state(self, module_state: ModuleState) -> None:
-        """Update individual module state in table.
+        """
+        Update individual module state in table.
 
         Updates existing row if module exists, otherwise adds new row.
 
@@ -133,7 +138,8 @@ class ModulesListWidget(Static):
             self._add_module_row(module_state)
 
     def _add_module_row(self, module_state: ModuleState) -> None:
-        """Add a module row to the table.
+        """
+        Add a module row to the table.
 
         Args:
             module_state: Module state to add.
@@ -154,7 +160,8 @@ class ModulesListWidget(Static):
         self._row_keys[module_state.serial_number] = row_key
 
     def _format_outputs(self, outputs: str) -> str:
-        """Format outputs for display.
+        """
+        Format outputs for display.
 
         Args:
             outputs: Raw output string.
@@ -165,7 +172,8 @@ class ModulesListWidget(Static):
         return outputs
 
     def _format_report(self, auto_report: bool) -> str:
-        """Format auto-report status for display.
+        """
+        Format auto-report status for display.
 
         Args:
             auto_report: Auto-report boolean value.
@@ -176,7 +184,8 @@ class ModulesListWidget(Static):
         return "Y" if auto_report else "N"
 
     def _format_last_update(self, last_update: Optional[datetime]) -> str:
-        """Format last update timestamp for display.
+        """
+        Format last update timestamp for display.
 
         Shows elapsed time in HH:MM:SS format or "--:--:--" if never updated.
 
@@ -200,7 +209,8 @@ class ModulesListWidget(Static):
         return f"{hours:02d}:{minutes:02d}:{seconds:02d}"
 
     def refresh_last_update_times(self) -> None:
-        """Refresh only the last_update column for all modules.
+        """
+        Refresh only the last_update column for all modules.
 
         Updates the elapsed time display without querying the service.
         """

xp/term/widgets/protocol_log.py

@@ -11,7 +11,8 @@ from xp.services.term.protocol_monitor_service import ProtocolMonitorService
 
 
 class ProtocolLogWidget(Widget):
-    """Widget for displaying protocol telegram stream.
+    """
+    Widget for displaying protocol telegram stream.
 
     Displays live RX/TX telegram stream with color-coded direction markers
     via ProtocolMonitorService.
@@ -23,7 +24,8 @@ class ProtocolLogWidget(Widget):
     """
 
     def __init__(self, service: ProtocolMonitorService) -> None:
-        """Initialize the Protocol Log widget.
+        """
+        Initialize the Protocol Log widget.
 
         Args:
             service: ProtocolMonitorService instance for protocol operations.
@@ -35,7 +37,8 @@ class ProtocolLogWidget(Widget):
         self.log_widget: Optional[RichLog] = None
 
     def compose(self) -> Any:
-        """Compose the widget layout.
+        """
+        Compose the widget layout.
 
         Yields:
             RichLog widget for message display.
@@ -44,7 +47,8 @@ class ProtocolLogWidget(Widget):
         yield self.log_widget
 
     def on_mount(self) -> None:
-        """Initialize widget when mounted.
+        """
+        Initialize widget when mounted.
 
         Connects to service signals for telegram display.
         """
@@ -52,7 +56,8 @@ class ProtocolLogWidget(Widget):
         self.service.on_telegram_display.connect(self._on_telegram_display)
 
     def _on_telegram_display(self, event: TelegramDisplayEvent) -> None:
-        """Handle telegram display event from service.
+        """
+        Handle telegram display event from service.
 
         Args:
             event: Telegram display event with direction and telegram data.
@@ -69,7 +74,8 @@ class ProtocolLogWidget(Widget):
             self.log_widget.clear()
 
     def on_unmount(self) -> None:
-        """Clean up when widget unmounts.
+        """
+        Clean up when widget unmounts.
 
         Disconnects signals from service.
         """

xp/term/widgets/status_footer.py

@@ -12,7 +12,8 @@ from xp.services.term.state_monitor_service import StateMonitorService
 
 
 class StatusFooterWidget(Horizontal):
-    """Footer widget with connection status indicator.
+    """
+    Footer widget with connection status indicator.
 
     Combines the Textual Footer with a status indicator dot that shows
     the current connection state. Subscribes directly to service signals.
@@ -29,7 +30,8 @@ class StatusFooterWidget(Horizontal):
         *args: Any,
         **kwargs: Any,
     ) -> None:
-        """Initialize the Status Footer widget.
+        """
+        Initialize the Status Footer widget.
 
         Args:
             service: Optional ProtocolMonitorService or StateMonitorService for signal subscriptions.
@@ -42,7 +44,8 @@ class StatusFooterWidget(Horizontal):
         self.status_widget: Static = Static("○", id="status-line")
 
     def compose(self) -> ComposeResult:
-        """Compose the footer layout.
+        """
+        Compose the footer layout.
 
         Yields:
             Footer and status indicator widgets.
@@ -64,7 +67,8 @@ class StatusFooterWidget(Horizontal):
             self.service.on_status_message.disconnect(self.update_message)
 
     def update_status(self, state: ConnectionState) -> None:
-        """Update status indicator with connection state.
+        """
+        Update status indicator with connection state.
 
         Args:
             state: Current connection state (ConnectionState enum).
@@ -80,7 +84,8 @@ class StatusFooterWidget(Horizontal):
         self.status_widget.update(dot)
 
     def update_message(self, message: str) -> None:
-        """Update status text with message.
+        """
+        Update status text with message.
 
         Args:
             message: Status message to display.

xp/utils/checksum.py

@@ -1,4 +1,5 @@
-"""Checksum utility functions for protocol interoperability.
+"""
+Checksum utility functions for protocol interoperability.
 
 This module provides standard checksum calculation functions for protocol
 communication compatibility, including XOR checksum and IEEE 802.3 CRC32.
@@ -12,7 +13,8 @@ from xp.utils.serialization import nibble
 
 
 def calculate_checksum(buffer: str) -> str:
-    """Calculate simple XOR checksum of a string buffer.
+    """
+    Calculate simple XOR checksum of a string buffer.
 
     Args:
         buffer: Input string to calculate checksum for
@@ -28,7 +30,8 @@ def calculate_checksum(buffer: str) -> str:
 
 
 def calculate_checksum32(buffer: bytes) -> str:
-    """Calculate CRC32 checksum for protocol interoperability.
+    """
+    Calculate CRC32 checksum for protocol interoperability.
 
     Implements standard CRC32 algorithm using IEEE 802.3 polynomial 0xEDB88320
     for interoperability with XP protocol communications. This is a standard

xp/utils/dependencies.py

@@ -51,15 +51,6 @@ from xp.services.conbus.conbus_output_service import ConbusOutputService
 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.msactiontable.msactiontable_download_service import (
-    MsActionTableDownloadService,
-)
-from xp.services.conbus.msactiontable.msactiontable_list_service import (
-    MsActionTableListService,
-)
-from xp.services.conbus.msactiontable.msactiontable_show_service import (
-    MsActionTableShowService,
-)
 from xp.services.conbus.msactiontable.msactiontable_upload_service import (
     MsActionTableUploadService,
 )
@@ -100,8 +91,8 @@ class ServiceContainer:
     """
     Service container that manages dependency injection for all XP services.
 
-    Uses the service dependency graph from Dependencies.dot to properly
-    wire up all services with their dependencies.
+    Uses the service dependency graph from Dependencies.dot to properly wire up all
+    services with their dependencies.
     """
 
     def __init__(
@@ -327,6 +318,15 @@ class ServiceContainer:
             factory=lambda: ActionTableDownloadService(
                 conbus_protocol=self.container.resolve(ConbusEventProtocol),
                 actiontable_serializer=self.container.resolve(ActionTableSerializer),
+                msactiontable_serializer_xp20=self.container.resolve(
+                    Xp20MsActionTableSerializer
+                ),
+                msactiontable_serializer_xp24=self.container.resolve(
+                    Xp24MsActionTableSerializer
+                ),
+                msactiontable_serializer_xp33=self.container.resolve(
+                    Xp33MsActionTableSerializer
+                ),
             ),
             scope=punq.Scope.singleton,
         )
@@ -373,13 +373,19 @@ class ServiceContainer:
         )
 
         self.container.register(
-            MsActionTableDownloadService,
-            factory=lambda: MsActionTableDownloadService(
+            ActionTableDownloadService,
+            factory=lambda: ActionTableDownloadService(
                 conbus_protocol=self.container.resolve(ConbusEventProtocol),
-                xp20ms_serializer=self.container.resolve(Xp20MsActionTableSerializer),
-                xp24ms_serializer=self.container.resolve(Xp24MsActionTableSerializer),
-                xp33ms_serializer=self.container.resolve(Xp33MsActionTableSerializer),
-                telegram_service=self.container.resolve(TelegramService),
+                actiontable_serializer=self.container.resolve(ActionTableSerializer),
+                msactiontable_serializer_xp20=self.container.resolve(
+                    Xp20MsActionTableSerializer
+                ),
+                msactiontable_serializer_xp24=self.container.resolve(
+                    Xp24MsActionTableSerializer
+                ),
+                msactiontable_serializer_xp33=self.container.resolve(
+                    Xp33MsActionTableSerializer
+                ),
             ),
             scope=punq.Scope.singleton,
         )
@@ -494,18 +500,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        self.container.register(
-            MsActionTableListService,
-            factory=MsActionTableListService,
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            MsActionTableShowService,
-            factory=MsActionTableShowService,
-            scope=punq.Scope.singleton,
-        )
-
         # Server services layer
         self.container.register(
             ServerService,
@@ -629,7 +623,8 @@ class ServiceContainer:
         )
 
     def _load_protocol_keys(self) -> "ProtocolKeysConfig":
-        """Load protocol keys from YAML config file.
+        """
+        Load protocol keys from YAML config file.
 
         Returns:
             ProtocolKeysConfig instance loaded from configuration path.

xp/utils/event_helper.py

@@ -1,7 +1,8 @@
-"""Event handling utilities for PyDispatcher integration.
+"""
+Event handling utilities for PyDispatcher integration.
 
-This module provides clean, reusable utilities for handling PyDispatcher
-responses across all HomeKit accessory classes.
+This module provides clean, reusable utilities for handling PyDispatcher responses
+across all HomeKit accessory classes.
 """
 
 from typing import Any, Callable, List, Tuple
@@ -10,7 +11,8 @@ from typing import Any, Callable, List, Tuple
 def get_first_response(
     responses: List[Tuple[Callable, Any]], default: Any = None
 ) -> Any:
-    """Extract the first non-None response from PyDispatcher responses.
+    """
+    Extract the first non-None response from PyDispatcher responses.
 
     Args:
         responses: List of (receiver_function, return_value) tuples from dispatcher.send()