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

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

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

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

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

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

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

{conson_xp-1.7.0 → conson_xp-1.9.0}/src/xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -1,7 +1,7 @@
 """ActionTable CLI commands."""
 
 import json
-from dataclasses import asdict
+from typing import Any
 
 import click
 from click import Context
@@ -40,15 +40,22 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         """
         click.echo(progress)
 
-    def on_finish(actiontable: ActionTable) -> None:
+    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: Downloaded action table object.
+            actiontable_dict: Dictionary representation of action table.
+            actiontable_short: List of textual format strings.
         """
         output = {
             "serial_number": serial_number,
-            "actiontable": asdict(actiontable),
+            "actiontable_short": actiontable_short,
+            "actiontable": actiontable_dict,
         }
         click.echo(json.dumps(output, indent=2, default=str))
 

{conson_xp-1.7.0 → conson_xp-1.9.0}/src/xp/models/homekit/homekit_conson_config.py

@@ -22,6 +22,8 @@ class ConsonModuleConfig(BaseModel):
         conbus_port: Optional Conbus port number.
         sw_version: Optional software version.
         hw_version: Optional hardware version.
+        action_table: Optional action table configuration.
+        auto_report_status: Optional auto report status.
     """
 
     name: str
@@ -35,6 +37,8 @@ class ConsonModuleConfig(BaseModel):
     conbus_port: Optional[int] = None
     sw_version: Optional[str] = None
     hw_version: Optional[str] = None
+    action_table: Optional[List[str]] = None
+    auto_report_status: Optional[str] = None
 
 
 class ConsonModuleListConfig(BaseModel):
@@ -66,3 +70,17 @@ class ConsonModuleListConfig(BaseModel):
         with Path(file_path).open("r") as file:
             data = yaml.safe_load(file)
         return cls(root=data)
+
+    def find_module(self, serial_number: str) -> Optional[ConsonModuleConfig]:
+        """Find a module by serial number.
+
+        Args:
+            serial_number: Module serial number to search for.
+
+        Returns:
+            ConsonModuleConfig if found, None otherwise.
+        """
+        for module in self.root:
+            if module.serial_number == serial_number:
+                return module
+        return None

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

@@ -1,9 +1,9 @@
 """Input action types for XP24 module based on Feature-Action-Table.md."""
 
-from enum import IntEnum
+from enum import Enum
 
 
-class InputActionType(IntEnum):
+class InputActionType(Enum):
     """Input action types for XP24 module (based on Feature-Action-Table.md).
 
     Attributes:

{conson_xp-1.7.0 → conson_xp-1.9.0}/src/xp/models/telegram/system_function.py

@@ -15,35 +15,65 @@ class SystemFunction(str, Enum):
         WRITE_CONFIG: Write configuration.
         BLINK: Blink LED function.
         UNBLINK: Unblink LED function.
-        DOWNLOAD_MSACTIONTABLE: Download module specific action table.
+        UPLOAD_FIRMWARE_START: Start upload firmware.
+        UPLOAD_FIRMWARE_STOP: Stop upload firmware.
+        UPLOAD_FIRMWARE: Upload firmware.
+        UPLOAD_ACTIONTABLE: Upload ActionTable to module.
         DOWNLOAD_ACTIONTABLE: Download ActionTable.
+        UPLOAD_MSACTIONTABLE: Upload module specific action table to module.
+        DOWNLOAD_MSACTIONTABLE: Download module specific action table.
+        TELEGRAM_WRITE_START: Start writing telegram.
+        TELEGRAM_READ_START: Start reading telegram.
         EOF: End of msactiontable response.
+        TELEGRAM: Module specific telegram response.
         MSACTIONTABLE: Module specific action table response.
         ACTIONTABLE: Module specific action table response.
         ACK: Acknowledge response.
         NAK: Not acknowledge response.
