conson-xp 1.34.0__tar.gz → 1.36.0__tar.gz

{conson_xp-1.34.0 → conson_xp-1.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.34.0
+Version: 1.36.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License

{conson_xp-1.34.0 → conson_xp-1.36.0}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.34.0"
+version = "1.36.0"
 
 [project.license]
 file = "LICENSE"
@@ -138,7 +138,7 @@ disable_error_code = [
     "method-assign",
 ]
 overrides = [
-    { module = "tests.*", disallow_untyped_defs = false },
+    { module = "tests.*", disallow_untyped_defs = false, warn_unreachable = false },
 ]
 
 [tool.isort]

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/__init__.py

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

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -3,7 +3,6 @@
 import json
 from contextlib import suppress
 from pathlib import Path
-from typing import Any
 
 import click
 from click import Context
@@ -13,7 +12,6 @@ from xp.cli.utils.decorators import (
     connection_command,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.models.actiontable.actiontable import ActionTable
 from xp.models.homekit.homekit_conson_config import (
     ConsonModuleConfig,
     ConsonModuleListConfig,
@@ -53,7 +51,7 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         ctx.obj.get("container").get_container().resolve(ActionTableService)
     )
 
-    def progress_callback(progress: str) -> None:
+    def on_progress(progress: str) -> None:
         """Handle progress updates during action table download.
 
         Args:
@@ -61,40 +59,36 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         """
         click.echo(progress)
 
-    def on_finish(
-        _actiontable: ActionTable,
-        actiontable_dict: dict[str, Any],
-        actiontable_short: list[str],
-    ) -> None:
+    def on_finish(result: tuple) -> None:
         """Handle successful completion of action table download.
 
         Args:
-            _actiontable: Downloaded action table object.
-            actiontable_dict: Dictionary representation of action table.
-            actiontable_short: List of textual format strings.
+            result: Tuple of (_actiontable, actiontable_dict, actiontable_short).
         """
+        _actiontable, actiontable_dict, actiontable_short = result
         output = {
             "serial_number": serial_number,
             "actiontable_short": actiontable_short,
             "actiontable": actiontable_dict,
         }
         click.echo(json.dumps(output, indent=2, default=str))
+        service.stop_reactor()
 
-    def error_callback(error: str) -> None:
+    def on_error(error: str) -> None:
         """Handle errors during action table download.
 
         Args:
             error: Error message string.
         """
         click.echo(error)
+        service.stop_reactor()
 
     with service:
-        service.start(
-            serial_number=serial_number,
-            progress_callback=progress_callback,
-            finish_callback=on_finish,
-            error_callback=error_callback,
-        )
+        service.on_progress.connect(on_progress)
+        service.on_finish.connect(on_finish)
+        service.on_error.connect(on_error)
+        service.start(serial_number=serial_number)
+        service.start_reactor()
 
 
 @conbus_actiontable.command("upload", short_help="Upload ActionTable")
@@ -125,13 +119,19 @@ def conbus_upload_actiontable(ctx: Context, serial_number: str) -> None:
         """
         click.echo(progress, nl=False)
 
-    def success_callback() -> None:
-        """Handle successful completion of action table upload."""
-        click.echo("\nAction table uploaded successfully")
-        if entries_count > 0:
-            click.echo(f"{entries_count} entries written")
+    def on_finish(success: bool) -> None:
+        """Handle completion of action table upload.
 
-    def error_callback(error: str) -> None:
+        Args:
+            success: True if upload succeeded.
+        """
+        if success:
+            click.echo("\nAction table uploaded successfully")
+            if entries_count > 0:
+                click.echo(f"{entries_count} entries written")
+        service.stop_reactor()
+
+    def on_error(error: str) -> None:
         """Handle errors during action table upload.
 
         Args:
@@ -140,6 +140,7 @@ def conbus_upload_actiontable(ctx: Context, serial_number: str) -> None:
         Raises:
             ActionTableError: Always raised with upload failure message.
         """
+        service.stop_reactor()
         raise ActionTableError(f"Upload failed: {error}")
 
     with service:
@@ -152,12 +153,11 @@ def conbus_upload_actiontable(ctx: Context, serial_number: str) -> None:
                 if module and module.action_table:
                     entries_count = len(module.action_table)
 
-        service.start(
-            serial_number=serial_number,
-            progress_callback=progress_callback,
-            success_callback=success_callback,
-            error_callback=error_callback,
-        )
+        service.on_progress.connect(progress_callback)
+        service.on_finish.connect(on_finish)
+        service.on_error.connect(on_error)
+        service.start(serial_number=serial_number)
+        service.start_reactor()
 
 
 @conbus_actiontable.command("list", short_help="List modules with ActionTable")
@@ -180,7 +180,7 @@ def conbus_list_actiontable(ctx: Context) -> None:
         """
         click.echo(json.dumps(module_list, indent=2, default=str))
 
-    def error_callback(error: str) -> None:
+    def on_error(error: str) -> None:
         """Handle errors during action table list.
 
         Args:
@@ -189,10 +189,9 @@ def conbus_list_actiontable(ctx: Context) -> None:
         click.echo(error)
 
     with service:
-        service.start(
-            finish_callback=on_finish,
-            error_callback=error_callback,
-        )
+        service.on_finish.connect(on_finish)
+        service.on_error.connect(on_error)
+        service.start()
 
 
 @conbus_actiontable.command("show", short_help="Show ActionTable configuration")

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_autoreport_commands.py

@@ -55,10 +55,9 @@ def get_autoreport_command(ctx: Context, serial_number: str) -> None:
         click.echo(json.dumps(result, indent=2))
 
     with service:
+        service.on_finish.connect(on_finish)
         service.query_datapoint(
-            serial_number=serial_number,
-            datapoint_type=DataPointType.AUTO_REPORT_STATUS,
-            finish_callback=on_finish,
+            serial_number=serial_number, datapoint_type=DataPointType.AUTO_REPORT_STATUS
         )
 
 
@@ -80,6 +79,12 @@ def set_autoreport_command(ctx: Context, serial_number: str, status: str) -> Non
         xp conbus autoreport set 0123450001 on
         xp conbus autoreport set 0123450001 off
     """
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
+    )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
@@ -88,21 +93,17 @@ def set_autoreport_command(ctx: Context, serial_number: str, status: str) -> Non
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
-    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.on_finish.connect(on_finish)
         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,
         )
