conson-xp 1.20.0__tar.gz → 1.21.0__tar.gz

{conson_xp-1.20.0 → conson_xp-1.21.0}/PKG-INFO

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

{conson_xp-1.20.0 → conson_xp-1.21.0}/pyproject.toml

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

{conson_xp-1.20.0 → conson_xp-1.21.0}/src/xp/__init__.py

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

{conson_xp-1.20.0 → conson_xp-1.21.0}/src/xp/cli/commands/term/term_commands.py

@@ -21,7 +21,7 @@ def protocol_monitor(ctx: Context) -> None:
         \b
         xp term protocol
     """
-    from xp.tui.app import ProtocolMonitorApp
+    from xp.term.app import ProtocolMonitorApp
 
     # Resolve ServiceContainer from context
     container = ctx.obj.get("container").get_container()

conson_xp-1.21.0/src/xp/models/term/__init__.py

@@ -0,0 +1,11 @@
+"""Terminal UI models."""
+
+from xp.models.term.protocol_keys_config import (
+    ProtocolKeyConfig,
+    ProtocolKeysConfig,
+)
+
+__all__ = [
+    "ProtocolKeyConfig",
+    "ProtocolKeysConfig",
+]

conson_xp-1.21.0/src/xp/models/term/protocol_keys_config.py

@@ -0,0 +1,45 @@
+"""Protocol keys configuration model."""
+
+from pathlib import Path
+from typing import Dict
+
+import yaml
+from pydantic import BaseModel, Field
+
+
+class ProtocolKeyConfig(BaseModel):
+    """Configuration for a single protocol key.
+
+    Attributes:
+        name: Human-readable command name.
+        telegrams: List of raw telegram strings to send (without angle brackets).
+    """
+
+    name: str = Field(..., description="Human-readable command name")
+    telegrams: list[str] = Field(..., description="List of raw telegram strings")
+
+
+class ProtocolKeysConfig(BaseModel):
+    """Protocol keys configuration.
+
+    Attributes:
+        protocol: Dictionary mapping key to protocol configuration.
+    """
+
+    protocol: Dict[str, ProtocolKeyConfig] = Field(
+        default_factory=dict, description="Protocol key mappings"
+    )
+
+    @classmethod
+    def from_yaml(cls, config_path: Path) -> "ProtocolKeysConfig":
+        """Load protocol keys from YAML file.
+
+        Args:
+            config_path: Path to YAML configuration file.
+
+        Returns:
+            ProtocolKeysConfig instance.
+        """
+        with config_path.open("r") as f:
+            data = yaml.safe_load(f)
+        return cls(**data)

{conson_xp-1.20.0 → conson_xp-1.21.0}/src/xp/services/protocol/conbus_event_protocol.py

@@ -209,6 +209,14 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
             f"F{system_function.value}"
             f"D{data_value}"
         )
+        self.send_raw_telegram(payload)
+
+    def send_raw_telegram(self, payload: str) -> None:
+        """Send telegram with specified parameters.
+
+        Args:
+            payload: Telegram to send.
+        """
         self.telegram_queue.put_nowait(payload.encode())
         self.call_later(0.0, self.start_queue_manager)
 

conson_xp-1.21.0/src/xp/term/app.py

@@ -0,0 +1,158 @@
+"""Protocol Monitor TUI Application."""
+
+from pathlib import Path
+from typing import Any, Optional
+
+from textual.app import App, ComposeResult
+from textual.containers import Horizontal, Vertical
+from textual.widgets import DataTable, Footer, Static
+
+from xp.models.term import ProtocolKeysConfig
+from xp.term.widgets.protocol_log import ProtocolLogWidget
+
+
+class ProtocolMonitorApp(App[None]):
+    """Textual app for real-time protocol monitoring.
+
+    Displays live RX/TX telegram stream from Conbus server in an interactive
+    terminal interface with keyboard shortcuts for control.
+
+    Attributes:
+        container: ServiceContainer for dependency injection.
+        CSS_PATH: Path to CSS stylesheet file.
+        BINDINGS: Keyboard bindings for app actions.
+        TITLE: Application title displayed in header.
+        ENABLE_COMMAND_PALETTE: Disable Textual's command palette feature.
+    """
+
+    CSS_PATH = Path(__file__).parent / "protocol.tcss"
+    TITLE = "Protocol Monitor"
+    ENABLE_COMMAND_PALETTE = False
+
+    BINDINGS = [
+        ("Q", "quit", "Quit"),
+        ("C", "toggle_connection", "Connect"),
+        ("R", "reset", "Reset"),
+        ("0-9,a-q", "protocol_keys", "Keys"),
+    ]
+
+    def __init__(self, container: Any) -> None:
+        """Initialize the Protocol Monitor app.
+
+        Args:
+            container: ServiceContainer for resolving services.
+        """
+        super().__init__()
+        self.container = container
+        self.protocol_widget: Optional[ProtocolLogWidget] = None
+        self.status_widget: Optional[Static] = None
+        self.status_text_widget: Optional[Static] = None
+        self.help_table: Optional[DataTable] = None
+        self.protocol_keys = self._load_protocol_keys()
+
+    def _load_protocol_keys(self) -> ProtocolKeysConfig:
+        """Load protocol keys from YAML config file.
+
+        Returns:
+            ProtocolKeysConfig instance.
+        """
+        config_path = Path(__file__).parent / "protocol.yml"
+        return ProtocolKeysConfig.from_yaml(config_path)
+
+    def compose(self) -> ComposeResult:
+        """Compose the app layout with widgets.
+
+        Yields:
+            ProtocolLogWidget and Footer widgets.
+        """
+        with Horizontal(id="main-container"):
+            self.protocol_widget = ProtocolLogWidget(container=self.container)
+            yield self.protocol_widget
+
+            # Help menu (hidden by default)
+            help_container = Vertical(id="help-menu")
+            help_container.border_title = "Help menu"
+            help_container.can_focus = False
+            with help_container:
+                self.help_table = DataTable(id="help-table", show_header=False)
+                self.help_table.can_focus = False
+                yield self.help_table
+
+        with Horizontal(id="footer-container"):
+            yield Footer()
+            self.status_widget = Static("○", id="status-line")
+            yield self.status_widget
+
+    def action_toggle_connection(self) -> None:
+        """Toggle connection on 'c' key press.
+
+        Connects if disconnected/failed, disconnects if connected/connecting.
+        """
+        if self.protocol_widget:
+            from xp.term.widgets.protocol_log import ConnectionState
+
+            state = self.protocol_widget.connection_state
+            if state in (ConnectionState.CONNECTED, ConnectionState.CONNECTING):
+                self.protocol_widget.disconnect()
+            else:
+                self.protocol_widget.connect()
+
+    def action_reset(self) -> None:
+        """Reset and clear protocol widget on 'r' key press."""
+        if self.protocol_widget:
+            self.protocol_widget.clear_log()
+
+    def on_key(self, event: Any) -> None:
+        """Handle key press events for protocol keys.
+
+        Args:
+            event: Key press event from Textual.
+        """
+        if event.key in self.protocol_keys.protocol and self.protocol_widget:
+            key_config = self.protocol_keys.protocol[event.key]
+            for telegram in key_config.telegrams:
+                self.protocol_widget.send_telegram(key_config.name, telegram)
+
+    def on_mount(self) -> None:
+        """Set up status line updates when app mounts."""
+        if self.protocol_widget:
+            self.protocol_widget.watch(
+                self.protocol_widget,
+                "connection_state",
+                self._update_status,
+            )
+
+        # Initialize help table
+        if self.help_table:
+            self.help_table.add_columns("Key", "Command")
+            for key, config in self.protocol_keys.protocol.items():
+                self.help_table.add_row(key, config.name)
+
+    def _update_status(self, state: Any) -> None:
+        """Update status line with connection state.
+
+        Args:
+            state: Current connection state.
+        """
+        if self.status_widget:
+            # Map states to colored dots
+            status_map = {
+                "CONNECTED": "[green]●[/green]",
+                "CONNECTING": "[yellow]●[/yellow]",
+                "DISCONNECTING": "[yellow]●[/yellow]",
+                "FAILED": "[red]●[/red]",
+                "DISCONNECTED": "○",
+            }
+            dot = status_map.get(state.value, "○")
+            self.status_widget.update(dot)
+
+    def on_protocol_log_widget_status_message_changed(
+        self, message: ProtocolLogWidget.StatusMessageChanged
+    ) -> None:
+        """Handle status message changes from protocol widget.
+
+        Args:
+            message: Message containing the status text.
+        """
+        if self.status_text_widget:
+            self.status_text_widget.update(message.message)

conson_xp-1.21.0/src/xp/term/protocol.tcss

@@ -0,0 +1,135 @@
+/* Protocol Monitor TUI Styling */
+
+/* App-level styling */
+Screen {
+    background: $background;
+}
+
+/* Protocol Log Widget */
+ProtocolLogWidget {
+    border: solid $success;
+    width: 1fr;
+    height: 1fr;
+    background: $background;
+    padding: 1;
+}
+
+ProtocolLogWidget > RichLog {
+    background: $background !important;
+    scrollbar-background: $background;
+}
+
+ProtocolLogWidget > RichLog:focus {
+    background: $background !important;
+    background-tint: transparent;
+}
+
+ProtocolLogWidget > .connection-status {
+    color: $text;
+    text-align: center;
+    padding: 1;
+}
+
+ProtocolLogWidget > .connection-status.connecting {
+    color: $warning;
+}
+
+ProtocolLogWidget > .connection-status.connected {
+    color: $success;
+}
+
+ProtocolLogWidget > .connection-status.failed {
+    color: $error;
+}
+
+/* Message display styling */
+.message-tx {
+    color: $success;
+}
+
+.message-rx {
+    color: $success;
+}
+
+.message-frame {
+    color: $text-muted;
+}
+
+/* Main container */
+#main-container {
+    height: 1fr;
+}
+
+/* Help menu styling */
+#help-menu {
+    width: 35;
+    height: 1fr;
+    background: $background;
+    border: solid $success;
+    padding: 1;
+}
+
+#help-menu:focus {
+    border: solid $success;
+}
+
+#help-title {
+    color: $success;
+    text-align: center;
+    text-style: bold;
+    margin-bottom: 1;
+}
+
+#help-table {
+    background: $background;
+    height: auto;
+    color: $success;
+}
+
+DataTable {
+    background: $background;
+}
+
+DataTable > .datatable--header {
+    background: $background;
+    color: $success;
+}
+
+DataTable > .datatable--cursor {
+    background: $background;
+}
+
+DataTable:focus > .datatable--cursor {
+    background: $background;
+}
+
+/* Footer styling */
+#footer-container {
+    dock: bottom;
+    height: 1;
+    background: $background;
+}
+
+Footer {
+    width: auto;
+    background: $background;
+    color: $text;
+}
+
+#status-text {
+    dock: right;
+    width: auto;
+    padding: 0 1;
+    background: $background;
+    color: $text;
+    text-align: right;
+}
+
+#status-line {
+    dock: right;
+    width: auto;
+    padding: 0 1;
+    background: $background;
+    color: $text;
+    text-align: right;
+}

conson_xp-1.21.0/src/xp/term/protocol.yml

@@ -0,0 +1,139 @@
+protocol:
+  "1":
+    name: "Discover"
+    telegrams:
+      - S0000000000F01D00
+  "2":
+    name: "Error Code"
+    telegrams:
+      - S0020044966F02D10
+  "3":
+    name: "Module Type"
+    telegrams:
+      - S0020044966F02D00
+  "4":
+    name: "Auto Report"
+    telegrams:
+      - S0020044966F02D21
+  "5":
+    name: "Link Number"
+    telegrams:
+      - S0020044966F02D04
+  "6":
+    name: "Blink On"
+    telegrams:
+      - S0020044966F01D01
+  "7":
+    name: "Blink Off"
+    telegrams:
+      - S0020044966F01D00
+  "8":
+    name: "Output 1 On"
+    telegrams:
+      - S0020044966F02101
+  "9":
+    name: "Output 1 Off"
+    telegrams:
+      - S0020044966F02100
+  "0":
+    name: "Output State"
+    telegrams:
+      - S0020044966F02D09
+  "a":
+    name: "Module State"
+    telegrams:
+      - S0020044966F02D09
+  "b":
+    name: "All Off"
+    telegrams:
+      - E02L00I00M
+      - E02L00I00B
+  "c":
+    name: "All On"
+    telegrams:
+      - E02L00I08M
+      - E02L00I08B
+
+  "d":
+    name: "All 1 On"
+    telegrams:
+      - E02L01I08M
+      - E02L01I08B
+
+  "e":
+    name: "All 1 Off"
+    telegrams:
+      - E02L01I00M
+      - E02L01I00B
+
+  "f":
+    name: "All 2 On"
+    telegrams:
+      - E02L02I08M
+      - E02L02I08B
+
+  "g":
+    name: "All 2 Off"
+    telegrams:
+      - E02L02I00M
+      - E02L02I00B
+
+  "h":
+    name: "All 3 On"
+    telegrams:
+      - E02L03I08M
+      - E02L03I08B
+
+  "i":
+    name: "All 3 Off"
+    telegrams:
+      - E02L03I00M
+      - E02L03I00B
+
+  "j":
+    name: "All 4 On"
+    telegrams:
+      - E02L04I08M
+      - E02L04I08B
+
+  "k":
+    name: "All 4 Off"
+    telegrams:
+      - E02L04I00M
+      - E02L04I00B
+
+  "l":
+    name: "All 5 On"
+    telegrams:
+      - E02L05I08M
+      - E02L05I08B
+
+  "m":
+    name: "All 5 Off"
+    telegrams:
+      - E02L05I00M
+      - E02L05I00B
+
+  "n":
+    name: "All 6 On"
+    telegrams:
+      - E02L06I08M
+      - E02L06I08B
+
+  "o":
+    name: "All 6 Off"
+    telegrams:
+      - E02L06I00M
+      - E02L06I00B
+
+  "p":
+    name: "All 7 On"
+    telegrams:
+      - E02L07I08M
+      - E02L07I08B
+
+  "q":
+    name: "All 7 Off"
+    telegrams:
+      - E02L07I00M
+      - E02L07I00B