conson-xp 1.22.0__py3-none-any.whl → 1.23.0__py3-none-any.whl

{conson_xp-1.22.0.dist-info → conson_xp-1.23.0.dist-info}/METADATA

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

{conson_xp-1.22.0.dist-info → conson_xp-1.23.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.22.0.dist-info/METADATA,sha256=SHz732F4Z0CbbWIukCpttstkgiNLFBgqYAZQg94OkEk,10298
-conson_xp-1.22.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.22.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.22.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=cGDFz-p2G9nzESEviCX7b8voSRj-fYSsRjnhBPsDwSE,181
+conson_xp-1.23.0.dist-info/METADATA,sha256=z9DdbWCsagoeEX32rY76lsao7924etwx1cYvdWevwSg,10298
+conson_xp-1.23.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.23.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.23.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=a3NpXD1LnawKeJVM7klz-0Z1EzpYFllOS4ifHJUbU_4,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=noh8fdZAWq-ihJEboP8WugbIgq4LJ3jUWMRA7720xWE,4909
@@ -105,7 +105,9 @@ xp/models/telegram/telegram.py,sha256=IJUxHX6ftLcET9C1pjvLhUO5Db5JO6W7rUItzdEW30
 xp/models/telegram/telegram_type.py,sha256=GhqKP63oNMyh2tIvCPcsC5RFp4s4JjhmEqCLCC-8XMk,423
 xp/models/telegram/timeparam_type.py,sha256=Ar8xvSfPmOAgR2g2Je0FgvP01SL7bPvZn5_HrVDpmJM,1137
 xp/models/term/__init__.py,sha256=c1AMtVitYk80o9K_zWjYNzZYpFDASqM8S1Djm1PD4Qo,192
+xp/models/term/connection_state.py,sha256=floDRMeMcfgMrYIVsyoVHBXHtxd3hqm-xOdr3oXtaHY,1793
 xp/models/term/protocol_keys_config.py,sha256=CTujcfI2_NOeltjvHy_cnsHzxLSVsGFXieMZlD-zj0Q,1204
+xp/models/term/status_message.py,sha256=DOmzL0dbig5mP1UEoXdgzGT4UG2RyAXa_yRVo5c4x8w,394
 xp/models/write_config_type.py,sha256=T2RaO52RpzoJ4782uMHE-fX7Ymx3CaIQAEwByydXq1M,881
 xp/services/__init__.py,sha256=W9YZyrkh7vm--ZHhAXNQiOYQs5yhhmUHXP5I0Lf1XBg,782
 xp/services/actiontable/__init__.py,sha256=z6js4EuJ6xKHaseTEhuEvKo1tr9K1XyQiruReJtBiPY,26
@@ -151,7 +153,7 @@ xp/services/homekit/homekit_service.py,sha256=0lW-hg40ETco3gDBEYkR_sX-UIYsLSKCD4
 xp/services/log_file_service.py,sha256=fvPcZQj8XOKUA-4ep5R8n0PelvwvRlTLlVxvIWM5KR4,10506
 xp/services/module_type_service.py,sha256=xWhr1EAZMykL5uNWHWdpa5T8yNruGKH43XRTOS8GwZg,7477
 xp/services/protocol/__init__.py,sha256=qRufBmqRKGzpuzZ5bxBbmwf510TT00Ke8s5HcWGnqRY,818
-xp/services/protocol/conbus_event_protocol.py,sha256=t_ovcLbwXays-y8u-EqFpDSfo2Xc_BNl3jAj9PqxRwg,13885
+xp/services/protocol/conbus_event_protocol.py,sha256=h9ZdnN9CWSBXQqE-M9qmPPbMT3r25cxzXuJsvURp1WQ,14390
 xp/services/protocol/conbus_protocol.py,sha256=JO7yLkD_ohPT0ETjnAIx4CGpZyobf4LdbuozM_43btE,10276
 xp/services/protocol/protocol_factory.py,sha256=PmjN9AtW9sxNo3voqUiNgQA-pTvX1RW4XXFlHKfFr5Q,2470
 xp/services/protocol/telegram_protocol.py,sha256=Ki5DrXsKxiaqLcdP9WWUuhUI7cPu2DfwyZkh-Gv9Lb8,9496
@@ -176,13 +178,13 @@ xp/services/telegram/telegram_output_service.py,sha256=UaUv_14fR8o5K2PxQBXrCzx-H
 xp/services/telegram/telegram_service.py,sha256=XrP1CPi0ckxoKBaNwLA6lo-TogWxXgmXDOsU4Xl8BlY,13237
 xp/services/telegram/telegram_version_service.py,sha256=M5HdOTsLdcwo122FP-jW6R740ktLrtKf2TiMDVz23h8,10528
 xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
-xp/term/protocol.py,sha256=ERntzYvNMyI-VDCYW7EnhpPu-V6WPmyEk0xcQfm7LFM,4399
-xp/term/protocol.tcss,sha256=biaIv6X-bmD1tbXENFUNsXOF8ABkuoRAUgeSDqwudtQ,2126
+xp/term/protocol.py,sha256=acYYsv7_4z5ePrnslSC1exKzqbKOE5ZGds4J33Q2XNs,4784
+xp/term/protocol.tcss,sha256=r_KfxrbpycGHLVXqZc6INBBcUJME0hLrAZkF1oqnab4,2126
 xp/term/protocol.yml,sha256=kiTe_QSMPmLvLA0ZyIhNaDPwBdi6khh5C1NSR7I9TN0,2124
 xp/term/widgets/__init__.py,sha256=ftWmN_fmjxy2E8Qfm-YSRmzKfgL0KTBCTpgvYWCPbUY,274
 xp/term/widgets/help_menu.py,sha256=bdT5AYRdtKt_tvZTVbG7-DPMb1mj78kggtjjsa-95BA,1780
-xp/term/widgets/protocol_log.py,sha256=yuSfc61azgQmWQxLvBcmVik3cJAW1Hocj2Sk8qr3hSg,14343
-xp/term/widgets/status_footer.py,sha256=VTN5owCprMbYmNiEbNWS_4CE8yxysDi8IBCECuU9EQY,1663
+xp/term/widgets/protocol_log.py,sha256=OeVg9VCvIl9HXm6j_HPAGOIAYxO0MxlKcS9QmBEOKx4,13018
+xp/term/widgets/status_footer.py,sha256=eRZHkrG5aZCMulibX56KfFyGHS8IgL-7psvr9f9S6FI,1992
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=HDpiQxmdIedbCbZ4o_Box0i_Zig417BtCV_46ZyhiTk,1711
 xp/utils/dependencies.py,sha256=ECS6p0eXzocM5INLwJeckHXn_Dim18uOjXTJ29qQvkQ,22001
@@ -191,4 +193,4 @@ xp/utils/logging.py,sha256=rZDXwlBrYK8A6MPq5StsMNpgsRowzJXM6fvROPwJdGM,3750
 xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
 xp/utils/state_machine.py,sha256=Oe2sLwCh9z_vr1tF6X0ZRGTeuckRQAGzmef7xc9CNdc,2413
 xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
-conson_xp-1.22.0.dist-info/RECORD,,
+conson_xp-1.23.0.dist-info/RECORD,,

xp/__init__.py

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

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

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

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.
 

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)

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;

