conson-xp 1.36.0__tar.gz → 1.38.0__tar.gz

{conson_xp-1.36.0 → conson_xp-1.38.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.36.0
+Version: 1.38.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -350,7 +350,10 @@ xp conbus event
 xp conbus event list
 xp conbus event raw
 
+
 xp conbus export
+xp conbus export config
+
 
 xp conbus lightlevel
 xp conbus lightlevel get
@@ -371,6 +374,8 @@ xp conbus modulenumber set
 
 xp conbus msactiontable
 xp conbus msactiontable download
+xp conbus msactiontable list
+xp conbus msactiontable show
 
 
 xp conbus output

{conson_xp-1.36.0 → conson_xp-1.38.0}/README.md

@@ -297,7 +297,10 @@ xp conbus event
 xp conbus event list
 xp conbus event raw
 
+
 xp conbus export
+xp conbus export config
+
 
 xp conbus lightlevel
 xp conbus lightlevel get
@@ -318,6 +321,8 @@ xp conbus modulenumber set
 
 xp conbus msactiontable
 xp conbus msactiontable download
+xp conbus msactiontable list
+xp conbus msactiontable show
 
 
 xp conbus output

{conson_xp-1.36.0 → conson_xp-1.38.0}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.36.0"
+version = "1.38.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/__init__.py

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

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/__init__.py

@@ -8,6 +8,7 @@ from xp.cli.commands.conbus.conbus import (
     conbus_autoreport,
     conbus_blink,
     conbus_datapoint,
+    conbus_export,
     conbus_lightlevel,
     conbus_linknumber,
     conbus_modulenumber,
@@ -101,6 +102,7 @@ __all__ = [
     "conbus_msactiontable",
     "conbus_actiontable",
     "conbus_event",
+    "conbus_export",
     "file",
     "module",
     "reverse_proxy",

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/__init__.py

@@ -6,6 +6,7 @@ from xp.cli.commands.conbus.conbus import (
     conbus_autoreport,
     conbus_blink,
     conbus_datapoint,
+    conbus_export,
     conbus_lightlevel,
     conbus_linknumber,
     conbus_msactiontable,
@@ -22,4 +23,5 @@ __all__ = [
     "conbus_lightlevel",
     "conbus_msactiontable",
     "conbus_actiontable",
+    "conbus_export",
 ]

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus.py

@@ -117,6 +117,30 @@ def conbus_actiontable() -> None:
     pass
 
 
+@click.group(
+    "event",
+    cls=HelpColorsGroup,
+    help_headers_color="yellow",
+    help_options_color="green",
+    short_help="Export operations",
+)
+def conbus_event() -> None:
+    """Event telegrams to Conbus modules."""
+    pass
+
+
+@click.group(
+    "export",
+    cls=HelpColorsGroup,
+    help_headers_color="yellow",
+    help_options_color="green",
+    short_help="Export operations",
+)
+def conbus_export() -> None:
+    """Download ActionTable from Conbus modules."""
+    pass
+
+
 conbus.add_command(conbus_blink)
 conbus.add_command(conbus_output)
 conbus.add_command(conbus_datapoint)
@@ -126,3 +150,5 @@ conbus.add_command(conbus_autoreport)
 conbus.add_command(conbus_lightlevel)
 conbus.add_command(conbus_msactiontable)
 conbus.add_command(conbus_actiontable)
+conbus.add_command(conbus_event)
+conbus.add_command(conbus_export)

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -3,6 +3,7 @@
 import json
 from contextlib import suppress
 from pathlib import Path
+from typing import Any, Dict
 
 import click
 from click import Context
@@ -12,12 +13,13 @@ from xp.cli.utils.decorators import (
     connection_command,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.models.homekit.homekit_conson_config import (
+from xp.models.actiontable.actiontable import ActionTable
+from xp.models.config.conson_module_config import (
     ConsonModuleConfig,
     ConsonModuleListConfig,
 )
 from xp.services.conbus.actiontable.actiontable_download_service import (
-    ActionTableService,
+    ActionTableDownloadService,
 )
 from xp.services.conbus.actiontable.actiontable_list_service import (
     ActionTableListService,
@@ -47,8 +49,8 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         ctx: Click context object.
         serial_number: 10-digit module serial number.
     """
-    service: ActionTableService = (
-        ctx.obj.get("container").get_container().resolve(ActionTableService)
+    service: ActionTableDownloadService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableDownloadService)
     )
 
     def on_progress(progress: str) -> None:
@@ -57,15 +59,20 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         Args:
             progress: Progress message string.
         """
-        click.echo(progress)
+        click.echo(progress, nl=False)
 
-    def on_finish(result: tuple) -> None:
+    def on_finish(
+        _actiontable: ActionTable,
+        actiontable_dict: Dict[str, Any],
+        actiontable_short: list[str],
+    ) -> None:
         """Handle successful completion of action table download.
 
         Args:
-            result: Tuple of (_actiontable, actiontable_dict, actiontable_short).
+            _actiontable: a list of ActionTableEntries.
+            actiontable_dict: action table in a dictionary.
+            actiontable_short: short representation of action table.
         """
-        _actiontable, actiontable_dict, actiontable_short = result
         output = {
             "serial_number": serial_number,
             "actiontable_short": actiontable_short,
@@ -214,7 +221,9 @@ def conbus_show_actiontable(ctx: Context, serial_number: str) -> None:
         Args:
             module: Dictionary containing module configuration.
         """
-        click.echo(json.dumps(module.model_dump(), indent=2, default=str))
+        module_data = module.model_dump()
+        module_data.pop("msactiontable", None)
+        click.echo(json.dumps(module_data, indent=2, default=str))
 
     def error_callback(error: str) -> None:
         """Handle errors during action table show.

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_autoreport_commands.py

@@ -57,8 +57,11 @@ def get_autoreport_command(ctx: Context, serial_number: str) -> None:
     with service:
         service.on_finish.connect(on_finish)
         service.query_datapoint(
-            serial_number=serial_number, datapoint_type=DataPointType.AUTO_REPORT_STATUS
+            serial_number=serial_number,
+            datapoint_type=DataPointType.AUTO_REPORT_STATUS,
+            timeout_seconds=1.0,
         )
+        service.start_reactor()
 
 
 @conbus_autoreport.command("set", short_help="Set auto report status for a module")
@@ -104,6 +107,6 @@ def set_autoreport_command(ctx: Context, serial_number: str, status: str) -> Non
             serial_number=serial_number,
             datapoint_type=DataPointType.AUTO_REPORT_STATUS,
             data_value=data_value,
-            timeout_seconds=0.5,
+            timeout_seconds=1.0,
         )
         service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_event_commands.py

@@ -4,7 +4,7 @@ import json
 
 import click
 
-from xp.cli.commands.conbus.conbus import conbus
+from xp.cli.commands.conbus.conbus import conbus, conbus_event
 from xp.cli.utils.decorators import connection_command
 from xp.cli.utils.module_type_choice import MODULE_TYPE
 from xp.models import ConbusEventRawResponse
@@ -12,12 +12,6 @@ from xp.services.conbus.conbus_event_list_service import ConbusEventListService
 from xp.services.conbus.conbus_event_raw_service import ConbusEventRawService
 
 
-@click.group(name="event")
-def conbus_event() -> None:
-    """Send event telegrams to Conbus modules."""
-    pass
-
-
 @conbus_event.command("list")
 @click.pass_context
 def list_events(ctx: click.Context) -> None:

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_export_commands.py

@@ -1,21 +1,21 @@
-"""Conbus export CLI command."""
+"""Conbus export CLI commands."""
 
 from contextlib import suppress
 
 import click
 
-from xp.cli.commands.conbus.conbus import conbus
+from xp.cli.commands.conbus.conbus import conbus_export
 from xp.cli.utils.decorators import connection_command
 from xp.models.conbus.conbus_export import ConbusExportResponse
-from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
+from xp.models.config.conson_module_config import ConsonModuleConfig
 from xp.services.conbus.conbus_export_service import ConbusExportService
 
 
-@conbus.command("export")
+@conbus_export.command("config")
 @click.pass_context
 @connection_command()
 def export_conbus_config(ctx: click.Context) -> None:
-    r"""Export Conbus device configuration to YAML file.
+    r"""Export Conbus device metadata to YAML file.
 
     Discovers all devices on the Conbus network and queries their configuration
     datapoints to generate a complete export.yml file in conson.yml format.
@@ -25,8 +25,9 @@ def export_conbus_config(ctx: click.Context) -> None:
 
     Examples:
         \b
-        # Export to export.yml in current directory
+        # Export device metadata to export.yml
         xp conbus export
+        xp conbus export config
     """
 
     def on_progress(serial_number: str, current: int, total: int) -> None:

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -200,6 +200,7 @@ def xp_lightlevel_get(
         result["output_number"] = output_number
         result["lightlevel_level"] = lightlevel_level
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -208,3 +209,4 @@ def xp_lightlevel_get(
             datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -93,6 +93,7 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
         result = service_response.to_dict()
         result["linknumber_value"] = linknumber_value
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -101,3 +102,4 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
             datapoint_type=DataPointType.LINK_NUMBER,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_modulenumber_commands.py

@@ -95,6 +95,7 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
         result = service_response.to_dict()
         result["modulenumber_value"] = modulenumber_value
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -103,3 +104,4 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
             datapoint_type=DataPointType.MODULE_NUMBER,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

conson_xp-1.38.0/src/xp/cli/commands/conbus/conbus_msactiontable_commands.py

@@ -0,0 +1,175 @@
+"""XP24 Action Table CLI commands."""
+
+import json
+from typing import Union
+
+import click
+from click import Context
+
+from xp.cli.commands.conbus.conbus import conbus_msactiontable
+from xp.cli.utils.decorators import (
+    connection_command,
+)
+from xp.cli.utils.serial_number_type import SERIAL
+from xp.cli.utils.xp_module_type import XP_MODULE_TYPE
+from xp.models.actiontable.msactiontable_xp20 import Xp20MsActionTable
+from xp.models.actiontable.msactiontable_xp24 import Xp24MsActionTable
+from xp.models.actiontable.msactiontable_xp33 import Xp33MsActionTable
+from xp.models.config.conson_module_config import ConsonModuleConfig
+from xp.services.conbus.msactiontable.msactiontable_download_service import (
+    MsActionTableDownloadService,
+)
+from xp.services.conbus.msactiontable.msactiontable_list_service import (
+    MsActionTableListService,
+)
+from xp.services.conbus.msactiontable.msactiontable_show_service import (
+    MsActionTableShowService,
+)
+
+
+@conbus_msactiontable.command("download", short_help="Download MSActionTable")
+@click.argument("serial_number", type=SERIAL)
+@click.argument("xpmoduletype", type=XP_MODULE_TYPE)
+@click.pass_context
+@connection_command()
+def conbus_download_msactiontable(
+    ctx: Context, serial_number: str, xpmoduletype: str
+) -> None:
+    """Download MS action table from XP24 module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        xpmoduletype: XP module type.
+    """
+    service: MsActionTableDownloadService = (
+        ctx.obj.get("container").get_container().resolve(MsActionTableDownloadService)
+    )
+
+    def on_progress(progress: str) -> None:
+        """Handle progress updates during MS action table download.
+
+        Args:
+            progress: Progress message string.
+        """
+        click.echo(progress, nl=False)
+
+    def on_finish(
+        msaction_table: Union[
+            Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable, None
+        ],
+        msaction_table_short: str,
+    ) -> None:
+        """Handle successful completion of MS action table download.
+
+        Args:
+            msaction_table: Downloaded MS action table object or None if failed.
+            msaction_table_short: Short version of MS action table object or None if failed.
+
+        Raises:
+            Abort: If action table download failed.
+        """
+        service.stop_reactor()
+        if msaction_table is None:
+            click.echo("Error: Failed to download MS action table")
+            raise click.Abort()
+
+        output = {
+            "serial_number": serial_number,
+            "xpmoduletype": xpmoduletype,
+            "msaction_table_short": msaction_table_short,
+            "msaction_table": msaction_table.model_dump(),
+        }
+        click.echo(json.dumps(output, indent=2, default=str))
+
+    def on_error(error: str) -> None:
+        """Handle errors during MS action table download.
+
+        Args:
+            error: Error message string.
+        """
+        click.echo(f"Error: {error}")
+
+    with service:
+        service.on_progress.connect(on_progress)
+        service.on_error.connect(on_error)
+        service.on_finish.connect(on_finish)
+        service.start(
+            serial_number=serial_number,
+            xpmoduletype=xpmoduletype,
+        )
+        service.start_reactor()
+
+
+@conbus_msactiontable.command("list", short_help="List modules with MsActionTable")
+@click.pass_context
+def conbus_list_msactiontable(ctx: Context) -> None:
+    """List all modules with action table configurations from conson.yml.
+
+    Args:
+        ctx: Click context object.
+    """
+    service: MsActionTableListService = (
+        ctx.obj.get("container").get_container().resolve(MsActionTableListService)
+    )
+
+    def on_finish(module_list: dict) -> None:
+        """Handle successful completion of action table list.
+
+        Args:
+            module_list: Dictionary containing modules and total count.
+        """
+        click.echo(json.dumps(module_list, indent=2, default=str))
+
+    def on_error(error: str) -> None:
+        """Handle errors during action table list.
+
+        Args:
+            error: Error message string.
+        """
+        click.echo(error)
+
+    with service:
+        service.on_finish.connect(on_finish)
+        service.on_error.connect(on_error)
+        service.start()
+
+
+@conbus_msactiontable.command("show", short_help="Show MsActionTable configuration")
+@click.argument("serial_number", type=SERIAL)
+@click.pass_context
+def conbus_show_msactiontable(ctx: Context, serial_number: str) -> None:
+    """Show ms action table configuration for a specific module from conson.yml.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+    """
+    service: MsActionTableShowService = (
+        ctx.obj.get("container").get_container().resolve(MsActionTableShowService)
+    )
+
+    def on_finish(module: ConsonModuleConfig) -> None:
+        """Handle successful completion of action table show.
+
+        Args:
+            module: Dictionary containing module configuration.
+        """
+        module_data = module.model_dump()
+        module_data.pop("action_table", None)
+        click.echo(json.dumps(module_data, indent=2, default=str))
+
+    def error_callback(error: str) -> None:
+        """Handle errors during action table show.
+
+        Args:
+            error: Error message string.
+        """
+        click.echo(error)
+
+    with service:
+        service.start(
+            serial_number=serial_number,
+            finish_callback=on_finish,
+            error_callback=error_callback,
+        )

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/cli/commands/conbus/conbus_output_commands.py

@@ -121,6 +121,7 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
             response: Datapoint response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -128,6 +129,7 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_OUTPUT_STATE,
         )
+        service.start_reactor()
 
 
 @conbus_output.command("state")
@@ -156,6 +158,7 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
             response: Datapoint response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -163,3 +166,4 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_STATE,
         )
+        service.start_reactor()

conson_xp-1.38.0/src/xp/models/actiontable/msactiontable.py

@@ -0,0 +1,9 @@
+"""Base class for MS Action Table models."""
+
+from pydantic import BaseModel
+
+
+class MsActionTable(BaseModel):
+    """Base class for all MS Action Table types (XP20, XP24, XP33)."""
+
+    pass

{conson_xp-1.36.0 → conson_xp-1.38.0}/src/xp/models/actiontable/msactiontable_xp20.py

@@ -1,10 +1,11 @@
 """XP20 Action Table models for input actions and settings."""
 
-from dataclasses import dataclass, field
+from pydantic import BaseModel, Field
 
+from xp.models.actiontable.msactiontable import MsActionTable
 
-@dataclass
-class InputChannel:
+
+class InputChannel(BaseModel):
     """Configuration for a single input channel in XP20 action table.
 
     Attributes:
@@ -19,13 +20,12 @@ class InputChannel:
     invert: bool = False
     short_long: bool = False
     group_on_off: bool = False
-    and_functions: list[bool] = field(default_factory=lambda: [False] * 8)
+    and_functions: list[bool] = Field(default_factory=lambda: [False] * 8)
     sa_function: bool = False
     ta_function: bool = False
 
 
-@dataclass
-class Xp20MsActionTable:
+class Xp20MsActionTable(MsActionTable):
     """XP20 Action Table for managing 8 input channels.
 
     Contains configuration for 8 input channels (input1 through input8),
@@ -43,11 +43,11 @@ class Xp20MsActionTable:
         input8: Configuration for input channel 8.
     """
 
-    input1: InputChannel = field(default_factory=InputChannel)
-    input2: InputChannel = field(default_factory=InputChannel)
-    input3: InputChannel = field(default_factory=InputChannel)
-    input4: InputChannel = field(default_factory=InputChannel)
-    input5: InputChannel = field(default_factory=InputChannel)
-    input6: InputChannel = field(default_factory=InputChannel)
-    input7: InputChannel = field(default_factory=InputChannel)
-    input8: InputChannel = field(default_factory=InputChannel)
+    input1: InputChannel = Field(default_factory=InputChannel)
+    input2: InputChannel = Field(default_factory=InputChannel)
+    input3: InputChannel = Field(default_factory=InputChannel)
+    input4: InputChannel = Field(default_factory=InputChannel)
+    input5: InputChannel = Field(default_factory=InputChannel)
+    input6: InputChannel = Field(default_factory=InputChannel)
+    input7: InputChannel = Field(default_factory=InputChannel)
+    input8: InputChannel = Field(default_factory=InputChannel)