+        UPLOAD_TOP_FIRMWARE_START: Start upload firmware (TOP).
+        UPLOAD_TOP_FIRMWARE_STOP: Stop upload firmware (TOP).
+        UPLOAD_TOP_FIRMWARE: Upload firmware (TOP).
+        ROTATE_ENABLE: Enable rotate.
+        ROTATE_DISABLE: Disable rotate.
         UNKNOWN_26: Used after discover, unknown purpose.
         ACTION: Action function.
     """
 
-    NONE = "00"  # Undefined
-    DISCOVERY = "01"  # Discover function
-    READ_DATAPOINT = "02"  # Read datapoint
-    READ_CONFIG = "03"  # Read configuration
-    WRITE_CONFIG = "04"  # Write configuration
-    BLINK = "05"  # Blink LED function
-    UNBLINK = "06"  # Unblink LED function
-    DOWNLOAD_MSACTIONTABLE = (
-        "13"  # Download the module specific action table (MsActionTable)
-    )
-    DOWNLOAD_ACTIONTABLE = "11D"  # Download ActionTable
-    EOF = "16"  # End of msactiontable response
-    MSACTIONTABLE = "17"  # module specific action table (MsActionTable) response
-    ACTIONTABLE = "17"  # module specific action table (MsActionTable) response
-    ACK = "18"  # Acknowledge response
-    NAK = "19"  # Not acknowledge response
-    UNKNOWN_26 = "26"  # Used after discover, but don't know what it is
-    ACTION = "27"  # Action function
+    NONE = "00"  # F00D Undefined
+    DISCOVERY = "01"  # F01D Discover function
+    READ_DATAPOINT = "02"  # F02D Read datapoint
+    READ_CONFIG = "03"  # F03D Read configuration
+    WRITE_CONFIG = "04"  # F04D Write configuration
+    BLINK = "05"  # F05D Blink LED function
+    UNBLINK = "06"  # F06D Unblink LED function
+
+    UPLOAD_FIRMWARE_START = "07"  # F07D Start Upload firmware
+    UPLOAD_FIRMWARE_STOP = "08"  # F08D Stop Upload firmware
+    UPLOAD_FIRMWARE = "09"  # F09D Upload firmware
+
+    UPLOAD_ACTIONTABLE = "10"  # F10D Upload ActionTable
+    DOWNLOAD_ACTIONTABLE = "11"  # F11D Download ActionTable
+    UPLOAD_MSACTIONTABLE = "12"  # F12D Upload MsActionTable to module
+    DOWNLOAD_MSACTIONTABLE = "13"  # F13D Download MsActionTable
+
+    TELEGRAM_WRITE_START = "14"  # F14D Start writing telegram
+    TELEGRAM_READ_START = "15"  # F15D Start reading telegram
+    EOF = "16"  # F16D End of msactiontable response
+    TELEGRAM = "17"  # F17D module specific Telegram response
+    MSACTIONTABLE = "17"  # F17D module specific ms action table (Telegram) response
+    ACTIONTABLE = "17"  # F17D module specific action table (Telegram) response
+    ACK = "18"  # F18D Acknowledge / continue response
+    NAK = "19"  # F19D Not acknowledge response
+
+    UPLOAD_TOP_FIRMWARE_START = "20"  # F20D Start Upload firmware (TOP)
+    UPLOAD_TOP_FIRMWARE_STOP = "21"  # F21D Stop Upload firmware (TOP)
+    UPLOAD_TOP_FIRMWARE = "22"  # F22D Upload firmware (TOP)
+
+    ROTATE_ENABLE = "23"  # F23D Enable rotate
+    ROTATE_DISABLE = "24"  # F24D Disable rotate
+
+    UNKNOWN_26 = "26"  # F26D Used after discover, but don't know what it is
+    ACTION = "27"  # F27D Action function
 
     def get_description(self) -> str:
         """Get the description of the SystemFunction.

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

@@ -141,29 +141,38 @@ class ActionTableSerializer:
         return ActionTableSerializer.from_data(data)
 
     @staticmethod
-    def format_decoded_output(action_table: ActionTable) -> str:
+    def format_decoded_output(action_table: ActionTable) -> list[str]:
         """Format ActionTable as human-readable decoded output.
 
         Args:
             action_table: ActionTable to format
 
         Returns:
-            Human-readable string representation
+            List of human-readable string representations
         """
         lines = []
         for entry in action_table.entries:
-            # Format: CP20 0 0 > 1 OFF;
+            # Format: CP20 0 0 > 1 OFF [param];
             module_type = entry.module_type.name
             link = entry.link_number
             input_num = entry.module_input
             output = entry.module_output
             command = entry.command.name
 
-            # Add prefix for special commands
+            # Add prefix for inverted commands
             if entry.inverted:
                 command = f"~{command}"
 
-            line = f"{module_type} {link} {input_num} > {output} {command};"
+            # Build base line
+            line = f"{module_type} {link} {input_num} > {output} {command}"
+
+            # Add parameter if present and non-zero
+            if entry.parameter is not None and entry.parameter.value != 0:
+                line += f" {entry.parameter.value}"
+
+            # Add semicolon terminator
+            line += ";"
+
             lines.append(line)
 
-        return "\n".join(lines)
+        return lines

{conson_xp-1.7.0 → conson_xp-1.9.0}/src/xp/services/conbus/actiontable/actiontable_service.py

@@ -1,7 +1,8 @@
 """Service for downloading ActionTable via Conbus protocol."""
 
 import logging
-from typing import Callable, Optional
+from dataclasses import asdict
+from typing import Any, Callable, Dict, Optional
 
 from twisted.internet.posixbase import PosixReactorBase
 
@@ -44,14 +45,19 @@ class ActionTableService(ConbusProtocol):
         self.serial_number: str = ""
         self.progress_callback: Optional[Callable[[str], None]] = None
         self.error_callback: Optional[Callable[[str], None]] = None
-        self.finish_callback: Optional[Callable[[ActionTable], None]] = None
+        self.finish_callback: Optional[
+            Callable[[ActionTable, Dict[str, Any], list[str]], None]
+        ] = None
+
         self.actiontable_data: list[str] = []
         # Set up logging
         self.logger = logging.getLogger(__name__)
 
     def connection_established(self) -> None:
         """Handle connection established event."""
-        self.logger.debug("Connection established, sending discover telegram")
+        self.logger.debug(
+            "Connection established, sending download actiontable telegram"
+        )
         self.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number=self.serial_number,
@@ -82,7 +88,9 @@ class ActionTableService(ConbusProtocol):
             self.logger.debug("Not a reply response")
             return
 
