conson-xp 2.0.3__py3-none-any.whl → 2.0.4__py3-none-any.whl

{conson_xp-2.0.3.dist-info → conson_xp-2.0.4.dist-info}/METADATA

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

{conson_xp-2.0.3.dist-info → conson_xp-2.0.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-2.0.3.dist-info/METADATA,sha256=MacSE_YD6_kKpZQfPXnzZAs9YbYR__cvxg1d4ISQLXg,11319
-conson_xp-2.0.3.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-2.0.3.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-2.0.3.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=Cd7Ua5HD9WOxxHs-xepjLjWZf4c-ue1kISZWRKiqgwM,181
+conson_xp-2.0.4.dist-info/METADATA,sha256=CJMAU_3xThp1pBfy62H2HtM-hDsN8T9UxxqFRTflo0o,11319
+conson_xp-2.0.4.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-2.0.4.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-2.0.4.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=8uU6iQSfgIQU3EC4KbiWh-hGKhEpZZZ7YaahwbEQvaE,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=9TGP3uTxAU-s-kVChvQ-Fn3-HVYj-QpeQ05Is-20HRo,4788
@@ -22,7 +22,7 @@ xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=3bkik8nHXY89XfzeUnKW
 xp/cli/commands/conbus/conbus_modulenumber_commands.py,sha256=fOIO0f85iDJBfGnRCEN8zK6j4i43uuF_9YKQc_nQ39A,3628
 xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=oMHfrxDR9yj0Pvx92ZHnwYU3CZqwNNvfAfEoLuo_jhQ,11585
 xp/cli/commands/conbus/conbus_output_commands.py,sha256=XMEMb5tM0ul7lwhwoo4QRgWprXZ31qswXBno8KCeFMo,5342
-xp/cli/commands/conbus/conbus_raw_commands.py,sha256=o1dVZqiRw7J3_8Bge7DJucFyAqt7GNP-Azf-f3ir3SU,2019
+xp/cli/commands/conbus/conbus_raw_commands.py,sha256=bCFF1q61VSfdwS_Ch7jTbv-Q-t6n_EwEHRw_wlvNrr0,1984
 xp/cli/commands/conbus/conbus_receive_commands.py,sha256=LdxoOUdM5atkC8fFlp-GK7HQ7oxTnjrSFDx-lQ3nme0,1925
 xp/cli/commands/conbus/conbus_scan_commands.py,sha256=QuRT4Vx5TqervCOUsZ4wcxvy7Jwra4hl2-DIt8cDcoE,1828
 xp/cli/commands/file_commands.py,sha256=dx6a4xNxuReXq7dOyL8ebn6lyifzDm0d0OsuDjyr_90,5547
@@ -136,7 +136,7 @@ xp/services/conbus/conbus_event_raw_service.py,sha256=viXuEXw165-RytdqC76wQShJLD
 xp/services/conbus/conbus_export_actiontable_service.py,sha256=d6Y2RDiVOH-jTMWOIE_gY_WBJnHFrbJGguk-WZWbNPs,11818
 xp/services/conbus/conbus_export_service.py,sha256=RP8nADTIs4FGUf_BFLRZMtEJZdXV94zg3QrlWaDnhKA,17536
 xp/services/conbus/conbus_output_service.py,sha256=e57bRkLgPnJuB8hkllNh0kgGkjPt9IK75tuBxd_bOkE,9361
-xp/services/conbus/conbus_raw_service.py,sha256=OQuV521VOQraf2PGF2B9868vh7sDgmfc19YebrkZnyw,5844
+xp/services/conbus/conbus_raw_service.py,sha256=xmFotLJqPU8CSDumB2gnxqLW7OO-Jlc7WyS0f2cgayA,5967
 xp/services/conbus/conbus_receive_service.py,sha256=TFf3W65brGsy6QZICpIs0Xy9bgqyL1vgQuhS_eHuIZs,5416
 xp/services/conbus/conbus_scan_service.py,sha256=_Ka0OUDNYhDgZIR49Q0P5GTxJq6RcAAX2DVqEDdtb5U,6888
 xp/services/conbus/write_config_service.py,sha256=BCfmLNPRDpwSwRMRYJvx2FXA8IZsdgmyeTXIYvmb4ys,9004
@@ -191,4 +191,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-2.0.3.dist-info/RECORD,,
+conson_xp-2.0.4.dist-info/RECORD,,

xp/__init__.py

@@ -4,7 +4,7 @@ XP CLI tool for remote console bus operations.
 conson-xp package.
 """
 
-__version__ = "2.0.3"
+__version__ = "2.0.4"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

xp/cli/commands/conbus/conbus_raw_commands.py

@@ -14,25 +14,24 @@ from xp.services.conbus.conbus_raw_service import ConbusRawService
 
 
 @conbus.command("raw")
-@click.argument("raw_telegrams")
+@click.argument("telegrams", nargs=-1, required=True)
 @click.pass_context
 @connection_command()
-def send_raw_telegrams(ctx: Context, raw_telegrams: str) -> None:
+def send_raw_telegrams(ctx: Context, telegrams: tuple[str, ...]) -> None:
     r"""
     Send raw telegram sequence to Conbus server.
 
-    Accepts a string containing one or more telegrams in format <...>.
-    Multiple telegrams should be concatenated without separators.
+    Accepts one or more telegrams in format S2113010000F02D (without <> nor CHECKSUM) as separate arguments.
 
     Args:
         ctx: Click context object.
-        raw_telegrams: Raw telegram string(s).
+        telegrams: Raw telegram string(s).
 
     Examples:
         \b
-        xp conbus raw '<S2113010000F02D12>'
-        xp conbus raw '<S2113010000F02D12><S2113010001F02D12><S2113010002F02D12>'
-        xp conbus raw '<S0012345003F02D12FM>...<S0012345009F02D12FF>'
+        xp conbus raw 'S2113010000F02D'
+        xp conbus raw 'S2113010000F02D' 'S2113010001F02D'
+        xp conbus raw 'S0012345003F02D12F' 'S0012345009F02D12'
     """
     service: ConbusRawService = (
         ctx.obj.get("container").get_container().resolve(ConbusRawService)
@@ -62,8 +61,8 @@ def send_raw_telegrams(ctx: Context, raw_telegrams: str) -> None:
         service.on_progress.connect(on_progress)
         service.on_finish.connect(on_finish)
         # Setup
-        service.send_raw_telegram(
-            raw_input=raw_telegrams,
+        service.send_raw_telegrams(
+            telegrams=list(telegrams),
             timeout_seconds=5.0,
         )
         # Start (blocks until completion)

xp/services/conbus/conbus_raw_service.py

@@ -51,7 +51,7 @@ class ConbusRawService:
         self.conbus_protocol.on_timeout.connect(self.timeout)
         self.conbus_protocol.on_failed.connect(self.failed)
 
-        self.raw_input: str = ""
+        self.telegrams: list[str] = []
         self.service_response: ConbusRawResponse = ConbusRawResponse(
             success=False,
         )
@@ -60,8 +60,11 @@ class ConbusRawService:
 
     def connection_made(self) -> None:
         """Handle connection established event."""
-        self.logger.debug(f"Connection established, sending {self.raw_input}")
-        self.conbus_protocol.send_raw_telegram(self.raw_input)
+        self.logger.debug(
+            f"Connection established, sending {len(self.telegrams)} telegrams"
+        )
+        for telegram in self.telegrams:
+            self.conbus_protocol.send_raw_telegram(telegram)
 
     def telegram_sent(self, telegram_sent: str) -> None:
         """
@@ -108,22 +111,22 @@ class ConbusRawService:
         self.service_response.error = message
         self.on_finish.emit(self.service_response)
 
-    def send_raw_telegram(
+    def send_raw_telegrams(
         self,
-        raw_input: str,
+        telegrams: list[str],
         timeout_seconds: Optional[float] = None,
     ) -> None:
         """
-        Send a raw telegram string to the Conbus server.
+        Send raw telegrams to the Conbus server.
 
         Args:
-            raw_input: Raw telegram string to send.
+            telegrams: List of raw telegram strings to send.
             timeout_seconds: Timeout in seconds.
         """
-        self.logger.info("Starting send_raw_telegram")
+        self.logger.info(f"Starting send_raw_telegrams with {len(telegrams)} telegrams")
         if timeout_seconds:
             self.conbus_protocol.timeout_seconds = timeout_seconds
-        self.raw_input = raw_input
+        self.telegrams = telegrams
 
     def set_timeout(self, timeout_seconds: float) -> None:
         """
@@ -151,7 +154,7 @@ class ConbusRawService:
         """
         # Reset state for singleton reuse
         self.service_response = ConbusRawResponse(success=False)
-        self.raw_input = ""
+        self.telegrams = []
         return self
 
     def __exit__(