conson-xp 1.22.0__tar.gz → 1.24.0__tar.gz

{conson_xp-1.22.0 → conson_xp-1.24.0}/PKG-INFO

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

{conson_xp-1.22.0 → conson_xp-1.24.0}/pyproject.toml

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

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/__init__.py

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

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/cli/commands/conbus/conbus_discover_commands.py

@@ -36,6 +36,7 @@ def send_discover_telegram(ctx: click.Context) -> None:
             discovered_devices: Discover response with all found devices.
         """
         click.echo(json.dumps(discovered_devices.to_dict(), indent=2))
+        service.stop_reactor()
 
     def on_device_discovered(discovered_device: DiscoveredDevice) -> None:
         """Handle discovery of sa single module.
@@ -57,5 +58,9 @@ def send_discover_telegram(ctx: click.Context) -> None:
     service: ConbusDiscoverService = (
         ctx.obj.get("container").get_container().resolve(ConbusDiscoverService)
     )
-    service.run(progress, on_device_discovered, on_finish, 5)
-    service.start_reactor()
+    with service:
+        service.on_progress.connect(progress)
+        service.on_device_discovered.connect(on_device_discovered)
+        service.on_finish.connect(on_finish)
+        service.set_timeout(5)
+        service.start_reactor()

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/cli/commands/conbus/conbus_receive_commands.py

@@ -43,8 +43,9 @@ def receive_telegrams(ctx: Context, timeout: float) -> None:
             response_received: Receive response object with telegrams.
         """
         click.echo(json.dumps(response_received.to_dict(), indent=2))
+        service.stop_reactor()
 
-    def progress(telegram_received: str) -> None:
+    def on_progress(telegram_received: str) -> None:
         """Handle progress updates during telegram receive operation.
 
         Args:
@@ -56,5 +57,7 @@ def receive_telegrams(ctx: Context, timeout: float) -> None:
         ctx.obj.get("container").get_container().resolve(ConbusReceiveService)
     )
     with service:
-        service.init(progress, on_finish, timeout)
+        service.on_progress.connect(on_progress)
+        service.on_finish.connect(on_finish)
+        service.set_timeout(timeout)
         service.start_reactor()

conson_xp-1.24.0/src/xp/models/term/connection_state.py

@@ -0,0 +1,58 @@
+"""Connection state management module."""
+
+from enum import Enum
+
+from xp.utils.state_machine import StateMachine
+
+
+class ConnectionState(str, Enum):
+    """Connection state enumeration.
+
+    Attributes:
+        DISCONNECTING: Disconnecting to server.
+        DISCONNECTED: Not connected to server.
+        CONNECTING: Connection in progress.
+        CONNECTED: Successfully connected.
+        FAILED: Connection failed.
+    """
+
+    DISCONNECTING = "DISCONNECTING"
+    DISCONNECTED = "DISCONNECTED"
+    CONNECTING = "CONNECTING"
+    CONNECTED = "CONNECTED"
+    FAILED = "FAILED"
+
+    @staticmethod
+    def create_state_machine() -> StateMachine:
+        """Create and configure state machine for connection management.
+
+        Returns:
+            Configured StateMachine with connection state transitions.
+        """
+        sm = StateMachine(ConnectionState.DISCONNECTED)
+
+        # Define valid transitions
+        sm.define_transition(
+            "connect", {ConnectionState.DISCONNECTED, ConnectionState.FAILED}
+        )
+        sm.define_transition(
+            "disconnect", {ConnectionState.CONNECTED, ConnectionState.CONNECTING}
+        )
+        sm.define_transition(
+            "connecting", {ConnectionState.DISCONNECTED, ConnectionState.FAILED}
+        )
+        sm.define_transition("connected", {ConnectionState.CONNECTING})
+        sm.define_transition(
+            "disconnecting", {ConnectionState.CONNECTED, ConnectionState.CONNECTING}
+        )
+        sm.define_transition("disconnected", {ConnectionState.DISCONNECTING})
+        sm.define_transition(
+            "failed",
+            {
+                ConnectionState.CONNECTING,
+                ConnectionState.CONNECTED,
+                ConnectionState.DISCONNECTING,
+            },
+        )
+
+        return sm

conson_xp-1.24.0/src/xp/models/term/status_message.py

