conson-xp 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

xp/cli/commands/conbus/conbus_blink_commands.py

@@ -23,23 +23,30 @@ from xp.services.telegram.telegram_blink_service import BlinkError
 @connection_command()
 @handle_service_errors(BlinkError)
 def send_blink_on_telegram(ctx: Context, serial_number: str) -> None:
-    """
-    Send blink command to start blinking module LED.
+    r"""Send blink command to start blinking module LED.
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
 
-    \b
+    Examples:
+        \b
         xp conbus blink on 0012345008
     """
 
-    def finish(service_response: ConbusBlinkResponse) -> None:
+    def on_finish(service_response: ConbusBlinkResponse) -> None:
+        """Handle successful completion of blink on command.
+
+        Args:
+            service_response: Blink response object.
+        """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
 
     service: ConbusBlinkService = (
         ctx.obj.get("container").get_container().resolve(ConbusBlinkService)
     )
     with service:
-        service.send_blink_telegram(serial_number, "on", finish, 0.5)
+        service.send_blink_telegram(serial_number, "on", on_finish, 0.5)
 
 
 @conbus_blink.command("off")
@@ -48,30 +55,35 @@ def send_blink_on_telegram(ctx: Context, serial_number: str) -> None:
 @connection_command()
 @handle_service_errors(BlinkError)
 def send_blink_off_telegram(ctx: Context, serial_number: str) -> None:
-    """
-    Send blink command to start blinking module LED.
+    r"""Send blink command to stop blinking module LED.
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
 
-    \b
+    Examples:
+        \b
         xp conbus blink off 0012345008
     """
 
-    def finish(service_response: ConbusBlinkResponse) -> None:
+    def on_finish(service_response: ConbusBlinkResponse) -> None:
+        """Handle successful completion of blink off command.
+
+        Args:
+            service_response: Blink response object.
+        """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
 
     service: ConbusBlinkService = (
         ctx.obj.get("container").get_container().resolve(ConbusBlinkService)
     )
     with service:
-        service.send_blink_telegram(serial_number, "off", finish, 0.5)
+        service.send_blink_telegram(serial_number, "off", on_finish, 0.5)
 
 
 @conbus_blink.group("all", short_help="Control blink state for all devices")
 def conbus_blink_all() -> None:
-    """
-    Control blink state for all discovered devices.
-    """
+    """Control blink state for all discovered devices."""
     pass
 
 
@@ -80,27 +92,37 @@ def conbus_blink_all() -> None:
 @connection_command()
 @handle_service_errors(BlinkError)
 def blink_all_off(ctx: Context) -> None:
-    """
-    Turn off blinking for all discovered devices.
+    r"""Turn off blinking for all discovered devices.
 
-    Examples:
+    Args:
+        ctx: Click context object.
 
-    \b
+    Examples:
+        \b
         xp conbus blink all off
     """
 
-    def finish(discovered_devices: ConbusBlinkResponse) -> None:
+    def on_finish(discovered_devices: ConbusBlinkResponse) -> None:
+        """Handle successful completion of blink all off command.
+
+        Args:
+            discovered_devices: Blink response with all devices.
+        """
         click.echo(json.dumps(discovered_devices.to_dict(), indent=2))
 
     def progress(message: str) -> None:
+        """Handle progress updates during blink all off operation.
+
+        Args:
+            message: Progress message string.
+        """
         click.echo(message)
-        pass
 
     service: ConbusBlinkAllService = (
         ctx.obj.get("container").get_container().resolve(ConbusBlinkAllService)
     )
     with service:
-        service.send_blink_all_telegram("off", progress, finish, 0.5)
+        service.send_blink_all_telegram("off", progress, on_finish, 0.5)
 
 
 @conbus_blink_all.command("on", short_help="Turn on blinking for all devices")
@@ -108,24 +130,34 @@ def blink_all_off(ctx: Context) -> None:
 @connection_command()
 @handle_service_errors(BlinkError)
 def blink_all_on(ctx: Context) -> None:
-    """
-    Turn on blinking for all discovered devices.
+    r"""Turn on blinking for all discovered devices.
 
-    Examples:
+    Args:
+        ctx: Click context object.
 
-    \b
+    Examples:
+        \b
         xp conbus blink all on
     """
 
