conson-xp 1.34.0__py3-none-any.whl → 1.36.0__py3-none-any.whl

{conson_xp-1.34.0.dist-info → conson_xp-1.36.0.dist-info}/METADATA

@@ -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.dist-info → conson_xp-1.36.0.dist-info}/RECORD

@@ -1,30 +1,30 @@
-conson_xp-1.34.0.dist-info/METADATA,sha256=9ID-C2KoLbshYqzErSWWIRc0q_O9loTVJIOJxGe57NY,11246
-conson_xp-1.34.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.34.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.34.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=vXeJqE3QI_Fjqi5W7xgUMPTwKhql9XhCnkj3f7fKMjs,181
+conson_xp-1.36.0.dist-info/METADATA,sha256=yAI8M5UPAq9YeW27pMskQLgX_CehBjANMIhDqaEm1JQ,11246
+conson_xp-1.36.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.36.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.36.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=5SwVHk5WNEf2f5aDU_P09Qax6p3E4JqdZGNWOOqOQq4,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=noh8fdZAWq-ihJEboP8WugbIgq4LJ3jUWMRA7720xWE,4909
 xp/cli/commands/conbus/__init__.py,sha256=gE3K5OEoXkkZX8UOc2v3nreQQzwkOQi7n0VZ-Z2juXA,495
 xp/cli/commands/conbus/conbus.py,sha256=eqdY8ArapvD08Z4p7Xk7eh4z0dESHuMSw7PKtwTJRYU,3021
-xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=cdjLV9cnm7teEOlu5Jf1MS_aL7lNy8KiDIyjCQa5Nzw,7138
-xp/cli/commands/conbus/conbus_autoreport_commands.py,sha256=oZgyUUFNsb4yf2WO81l2w1PrasNwdC__QwxNkJ2jCaU,3794
+xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=tqZzKU5-PQ1JbdqcbarUA5nlybpB0Es656jG_5Bz3Wg,7128
+xp/cli/commands/conbus/conbus_autoreport_commands.py,sha256=1ltokrvbzoCwwSAKvki-0EuL2M6i-q2E9RSYHwQX2js,3856
 xp/cli/commands/conbus/conbus_blink_commands.py,sha256=HRn4Lr_BO7_WynsaUnO_hKezOi3MVhkPYEOnh0rMMlg,5324
 xp/cli/commands/conbus/conbus_config_commands.py,sha256=BugIbgNX6_s4MySGvI6tWZkwguciajHUX2Xz8XBux7k,716
-xp/cli/commands/conbus/conbus_custom_commands.py,sha256=lICT93ijMdhVRm8KjNMLo7kQ2BLlnOZvMPbR3SxSmZ4,1692
-xp/cli/commands/conbus/conbus_datapoint_commands.py,sha256=r36OuTjREtbGKL-bskAGa0-WLw7x06td6woZn3GYJNA,3630
+xp/cli/commands/conbus/conbus_custom_commands.py,sha256=nQttCXzmuUVLy5u7mZaRqYXzy8MIHyHRJQBdkDLunYc,1735
+xp/cli/commands/conbus/conbus_datapoint_commands.py,sha256=UZ_wTO0cdxjed0fGGZYylfJN9gaXwqLg3cn80JqqWt0,3751
 xp/cli/commands/conbus/conbus_discover_commands.py,sha256=MnTCzvERO5xerfs0fuuIBoo1O9h_0IfoJ6snLGVl0lA,1899
 xp/cli/commands/conbus/conbus_event_commands.py,sha256=7URf-2u8Kzcy0chLYShbZfCbKawf--i-8U88AjhxleQ,3177
 xp/cli/commands/conbus/conbus_export_commands.py,sha256=s3jgg3Wqi1P6rYujpE_9aPA47S4UBQfrZPTr9vzH-UA,2951