+        service.start_reactor()

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_custom_commands.py

@@ -40,18 +40,20 @@ def send_custom_telegram(
         ctx.obj.get("container").get_container().resolve(ConbusCustomService)
     )
 
-    def on_finish(service_response: "ConbusCustomResponse") -> None:
+    def on_finish(response: ConbusCustomResponse) -> None:
         """Handle successful completion of custom telegram.
 
         Args:
-            service_response: Custom response object.
+            response: Custom response object.
         """
-        click.echo(json.dumps(service_response.to_dict(), indent=2))
+        click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
+        service.on_finish.connect(on_finish)
         service.send_custom_telegram(
             serial_number=serial_number,
             function_code=function_code,
             data=datapoint_code,
-            finish_callback=on_finish,
         )
+        service.start_reactor()

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_datapoint_commands.py

@@ -56,14 +56,16 @@ def query_datapoint(ctx: Context, serial_number: str, datapoint: DataPointType)
             service_response: Datapoint response object.
         """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
+        service.stop_reactor()
 
     # Send telegram
     with service:
+        service.on_finish.connect(on_finish)
         service.query_datapoint(
             serial_number=serial_number,
             datapoint_type=datapoint,
-            finish_callback=on_finish,
         )
+        service.start_reactor()
 
 
 # Add the single datapoint query command to the group
@@ -96,6 +98,7 @@ def query_all_datapoints(ctx: Context, serial_number: str) -> None:
             service_response: Datapoint response object with all datapoints.
         """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
+        service.stop_reactor()
 
     def on_progress(reply_telegram: ReplyTelegram) -> None:
         """Handle progress updates during all datapoints query.
@@ -106,8 +109,7 @@ def query_all_datapoints(ctx: Context, serial_number: str) -> None:
         click.echo(json.dumps(reply_telegram.to_dict(), indent=2))
 
     with service:
-        service.query_all_datapoints(
-            serial_number=serial_number,
-            finish_callback=on_finish,
-            progress_callback=on_progress,
-        )
+        service.on_finish.connect(on_finish)
+        service.on_progress.connect(on_progress)
+        service.query_all_datapoints(serial_number=serial_number)
+        service.start_reactor()

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -39,6 +39,9 @@ def xp_lightlevel_set(
         xp conbus lightlevel set 0123450001 2 50   # Set output 2 to 50%
         xp conbus lightlevel set 0011223344 0 100  # Set output 0 to 100%
     """
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
@@ -47,21 +50,19 @@ def xp_lightlevel_set(
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
-
-    service: WriteConfigService = (
-        ctx.obj.get("container").get_container().resolve(WriteConfigService)
-    )
+        service.stop_reactor()
 
     data_value = f"{output_number:02d}:{level:03d}"
 
     with service:
+        service.on_finish.connect(on_finish)
         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,
         )
