conson-xp 1.2.0__tar.gz → 1.3.0__tar.gz

{conson_xp-1.2.0 → conson_xp-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.2.0
+Version: 1.3.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -272,10 +272,6 @@ src/xp/
 
 xp
 
-xp api
-xp api start
-
-
 xp conbus
 
 xp conbus actiontable

{conson_xp-1.2.0 → conson_xp-1.3.0}/README.md

@@ -221,10 +221,6 @@ src/xp/
 
 xp
 
-xp api
-xp api start
-
-
 xp conbus
 
 xp conbus actiontable

{conson_xp-1.2.0 → conson_xp-1.3.0}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.2.0"
+version = "1.3.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/__init__.py

@@ -3,7 +3,7 @@
 conson-xp package.
 """
 
-__version__ = "1.2.0"
+__version__ = "1.3.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/__init__.py

@@ -1,7 +1,6 @@
 """Command modules for XP CLI."""
 
 # Main command groups
-from xp.cli.commands.api_start_commands import start_api_server
 
 # Import conbus command groups (but not 'conbus' itself to avoid module shadowing in Python 3.10)
 from xp.cli.commands.conbus.conbus import (
@@ -100,7 +99,6 @@ __all__ = [
     "linknumber",
     "blink",
     "checksum",
-    "start_api_server",
     "homekit",
     "homekit_start",
     # Individual command functions

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -28,7 +28,9 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         ctx: Click context object.
         serial_number: 10-digit module serial number.
     """
-    service = ctx.obj.get("container").get_container().resolve(ActionTableService)
+    service: ActionTableService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableService)
+    )
 
     def progress_callback(progress: str) -> None:
         """Handle progress updates during action table download.
@@ -38,7 +40,7 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         """
         click.echo(progress)
 
-    def finish_callback(actiontable: ActionTable) -> None:
+    def on_finish(actiontable: ActionTable) -> None:
         """Handle successful completion of action table download.
 
         Args:
@@ -62,6 +64,6 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         service.start(
             serial_number=serial_number,
             progress_callback=progress_callback,
-            finish_callback=finish_callback,
+            finish_callback=on_finish,
             error_callback=error_callback,
         )

conson_xp-1.3.0/src/xp/cli/commands/conbus/conbus_autoreport_commands.py

@@ -0,0 +1,108 @@
+"""Conbus auto report CLI commands."""
+
+import json
+
+import click
+from click import Context
+
+from xp.cli.commands.conbus.conbus import conbus_autoreport
+from xp.cli.utils.decorators import (
+    connection_command,
+)
+from xp.cli.utils.serial_number_type import SERIAL
+from xp.models import ConbusDatapointResponse
+from xp.models.conbus.conbus_writeconfig import ConbusWriteConfigResponse
+from xp.models.telegram.datapoint_type import DataPointType
+from xp.services.conbus.conbus_datapoint_service import ConbusDatapointService
+from xp.services.conbus.write_config_service import WriteConfigService
+from xp.services.telegram.telegram_datapoint_service import TelegramDatapointService
+
+
+@conbus_autoreport.command("get", short_help="Get auto report status for a module")
+@click.argument("serial_number", type=SERIAL)
+@connection_command()
+@click.pass_context
+def get_autoreport_command(ctx: Context, serial_number: str) -> None:
+    r"""Get the current auto report status for a specific module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+
+    Examples:
+        \b
+        xp conbus autoreport get 0123450001
+    """
+    # Get service from container
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
+    )
+
+    def on_finish(service_response: ConbusDatapointResponse) -> None:
+        """Handle successful completion of auto report status retrieval.
+
+        Args:
+            service_response: Auto report response object.
+        """
+        auto_report_status = telegram_service.get_autoreport_status(
+            service_response.data_value
+        )
+        result = service_response.to_dict()
+        result["auto_report_status"] = auto_report_status
+        click.echo(json.dumps(result, indent=2))
+
+    with service:
+        service.query_datapoint(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.AUTO_REPORT_STATUS,
+            finish_callback=on_finish,
+        )
+
+
+@conbus_autoreport.command("set", short_help="Set auto report status for a module")
+@click.argument("serial_number", type=SERIAL)
+@click.argument("status", type=click.Choice(["on", "off"], case_sensitive=False))
+@connection_command()
+@click.pass_context
+def set_autoreport_command(ctx: Context, serial_number: str, status: str) -> None:
+    r"""Set the auto report status for a specific module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        status: Auto report status - either 'on' or 'off'.
+
+    Examples:
+        \b
+        xp conbus autoreport set 0123450001 on
+        xp conbus autoreport set 0123450001 off
+    """
+
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
+        """Handle successful completion of light level on command.
+
+        Args:
+            response: Light level response object.
+        """
+        click.echo(json.dumps(response.to_dict(), indent=2))
+
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
+    )
+    status_value = True if status == "on" else False
+    data_value = telegram_service.get_autoreport_status_data_value(status_value)
+
+    with service:
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.AUTO_REPORT_STATUS,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_blink_commands.py

@@ -34,7 +34,7 @@ def send_blink_on_telegram(ctx: Context, serial_number: str) -> None:
         xp conbus blink on 0012345008
     """
 
