conson-xp 1.11.0__tar.gz → 1.15.0__tar.gz

{conson_xp-1.11.0 → conson_xp-1.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.11.0
+Version: 1.15.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -316,6 +316,11 @@ xp conbus linknumber get
 xp conbus linknumber set
 
 
+xp conbus modulenumber
+xp conbus modulenumber get
+xp conbus modulenumber set
+
+
 xp conbus msactiontable
 xp conbus msactiontable download
 

{conson_xp-1.11.0 → conson_xp-1.15.0}/README.md

@@ -265,6 +265,11 @@ xp conbus linknumber get
 xp conbus linknumber set
 
 
+xp conbus modulenumber
+xp conbus modulenumber get
+xp conbus modulenumber set
+
+
 xp conbus msactiontable
 xp conbus msactiontable download
 

{conson_xp-1.11.0 → conson_xp-1.15.0}/pyproject.toml

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

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/__init__.py

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

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/cli/commands/__init__.py

@@ -10,6 +10,7 @@ from xp.cli.commands.conbus.conbus import (
     conbus_datapoint,
     conbus_lightlevel,
     conbus_linknumber,
+    conbus_modulenumber,
     conbus_msactiontable,
     conbus_output,
 )
@@ -46,6 +47,10 @@ from xp.cli.commands.conbus.conbus_linknumber_commands import (
     get_linknumber_command,
     set_linknumber_command,
 )
+from xp.cli.commands.conbus.conbus_modulenumber_commands import (
+    get_modulenumber_command,
+    set_modulenumber_command,
+)
 from xp.cli.commands.conbus.conbus_msactiontable_commands import (
     conbus_download_msactiontable,
 )
@@ -87,6 +92,7 @@ __all__ = [
     "conbus_output",
     "conbus_datapoint",
     "conbus_linknumber",
+    "conbus_modulenumber",
     "conbus_autoreport",
     "conbus_lightlevel",
     "conbus_msactiontable",
@@ -123,6 +129,8 @@ __all__ = [
     "receive_telegrams",
     "set_linknumber_command",
     "get_linknumber_command",
+    "set_modulenumber_command",
+    "get_modulenumber_command",
     "get_autoreport_command",
     "set_autoreport_command",
     "xp_lightlevel_set",

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/cli/commands/conbus/conbus.py

@@ -57,6 +57,18 @@ def conbus_linknumber() -> None:
     pass
 
 
+@click.group(
+    "modulenumber",
+    cls=HelpColorsGroup,
+    help_headers_color="yellow",
+    help_options_color="green",
+    short_help="Module number operations",
+)
+def conbus_modulenumber() -> None:
+    """Set or get the module number for specific modules."""
+    pass
+
+
 @click.group(
     "autoreport",
     cls=HelpColorsGroup,
@@ -109,6 +121,7 @@ conbus.add_command(conbus_blink)
 conbus.add_command(conbus_output)
 conbus.add_command(conbus_datapoint)
 conbus.add_command(conbus_linknumber)
+conbus.add_command(conbus_modulenumber)
 conbus.add_command(conbus_autoreport)
 conbus.add_command(conbus_lightlevel)
 conbus.add_command(conbus_msactiontable)

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -49,7 +49,7 @@ def set_linknumber_command(
         ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
-    data_value = f"{link_number: 02d}"
+    data_value = f"{link_number:02d}"
     with service:
         service.write_config(
             serial_number=serial_number,

conson_xp-1.15.0/src/xp/cli/commands/conbus/conbus_modulenumber_commands.py

@@ -0,0 +1,104 @@
+"""Conbus module number CLI commands."""
+
+import json
+
+import click
+
+from xp.cli.commands.conbus.conbus import conbus_modulenumber
+from xp.cli.utils.decorators import (
+    connection_command,
+)
+from xp.cli.utils.serial_number_type import SERIAL
+from xp.models import ConbusDatapointResponse
+from xp.models.conbus.conbus_writeconfig import ConbusWriteConfigResponse
+from xp.models.telegram.datapoint_type import DataPointType
+from xp.services.conbus.conbus_datapoint_service import ConbusDatapointService
+from xp.services.conbus.write_config_service import WriteConfigService
+from xp.services.telegram.telegram_datapoint_service import TelegramDatapointService
+
+
+@conbus_modulenumber.command("set", short_help="Set module number for a module")
+@click.argument("serial_number", type=SERIAL)
+@click.argument("module_number", type=click.IntRange(0, 99))
+@click.pass_context
+@connection_command()
+def set_modulenumber_command(
+    ctx: click.Context, serial_number: str, module_number: int
+) -> None:
+    r"""Set the module number for a specific module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        module_number: Module number to set (0-99).
+
+    Examples:
+        \b
+        xp conbus modulenumber set 0123450001 25
+    """
+
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
+        """Handle successful completion of light level on command.
+
+        Args:
+            response: Light level response object.
+        """
+        click.echo(json.dumps(response.to_dict(), indent=2))
+
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
+    )
+
+    data_value = f"{module_number:02d}"
+    with service:
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_NUMBER,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
+
+
+@conbus_modulenumber.command("get", short_help="Get module number for a module")
+@click.argument("serial_number", type=SERIAL)
+@click.pass_context
+@connection_command()
+def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
+    r"""Get the current module number for a specific module.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+
+    Examples:
+        \b
+        xp conbus modulenumber get 0123450001
+    """
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
+    )
+
+    def on_finish(service_response: ConbusDatapointResponse) -> None:
+        """Handle successful completion of module number get command.
+
+        Args:
+            service_response: Module number response object.
+        """
+        modulenumber_value = telegram_service.get_modulenumber(
+            service_response.data_value
+        )
+        result = service_response.to_dict()
+        result["modulenumber_value"] = modulenumber_value
+        click.echo(json.dumps(result, indent=2))
+
+    with service:
+        service.query_datapoint(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_NUMBER,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/models/homekit/homekit_config.py

@@ -55,6 +55,8 @@ class HomekitAccessoryConfig(BaseModel):
         output_number: Output number for the accessory.
         description: Description of the accessory.
         service: Service type for the accessory.
+        on_action: on code for the accessory.
+        off_action: off code for the accessory.
         hap_accessory: Optional HAP accessory identifier.
     """
 
@@ -64,6 +66,8 @@ class HomekitAccessoryConfig(BaseModel):
     output_number: int
     description: str
     service: str
+    on_action: str
+    off_action: str
     hap_accessory: Optional[int] = None
 
 

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/models/protocol/conbus_protocol.py

@@ -61,11 +61,15 @@ class SendActionEvent(BaseEvent):
         serial_number: Serial number of the light bulb set.
         output_number: Output number of the light bulb set.
         value: Set light bulb On or Off (True/False).
+        on_action: On action E00L00I00.
+        off_action: On action E00L00I04.
     """
 
     serial_number: str = Field(description="Serial number of the light bulb set")
     output_number: int = Field(description="Output number of the light bulb set")
     value: bool = Field(description="Set light bulb On or Off (True/False)")
+    on_action: str = Field(description="on action")
+    off_action: str = Field(description="off action")
 
 
 class DatapointEvent(BaseEvent):

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/services/conbus/write_config_service.py

@@ -165,6 +165,7 @@ class WriteConfigService(ConbusProtocol):
         self.write_config_response.data_value = self.data_value
         if self.write_config_finished_callback:
             self.write_config_finished_callback(self.write_config_response)
+        self._stop_reactor()
 
     def write_config(
         self,

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/services/homekit/homekit_conbus_service.py

@@ -12,7 +12,6 @@ from xp.models.protocol.conbus_protocol import (
     SendActionEvent,
     SendWriteConfigEvent,
 )
-from xp.models.telegram.action_type import ActionType
 from xp.models.telegram.datapoint_type import DataPointType
 from xp.models.telegram.system_function import SystemFunction
 from xp.services.protocol.telegram_protocol import TelegramProtocol
@@ -87,11 +86,8 @@ class HomeKitConbusService:
         """
         self.logger.debug(f"send_action_event {event}")
 
-        action_value = (
-            ActionType.ON_RELEASE.value if event.value else ActionType.OFF_PRESS.value
-        )
-        input_action = f"{event.output_number:02d}{action_value}"
-        telegram = (
-            f"S{event.serial_number}F{SystemFunction.ACTION.value}D{input_action}"
-        )
-        self.telegram_protocol.sendFrame(telegram.encode())
+        telegram = event.on_action if event.value else event.off_action
+        telegram_make = f"{telegram}M"
+        telegram_break = f"{telegram}B"
+        self.telegram_protocol.sendFrame(telegram_make.encode())
+        self.telegram_protocol.sendFrame(telegram_break.encode())

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/services/homekit/homekit_lightbulb_service.py

@@ -77,6 +77,8 @@ class HomeKitLightbulbService:
             serial_number=event.serial_number,
             output_number=event.output_number,
             value=event.value,
+            on_action=event.accessory.on_action,
+            off_action=event.accessory.off_action,
         )
 
         self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/services/homekit/homekit_outlet_service.py

@@ -85,6 +85,8 @@ class HomeKitOutletService:
             serial_number=event.serial_number,
             output_number=event.output_number,
             value=event.value,
+            on_action=event.accessory.on_action,
+            off_action=event.accessory.off_action,
         )
 
         self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/services/telegram/telegram_datapoint_service.py

@@ -68,3 +68,15 @@ class TelegramDatapointService:
         """
         link_number_value = int(data_value)
         return link_number_value
+
+    def get_modulenumber(self, data_value: str) -> int:
+        """Parse and return the module number value.
+
+        Args:
+            data_value: The raw module number data value as a string.
+
+        Returns:
+            The module number as an integer.
+        """
+        module_number_value = int(data_value)
+        return module_number_value

{conson_xp-1.11.0 → conson_xp-1.15.0}/src/xp/utils/dependencies.py

@@ -64,6 +64,7 @@ from xp.services.reverse_proxy_service import ReverseProxyService
 from xp.services.server.device_service_factory import DeviceServiceFactory
 from xp.services.server.server_service import ServerService
 from xp.services.telegram.telegram_blink_service import TelegramBlinkService
+from xp.services.telegram.telegram_datapoint_service import TelegramDatapointService
 from xp.services.telegram.telegram_discover_service import TelegramDiscoverService
 from xp.services.telegram.telegram_link_number_service import LinkNumberService
 from xp.services.telegram.telegram_output_service import TelegramOutputService
@@ -128,6 +129,7 @@ class ServiceContainer:
         )
         self.container.register(TelegramDiscoverService, scope=punq.Scope.singleton)
         self.container.register(TelegramBlinkService, scope=punq.Scope.singleton)
+        self.container.register(TelegramDatapointService, scope=punq.Scope.singleton)
         self.container.register(LinkNumberService, scope=punq.Scope.singleton)
 
         # Conbus services layer

{conson_xp-1.11.0 → conson_xp-1.15.0}/tests/integration/test_homekit_config_integration.py

@@ -102,6 +102,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 1,
                     "description": "Main Living Room Light",
                     "service": "lightbulb",
+                    "on_action": "E00L01I01",
+                    "off_action": "E00L01I05",
                 },
                 {
                     "name": "side_lamp",
@@ -110,6 +112,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 2,
                     "description": "Side Lamp",
                     "service": "lightbulb",
+                    "on_action": "E00L01I02",
+                    "off_action": "E00L01I06",
                 },
                 {
                     "name": "kitchen_light",
@@ -118,6 +122,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 1,
                     "description": "Kitchen Light",
                     "service": "lightbulb",
+                    "on_action": "E00L02I01",
+                    "off_action": "E00L02I05",
                 },
             ],
         }
@@ -194,6 +200,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 0,  # Invalid output
                     "description": "Main Light",
                     "service": "invalid_service",  # Invalid service
+                    "on_action": "E00L01I01",
+                    "off_action": "E00L01I05",
                 },
                 {
                     "name": "main_light",  # Duplicate accessory name
@@ -202,6 +210,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 50,  # Output exceeds module capability
                     "description": "Duplicate Light",
                     "service": "lightbulb",
+                    "on_action": "E00L01I02",
+                    "off_action": "E00L01I06",
                 },
                 {
                     "name": "orphaned_light",  # Not assigned to any room
@@ -210,6 +220,8 @@ class TestHomekitConfigIntegration:
                     "output_number": 3,
                     "description": "Orphaned Light",
                     "service": "lightbulb",
+                    "on_action": "E00L01I03",
+                    "off_action": "E00L01I07",
                 },
             ],
         }