-xp/cli/commands/conbus/conbus_lightlevel_commands.py,sha256=FpCwogdxa7yFUjlrxM7e8Q2Ut32tKAHabngQQChvtJI,6763
-xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=KitaGDM5HpwVUz8rLpO8VZUypUTcAg3Bzl0DVm6gnSk,3391
-xp/cli/commands/conbus/conbus_modulenumber_commands.py,sha256=L7-6y3rDllOjQ9g6Bk_RiTKIhAOHVPLdxWif9exkngs,3463
-xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=fb9MQ4O04H0Dinpt7vSF5GtfntTZHelQ5TuUmSBbCTg,2899
-xp/cli/commands/conbus/conbus_output_commands.py,sha256=zdRVbHzVhMbZpG2x5WXtujc3wKTsoQUV4IgkVIbJbCc,5019
-xp/cli/commands/conbus/conbus_raw_commands.py,sha256=8BKUarwvHgz-sxML7n99YVsb8B1HJNExjQpRsuY_tQw,1829
+xp/cli/commands/conbus/conbus_lightlevel_commands.py,sha256=7KeR9YVW2u6DfuEXlrkrv65Q5cfgFnSwJQjK1TuQrLs,6973
+xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=cd7kvG6Ikf_VqqSxv9enksckd3onUOwziVS9Mr6Yf6k,3465
+xp/cli/commands/conbus/conbus_modulenumber_commands.py,sha256=Z9deoalANi0fkqBUosFvkuD-dnSP5vvi9VPdy0osyDs,3537
+xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=rNLWuC19Nj8CxGJNQRCnwl-mEAipz1iufBcIbCytkGM,2847
+xp/cli/commands/conbus/conbus_output_commands.py,sha256=k4DqraUWCbWY6cfSk8WF2WBDz6Dc4ABU1TPq1fCZnRk,5160
+xp/cli/commands/conbus/conbus_raw_commands.py,sha256=892-S6wxp5xNPz6K86Le8KtQXNO4a0PQv20Hzx3vhiA,1996
 xp/cli/commands/conbus/conbus_receive_commands.py,sha256=_PsC-3xidmJBuOWUS60iDzhSHYYn5ZFmORXap-ljVGM,1902
-xp/cli/commands/conbus/conbus_scan_commands.py,sha256=JfXucOwOadvLEKT_fW9fwvqWKHaEODOojLjnO8JV_00,1730
+xp/cli/commands/conbus/conbus_scan_commands.py,sha256=L7YHNnDUWxT8UHkQoNgyKa6twoUrE126XBkT1G76xK0,1805
 xp/cli/commands/file_commands.py,sha256=GV102X7FRZDUNKLlzvSsIGcoXAaofOzmjCp3HUpE9lw,5532
 xp/cli/commands/homekit/__init__.py,sha256=qqwY8ulxTx1S74Mzpb6EKjBLT6fWTNdf9PQ3HKuERKY,50
 xp/cli/commands/homekit/homekit.py,sha256=fiPBlE_nSndyO1ftEyTjL6xmgTh44Q3uZJEIcsf6W9I,3594
@@ -122,25 +122,25 @@ xp/services/actiontable/msactiontable_xp24_serializer.py,sha256=zdKzcrKqD41POqj_
 xp/services/actiontable/msactiontable_xp33_serializer.py,sha256=xoZBA38pBSUPA9nn7HgaH1ZM5sR2heQbJ6JVlPVbzUY,8400
 xp/services/conbus/__init__.py,sha256=Hi35sMKu9o6LpYoi2tQDaQoMb8M5sOt_-LUTxxaCU_0,28
 xp/services/conbus/actiontable/__init__.py,sha256=oD6vRk_Ye-eZ9s_hldAgtRJFu4mfAnODqpkJUGHHszk,40
-xp/services/conbus/actiontable/actiontable_download_service.py,sha256=x9k5VlVjvsAJi4McDGqErLaBE_dosV5uMSrNF_r6ic0,6013
-xp/services/conbus/actiontable/actiontable_list_service.py,sha256=6izVZkM2hlWXUMUo1NkNzSMvPo0wFfDxYTADQBXQptU,3000
+xp/services/conbus/actiontable/actiontable_download_service.py,sha256=1sk_STBdMfq8YlZnr_7zC_de2Rqkb3SHiKwioTJK2mw,7484
+xp/services/conbus/actiontable/actiontable_list_service.py,sha256=PH8B-5j1ON_Q50INylYhrVDE1gG7vNE1nMyy-2DJfqA,2808
 xp/services/conbus/actiontable/actiontable_show_service.py,sha256=jqNZ4UvZPHH66OYuryjnU1Km-a83OCwYvK0vc56oL8I,3017
