conson-xp 1.9.0__tar.gz → 1.10.0__tar.gz

{conson_xp-1.9.0 → conson_xp-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.9.0
+Version: 1.10.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -276,6 +276,9 @@ xp conbus
 
 xp conbus actiontable
 xp conbus actiontable download
+xp conbus actiontable list
+xp conbus actiontable show
+xp conbus actiontable upload
 
 
 xp conbus autoreport

{conson_xp-1.9.0 → conson_xp-1.10.0}/README.md

@@ -225,6 +225,9 @@ xp conbus
 
 xp conbus actiontable
 xp conbus actiontable download
+xp conbus actiontable list
+xp conbus actiontable show
+xp conbus actiontable upload
 
 
 xp conbus autoreport

{conson_xp-1.9.0 → conson_xp-1.10.0}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.9.0"
+version = "1.10.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.9.0 → conson_xp-1.10.0}/src/xp/__init__.py

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

conson_xp-1.10.0/src/xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -0,0 +1,233 @@
+"""ActionTable CLI commands."""
+
+import json
+from contextlib import suppress
+from pathlib import Path
+from typing import Any
+
+import click
+from click import Context
+
+from xp.cli.commands.conbus.conbus import conbus_actiontable
+from xp.cli.utils.decorators import (
+    connection_command,
+)
+from xp.cli.utils.serial_number_type import SERIAL
+from xp.models.actiontable.actiontable import ActionTable
+from xp.models.homekit.homekit_conson_config import (
+    ConsonModuleConfig,
+    ConsonModuleListConfig,
+)
+from xp.services.conbus.actiontable.actiontable_download_service import (
+    ActionTableService,
+)
+from xp.services.conbus.actiontable.actiontable_list_service import (
+    ActionTableListService,
+)
+from xp.services.conbus.actiontable.actiontable_show_service import (
+    ActionTableShowService,
+)
+from xp.services.conbus.actiontable.actiontable_upload_service import (
+    ActionTableUploadService,
+)
+
+
+class ActionTableError(Exception):
+    """Raised when ActionTable operations fail."""
+
+    pass
+
+
+@conbus_actiontable.command("download", short_help="Download ActionTable")
+@click.argument("serial_number", type=SERIAL)
+@click.pass_context
+@connection_command()
+def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
+    """Download action table from XP module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+    """
+    service: ActionTableService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableService)
+    )
+
+    def progress_callback(progress: str) -> None:
+        """Handle progress updates during action table download.
+
+        Args:
+            progress: Progress message string.
+        """
+        click.echo(progress)
+
+    def on_finish(
+        _actiontable: ActionTable,
+        actiontable_dict: dict[str, Any],
+        actiontable_short: list[str],
+    ) -> None:
+        """Handle successful completion of action table download.
+
+        Args:
+            _actiontable: Downloaded action table object.
+            actiontable_dict: Dictionary representation of action table.
+            actiontable_short: List of textual format strings.
+        """
+        output = {
+            "serial_number": serial_number,
+            "actiontable_short": actiontable_short,
+            "actiontable": actiontable_dict,
+        }
+        click.echo(json.dumps(output, indent=2, default=str))
+
+    def error_callback(error: str) -> None:
+        """Handle errors during action table download.
+
+        Args:
+            error: Error message string.
+        """
+        click.echo(error)
+
+    with service:
+        service.start(
+            serial_number=serial_number,
+            progress_callback=progress_callback,
+            finish_callback=on_finish,
+            error_callback=error_callback,
+        )
+
+
+@conbus_actiontable.command("upload", short_help="Upload ActionTable")
+@click.argument("serial_number", type=SERIAL)
+@click.pass_context
+@connection_command()
+def conbus_upload_actiontable(ctx: Context, serial_number: str) -> None:
+    """Upload action table from conson.yml to XP module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+    """
+    service: ActionTableUploadService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableUploadService)
+    )
+
+    click.echo(f"Uploading action table to {serial_number}...")
+
+    # Track number of entries for success message
+    entries_count = 0
+
+    def progress_callback(progress: str) -> None:
+        """Handle progress updates during action table upload.
+
+        Args:
+            progress: Progress message string.
+        """
+        click.echo(progress, nl=False)
+
+    def success_callback() -> None:
+        """Handle successful completion of action table upload."""
+        click.echo("\nAction table uploaded successfully")
+        if entries_count > 0:
+            click.echo(f"{entries_count} entries written")
+
+    def error_callback(error: str) -> None:
+        """Handle errors during action table upload.
+
+        Args:
+            error: Error message string.
+
+        Raises:
+            ActionTableError: Always raised with upload failure message.
+        """
+        raise ActionTableError(f"Upload failed: {error}")
+
+    with service:
+        # Load config to get entry count for success message
+        config_path = Path.cwd() / "conson.yml"
+        if config_path.exists():
+            with suppress(Exception):
+                config = ConsonModuleListConfig.from_yaml(str(config_path))
+                module = config.find_module(serial_number)
+                if module and module.action_table:
+                    entries_count = len(module.action_table)
+
+        service.start(
+            serial_number=serial_number,
+            progress_callback=progress_callback,
+            success_callback=success_callback,
+            error_callback=error_callback,
+        )
+
+
+@conbus_actiontable.command("list", short_help="List modules with ActionTable")
+@click.pass_context
+def conbus_list_actiontable(ctx: Context) -> None:
+    """List all modules with action table configurations from conson.yml.
+
+    Args:
+        ctx: Click context object.
+    """
+    service: ActionTableListService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableListService)
+    )
+
+    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 error_callback(error: str) -> None:
+        """Handle errors during action table list.
+
+        Args:
+            error: Error message string.
+        """
+        click.echo(error)
+
+    with service:
+        service.start(
+            finish_callback=on_finish,
+            error_callback=error_callback,
+        )
+
+
+@conbus_actiontable.command("show", short_help="Show ActionTable configuration")
+@click.argument("serial_number", type=SERIAL)
+@click.pass_context
+def conbus_show_actiontable(ctx: Context, serial_number: str) -> None:
+    """Show action table configuration for a specific module from conson.yml.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+    """
+    service: ActionTableShowService = (
+        ctx.obj.get("container").get_container().resolve(ActionTableShowService)
+    )
+
+    def on_finish(module: ConsonModuleConfig) -> None:
+        """Handle successful completion of action table show.
+
+        Args:
+            module: Dictionary containing module configuration.
+        """
+        click.echo(json.dumps(module.model_dump(), 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.9.0 → conson_xp-1.10.0}/src/xp/models/actiontable/actiontable.py

@@ -27,7 +27,7 @@ class ActionTableEntry:
     link_number: int = 0
     module_input: int = 0
     module_output: int = 1
-    command: InputActionType = InputActionType.TURNOFF
+    command: InputActionType = InputActionType.OFF
     parameter: TimeParam = TimeParam.NONE
     inverted: bool = False
 

{conson_xp-1.9.0 → conson_xp-1.10.0}/src/xp/models/actiontable/msactiontable_xp24.py

@@ -23,7 +23,7 @@ class InputAction:
 class Xp24MsActionTable:
     """XP24 Action Table for managing input actions and settings.
 
-    Each input has an action type (TOGGLE, TURNON, LEVELSET, etc.)
+    Each input has an action type (TOGGLE, ON, LEVELSET, etc.)
     with an optional parameter string.
 
     Attributes:

{conson_xp-1.9.0 → conson_xp-1.10.0}/src/xp/models/telegram/input_action_type.py

@@ -8,8 +8,8 @@ class InputActionType(Enum):
 
     Attributes:
         VOID: No action.
-        TURNON: Turn on action.
-        TURNOFF: Turn off action.
+        ON: Turn on action.
+        OFF: Turn off action.
         TOGGLE: Toggle action.
         BLOCK: Block action.
         AUXRELAY: Auxiliary relay action.
@@ -39,8 +39,8 @@ class InputActionType(Enum):
     """
 
     VOID = 0
-    TURNON = 1
-    TURNOFF = 2
+    ON = 1
+    OFF = 2
     TOGGLE = 3
     BLOCK = 4
     AUXRELAY = 5

{conson_xp-1.9.0 → conson_xp-1.10.0}/src/xp/services/actiontable/actiontable_serializer.py

@@ -1,5 +1,7 @@
 """Serializer for ActionTable telegram encoding/decoding."""
 
+import re
+
 from xp.models import ModuleTypeCode
 from xp.models.actiontable.actiontable import ActionTable, ActionTableEntry
 from xp.models.telegram.input_action_type import InputActionType
@@ -18,7 +20,13 @@ from xp.utils.serialization import (
 
 
 class ActionTableSerializer:
-    """Handles serialization/deserialization of ActionTable to/from telegrams."""
+    """Handles serialization/deserialization of ActionTable to/from telegrams.
+
+    Attributes:
+        MAX_ENTRIES: Maximum number of entries in an ActionTable (96).
+    """
+
+    MAX_ENTRIES = 96  # ActionTable must always contain exactly 96 entries
 
     @staticmethod
     def from_data(data: bytes) -> ActionTable:
@@ -57,12 +65,12 @@ class ActionTableSerializer:
             try:
                 module_type = ModuleTypeCode(module_type_raw)
             except ValueError:
-                module_type = ModuleTypeCode.CP20  # Default fallback
+                module_type = ModuleTypeCode.NOMOD  # Default fallback
 
             try:
                 command = InputActionType(command_raw)
             except ValueError:
-                command = InputActionType.TURNOFF  # Default fallback
+                command = InputActionType.OFF  # Default fallback
 
             try:
                 parameter = TimeParam(parameter_raw)
@@ -91,7 +99,7 @@ class ActionTableSerializer:
             action_table: ActionTable to serialize
 
         Returns:
-            Raw byte data for telegram
+            Raw byte data for telegram (always 480 bytes for 96 entries)
         """
         data = bytearray()
 
@@ -112,6 +120,14 @@ class ActionTableSerializer:
                 [type_byte, link_byte, input_byte, output_command_byte, parameter_byte]
             )
 
+        # Pad to 96 entries with default NOMOD entries (00 00 00 00 00)
+        current_entries = len(action_table.entries)
+        if current_entries < ActionTableSerializer.MAX_ENTRIES:
+            # Default entry: NOMOD 0 0 > 0 OFF (all zeros)
+            padding_bytes = [0x00, 0x00, 0x00, 0x00, 0x00]
+            for _ in range(ActionTableSerializer.MAX_ENTRIES - current_entries):
+                data.extend(padding_bytes)
+
         return bytes(data)
 
     @staticmethod
@@ -176,3 +192,82 @@ class ActionTableSerializer:
             lines.append(line)
 
         return lines
+
+    @staticmethod
+    def parse_action_string(action_str: str) -> ActionTableEntry:
+        """Parse action table entry from string format.
+
+        Args:
+            action_str: String in format "CP20 0 0 > 1 OFF" or "CP20 0 1 > 1 ~ON"
+
+        Returns:
+            Parsed ActionTableEntry
+
+        Raises:
+            ValueError: If string format is invalid
+        """
+        # Remove trailing semicolon if present
+        action_str = action_str.strip().rstrip(";")
+
+        # Pattern: <Type> <Link> <Input> > <Output> <Command> [Parameter]
+        pattern = r"^(\w+)\s+(\d+)\s+(\d+)\s+>\s+(\d+)\s+(~?)(\w+)(?:\s+(\d+))?$"
+        match = re.match(pattern, action_str)
+
+        if not match:
+            raise ValueError(f"Invalid action table format: {action_str}")
+
+        (
+            module_type_str,
+            link_str,
+            input_str,
+            output_str,
+            inverted_str,
+            command_str,
+            parameter_str,
+        ) = match.groups()
+
+        # Parse module type
+        try:
+            module_type = ModuleTypeCode[module_type_str]
+        except KeyError:
+            raise ValueError(f"Invalid module type: {module_type_str}")
+
+        # Parse command
+        try:
+            command = InputActionType[command_str]
+        except KeyError:
+            raise ValueError(f"Invalid command: {command_str}")
+
+        # Parse parameter (default to NONE)
+        parameter = TimeParam.NONE
+        if parameter_str:
+            try:
+                parameter = TimeParam(int(parameter_str))
+            except ValueError:
+                raise ValueError(f"Invalid parameter: {parameter_str}")
+
+        return ActionTableEntry(
+            module_type=module_type,
+            link_number=int(link_str),
+            module_input=int(input_str),
+            module_output=int(output_str),
+            command=command,
+            parameter=parameter,
+            inverted=bool(inverted_str),
+        )
+
+    @staticmethod
+    def parse_action_table(action_strings: list[str]) -> ActionTable:
+        """Parse action table from list of string entries.
+
+        Args:
+            action_strings: List of action strings from conson.yml
+
+        Returns:
+            Parsed ActionTable
+        """
+        entries = [
+            ActionTableSerializer.parse_action_string(action_str)
+            for action_str in action_strings
+        ]
+        return ActionTable(entries=entries)

conson_xp-1.9.0/src/xp/services/conbus/actiontable/actiontable_service.py → conson_xp-1.10.0/src/xp/services/conbus/actiontable/actiontable_download_service.py

@@ -17,11 +17,10 @@ from xp.services.telegram.telegram_service import TelegramService
 
 
 class ActionTableService(ConbusProtocol):
-    """
-    TCP client service for sending telegrams to Conbus servers.
+    """TCP client service for downloading action tables from Conbus modules.
 
     Manages TCP socket connections, handles telegram generation and transmission,
-    and processes server responses.
+    and processes server responses for action table downloads.
     """
 
     def __init__(
@@ -31,7 +30,7 @@ class ActionTableService(ConbusProtocol):
         actiontable_serializer: ActionTableSerializer,
         telegram_service: TelegramService,
     ) -> None:
-        """Initialize the Conbus client send service.
+        """Initialize the action table download service.
 
         Args:
             cli_config: Conbus client configuration.

conson_xp-1.10.0/src/xp/services/conbus/actiontable/actiontable_list_service.py

@@ -0,0 +1,91 @@
+"""Service for listing modules with action table configurations from conson.yml."""
+
+import logging
+from pathlib import Path
+from typing import Any, Callable, Optional
+
+
+class ActionTableListService:
+    """Service for listing modules with action table configurations.
+
+    Reads conson.yml and returns a list of all modules that have action table
+    configurations defined.
+    """
+
+    def __init__(self) -> None:
+        """Initialize the action table list service."""
+        self.logger = logging.getLogger(__name__)
+        self.finish_callback: Optional[Callable[[dict[str, Any]], None]] = None
+        self.error_callback: Optional[Callable[[str], None]] = None
+
+    def __enter__(self) -> "ActionTableListService":
+        """Context manager entry.
+
+        Returns:
+            Self for context manager use.
+        """
+        return self
+
+    def __exit__(self, _exc_type: Any, _exc_val: Any, _exc_tb: Any) -> None:
+        """Context manager exit."""
+        pass
+
+    def start(
+        self,
+        finish_callback: Callable[[dict[str, Any]], None],
+        error_callback: Callable[[str], None],
+        config_path: Optional[Path] = None,
+    ) -> None:
+        """List all modules with action table configurations.
+
+        Args:
+            finish_callback: Callback to invoke with the module list.
+            error_callback: Callback to invoke on error.
+            config_path: Optional path to conson.yml. Defaults to current directory.
+        """
+        self.finish_callback = finish_callback
+        self.error_callback = error_callback
+
+        # Default to current directory if not specified
+        if config_path is None:
+            config_path = Path.cwd() / "conson.yml"
+
+        # Check if config file exists
+        if not config_path.exists():
+            self._handle_error("Error: conson.yml not found in current directory")
+            return
+
+        # Load configuration
+        try:
+            from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+
+            config = ConsonModuleListConfig.from_yaml(str(config_path))
+        except Exception as e:
+            self.logger.error(f"Failed to load conson.yml: {e}")
+            self._handle_error(f"Error: Failed to load conson.yml: {e}")
+            return
+
+        # Filter modules that have action_table configured
+        modules_with_actiontable = [
+            {
+                "serial_number": module.serial_number,
+                "module_type": module.module_type,
+            }
+            for module in config.root
+        ]
+
+        # Prepare result
+        result = {"modules": modules_with_actiontable}
+
+        # Invoke callback
+        if self.finish_callback is not None:
+            self.finish_callback(result)
+
+    def _handle_error(self, message: str) -> None:
+        """Handle error and invoke error callback.
+
+        Args:
+            message: Error message.
+        """
+        if self.error_callback is not None:
+            self.error_callback(message)

conson_xp-1.10.0/src/xp/services/conbus/actiontable/actiontable_show_service.py

@@ -0,0 +1,89 @@
+"""Service for showing action table configuration for a specific module."""
+
+import logging
+from pathlib import Path
+from typing import Any, Callable, Optional
+
+from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
+
+
+class ActionTableShowService:
+    """Service for showing action table configuration for a specific module.
+
+    Reads conson.yml and returns the action table configuration for the specified
+    module serial number.
+    """
+
+    def __init__(self) -> None:
+        """Initialize the action table show service."""
+        self.logger = logging.getLogger(__name__)
+        self.finish_callback: Optional[Callable[[ConsonModuleConfig], None]] = None
+        self.error_callback: Optional[Callable[[str], None]] = None
+
+    def __enter__(self) -> "ActionTableShowService":
+        """Context manager entry.
+
+        Returns:
+            Self for context manager use.
+        """
+        return self
+
+    def __exit__(self, _exc_type: Any, _exc_val: Any, _exc_tb: Any) -> None:
+        """Context manager exit."""
+        pass
+
+    def start(
+        self,
+        serial_number: str,
+        finish_callback: Callable[[ConsonModuleConfig], None],
+        error_callback: Callable[[str], None],
+        config_path: Optional[Path] = None,
+    ) -> None:
+        """Show action table configuration for a specific module.
+
+        Args:
+            serial_number: Module serial number.
+            finish_callback: Callback to invoke with the module configuration.
+            error_callback: Callback to invoke on error.
+            config_path: Optional path to conson.yml. Defaults to current directory.
+        """
+        self.finish_callback = finish_callback
+        self.error_callback = error_callback
+
+        # Default to current directory if not specified
+        if config_path is None:
+            config_path = Path.cwd() / "conson.yml"
+
+        # Check if config file exists
+        if not config_path.exists():
+            self._handle_error("Error: conson.yml not found in current directory")
+            return
+
+        # Load configuration
+        try:
+            from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+
+            config = ConsonModuleListConfig.from_yaml(str(config_path))
+        except Exception as e:
+            self.logger.error(f"Failed to load conson.yml: {e}")
+            self._handle_error(f"Error: Failed to load conson.yml: {e}")
+            return
+
+        # Find module
+        module = config.find_module(serial_number)
+        if not module:
+            self._handle_error(f"Error: Module {serial_number} not found in conson.yml")
+            return
+
+        # Invoke callback
+        if self.finish_callback is not None:
+            self.finish_callback(module)
+
+    def _handle_error(self, message: str) -> None:
+        """Handle error and invoke error callback.
+
+        Args:
+            message: Error message.
+        """
+        if self.error_callback is not None:
+            self.error_callback(message)