+        service.start_reactor()
 
 
 @conbus_lightlevel.command("off")
@@ -84,6 +85,9 @@ def xp_lightlevel_off(
         xp conbus lightlevel off 0123450001 2   # Turn off output 2
         xp conbus lightlevel off 0011223344 0   # Turn off output 0
     """
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
@@ -92,22 +96,20 @@ def xp_lightlevel_off(
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
-
-    service: WriteConfigService = (
-        ctx.obj.get("container").get_container().resolve(WriteConfigService)
-    )
+        service.stop_reactor()
 
     level = 0
     data_value = f"{output_number:02d}:{level:03d}"
 
     with service:
+        service.on_finish.connect(on_finish)
         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,
         )
+        service.start_reactor()
 
 
 @conbus_lightlevel.command("on")
@@ -130,6 +132,9 @@ def xp_lightlevel_on(
         xp conbus lightlevel on 0123450001 2   # Turn on output 2 (80%)
         xp conbus lightlevel on 0011223344 0   # Turn on output 0 (80%)
     """
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
@@ -138,22 +143,20 @@ def xp_lightlevel_on(
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
-
-    service: WriteConfigService = (
-        ctx.obj.get("container").get_container().resolve(WriteConfigService)
-    )
+        service.stop_reactor()
 
     level = 60
     data_value = f"{output_number:02d}:{level:03d}"
 
     with service:
+        service.on_finish.connect(on_finish)
         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,
         )
+        service.start_reactor()
 
 
 @conbus_lightlevel.command("get")
@@ -199,9 +202,9 @@ def xp_lightlevel_get(
         click.echo(json.dumps(result, indent=2))
 
     with service:
+        service.on_finish.connect(on_finish)
         service.query_datapoint(
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
-            finish_callback=on_finish,
             timeout_seconds=0.5,
         )

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -36,6 +36,9 @@ def set_linknumber_command(
         \b
         xp conbus linknumber set 0123450001 25
     """
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
@@ -44,20 +47,18 @@ def set_linknumber_command(
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
-
-    service: WriteConfigService = (
-        ctx.obj.get("container").get_container().resolve(WriteConfigService)
-    )
+        service.stop_reactor()
 
     data_value = f"{link_number:02d}"
     with service:
+        service.on_finish.connect(on_finish)
         service.write_config(
             serial_number=serial_number,
             datapoint_type=DataPointType.LINK_NUMBER,
             data_value=data_value,
-            finish_callback=on_finish,
             timeout_seconds=0.5,
         )
+        service.start_reactor()
 
 
 @conbus_linknumber.command("get", short_help="Get link number for a module")
@@ -94,9 +95,9 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
         click.echo(json.dumps(result, indent=2))
 
     with service:
+        service.on_finish.connect(on_finish)
         service.query_datapoint(
             serial_number=serial_number,
             datapoint_type=DataPointType.LINK_NUMBER,
-            finish_callback=on_finish,
             timeout_seconds=0.5,
         )

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_modulenumber_commands.py

@@ -36,6 +36,9 @@ def set_modulenumber_command(
         \b
         xp conbus modulenumber set 0123450001 25
     """
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
 
     def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
@@ -44,20 +47,18 @@ def set_modulenumber_command(
             response: Light level response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
-
-    service: WriteConfigService = (
-        ctx.obj.get("container").get_container().resolve(WriteConfigService)
-    )
+        service.stop_reactor()
 
     data_value = f"{module_number:02d}"
     with service:
+        service.on_finish.connect(on_finish)
         service.write_config(
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_NUMBER,
             data_value=data_value,
-            finish_callback=on_finish,
             timeout_seconds=0.5,
         )
+        service.start_reactor()
 
 
 @conbus_modulenumber.command("get", short_help="Get module number for a module")
@@ -96,9 +97,9 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
         click.echo(json.dumps(result, indent=2))
 
     with service:
+        service.on_finish.connect(on_finish)
         service.query_datapoint(
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_NUMBER,
-            finish_callback=on_finish,
             timeout_seconds=0.5,
         )

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_msactiontable_commands.py

@@ -40,7 +40,7 @@ def conbus_download_msactiontable(
         ctx.obj.get("container").get_container().resolve(MsActionTableService)
     )
 
-    def progress_callback(progress: str) -> None:
+    def on_progress(progress: str) -> None:
         """Handle progress updates during MS action table download.
 
         Args:
@@ -61,6 +61,7 @@ def conbus_download_msactiontable(
         Raises:
             Abort: If action table download failed.
         """
+        service.stop_reactor()
         if action_table is None:
             click.echo("Error: Failed to download MS action table")
             raise click.Abort()
@@ -72,23 +73,20 @@ def conbus_download_msactiontable(
         }
         click.echo(json.dumps(output, indent=2, default=str))
 
-    def error_callback(error: str) -> None:
+    def on_error(error: str) -> None:
         """Handle errors during MS action table download.
 
         Args:
             error: Error message string.
-
-        Raises:
-            Abort: Always raised to abort the command on error.
         """
         click.echo(f"Error: {error}")
-        raise click.Abort()
 
     with service:
+        service.on_progress.connect(on_progress)
+        service.on_error.connect(on_error)
+        service.on_finish.connect(on_finish)
         service.start(
             serial_number=serial_number,
             xpmoduletype=xpmoduletype,
-            progress_callback=progress_callback,
-            finish_callback=on_finish,
-            error_callback=error_callback,
         )
+        service.start_reactor()

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_output_commands.py

@@ -5,9 +5,7 @@ import json
 import click
 
 from xp.cli.commands.conbus.conbus import conbus_output
-from xp.cli.utils.decorators import (
-    connection_command,
-)
+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_output import ConbusOutputResponse
@@ -45,14 +43,16 @@ def xp_output_on(ctx: click.Context, serial_number: str, output_number: int) ->
             response: Output response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
+        service.on_finish.connect(on_finish)
         service.send_action(
             serial_number=serial_number,
             output_number=output_number,
             action_type=ActionType.ON_RELEASE,
-            finish_callback=on_finish,
         )
+        service.start_reactor()
 
 
 @conbus_output.command("off")
@@ -83,14 +83,16 @@ def xp_output_off(ctx: click.Context, serial_number: str, output_number: int) ->
             response: Output response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
+        service.on_finish.connect(on_finish)
         service.send_action(
             serial_number=serial_number,
             output_number=output_number,
             action_type=ActionType.OFF_PRESS,
-            finish_callback=on_finish,
         )
+        service.start_reactor()
 
 
 @conbus_output.command("status")
@@ -121,10 +123,10 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
 
     with service:
+        service.on_finish.connect(on_finish)
         service.query_datapoint(
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_OUTPUT_STATE,
-            finish_callback=on_finish,
         )
 
 
@@ -156,8 +158,8 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
 
     with service:
+        service.on_finish.connect(on_finish)
         service.query_datapoint(
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_STATE,
-            finish_callback=on_finish,
         )

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_raw_commands.py

@@ -52,11 +52,16 @@ def send_raw_telegrams(ctx: Context, raw_telegrams: str) -> None:
             service_response: Raw response object.
         """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
+        # Connect service signals
+        service.on_progress.connect(on_progress)
+        service.on_finish.connect(on_finish)
+        # Setup
         service.send_raw_telegram(
             raw_input=raw_telegrams,
-            progress_callback=on_progress,
-            finish_callback=on_finish,
             timeout_seconds=5.0,
         )
+        # Start (blocks until completion)
+        service.start_reactor()

{conson_xp-1.34.0 → conson_xp-1.36.0}/src/xp/cli/commands/conbus/conbus_scan_commands.py

@@ -48,11 +48,13 @@ def scan_module(ctx: Context, serial_number: str, function_code: str) -> None:
             service_response: Scan response object.
         """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
+        service.on_progress.connect(on_progress)
+        service.on_finish.connect(on_finish)
         service.scan_module(
             serial_number=serial_number,
             function_code=function_code,
-            progress_callback=on_progress,
-            finish_callback=on_finish,
         )
+        service.start_reactor()