-xp/services/conbus/actiontable/actiontable_upload_service.py,sha256=txhMumjcIHPI4TZk6CERhjyyTKUNhUb7fdSmaylYC48,8189
-xp/services/conbus/actiontable/msactiontable_service.py,sha256=K0TiYL8g4ac8BS1tqS0UAIYJigOlNhxVLIb8ZFybnVE,8393
+xp/services/conbus/actiontable/actiontable_upload_service.py,sha256=kXV99ReAYcMZt0icPU04lX9ZWWkiiYcxzsty0pnfzwE,9707
+xp/services/conbus/actiontable/msactiontable_service.py,sha256=W44Uy2m2vM_yL57gwyyz59j9zRu5dyAG1g8PJcT7vE8,9777
 xp/services/conbus/conbus_blink_all_service.py,sha256=6XsqtgHUgPDPWG0Mx2W2gnG_1eiaHrt2DiPXGqGHS50,8472
 xp/services/conbus/conbus_blink_service.py,sha256=wFCUbHYInbzfE4Ks_qjkav0FhtHXsxM9IY6tD5r0oAk,7898
-xp/services/conbus/conbus_custom_service.py,sha256=4aneYdPObiZOGxPFYg5Wr70cl_xFxlQIdJBPQSa0enI,5826
-xp/services/conbus/conbus_datapoint_queryall_service.py,sha256=p9R02cVimhdJILHQ6BoeZj8Hog4oRpqBnMo3t4R8ecY,6816
-xp/services/conbus/conbus_datapoint_service.py,sha256=SYhHj9RmTmaJ750tyZ1IW2kl7tgDQ1xm_EM1zUjk1aQ,6421
+xp/services/conbus/conbus_custom_service.py,sha256=uPsBkoVGr8I5JwpHiCM8Xf2DUYy6e34cQHmGSheY98Y,7766
+xp/services/conbus/conbus_datapoint_queryall_service.py,sha256=K8a_aO5rXuOx9ZHTrN1rpQ6KIOAkhYx-HsqDf0HIo-E,8399
+xp/services/conbus/conbus_datapoint_service.py,sha256=MjUHHkFgFD5Ex5sESamylPzoHfYRmIOZWnTIdI0AXjY,8037
 xp/services/conbus/conbus_discover_service.py,sha256=ZwjYBlgP6FgpHBJk7pcKr4JHfH7WUHDxe4he4F_HblQ,12740
 xp/services/conbus/conbus_event_list_service.py,sha256=0xyXXNU44epN5bFkU6oiZMyhxfUguul3evqClvPJDcA,3618
 xp/services/conbus/conbus_event_raw_service.py,sha256=FZFu-LNLInrTKTpiGLyootozvyIF5Si5FMrxNk2ALD0,7000
 xp/services/conbus/conbus_export_service.py,sha256=3Zb58qqRDNR9gA4rQ_fyT--ZgRIK_lkqnXJFbQnrZOA,17300
-xp/services/conbus/conbus_output_service.py,sha256=mHFOAPx2zo0TStZ3pokp6v94AQjIamcwZDeg5YH_-eo,7240
-xp/services/conbus/conbus_raw_service.py,sha256=4yZLLTIAOxpgByUTWZXw1ihGa6Xtl98ckj9T7VfprDI,4335
+xp/services/conbus/conbus_output_service.py,sha256=XHn_htcTt2TBSpuXr2DNsT8oOC2soctNFIojhYfd_v0,9297
+xp/services/conbus/conbus_raw_service.py,sha256=FmUaF9o2nFZVP8LpabKIwkg0P8coLCkeJC4yYgsA6U0,5780
 xp/services/conbus/conbus_receive_service.py,sha256=7wOaEDrdoXwZE9MeUM89eB3hobYpvtbYk_YLv3MVAtc,5352
-xp/services/conbus/conbus_scan_service.py,sha256=tHJ5qaxcNXxAZb2D2F1v6IrzydfxjJOYllM6Txt1eBE,5176
-xp/services/conbus/write_config_service.py,sha256=6feNdixI_Nli4MRLe15nea-7gTEXMUwZIvTqv_1OqHI,7157
+xp/services/conbus/conbus_scan_service.py,sha256=QN7_x8BtNbHnqG7akcooAAcjz9Ex2y3VNDdhShKHUX8,6824
+xp/services/conbus/write_config_service.py,sha256=PQsN7rtTKHpwtAG8moLksUfRVqqE_0sxdE37meR1ZQ0,8935
 xp/services/homekit/__init__.py,sha256=xAMKmln_AmEFdOOJGKWYi96seRlKDQpKx3-hm7XbdIo,36
 xp/services/homekit/homekit_cache_service.py,sha256=NdijyH5_iyhsTHBb-OyT8Y2xnNDj8F5MP8neoVQ26hY,11010
 xp/services/homekit/homekit_conbus_service.py,sha256=porvo4nZ4PE0R6bdaKwClDW2kevkW_8DOzw4NOO6DZQ,3348
