conson-xp 0.11.19__py3-none-any.whl → 1.0.1__py3-none-any.whl

{conson_xp-0.11.19.dist-info → conson_xp-1.0.1.dist-info}/METADATA

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

{conson_xp-0.11.19.dist-info → conson_xp-1.0.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-0.11.19.dist-info/METADATA,sha256=p1zZBcnLWzxqgjDpG5PV79RjfUlqHFro4Lg9UR7DCwM,9298
-conson_xp-0.11.19.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-conson_xp-0.11.19.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-0.11.19.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=GI7bh7zmr-OWMd0qpVNaJWLLfl-rOYs03w6gLooWVqQ,177
+conson_xp-1.0.1.dist-info/METADATA,sha256=wo_NyCrK54bsHkSF0LihKlfeDtxR02DHb8ONbd-Wv_I,9296
+conson_xp-1.0.1.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+conson_xp-1.0.1.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.0.1.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=vAQhsuRRkcqth5YA78Q1OHLSN5KKxSPyl7s7tokrbis,175
 xp/api/__init__.py,sha256=fCWjkuTzDlyJ8hIpU_QEBNcah3BB2bqVSfZwmP4ee5k,51
 xp/api/main.py,sha256=8OMXUYKnpsqjjnLChokC_M0DXZy-whrxY2dU4QTvr8A,3389
 xp/api/models/__init__.py,sha256=Xl8j2qiHc-Vb8b1ZmNZaMj7RtMvk0G_2SOvMgQumYzs,54
@@ -17,7 +17,7 @@ xp/api/routers/conbus_output.py,sha256=U-i7kjZv7H6aE0O_8AcZIKZDJuYwU8XostEWoNccn
 xp/api/routers/errors.py,sha256=5vzpeTt0cPQZDHL5YgrYJUxMh4uI7IgUNFAvL0NpLKM,1267
 xp/cli/__init__.py,sha256=KWYwhOU46dNEerlc2i4FHsVR4Fxmt90Pw5L5i2v1Jqc,80
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
-xp/cli/commands/__init__.py,sha256=_Ia9P0gK7tCeiWbuU7p8RPgvBhQx1kFC6i3b1g1UuOo,4482
+xp/cli/commands/__init__.py,sha256=dJ_VaOojg14vdx4OwxbDH-egJd16h3uT7f5DSQX4ZB0,4459
 xp/cli/commands/api.py,sha256=d9uD5NnDV807suEK6eLzJSl62TGTtFSwIA_foPc6wtg,340
 xp/cli/commands/api_start_commands.py,sha256=q9yOkiIY-NmRD04pq3N6rRe-BjnrcMRZmai8Jg5TKhA,3116
 xp/cli/commands/conbus/__init__.py,sha256=gE3K5OEoXkkZX8UOc2v3nreQQzwkOQi7n0VZ-Z2juXA,495
@@ -25,14 +25,14 @@ xp/cli/commands/conbus/conbus.py,sha256=fVLbAg0kuodUdx9RfE4vVR3L_bc8liDP2cOEyup7
 xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=CjJKFTB_oHENKY165j0lQBBndf9S36K-ykogv7kSppQ,1436
 xp/cli/commands/conbus/conbus_autoreport_commands.py,sha256=EfCLZhuDu8uXDVGKE1eJ5Ji9mUauJLoGXqP4zFn2LhA,2501
 xp/cli/commands/conbus/conbus_blink_commands.py,sha256=g2zGEXce2aTReCCNp7ph0-uI7YhWEgz_Z048-3YC36w,3696
-xp/cli/commands/conbus/conbus_config_commands.py,sha256=MBLt7Z95-v2Drvr80r4HQxx8PMmq9rA5odl60IF3j7A,897
+xp/cli/commands/conbus/conbus_config_commands.py,sha256=Wphy_gxjc5pdPRzw8ElHC3G1jLxoUqmIBe-MFL54LN8,593
 xp/cli/commands/conbus/conbus_custom_commands.py,sha256=NH8WDm31-7tb-KYH8nZprEXgo8a4asLWmNd0EgJVSHQ,1336
 xp/cli/commands/conbus/conbus_datapoint_commands.py,sha256=Ozc36DFKVfzDZyWU9xVdhebiYy8yodb_DgVKEpzK9Jg,2842
 xp/cli/commands/conbus/conbus_discover_commands.py,sha256=5HwuhlC3qyYJqLBuqQVyu5kr493BJOZ281V2pXtfoCY,961
-xp/cli/commands/conbus/conbus_lightlevel_commands.py,sha256=-0rkE6Y5XForr3WRYSuBT02JO2rXuXLYHkEwbMVNF14,3744
-xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=Q8hh222Gq7xDD-dRvwS4tiLQj3l913n-Vk1J73QxGGc,1954
+xp/cli/commands/conbus/conbus_lightlevel_commands.py,sha256=hMzQewTgqGNB6s_Pag2HNfImhpgXnitwUVgMM6XXJv8,4161
+xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=IQ_DjBoUOYSkP5JxUuJYaKdxjwcOWGUZz7R-6sFeAAk,2256
 xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=n1g-ZKjjjbCQqTPGCrcCB595QoRClv0DGvGEx8y7BAY,1728
-xp/cli/commands/conbus/conbus_output_commands.py,sha256=B_N31H4uBjahBxr6VNsj_bnsJsqkQc4CTIofDBKY4v8,2885
+xp/cli/commands/conbus/conbus_output_commands.py,sha256=Y98-ibcgGB_L52VtczyJqtkGLKESzZjeGvwdLdwM35E,3900
 xp/cli/commands/conbus/conbus_raw_commands.py,sha256=NRST1cg9tO7zVUwiTKqCBpwfwP1-yvnKTDrwwIMaz68,1572
 xp/cli/commands/conbus/conbus_receive_commands.py,sha256=jV5zAmiIKK3_oDpTs9yF1YklIRcJNvOrkI6O2deb1eQ,1380
 xp/cli/commands/conbus/conbus_scan_commands.py,sha256=HjZMhU1hPRuUSWMURB9UUeZt8aNMDlBYCktwrXUgsCY,4190
@@ -71,7 +71,7 @@ xp/models/actiontable/msactiontable_xp20.py,sha256=JNi2gx0ObbEZ-qq-MNECc4zoCypDp
 xp/models/actiontable/msactiontable_xp24.py,sha256=edDG2wCf1IFgUPm4qnfB9GlXHagf5T6JgCLRVJEfBDw,1390
 xp/models/actiontable/msactiontable_xp33.py,sha256=vYXJnyqnazUQ_6lkoDnDVh31bo-Mq6-6tQOnYiC766Y,1101
 xp/models/conbus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xp/models/conbus/conbus.py,sha256=Su2NKXizapeN3-mEMpCXDNii7TfZB3p3cAfWSmPpSC4,1763
+xp/models/conbus/conbus.py,sha256=ePdihpX2w-A3t-nrvOpWVNwNoS4cDRJ9jpVvhEM_Jwg,1735
 xp/models/conbus/conbus_autoreport.py,sha256=dx9CzlDwDWrLkyvfVsz4dKFouiCl4YcQ80rue97Zfbk,1652
 xp/models/conbus/conbus_blink.py,sha256=xwe8A-C1ywbLKYARRUwUEX0sq6QALQiv1C8R3RyQOSM,2196
 xp/models/conbus/conbus_client_config.py,sha256=HVaGZkhZI6cBpJaEgybq8TFARyrI9-dM6U6IPc2hOKQ,940
@@ -80,7 +80,7 @@ xp/models/conbus/conbus_custom.py,sha256=hjzL7n5eIWfascyWNA2F6L3W5nnG4JgzAz2wL_c
 xp/models/conbus/conbus_datapoint.py,sha256=t41goYkzDf7booC6yBbvlYgX-nH5H0-YE7Yb-JncXJ4,2525
 xp/models/conbus/conbus_discover.py,sha256=lLwWkQYMZXMc0cbjx8oFfippE0aFWjfapgfOBIGkMlc,1087
 xp/models/conbus/conbus_lightlevel.py,sha256=A4DYVejsTa3_SR37oFfG4XNRqjbOKCDbmHg_vA8PqVM,1091
-xp/models/conbus/conbus_linknumber.py,sha256=iN5Aa5MaEl1ClIHvCLrcSKN_aFhzVywNU6f2XtPMw6o,1198
+xp/models/conbus/conbus_linknumber.py,sha256=IaA-Lk6o3KQoEvxcYf9cWNpVdjkzOZIQSPVOylzqCWU,1198
 xp/models/conbus/conbus_output.py,sha256=tXAAJqySzbpHJauDEQf8PCYP_hbz31NK5bFs6GUJu_U,1238
 xp/models/conbus/conbus_raw.py,sha256=kP_w9_e-qHv-2cDMm4_nAa1g3G8GFlrxOiYXR5IOq8o,994
 xp/models/conbus/conbus_receive.py,sha256=hVI3CEGQ74UqqLVH8RhlQvOVtmqlcmeI2kWVY1CPPCI,896
@@ -118,22 +118,22 @@ xp/services/conbus/actiontable/msactiontable_service.py,sha256=89pxbUVlKd6mplpIe
 xp/services/conbus/actiontable/msactiontable_xp20_serializer.py,sha256=EYspooOdi0Z8oaXGxpazwnUoTmh-d7U9auhu11iBgmU,6527
 xp/services/conbus/actiontable/msactiontable_xp24_serializer.py,sha256=J_ve6uyMmsb_QT2Py1ciZngf4C0pfHpkbWFc8OL2QEk,3752
 xp/services/conbus/actiontable/msactiontable_xp33_serializer.py,sha256=AeGBbum5eIqlgVm9t4igfF6vyl-ACVpuzSUQm4TYfUQ,7962
-xp/services/conbus/conbus_autoreport_get_service.py,sha256=d97x_2AMq9BZsRS8ZvwN-LgdyNPzdDiyqjSqvWDqYjQ,4949
+xp/services/conbus/conbus_autoreport_get_service.py,sha256=Jzu8tBIwt9nb9X60LcWnV72wblpVJCZjyfPb45kkCtA,3165
 xp/services/conbus/conbus_autoreport_set_service.py,sha256=0fa2xGVE1GSoBvEcOH8cnjAdhvEoamvHE27t40f7lUk,4937
 xp/services/conbus/conbus_blink_all_service.py,sha256=t_oaztEFRirjS3nL50AEBrKKpNXYssWwSBwWjWhhKqU,5959
 xp/services/conbus/conbus_blink_service.py,sha256=mHaD-84RCmEGqD2cD4Ve85A36D08tMBPwMgDEyAEMCc,5031
-xp/services/conbus/conbus_connection_pool.py,sha256=uiuuZ1S2_BBg6sTWqWIStCPFnWJjsfi2PuD53DalPv8,5616
 xp/services/conbus/conbus_custom_service.py,sha256=jM6B085GTT8epCE9EqVTT8mZLPMXM3tVwvO-yJulJ5s,5290
 xp/services/conbus/conbus_datapoint_queryall_service.py,sha256=FBpFmwXVKoTiqMwQW-z2eYbamKL_ZGlTI86720ZcGt8,6095
-xp/services/conbus/conbus_datapoint_service.py,sha256=CspxjhEi8awX_dv6EpJpYjTtCsfLgjJ4ROl6jD1TOiY,5289
+xp/services/conbus/conbus_datapoint_service.py,sha256=YpInc-Wq4pIjy6ksTWE2mdBSeGWU-VxUNEVyYUi07jM,5577
 xp/services/conbus/conbus_discover_service.py,sha256=kA_ewxXgbqXng0cXBjSgQSGYesyesbN2wK0tMp1fgfc,4281
-xp/services/conbus/conbus_lightlevel_service.py,sha256=Lfa1ruDDA4_M1103Ha-wSlGSjZmsGDpXuF22RfGBYDQ,7243
-xp/services/conbus/conbus_linknumber_service.py,sha256=r3Lyb7IV4i5kRY6zTnRK9jmC1vo8dpyHwh4WwdwrlL4,7703
-xp/services/conbus/conbus_output_service.py,sha256=_sHGF6AWadhT_CNSnRPaXwQLaNEwQHSVuyKtyZ9jgFc,5115
+xp/services/conbus/conbus_lightlevel_get_service.py,sha256=Z7Pg_c0sI6gMNnoThN7DruEOGyM3-i4D-rO2WKfHXjw,3699
+xp/services/conbus/conbus_lightlevel_set_service.py,sha256=6Mhq9xjWx-ixGVfcWBcJSnuYT256m8Lps1g8Tg-1nkM,7483
+xp/services/conbus/conbus_linknumber_get_service.py,sha256=debaacIbwFLUkXwhG0cJ9Wh31rzmWEmd_o1YC9PvpBY,3195
+xp/services/conbus/conbus_linknumber_set_service.py,sha256=cmCP8zZ8Szb-vwYHvDbZUyEfZJOjO_zSptJUZhHRctQ,6019
+xp/services/conbus/conbus_output_service.py,sha256=w2yBeMdZn3g3wbwUoUnv3gKbqUuGcabeEaH8qw1AyUs,6689
 xp/services/conbus/conbus_raw_service.py,sha256=riANTAiXTdSzOWbp_g-IQjdRhAf8CzZnNJtlT-aDvRs,3746
 xp/services/conbus/conbus_receive_service.py,sha256=k6hzxh-D4piizb3e5Vsz-2Mfft_5KnAXoov4xk9wVY0,3123
-xp/services/conbus/conbus_scan_service.py,sha256=uDI4rRAeBMg4Z5gdO0Evn-ejEoPpB5X4FTxMpfKTw78,4025
-xp/services/conbus/conbus_service.py,sha256=MdT01cE_KjAqx6gZOiL0k6z9dPBd-CG19wiKrK8GqB4,10873
+xp/services/conbus/conbus_scan_service.py,sha256=ODKXqD84aSkT6z_B7KHolUx2o5yuLP0gpTCAR-UoHOk,4505
 xp/services/homekit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xp/services/homekit/homekit_cache_service.py,sha256=XMZBTz2ZVTq8OZM3h0Fxu738XPlPRdvq6JLaWMbAS4Q,10289
 xp/services/homekit/homekit_conbus_service.py,sha256=71JeM-phBTiGMRr2bEfCiF85eHNIzmxtkCi2Zn0B5uA,2595
@@ -151,7 +151,7 @@ xp/services/homekit/homekit_service.py,sha256=yksnbcqbrckxWTqtJkaaPh_wd2xYH9yCOt
 xp/services/log_file_service.py,sha256=E2CSVbw5W_uk13efILb6OGqeERbxCBWjIsCbHjeps_0,10401
 xp/services/module_type_service.py,sha256=Q3TFZdiknF24OqGAP6Op1F8_SL8aslkHwPh6o_M7wxM,7010
 xp/services/protocol/__init__.py,sha256=XUj54if_nJTfqrEDZfj40nfLr-2xjfKm4CIgHMabp-o,719
-xp/services/protocol/conbus_protocol.py,sha256=a-R7WCRJ9YOk64VJnrKdR_Hef-53JY2PTIaDQx5nRIQ,7514
+xp/services/protocol/conbus_protocol.py,sha256=GKmEB4hXAJO4sr3QHfhS_zF-J5BqV3Yi7QNexeSfzLg,7610
 xp/services/protocol/protocol_factory.py,sha256=c3CkMoWAuk9lmHdXIG51B5-S0aIaB7-mHuyULyr_jS4,1248
 xp/services/protocol/telegram_protocol.py,sha256=4mybR5gFreN_Kxw04fujt1gKIvr3Mg6O_6WwoTXe2i8,8568
 xp/services/reverse_proxy_service.py,sha256=OIPm-9y2I-xf1tESZBfgiLd_hgfGQdgrsxAFdhotmJ0,13231
@@ -174,8 +174,8 @@ xp/services/telegram/telegram_service.py,sha256=Mp20QB50WDp43QBl8TzsR9BKV_hHP53R
 xp/services/telegram/telegram_version_service.py,sha256=21v256THg0lidTyUtp2i8r6TAl8J0CTaZo4bZw59nFk,10479
 xp/utils/__init__.py,sha256=clisBctja_VwtkAM9wnbOGDRPfbKHlCUqq4Sa4Z6zng,331
 xp/utils/checksum.py,sha256=HDpiQxmdIedbCbZ4o_Box0i_Zig417BtCV_46ZyhiTk,1711
-xp/utils/dependencies.py,sha256=ZG374ofjrWF7P4MqO3vpeuweD5M9d_RL0682ouJrQ3M,20566
+xp/utils/dependencies.py,sha256=PbdI30ug3JCNn1IS9B1jGDEq5wQ_3hDrTLE2Pr-f7AA,19602
 xp/utils/event_helper.py,sha256=W-A_xmoXlpWZBbJH6qdaN50o3-XrwFsDgvAGMJDiAgo,1001
 xp/utils/serialization.py,sha256=hZcrpzaBOe3a2wS_RFCIRs9PvnYsrbK7Ulq6s1rU0q4,4456
 xp/utils/time_utils.py,sha256=Yi3JxHrHsd9ZZxTBRIqlTOz1FYTCeE1IZbefDaXIop8,3800
-conson_xp-0.11.19.dist-info/RECORD,,
+conson_xp-1.0.1.dist-info/RECORD,,

xp/__init__.py

@@ -2,7 +2,7 @@
 
 """conson-xp"""
 
-__version__ = "0.11.19"
+__version__ = "1.0.1"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

xp/cli/commands/__init__.py

@@ -38,7 +38,6 @@ from xp.cli.commands.conbus.conbus_datapoint_commands import (
 )
 from xp.cli.commands.conbus.conbus_discover_commands import send_discover_telegram
 from xp.cli.commands.conbus.conbus_lightlevel_commands import (
-    xp_lightlevel_get,
     xp_lightlevel_off,
     xp_lightlevel_on,
     xp_lightlevel_set,

xp/cli/commands/conbus/conbus_config_commands.py

@@ -5,9 +5,7 @@ from click import Context
 
 from xp.cli.commands.conbus.conbus import conbus
 from xp.cli.utils.decorators import handle_service_errors
-from xp.cli.utils.error_handlers import CLIErrorHandler
-from xp.cli.utils.formatters import OutputFormatter
-from xp.services.conbus.conbus_service import ConbusService
+from xp.models import ConbusClientConfig
 
 
 @conbus.command("config")
@@ -22,12 +20,5 @@ def show_config(ctx: Context) -> None:
     \b
         xp conbus config
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusService)
-    OutputFormatter(True)
-
-    try:
-        config = service.get_config()
-        click.echo(json.dumps(config.conbus.model_dump(mode="json"), indent=2))
-
-    except Exception as e:
-        CLIErrorHandler.handle_service_error(e, "configuration retrieval")
+    config = ctx.obj.get("container").get_container().resolve(ConbusClientConfig)
+    click.echo(json.dumps(config.conbus.model_dump(mode="json"), indent=2))

xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -10,9 +10,10 @@ from xp.cli.utils.decorators import (
     handle_service_errors,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.services.conbus.conbus_lightlevel_service import (
+from xp.models.conbus.conbus_lightlevel import ConbusLightlevelResponse
+from xp.services.conbus.conbus_lightlevel_set_service import (
     ConbusLightlevelError,
-    ConbusLightlevelService,
+    ConbusLightlevelSetService,
 )
 
 
@@ -34,12 +35,17 @@ 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 = ctx.obj.get("container").get_container().resolve(ConbusLightlevelService)
 
-    with service:
-        response = service.set_lightlevel(serial_number, output_number, level)
+    def finish(response: "ConbusLightlevelResponse") -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
 
+    service = (
+        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    )
+
+    with service:
+        service.set_lightlevel(serial_number, output_number, level, finish, 0.5)
+
 
 @conbus_lightlevel.command("off")
 @click.argument("serial_number", type=SERIAL)
@@ -58,12 +64,17 @@ 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 = ctx.obj.get("container").get_container().resolve(ConbusLightlevelService)
 
-    with service:
-        response = service.turn_off(serial_number, output_number)
+    def finish(response: "ConbusLightlevelResponse") -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
 
+    service = (
+        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    )
+
+    with service:
+        service.turn_off(serial_number, output_number, finish, 0.5)
+
 
 @conbus_lightlevel.command("on")
 @click.argument("serial_number", type=SERIAL)
@@ -82,12 +93,17 @@ 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 = ctx.obj.get("container").get_container().resolve(ConbusLightlevelService)
 
-    with service:
-        response = service.turn_on(serial_number, output_number)
+    def finish(response: "ConbusLightlevelResponse") -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
 
+    service = (
+        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    )
+
+    with service:
+        service.turn_on(serial_number, output_number, finish, 0.5)
+
 
 @conbus_lightlevel.command("get")
 @click.argument("serial_number", type=SERIAL)
@@ -99,15 +115,18 @@ def xp_lightlevel_get(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
     """Get current light level for output_number on XP module serial_number
-
     Examples:
-
     \b
         xp conbus lightlevel get 0123450001 2   # Get light level for output 2
         xp conbus lightlevel get 0011223344 0   # Get light level for output 0
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusLightlevelService)
 
-    with service:
-        response = service.get_lightlevel(serial_number, output_number)
+    def finish(response: "ConbusLightlevelResponse") -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
+
+    service = (
+        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    )
+
+    with service:
+        service.get_lightlevel(serial_number, output_number, finish, 0.5)

xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -7,11 +7,11 @@ import click
 from xp.cli.commands.conbus.conbus import conbus_linknumber
 from xp.cli.utils.decorators import (
     connection_command,
-    handle_service_errors,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.services.conbus.conbus_linknumber_service import ConbusLinknumberService
-from xp.services.telegram.telegram_link_number_service import LinkNumberError
+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
 
 
 @conbus_linknumber.command("set", short_help="Set link number for a module")
@@ -19,7 +19,6 @@ from xp.services.telegram.telegram_link_number_service import LinkNumberError
 @click.argument("link_number", type=click.IntRange(0, 99))
 @click.pass_context
 @connection_command()
-@handle_service_errors(LinkNumberError)
 def set_linknumber_command(
     ctx: click.Context, serial_number: str, link_number: int
 ) -> None:
@@ -34,18 +33,25 @@ def set_linknumber_command(
     \b
         xp conbus linknumber set 0123450001 25
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusLinknumberService)
+    service = (
+        ctx.obj.get("container").get_container().resolve(ConbusLinknumberSetService)
+    )
 
-    with service:
-        response = service.set_linknumber(serial_number, link_number)
+    def on_finish(response: ConbusLinknumberResponse) -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
 
+    with service:
+        service.set_linknumber(
+            serial_number=serial_number,
+            link_number=link_number,
+            finish_callback=on_finish,
+        )
+
 
 @conbus_linknumber.command("get", short_help="Get link number for a module")
 @click.argument("serial_number", type=SERIAL)
 @click.pass_context
 @connection_command()
-@handle_service_errors(LinkNumberError)
 def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
     """
     Get the current link number for a specific module.
@@ -57,8 +63,15 @@ 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(ConbusLinknumberService)
+    service = (
+        ctx.obj.get("container").get_container().resolve(ConbusLinknumberGetService)
+    )
 
-    with service:
-        response = service.get_linknumber(serial_number)
+    def on_finish(response: ConbusLinknumberResponse) -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
+
+    with service:
+        service.get_linknumber(
+            serial_number=serial_number,
+            finish_callback=on_finish,
+        )

xp/cli/commands/conbus/conbus_output_commands.py

@@ -9,7 +9,11 @@ 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
 from xp.models.telegram.action_type import ActionType
+from xp.models.telegram.datapoint_type import DataPointType
+from xp.services.conbus.conbus_datapoint_service import ConbusDatapointService
 from xp.services.conbus.conbus_output_service import ConbusOutputService
 
 
@@ -24,16 +28,20 @@ def xp_output_on(ctx: click.Context, serial_number: str, output_number: int) ->
     Examples:
 
     \b
-        xp conbus input on 0011223344 0  # Toggle input 0
+        xp conbus output on 0011223344 0  # Turn on output 0
     """
     service = ctx.obj.get("container").get_container().resolve(ConbusOutputService)
 
-    with service:
+    def on_finish(response: ConbusOutputResponse) -> None:
+        click.echo(json.dumps(response.to_dict(), indent=2))
 
-        response = service.send_action(
-            serial_number, output_number, ActionType.ON_RELEASE
+    with service:
+        service.send_action(
+            serial_number=serial_number,
+            output_number=output_number,
+            action_type=ActionType.ON_RELEASE,
+            finish_callback=on_finish,
         )
-        click.echo(json.dumps(response.to_dict(), indent=2))
 
 
 @conbus_output.command("off")
@@ -47,16 +55,20 @@ def xp_output_off(ctx: click.Context, serial_number: str, output_number: int) ->
     Examples:
 
     \b
-        xp conbus input off 0011223344 1    # Toggle input 1
+        xp conbus output off 0011223344 1    # Turn off output 1
     """
     service = ctx.obj.get("container").get_container().resolve(ConbusOutputService)
 
-    with service:
+    def on_finish(response: ConbusOutputResponse) -> None:
+        click.echo(json.dumps(response.to_dict(), indent=2))
 
-        response = service.send_action(
-            serial_number, output_number, ActionType.OFF_PRESS
+    with service:
+        service.send_action(
+            serial_number=serial_number,
+            output_number=output_number,
+            action_type=ActionType.OFF_PRESS,
+            finish_callback=on_finish,
         )
-        click.echo(json.dumps(response.to_dict(), indent=2))
 
 
 @conbus_output.command("status")
@@ -71,13 +83,20 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
     \b
         xp conbus output status 0011223344    # Query output status
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusOutputService)
-
-    with service:
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
 
-        response = service.get_output_state(serial_number)
+    def on_finish(response: ConbusDatapointResponse) -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
 
+    with service:
+        service.query_datapoint(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_OUTPUT_STATE,
+            finish_callback=on_finish,
+        )
+
 
 @conbus_output.command("state")
 @click.argument("serial_number", type=SERIAL)
@@ -91,9 +110,16 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
     \b
         xp conbus output state 0011223344    # Query module state
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusOutputService)
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
 
-    with service:
-
-        response = service.get_module_state(serial_number)
+    def on_finish(response: ConbusDatapointResponse) -> None:
         click.echo(json.dumps(response.to_dict(), indent=2))
+
+    with service:
+        service.query_datapoint(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_STATE,
+            finish_callback=on_finish,
+        )

xp/models/conbus/conbus.py

@@ -32,24 +32,25 @@ class ConbusResponse:
     """Represents a response from Conbus send operation"""
 
     success: bool
-    request: ConbusRequest
-    sent_telegram: Optional[str] = None
-    received_telegrams: Optional[list[str]] = None
-    error: Optional[str] = None
-    timestamp: Optional[datetime] = None
+    sent_telegrams: list[str]
+    received_telegrams: list[str]
+    timestamp: datetime
+    error: str = ""
+    serial_number: str = ""
+    function_code: str = ""
 
     def __post_init__(self) -> None:
-        if self.timestamp is None:
-            self.timestamp = datetime.now()
-        if self.received_telegrams is None:
-            self.received_telegrams = []
+        self.timestamp = datetime.now()
+        self.sent_telegrams = []
+        self.received_telegrams = []
 
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary for JSON serialization"""
         return {
             "success": self.success,
-            "request": self.request.to_dict(),
-            "sent_telegram": self.sent_telegram,
+            "serial_number": self.serial_number,
+            "function_code": self.function_code,
+            "sent_telegrams": self.sent_telegrams,
             "received_telegrams": self.received_telegrams,
             "error": self.error,
             "timestamp": self.timestamp.isoformat() if self.timestamp else None,

xp/models/conbus/conbus_linknumber.py

@@ -8,8 +8,8 @@ class ConbusLinknumberResponse:
     """Represents a response from Conbus link number operations (set/get)"""
 
     success: bool
-    result: str
     serial_number: str
+    result: str
     sent_telegram: Optional[str] = None
     received_telegrams: Optional[list] = None
     link_number: Optional[int] = None

xp/services/conbus/conbus_autoreport_get_service.py

@@ -4,22 +4,18 @@ This service handles auto report status operations for modules through Conbus te
 """
 
 import logging
-from datetime import datetime
 from typing import Callable, Optional
 
 from twisted.internet.posixbase import PosixReactorBase
 
-from xp.models import ConbusClientConfig
+from xp.models import ConbusClientConfig, ConbusDatapointResponse
 from xp.models.conbus.conbus_autoreport import ConbusAutoreportResponse
-from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.datapoint_type import DataPointType
-from xp.models.telegram.system_function import SystemFunction
-from xp.models.telegram.telegram_type import TelegramType
-from xp.services.protocol import ConbusProtocol
+from xp.services.conbus.conbus_datapoint_service import ConbusDatapointService
 from xp.services.telegram.telegram_service import TelegramService
 
 
-class ConbusAutoreportGetService(ConbusProtocol):
+class ConbusAutoreportGetService(ConbusDatapointService):
     """
     Service for receiving telegrams from Conbus servers.
 
@@ -34,71 +30,35 @@ class ConbusAutoreportGetService(ConbusProtocol):
         reactor: PosixReactorBase,
     ) -> None:
         """Initialize the Conbus client send service"""
-        super().__init__(cli_config, reactor)
-        self.telegram_service = telegram_service
-        self.serial_number: str = ""
-        self.finish_callback: Optional[Callable[[ConbusAutoreportResponse], None]] = (
+        super().__init__(telegram_service, cli_config, reactor)
+        self.service_callback: Optional[Callable[[ConbusAutoreportResponse], None]] = (
             None
         )
-        self.service_response: ConbusAutoreportResponse = ConbusAutoreportResponse(
-            success=False,
-            serial_number=self.serial_number,
-        )
 
         # Set up logging
         self.logger = logging.getLogger(__name__)
 
-    def connection_established(self) -> None:
-        self.logger.debug("Connection established, retrieving autoreport status...")
-        self.send_telegram(
-            telegram_type=TelegramType.SYSTEM,
-            serial_number=self.serial_number,
-            system_function=SystemFunction.READ_DATAPOINT,
-            data_value=str(DataPointType.AUTO_REPORT_STATUS.value),
-        )
-
-    def telegram_sent(self, telegram_sent: str) -> None:
-        self.service_response.sent_telegram = telegram_sent
-
-    def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-
-        self.logger.debug(f"Telegram received: {telegram_received}")
-        if not self.service_response.received_telegrams:
-            self.service_response.received_telegrams = []
-        self.service_response.received_telegrams.append(telegram_received.frame)
+    def finish_service_callback(
+        self, datapoint_response: ConbusDatapointResponse
+    ) -> None:
 
-        if (
-            not telegram_received.checksum_valid
-            or telegram_received.telegram_type != TelegramType.REPLY
-            or telegram_received.serial_number != self.serial_number
-        ):
-            self.logger.debug("Not a reply")
-            return
+        self.logger.debug("Parsing datapoint response")
+        autoreport_status = ""
+        if datapoint_response.success and datapoint_response.datapoint_telegram:
+            autoreport_status = datapoint_response.datapoint_telegram.data_value
 
-        reply_telegram = self.telegram_service.parse_reply_telegram(
-            telegram_received.frame
+        service_response = ConbusAutoreportResponse(
+            success=datapoint_response.success,
+            serial_number=self.serial_number,
+            auto_report_status=autoreport_status,
+            error=datapoint_response.error,
+            sent_telegram=datapoint_response.sent_telegram,
+            received_telegrams=datapoint_response.received_telegrams,
+            timestamp=datapoint_response.timestamp,
         )
-        if (
-            reply_telegram is not None
-            and reply_telegram.system_function == SystemFunction.READ_DATAPOINT
-            and reply_telegram.datapoint_type == DataPointType.AUTO_REPORT_STATUS
-        ):
-            self.logger.debug("Received autoreport status telegram")
-            self.service_response.success = True
-            self.service_response.timestamp = datetime.now()
-            self.service_response.serial_number = self.serial_number
-            self.service_response.auto_report_status = reply_telegram.data_value
-
-            if self.finish_callback:
-                self.finish_callback(self.service_response)
-
-    def failed(self, message: str) -> None:
-        self.logger.debug(f"Failed with message: {message}")
-        self.service_response.success = False
-        self.service_response.timestamp = datetime.now()
-        self.service_response.error = message
-        if self.finish_callback:
-            self.finish_callback(self.service_response)
+
+        if self.service_callback:
+            self.service_callback(service_response)
 
     def get_autoreport_status(
         self,
@@ -110,20 +70,16 @@ class ConbusAutoreportGetService(ConbusProtocol):
         Get the current auto report status for a specific module.
 
         Args:
-            serial_number: 10-digit module serial number
-            finish_callback: callback function to call when the autoreport status is
-            timeout_seconds: timeout in seconds
-
-        Returns:
-            ConbusAutoreportResponse with operation result and auto report status
+            :param  serial_number: 10-digit module serial number
+            :param  finish_callback: callback function to call when the linknumber status is
+            :param  timeout_seconds: timeout in seconds
 
-        Raises:
-            ConbusAutoreportError: If the operation fails
         """
-
         self.logger.info("Starting get_autoreport_status")
         if timeout_seconds:
             self.timeout_seconds = timeout_seconds
-        self.finish_callback = finish_callback
         self.serial_number = serial_number
+        self.datapoint_type = DataPointType.AUTO_REPORT_STATUS
+        self.finish_callback = self.finish_service_callback
+        self.service_callback = finish_callback
         self.start_reactor()