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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.11.0
+Version: 1.14.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.14.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.14.0}/pyproject.toml

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

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

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

{conson_xp-1.11.0 → conson_xp-1.14.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.14.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.14.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.14.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.14.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.14.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.14.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