{conson_xp-1.11.0 → conson_xp-1.15.0}/tests/unit/test_services/test_homekit_config_validator.py

@@ -41,6 +41,8 @@ class TestHomekitConfigValidator:
                     output_number=1,
                     description="Light 1",
                     service="lightbulb",
+                    on_action="E00L01I01",
+                    off_action="E00L01I05",
                 ),
                 HomekitAccessoryConfig(
                     name="light2",
@@ -49,6 +51,8 @@ class TestHomekitConfigValidator:
                     output_number=2,
                     description="Light 2",
                     service="lightbulb",
+                    on_action="E00L01I02",
+                    off_action="E00L01I06",
                 ),
             ]
 
@@ -82,6 +86,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light1",
@@ -90,6 +96,8 @@ class TestHomekitConfigValidator:
                 output_number=2,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         config = self.create_test_homekit_config(accessories=accessories)
@@ -113,6 +121,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="invalid_service",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             )
         ]
         config = self.create_test_homekit_config(accessories=accessories)
@@ -136,6 +146,8 @@ class TestHomekitConfigValidator:
                 output_number=0,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light2",
@@ -144,6 +156,8 @@ class TestHomekitConfigValidator:
                 output_number=-1,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         config = self.create_test_homekit_config(accessories=accessories)
