conson-xp 1.45.0__py3-none-any.whl → 1.47.0__py3-none-any.whl

xp/services/conbus/actiontable/actiontable_show_service.py

@@ -8,10 +8,11 @@ from xp.models.config.conson_module_config import ConsonModuleConfig
 
 
 class ActionTableShowService:
-    """Service for showing action table configuration for a specific module.
+    """
+    Service for showing action table configuration for a specific module.
 
-    Reads conson.yml and returns the action table configuration for the specified
-    module serial number.
+    Reads conson.yml and returns the action table configuration for the specified module
+    serial number.
     """
 
     def __init__(self) -> None:
@@ -21,7 +22,8 @@ class ActionTableShowService:
         self.error_callback: Optional[Callable[[str], None]] = None
 
     def __enter__(self) -> "ActionTableShowService":
-        """Context manager entry.
+        """
+        Context manager entry.
 
         Returns:
             Self for context manager use.
@@ -39,7 +41,8 @@ class ActionTableShowService:
         error_callback: Callable[[str], None],
         config_path: Optional[Path] = None,
     ) -> None:
-        """Show action table configuration for a specific module.
+        """
+        Show action and msaction table configuration for a specific module.
 
         Args:
             serial_number: Module serial number.
@@ -80,7 +83,8 @@ class ActionTableShowService:
             self.finish_callback(module)
 
     def _handle_error(self, message: str) -> None:
-        """Handle error and invoke error callback.
+        """
+        Handle error and invoke error callback.
 
         Args:
             message: Error message.

xp/services/conbus/actiontable/actiontable_upload_service.py

@@ -15,7 +15,8 @@ from xp.services.telegram.telegram_service import TelegramService
 
 
 class ActionTableUploadService:
-    """TCP client service for uploading action tables to Conbus modules.
+    """
+    TCP client service for uploading action tables to Conbus modules.
 
     Manages TCP socket connections, handles telegram generation and transmission,
     and processes server responses for action table uploads.
@@ -37,7 +38,8 @@ class ActionTableUploadService:
         telegram_service: TelegramService,
         conson_config: ConsonModuleListConfig,
     ) -> None:
-        """Initialize the action table upload service.
+        """
+        Initialize the action table upload service.
 
         Args:
             conbus_protocol: ConbusEventProtocol for communication.
@@ -76,7 +78,8 @@ class ActionTableUploadService:
         )
 
     def telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
+        """
+        Handle telegram sent event.
 
         Args:
             telegram_sent: The telegram that was sent.
@@ -84,7 +87,8 @@ class ActionTableUploadService:
         self.logger.debug(f"Telegram sent: {telegram_sent}")
 
     def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -105,7 +109,8 @@ class ActionTableUploadService:
         self._handle_upload_response(reply_telegram)
 
     def _handle_upload_response(self, reply_telegram: Any) -> None:
-        """Handle telegram responses during upload.
+        """
+        Handle telegram responses during upload.
 
         Args:
             reply_telegram: Parsed reply telegram.
@@ -152,7 +157,8 @@ class ActionTableUploadService:
         self.failed("Upload timeout")
 
     def failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -165,7 +171,8 @@ class ActionTableUploadService:
         serial_number: str,
         timeout_seconds: Optional[float] = None,
     ) -> None:
-        """Upload action table to module.
+        """
+        Upload action table to module.
 
         Uploads the action table configuration to the specified module.
 
@@ -187,7 +194,7 @@ class ActionTableUploadService:
         # Parse action table strings to ActionTable object
         try:
             module_action_table = module.action_table or []
-            action_table = self.serializer.parse_action_table(module_action_table)
+            action_table = self.serializer.from_short_string(module_action_table)
         except ValueError as e:
             self.logger.error(f"Invalid action table format: {e}")
             self.failed(f"Invalid action table format: {e}")