-    def finish(service_response: ConbusBlinkResponse) -> None:
+    def on_finish(service_response: ConbusBlinkResponse) -> None:
         """Handle successful completion of blink on command.
 
         Args:
@@ -46,7 +46,7 @@ def send_blink_on_telegram(ctx: Context, serial_number: str) -> None:
         ctx.obj.get("container").get_container().resolve(ConbusBlinkService)
     )
     with service:
-        service.send_blink_telegram(serial_number, "on", finish, 0.5)
+        service.send_blink_telegram(serial_number, "on", on_finish, 0.5)
 
 
 @conbus_blink.command("off")
@@ -66,7 +66,7 @@ def send_blink_off_telegram(ctx: Context, serial_number: str) -> None:
         xp conbus blink off 0012345008
     """
 
-    def finish(service_response: ConbusBlinkResponse) -> None:
+    def on_finish(service_response: ConbusBlinkResponse) -> None:
         """Handle successful completion of blink off command.
 
         Args:
@@ -78,7 +78,7 @@ def send_blink_off_telegram(ctx: Context, serial_number: str) -> None:
         ctx.obj.get("container").get_container().resolve(ConbusBlinkService)
     )
     with service:
-        service.send_blink_telegram(serial_number, "off", finish, 0.5)
+        service.send_blink_telegram(serial_number, "off", on_finish, 0.5)
 
 
 @conbus_blink.group("all", short_help="Control blink state for all devices")
@@ -102,7 +102,7 @@ def blink_all_off(ctx: Context) -> None:
         xp conbus blink all off
     """
 
-    def finish(discovered_devices: ConbusBlinkResponse) -> None:
+    def on_finish(discovered_devices: ConbusBlinkResponse) -> None:
         """Handle successful completion of blink all off command.
 
         Args:
@@ -122,7 +122,7 @@ def blink_all_off(ctx: Context) -> None:
         ctx.obj.get("container").get_container().resolve(ConbusBlinkAllService)
     )
     with service:
-        service.send_blink_all_telegram("off", progress, finish, 0.5)
+        service.send_blink_all_telegram("off", progress, on_finish, 0.5)
 
 
 @conbus_blink_all.command("on", short_help="Turn on blinking for all devices")
@@ -140,7 +140,7 @@ def blink_all_on(ctx: Context) -> None:
         xp conbus blink all on
     """
 
-    def finish(discovered_devices: ConbusBlinkResponse) -> None:
+    def on_finish(discovered_devices: ConbusBlinkResponse) -> None:
         """Handle successful completion of blink all on command.
 
         Args:
@@ -160,4 +160,4 @@ def blink_all_on(ctx: Context) -> None:
         ctx.obj.get("container").get_container().resolve(ConbusBlinkAllService)
     )
     with service:
-        service.send_blink_all_telegram("on", progress, finish, 0.5)
+        service.send_blink_all_telegram("on", progress, on_finish, 0.5)

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_config_commands.py

@@ -23,5 +23,7 @@ def show_config(ctx: Context) -> None:
         \b
         xp conbus config
     """
-    config = ctx.obj.get("container").get_container().resolve(ConbusClientConfig)
+    config: ConbusClientConfig = (
+        ctx.obj.get("container").get_container().resolve(ConbusClientConfig)
+    )
     click.echo(json.dumps(config.conbus.model_dump(mode="json"), indent=2))

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_custom_commands.py

@@ -36,7 +36,9 @@ def send_custom_telegram(
         xp conbus custom 0012345011 02 E2
         xp conbus custom 0012345011 17 AA
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusCustomService)
+    service: ConbusCustomService = (
+        ctx.obj.get("container").get_container().resolve(ConbusCustomService)
+    )
 
     def on_finish(service_response: "ConbusCustomResponse") -> None:
         """Handle successful completion of custom telegram.

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_datapoint_commands.py

@@ -45,7 +45,9 @@ def query_datapoint(ctx: Context, serial_number: str, datapoint: DataPointType)
         xp conbus datapoint query current 0012345011
         xp conbus datapoint query humidity 0012345011
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
 
     def on_finish(service_response: ConbusDatapointResponse) -> None:
         """Handle successful completion of datapoint query.