@@ -0,0 +1,16 @@
+"""Status message models for terminal UI."""
+
+from textual.message import Message
+
+
+class StatusMessageChanged(Message):
+    """Message posted when status message changes."""
+
+    def __init__(self, message: str) -> None:
+        """Initialize the message.
+
+        Args:
+            message: The status message to display.
+        """
+        super().__init__()
+        self.message = message

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/services/conbus/conbus_discover_service.py

@@ -4,8 +4,11 @@ This service implements a TCP client that connects to Conbus servers and sends
 discover telegrams to find modules on the network.
 """
 
+import asyncio
 import logging
-from typing import Callable, Optional
+from typing import Any, Optional
+
+from psygnal import Signal
 
 from xp.models import ConbusDiscoverResponse
 from xp.models.conbus.conbus_discover import DiscoveredDevice
@@ -26,9 +29,15 @@ class ConbusDiscoverService:
 
     Attributes:
         conbus_protocol: Protocol instance for Conbus communication.
+        on_progress: Signal emitted when discovery progress is made (with serial number).
+        on_finish: Signal emitted when discovery finishes (with result).
+        on_device_discovered: Signal emitted when a device is discovered (with device info).
     """
 
     conbus_protocol: ConbusEventProtocol
+    on_progress: Signal = Signal(str)
+    on_finish: Signal = Signal(DiscoveredDevice)
+    on_device_discovered: Signal = Signal(ConbusDiscoverResponse)
 
     def __init__(self, conbus_protocol: ConbusEventProtocol) -> None:
         """Initialize the Conbus discover service.
@@ -36,12 +45,6 @@ class ConbusDiscoverService:
         Args:
             conbus_protocol: ConbusProtocol.
         """
-        self.progress_callback: Optional[Callable[[str], None]] = None
-        self.device_discover_callback: Optional[Callable[[DiscoveredDevice], None]] = (
-            None
-        )
-        self.finish_callback: Optional[Callable[[ConbusDiscoverResponse], None]] = None
-
         self.conbus_protocol: ConbusEventProtocol = conbus_protocol
         self.conbus_protocol.on_connection_made.connect(self.connection_made)
         self.conbus_protocol.on_telegram_sent.connect(self.telegram_sent)
@@ -135,9 +138,7 @@ class ConbusDiscoverService:
             "module_type_name": None,
         }
         self.discovered_device_result.discovered_devices.append(device)
-
-        if self.device_discover_callback:
-            self.device_discover_callback(device)
+        self.on_device_discovered.emit(device)
 
         # Send READ_DATAPOINT telegram to query module type
         self.logger.debug(f"Sending module type query for {serial_number}")
@@ -147,8 +148,7 @@ class ConbusDiscoverService:
             system_function=SystemFunction.READ_DATAPOINT,
             data_value=DataPointType.MODULE_TYPE.value,
         )
-        if self.progress_callback:
-            self.progress_callback(serial_number)
+        self.on_progress.emit(serial_number)
 
     def handle_module_type_code_response(
         self, serial_number: str, module_type_code: str
@@ -194,8 +194,7 @@ class ConbusDiscoverService:
                     device["module_type_code"] = code
                     device["module_type_name"] = module_type_name
 
-                    if self.device_discover_callback:
-                        self.device_discover_callback(device)
+                    self.on_device_discovered.emit(device)
 
                     self.logger.debug(
                         f"Updated device {serial_number} with module_type {module_type_name}"
@@ -231,9 +230,7 @@ class ConbusDiscoverService:
                     self.logger.debug(
                         f"Updated device {serial_number} with module_type {module_type}"
                     )
-                    if self.device_discover_callback:
-                        self.device_discover_callback(device)
-
+                    self.on_device_discovered.emit(device)
                     break
 
         self.conbus_protocol.send_telegram(
@@ -249,10 +246,7 @@ class ConbusDiscoverService:
         self.logger.info("Discovery stopped after: %ss", timeout)
         self.discovered_device_result.success = False
         self.discovered_device_result.error = "Discovered device timeout"
-        if self.finish_callback:
-            self.finish_callback(self.discovered_device_result)
-
-        self.stop_reactor()
+        self.on_finish.emit(self.discovered_device_result)
 
     def failed(self, message: str) -> None:
         """Handle failed connection event.
@@ -263,50 +257,64 @@ class ConbusDiscoverService:
         self.logger.debug(f"Failed: {message}")
         self.discovered_device_result.success = False
         self.discovered_device_result.error = message
-        if self.finish_callback:
-            self.finish_callback(self.discovered_device_result)
-
-        self.stop_reactor()
+        self.on_finish.emit(self.discovered_device_result)
 
     def succeed(self) -> None:
         """Handle discovered device success event."""
         self.logger.debug("Succeed")
         self.discovered_device_result.success = True
         self.discovered_device_result.error = None
-        if self.finish_callback:
-            self.finish_callback(self.discovered_device_result)
+        self.on_finish.emit(self.discovered_device_result)
 
-        self.stop_reactor()
+    def set_timeout(self, timeout_seconds: float) -> None:
+        """Setup callbacks and timeout for receiving telegrams.
 
-    def stop_reactor(self) -> None:
-        """Stop reactor."""
-        self.logger.info("Stopping reactor")
-        self.conbus_protocol.stop_reactor()
-
-    def start_reactor(self) -> None:
-        """Start reactor."""
-        self.logger.info("Starting reactor")
-        self.conbus_protocol.start_reactor()
+        Args:
+            timeout_seconds: Optional timeout in seconds.
+        """
+        self.logger.debug("Set timeout")
+        self.conbus_protocol.timeout_seconds = timeout_seconds
 
-    def run(
+    def set_event_loop(
         self,
-        progress_callback: Callable[[str], None],
-        device_discover_callback: Callable[[DiscoveredDevice], None],
-        finish_callback: Callable[[ConbusDiscoverResponse], None],
-        timeout_seconds: Optional[float] = None,
+        event_loop: asyncio.AbstractEventLoop,
     ) -> None:
-        """Run reactor in dedicated thread with its own event loop.
+        """Setup callbacks and timeout for receiving telegrams.
 
         Args:
-            progress_callback: Callback for each discovered device.
-            device_discover_callback: Callback for each discovered device.
-            finish_callback: Callback when discovery completes.
-            timeout_seconds: Optional timeout in seconds.
+            event_loop: Optional event loop to use for async operations.
         """
-        self.logger.info("Starting discovery")
+        self.logger.debug("Set eventloop")
+        self.conbus_protocol.set_event_loop(event_loop)
 
-        if timeout_seconds:
-            self.conbus_protocol.timeout_seconds = timeout_seconds
-        self.progress_callback = progress_callback
-        self.device_discover_callback = device_discover_callback
-        self.finish_callback = finish_callback
+    def start_reactor(self) -> None:
+        """Start the reactor."""
+        self.conbus_protocol.start_reactor()
+
+    def stop_reactor(self) -> None:
+        """Start the reactor."""
+        self.conbus_protocol.stop_reactor()
+
+    def __enter__(self) -> "ConbusDiscoverService":
+        """Enter context manager.
+
+        Returns:
+            Self for context manager protocol.
+        """
+        # Reset state for singleton reuse
+        self.receive_response = ConbusDiscoverResponse(success=True)
+        return self
+
+    def __exit__(
+        self, _exc_type: Optional[type], _exc_val: Optional[Exception], _exc_tb: Any
+    ) -> None:
+        """Exit context manager and disconnect signals."""
+        self.conbus_protocol.on_connection_made.disconnect(self.connection_made)
+        self.conbus_protocol.on_telegram_sent.disconnect(self.telegram_sent)
+        self.conbus_protocol.on_telegram_received.disconnect(self.telegram_received)
+        self.conbus_protocol.on_timeout.disconnect(self.timeout)
+        self.conbus_protocol.on_failed.disconnect(self.failed)
+        self.on_device_discovered.disconnect()
+        self.on_progress.disconnect()
+        self.on_finish.disconnect()
+        self.stop_reactor()

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/services/conbus/conbus_receive_service.py

@@ -6,7 +6,9 @@ allowing clients to receive waiting event telegrams using empty telegram sends.
 
 import asyncio
 import logging
-from typing import Any, Callable, Optional
+from typing import Any, Optional
+
+from psygnal import Signal
 
 from xp.models.conbus.conbus_receive import ConbusReceiveResponse
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
@@ -22,9 +24,13 @@ class ConbusReceiveService:
 
     Attributes:
         conbus_protocol: Protocol instance for Conbus communication.
+        on_progress: Signal emitted when a telegram is received (with telegram frame).
+        on_finish: Signal emitted when receiving finishes (with result).
     """
 
     conbus_protocol: ConbusEventProtocol
+    on_progress: Signal = Signal(str)
+    on_finish: Signal = Signal(ConbusReceiveResponse)
 
     def __init__(self, conbus_protocol: ConbusEventProtocol) -> None:
         """Initialize the Conbus receive service.
@@ -32,8 +38,6 @@ class ConbusReceiveService:
         Args:
             conbus_protocol: ConbusEventProtocol instance.
         """
-        self.progress_callback: Optional[Callable[[str], None]] = None
-        self.finish_callback: Optional[Callable[[ConbusReceiveResponse], None]] = None
         self.receive_response: ConbusReceiveResponse = ConbusReceiveResponse(
             success=True
         )
@@ -67,8 +71,7 @@ class ConbusReceiveService:
             telegram_received: The telegram received event.
         """
         self.logger.debug(f"Telegram received: {telegram_received}")
-        if self.progress_callback:
-            self.progress_callback(telegram_received.frame)
+        self.on_progress.emit(telegram_received.frame)
 
         if not self.receive_response.received_telegrams:
             self.receive_response.received_telegrams = []
@@ -79,8 +82,7 @@ class ConbusReceiveService:
         timeout = self.conbus_protocol.timeout_seconds
         self.logger.info("Receive stopped after: %ss", timeout)
         self.receive_response.success = True
-        if self.finish_callback:
-            self.finish_callback(self.receive_response)
+        self.on_finish.emit(self.receive_response)
 
     def failed(self, message: str) -> None:
         """Handle failed connection event.
@@ -91,37 +93,37 @@ class ConbusReceiveService:
         self.logger.debug("Failed %s:", message)
         self.receive_response.success = False
         self.receive_response.error = message
-        if self.finish_callback:
-            self.finish_callback(self.receive_response)
+        self.on_finish.emit(self.receive_response)
+
+    def set_timeout(self, timeout_seconds: float) -> None:
+        """Setup callbacks and timeout for receiving telegrams.
 
-    def init(
+        Args:
+            timeout_seconds: Optional timeout in seconds.
+        """
+        self.logger.debug("Set timeout")
+        self.conbus_protocol.timeout_seconds = timeout_seconds
+
+    def set_event_loop(
         self,
-        progress_callback: Callable[[str], None],
-        finish_callback: Callable[[ConbusReceiveResponse], None],
-        timeout_seconds: Optional[float] = None,
-        event_loop: Optional[asyncio.AbstractEventLoop] = None,
+        event_loop: asyncio.AbstractEventLoop,
     ) -> None:
         """Setup callbacks and timeout for receiving telegrams.
 
         Args:
-            progress_callback: Callback for each received telegram.
-            finish_callback: Callback when receiving completes.
-            timeout_seconds: Optional timeout in seconds.
             event_loop: Optional event loop to use for async operations.
         """
-        self.logger.info("Starting receive")
-        if timeout_seconds:
-            self.conbus_protocol.timeout_seconds = timeout_seconds
-        self.progress_callback = progress_callback
-        self.finish_callback = finish_callback
-
-        if event_loop:
-            self.conbus_protocol.set_event_loop(event_loop)
+        self.logger.debug("Set eventloop")
+        self.conbus_protocol.set_event_loop(event_loop)
 
     def start_reactor(self) -> None:
         """Start the reactor."""
         self.conbus_protocol.start_reactor()
 
+    def stop_reactor(self) -> None:
+        """Start the reactor."""
+        self.conbus_protocol.stop_reactor()
+
     def __enter__(self) -> "ConbusReceiveService":
         """Enter context manager.
 
@@ -141,3 +143,6 @@ class ConbusReceiveService:
         self.conbus_protocol.on_telegram_received.disconnect(self.telegram_received)
         self.conbus_protocol.on_timeout.disconnect(self.timeout)
         self.conbus_protocol.on_failed.disconnect(self.failed)
+        self.on_progress.disconnect()
+        self.on_finish.disconnect()
+        self.stop_reactor()

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/services/protocol/conbus_event_protocol.py

@@ -17,7 +17,7 @@ from twisted.internet.interfaces import IAddress, IConnector
 from twisted.internet.posixbase import PosixReactorBase
 from twisted.python.failure import Failure
 
-from xp.models import ConbusClientConfig
+from xp.models import ConbusClientConfig, ModuleTypeCode
 from xp.models.protocol.conbus_protocol import (
     TelegramReceivedEvent,
 )
@@ -168,9 +168,6 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
 
         Args:
             data: Raw telegram payload (without checksum/framing).
-
-        Raises:
-            IOError: If transport is not open.
         """
         self.on_send_frame.emit(data)
 
@@ -180,8 +177,9 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         frame = b"<" + frame_data.encode() + b">"
 
         if not self.transport:
-            self.logger.info("Invalid transport")
-            raise IOError("Transport is not open")
+            self.logger.info("Invalid transport, connection closed.")
+            self.on_connection_failed.emit(Failure("Invalid transport."))
+            return
 
         self.logger.debug(f"Sending frame: {frame.decode()}")
         self.transport.write(frame)  # type: ignore
@@ -211,6 +209,21 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         )
         self.send_raw_telegram(payload)
 
+    def send_event_telegram(
+        self, module_type_code: ModuleTypeCode, link_number: int, input_number: int
+    ) -> None:
+        """Send telegram with specified parameters.
+
+        Args:
+            module_type_code: Type code of module.
+            link_number: Link number.
+            input_number: Input number.
+        """
+        payload = (
+            f"E" f"{module_type_code}" f"L{link_number:02d}" f"I{input_number:02d}"
+        )
+        self.send_raw_telegram(payload)
+
     def send_raw_telegram(self, payload: str) -> None:
         """Send telegram with specified parameters.
 

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/term/protocol.py

@@ -7,6 +7,7 @@ from textual.app import App, ComposeResult
 from textual.containers import Horizontal
 
 from xp.models.term import ProtocolKeysConfig
+from xp.models.term.status_message import StatusMessageChanged
 from xp.term.widgets.help_menu import HelpMenuWidget
 from xp.term.widgets.protocol_log import ProtocolLogWidget
 from xp.term.widgets.status_footer import StatusFooterWidget
@@ -125,3 +126,12 @@ class ProtocolMonitorApp(App[None]):
         """
         if self.footer_widget:
             self.footer_widget.update_status(state)
+
+    def on_status_message_changed(self, message: StatusMessageChanged) -> None:
+        """Handle status message changes from protocol widget.
+
+        Args:
+            message: Message containing the status text.
+        """
+        if self.footer_widget:
+            self.footer_widget.update_message(message.message)

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/term/protocol.tcss

@@ -119,7 +119,7 @@ Footer {
 #status-text {
     dock: right;
     width: auto;
-    padding: 0 1;
+    padding: 0 3;
     background: $background;
     color: $text;
     text-align: right;

{conson_xp-1.22.0 → conson_xp-1.24.0}/src/xp/term/protocol.yml

@@ -63,8 +63,8 @@ protocol:
   "e":
     name: "Link 1 Off"
     telegrams:
-      - E02L01I00M
-      - E02L01I00B
+      - E02L01I09M
+      - E02L01I09B
 
   "f":
     name: "Link 2 On"
@@ -75,8 +75,8 @@ protocol:
   "g":
     name: "Link 2 Off"
     telegrams:
-      - E02L02I00M
-      - E02L02I00B
+      - E02L02I09M
+      - E02L02I09B
 
   "h":
     name: "Link 3 On"
@@ -87,8 +87,8 @@ protocol:
   "i":
     name: "Link 3 Off"
     telegrams:
-      - E02L03I00M
-      - E02L03I00B
+      - E02L03I09M
+      - E02L03I09B
 
   "j":
     name: "Link 4 On"
@@ -99,8 +99,8 @@ protocol:
   "k":
     name: "Link 4 Off"
     telegrams:
-      - E02L04I00M
-      - E02L04I00B
+      - E02L04I09M
+      - E02L04I09B
 
   "l":
     name: "Link 5 On"
@@ -111,8 +111,8 @@ protocol:
   "m":
     name: "Link 5 Off"
     telegrams:
-      - E02L05I00M
-      - E02L05I00B
+      - E02L05I09M
+      - E02L05I09B
 
   "n":
     name: "Link 6 On"
@@ -123,8 +123,8 @@ protocol:
   "o":
     name: "Link 6 Off"
     telegrams:
-      - E02L06I00M
-      - E02L06I00B
+      - E02L06I09M
+      - E02L06I09B
 
   "p":
     name: "Link 7 On"
@@ -135,5 +135,5 @@ protocol:
   "q":
     name: "Link 7 Off"
     telegrams:
-      - E02L07I00M
-      - E02L07I00B
+      - E02L07I09M
+      - E02L07I09B