@@ -210,7 +217,8 @@ class ActionTableUploadService:
         )
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Set operation timeout.
+        """
+        Set operation timeout.
 
         Args:
             timeout_seconds: Timeout in seconds.

xp/services/conbus/conbus_blink_all_service.py

@@ -1,4 +1,5 @@
-"""Conbus Blink All Service for TCP communication with Conbus servers.
+"""
+Conbus Blink All Service for TCP communication with Conbus servers.
 
 This service implements a TCP client that connects to Conbus servers and sends
 blink/unblink telegrams to all discovered modules on the network.
@@ -38,7 +39,8 @@ class ConbusBlinkAllService:
         conbus_protocol: ConbusEventProtocol,
         telegram_service: TelegramService,
     ) -> None:
-        """Initialize the Conbus blink all service.
+        """
+        Initialize the Conbus blink all service.
 
         Args:
             conbus_protocol: ConbusEventProtocol instance for communication.
@@ -77,7 +79,8 @@ class ConbusBlinkAllService:
         self.on_progress.emit(".")
 
     def send_blink(self, serial_number: str) -> None:
-        """Send blink or unblink telegram to a discovered module.
+        """
+        Send blink or unblink telegram to a discovered module.
 
         Args:
             serial_number: 10-digit module serial number.
@@ -101,7 +104,8 @@ class ConbusBlinkAllService:
         self.on_progress.emit(".")
 
     def telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
+        """
+        Handle telegram sent event.
 
         Args:
             telegram_sent: The telegram that was sent.
@@ -110,7 +114,8 @@ class ConbusBlinkAllService:
         self.service_response.sent_telegram = system_telegram
 
     def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -157,7 +162,8 @@ class ConbusBlinkAllService:
         self.on_finish.emit(self.service_response)
 
     def failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -173,7 +179,8 @@ class ConbusBlinkAllService:
         on_or_off: str,
         timeout_seconds: Optional[float] = None,
     ) -> None:
-        """Send blink command to all discovered modules.
+        """
+        Send blink command to all discovered modules.
 
         Args:
             on_or_off: "on" to blink or "off" to unblink all devices.
@@ -186,7 +193,8 @@ class ConbusBlinkAllService:
         # Caller invokes start_reactor()
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Set operation timeout.
+        """
+        Set operation timeout.
 
         Args:
             timeout_seconds: Timeout in seconds.

xp/services/conbus/conbus_blink_service.py

@@ -1,4 +1,5 @@
-"""Conbus Blink Service for TCP communication with Conbus servers.
+"""
+Conbus Blink Service for TCP communication with Conbus servers.
 
 This service implements a TCP client that connects to Conbus servers and sends
 blink/unblink telegrams to control module LED indicators.
@@ -36,7 +37,8 @@ class ConbusBlinkService:
         conbus_protocol: ConbusEventProtocol,
         telegram_service: TelegramService,
     ) -> None:
-        """Initialize the Conbus blink service.
+        """
+        Initialize the Conbus blink service.
 
         Args:
             conbus_protocol: ConbusEventProtocol instance for communication.
@@ -81,7 +83,8 @@ class ConbusBlinkService:
         self.service_response.operation = self.on_or_off
 
     def telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
+        """
+        Handle telegram sent event.
 
         Args:
             telegram_sent: The telegram that was sent.
@@ -90,7 +93,8 @@ class ConbusBlinkService:
         self.service_response.sent_telegram = system_telegram
 
     def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -131,7 +135,8 @@ class ConbusBlinkService:
         self.on_finish.emit(self.service_response)
 
     def failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -148,7 +153,8 @@ class ConbusBlinkService:
         on_or_off: str,
         timeout_seconds: Optional[float] = None,
     ) -> None:
-        r"""Send blink command to start blinking module LED.
+        r"""
+        Send blink command to start blinking module LED.
 
         Args:
             serial_number: 10-digit module serial number.