-    def finish(discovered_devices: ConbusBlinkResponse) -> None:
+    def on_finish(discovered_devices: ConbusBlinkResponse) -> None:
+        """Handle successful completion of blink all on command.
+
+        Args:
+            discovered_devices: Blink response with all devices.
+        """
         click.echo(json.dumps(discovered_devices.to_dict(), indent=2))
 
     def progress(message: str) -> None:
+        """Handle progress updates during blink all on operation.
+
+        Args:
+            message: Progress message string.
+        """
         click.echo(message)
-        pass
 
     service: ConbusBlinkAllService = (
         ctx.obj.get("container").get_container().resolve(ConbusBlinkAllService)
     )
     with service:
-        service.send_blink_all_telegram("on", progress, finish, 0.5)
+        service.send_blink_all_telegram("on", progress, on_finish, 0.5)

xp/cli/commands/conbus/conbus_config_commands.py

@@ -1,3 +1,5 @@
+"""Conbus configuration CLI commands."""
+
 import json
 
 import click
@@ -12,13 +14,16 @@ from xp.models import ConbusClientConfig
 @click.pass_context
 @handle_service_errors(Exception)
 def show_config(ctx: Context) -> None:
-    """
-    Display current Conbus client configuration.
+    r"""Display current Conbus client configuration.
 
-    Examples:
+    Args:
+        ctx: Click context object.
 
-    \b
+    Examples:
+        \b
         xp conbus config
     """
-    config = ctx.obj.get("container").get_container().resolve(ConbusClientConfig)
+    config: ConbusClientConfig = (
+        ctx.obj.get("container").get_container().resolve(ConbusClientConfig)
+    )
     click.echo(json.dumps(config.conbus.model_dump(mode="json"), indent=2))

xp/cli/commands/conbus/conbus_custom_commands.py

@@ -23,18 +23,29 @@ from xp.services.conbus.conbus_custom_service import ConbusCustomService
 def send_custom_telegram(
     ctx: Context, serial_number: str, function_code: str, datapoint_code: str
 ) -> None:
-    """
-    Send custom telegram with specified function and data point codes.
+    r"""Send custom telegram with specified function and data point codes.
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        function_code: Function code.
+        datapoint_code: Data point code.
 
-    \b
+    Examples:
+        \b
         xp conbus custom 0012345011 02 E2
         xp conbus custom 0012345011 17 AA
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusCustomService)
+    service: ConbusCustomService = (
+        ctx.obj.get("container").get_container().resolve(ConbusCustomService)
+    )
 
     def on_finish(service_response: "ConbusCustomResponse") -> None:
+        """Handle successful completion of custom telegram.
+
+        Args:
+            service_response: Custom response object.
+        """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
 
     with service:

xp/cli/commands/conbus/conbus_datapoint_commands.py

@@ -30,21 +30,31 @@ from xp.services.conbus.conbus_datapoint_service import (
 @click.pass_context
 @connection_command()
 def query_datapoint(ctx: Context, serial_number: str, datapoint: DataPointType) -> None:
-    """
-    Query a specific datapoint from Conbus server.
+    r"""Query a specific datapoint from Conbus server.
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        datapoint: Datapoint type to query.
 
-    \b
+    Examples:
+        \b
         xp conbus datapoint query version 0012345011
         xp conbus datapoint query voltage 0012345011
         xp conbus datapoint query temperature 0012345011
         xp conbus datapoint query current 0012345011
         xp conbus datapoint query humidity 0012345011
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    service: ConbusDatapointService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDatapointService)
+    )
 
     def on_finish(service_response: ConbusDatapointResponse) -> None:
+        """Handle successful completion of datapoint query.
+
+        Args:
+            service_response: Datapoint response object.
+        """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
 
     # Send telegram
@@ -65,22 +75,34 @@ conbus_datapoint.add_command(query_datapoint)
 @click.pass_context
 @connection_command()
 def query_all_datapoints(ctx: Context, serial_number: str) -> None:
-    """
-    Query all datapoints from a specific module.
+    r"""Query all datapoints from a specific module.
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
 
-    \b
+    Examples:
+        \b
         xp conbus datapoint all 0123450001
     """