@@ -207,6 +221,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="orphaned_light",
@@ -215,6 +231,8 @@ class TestHomekitConfigValidator:
                 output_number=2,
                 description="Orphaned",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         rooms = [RoomConfig(name="Living Room", accessories=["light1"])]
@@ -233,6 +251,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light2",
@@ -241,6 +261,8 @@ class TestHomekitConfigValidator:
                 output_number=2,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L01I02",
+                off_action="E00L01I06",
             ),
         ]
         rooms = [
@@ -263,6 +285,8 @@ class TestHomekitConfigValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             )
         ]
         rooms = [
@@ -316,6 +340,8 @@ class TestCrossReferenceValidator:
                 output_number=1,
                 description="Light 1",
                 service="lightbulb",
+                on_action="E00L01I01",
+                off_action="E00L01I05",
             ),
             HomekitAccessoryConfig(
                 name="light2",
@@ -324,6 +350,8 @@ class TestCrossReferenceValidator:
                 output_number=1,
                 description="Light 2",
                 service="lightbulb",
+                on_action="E00L02I01",
+                off_action="E00L02I05",
             ),
         ]
         rooms = [RoomConfig(name="Living Room", accessories=["light1", "light2"])]
@@ -361,6 +389,8 @@ class TestCrossReferenceValidator:
             output_number=1,
             description="Invalid",
             service="lightbulb",