-        reply_telegram = self.telegram_service.parse_reply_telegram(telegram_received)
+        reply_telegram = self.telegram_service.parse_reply_telegram(
+            telegram_received.frame
+        )
         if reply_telegram.system_function not in (
             SystemFunction.ACTIONTABLE,
             SystemFunction.EOF,
@@ -109,8 +117,10 @@ class ActionTableService(ConbusProtocol):
             all_data = "".join(self.actiontable_data)
             # Deserialize from received data
             actiontable = self.serializer.from_encoded_string(all_data)
+            actiontable_dict = asdict(actiontable)
+            actiontable_short = self.serializer.format_decoded_output(actiontable)
             if self.finish_callback:
-                self.finish_callback(actiontable)
+                self.finish_callback(actiontable, actiontable_dict, actiontable_short)
 
     def failed(self, message: str) -> None:
         """Handle failed connection event.
@@ -127,7 +137,7 @@ class ActionTableService(ConbusProtocol):
         serial_number: str,
         progress_callback: Callable[[str], None],
         error_callback: Callable[[str], None],
-        finish_callback: Callable[[ActionTable], None],
+        finish_callback: Callable[[ActionTable, Dict[str, Any], list[str]], None],
         timeout_seconds: Optional[float] = None,
     ) -> None:
         """Run reactor in dedicated thread with its own event loop.

{conson_xp-1.7.0 → conson_xp-1.9.0}/src/xp/services/conbus/actiontable/msactiontable_service.py

@@ -84,7 +84,9 @@ class MsActionTableService(ConbusProtocol):
 
     def connection_established(self) -> None:
         """Handle connection established event."""
-        self.logger.debug("Connection established, sending discover telegram")
+        self.logger.debug(
+            "Connection established, sending download msactiontable telegram"
+        )
         self.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number=self.serial_number,

{conson_xp-1.7.0 → conson_xp-1.9.0}/tests/integration/test_actiontable_integration.py

@@ -1,5 +1,6 @@
 """Integration tests for ActionTable functionality."""
 
+from dataclasses import asdict
 from unittest.mock import Mock
 
 import pytest
@@ -12,9 +13,7 @@ from xp.models import ModuleTypeCode
 from xp.models.actiontable.actiontable import ActionTable, ActionTableEntry
 from xp.models.telegram.input_action_type import InputActionType
 from xp.models.telegram.timeparam_type import TimeParam
-from xp.services.conbus.actiontable.actiontable_service import (
-    ActionTableSerializer,
-)
+from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
 
 
 class TestActionTableIntegration:
@@ -89,7 +88,7 @@ class TestActionTableIntegration:
         # Test decoded output format
         decoded = serializer.format_decoded_output(sample_actiontable)
         expected_lines = ["CP20 0 0 > 1 TURNOFF;", "CP20 0 1 > 2 ~TURNON;"]
-        assert decoded == "\n".join(expected_lines)
+        assert decoded == expected_lines
 
         # Test encoded output format
         encoded = serializer.to_encoded_string(sample_actiontable)
@@ -115,7 +114,12 @@ class TestActionTableIntegration:
                 finish_callback: Callback when finished.
                 error_callback: Callback for errors.
             """
-            finish_callback(sample_actiontable)
+            # Generate dict and short format like the service does
+            actiontable_dict = asdict(sample_actiontable)
+            actiontable_short = ActionTableSerializer.format_decoded_output(
+                sample_actiontable
+            )
+            finish_callback(sample_actiontable, actiontable_dict, actiontable_short)
 
         mock_service.start.side_effect = mock_start
 

{conson_xp-1.7.0 → conson_xp-1.9.0}/tests/integration/test_xp24_action_table_integration.py

@@ -92,9 +92,9 @@ class TestXp24ActionTableIntegration:
 
         # Verify action table structure
         action_table = output["action_table"]
-        assert action_table["input1_action"]["type"] == InputActionType.TOGGLE.value
+        assert action_table["input1_action"]["type"] == str(InputActionType.TOGGLE)
         assert action_table["input1_action"]["param"] == TimeParam.NONE.value
-        assert action_table["input2_action"]["type"] == InputActionType.TURNON.value
+        assert action_table["input2_action"]["type"] == str(InputActionType.TURNON)
         assert action_table["input2_action"]["param"] == TimeParam.T5SEC.value
         assert action_table["mutex34"] is True
         assert action_table["curtain34"] is True

{conson_xp-1.7.0 → conson_xp-1.9.0}/tests/unit/test_cli/test_conbus_actiontable_commands.py

@@ -1,5 +1,6 @@
 """Unit tests for conbus actiontable CLI commands."""
 
+from dataclasses import asdict
 from unittest.mock import Mock
 
 import pytest
@@ -12,6 +13,7 @@ from xp.models import ModuleTypeCode
 from xp.models.actiontable.actiontable import ActionTable, ActionTableEntry
 from xp.models.telegram.input_action_type import InputActionType
 from xp.models.telegram.timeparam_type import TimeParam
+from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
 
 
 class TestConbusActionTableCommands:
@@ -67,7 +69,12 @@ class TestConbusActionTableCommands:
                 error_callback(error)
             else:
                 if actiontable:
-                    finish_callback(actiontable)
+                    # Generate dict and short format like the service does
+                    actiontable_dict = asdict(actiontable)
+                    actiontable_short = ActionTableSerializer.format_decoded_output(
+                        actiontable
+                    )
+                    finish_callback(actiontable, actiontable_dict, actiontable_short)
 
         mock_service.start.side_effect = mock_start
         return mock_service
@@ -227,3 +234,154 @@ class TestConbusActionTableCommands:
         assert "0000012345" in result.output
         assert "actiontable" in result.output
         assert "entries" in result.output
+
+    def test_download_actiontable_includes_short_format(
+        self, runner, sample_actiontable
+    ):
+        """Test that actiontable download includes actiontable_short field."""
+        # Setup mock service
+        mock_service = self._create_mock_service(actiontable=sample_actiontable)
+
+        # Setup mock container to resolve ActionTableService
+        mock_container = Mock()
+        mock_container.resolve.return_value = mock_service
+        mock_service_container = Mock()
+        mock_service_container.get_container.return_value = mock_container
+
+        # Execute command
+        result = runner.invoke(
+            conbus_download_actiontable,
+            ["012345"],
+            obj={"container": mock_service_container},
+        )
+
+        # Verify success
+        assert result.exit_code == 0
+
+        # Verify actiontable_short field exists
+        assert "actiontable_short" in result.output
+
+    def test_download_actiontable_short_format_correct(
+        self, runner, sample_actiontable
+    ):
+        """Test that actiontable_short field contains correctly formatted entries."""
+        # Setup mock service
+        mock_service = self._create_mock_service(actiontable=sample_actiontable)
+
+        # Setup mock container to resolve ActionTableService
+        mock_container = Mock()
+        mock_container.resolve.return_value = mock_service
+        mock_service_container = Mock()
+        mock_service_container.get_container.return_value = mock_container
+
+        # Execute command
+        result = runner.invoke(
+            conbus_download_actiontable,
+            ["012345"],
+            obj={"container": mock_service_container},
+        )
+
+        # Verify success
+        assert result.exit_code == 0
+
+        # Verify short format is present with semicolons
+        assert "CP20 0 0 > 1 TURNOFF;" in result.output
+
+    def test_download_actiontable_backward_compatible(self, runner, sample_actiontable):
+        """Test that JSON actiontable field is still present for backward compatibility."""
+        # Setup mock service
+        mock_service = self._create_mock_service(actiontable=sample_actiontable)
+
+        # Setup mock container to resolve ActionTableService
+        mock_container = Mock()
+        mock_container.resolve.return_value = mock_service
+        mock_service_container = Mock()
+        mock_service_container.get_container.return_value = mock_container
+
+        # Execute command
+        result = runner.invoke(
+            conbus_download_actiontable,
+            ["012345"],
+            obj={"container": mock_service_container},
+        )
+
+        # Verify success
+        assert result.exit_code == 0
+
+        # Verify both formats are present
+        assert "actiontable_short" in result.output
+        assert "actiontable" in result.output
+        assert "entries" in result.output
+
+    def test_download_actiontable_short_with_parameter(self, runner):
+        """Test actiontable_short displays parameter when non-zero."""
+        # Create actiontable with parameter
+        entry = ActionTableEntry(
+            module_type=ModuleTypeCode.CP20,
+            link_number=0,
+            module_input=2,
+            module_output=1,
+            inverted=False,
+            command=InputActionType.TURNON,
+            parameter=TimeParam.T1SEC,  # value = 2
+        )
+        actiontable = ActionTable(entries=[entry])
+
+        # Setup mock service
+        mock_service = self._create_mock_service(actiontable=actiontable)
+
+        # Setup mock container to resolve ActionTableService
+        mock_container = Mock()
+        mock_container.resolve.return_value = mock_service
+        mock_service_container = Mock()
+        mock_service_container.get_container.return_value = mock_container
+
+        # Execute command
+        result = runner.invoke(
+            conbus_download_actiontable,
+            ["012345"],
+            obj={"container": mock_service_container},
+        )
+
+        # Verify success
+        assert result.exit_code == 0
+
+        # Verify parameter is included in output
+        assert "CP20 0 2 > 1 TURNON 2;" in result.output
+
+    def test_download_actiontable_short_inverted(self, runner):
+        """Test actiontable_short displays inverted commands with ~ prefix."""
+        # Create actiontable with inverted command
+        entry = ActionTableEntry(
+            module_type=ModuleTypeCode.CP20,
+            link_number=0,
+            module_input=1,
+            module_output=1,
+            inverted=True,
+            command=InputActionType.TURNON,
+            parameter=TimeParam.NONE,
+        )
+        actiontable = ActionTable(entries=[entry])
+
+        # Setup mock service
+        mock_service = self._create_mock_service(actiontable=actiontable)
+
+        # Setup mock container to resolve ActionTableService
+        mock_container = Mock()
+        mock_container.resolve.return_value = mock_service
+        mock_service_container = Mock()
+        mock_service_container.get_container.return_value = mock_container
+
+        # Execute command
+        result = runner.invoke(
+            conbus_download_actiontable,
+            ["012345"],
+            obj={"container": mock_service_container},
+        )
+
+        # Verify success
+        assert result.exit_code == 0
+
+        # Verify inverted prefix is present
+        assert "~TURNON" in result.output
+        assert "CP20 0 1 > 1 ~TURNON;" in result.output