conson-xp 1.0.1__tar.gz → 1.1.0__tar.gz

{conson_xp-1.0.1 → conson_xp-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.0.1
+Version: 1.1.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License

{conson_xp-1.0.1 → conson_xp-1.1.0}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.0.1"
+version = "1.1.0"
 
 [project.license]
 file = "LICENSE"
@@ -168,7 +168,7 @@ typecheck = "mypy src/ tests/"
 vulture = "vulture src/ tests/"
 refurb = "refurb src/ tests/"
 isort = "isort src/ tests/"
-bump-version = "pdm bump -v patch"
+bump-version = "pdm bump -v minor"
 env = "echo ${PATH}"
 install = "pdm install"
 install-dev = "pdm install -G dev"

{conson_xp-1.0.1 → conson_xp-1.1.0}/src/xp/__init__.py

@@ -2,7 +2,7 @@
 
 """conson-xp"""
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

conson_xp-1.1.0/src/xp/cli/commands/conbus/conbus_scan_commands.py

@@ -0,0 +1,45 @@
+"""Conbus client operations CLI commands."""
+
+import json
+
+import click
+from click import Context
+
+from xp.cli.commands.conbus.conbus import conbus
+from xp.cli.utils.decorators import connection_command
+from xp.cli.utils.serial_number_type import SERIAL
+from xp.models import ConbusResponse
+from xp.services.conbus.conbus_scan_service import ConbusScanService
+
+
+@conbus.command("scan")
+@click.argument("serial_number", type=SERIAL)
+@click.argument("function_code", type=str)
+@click.pass_context
+@connection_command()
+def scan_module(ctx: Context, serial_number: str, function_code: str) -> None:
+    """
+    Scan all datapoints of a function_code for a module.
+
+    Examples:
+
+    \b
+        xp conbus scan 0012345011 02 # Scan all datapoints of function Read data points (02)
+    """
+    service: ConbusScanService = (
+        ctx.obj.get("container").get_container().resolve(ConbusScanService)
+    )
+
+    def on_progress(progress: str) -> None:
+        click.echo(progress)
+
+    def on_finish(service_response: ConbusResponse) -> None:
+        click.echo(json.dumps(service_response.to_dict(), indent=2))
+
+    with service:
+        service.scan_module(
+            serial_number=serial_number,
+            function_code=function_code,
+            progress_callback=on_progress,
+            finish_callback=on_finish,
+        )

{conson_xp-1.0.1 → conson_xp-1.1.0}/src/xp/services/conbus/conbus_scan_service.py

@@ -91,7 +91,7 @@ class ConbusScanService(ConbusProtocol):
         if self.finish_callback:
             self.finish_callback(self.service_response)
 
-    def scan_module_background(
+    def scan_module(
         self,
         serial_number: str,
         function_code: str,

{conson_xp-1.0.1 → conson_xp-1.1.0}/src/xp/services/protocol/conbus_protocol.py

@@ -75,7 +75,7 @@ class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
                 )
 
             self.logger.debug(
-                f"frameReceived payload: {payload.decode()}, checksum: {checksum}"
+                f"frameReceived payload: {payload.decode('latin-1')}, checksum: {checksum}"
             )
 
             # Reset timeout on activity
@@ -83,9 +83,9 @@ class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
 
             telegram_received = TelegramReceivedEvent(
                 protocol=self,
-                frame=frame.decode(),
-                telegram=telegram.decode(),
-                payload=payload.decode(),
+                frame=frame.decode("latin-1"),
+                telegram=telegram.decode("latin-1"),
+                payload=payload.decode("latin-1"),
                 telegram_type=telegram_type,
                 serial_number=serial_number,
                 checksum=checksum,
@@ -112,6 +112,7 @@ class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
         self.logger.debug(f"Sending frame: {frame.decode()}")
         self.transport.write(frame)  # type: ignore
         self.telegram_sent(frame.decode())
+        self._reset_timeout()
 
     def send_telegram(
         self,

conson_xp-1.0.1/src/xp/cli/commands/conbus/conbus_scan_commands.py

@@ -1,125 +0,0 @@
-"""Conbus client operations CLI commands."""
-
-import json
-import threading
-
-import click
-from click import Context
-
-from xp.cli.commands.conbus.conbus import conbus
-from xp.cli.utils.decorators import connection_command
-from xp.cli.utils.serial_number_type import SERIAL
-from xp.models import ConbusResponse
-from xp.services.conbus.conbus_scan_service import ConbusScanService
-
-
-@conbus.command("scan")
-@click.argument("serial_number", type=SERIAL)
-@click.argument("function_code", type=str)
-@click.option(
-    "--background",
-    "-b",
-    default=True,
-    is_flag=True,
-    help="Run scan in background with live output",
-)
-@click.pass_context
-@connection_command()
-def scan_module(
-    ctx: Context, serial_number: str, function_code: str, background: bool
-) -> None:
-    """
-    Scan all datapoints of a function_code for a module.
-
-    Examples:
-
-    \b
-        xp conbus scan 0012345011 02 # Scan all datapoints of function Read data points (02)
-    """
-    service = ctx.obj.get("container").get_container().resolve(ConbusScanService)
-
-    # Shared state for results collection and live output
-    results = []
-    successful_count = 0
-    failed_count = 0
-
-    def progress_callback(response: ConbusResponse, total: int, count: int) -> None:
-        nonlocal successful_count, failed_count
-        results.append(response)
-
-        if count % 10 == 0:
-            click.echo(f"{count}/{total} datapoints scanned.")
-
-        # Count results for JSON output
-        if response.success:
-            successful_count += 1
-        else:
-            failed_count += 1
-
-    try:
-        with service:
-            if background:
-                # Background processing
-
-                # Use background scanning with progress callback
-                scan_complete = threading.Event()
-
-                def background_scan() -> None:
-                    try:
-                        service.scan_module(
-                            serial_number, function_code, progress_callback
-                        )
-                    except (ValueError, KeyError, ConnectionError):
-                        pass  # Will be handled by outer error handling
-                    finally:
-                        scan_complete.set()
-
-                # Start background thread
-                scan_thread = threading.Thread(target=background_scan, daemon=True)
-                scan_thread.start()
-
-                # Wait for completion or user interrupt
-                try:
-                    while not scan_complete.is_set():
-                        scan_complete.wait(1.0)  # Check every second
-                except KeyboardInterrupt:
-                    # Output partial results in JSON format
-                    output = {
-                        "serial_number": serial_number,
-                        "total_scans": len(results),
-                        "successful_scans": successful_count,
-                        "failed_scans": failed_count,
-                        "background_mode": background,
-                        "interrupted": True,
-                        "results": [result.to_dict() for result in results],
-                    }
-                    click.echo(json.dumps(output, indent=2))
-                    raise click.Abort()
-
-                # Wait for thread to complete
-                scan_thread.join(timeout=1.0)
-
-            else:
-                # Traditional synchronous scanning
-                results = service.scan_module(
-                    serial_number,
-                    function_code,
-                    progress_callback,
-                )
-                successful_count = len([r for r in results if r.success])
-                failed_count = len([r for r in results if not r.success])
-
-        # Final output
-        output = {
-            "serial_number": serial_number,
-            "total_scans": len(results),
-            "successful_scans": successful_count,
-            "failed_scans": failed_count,
-            "background_mode": background,
-            "results": [result.to_dict() for result in results],
-        }
-        click.echo(json.dumps(output, indent=2))
-
-    except click.Abort:
-        # User interrupted the scan
-        raise