conson-xp 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -7,14 +7,14 @@ import click
 from xp.cli.commands.conbus.conbus import conbus_lightlevel
 from xp.cli.utils.decorators import (
     connection_command,
-    handle_service_errors,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.models.conbus.conbus_lightlevel import ConbusLightlevelResponse
-from xp.services.conbus.conbus_lightlevel_set_service import (
-    ConbusLightlevelError,
-    ConbusLightlevelSetService,
-)
+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_lightlevel.command("set")
@@ -23,7 +23,6 @@ from xp.services.conbus.conbus_lightlevel_set_service import (
 @click.argument("level", type=click.IntRange(0, 100))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_set(
     ctx: click.Context, serial_number: str, output_number: int, level: int
 ) -> None:
@@ -41,20 +40,28 @@ def xp_lightlevel_set(
         xp conbus lightlevel set 0011223344 0 100  # Set output 0 to 100%
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
-        """Handle successful completion of light level set command.
+    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 = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
+    data_value = f"{output_number:02d}:{level:03d}"
+
     with service:
-        service.set_lightlevel(serial_number, output_number, level, finish, 0.5)
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
 
 
 @conbus_lightlevel.command("off")
@@ -62,7 +69,6 @@ def xp_lightlevel_set(
 @click.argument("output_number", type=click.IntRange(0, 8))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_off(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
@@ -79,20 +85,29 @@ def xp_lightlevel_off(
         xp conbus lightlevel off 0011223344 0   # Turn off output 0
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
-        """Handle successful completion of light level off command.
+    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 = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
+    level = 0
+    data_value = f"{output_number:02d}:{level:03d}"
+
     with service:
-        service.turn_off(serial_number, output_number, finish, 0.5)
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
 
 
 @conbus_lightlevel.command("on")
@@ -100,7 +115,6 @@ def xp_lightlevel_off(
 @click.argument("output_number", type=click.IntRange(0, 8))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_on(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
@@ -117,7 +131,7 @@ def xp_lightlevel_on(
         xp conbus lightlevel on 0011223344 0   # Turn on output 0 (80%)
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
         """Handle successful completion of light level on command.
 
         Args:
@@ -125,12 +139,21 @@ def xp_lightlevel_on(
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
 
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
+    service: WriteConfigService = (
+        ctx.obj.get("container").get_container().resolve(WriteConfigService)
     )
 
+    level = 60
+    data_value = f"{output_number:02d}:{level:03d}"
+
     with service:
-        service.turn_on(serial_number, output_number, finish, 0.5)
+        service.write_config(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            data_value=data_value,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )
 
 
 @conbus_lightlevel.command("get")
@@ -138,7 +161,6 @@ def xp_lightlevel_on(
 @click.argument("output_number", type=click.IntRange(0, 8))
 @click.pass_context
 @connection_command()
-@handle_service_errors(ConbusLightlevelError)
 def xp_lightlevel_get(
     ctx: click.Context, serial_number: str, output_number: int
 ) -> None:
@@ -154,18 +176,32 @@ def xp_lightlevel_get(
         xp conbus lightlevel get 0123450001 2   # Get light level for output 2
         xp conbus lightlevel get 0011223344 0   # Get light level for output 0
     """
+    # Get service from container
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
+    )
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
+    def on_finish(service_response: "ConbusDatapointResponse") -> None:
         """Handle successful completion of light level get command.
 
         Args:
-            response: Light level response object.
+            service_response: Light level response object.
         """
-        click.echo(json.dumps(response.to_dict(), indent=2))
-
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
-    )
+        lightlevel_level = telegram_service.get_lightlevel(
+            service_response.data_value, output_number
+        )
+        result = service_response.to_dict()
+        result["output_number"] = output_number
+        result["lightlevel_level"] = lightlevel_level
+        click.echo(json.dumps(result, indent=2))
 
     with service:
-        service.get_lightlevel(serial_number, output_number, finish, 0.5)
+        service.query_datapoint(
+            serial_number=serial_number,
+            datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
+            finish_callback=on_finish,
+            timeout_seconds=0.5,
+        )

xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -9,9 +9,12 @@ from xp.cli.utils.decorators import (
     connection_command,
 )
 from xp.cli.utils.serial_number_type import SERIAL
-from xp.models.conbus.conbus_linknumber import ConbusLinknumberResponse
-from xp.services.conbus.conbus_linknumber_get_service import ConbusLinknumberGetService
-from xp.services.conbus.conbus_linknumber_set_service import ConbusLinknumberSetService
+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_linknumber.command("set", short_help="Set link number for a module")
@@ -33,23 +36,27 @@ def set_linknumber_command(
         \b
         xp conbus linknumber set 0123450001 25
     """
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLinknumberSetService)
-    )
 
-    def on_finish(response: ConbusLinknumberResponse) -> None:
-        """Handle successful completion of link number set command.
+    def on_finish(response: "ConbusWriteConfigResponse") -> None:
+        """Handle successful completion of light level on command.
 
         Args:
-            response: Link number response object.
+            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"{link_number: 02d}"
     with service:
-        service.set_linknumber(
+        service.write_config(
             serial_number=serial_number,
-            link_number=link_number,
+            datapoint_type=DataPointType.LINK_NUMBER,
+            data_value=data_value,
             finish_callback=on_finish,
+            timeout_seconds=0.5,
         )
 
 
@@ -68,20 +75,28 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
         \b
         xp conbus linknumber get 0123450001
     """
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLinknumberGetService)
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
+    telegram_service: TelegramDatapointService = (
+        ctx.obj.get("container").get_container().resolve(TelegramDatapointService)
     )
 
-    def on_finish(response: ConbusLinknumberResponse) -> None:
+    def on_finish(service_response: ConbusDatapointResponse) -> None:
         """Handle successful completion of link number get command.
 
         Args:
-            response: Link number response object.
+            service_response: Link number response object.
         """
-        click.echo(json.dumps(response.to_dict(), indent=2))
+        linknumber_value = telegram_service.get_linknumber(service_response.data_value)
+        result = service_response.to_dict()
+        result["linknumber_value"] = linknumber_value
+        click.echo(json.dumps(result, indent=2))
 
     with service:
-        service.get_linknumber(
+        service.query_datapoint(
             serial_number=serial_number,
+            datapoint_type=DataPointType.LINK_NUMBER,
             finish_callback=on_finish,
+            timeout_seconds=0.5,
         )

xp/cli/commands/conbus/conbus_msactiontable_commands.py

@@ -2,6 +2,7 @@
 
 import json
 from dataclasses import asdict
+from typing import Union
 
 import click
 from click import Context
@@ -12,7 +13,9 @@ from xp.cli.utils.decorators import (
 )
 from xp.cli.utils.serial_number_type import SERIAL
 from xp.cli.utils.xp_module_type import XP_MODULE_TYPE
-from xp.models.actiontable.actiontable import ActionTable
+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.services.conbus.actiontable.msactiontable_service import (
     MsActionTableService,
 )
@@ -33,7 +36,9 @@ def conbus_download_msactiontable(
         serial_number: 10-digit module serial number.
         xpmoduletype: XP module type.
     """
-    service = ctx.obj.get("container").get_container().resolve(MsActionTableService)
+    service: MsActionTableService = (
+        ctx.obj.get("container").get_container().resolve(MsActionTableService)
+    )
 
     def progress_callback(progress: str) -> None:
         """Handle progress updates during MS action table download.
@@ -43,7 +48,9 @@ def conbus_download_msactiontable(
         """
         click.echo(progress, nl=False)
 
-    def finish_callback(action_table: ActionTable) -> None:
+    def on_finish(
+        action_table: Union[Xp20MsActionTable | Xp24MsActionTable | Xp33MsActionTable],
+    ) -> None:
         """Handle successful completion of MS action table download.
 
         Args:
@@ -73,6 +80,6 @@ def conbus_download_msactiontable(
             serial_number=serial_number,
             xpmoduletype=xpmoduletype,
             progress_callback=progress_callback,
-            finish_callback=finish_callback,
+            finish_callback=on_finish,
             error_callback=error_callback,
         )

xp/cli/commands/conbus/conbus_output_commands.py

@@ -34,7 +34,9 @@ def xp_output_on(ctx: click.Context, serial_number: str, output_number: int) ->
         \b
         xp conbus output on 0011223344 0  # Turn on output 0
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusOutputService)
+    service: ConbusOutputService = (
+        ctx.obj.get("container").get_container().resolve(ConbusOutputService)
+    )
 
     def on_finish(response: ConbusOutputResponse) -> None:
         """Handle successful completion of output on command.
@@ -70,7 +72,9 @@ def xp_output_off(ctx: click.Context, serial_number: str, output_number: int) ->
         \b
         xp conbus output off 0011223344 1    # Turn off output 1
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusOutputService)
+    service: ConbusOutputService = (
+        ctx.obj.get("container").get_container().resolve(ConbusOutputService)
+    )
 
     def on_finish(response: ConbusOutputResponse) -> None:
         """Handle successful completion of output off command.

xp/cli/commands/conbus/conbus_receive_commands.py

@@ -36,7 +36,7 @@ def receive_telegrams(ctx: Context, timeout: float) -> None:
         xp conbus receive 5.0
     """
 
-    def finish(response_received: ConbusReceiveResponse) -> None:
+    def on_finish(response_received: ConbusReceiveResponse) -> None:
         """Handle successful completion of telegram receive operation.
 
         Args:
@@ -52,6 +52,8 @@ def receive_telegrams(ctx: Context, timeout: float) -> None:
         """
         click.echo(telegram_received)
 
-    service = ctx.obj.get("container").get_container().resolve(ConbusReceiveService)
+    service: ConbusReceiveService = (
+        ctx.obj.get("container").get_container().resolve(ConbusReceiveService)
+    )
     with service:
-        service.start(progress, finish, timeout)
+        service.start(progress, on_finish, timeout)

xp/cli/commands/file_commands.py

@@ -56,7 +56,9 @@ def decode_log_file(
     from xp.services.log_file_service import LogFileService
     from xp.utils.time_utils import TimeParsingError, parse_time_range
 
-    service = ctx.obj.get("container").get_container().resolve(LogFileService)
+    service: LogFileService = (
+        ctx.obj.get("container").get_container().resolve(LogFileService)
+    )
     StatisticsFormatter(True)
 
     try:
@@ -124,7 +126,9 @@ def analyze_log_file(ctx: Context, log_file_path: str) -> None:
     """
     from xp.services.log_file_service import LogFileService
 
-    service = ctx.obj.get("container").get_container().resolve(LogFileService)
+    service: LogFileService = (
+        ctx.obj.get("container").get_container().resolve(LogFileService)
+    )
     StatisticsFormatter(True)
 
     try:
@@ -156,7 +160,9 @@ def validate_log_file(ctx: Context, log_file_path: str) -> None:
     """
     from xp.services.log_file_service import LogFileService
 
-    service = ctx.obj.get("container").get_container().resolve(LogFileService)
+    service: LogFileService = (
+        ctx.obj.get("container").get_container().resolve(LogFileService)
+    )
     OutputFormatter(True)
 
     try:

xp/cli/commands/homekit/homekit_start_commands.py

@@ -28,7 +28,9 @@ def homekit_start(ctx: Context) -> None:
     click.echo("Starting XP Protocol HomeKit server...")
 
     try:
-        service = ctx.obj.get("container").get_container().resolve(HomeKitService)
+        service: HomeKitService = (
+            ctx.obj.get("container").get_container().resolve(HomeKitService)
+        )
         service.start()  # Blocking call - reactor.run() never returns
 
     except KeyboardInterrupt:

xp/cli/commands/module_commands.py

@@ -37,7 +37,9 @@ def module_info(ctx: Context, identifier: str) -> None:
         xp module info 14
         xp module info XP2606
     """
-    service = ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    service: ModuleTypeService = (
+        ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    )
     OutputFormatter(True)
 
     try:
@@ -76,7 +78,9 @@ def module_list(ctx: Context, category: str, group_by_category: bool) -> None:
         xp module list --category "Interface Panels"
         xp module list --group-by-category
     """
-    service = ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    service: ModuleTypeService = (
+        ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    )
     ListFormatter(True)
 
     try:
@@ -130,7 +134,9 @@ def module_search(ctx: Context, query: str, field: tuple) -> None:
         xp module search "push button"
         xp module search --field name "XP"
     """
-    service = ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    service: ModuleTypeService = (
+        ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    )
     ListFormatter(True)
 
     try:
@@ -162,7 +168,9 @@ def module_categories(ctx: Context) -> None:
         \b
         xp module categories
     """
-    service = ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    service: ModuleTypeService = (
+        ctx.obj.get("container").get_container().resolve(ModuleTypeService)
+    )
     OutputFormatter(True)
 
     try:

xp/cli/commands/reverse_proxy_commands.py

@@ -73,7 +73,9 @@ def start_proxy(ctx: Context, port: int, config: str) -> None:
             raise SystemExit(1)
 
         # Load configuration and create proxy instance
-        service = ctx.obj.get("container").get_container().resolve(ReverseProxyService)
+        service: ReverseProxyService = (
+            ctx.obj.get("container").get_container().resolve(ReverseProxyService)
+        )
         global_proxy_instance = service
 
         # Handle graceful shutdown on SIGINT

xp/cli/main.py

@@ -6,7 +6,6 @@ import click
 from click_help_colors import HelpColorsGroup
 
 from xp.cli.commands import homekit
-from xp.cli.commands.api import api
 from xp.cli.commands.conbus.conbus import conbus
 from xp.cli.commands.file_commands import file
 from xp.cli.commands.module_commands import module
@@ -79,7 +78,6 @@ cli.add_command(telegram)
 cli.add_command(module)
 cli.add_command(file)
 cli.add_command(server)
-cli.add_command(api)
 cli.add_command(reverse_proxy)
 
 # Add the tree command

xp/models/conbus/conbus_datapoint.py

@@ -21,6 +21,7 @@ class ConbusDatapointResponse:
         sent_telegram: Telegram sent to device.
         received_telegrams: List of telegrams received.
         datapoint_telegram: Parsed datapoint telegram.
+        data_value: Value of the datapoint telegram.
         datapoints: List of datapoint values.
         error: Error message if operation failed.
         timestamp: Timestamp of the response.
@@ -33,6 +34,7 @@ class ConbusDatapointResponse:
     sent_telegram: Optional[str] = None
     received_telegrams: Optional[list] = None
     datapoint_telegram: Optional[ReplyTelegram] = None
+    data_value: str = ""
     datapoints: Optional[List[Dict[str, str]]] = None
     error: Optional[str] = None
     timestamp: Optional[datetime] = None
@@ -55,6 +57,7 @@ class ConbusDatapointResponse:
         result: Dict[str, Any] = {
             "success": self.success,
             "serial_number": self.serial_number,
+            "data_value": self.data_value,
             "error": self.error,
             "timestamp": self.timestamp.isoformat() if self.timestamp else None,
         }

xp/models/conbus/conbus_discover.py

@@ -2,7 +2,23 @@
 
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, TypedDict
+
+
+class DiscoveredDevice(TypedDict):
+    """Discovered device information.
+
+    Attributes:
+        serial_number: Serial number of the device.
+        module_type: Module type name (e.g., "XP24", "XP230"), None if not yet retrieved.
+        module_type_code: Module type code (e.g., "13", "10"), None if not yet retrieved.
+        module_type_name: Module type name converted from module_type_code, None if not yet retrieved.
+    """
+
+    serial_number: str
+    module_type: Optional[str]
+    module_type_code: Optional[int]
+    module_type_name: Optional[str]
 
 
 @dataclass
@@ -13,7 +29,7 @@ class ConbusDiscoverResponse:
         success: Whether the operation was successful.
         sent_telegram: Telegram sent to discover devices.
         received_telegrams: List of telegrams received.
-        discovered_devices: List of discovered device serial numbers.
+        discovered_devices: List of discovered devices with their module types.
         error: Error message if operation failed.
         timestamp: Timestamp of the response.
     """
@@ -21,7 +37,7 @@ class ConbusDiscoverResponse:
     success: bool
     sent_telegram: Optional[str] = None
     received_telegrams: Optional[list[str]] = None
-    discovered_devices: Optional[list[str]] = None
+    discovered_devices: Optional[list[DiscoveredDevice]] = None
     error: Optional[str] = None
     timestamp: Optional[datetime] = None
 

xp/models/conbus/conbus_writeconfig.py

@@ -0,0 +1,60 @@
+"""Conbus link number response model."""
+
+from dataclasses import dataclass
+from datetime import datetime
+from typing import Any, Dict, Optional
+
+from xp.models.telegram.datapoint_type import DataPointType
+from xp.models.telegram.system_function import SystemFunction
+
+
+@dataclass
+class ConbusWriteConfigResponse:
+    """Represents a response from Conbus write config operations (set/get).
+
+    Attributes:
+        success: Whether the operation was successful.
+        serial_number: Serial number of the device.
+        datapoint_type: the datapoint to write.
+        system_function: ACK or NAK received.
+        sent_telegram: Telegram sent to device.
+        received_telegrams: List of telegrams received.
+        data_value: written value.
+        error: Error message if operation failed.
+        timestamp: Timestamp of the response.
+    """
+
+    success: bool
+    serial_number: str
+    datapoint_type: Optional[DataPointType] = None
+    system_function: Optional[SystemFunction] = None
+    sent_telegram: Optional[str] = None
+    received_telegrams: Optional[list] = None
+    data_value: Optional[str] = None
+    error: Optional[str] = None
+    timestamp: Optional[datetime] = None
+
+    def __post_init__(self) -> None:
+        """Initialize timestamp and received_telegrams if not provided."""
+        if self.timestamp is None:
+            self.timestamp = datetime.now()
+        if self.received_telegrams is None:
+            self.received_telegrams = []
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert to dictionary for JSON serialization.
+
+        Returns:
+            Dictionary representation of the response.
+        """
+        return {
+            "success": self.success,
+            "system_function": self.system_function,
+            "datapoint_type": self.datapoint_type,
+            "data_value": self.data_value,
+            "serial_number": self.serial_number,
+            "sent_telegram": self.sent_telegram,
+            "received_telegrams": self.received_telegrams,
+            "error": self.error,
+            "timestamp": self.timestamp.isoformat() if self.timestamp else None,
+        }

xp/models/telegram/system_telegram.py

@@ -22,10 +22,10 @@ class SystemTelegram(Telegram):
     Examples: <S0020012521F02D18FN>
 
     Attributes:
-        serial_number: Serial number of the device.
-        system_function: System function code.
-        data: Data payload.
-        datapoint_type: Type of datapoint.
+        serial_number: Serial number of the device (0020012521)
+        system_function: System function code (02).
+        data: Data payload (18)
+        datapoint_type: Type of datapoint (18).
     """
 
     serial_number: str = ""