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

{conson_xp-1.47.0.dist-info → conson_xp-1.49.0.dist-info}/METADATA

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

{conson_xp-1.47.0.dist-info → conson_xp-1.49.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-conson_xp-1.47.0.dist-info/METADATA,sha256=KEcaeIwNHG8SkCmhpQKnvgoFV9blo1dNmT4Bd7YK_64,11403
-conson_xp-1.47.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.47.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.47.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=_cWb-_CUZls1SVCjuFvaRVCvlVD7NfxFsQh5pzj2Q4Y,182
+conson_xp-1.49.0.dist-info/METADATA,sha256=TynMPgKlwxBap1KLaYahYSNDF4YOS_iO1kNhUFR78io,11403
+conson_xp-1.49.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.49.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.49.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=KJJ4ZcIuwzCmqcxnfXWmH4RNucpuxrNrvbjN0cEnmaw,182
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=G7A1KFRSV0CEeDTqr_khu-K9_sc01CTI2KSfkFcaBRM,4949
 xp/cli/commands/conbus/__init__.py,sha256=HYaX2__XxwD3Xaw4CzflvL8CwoUa4yR6wOyH8wwyofM,535
 xp/cli/commands/conbus/conbus.py,sha256=GpWq1QS3mKfQFG77nTED-_hsvcnXb3ZIrC6DhfyhzBE,3538
-xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=6kJFWI1CKBLSq_H6ESDo7UVMOVF2FBdKJOYLueAylaY,7919
+xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=9kLP-ISIDWXVUtELCjTAs0JIT3DNGcYGBRnZEo-tp3g,7743
 xp/cli/commands/conbus/conbus_autoreport_commands.py,sha256=dO3rxgII_xZVhbkxlMqTJCarrUveQCs_7-qf4li0UkQ,3962
 xp/cli/commands/conbus/conbus_blink_commands.py,sha256=1zLiXV8Nn4XSDI-z7F3f2RN2IO-yxeMkGQ1PCknAkWY,5398
 xp/cli/commands/conbus/conbus_config_commands.py,sha256=jeZi7J973DrDCyP59Qrvk6tonduj97KnV4fq9zbei2k,721
@@ -88,7 +88,7 @@ xp/models/homekit/homekit_accessory.py,sha256=ANjDWlFxeNTstl7lKdmf6vMOC0wc005vpi
 xp/models/homekit/homekit_config.py,sha256=OMq0eayAJ6NRr8PXANvQzgEYGW9RN_ycyEmnTlTlHrQ,2938
 xp/models/log_entry.py,sha256=tAiNwouCP2d4jKiHJY9a-2iAi8LWTpG-TZsOPDIstlA,4423
 xp/models/protocol/__init__.py,sha256=TJ_CJKchA-xgQiv5vCo_ndBBZjrcaTmjT74bR0T-5Cw,38
-xp/models/protocol/conbus_protocol.py,sha256=TB7L2d_UausI6SXoNGCyi2nSn8cSuQA19pTA5evEsrI,9229
+xp/models/protocol/conbus_protocol.py,sha256=hF78N5xvBzMiyWoKd8i_avA8kJ1As_9Pplkw1GMqKzk,9145
 xp/models/response.py,sha256=z0376hEVNh1Z_R9CtzmKNbJBzCo_Aun2ImI9dTtrVe4,1254
 xp/models/telegram/__init__.py,sha256=-_exhjlRLbBNuPxHC4tLA2SAgf8M0yHJMeyEoQIk9PI,53
 xp/models/telegram/action_type.py,sha256=ys3yInmD97bKotB-nlPdfo8ZPXKaYxzG0CxV9wHK-zo,797
@@ -118,13 +118,13 @@ xp/services/actiontable/__init__.py,sha256=z6js4EuJ6xKHaseTEhuEvKo1tr9K1XyQiruRe
 xp/services/actiontable/actiontable_serializer.py,sha256=AZpqxfq8-o7FGGtseW52MS6z647x3Ucc1RjR3GLUb20,8335
 xp/services/actiontable/download_state_machine.py,sha256=lqNYN9LGGK2KiVUsmvyRfryWRB4-NOfsp7-9GrFubK4,9978
 xp/services/actiontable/msactiontable_serializer.py,sha256=RRL6TZ1gpSQw81kAiw2BV3jTqm4fCJC0pWIcO26Cmos,174
-xp/services/actiontable/msactiontable_xp20_serializer.py,sha256=d1LxmaA1EISh2NeQRKtxZ9ZrrW66Zd-KjBez16QwnPM,7206
-xp/services/actiontable/msactiontable_xp24_serializer.py,sha256=RrCPpepPwY1UjOVHBRLj4Gkqzl-9aVp9ao30YtUfojc,5386
-xp/services/actiontable/msactiontable_xp33_serializer.py,sha256=0iM1XPSWxK-F2IebCEujpRPdKlNQgqBpn7wA6k0hccI,9699
+xp/services/actiontable/msactiontable_xp20_serializer.py,sha256=5K6FxgbV2F4brumNaOH6M8qPyCxIfaqCGOPIYDmFdnk,6998
+xp/services/actiontable/msactiontable_xp24_serializer.py,sha256=NBsRViz-J1Zx7DtO9flRRsiZtOsB5rpQVplJ-I43stg,5192
+xp/services/actiontable/msactiontable_xp33_serializer.py,sha256=9JzG9dOrfamu8UjsWztveX5n4o29Rm3ki81Ot0a38KQ,9490
 xp/services/actiontable/serializer_protocol.py,sha256=PMsZbPwPQD1MJYo_KpZSgpnVQCtXFXSfzXFpCiA6Xi8,2002
 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=J-obabOBv8KizOpP00nzUKlSJUs7eELprz-Mr6B6z0Y,14929
+xp/services/conbus/actiontable/actiontable_download_service.py,sha256=ZTQCC1D9TLmyDu3b5GAO4VxUVGSr6HuqZI9fxHB1qW8,14992
 xp/services/conbus/actiontable/actiontable_list_service.py,sha256=oTDSpBkp-MJeaF5bhRnwkSy3na55xqQ4e2ykJzbMCUo,3236
 xp/services/conbus/actiontable/actiontable_show_service.py,sha256=WISY2VsmSlceGa5_9lpFO-gs5TnTjv6YidQksUjCapk,3058
 xp/services/conbus/actiontable/actiontable_upload_service.py,sha256=4crX4OZeTLYC_9ZjhV1Cqqc-WOhhBlXDmEHToLS6N9g,9772
@@ -133,7 +133,7 @@ xp/services/conbus/conbus_blink_service.py,sha256=ggLuzeq_UsgCoxRxg2bsNs9p8Lw_sh
 xp/services/conbus/conbus_custom_service.py,sha256=9OIRC2CG_rN96vbv_EZXf7BrX_abhqi5MZx0Se8fEhU,7826
 xp/services/conbus/conbus_datapoint_queryall_service.py,sha256=YCeieYgS73HAplAB1NpyEFary8L3yJXm2z9XOuUOLkI,8468
 xp/services/conbus/conbus_datapoint_service.py,sha256=WBQC42-6xuPWhMKKRtHtRzwEmVfYFt7cmS5uS-iv3P0,8095
-xp/services/conbus/conbus_discover_service.py,sha256=NYHPBD16196EwcorPSwFqIwcUWcfN6moXctXlIoO9ik,12831
+xp/services/conbus/conbus_discover_service.py,sha256=mvqjHFMmEkQjHD9YDIk9gE8MowPMkOIJRmyjX96G5pw,12868
 xp/services/conbus/conbus_event_list_service.py,sha256=-jl3WHpyidbh-h4NMK2gERqu48mTNFD6rpPo2EyGxeg,3641
 xp/services/conbus/conbus_event_raw_service.py,sha256=viXuEXw165-RytdqC76wQShJLD7Yd0rtURxWZZ8hyKA,7060
 xp/services/conbus/conbus_export_service.py,sha256=coUbwdx3eG7ILhvUvlY3dkxdzZUksjnZHBGPvDDrTdk,17420
@@ -142,7 +142,7 @@ xp/services/conbus/conbus_raw_service.py,sha256=OQuV521VOQraf2PGF2B9868vh7sDgmfc
 xp/services/conbus/conbus_receive_service.py,sha256=TFf3W65brGsy6QZICpIs0Xy9bgqyL1vgQuhS_eHuIZs,5416
 xp/services/conbus/conbus_scan_service.py,sha256=_Ka0OUDNYhDgZIR49Q0P5GTxJq6RcAAX2DVqEDdtb5U,6888
 xp/services/conbus/msactiontable/__init__.py,sha256=rDYzumPSfcTjDADHxjE7bXQoeWtZTDGaYzFTYdVl_9g,42
-xp/services/conbus/msactiontable/msactiontable_upload_service.py,sha256=bZIZ7NeL9G1HFL0Mw0PRlFdbERBQ8bSCux-s3XeBEWQ,12414
+xp/services/conbus/msactiontable/msactiontable_upload_service.py,sha256=LB9pv0VOUDmyTHKUcY894fmBAqINO7qpM8mW1E3s8aU,12423
 xp/services/conbus/write_config_service.py,sha256=BCfmLNPRDpwSwRMRYJvx2FXA8IZsdgmyeTXIYvmb4ys,9004
 xp/services/homekit/__init__.py,sha256=xAMKmln_AmEFdOOJGKWYi96seRlKDQpKx3-hm7XbdIo,36
 xp/services/homekit/homekit_cache_service.py,sha256=z1TB6icEqd1paoilVTewuFL0lXVCQbvrOJkJvvQECJY,11060
@@ -160,9 +160,8 @@ xp/services/homekit/homekit_outlet_service.py,sha256=VVeuUas5HROaMwfbc_FO-gVp_mX
 xp/services/homekit/homekit_service.py,sha256=mmO9dHd1PAkOLkM7wwbpC0iBnULN4XZxeHUnCMKOL7g,14127
 xp/services/log_file_service.py,sha256=y775InPlpG8Z_uitHt7yrgRG-3vlIuCfdJjiZzPc_MA,10578
 xp/services/module_type_service.py,sha256=ga4WO7dmJEaDKrXPmrJ-72n4UaEZonead23lHBkFN1E,7505
-xp/services/protocol/__init__.py,sha256=qRufBmqRKGzpuzZ5bxBbmwf510TT00Ke8s5HcWGnqRY,818
-xp/services/protocol/conbus_event_protocol.py,sha256=vgLQhqa2oLfROFB9JvmswPEOe74_MF5SmVw34zMLylg,19460
-xp/services/protocol/conbus_protocol.py,sha256=3RY1dva3XHLyvcBqwV4nuenaVpRnT-ppPz45EXNGCIs,10417
+xp/services/protocol/__init__.py,sha256=4zC__3e-Hma_IrmFCvsL44wJRd5LLHLSI_tahqdaTF8,741
+xp/services/protocol/conbus_event_protocol.py,sha256=7AMn_5jr8lWPbf3C2s0P-r-w4PgdsmsBVcK0UMmrdaw,19572
 xp/services/protocol/protocol_factory.py,sha256=gWXQtOdgtOyn0Tu_aydYFd_cTdU-jtsKVuMl-ru133s,2512
 xp/services/protocol/telegram_protocol.py,sha256=hyEMJUUhgQe_2R8CDio8xT5tpLtgoXS8W0aDd7wN48E,9538
 xp/services/reverse_proxy_service.py,sha256=Xuxo2ajjmTXLg5yd6gRGKHpFPX4-6kpOUg10doZB8vw,15161
@@ -207,4 +206,4 @@ xp/utils/logging.py,sha256=wJ1d-yg97NiZUrt2F8iDMcmnHVwC-PErcI-7dpyiRDc,3777
 xp/utils/serialization.py,sha256=TS1OwpTOemSvXsCGw3js4JkYYFEqkzrPe8V9QYQefdw,4684
 xp/utils/state_machine.py,sha256=W9AY4ntRZnFeHAa5d43hm37j53uJPlqkRvWTPiBhJ_0,2464
 xp/utils/time_utils.py,sha256=K17godWpL18VEypbTlvNOEDG6R3huYnf29yjkcnwRpU,3796
-conson_xp-1.47.0.dist-info/RECORD,,
+conson_xp-1.49.0.dist-info/RECORD,,

xp/__init__.py

@@ -4,7 +4,7 @@ XP CLI tool for remote console bus operations.
 conson-xp package.
 """
 
-__version__ = "1.47.0"
+__version__ = "1.49.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, Dict
 
 import click
 from click import Context
@@ -66,7 +65,6 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
 
     def on_actiontable_received(
         _actiontable: ActionTable,
-        actiontable_dict: Dict[str, Any],
         actiontable_short: list[str],
     ) -> None:
         """
@@ -74,13 +72,11 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
 
         Args:
             _actiontable: a list of ActionTableEntries.
-            actiontable_dict: action table in a dictionary.
             actiontable_short: short representation of action table.
         """
         output = {
             "serial_number": serial_number,
             "actiontable_short": actiontable_short,
-            "actiontable": actiontable_dict,
         }
         click.echo(json.dumps(output, indent=2, default=str))
 

xp/models/protocol/conbus_protocol.py

@@ -13,7 +13,6 @@ from xp.models.telegram.datapoint_type import DataPointType
 
 if TYPE_CHECKING:
     from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-    from xp.services.protocol.conbus_protocol import ConbusProtocol
     from xp.services.protocol.telegram_protocol import TelegramProtocol
 
 
@@ -266,7 +265,7 @@ class TelegramEvent(BaseEvent):
         checksum_valid: Checksum valid true or false.
     """
 
-    protocol: Union[TelegramProtocol, ConbusProtocol, ConbusEventProtocol] = Field(
+    protocol: Union[TelegramProtocol, ConbusEventProtocol] = Field(
         description="TelegramProtocol instance"
     )
     frame: str = Field(description="Frame <S0123450001F02D12FK>")

xp/services/actiontable/msactiontable_xp20_serializer.py

@@ -42,17 +42,12 @@ class Xp20MsActionTableSerializer(ActionTableSerializerProtocol):
             ValueError: If input length is not 64 characters
         """
         raw_length = len(encoded_data)
-        if raw_length < 68:  # Minimum: 4 char prefix + 64 chars data
+        if raw_length < 64:  # Minimum: 4 char prefix + 64 chars data
             raise ValueError(
-                f"XP20 action table data must be 68 characters long, got {len(encoded_data)}"
+                f"XP20 action table data must be 64 characters long, got {len(encoded_data)}"
             )
 
-        # Remove action table count prefix (first 4 characters: AAAA, AAAB, etc.)
-        data = encoded_data[4:]
-
-        # Take first 64 chars (32 bytes) as per pseudocode
-        hex_data = data[:64]
-        raw_bytes = de_nibbles(hex_data)
+        raw_bytes = de_nibbles(encoded_data)
 
         # Decode input channels
         input_channels = []
@@ -108,7 +103,7 @@ class Xp20MsActionTableSerializer(ActionTableSerializerProtocol):
 
         encoded_data = nibbles(raw_bytes)
         # Convert raw bytes to hex string with A-P encoding
-        return "AAAA" + encoded_data
+        return encoded_data
 
     @staticmethod
     def to_short_string(action_table: Xp20MsActionTable) -> list[str]:

xp/services/actiontable/msactiontable_xp24_serializer.py

@@ -36,19 +36,13 @@ class Xp24MsActionTableSerializer(ActionTableSerializerProtocol):
             ValueError: If data length is not 68 bytes.
         """
         raw_length = len(encoded_data)
-        if raw_length != 68:
+        if raw_length != 64:
             raise ValueError(
-                f"Msactiontable is not 68 bytes long ({raw_length}): {encoded_data}"
+                f"Msactiontable is not 64 bytes long ({raw_length}): {encoded_data}"
             )
 
-        # Remove action table count AAAA, AAAB .
-        stripped_data = encoded_data[4:]
-
-        # Take first 64 chars (32 bytes) as per pseudocode
-        hex_data = stripped_data[:64]
-
         # Convert hex string to bytes using deNibble (A-P encoding)
-        data = de_nibbles(hex_data)
+        data = de_nibbles(encoded_data)
 
         # Decode input actions from positions 0-3 (2 bytes each)
         input_actions = []
@@ -78,7 +72,7 @@ class Xp24MsActionTableSerializer(ActionTableSerializerProtocol):
             action_table: XP24 MS action table to serialize.
 
         Returns:
-            Serialized action table data string (68 characters).
+            Serialized action table data string (64 characters).
         """
         # Build byte array for the action table (32 bytes total)
         raw_bytes = bytearray()
@@ -107,7 +101,7 @@ class Xp24MsActionTableSerializer(ActionTableSerializerProtocol):
 
         # Build byte array for the action table (32 bytes total)
         # Prepend action table count "AAAA" (4 chars) -> total 68 chars
-        return "AAAA" + nibbles(raw_bytes)
+        return nibbles(raw_bytes)
 
     @staticmethod
     def to_short_string(action_table: Xp24MsActionTable) -> list[str]:

xp/services/actiontable/msactiontable_xp33_serializer.py

@@ -139,7 +139,7 @@ class Xp33MsActionTableSerializer(ActionTableSerializerProtocol):
         encoded_data = nibbles(raw_bytes)
 
         # Convert raw bytes to hex string with A-P encoding
-        return "AAAA" + encoded_data
+        return encoded_data
 
     @staticmethod
     def from_encoded_string(msactiontable_rawdata: str) -> Xp33MsActionTable:
@@ -153,22 +153,16 @@ class Xp33MsActionTableSerializer(ActionTableSerializerProtocol):
             Deserialized XP33 MS action table.
 
         Raises:
-            ValueError: If data length is less than 68 characters.
+            ValueError: If data length is less than 64 characters.
         """
         raw_length = len(msactiontable_rawdata)
-        if raw_length < 68:  # Minimum: 4 char prefix + 64 chars data
+        if raw_length < 64:  # Minimum: 4 char prefix + 64 chars data
             raise ValueError(
-                f"Msactiontable is too short ({raw_length}), minimum 68 characters required"
+                f"Msactiontable is too short ({raw_length}), minimum 64 characters required"
             )
 
-        # Remove action table count prefix (first 4 characters: AAAA, AAAB, etc.)
-        data = msactiontable_rawdata[4:]
-
-        # Take first 64 chars (32 bytes) as per pseudocode
-        hex_data = data[:64]
-
         # Convert hex string to bytes using deNibble (A-P encoding)
-        raw_bytes = de_nibbles(hex_data)
+        raw_bytes = de_nibbles(msactiontable_rawdata)
 
         # Decode outputs
         output1 = Xp33MsActionTableSerializer._decode_output(raw_bytes, 0)

xp/services/conbus/actiontable/actiontable_download_service.py

@@ -51,7 +51,7 @@ class ActionTableDownloadService(DownloadStateMachine):
     Attributes:
         on_progress: Signal emitted with "." for each chunk received.
         on_error: Signal emitted with error message string.
-        on_actiontable_received: Signal emitted with (ActionTable, dict, list).
+        on_actiontable_received: Signal emitted with (ActionTable, list).
         on_finish: Signal emitted when download and cleanup completed.
 
     Example:
@@ -65,7 +65,7 @@ class ActionTableDownloadService(DownloadStateMachine):
     on_progress: Signal = Signal(str)
     on_error: Signal = Signal(str)
     on_finish: Signal = Signal()
-    on_actiontable_received: Signal = Signal(Any, dict[str, Any], list[str])
+    on_actiontable_received: Signal = Signal(Any, list[str])
 
     def __init__(
         self,
@@ -126,7 +126,10 @@ class ActionTableDownloadService(DownloadStateMachine):
     def on_enter_requesting(self) -> None:
         """Enter requesting state - send download request."""
         self.enter_download_phase()  # Sets phase to DOWNLOAD
-        self.conbus_protocol.send_download_request(serial_number=self.serial_number)
+        self.conbus_protocol.send_download_request(
+            serial_number=self.serial_number,
+            actiontable_type=self.serializer.download_type(),
+        )
         self.send_download()
 
     def on_enter_waiting_data(self) -> None:

xp/services/conbus/conbus_discover_service.py

@@ -25,7 +25,7 @@ class ConbusDiscoverService:
     """
     Service for discovering modules on Conbus servers.
 
-    Uses ConbusProtocol to provide discovery functionality for finding
+    Uses ConbusEventProtocol to provide discovery functionality for finding
     modules connected to the Conbus network.
 
     Attributes:
@@ -45,7 +45,7 @@ class ConbusDiscoverService:
         Initialize the Conbus discover service.
 
         Args:
-            conbus_protocol: ConbusProtocol.
+            conbus_protocol: ConbusEventProtocol instance for communication.
         """
         self.conbus_protocol: ConbusEventProtocol = conbus_protocol
         self.conbus_protocol.on_connection_made.connect(self.connection_made)

xp/services/conbus/msactiontable/msactiontable_upload_service.py

@@ -279,8 +279,8 @@ class MsActionTableUploadService:
             self.failed(f"Invalid msactiontable format: {e}")
             return
 
-        # Serialize to telegram data (68 characters: AAAA + 64 data chars)
-        self.upload_data = self.serializer.to_encoded_string(msactiontable)  # type: ignore[arg-type]
+        # Serialize to telegram data (64 characters: AAAA + 64 data chars)
+        self.upload_data = "AAAA" + self.serializer.to_encoded_string(msactiontable)  # type: ignore[arg-type]
 
         self.logger.debug(
             f"Upload data encoded: {len(self.upload_data)} chars (single chunk)"

xp/services/protocol/__init__.py

@@ -8,12 +8,11 @@ from xp.models.protocol.conbus_protocol import (
     TelegramReceivedEvent,
 )
 from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-from xp.services.protocol.conbus_protocol import ConbusProtocol
 from xp.services.protocol.telegram_protocol import TelegramProtocol
 
-__all__ = ["TelegramProtocol", "ConbusProtocol", "ConbusEventProtocol"]
+__all__ = ["TelegramProtocol", "ConbusEventProtocol"]
 
-# Rebuild models after TelegramProtocol and ConbusProtocol are imported to resolve forward references
+# Rebuild models after TelegramProtocol and ConbusEventProtocol are imported to resolve forward references
 ConnectionMadeEvent.model_rebuild()
 InvalidTelegramReceivedEvent.model_rebuild()
 ModuleDiscoveredEvent.model_rebuild()

xp/services/protocol/conbus_event_protocol.py

@@ -98,7 +98,7 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         telegram_service: TelegramService,
     ) -> None:
         """
-        Initialize ConbusProtocol.
+        Initialize ConbusEventProtocol.
 
         Args:
             cli_config: Configuration for Conbus client connection.
@@ -326,17 +326,20 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
             data_value=DataPointType.MODULE_ERROR_CODE.value,
         )
 
-    def send_download_request(self, serial_number: str) -> None:
+    def send_download_request(
+        self, serial_number: str, actiontable_type: SystemFunction
+    ) -> None:
         """
         Send download request telegram.
 
         Args:
             serial_number: Device serial number.
+            actiontable_type: DOWNLOAD_ACTIONTABLE or DOWNLOAD_MSACTIONTABLE.
         """
         self.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number=serial_number,
-            system_function=SystemFunction.DOWNLOAD_ACTIONTABLE,
+            system_function=actiontable_type,
             data_value=NO_ERROR_CODE,
         )
 

xp/services/protocol/conbus_protocol.py

@@ -1,335 +0,0 @@
-"""
-Conbus Protocol for XP telegram communication.
-
-This module implements the Twisted protocol for Conbus communication.
-"""
-
-import logging
-from typing import Any, Optional
-
-from twisted.internet import protocol
-from twisted.internet.base import DelayedCall
-from twisted.internet.interfaces import IAddress, IConnector
-from twisted.internet.posixbase import PosixReactorBase
-from twisted.python.failure import Failure
-
-from xp.models import ConbusClientConfig
-from xp.models.protocol.conbus_protocol import (
-    TelegramReceivedEvent,
-)
-from xp.models.telegram.system_function import SystemFunction
-from xp.models.telegram.telegram_type import TelegramType
-from xp.utils import calculate_checksum
-
-
-class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
-    """
-    Twisted protocol for XP telegram communication.
-
-    Attributes:
-        buffer: Buffer for incoming telegram data.
-        logger: Logger instance for this protocol.
-        cli_config: Conbus configuration settings.
-        reactor: Twisted reactor instance.
-        timeout_seconds: Timeout duration in seconds.
-        timeout_call: Delayed call handle for timeout management.
-    """
-
-    buffer: bytes
-
-    def __init__(
-        self,
-        cli_config: ConbusClientConfig,
-        reactor: PosixReactorBase,
-    ) -> None:
-        """
-        Initialize ConbusProtocol.
-
-        Args:
-            cli_config: Configuration for Conbus client connection.
-            reactor: Twisted reactor for event handling.
-        """
-        self.buffer = b""
-        self.logger = logging.getLogger(__name__)
-        self.cli_config = cli_config.conbus
-        self.reactor = reactor
-        self.timeout_seconds = self.cli_config.timeout
-        self.timeout_call: Optional[DelayedCall] = None
-
-    def connectionMade(self) -> None:
-        """
-        Handle connection established event.
-
-        Called when TCP connection is successfully established. Starts inactivity
-        timeout monitoring.
-        """
-        self.logger.debug("connectionMade")
-        self.connection_established()
-        # Start inactivity timeout
-        self._reset_timeout()
-
-    def dataReceived(self, data: bytes) -> None:
-        """
-        Handle received data from TCP connection.
-
-        Parses incoming telegram frames and dispatches events.
-
-        Args:
-            data: Raw bytes received from connection.
-        """
-        self.logger.debug("dataReceived")
-        self.buffer += data
-
-        while True:
-            start = self.buffer.find(b"<")
-            if start == -1:
-                break
-
-            end = self.buffer.find(b">", start)
-            if end == -1:
-                break
-
-            # <S0123450001F02D12FK>
-            # <R0123450001F02D12FK>
-            # <E12L01I08MAK>
-            frame = self.buffer[start : end + 1]  # <S0123450001F02D12FK>
-            self.buffer = self.buffer[end + 1 :]
-            telegram = frame[1:-1]  # S0123450001F02D12FK
-            telegram_type = telegram[0:1].decode()  # S
-            payload = telegram[:-2]  # S0123450001F02D12
-            checksum = telegram[-2:].decode()  # FK
-            serial_number = (
-                telegram[1:11] if telegram_type in ("S", "R") else b""
-            )  # 0123450001
-            calculated_checksum = calculate_checksum(payload.decode(encoding="latin-1"))
-
-            checksum_valid = checksum == calculated_checksum
-            if not checksum_valid:
-                self.logger.debug(
-                    f"Invalid checksum: {checksum}, calculated: {calculated_checksum}"
-                )
-
-            self.logger.debug(
-                f"frameReceived payload: {payload.decode('latin-1')}, checksum: {checksum}"
-            )
-
-            # Reset timeout on activity
-            self._reset_timeout()
-
-            telegram_received = TelegramReceivedEvent(
-                protocol=self,
-                frame=frame.decode("latin-1"),
-                telegram=telegram.decode("latin-1"),
-                payload=payload.decode("latin-1"),
-                telegram_type=telegram_type,
-                serial_number=serial_number,
-                checksum=checksum,
-                checksum_valid=checksum_valid,
-            )
-            self.telegram_received(telegram_received)
-
-    def sendFrame(self, data: bytes) -> None:
-        """
-        Send telegram frame.
-
-        Args:
-            data: Raw telegram payload (without checksum/framing).
-
-        Raises:
-            IOError: If transport is not open.
-        """
-        # Calculate full frame (add checksum and brackets)
-        checksum = calculate_checksum(data.decode())
-        frame_data = data.decode() + checksum
-        frame = b"<" + frame_data.encode() + b">"
-
-        if not self.transport:
-            self.logger.info("Invalid transport")
-            raise IOError("Transport is not open")
-
-        self.logger.debug(f"Sending frame: {frame.decode()}")
-        self.transport.write(frame)  # type: ignore
-        self.telegram_sent(frame.decode())
-        self._reset_timeout()
-
-    def send_telegram(
-        self,
-        telegram_type: TelegramType,
-        serial_number: str,
-        system_function: SystemFunction,
-        data_value: str,
-    ) -> None:
-        """
-        Send telegram with specified parameters.
-
-        Args:
-            telegram_type: Type of telegram to send.
-            serial_number: Device serial number.
-            system_function: System function code.
-            data_value: Data value to send.
-        """
-        payload = (
-            f"{telegram_type.value}"
-            f"{serial_number}"
-            f"F{system_function.value}"
-            f"D{data_value}"
-        )
-        self.sendFrame(payload.encode())
-
-    def buildProtocol(self, addr: IAddress) -> protocol.Protocol:
-        """
-        Build protocol instance for connection.
-
-        Args:
-            addr: Address of the connection.
-
-        Returns:
-            Protocol instance for this connection.
-        """
-        self.logger.debug(f"buildProtocol: {addr}")
-        return self
-
-    def clientConnectionFailed(self, connector: IConnector, reason: Failure) -> None:
-        """
-        Handle client connection failure.
-
-        Args:
-            connector: Connection connector instance.
-            reason: Failure reason details.
-        """
-        self.logger.debug(f"clientConnectionFailed: {reason}")
-        self.connection_failed(reason)
-        self._cancel_timeout()
-        self._stop_reactor()
-
-    def clientConnectionLost(self, connector: IConnector, reason: Failure) -> None:
-        """
-        Handle client connection lost event.
-
-        Args:
-            connector: Connection connector instance.
-            reason: Reason for connection loss.
-        """
-        self.logger.debug(f"clientConnectionLost: {reason}")
-        self.connection_lost(reason)
-        self._cancel_timeout()
-        self._stop_reactor()
-
-    def timeout(self) -> bool:
-        """
-        Handle timeout event.
-
-        Returns:
-            True to continue waiting for next timeout, False to stop.
-        """
-        self.logger.info("Timeout after: %ss", self.timeout_seconds)
-        self.failed(f"Timeout after: {self.timeout_seconds}s")
-        return False
-
-    def connection_failed(self, reason: Failure) -> None:
-        """
-        Handle connection failure.
-
-        Args:
-            reason: Failure reason details.
-        """
-        self.logger.debug(f"Client connection failed: {reason}")
-        self.failed(reason.getErrorMessage())
-
-    def _reset_timeout(self) -> None:
-        """Reset the inactivity timeout."""
-        self._cancel_timeout()
-        self.timeout_call = self.reactor.callLater(
-            self.timeout_seconds, self._on_timeout
-        )
-
-    def _cancel_timeout(self) -> None:
-        """Cancel the inactivity timeout."""
-        if self.timeout_call and self.timeout_call.active():
-            self.timeout_call.cancel()
-
-    def _on_timeout(self) -> None:
-        """Handle inactivity timeout expiration."""
-        self.logger.debug(f"Conbus timeout after {self.timeout_seconds} seconds")
-        continue_work = self.timeout()
-        if not continue_work:
-            self._stop_reactor()
-
-    def _stop_reactor(self) -> None:
-        """Stop the reactor if it's running."""
-        if self.reactor.running:
-            self.logger.info("Stopping reactor")
-            self.reactor.stop()
-
-    def start_reactor(self) -> None:
-        """Start the reactor if it's running."""
-        # Connect to TCP server
-        self.logger.info(
-            f"Connecting to TCP server {self.cli_config.ip}:{self.cli_config.port}"
-        )
-        self.reactor.connectTCP(self.cli_config.ip, self.cli_config.port, self)
-
-        # Run the reactor (which now uses asyncio underneath)
-        self.logger.info("Starting reactor event loop.")
-        self.reactor.run()
-
-    def __enter__(self) -> "ConbusProtocol":
-        """
-        Enter context manager.
-
-        Returns:
-            Self for context management.
-        """
-        return self
-
-    def __exit__(
-        self,
-        _exc_type: Optional[type],
-        _exc_val: Optional[BaseException],
-        _exc_tb: Optional[Any],
-    ) -> None:
-        """Context manager exit - ensure connection is closed."""
-        self.logger.debug("Exiting the event loop.")
-        self._stop_reactor()
-
-    """Override methods."""
-
-    def telegram_sent(self, telegram_sent: str) -> None:
-        """
-        Override callback when telegram has been sent.
-
-        Args:
-            telegram_sent: The telegram that was sent.
-        """
-        pass
-
-    def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """
-        Override callback when telegram is received.
-
-        Args:
-            telegram_received: Event containing received telegram details.
-        """
-        pass
-
-    def connection_established(self) -> None:
-        """Override callback when connection established."""
-        pass
-
-    def connection_lost(self, reason: Failure) -> None:
-        """
-        Override callback when connection is lost.
-
-        Args:
-            reason: Reason for connection loss.
-        """
-        pass
-
-    def failed(self, message: str) -> None:
-        """
-        Override callback when connection failed.
-
-        Args:
-            message: Error message describing the failure.
-        """
-        pass