@@ -83,7 +85,7 @@ def query_all_datapoints(ctx: Context, serial_number: str) -> None:
         \b
         xp conbus datapoint all 0123450001
     """
-    service = (
+    service: ConbusDatapointQueryAllService = (
         ctx.obj.get("container").get_container().resolve(ConbusDatapointQueryAllService)
     )
 

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_discover_commands.py

@@ -28,7 +28,7 @@ def send_discover_telegram(ctx: click.Context) -> None:
         xp conbus discover
     """
 
-    def finish(discovered_devices: ConbusDiscoverResponse) -> None:
+    def on_finish(discovered_devices: ConbusDiscoverResponse) -> None:
         """Handle successful completion of device discovery.
 
         Args:
@@ -45,6 +45,8 @@ def send_discover_telegram(ctx: click.Context) -> None:
         # click.echo(f"Discovered : {serial_number}")
         pass
 
-    service = ctx.obj.get("container").get_container().resolve(ConbusDiscoverService)
+    service: ConbusDiscoverService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDiscoverService)
+    )
     with service:
-        service.start(progress, finish, 0.5)
+        service.start(progress, on_finish, 0.5)

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -7,14 +7,14 @@ import click
 from xp.cli.commands.conbus.conbus import conbus_lightlevel
 from xp.cli.utils.decorators import (
     connection_command,
-    handle_service_errors,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.models.conbus.conbus_lightlevel import ConbusLightlevelResponse
-from xp.services.conbus.conbus_lightlevel_set_service import (
-    ConbusLightlevelError,
-    ConbusLightlevelSetService,
-)
+from xp.models import ConbusDatapointResponse
+from xp.models.conbus.conbus_writeconfig import ConbusWriteConfigResponse
+from xp.models.telegram.datapoint_type import DataPointType
+from xp.services.conbus.conbus_datapoint_service import ConbusDatapointService
+from xp.services.conbus.write_config_service import WriteConfigService
+from xp.services.telegram.telegram_datapoint_service import TelegramDatapointService
 
 
 @conbus_lightlevel.command("set")
@@ -23,7 +23,6 @@ from xp.services.conbus.conbus_lightlevel_set_service import (
 @click.argument("level", type=click.IntRange(0, 100))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_set(
     ctx: click.Context, serial_number: str, output_number: int, level: int
 ) -> None:
@@ -41,20 +40,28 @@ def xp_lightlevel_set(
         xp conbus lightlevel set 0011223344 0 100  # Set output 0 to 100%
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
-        """Handle successful completion of light level set command.
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
+        """Handle successful completion of light level on command.
 
         Args:
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
 
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
+    data_value = f"{output_number:02d}:{level:03d}"
+
     with service:
-        service.set_lightlevel(serial_number, output_number, level, finish, 0.5)
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
 
 
 @conbus_lightlevel.command("off")
@@ -62,7 +69,6 @@ def xp_lightlevel_set(
 @click.argument("output_number", type=click.IntRange(0, 8))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_off(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
@@ -79,20 +85,29 @@ def xp_lightlevel_off(
         xp conbus lightlevel off 0011223344 0   # Turn off output 0
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
-        """Handle successful completion of light level off command.
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
+        """Handle successful completion of light level on command.
 
         Args:
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
 
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
+    level = 0
+    data_value = f"{output_number:02d}:{level:03d}"
+
     with service:
-        service.turn_off(serial_number, output_number, finish, 0.5)
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
 
 
 @conbus_lightlevel.command("on")
@@ -100,7 +115,6 @@ def xp_lightlevel_off(
 @click.argument("output_number", type=click.IntRange(0, 8))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_on(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
@@ -117,7 +131,7 @@ def xp_lightlevel_on(
         xp conbus lightlevel on 0011223344 0   # Turn on output 0 (80%)
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
 
         Args:
@@ -125,12 +139,21 @@ def xp_lightlevel_on(
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
 
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
+    level = 60
+    data_value = f"{output_number:02d}:{level:03d}"
+
     with service:
-        service.turn_on(serial_number, output_number, finish, 0.5)
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
 
 
 @conbus_lightlevel.command("get")
@@ -138,7 +161,6 @@ def xp_lightlevel_on(
 @click.argument("output_number", type=click.IntRange(0, 8))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_get(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
@@ -154,18 +176,32 @@ def xp_lightlevel_get(
         xp conbus lightlevel get 0123450001 2   # Get light level for output 2
         xp conbus lightlevel get 0011223344 0   # Get light level for output 0
     """
+    # Get service from container
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
+    )
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
+    def on_finish(service_response: "ConbusDatapointResponse") -> None:
         """Handle successful completion of light level get command.
 
         Args:
-            response: Light level response object.
+            service_response: Light level response object.
         """