xp/term/widgets/protocol_log.py

@@ -2,71 +2,18 @@
 
 import asyncio
 import logging
-from enum import Enum
 from typing import Any, Optional
 
-from textual.message import Message
 from textual.reactive import reactive
 from textual.widget import Widget
 from textual.widgets import RichLog
+from twisted.python.failure import Failure
 
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
+from xp.models.term.connection_state import ConnectionState
+from xp.models.term.status_message import StatusMessageChanged
 from xp.services.conbus.conbus_receive_service import ConbusReceiveService
 from xp.services.protocol import ConbusEventProtocol
-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"
-
-
-def create_connection_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
 
 
 class ProtocolLogWidget(Widget):
@@ -84,18 +31,6 @@ class ProtocolLogWidget(Widget):
         log_widget: RichLog widget for displaying messages.
     """
 
-    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
-
     connection_state = reactive(ConnectionState.DISCONNECTED)
 
     def __init__(self, container: Any) -> None:
@@ -111,7 +46,7 @@ class ProtocolLogWidget(Widget):
         self.service: Optional[ConbusReceiveService] = None
         self.logger = logging.getLogger(__name__)
         self.log_widget: Optional[RichLog] = None
-        self._state_machine = create_connection_state_machine()
+        self._state_machine = ConnectionState.create_state_machine()
 
     def compose(self) -> Any:
         """Compose the widget layout.
@@ -134,6 +69,7 @@ class ProtocolLogWidget(Widget):
 
         # Connect psygnal signals
         self.protocol.on_connection_made.connect(self._on_connection_made)
+        self.protocol.on_connection_failed.connect(self._on_connection_failed)
         self.protocol.on_telegram_received.connect(self._on_telegram_received)
         self.protocol.on_telegram_sent.connect(self._on_telegram_sent)
         self.protocol.on_timeout.connect(self._on_timeout)
@@ -169,10 +105,8 @@ class ProtocolLogWidget(Widget):
             # Transition to CONNECTING
             if self._state_machine.transition("connecting", ConnectionState.CONNECTING):
                 self.connection_state = ConnectionState.CONNECTING