+            on_action="E00L03I01",
+            off_action="E00L03I05",
         )
         homekit_validator.config.accessories.append(invalid_accessory)
 
@@ -394,6 +424,8 @@ class TestCrossReferenceValidator:
             output_number=20,
             description="High Output",
             service="lightbulb",
+            on_action="E00L02I09",
+            off_action="E00L02I13",
         )
         homekit_validator.config.accessories.append(high_output_accessory)
 
@@ -425,6 +457,8 @@ class TestCrossReferenceValidator:
                 output_number=1,
                 description="Invalid Serial",
                 service="lightbulb",
+                on_action="E00L03I01",
+                off_action="E00L03I05",
             ),
             HomekitAccessoryConfig(
                 name="invalid_output",
@@ -433,6 +467,8 @@ class TestCrossReferenceValidator:
                 output_number=20,
                 description="Invalid Output",
                 service="lightbulb",
+                on_action="E00L02I09",
+                off_action="E00L02I13",
             ),
         ]
         homekit_validator.config.accessories.extend(invalid_accessories)

{conson_xp-1.11.0 → conson_xp-1.15.0}/tests/unit/test_services/test_homekit_services.py

@@ -68,6 +68,8 @@ def mock_accessory():
         output_number=2,
         description="Test Description",
         service="lightbulb",
+        on_action="E00L01I01",
+        off_action="E00L01I05",
     )
 
 
@@ -357,23 +359,33 @@ class TestHomeKitConbusService:
 
     def test_handle_send_action_event_on(self, mock_module, mock_accessory):
         """Test handle_send_action_event for turning on."""
-        event = SendActionEvent(serial_number="1234567890", output_number=2, value=True)
+        event = SendActionEvent(
+            serial_number="1234567890",
+            output_number=2,
+            value=True,
+            on_action="E00L04I02",
+            off_action="E00L04I06",
+        )
 
         self.service.handle_send_action_event(event)
 
         sent_data = self.telegram_protocol.sendFrame.call_args[0][0]
-        assert sent_data == b"S1234567890F27D02AB"  # ON_RELEASE action
+        assert sent_data == b"E00L04I02B"  # ON action code
 
     def test_handle_send_action_event_off(self, mock_module, mock_accessory):
         """Test handle_send_action_event for turning off."""
         event = SendActionEvent(
-            serial_number="1234567890", output_number=5, value=False
+            serial_number="1234567890",
+            output_number=5,
+            value=False,
+            on_action="E00L05I05",
+            off_action="E00L05I09",
         )
 
         self.service.handle_send_action_event(event)
 
         sent_data = self.telegram_protocol.sendFrame.call_args[0][0]
-        assert sent_data == b"S1234567890F27D05AA"  # OFF_PRESS action
+        assert sent_data == b"E00L05I09B"  # OFF action code
 
 
 class TestHomeKitService: