conson-xp 1.18.0__py3-none-any.whl → 1.19.0__py3-none-any.whl

{conson_xp-1.18.0.dist-info → conson_xp-1.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.18.0
+Version: 1.19.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -306,6 +306,7 @@ xp conbus datapoint query
 xp conbus discover
 
 xp conbus event
+xp conbus event list
 xp conbus event raw
 
 

{conson_xp-1.18.0.dist-info → conson_xp-1.19.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.18.0.dist-info/METADATA,sha256=tn61tFoUuWRz3TkdNXxuq2b26S0ZtqqjYAmHYL6Cwqg,9506
-conson_xp-1.18.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-conson_xp-1.18.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.18.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=F3DFS5EiPFPNOhbV20K8kGI6O9d6SQGEopDRegtFQZI,181
+conson_xp-1.19.0.dist-info/METADATA,sha256=-VtLm8xePli914-pZt50momoSfpi6BARWkhyla_IiYA,9527
+conson_xp-1.19.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+conson_xp-1.19.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.19.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=xqDwwDvx5lt_aNSuHKANp3WXQCP4x1a9OzyP8CniQnE,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=wvo9Z5viwpjvO2432E7YP5HWjLLiW1IFpyXLc5puuGY,4766
@@ -15,7 +15,7 @@ xp/cli/commands/conbus/conbus_config_commands.py,sha256=BugIbgNX6_s4MySGvI6tWZkw
 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_discover_commands.py,sha256=-y3TDgOnw1_cjvxvgyfQ1GQE2_WmYq-l8Md7DsdTXmo,1719
-xp/cli/commands/conbus/conbus_event_commands.py,sha256=nhWnPIIWTD9EFp_WiyaUAMlr8q20WW3SvyJ0LiqTu88,2373
+xp/cli/commands/conbus/conbus_event_commands.py,sha256=7URf-2u8Kzcy0chLYShbZfCbKawf--i-8U88AjhxleQ,3177
 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
@@ -53,7 +53,7 @@ xp/cli/utils/system_function_choice.py,sha256=0J02EMgAQcsrE-9rEkv6YHelBoBkZ73T8V
 xp/cli/utils/xp_module_type.py,sha256=qSFJBRceqPi_cUFPxAWtLUNq37-KwUEjo9ekYOj7kLQ,1471
 xp/connection/__init__.py,sha256=ClJsVWALYZgAGYZK_Jznd3YKLrHDu17kBfwugjuPfu0,209
 xp/connection/exceptions.py,sha256=7CcRUzkyay5zA6Z9-5dIDRzua806v5N7pCcJazP_1dE,365
-xp/models/__init__.py,sha256=UaUiuvWevneh9gPzKNaVsuy6rxM7YlZg4mi8VlEJpfg,1210
+xp/models/__init__.py,sha256=lROqr559DGd8WpJJUtfPT95VERCwMZHpBDEc96QSxQ0,1312
 xp/models/actiontable/__init__.py,sha256=6kVq1rTOlpc24sZxGGVWkY48tqR42YWHLQHqakWqlPc,43
 xp/models/actiontable/actiontable.py,sha256=bIeluZhMsvukkSwy2neaewavU8YR6Pso3PIvJ8ENlGg,1251
 xp/models/actiontable/msactiontable_xp20.py,sha256=C_lYYIQagEFap0S5S40_S7AhLO2UZG2EmXjjeem7uw8,1967
@@ -68,6 +68,7 @@ xp/models/conbus/conbus_connection_status.py,sha256=iGbmtBaAMwV6UD7XG3H3tnB0fl2M
 xp/models/conbus/conbus_custom.py,sha256=8H2sPR6_LIlksuOvL7-8bPkzAJLR0rpYiiwfYYFVjEo,1965
 xp/models/conbus/conbus_datapoint.py,sha256=4ncR-vB2lRzRBAA30rYn8eguyTxsZoOKrrXtjGmPpWg,3396
 xp/models/conbus/conbus_discover.py,sha256=nxxUEKfEsH1kd0BF8ovMs7zLujRhrq1oL9ZJtysPr5o,2238
+xp/models/conbus/conbus_event_list.py,sha256=M8aHRHVB5VDIjqMzjO86xlERt7AMdfjIjt1b70RF52Y,958
 xp/models/conbus/conbus_event_raw.py,sha256=i5gc7z-0yeunWOZ4rw3AiBt4MANezmhBQKjOOQk3oDc,1567
 xp/models/conbus/conbus_lightlevel.py,sha256=GQGhzrCBEJROosNHInXIzBy6MD2AskEIMoFEGgZ60-0,1695
 xp/models/conbus/conbus_linknumber.py,sha256=uFzKzfB06oIzZEKCb5X2JEI80JjMPFuYglsT1W1k8j4,1815
@@ -120,6 +121,7 @@ xp/services/conbus/conbus_custom_service.py,sha256=4aneYdPObiZOGxPFYg5Wr70cl_xFx
 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_discover_service.py,sha256=sSCSDNWWGtx5QOShwJfcbG54WCYH-BxWvgE10ghibN4,12326
+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_output_service.py,sha256=mHFOAPx2zo0TStZ3pokp6v94AQjIamcwZDeg5YH_-eo,7240
 xp/services/conbus/conbus_raw_service.py,sha256=4yZLLTIAOxpgByUTWZXw1ihGa6Xtl98ckj9T7VfprDI,4335
@@ -169,8 +171,8 @@ xp/services/telegram/telegram_service.py,sha256=XrP1CPi0ckxoKBaNwLA6lo-TogWxXgmX
 xp/services/telegram/telegram_version_service.py,sha256=M5HdOTsLdcwo122FP-jW6R740ktLrtKf2TiMDVz23h8,10528
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=HDpiQxmdIedbCbZ4o_Box0i_Zig417BtCV_46ZyhiTk,1711
-xp/utils/dependencies.py,sha256=QsZfPDMdlrQK01YQ4PRQ8Q59ZF9w22h1evWX3J4xCjE,20930
+xp/utils/dependencies.py,sha256=PYe-RvmfGBRXWnLKX62nXGMDFN7PQW3deoGCkIVEG4s,21274
 xp/utils/event_helper.py,sha256=W-A_xmoXlpWZBbJH6qdaN50o3-XrwFsDgvAGMJDiAgo,1001
 xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
 xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
-conson_xp-1.18.0.dist-info/RECORD,,
+conson_xp-1.19.0.dist-info/RECORD,,

xp/__init__.py

@@ -3,7 +3,7 @@
 conson-xp package.
 """
 
-__version__ = "1.18.0"
+__version__ = "1.19.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

xp/cli/commands/conbus/conbus_event_commands.py

@@ -8,6 +8,7 @@ from xp.cli.commands.conbus.conbus import conbus
 from xp.cli.utils.decorators import connection_command
 from xp.cli.utils.module_type_choice import MODULE_TYPE
 from xp.models import ConbusEventRawResponse
+from xp.services.conbus.conbus_event_list_service import ConbusEventListService
 from xp.services.conbus.conbus_event_raw_service import ConbusEventRawService
 
 
@@ -17,6 +18,30 @@ def conbus_event() -> None:
     pass
 
 
+@conbus_event.command("list")
+@click.pass_context
+def list_events(ctx: click.Context) -> None:
+    r"""List configured event telegrams from module action tables.
+
+    Reads conson.yml configuration, parses action tables, and groups
+    modules by their event keys to show which modules are assigned to
+    each event (button configuration).
+
+    Output is sorted by module count (most frequently used events first).
+
+    Args:
+        ctx: Click context object.
+
+    Examples:
+        \b
+        xp conbus event list
+    """
+    service: ConbusEventListService = (
+        ctx.obj.get("container").get_container().resolve(ConbusEventListService)
+    )
+    click.echo(json.dumps(service.list_events().to_dict(), indent=2))
+
+
 @conbus_event.command("raw")
 @click.argument("module_type", type=MODULE_TYPE)
 @click.argument("link_number", type=click.IntRange(0, 99))

xp/models/__init__.py

@@ -5,6 +5,7 @@ from xp.models.conbus.conbus_client_config import ConbusClientConfig
 from xp.models.conbus.conbus_connection_status import ConbusConnectionStatus
 from xp.models.conbus.conbus_datapoint import ConbusDatapointResponse
 from xp.models.conbus.conbus_discover import ConbusDiscoverResponse
+from xp.models.conbus.conbus_event_list import ConbusEventListResponse
 from xp.models.conbus.conbus_event_raw import ConbusEventRawResponse
 from xp.models.log_entry import LogEntry
 from xp.models.telegram.event_telegram import EventTelegram
@@ -31,6 +32,7 @@ __all__ = [
     "ConbusResponse",
     "ConbusDatapointResponse",
     "ConbusDiscoverResponse",
+    "ConbusEventListResponse",
     "ConbusEventRawResponse",
     "ConbusConnectionStatus",
 ]

xp/models/conbus/conbus_event_list.py

@@ -0,0 +1,34 @@
+"""Conbus event list response model."""
+
+from dataclasses import dataclass
+from datetime import datetime
+from typing import Any, Dict, Optional
+
+
+@dataclass
+class ConbusEventListResponse:
+    """Represents a response from Conbus event list operation.
+
+    Attributes:
+        events: Dict mapping event keys to list of module names.
+        timestamp: Timestamp of the response.
+    """
+
+    events: Dict[str, list[str]]
+    timestamp: Optional[datetime] = None
+
+    def __post_init__(self) -> None:
+        """Initialize timestamp if not provided."""
+        if self.timestamp is None:
+            self.timestamp = datetime.now()
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert to dictionary for JSON serialization.
+
+        Returns:
+            Dictionary representation of the response.
+        """
+        return {
+            "events": self.events,
+            "timestamp": self.timestamp.isoformat() if self.timestamp else None,
+        }

xp/services/conbus/conbus_event_list_service.py

@@ -0,0 +1,91 @@
+"""Conbus Event List Service for listing configured event telegrams.
+
+This service parses action tables from conson.yml and groups events
+by button configuration to show which modules are assigned to each event.
+"""
+
+import logging
+from collections import defaultdict
+from typing import Dict, List
+
+from xp.models import ConbusEventListResponse
+from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
+
+
+class ConbusEventListService:
+    """Service for listing configured event telegrams from action tables.
+
+    Parses action tables from conson.yml configuration and groups modules
+    by their event keys to identify common button configurations.
+
+    Attributes:
+        conson_config: Configuration containing module action tables.
+        logger: Logger instance for the service.
+    """
+
+    def __init__(self, conson_config: ConsonModuleListConfig) -> None:
+        """Initialize the Conbus event list service.
+
+        Args:
+            conson_config: ConsonModuleListConfig instance with module action tables.
+        """
+        self.conson_config = conson_config
+        self.logger = logging.getLogger(__name__)
+
+    def list_events(self) -> ConbusEventListResponse:
+        """List all configured events from module action tables.
+
+        Parses action tables, extracts event information (module_type, link, input),
+        groups modules by event key, and sorts by usage count.
+
+        Returns:
+            ConbusEventListResponse with events dict mapping event keys to module names.
+        """
+        # Dict to track which modules are assigned to each event
+        # event_key -> set of module names (using set for automatic deduplication)
+        event_modules: Dict[str, set[str]] = defaultdict(set)
+
+        # Process each module's action table
+        for module in self.conson_config.root:
+            # Skip modules without action table
+            if not module.action_table:
+                continue
+
+            # Process each action in the module's action table
+            for action in module.action_table:
+                try:
+                    # Use existing ActionTableSerializer to parse action
+                    entry = ActionTableSerializer.parse_action_string(action)
+
+                    # Extract event data from parsed entry
+                    module_type_name = entry.module_type.name
+                    link = entry.link_number
+                    input_num = entry.module_input
+
+                    # Create event key (space-separated format)
+                    event_key = f"{module_type_name} {link:02d} {input_num:02d}"
+
+                    # Add this module to the event (set automatically deduplicates)
+                    event_modules[event_key].add(
+                        f"{module.serial_number}:{entry.module_output}"
+                    )
+
+                except ValueError as e:
+                    # Invalid action format - log warning and skip
+                    self.logger.warning(
+                        f"Invalid action '{action}' in module '{module.serial_number}': {e}"
+                    )
+                    continue
+
+        # Convert sets to sorted lists and sort events by module count (descending)
+        events_dict: Dict[str, List[str]] = {
+            event_key: sorted(list(modules))
+            for event_key, modules in sorted(
+                event_modules.items(),
+                key=lambda item: len(item[1]),
+                reverse=True,
+            )
+        }
+
+        return ConbusEventListResponse(events=events_dict)

xp/utils/dependencies.py

@@ -43,6 +43,7 @@ from xp.services.conbus.conbus_datapoint_service import (
     ConbusDatapointService,
 )
 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_output_service import ConbusOutputService
 from xp.services.conbus.conbus_raw_service import ConbusRawService
@@ -189,6 +190,14 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
+        self.container.register(
+            ConbusEventListService,
+            factory=lambda: ConbusEventListService(
+                conson_config=self.container.resolve(ConsonModuleListConfig)
+            ),
+            scope=punq.Scope.singleton,
+        )
+
         self.container.register(
             ConbusBlinkService,
             factory=lambda: ConbusBlinkService(