-                self.post_message(
-                    self.StatusMessageChanged(
-                        f"Connecting to {self.protocol.cli_config.ip}:{self.protocol.cli_config.port}..."
-                    )
+                self.post_status(
+                    f"Connecting to {self.protocol.cli_config.ip}:{self.protocol.cli_config.port}..."
                 )
 
             # Store protocol reference
@@ -222,15 +156,16 @@ class ProtocolLogWidget(Widget):
 
         except Exception as e:
             self.logger.error(f"Connection failed: {e}")
+            self.post_status(f"Connection failed: {e}")
             # Transition to FAILED
             if self._state_machine.transition("failed", ConnectionState.FAILED):
                 self.connection_state = ConnectionState.FAILED
-                self.post_message(self.StatusMessageChanged(f"Connection error: {e}"))
 
     def _start_connection(self) -> None:
         """Start connection (sync wrapper for async method)."""
         # Use run_worker to run async method from sync context
         self.logger.debug("Start connection")
+        self.post_status("Start connection")
         self.run_worker(self._start_connection_async(), exclusive=True)
 
     def _on_connection_made(self) -> None:
@@ -239,16 +174,26 @@ class ProtocolLogWidget(Widget):
         Sets state to CONNECTED and displays success message.
         """
         self.logger.debug("Connection made")
+        self.post_status("Connection made")
         # Transition to CONNECTED
         if self._state_machine.transition("connected", ConnectionState.CONNECTED):
             self.connection_state = ConnectionState.CONNECTED
             if self.protocol:
-                self.post_message(
-                    self.StatusMessageChanged(
-                        f"Connected to {self.protocol.cli_config.ip}:{self.protocol.cli_config.port}"
-                    )
+                self.post_status(
+                    f"Connected to {self.protocol.cli_config.ip}:{self.protocol.cli_config.port}"
                 )
 
+    def _on_connection_failed(self, failure: Failure) -> None:
+        """Handle connection failed signal.
+
+        Sets state to DISCONNECTED and displays success message.
+        """
+        self.logger.debug("Connection failed")
+        self.post_status(failure.getErrorMessage())
+        # Transition to CONNECTED
+        if self._state_machine.transition("disconnected", ConnectionState.DISCONNECTED):
+            self.connection_state = ConnectionState.DISCONNECTED
+
     def _on_telegram_received(self, event: TelegramReceivedEvent) -> None:
         """Handle telegram received signal.
 
@@ -289,7 +234,15 @@ class ProtocolLogWidget(Widget):
         if self._state_machine.transition("failed", ConnectionState.FAILED):
             self.connection_state = ConnectionState.FAILED
             self.logger.error(f"Connection failed: {error}")
-            self.post_message(self.StatusMessageChanged(f"Failed: {error}"))
+            self.post_status(f"Failed: {error}")
+
+    def post_status(self, message: str) -> None:
+        """Post status message.
+
+        Args:
+            message: message to be sent to status bar.
+        """
+        self.post_message(StatusMessageChanged(message))
 
     def connect(self) -> None:
         """Connect to Conbus server.
@@ -326,7 +279,7 @@ class ProtocolLogWidget(Widget):
             "disconnecting", ConnectionState.DISCONNECTING
         ):
             self.connection_state = ConnectionState.DISCONNECTING
-            self.post_message(self.StatusMessageChanged("Disconnecting..."))
+            self.post_status("Disconnecting...")
 
         if self.protocol:
             self.protocol.disconnect()
@@ -334,7 +287,7 @@ class ProtocolLogWidget(Widget):
         # Transition to DISCONNECTED
         if self._state_machine.transition("disconnected", ConnectionState.DISCONNECTED):
             self.connection_state = ConnectionState.DISCONNECTED
-            self.post_message(self.StatusMessageChanged("Disconnected"))
+            self.post_status("Disconnected")
 
     def send_telegram(self, name: str, telegram: str) -> None:
         """Send a raw telegram string.
@@ -349,19 +302,19 @@ class ProtocolLogWidget(Widget):
 
         try:
             # Remove angle brackets if present
-            self.post_message(self.StatusMessageChanged(f"Sending {name}..."))
+            self.post_status(f"{name} sent.")
             # Send raw telegram
             self.protocol.send_raw_telegram(telegram)
 
         except Exception as e:
             self.logger.error(f"Failed to send telegram: {e}")
-            self.post_message(self.StatusMessageChanged(f"Failed: {e}"))
+            self.post_status(f"Failed: {e}")
 
     def clear_log(self) -> None:
         """Clear the protocol log widget."""
         if self.log_widget:
             self.log_widget.clear()
-            self.post_message(self.StatusMessageChanged("Log cleared"))
+            self.post_status("Log cleared")
 
     def on_unmount(self) -> None:
         """Clean up when widget unmounts.

xp/term/widgets/status_footer.py

@@ -25,6 +25,7 @@ class StatusFooterWidget(Horizontal):
             kwargs: Additional keyword arguments for Horizontal.
         """
         super().__init__(*args, **kwargs)
+        self.status_text_widget: Static = Static("", id="status-text")
         self.status_widget: Static = Static("○", id="status-line")
 
     def compose(self) -> ComposeResult:
@@ -34,6 +35,7 @@ class StatusFooterWidget(Horizontal):
             Footer and status indicator widgets.
         """
         yield Footer()
+        yield self.status_text_widget
         yield self.status_widget
 
     def update_status(self, state: Any) -> None:
@@ -51,3 +53,11 @@ class StatusFooterWidget(Horizontal):
             "DISCONNECTED": "○",
         }.get(state.value, "○")
         self.status_widget.update(dot)
+
+    def update_message(self, message: str) -> None:
+        """Update status text with message.
+
+        Args:
+            message: Status message to display.
+        """
+        self.status_text_widget.update(message)