conson-xp 1.50.1__py3-none-any.whl → 1.51.0__py3-none-any.whl

{conson_xp-1.50.1.dist-info → conson_xp-1.51.0.dist-info}/METADATA

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

{conson_xp-1.50.1.dist-info → conson_xp-1.51.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.50.1.dist-info/METADATA,sha256=bCbYqnE9XZK73a4laFt68XxyWDTPC-MlmxJa99Y7JTc,11432
-conson_xp-1.50.1.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.50.1.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.50.1.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=hEOsOLZ2VP2s9c4Fqe0rpmfu56_wnujnc7Wf3f0xDGI,182
+conson_xp-1.51.0.dist-info/METADATA,sha256=8rmZ2V68vB3gZpx_sScMBXxKXqAei3GeqOOUHGe92mo,11432
+conson_xp-1.51.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.51.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.51.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=IbYggn-GNpmY-NkggNp_7SLbVaF6zPk0wENVaZeOIeE,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
@@ -16,7 +16,7 @@ xp/cli/commands/conbus/conbus_custom_commands.py,sha256=TqWo45yqEp_ezmKZ0tymQ0C4
 xp/cli/commands/conbus/conbus_datapoint_commands.py,sha256=uYsvi37vl2od2XJB0semAF0sH3UrRWTt_qHnBmUBR-w,3788
 xp/cli/commands/conbus/conbus_discover_commands.py,sha256=gSK5Y4lespNKFNgGtp7VkqStGe4fWxDNNfyPPuJiwXQ,1931
 xp/cli/commands/conbus/conbus_event_commands.py,sha256=faaSGRNtJCttk-0VO5Z4m4Zz37aOsSgmbuzWbTOUZIQ,3103
-xp/cli/commands/conbus/conbus_export_commands.py,sha256=epfoIC1C32IT7SMVxolUDm1xm2q7hz_kvs7Jct4W9FQ,5819
+xp/cli/commands/conbus/conbus_export_commands.py,sha256=pWZlS0MMcc8sZAfXx8xMSn53NT5cg3HpF-msBOU7whI,5992
 xp/cli/commands/conbus/conbus_lightlevel_commands.py,sha256=WH4ZQHxSbquPlAqd0uRxq8VR-sO4_AnfseMqaoPoGoA,7092
 xp/cli/commands/conbus/conbus_linknumber_commands.py,sha256=3bkik8nHXY89XfzeUnKWmvKA70r4qJJ79j8FfLL4sL0,3556
 xp/cli/commands/conbus/conbus_modulenumber_commands.py,sha256=fOIO0f85iDJBfGnRCEN8zK6j4i43uuF_9YKQc_nQ39A,3628
@@ -123,7 +123,7 @@ xp/services/actiontable/msactiontable_xp33_serializer.py,sha256=9JzG9dOrfamu8Ujs
 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=ZTQCC1D9TLmyDu3b5GAO4VxUVGSr6HuqZI9fxHB1qW8,14992
+xp/services/conbus/actiontable/actiontable_download_service.py,sha256=41Hr1753IBpUeHQqO57uS7qxOB0rJt8qCpznzKlUPOM,15028
 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=FaQzOSg8s2zUL5xz9qZY9fvzrdDosc3CoxkVDvNg2SU,13252
@@ -135,7 +135,7 @@ xp/services/conbus/conbus_datapoint_service.py,sha256=WBQC42-6xuPWhMKKRtHtRzwEmV
 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_actiontable_service.py,sha256=_2bxmDVSpkGtepuQVbdYX2nwEnSm91GX9P9UzB_INDQ,11043
+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
@@ -198,10 +198,10 @@ xp/term/widgets/protocol_log.py,sha256=E68QmSMpOFrvrPTo_gOQVfyiDqY5c_y8fkNKnQw6V
 xp/term/widgets/status_footer.py,sha256=YYAT0431p6jmrzzpVgaPhu7yGkRroWGv4e99t2XlkHI,3297
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=Px1S3dFGA-_plavBxrq3IqmprNlgtNDunE3whg6Otwg,1722
-xp/utils/dependencies.py,sha256=dlSuKVmuA7AZlqINrQkZxfHuU8mzSHDZnMRRDzqjRAI,24067
+xp/utils/dependencies.py,sha256=I8Z89_iTCeR-7adpae3GVQUGZ-1gY6wg0OGKmdJGg3w,24536
 xp/utils/event_helper.py,sha256=zD0K3TPfGEThU9vUNlDtglTai3Cmm30727iwjDZy6Dk,1007
 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.50.1.dist-info/RECORD,,
+conson_xp-1.51.0.dist-info/RECORD,,

xp/__init__.py

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

xp/cli/commands/conbus/conbus_export_commands.py

@@ -117,16 +117,21 @@ def export_conbus_actiontable(ctx: click.Context) -> None:
         xp conbus export actiontable
     """
 
-    def on_progress(serial_number: str, current: int, total: int) -> None:
+    def on_progress(
+        serial_number: str, actiontable_type: str, current: int, total: int
+    ) -> None:
         """
         Handle progress updates during export.
 
         Args:
             serial_number: Serial number of discovered device.
+            actiontable_type: Type of action table being exported.
             current: Current device number.
             total: Total devices discovered.
         """
-        click.echo(f"Querying device {current}/{total}: {serial_number}...")
+        click.echo(
+            f"Querying device {current}/{total}: {serial_number} / {actiontable_type}."
+        )
 
     def on_device_actiontable_exported(
         module: ConsonModuleConfig,
@@ -176,4 +181,5 @@ def export_conbus_actiontable(ctx: click.Context) -> None:
         service.on_device_actiontable_exported.connect(on_device_actiontable_exported)
         service.on_finish.connect(on_finish)
         service.set_timeout(5)
+        service.configure()
         service.start_reactor()

xp/services/conbus/actiontable/actiontable_download_service.py

@@ -292,6 +292,8 @@ class ActionTableDownloadService(DownloadStateMachine):
             raise RuntimeError("Cannot configure while download in progress")
         self.logger.info("Configuring actiontable download")
         self.serial_number = serial_number
+        self.actiontable_data = []
+
         if actiontable_type == ActionTableType.ACTIONTABLE:
             self.serializer = self.actiontable_serializer
         elif actiontable_type == ActionTableType.MSACTIONTABLE_XP20:

xp/services/conbus/conbus_export_actiontable_service.py

@@ -3,7 +3,7 @@
 import asyncio
 import logging
 from pathlib import Path
-from queue import SimpleQueue
+from queue import Empty, SimpleQueue
 from typing import Any, Optional, Tuple
 
 import yaml
@@ -38,7 +38,7 @@ class ConbusActiontableExportService:
     """
 
     # Signals (class attributes)
-    on_progress: Signal = Signal(str, int, int)  # serial, current, total
+    on_progress: Signal = Signal(str, str, int, int)  # serial, current, total
     on_device_actiontable_exported: Signal = Signal(
         ConsonModuleConfig, ActionTableType, str
     )
@@ -64,25 +64,35 @@ class ConbusActiontableExportService:
         self.logger = logging.getLogger(__name__)
         self.download_service = download_service
         self._module_list: ConsonModuleListConfig = module_list
+        self._module_dic: dict[str, ConsonModuleConfig] = {
+            module.serial_number: module for module in module_list.root
+        }
         # State management
-        self.device_queue: SimpleQueue[Tuple[ConsonModuleConfig, ActionTableType]] = (
+        self.device_queue: SimpleQueue[Tuple[str, ActionTableType]] = (
             SimpleQueue()
         )  # FIFO
         for module in self._module_list.root:
-            self.device_queue.put((module, ActionTableType.ACTIONTABLE))
-            if module.module_type == "xp20":
-                self.device_queue.put((module, ActionTableType.MSACTIONTABLE_XP20))
-            if module.module_type == "xp24":
-                self.device_queue.put((module, ActionTableType.MSACTIONTABLE_XP24))
-            if module.module_type == "xp33":
-                self.device_queue.put((module, ActionTableType.MSACTIONTABLE_XP33))
+            self.logger.info("Export module %s", module)
+            if module.module_type.lower() == "xp20":
+                self.device_queue.put(
+                    (module.serial_number, ActionTableType.MSACTIONTABLE_XP20)
+                )
+            if module.module_type.lower() == "xp24":
+                self.device_queue.put(
+                    (module.serial_number, ActionTableType.MSACTIONTABLE_XP24)
+                )
+            if module.module_type.lower() == "xp33":
+                self.device_queue.put(
+                    (module.serial_number, ActionTableType.MSACTIONTABLE_XP33)
+                )
+            self.device_queue.put((module.serial_number, ActionTableType.ACTIONTABLE))
+
+        self.logger.info("Export module %s", self.device_queue.qsize())
 
         self.current_module: Optional[ConsonModuleConfig] = None
-        self.curent_actiontable_type: Optional[ActionTableType] = None
+        self.current_actiontable_type: Optional[ActionTableType] = None
         self.export_result = ConbusExportResponse(success=False)
         self.export_status = "OK"
-        # Connect protocol signals
-        self._connect_signals()
 
     def on_module_actiontable_received(
         self, actiontable: Any, short_actiontable: list[str]
@@ -94,7 +104,7 @@ class ConbusActiontableExportService:
             actiontable: Full actiontable data.
             short_actiontable: Short representation of the actiontable.
         """
-        if not self.curent_actiontable_type:
+        if not self.current_actiontable_type:
             self._fail("Invalid state (curent_actiontable_type)")
             return
 
@@ -102,17 +112,17 @@ class ConbusActiontableExportService:
             self._fail("Invalid state (current_module)")
             return
 
-        if self.curent_actiontable_type == ActionTableType.ACTIONTABLE:
+        if self.current_actiontable_type == ActionTableType.ACTIONTABLE:
             self.current_module.action_table = short_actiontable
-        elif self.curent_actiontable_type == ActionTableType.MSACTIONTABLE_XP20:
+        elif self.current_actiontable_type == ActionTableType.MSACTIONTABLE_XP20:
             self.current_module.xp20_msaction_table = short_actiontable
-        elif self.curent_actiontable_type == ActionTableType.MSACTIONTABLE_XP24:
+        elif self.current_actiontable_type == ActionTableType.MSACTIONTABLE_XP24:
             self.current_module.xp24_msaction_table = short_actiontable
-        elif self.curent_actiontable_type == ActionTableType.MSACTIONTABLE_XP33:
+        elif self.current_actiontable_type == ActionTableType.MSACTIONTABLE_XP33:
             self.current_module.xp33_msaction_table = short_actiontable
 
         self.on_device_actiontable_exported.emit(
-            self.current_module, self.curent_actiontable_type, actiontable
+            self.current_module, self.current_actiontable_type, short_actiontable
         )
 
     def on_module_finish(self) -> None:
@@ -127,10 +137,13 @@ class ConbusActiontableExportService:
         serial_number = (
             self.current_module.serial_number if self.current_module else "UNKNOWN"
         )
+        current_actiontable_type = self.current_actiontable_type or "UNKNOWN"
         total_modules = len(self._module_list.root)
         current_index = total_modules - self.device_queue.qsize()
 
-        self.on_progress.emit(serial_number, current_index, total_modules)
+        self.on_progress.emit(
+            serial_number, current_actiontable_type, current_index, total_modules
+        )
 
     def on_module_error(self, error_message: str) -> None:
         """
@@ -162,7 +175,6 @@ class ConbusActiontableExportService:
                             "enabled",
                             "conbus_ip",
                             "conbus_port",
-                            "action_table",
                         }
                     }
                 },