-    service = (
+    service: ConbusDatapointQueryAllService = (
         ctx.obj.get("container").get_container().resolve(ConbusDatapointQueryAllService)
     )
 
     def on_finish(service_response: ConbusDatapointResponse) -> None:
+        """Handle successful completion of all datapoints query.
+
+        Args:
+            service_response: Datapoint response object with all datapoints.
+        """
         click.echo(json.dumps(service_response.to_dict(), indent=2))
 
     def on_progress(reply_telegram: ReplyTelegram) -> None:
+        """Handle progress updates during all datapoints query.
+
+        Args:
+            reply_telegram: Reply telegram object with progress data.
+        """
         click.echo(json.dumps(reply_telegram.to_dict(), indent=2))
 
     with service:

xp/cli/commands/conbus/conbus_discover_commands.py

@@ -18,22 +18,35 @@ from xp.services.conbus.conbus_discover_service import (
 @click.pass_context
 @connection_command()
 def send_discover_telegram(ctx: click.Context) -> None:
-    """
-    Send discover telegram to Conbus server.
+    r"""Send discover telegram to Conbus server.
 
-    Examples:
+    Args:
+        ctx: Click context object.
 
-    \b
+    Examples:
+        \b
         xp conbus discover
     """
 
-    def finish(discovered_devices: ConbusDiscoverResponse) -> None:
+    def on_finish(discovered_devices: ConbusDiscoverResponse) -> None:
+        """Handle successful completion of device discovery.
+
+        Args:
+            discovered_devices: Discover response with all found devices.
+        """
         click.echo(json.dumps(discovered_devices.to_dict(), indent=2))
 
     def progress(_serial_number: str) -> None:
+        """Handle progress updates during device discovery.
+
+        Args:
+            _serial_number: Serial number of discovered device (unused).
+        """
         # click.echo(f"Discovered : {serial_number}")
         pass
 
-    service = ctx.obj.get("container").get_container().resolve(ConbusDiscoverService)
+    service: ConbusDiscoverService = (
+        ctx.obj.get("container").get_container().resolve(ConbusDiscoverService)
+    )
     with service:
-        service.start(progress, finish, 0.5)
+        service.start(progress, on_finish, 0.5)

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,28 +23,45 @@ 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:
-    """Set light level for output_number on XP module serial_number
+    r"""Set light level for output_number on XP module serial_number.
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        output_number: Output number (0-8).
+        level: Light level (0-100).
 
-    \b
+    Examples:
+        \b
         xp conbus lightlevel set 0123450001 2 50   # Set output 2 to 50%
         xp conbus lightlevel set 0011223344 0 100  # Set output 0 to 100%
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
+    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")
@@ -52,28 +69,45 @@ 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:
-    """Turn off light for output_number on XP module serial_number (set level to 0)
+    r"""Turn off light for output_number on XP module serial_number (set level to 0).
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        output_number: Output number (0-8).
 
-    \b
+    Examples:
+        \b
         xp conbus lightlevel off 0123450001 2   # Turn off output 2
         xp conbus lightlevel off 0011223344 0   # Turn off output 0
     """
 
-    def finish(response: "ConbusLightlevelResponse") -> None:
+    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")
@@ -81,28 +115,45 @@ 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:
-    """Turn on light for output_number on XP module serial_number (set level to 80%)
+    r"""Turn on light for output_number on XP module serial_number (set level to 80%).
 
-    Examples:
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        output_number: Output number (0-8).
 
-    \b
+    Examples:
+        \b
         xp conbus lightlevel on 0123450001 2   # Turn on output 2 (80%)
         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:
+            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 = 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")
@@ -110,23 +161,47 @@ 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:
-    """Get current light level for output_number on XP module serial_number
+    r"""Get current light level for output_number on XP module serial_number.
+
+    Args:
+        ctx: Click context object.
+        serial_number: 10-digit module serial number.
+        output_number: Output number (0-8).
+
     Examples:
-    \b
+        \b
         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:
-        click.echo(json.dumps(response.to_dict(), indent=2))
+    def on_finish(service_response: "ConbusDatapointResponse") -> None:
+        """Handle successful completion of light level get command.
 
-    service = (
-        ctx.obj.get("container").get_container().resolve(ConbusLightlevelSetService)
-    )
+        Args:
+            service_response: Light level response object.
+        """
+        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,
+        )