@@ -168,7 +174,8 @@ class ConbusBlinkService:
         # Caller invokes start_reactor()
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Set operation timeout.
+        """
+        Set operation timeout.
 
         Args:
             timeout_seconds: Timeout in seconds.

xp/services/conbus/conbus_custom_service.py

@@ -1,4 +1,5 @@
-"""Conbus Custom Service for sending custom telegrams to modules.
+"""
+Conbus Custom Service for sending custom telegrams to modules.
 
 This service handles custom telegram operations for modules through Conbus telegrams.
 """
@@ -19,7 +20,8 @@ from xp.services.telegram.telegram_service import TelegramService
 
 
 class ConbusCustomService:
-    """Service for sending custom telegrams to Conbus modules.
+    """
+    Service for sending custom telegrams to Conbus modules.
 
     Uses ConbusEventProtocol to provide custom telegram functionality
     for sending arbitrary function codes and data to modules.
@@ -37,7 +39,8 @@ class ConbusCustomService:
         conbus_protocol: ConbusEventProtocol,
         telegram_service: TelegramService,
     ) -> None:
-        """Initialize the Conbus custom service.
+        """
+        Initialize the Conbus custom service.
 
         Args:
             conbus_protocol: Protocol instance for Conbus communication.
@@ -82,7 +85,8 @@ class ConbusCustomService:
         )
 
     def telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
+        """
+        Handle telegram sent event.
 
         Args:
             telegram_sent: The telegram that was sent.
@@ -90,7 +94,8 @@ class ConbusCustomService:
         self.service_response.sent_telegram = telegram_sent
 
     def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -131,7 +136,8 @@ class ConbusCustomService:
         self.failed("Timeout")
 
     def failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -151,7 +157,8 @@ class ConbusCustomService:
         data: str,
         timeout_seconds: Optional[float] = None,
     ) -> None:
-        """Send a custom telegram to a module.
+        """
+        Send a custom telegram to a module.
 
         Args:
             serial_number: 10-digit module serial number.
@@ -167,7 +174,8 @@ class ConbusCustomService:
             self.set_timeout(timeout_seconds)
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Set operation timeout.
+        """
+        Set operation timeout.
 
         Args:
             timeout_seconds: Timeout in seconds.

xp/services/conbus/conbus_datapoint_queryall_service.py

@@ -1,4 +1,5 @@
-"""Conbus DataPoint Query All Service.
+"""
+Conbus DataPoint Query All Service.
 
 This module provides service for querying all datapoint types from a module.
 """
@@ -20,7 +21,8 @@ from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
 
 
 class ConbusDatapointQueryAllService:
-    """Utility service for querying all datapoints from a module.
+    """
+    Utility service for querying all datapoints from a module.
 
     This service orchestrates multiple ConbusDatapointService calls to query
     all available datapoint types sequentially.
@@ -40,7 +42,8 @@ class ConbusDatapointQueryAllService:
         conbus_protocol: ConbusEventProtocol,
         telegram_service: TelegramService,
     ) -> None:
-        """Initialize the query all service.
+        """
+        Initialize the query all service.
 
         Args:
             conbus_protocol: ConbusEventProtocol for protocol communication.
@@ -73,7 +76,8 @@ class ConbusDatapointQueryAllService:
         self.next_datapoint()
 
     def next_datapoint(self) -> bool:
-        """Query the next datapoint type.
+        """
+        Query the next datapoint type.
 
         Returns:
             True if there are more datapoints to query, False otherwise.
@@ -111,7 +115,8 @@ class ConbusDatapointQueryAllService:
             self.on_finish.emit(self.service_response)
 
     def telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
+        """
+        Handle telegram sent event.
 
         Args:
             telegram_sent: The telegram that was sent.
@@ -119,7 +124,8 @@ class ConbusDatapointQueryAllService:
         self.service_response.sent_telegram = telegram_sent
 
     def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -152,7 +158,8 @@ class ConbusDatapointQueryAllService:
         self.on_progress.emit(datapoint_telegram)
 
     def failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -170,7 +177,8 @@ class ConbusDatapointQueryAllService:
         serial_number: str,
         timeout_seconds: Optional[float] = None,
     ) -> None:
-        """Query all datapoints from a module.
+        """
+        Query all datapoints from a module.
 
         Args:
             serial_number: 10-digit module serial number.
@@ -182,7 +190,8 @@ class ConbusDatapointQueryAllService:
         self.serial_number = serial_number
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Set operation timeout.
+        """
+        Set operation timeout.
 
         Args:
             timeout_seconds: Timeout in seconds.

xp/services/conbus/conbus_datapoint_service.py

@@ -1,4 +1,5 @@
-"""Conbus Datapoint Service for querying module datapoints.
+"""
+Conbus Datapoint Service for querying module datapoints.
 
 This service handles datapoint query operations for modules through Conbus telegrams.
 """
@@ -20,7 +21,8 @@ from xp.services.telegram.telegram_service import TelegramService
 
 
 class ConbusDatapointService:
-    """Service for querying datapoints from Conbus modules.
+    """
+    Service for querying datapoints from Conbus modules.
 
     Uses ConbusEventProtocol to provide datapoint query functionality
     for reading sensor data and module information.
@@ -38,7 +40,8 @@ class ConbusDatapointService:
         conbus_protocol: ConbusEventProtocol,
         telegram_service: TelegramService,
     ) -> None:
-        """Initialize the Conbus datapoint service.
+        """
+        Initialize the Conbus datapoint service.
 
         Args:
             conbus_protocol: Protocol instance for Conbus communication.
@@ -81,7 +84,8 @@ class ConbusDatapointService:
         )
 
     def telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
+        """
+        Handle telegram sent event.
 
         Args:
             telegram_sent: The telegram that was sent.
@@ -89,7 +93,8 @@ class ConbusDatapointService:
         self.service_response.sent_telegram = telegram_sent
 
     def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -124,7 +129,8 @@ class ConbusDatapointService:
         self.succeed(datapoint_telegram)
 
     def succeed(self, datapoint_telegram: ReplyTelegram) -> None:
-        """Handle successful datapoint query.
+        """
+        Handle successful datapoint query.
 
         Args:
             datapoint_telegram: The parsed datapoint telegram.
@@ -147,7 +153,8 @@ class ConbusDatapointService:
         self.failed("Timeout")
 
     def failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -167,7 +174,8 @@ class ConbusDatapointService:
         datapoint_type: DataPointType,
         timeout_seconds: float = 1.0,
     ) -> None:
-        """Query a specific datapoint from a module.
+        """
+        Query a specific datapoint from a module.
 
         Args:
             serial_number: 10-digit module serial number.
@@ -181,7 +189,8 @@ class ConbusDatapointService:
         self.datapoint_type = datapoint_type
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Set operation timeout.
+        """
+        Set operation timeout.
 
         Args:
             timeout_seconds: Timeout in seconds.

xp/services/conbus/conbus_discover_service.py

@@ -1,7 +1,8 @@
-"""Conbus Discover Service for TCP communication with Conbus servers.
+"""
+Conbus Discover Service for TCP communication with Conbus servers.
 
-This service implements a TCP client that connects to Conbus servers and sends
-discover telegrams to find modules on the network.
+This service implements a TCP client that connects to Conbus servers and sends discover
+telegrams to find modules on the network.
 """
 
 import asyncio
@@ -40,7 +41,8 @@ class ConbusDiscoverService:
     on_device_discovered: Signal = Signal(ConbusDiscoverResponse)
 
     def __init__(self, conbus_protocol: ConbusEventProtocol) -> None:
-        """Initialize the Conbus discover service.
+        """
+        Initialize the Conbus discover service.
 
         Args:
             conbus_protocol: ConbusProtocol.
@@ -68,7 +70,8 @@ class ConbusDiscoverService:
         )
 
     def telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
+        """
+        Handle telegram sent event.
 
         Args:
             telegram_sent: The telegram that was sent.
