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

xp/cli/commands/conbus/conbus_discover_commands.py

@@ -19,7 +19,8 @@ from xp.services.conbus.conbus_discover_service import (
 @click.pass_context
 @connection_command()
 def send_discover_telegram(ctx: click.Context) -> None:
-    r"""Send discover telegram to Conbus server.
+    r"""
+    Send discover telegram to Conbus server.
 
     Args:
         ctx: Click context object.
@@ -30,7 +31,8 @@ def send_discover_telegram(ctx: click.Context) -> None:
     """
 
     def on_finish(discovered_devices: ConbusDiscoverResponse) -> None:
-        """Handle successful completion of device discovery.
+        """
+        Handle successful completion of device discovery.
 
         Args:
             discovered_devices: Discover response with all found devices.
@@ -39,7 +41,8 @@ def send_discover_telegram(ctx: click.Context) -> None:
         service.stop_reactor()
 
     def on_device_discovered(discovered_device: DiscoveredDevice) -> None:
-        """Handle discovery of sa single module.
+        """
+        Handle discovery of sa single module.
 
         Args:
             discovered_device: Discover device.
@@ -47,7 +50,8 @@ def send_discover_telegram(ctx: click.Context) -> None:
         click.echo(json.dumps(discovered_device, indent=2))
 
     def progress(_serial_number: str) -> None:
-        """Handle progress updates during device discovery.
+        """
+        Handle progress updates during device discovery.
 
         Args:
             _serial_number: Serial number of discovered device (unused).

xp/cli/commands/conbus/conbus_event_commands.py

@@ -15,7 +15,8 @@ from xp.services.conbus.conbus_event_raw_service import ConbusEventRawService
 @conbus_event.command("list")
 @click.pass_context
 def list_events(ctx: click.Context) -> None:
-    r"""List configured event telegrams from module action tables.
+    r"""
+    List configured event telegrams from module action tables.
 
     Reads conson.yml configuration, parses action tables, and groups
     modules by their event keys to show which modules are assigned to
@@ -50,7 +51,8 @@ def send_event_raw(
     input_number: int,
     time_ms: int,
 ) -> None:
-    r"""Send raw event telegrams to simulate button presses.
+    r"""
+    Send raw event telegrams to simulate button presses.
 
     Args:
         ctx: Click context object.
@@ -66,7 +68,8 @@ def send_event_raw(
     """
 
     def on_finish(response: ConbusEventRawResponse) -> None:
-        """Handle successful completion of event raw operation.
+        """
+        Handle successful completion of event raw operation.
 
         Args:
             response: Event raw response with sent and received telegrams.
@@ -74,7 +77,8 @@ def send_event_raw(
         click.echo(json.dumps(response.to_dict(), indent=2))
 
     def on_progress(telegram: str) -> None:
-        """Handle progress updates during event operation.
+        """
+        Handle progress updates during event operation.
 
         Args:
             telegram: Received telegram.

xp/cli/commands/conbus/conbus_export_commands.py

@@ -15,7 +15,8 @@ from xp.services.conbus.conbus_export_service import ConbusExportService
 @click.pass_context
 @connection_command()
 def export_conbus_config(ctx: click.Context) -> None:
-    r"""Export Conbus device metadata to YAML file.
+    r"""
+    Export Conbus device metadata to YAML file.
 
     Discovers all devices on the Conbus network and queries their configuration
     datapoints to generate a complete export.yml file in conson.yml format.
@@ -31,7 +32,8 @@ def export_conbus_config(ctx: click.Context) -> None:
     """
 
     def on_progress(serial_number: str, current: int, total: int) -> None:
-        """Handle progress updates during export.
+        """
+        Handle progress updates during export.
 
         Args:
             serial_number: Serial number of discovered device.
@@ -41,7 +43,8 @@ def export_conbus_config(ctx: click.Context) -> None:
         click.echo(f"Querying device {current}/{total}: {serial_number}...")
 
     def on_device_exported(module: ConsonModuleConfig) -> None:
-        """Handle device export completion.
+        """
+        Handle device export completion.
 
         Args:
             module: Exported module configuration.
@@ -58,7 +61,8 @@ def export_conbus_config(ctx: click.Context) -> None:
             click.echo(f"  ✓ Software version: {module.sw_version}")
 
     def on_finish(result: ConbusExportResponse) -> None:
-        """Handle export completion.
+        """
+        Handle export completion.
 
         Args:
             result: Export result.

xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -26,7 +26,8 @@ from xp.services.telegram.telegram_datapoint_service import TelegramDatapointSer
 def xp_lightlevel_set(
     ctx: click.Context, serial_number: str, output_number: int, level: int
 ) -> None:
-    r"""Set light level for output_number on XP module serial_number.
+    r"""
+    Set light level for output_number on XP module serial_number.
 
     Args:
         ctx: Click context object.
@@ -44,7 +45,8 @@ def xp_lightlevel_set(
     )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
-        """Handle successful completion of light level on command.
+        """
+        Handle successful completion of light level on command.
 
         Args:
             response: Light level response object.
@@ -73,7 +75,8 @@ def xp_lightlevel_set(
 def xp_lightlevel_off(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
-    r"""Turn off light for output_number on XP module serial_number (set level to 0).
+    r"""
+    Turn off light for output_number on XP module serial_number (set level to 0).
 
     Args:
         ctx: Click context object.
@@ -90,7 +93,8 @@ def xp_lightlevel_off(
     )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
-        """Handle successful completion of light level on command.
+        """
+        Handle successful completion of light level on command.
 
         Args:
             response: Light level response object.
@@ -120,7 +124,8 @@ def xp_lightlevel_off(
 def xp_lightlevel_on(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
-    r"""Turn on light for output_number on XP module serial_number (set level to 80%).
+    r"""
+    Turn on light for output_number on XP module serial_number (set level to 80%).
 
     Args:
         ctx: Click context object.
@@ -137,7 +142,8 @@ def xp_lightlevel_on(
     )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
-        """Handle successful completion of light level on command.
+        """
+        Handle successful completion of light level on command.
 
         Args:
             response: Light level response object.
@@ -167,7 +173,8 @@ def xp_lightlevel_on(
 def xp_lightlevel_get(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
-    r"""Get current light level for output_number on XP module serial_number.
+    r"""
+    Get current light level for output_number on XP module serial_number.
 
     Args:
         ctx: Click context object.
@@ -188,7 +195,8 @@ def xp_lightlevel_get(
     )
 
     def on_finish(service_response: "ConbusDatapointResponse") -> None:
-        """Handle successful completion of light level get command.
+        """
+        Handle successful completion of light level get command.
 
         Args:
             service_response: Light level response object.

xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -25,7 +25,8 @@ from xp.services.telegram.telegram_datapoint_service import TelegramDatapointSer
 def set_linknumber_command(
     ctx: click.Context, serial_number: str, link_number: int
 ) -> None:
-    r"""Set the link number for a specific module.
+    r"""
+    Set the link number for a specific module.
 
     Args:
         ctx: Click context object.
@@ -41,7 +42,8 @@ def set_linknumber_command(
     )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
-        """Handle successful completion of light level on command.
+        """
+        Handle successful completion of light level on command.
 
         Args:
             response: Light level response object.
@@ -66,7 +68,8 @@ def set_linknumber_command(
 @click.pass_context
 @connection_command()
 def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
-    r"""Get the current link number for a specific module.
+    r"""
+    Get the current link number for a specific module.
 
     Args:
         ctx: Click context object.
@@ -84,7 +87,8 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
     )
 
     def on_finish(service_response: ConbusDatapointResponse) -> None:
-        """Handle successful completion of link number get command.
+        """
+        Handle successful completion of link number get command.
 
         Args:
             service_response: Link number response object.

xp/cli/commands/conbus/conbus_modulenumber_commands.py

@@ -25,7 +25,8 @@ from xp.services.telegram.telegram_datapoint_service import TelegramDatapointSer
 def set_modulenumber_command(
     ctx: click.Context, serial_number: str, module_number: int
 ) -> None:
-    r"""Set the module number for a specific module.
+    r"""
+    Set the module number for a specific module.
 
     Args:
         ctx: Click context object.
@@ -41,7 +42,8 @@ def set_modulenumber_command(
     )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
-        """Handle successful completion of light level on command.
+        """
+        Handle successful completion of light level on command.
 
         Args:
             response: Light level response object.
@@ -66,7 +68,8 @@ def set_modulenumber_command(
 @click.pass_context
 @connection_command()
 def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
-    r"""Get the current module number for a specific module.
+    r"""
+    Get the current module number for a specific module.
 
     Args:
         ctx: Click context object.
@@ -84,7 +87,8 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
     )
 
     def on_finish(service_response: ConbusDatapointResponse) -> None:
-        """Handle successful completion of module number get command.
+        """
+        Handle successful completion of module number get command.
 
         Args:
             service_response: Module number response object.

xp/cli/commands/conbus/conbus_msactiontable_commands.py

@@ -1,7 +1,7 @@
 """XP24 Action Table CLI commands."""
 
 import json
-from typing import Union
+from typing import Any, Union
 
 import click
 from click import Context
@@ -12,24 +12,45 @@ from xp.cli.utils.decorators import (
 )
 from xp.cli.utils.serial_number_type import SERIAL
 from xp.cli.utils.xp_module_type import XP_MODULE_TYPE
-from xp.models.actiontable.msactiontable_xp20 import Xp20MsActionTable
-from xp.models.actiontable.msactiontable_xp24 import Xp24MsActionTable
-from xp.models.actiontable.msactiontable_xp33 import Xp33MsActionTable
+from xp.models.actiontable.actiontable_type import ActionTableType
 from xp.models.config.conson_module_config import ConsonModuleConfig
-from xp.services.conbus.msactiontable.msactiontable_download_service import (
-    MsActionTableDownloadService,
+from xp.services.conbus.actiontable.actiontable_download_service import (
+    ActionTableDownloadService,
 )
-from xp.services.conbus.msactiontable.msactiontable_list_service import (
-    MsActionTableListService,
+from xp.services.conbus.actiontable.actiontable_list_service import (
+    ActionTableListService,
 )
-from xp.services.conbus.msactiontable.msactiontable_show_service import (
-    MsActionTableShowService,
+from xp.services.conbus.actiontable.actiontable_show_service import (
+    ActionTableShowService,
 )
 from xp.services.conbus.msactiontable.msactiontable_upload_service import (
     MsActionTableUploadService,
 )
 
 
+def _get_actiontable_type(xpmoduletype: str) -> ActionTableType:
+    """
+    Map xpmoduletype string to ActionTableType enum.
+
+    Args:
+        xpmoduletype: XP module type string (xp20, xp24, xp33).
+
+    Returns:
+        Corresponding ActionTableType enum value.
+
+    Raises:
+        ClickException: If module type is not supported.
+    """
+    type_map = {
+        "xp20": ActionTableType.MSACTIONTABLE_XP20,
+        "xp24": ActionTableType.MSACTIONTABLE_XP24,
+        "xp33": ActionTableType.MSACTIONTABLE_XP33,
+    }
+    if xpmoduletype not in type_map:
+        raise click.ClickException(f"Unsupported module type: {xpmoduletype}")
+    return type_map[xpmoduletype]
+
+
 @conbus_msactiontable.command("download", short_help="Download MSActionTable")
 @click.argument("serial_number", type=SERIAL)
 @click.argument("xpmoduletype", type=XP_MODULE_TYPE)
@@ -38,37 +59,38 @@ from xp.services.conbus.msactiontable.msactiontable_upload_service import (
 def conbus_download_msactiontable(
     ctx: Context, serial_number: str, xpmoduletype: str
 ) -> None:
-    """Download MS action table from XP24 module.
+    """
+    Download MS action table from XP24 module.
 
     Args:
         ctx: Click context object.
         serial_number: 10-digit module serial number.
         xpmoduletype: XP module type.
     """
-    service: MsActionTableDownloadService = (
-        ctx.obj.get("container").get_container().resolve(MsActionTableDownloadService)
+    service: ActionTableDownloadService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableDownloadService)
     )
 
     def on_progress(progress: str) -> None:
-        """Handle progress updates during MS action table download.
+        """
+        Handle progress updates during MS action table download.
 
         Args:
             progress: Progress message string.
         """
         click.echo(progress, nl=False)
 
-    def on_finish(
-        msaction_table: Union[Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable],
+    def on_actiontable_received(
+        msaction_table: Any,
         msaction_table_short: list[str],
     ) -> None:
-        """Handle successful completion of XP24 MS action table download.
+        """
+        Handle successful completion of XP24 MS action table download.
 
         Args:
             msaction_table: Downloaded XP MS action table object.
             msaction_table_short: Short version of XP24 MS action table.
         """
-        service.stop_reactor()
-
         # Format short representation based on module type
         short_field_name = f"{xpmoduletype}_msaction_table"
         # XP24 returns single-element list, XP20/XP33 return multi-line lists
@@ -86,23 +108,28 @@ def conbus_download_msactiontable(
         }
         click.echo(json.dumps(output, indent=2, default=str))
 
+    def on_finish() -> None:
+        """Handle download completion."""
+        service.stop_reactor()
+
     def on_error(error: str) -> None:
-        """Handle errors during MS action table download.
+        """
+        Handle errors during MS action table download.
 
         Args:
             error: Error message string.
         """
         click.echo(f"Error: {error}")
+        service.stop_reactor()
 
     with service:
         service.on_progress.connect(on_progress)
-        service.on_error.connect(on_error)
-
-        # Connect to the appropriate signal based on module type
+        service.on_actiontable_received.connect(on_actiontable_received)
         service.on_finish.connect(on_finish)
-        service.start(
+        service.on_error.connect(on_error)
+        service.configure(
             serial_number=serial_number,
-            xpmoduletype=xpmoduletype,
+            actiontable_type=_get_actiontable_type(xpmoduletype),
         )
         service.start_reactor()
 
@@ -110,17 +137,19 @@ def conbus_download_msactiontable(
 @conbus_msactiontable.command("list", short_help="List modules with MsActionTable")
 @click.pass_context
 def conbus_list_msactiontable(ctx: Context) -> None:
-    """List all modules with action table configurations from conson.yml.
+    """
+    List all modules with action table configurations from conson.yml.
 
     Args:
         ctx: Click context object.
     """
-    service: MsActionTableListService = (
-        ctx.obj.get("container").get_container().resolve(MsActionTableListService)
+    service: ActionTableListService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableListService)
     )
 
     def on_finish(module_list: dict) -> None:
