conson-xp 1.29.0__tar.gz → 1.33.0__tar.gz

{conson_xp-1.29.0 → conson_xp-1.33.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.29.0
+Version: 1.33.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -91,6 +91,9 @@ Comprehensive type safety and robust error handling
 # Install with PIP (recommended)
 pip install conson-xp
 
+# Export your Conbus device configuration (recommended first step)
+xp conbus export
+
 # Parse a telegram
 xp telegram parse "<E14L00I02MAK>"
 
@@ -133,7 +136,29 @@ xp telegram validate "<E14L00I02MAK>"
 ```
 
 **Device Communication**
+
+> **⚠️ Important**: Bridge modules (XP130, XP230) accept **only one TCP connection at a time**.
+> Close any existing connections (including the official app) before using xp commands.
+
 ```bash
+# Export device configuration (RECOMMENDED - run this first!)
+# Discovers all devices and exports complete configuration to export.yml
+xp conbus export
+
+# What it does:
+# - Automatically discovers all devices on the Conbus network
+# - Queries 7 datapoints per device (type, version, link number, etc.)
+# - Generates export.yml in conson.yml format
+# - Shows real-time progress for each device
+# - Handles timeouts gracefully with partial exports
+#
+# Example output:
+#   Querying device 1/12: 0020041013...
+#     ✓ Module type: X130 (1)
+#     ✓ Link number: 1
+#     ✓ Software version: V2.3
+#   Export complete: export.yml (12 devices)
+
 # Discover XP servers on your network
 xp conbus discover
 
@@ -325,6 +350,7 @@ xp conbus event
 xp conbus event list
 xp conbus event raw
 
+xp conbus export
 
 xp conbus lightlevel
 xp conbus lightlevel get

{conson_xp-1.29.0 → conson_xp-1.33.0}/README.md

@@ -38,6 +38,9 @@ Comprehensive type safety and robust error handling
 # Install with PIP (recommended)
 pip install conson-xp
 
+# Export your Conbus device configuration (recommended first step)
+xp conbus export
+
 # Parse a telegram
 xp telegram parse "<E14L00I02MAK>"
 
@@ -80,7 +83,29 @@ xp telegram validate "<E14L00I02MAK>"
 ```
 
 **Device Communication**
+
+> **⚠️ Important**: Bridge modules (XP130, XP230) accept **only one TCP connection at a time**.
+> Close any existing connections (including the official app) before using xp commands.
+
 ```bash
+# Export device configuration (RECOMMENDED - run this first!)
+# Discovers all devices and exports complete configuration to export.yml
+xp conbus export
+
+# What it does:
+# - Automatically discovers all devices on the Conbus network
+# - Queries 7 datapoints per device (type, version, link number, etc.)
+# - Generates export.yml in conson.yml format
+# - Shows real-time progress for each device
+# - Handles timeouts gracefully with partial exports
+#
+# Example output:
+#   Querying device 1/12: 0020041013...
+#     ✓ Module type: X130 (1)
+#     ✓ Link number: 1
+#     ✓ Software version: V2.3
+#   Export complete: export.yml (12 devices)
+
 # Discover XP servers on your network
 xp conbus discover
 
@@ -272,6 +297,7 @@ xp conbus event
 xp conbus event list
 xp conbus event raw
 
+xp conbus export
 
 xp conbus lightlevel
 xp conbus lightlevel get

{conson_xp-1.29.0 → conson_xp-1.33.0}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.29.0"
+version = "1.33.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.29.0 → conson_xp-1.33.0}/src/xp/__init__.py

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

conson_xp-1.33.0/src/xp/cli/commands/conbus/conbus_export_commands.py

@@ -0,0 +1,88 @@
+"""Conbus export CLI command."""
+
+from contextlib import suppress
+
+import click
+
+from xp.cli.commands.conbus.conbus import conbus
+from xp.cli.utils.decorators import connection_command
+from xp.models.conbus.conbus_export import ConbusExportResponse
+from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
+from xp.services.conbus.conbus_export_service import ConbusExportService
+
+
+@conbus.command("export")
+@click.pass_context
+@connection_command()
+def export_conbus_config(ctx: click.Context) -> None:
+    r"""Export Conbus device configuration to YAML file.
+
+    Discovers all devices on the Conbus network and queries their configuration
+    datapoints to generate a complete export.yml file in conson.yml format.
+
+    Args:
+        ctx: Click context object.
+
+    Examples:
+        \b
+        # Export to export.yml in current directory
+        xp conbus export
+    """
+
+    def on_progress(serial_number: str, current: int, total: int) -> None:
+        """Handle progress updates during export.
+
+        Args:
+            serial_number: Serial number of discovered device.
+            current: Current device number.
+            total: Total devices discovered.
+        """
+        click.echo(f"Querying device {current}/{total}: {serial_number}...")
+
+    def on_device_exported(module: ConsonModuleConfig) -> None:
+        """Handle device export completion.
+
+        Args:
+            module: Exported module configuration.
+        """
+        module_type = module.module_type or "UNKNOWN"
+        module_code = (
+            module.module_type_code if module.module_type_code is not None else "?"
+        )
+        click.echo(f"  ✓ Module type: {module_type} ({module_code})")
+
+        if module.link_number is not None:
+            click.echo(f"  ✓ Link number: {module.link_number}")
+        if module.sw_version:
+            click.echo(f"  ✓ Software version: {module.sw_version}")
+
+    def on_finish(result: ConbusExportResponse) -> None:
+        """Handle export completion.
+
+        Args:
+            result: Export result.
+
+        Raises:
+            ClickException: When export fails with error message from result.
+        """
+        # Try to stop reactor (may already be stopped)
+        with suppress(Exception):
+            service.stop_reactor()
+
+        if result.success:
+            click.echo(
+                f"\nExport complete: {result.output_file} ({result.device_count} devices)"
+            )
+        else:
+            click.echo(f"Error: {result.error}", err=True)
+            raise click.ClickException(result.error or "Export failed")
+
+    service: ConbusExportService = (
+        ctx.obj.get("container").get_container().resolve(ConbusExportService)
+    )
+    with service:
+        service.on_progress.connect(on_progress)
+        service.on_device_exported.connect(on_device_exported)
+        service.on_finish.connect(on_finish)
+        service.set_timeout(5)
+        service.start_reactor()

{conson_xp-1.29.0 → conson_xp-1.33.0}/src/xp/cli/main.py

@@ -4,11 +4,13 @@ import click
 from click_help_colors import HelpColorsGroup
 
 from xp.cli.commands import homekit
+
+# Import all conbus command modules to register their commands
+from xp.cli.commands.conbus import conbus_discover_commands  # noqa: F401
+from xp.cli.commands.conbus import conbus_export_commands  # noqa: F401
 from xp.cli.commands.conbus.conbus import conbus
 from xp.cli.commands.file_commands import file
 from xp.cli.commands.module_commands import module
-
-# Import all conbus command modules to register their commands
 from xp.cli.commands.reverse_proxy_commands import reverse_proxy
 from xp.cli.commands.server.server_commands import server
 

conson_xp-1.33.0/src/xp/models/conbus/conbus_export.py

@@ -0,0 +1,31 @@
+"""Conbus export response model."""
+
+from dataclasses import dataclass, field
+from typing import Optional
+
+from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+
+
+@dataclass
+class ConbusExportResponse:
+    """Response from Conbus export operation.
+
+    Attributes:
+        success: Whether the operation was successful.
+        config: Exported module configuration list.
+        device_count: Number of devices exported.
+        output_file: Path to output file.
+        export_status: Export status (OK, FAILED_TIMEOUT, FAILED_NO_DEVICES, etc.).
+        error: Error message if operation failed.
+        sent_telegrams: List of telegrams sent during export.
+        received_telegrams: List of telegrams received during export.
+    """
+
+    success: bool
+    config: Optional[ConsonModuleListConfig] = None
+    device_count: int = 0
+    output_file: str = "export.yml"
+    export_status: str = "OK"
+    error: Optional[str] = None
+    sent_telegrams: list[str] = field(default_factory=list)
+    received_telegrams: list[str] = field(default_factory=list)