@@ -77,7 +80,8 @@ class ConbusDiscoverService:
         self.discovered_device_result.sent_telegram = telegram_sent
 
     def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -121,7 +125,8 @@ class ConbusDiscoverService:
             self.logger.debug("Not a discover or module type response")
 
     def handle_discovered_device(self, serial_number: str) -> None:
-        """Handle discovered device event.
+        """
+        Handle discovered device event.
 
         Args:
             serial_number: Serial number of the discovered device.
@@ -153,7 +158,8 @@ class ConbusDiscoverService:
     def handle_module_type_code_response(
         self, serial_number: str, module_type_code: str
     ) -> None:
-        """Handle module type code response and update discovered device.
+        """
+        Handle module type code response and update discovered device.
 
         Args:
             serial_number: Serial number of the device.
@@ -214,7 +220,8 @@ class ConbusDiscoverService:
         self.succeed()
 
     def handle_module_type_response(self, serial_number: str, module_type: str) -> None:
-        """Handle module type response and update discovered device.
+        """
+        Handle module type response and update discovered device.
 
         Args:
             serial_number: Serial number of the device.
@@ -249,7 +256,8 @@ class ConbusDiscoverService:
         self.on_finish.emit(self.discovered_device_result)
 
     def failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -267,7 +275,8 @@ class ConbusDiscoverService:
         self.on_finish.emit(self.discovered_device_result)
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Setup callbacks and timeout for receiving telegrams.
+        """
+        Setup callbacks and timeout for receiving telegrams.
 
         Args:
             timeout_seconds: Optional timeout in seconds.
@@ -279,7 +288,8 @@ class ConbusDiscoverService:
         self,
         event_loop: asyncio.AbstractEventLoop,
     ) -> None:
-        """Setup callbacks and timeout for receiving telegrams.
+        """
+        Setup callbacks and timeout for receiving telegrams.
 
         Args:
             event_loop: Optional event loop to use for async operations.
@@ -296,7 +306,8 @@ class ConbusDiscoverService:
         self.conbus_protocol.stop_reactor()
 
     def __enter__(self) -> "ConbusDiscoverService":
-        """Enter context manager.
+        """
+        Enter context manager.
 
         Returns:
             Self for context manager protocol.

xp/services/conbus/conbus_event_list_service.py

@@ -1,7 +1,8 @@
-"""Conbus Event List Service for listing configured event telegrams.
+"""
+Conbus Event List Service for listing configured event telegrams.
 
-This service parses action tables from conson.yml and groups events
-by button configuration to show which modules are assigned to each event.
+This service parses action tables from conson.yml and groups events by button
+configuration to show which modules are assigned to each event.
 """
 
 import logging
@@ -14,7 +15,8 @@ from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
 
 
 class ConbusEventListService:
-    """Service for listing configured event telegrams from action tables.
+    """
+    Service for listing configured event telegrams from action tables.
 
     Parses action tables from conson.yml configuration and groups modules
     by their event keys to identify common button configurations.
@@ -25,7 +27,8 @@ class ConbusEventListService:
     """
 
     def __init__(self, conson_config: ConsonModuleListConfig) -> None:
-        """Initialize the Conbus event list service.
+        """
+        Initialize the Conbus event list service.
 
         Args:
             conson_config: ConsonModuleListConfig instance with module action tables.
@@ -34,7 +37,8 @@ class ConbusEventListService:
         self.logger = logging.getLogger(__name__)
 
     def list_events(self) -> ConbusEventListResponse:
-        """List all configured events from module action tables.
+        """
+        List all configured events from module action tables.
 
         Parses action tables, extracts event information (module_type, link, input),
         groups modules by event key, and sorts by usage count.
@@ -56,7 +60,7 @@ class ConbusEventListService:
             for action in module.action_table:
                 try:
                     # Use existing ActionTableSerializer to parse action
-                    entry = ActionTableSerializer.parse_action_string(action)
+                    entry = ActionTableSerializer._parse_action_string(action)
 
                     # Extract event data from parsed entry
                     module_type_name = entry.module_type.name