-        """Handle successful completion of action table list.
+        """
+        Handle successful completion of action table list.
 
         Args:
             module_list: Dictionary containing modules and total count.
@@ -128,7 +157,8 @@ def conbus_list_msactiontable(ctx: Context) -> None:
         click.echo(json.dumps(module_list, indent=2, default=str))
 
     def on_error(error: str) -> None:
-        """Handle errors during action table list.
+        """
+        Handle errors during action table list.
 
         Args:
             error: Error message string.
@@ -145,18 +175,20 @@ def conbus_list_msactiontable(ctx: Context) -> None:
 @click.argument("serial_number", type=SERIAL)
 @click.pass_context
 def conbus_show_msactiontable(ctx: Context, serial_number: str) -> None:
-    """Show ms action table configuration for a specific module from conson.yml.
+    """
+    Show ms action table configuration for a specific module from conson.yml.
 
     Args:
         ctx: Click context object.
         serial_number: 10-digit module serial number.
     """
-    service: MsActionTableShowService = (
-        ctx.obj.get("container").get_container().resolve(MsActionTableShowService)
+    service: ActionTableShowService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableShowService)
     )
 
     def on_finish(module: ConsonModuleConfig) -> None:
-        """Handle successful completion of action table show.
+        """
+        Handle successful completion of action table show.
 
         Args:
             module: Dictionary containing module configuration.
@@ -194,7 +226,8 @@ def conbus_show_msactiontable(ctx: Context, serial_number: str) -> None:
             click.echo(_format_yaml(yaml_dict, indent=2))
 
     def error_callback(error: str) -> None:
-        """Handle errors during action table show.
+        """
+        Handle errors during action table show.
 
         Args:
             error: Error message string.
@@ -217,7 +250,8 @@ def conbus_show_msactiontable(ctx: Context, serial_number: str) -> None:
 def conbus_upload_msactiontable(
     ctx: Context, serial_number: str, xpmoduletype: str
 ) -> None:
-    """Upload MS action table from conson.yml to XP module.
+    """
+    Upload MS action table from conson.yml to XP module.
 
     Args:
         ctx: Click context object.
@@ -229,7 +263,8 @@ def conbus_upload_msactiontable(
     )
 
     def on_progress(progress: str) -> None:
-        """Handle progress updates during MS action table upload.
+        """
+        Handle progress updates during MS action table upload.
 
         Args:
             progress: Progress message string.
@@ -237,7 +272,8 @@ def conbus_upload_msactiontable(
         click.echo(progress, nl=False)
 
     def on_finish(success: bool) -> None:
-        """Handle successful completion of MS action table upload.
+        """
+        Handle successful completion of MS action table upload.
 
         Args:
             success: Whether upload was successful.
@@ -247,7 +283,8 @@ def conbus_upload_msactiontable(
             click.echo("\nMsactiontable uploaded successfully")
 
     def on_error(error: str) -> None:
-        """Handle errors during MS action table upload.
+        """
+        Handle errors during MS action table upload.
 
         Args:
             error: Error message string.
@@ -269,7 +306,8 @@ def conbus_upload_msactiontable(
 
 
 def _format_yaml(data: dict, indent: int = 0) -> str:
-    """Format a dictionary as YAML-like output.
+    """
+    Format a dictionary as YAML-like output.
 
     Args:
         data: Dictionary to format.

xp/cli/commands/conbus/conbus_output_commands.py

@@ -21,7 +21,8 @@ from xp.services.conbus.conbus_output_service import ConbusOutputService
 @click.pass_context
 @connection_command()
 def xp_output_on(ctx: click.Context, serial_number: str, output_number: int) -> None:
-    r"""Send ON command for output_number XP module serial_number.
+    r"""
+    Send ON command for output_number XP module serial_number.
 
     Args:
         ctx: Click context object.
@@ -37,7 +38,8 @@ def xp_output_on(ctx: click.Context, serial_number: str, output_number: int) ->
     )
 
     def on_finish(response: ConbusOutputResponse) -> None:
-        """Handle successful completion of output on command.
+        """
+        Handle successful completion of output on command.
 
         Args:
             response: Output response object.
@@ -61,7 +63,8 @@ def xp_output_on(ctx: click.Context, serial_number: str, output_number: int) ->
 @click.pass_context
 @connection_command()
 def xp_output_off(ctx: click.Context, serial_number: str, output_number: int) -> None:
-    r"""Send OFF command for output_number XP module serial_number.
+    r"""
+    Send OFF command for output_number XP module serial_number.
 
     Args:
         ctx: Click context object.
@@ -77,7 +80,8 @@ def xp_output_off(ctx: click.Context, serial_number: str, output_number: int) ->
     )
 
     def on_finish(response: ConbusOutputResponse) -> None:
-        """Handle successful completion of output off command.
+        """
+        Handle successful completion of output off command.
 
         Args:
             response: Output response object.
@@ -100,7 +104,8 @@ def xp_output_off(ctx: click.Context, serial_number: str, output_number: int) ->
 @click.pass_context
 @connection_command()
 def xp_output_status(ctx: click.Context, serial_number: str) -> None:
-    r"""Query output state command to XP module serial_number.
+    r"""
+    Query output state command to XP module serial_number.
 
     Args:
         ctx: Click context object.
@@ -115,7 +120,8 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
     )
 
     def on_finish(response: ConbusDatapointResponse) -> None:
-        """Handle successful completion of output status query.
+        """
+        Handle successful completion of output status query.
 
         Args:
             response: Datapoint response object.
@@ -137,7 +143,8 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
 @click.pass_context
 @connection_command()
 def xp_module_state(ctx: click.Context, serial_number: str) -> None:
-    r"""Query module state of the XP module serial_number.
+    r"""
+    Query module state of the XP module serial_number.
 
     Args:
         ctx: Click context object.
@@ -152,7 +159,8 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
     )
 
     def on_finish(response: ConbusDatapointResponse) -> None:
-        """Handle successful completion of module state query.
+        """
+        Handle successful completion of module state query.
 
         Args:
             response: Datapoint response object.

xp/cli/commands/conbus/conbus_raw_commands.py

@@ -18,7 +18,8 @@ from xp.services.conbus.conbus_raw_service import ConbusRawService
 @click.pass_context
 @connection_command()
 def send_raw_telegrams(ctx: Context, raw_telegrams: str) -> None:
-    r"""Send raw telegram sequence to Conbus server.
+    r"""
+    Send raw telegram sequence to Conbus server.
 
     Accepts a string containing one or more telegrams in format <...>.
     Multiple telegrams should be concatenated without separators.
@@ -38,7 +39,8 @@ def send_raw_telegrams(ctx: Context, raw_telegrams: str) -> None:
     )
 
     def on_progress(message: str) -> None:
-        """Handle progress updates during raw telegram sending.
+        """
+        Handle progress updates during raw telegram sending.
 
         Args:
             message: Progress message string.
@@ -46,7 +48,8 @@ def send_raw_telegrams(ctx: Context, raw_telegrams: str) -> None:
         click.echo(message)
 
     def on_finish(service_response: ConbusRawResponse) -> None:
-        """Handle successful completion of raw telegram sending.
+        """
+        Handle successful completion of raw telegram sending.
 
         Args:
             service_response: Raw response object.

xp/cli/commands/conbus/conbus_receive_commands.py

@@ -20,7 +20,8 @@ from xp.services.conbus.conbus_receive_service import (
 @connection_command()
 @click.pass_context
 def receive_telegrams(ctx: Context, timeout: float) -> None:
-    r"""Receive waiting event telegrams from Conbus server.
+    r"""
+    Receive waiting event telegrams from Conbus server.
 
     Connects to the Conbus server and receives any waiting event telegrams
     without sending any data first. Useful for collecting pending notifications
@@ -37,7 +38,8 @@ def receive_telegrams(ctx: Context, timeout: float) -> None:
     """
 
     def on_finish(response_received: ConbusReceiveResponse) -> None:
-        """Handle successful completion of telegram receive operation.
+        """
+        Handle successful completion of telegram receive operation.
 
         Args:
             response_received: Receive response object with telegrams.
@@ -46,7 +48,8 @@ def receive_telegrams(ctx: Context, timeout: float) -> None:
         service.stop_reactor()
 
     def on_progress(telegram_received: str) -> None:
-        """Handle progress updates during telegram receive operation.
+        """
+        Handle progress updates during telegram receive operation.
 
         Args:
             telegram_received: Received telegram string.