@@ -203,16 +215,24 @@ class ConbusActiontableExportService:
             True if there is a module to export, False otherwise.
         """
         self.download_service.reset()
-        (self.current_module, self.curent_actiontable_type) = (
-            self.device_queue.get_nowait()
-        )
-        if not (self.current_module or self.curent_actiontable_type):
+        try:
+            (current_serial_number, self.current_actiontable_type) = (
+                self.device_queue.get_nowait()
+            )
+        except Empty:
+            return False
+
+        self.current_module = self._module_dic[current_serial_number]
+        if not (self.current_module or self.current_actiontable_type):
             self.logger.error("No module to export")
             return False
 
+        self.logger.info(
+            f"Downloading {self.current_module.serial_number} / {self.current_actiontable_type}"
+        )
         self.download_service.configure(
             self.current_module.serial_number,
-            self.curent_actiontable_type,
+            self.current_actiontable_type,
         )
         self.download_service.do_connect()
         return True
@@ -275,7 +295,7 @@ class ConbusActiontableExportService:
 
     def _disconnect_signals(self) -> None:
         """Disconnect download service signals from handlers."""
-        self.download_service.on_actiontable_received.connect(
+        self.download_service.on_actiontable_received.disconnect(
             self.on_module_actiontable_received
         )
         self.download_service.on_finish.disconnect(self.on_module_finish)

xp/utils/dependencies.py

@@ -46,6 +46,9 @@ from xp.services.conbus.conbus_datapoint_service import (
 from xp.services.conbus.conbus_discover_service import ConbusDiscoverService
 from xp.services.conbus.conbus_event_list_service import ConbusEventListService
 from xp.services.conbus.conbus_event_raw_service import ConbusEventRawService
+from xp.services.conbus.conbus_export_actiontable_service import (
+    ConbusActiontableExportService,
+)
 from xp.services.conbus.conbus_export_service import ConbusExportService
 from xp.services.conbus.conbus_output_service import ConbusOutputService
 from xp.services.conbus.conbus_raw_service import ConbusRawService
@@ -217,6 +220,15 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
+        self.container.register(
+            ConbusActiontableExportService,
+            factory=lambda: ConbusActiontableExportService(
+                download_service=self.container.resolve(ActionTableDownloadService),
+                module_list=self.container.resolve(ConsonModuleListConfig),
+            ),
+            scope=punq.Scope.singleton,
+        )
+
         # Terminal UI
         self.container.register(
             ProtocolMonitorService,