-        click.echo(json.dumps(response.to_dict(), indent=2))
-
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
-    )
+        lightlevel_level = telegram_service.get_lightlevel(
+            service_response.data_value, output_number
+        )
+        result = service_response.to_dict()
+        result["output_number"] = output_number
+        result["lightlevel_level"] = lightlevel_level
+        click.echo(json.dumps(result, indent=2))
 
     with service:
-        service.get_lightlevel(serial_number, output_number, finish, 0.5)
+        service.query_datapoint(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -9,9 +9,12 @@ from xp.cli.utils.decorators import (
     connection_command,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.models.conbus.conbus_linknumber import ConbusLinknumberResponse
-from xp.services.conbus.conbus_linknumber_get_service import ConbusLinknumberGetService
-from xp.services.conbus.conbus_linknumber_set_service import ConbusLinknumberSetService
+from xp.models import ConbusDatapointResponse
+from xp.models.conbus.conbus_writeconfig import ConbusWriteConfigResponse
+from xp.models.telegram.datapoint_type import DataPointType
+from xp.services.conbus.conbus_datapoint_service import ConbusDatapointService
+from xp.services.conbus.write_config_service import WriteConfigService
+from xp.services.telegram.telegram_datapoint_service import TelegramDatapointService
 
 
 @conbus_linknumber.command("set", short_help="Set link number for a module")
@@ -33,23 +36,27 @@ def set_linknumber_command(
         \b
         xp conbus linknumber set 0123450001 25
     """
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLinknumberSetService)
-    )
 
-    def on_finish(response: ConbusLinknumberResponse) -> None:
-        """Handle successful completion of link number set command.
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
+        """Handle successful completion of light level on command.
 
         Args:
-            response: Link number response object.
+            response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
 
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
+
+    data_value = f"{link_number: 02d}"
     with service:
-        service.set_linknumber(
+        service.write_config(
             serial_number=serial_number,
-            link_number=link_number,
+            datapoint_type=DataPointType.LINK_NUMBER,
+            data_value=data_value,
             finish_callback=on_finish,
+            timeout_seconds=0.5,
         )
 
 
@@ -68,20 +75,28 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
         \b
         xp conbus linknumber get 0123450001
     """
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLinknumberGetService)
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
     )
 
-    def on_finish(response: ConbusLinknumberResponse) -> None:
+    def on_finish(service_response: ConbusDatapointResponse) -> None:
         """Handle successful completion of link number get command.
 
         Args:
-            response: Link number response object.
+            service_response: Link number response object.
         """
-        click.echo(json.dumps(response.to_dict(), indent=2))
+        linknumber_value = telegram_service.get_linknumber(service_response.data_value)
+        result = service_response.to_dict()
+        result["linknumber_value"] = linknumber_value
+        click.echo(json.dumps(result, indent=2))
 
     with service:
-        service.get_linknumber(
+        service.query_datapoint(
             serial_number=serial_number,
+            datapoint_type=DataPointType.LINK_NUMBER,
             finish_callback=on_finish,
+            timeout_seconds=0.5,
         )

{conson_xp-1.2.0 → conson_xp-1.3.0}/src/xp/cli/commands/conbus/conbus_msactiontable_commands.py

@@ -2,6 +2,7 @@
 
 import json
 from dataclasses import asdict
+from typing import Union
 
 import click
 from click import Context
@@ -12,7 +13,9 @@ 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.actiontable import ActionTable
+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.services.conbus.actiontable.msactiontable_service import (
     MsActionTableService,
 )
@@ -33,7 +36,9 @@ def conbus_download_msactiontable(
         serial_number: 10-digit module serial number.
         xpmoduletype: XP module type.
     """
-    service = ctx.obj.get("container").get_container().resolve(MsActionTableService)
+    service: MsActionTableService = (
+        ctx.obj.get("container").get_container().resolve(MsActionTableService)
+    )
 
     def progress_callback(progress: str) -> None:
         """Handle progress updates during MS action table download.
@@ -43,7 +48,9 @@ def conbus_download_msactiontable(
         """
         click.echo(progress, nl=False)
 
-    def finish_callback(action_table: ActionTable) -> None:
+    def on_finish(
+        action_table: Union[Xp20MsActionTable | Xp24MsActionTable | Xp33MsActionTable],
+    ) -> None:
         """Handle successful completion of MS action table download.
 
         Args:
@@ -73,6 +80,6 @@ def conbus_download_msactiontable(
             serial_number=serial_number,
             xpmoduletype=xpmoduletype,
             progress_callback=progress_callback,
-            finish_callback=finish_callback,
+            finish_callback=on_finish,
             error_callback=error_callback,
         )