@@ -185,7 +185,7 @@ xp/services/telegram/telegram_service.py,sha256=XrP1CPi0ckxoKBaNwLA6lo-TogWxXgmX
 xp/services/telegram/telegram_version_service.py,sha256=M5HdOTsLdcwo122FP-jW6R740ktLrtKf2TiMDVz23h8,10528
 xp/services/term/__init__.py,sha256=BIeOK042bMR-0l6MA80wdW5VuHlpWOXtRER9IG5ilQA,245
 xp/services/term/protocol_monitor_service.py,sha256=PhEzLNzWf1XieQw94ua-hJu9ccwrAzhdxSZGe4kHghs,9945
-xp/services/term/state_monitor_service.py,sha256=PgwCH8nce1RODV33aJefiX3on-pSGEgP_4FDAoU5Trc,16218
+xp/services/term/state_monitor_service.py,sha256=PYKiPO4Zijc-DApRECTIChnbdsOFT3Ndc1MsBglekts,16961
 xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
 xp/term/protocol.py,sha256=oLJAExvIaOSpy75A5TaYB_7R9skTTtNtPx8hiJLdy_U,3425
 xp/term/protocol.tcss,sha256=r_KfxrbpycGHLVXqZc6INBBcUJME0hLrAZkF1oqnab4,2126
@@ -193,15 +193,15 @@ xp/term/state.py,sha256=sR7I6t4gJSkO2YS3TwonAnGPR_f43coCk4xKdWETus0,3233
 xp/term/state.tcss,sha256=Njp7fc16cCunLq7hi5RvXjPi4jSCGi5aPDnusb9dq1Y,1401
 xp/term/widgets/__init__.py,sha256=ftWmN_fmjxy2E8Qfm-YSRmzKfgL0KTBCTpgvYWCPbUY,274
 xp/term/widgets/help_menu.py,sha256=w2NjwiC_s16St0rigZ9ef9S0V9Y4v0J5eCVCHAdRKF4,1789
-xp/term/widgets/modules_list.py,sha256=DD0PUnY4gv05hkCVxThWULHg1ZNNY8xr1XFaZrv9kS4,7666
+xp/term/widgets/modules_list.py,sha256=cZlrHhse9onSZGBeJe9tuByWCk-928bsmUBGNeXiF2I,7745
 xp/term/widgets/protocol_log.py,sha256=CJUpckWj7GC1kVqixDadteyGnI4aHyzd4kkH-pSbzno,2600
 xp/term/widgets/status_footer.py,sha256=bxrcqKzJ9V0aPSn_WwraVpJz7NxBUh3yIjA3fwv5nVA,3256
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=HDpiQxmdIedbCbZ4o_Box0i_Zig417BtCV_46ZyhiTk,1711
-xp/utils/dependencies.py,sha256=jN2FNwUUacmrEXsOA-zWe-1yWr16x9BaVfLjmFxIJKg,24437
+xp/utils/dependencies.py,sha256=dA43oSFnhqqthSkX_wVlJorxWuSBT21rubkaYxWHbKY,23837
 xp/utils/event_helper.py,sha256=W-A_xmoXlpWZBbJH6qdaN50o3-XrwFsDgvAGMJDiAgo,1001
 xp/utils/logging.py,sha256=rZDXwlBrYK8A6MPq5StsMNpgsRowzJXM6fvROPwJdGM,3750
 xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
 xp/utils/state_machine.py,sha256=Oe2sLwCh9z_vr1tF6X0ZRGTeuckRQAGzmef7xc9CNdc,2413
 xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
-conson_xp-1.34.0.dist-info/RECORD,,
+conson_xp-1.36.0.dist-info/RECORD,,

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"

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")

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()

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()

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()

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,
         )

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,
         )

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,
         )

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()