Redesigned the TUI and hierarchicaly organized the information

Author: kaja-s

tui/components.py

@@ -23,9 +23,9 @@ def compose(self):
 
 
 class ScriptOutputType(str, Enum):
-    UNIT_TEST_OUTPUT_TEXT = "Latest unit test script execution output: "
-    CONFORMANCE_TEST_OUTPUT_TEXT = "Latest conformance tests script execution output: "
-    TESTING_ENVIRONMENT_OUTPUT_TEXT = "Latest testing environment preparation script execution output: "
+    UNIT_TEST_OUTPUT_TEXT = "Unit tests: "
+    CONFORMANCE_TEST_OUTPUT_TEXT = "Conformance tests: "
+    TESTING_ENVIRONMENT_OUTPUT_TEXT = "Testing environment preparation execution output: "
 
     @staticmethod
     def get_max_label_width(active_types: list["ScriptOutputType"]) -> int:
@@ -42,16 +42,16 @@ def get_max_label_width(active_types: list["ScriptOutputType"]) -> int:
         return max(len(script_type.value) for script_type in active_types)
 
     def get_padded_label(self, active_types: list["ScriptOutputType"]) -> str:
-        """Get the label right-padded to align with other active labels.
+        """Get the label left-aligned (no padding).
 
         Args:
             active_types: List of ScriptOutputType enum members that are currently active
 
         Returns:
-            Right-aligned label padded to match the longest active label
+            Label without padding (left-aligned)
         """
-        max_width = ScriptOutputType.get_max_label_width(active_types)
-        return self.value.rjust(max_width)
+        # Return label as-is without padding for left alignment
+        return self.value
 
 
 class TUIComponents(str, Enum):
@@ -189,6 +189,155 @@ async def clear_substates(self):
             pass
 
 
+class RenderingInfoBox(Vertical):
+    """Container with ASCII border for module and functionality information."""
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.module_text = ""
+        self.functionality_text = ""
+
+    def update_module(self, text: str) -> None:
+        """Update the module name and refresh the display."""
+        self.module_text = text
+        self._refresh_content()
+
+    def update_functionality(self, text: str) -> None:
+        """Update the functionality text and refresh the display."""
+        self.functionality_text = text
+        self._refresh_content()
+
+    def _refresh_content(self) -> None:
+        """Refresh the content of the box."""
+        try:
+            widget = self.query_one("#rendering-info-content", Static)
+            # Calculate the width needed for the border
+            lines = []
+            if self.module_text:
+                lines.append(f"  {self.module_text}")
+            if self.functionality_text:
+                lines.append(f"  {self.functionality_text}")
+            
+            if not lines:
+                widget.update("")
+                return
+            
+            # Find the longest line to determine border width
+            max_width = max(len(line) for line in lines) if lines else 40
+            border_width = max(max_width + 2, 42)  # At least 42 chars wide
+            
+            # Build the bordered box with title
+            title = " Currently rendering "
+            top_border = "┌[#FFFFFF]" + title + "[/#FFFFFF]" + "─" * (border_width - len(title)) + "┐"
+            bottom_border = "└" + "─" * border_width + "┘"
+            
+            content_lines = [top_border]
+            # Add top padding (empty line)
+            content_lines.append(f"│{' ' * border_width}│")
+            for line in lines:
+                padding = border_width - len(line)
+                content_lines.append(f"│{line}{' ' * padding}│")
+            # Add bottom padding (empty line)
+            content_lines.append(f"│{' ' * border_width}│")
+            content_lines.append(bottom_border)
+            
+            widget.update("\n".join(content_lines))
+        except Exception:
+            pass
+
+    def on_mount(self) -> None:
+        """Initialize the box with empty state on mount."""
+        # Set default empty labels
+        self.module_text = "Module: "
+        self.functionality_text = "Functionality:"
+        self._refresh_content()
+
+    def compose(self):
+        yield Static("", id="rendering-info-content", classes="rendering-info-box")
+
+
+class TestScriptsContainer(Vertical):
+    """Container with ASCII border for test script outputs."""
+
+    def __init__(
+        self,
+        show_unit_test: bool = True,
+        show_conformance_test: bool = True,
+        show_testing_env: bool = True,
+        **kwargs,
+    ):
+        super().__init__(**kwargs)
+        self.show_unit_test = show_unit_test
+        self.show_conformance_test = show_conformance_test
+        self.show_testing_env = show_testing_env
+        self.unit_test_text = ScriptOutputType.UNIT_TEST_OUTPUT_TEXT.value
+        self.conformance_test_text = ScriptOutputType.CONFORMANCE_TEST_OUTPUT_TEXT.value
+        self.testing_env_text = ScriptOutputType.TESTING_ENVIRONMENT_OUTPUT_TEXT.value
+
+    def update_unit_test(self, text: str) -> None:
+        """Update unit test output and refresh."""
+        self.unit_test_text = text
+        self._refresh_content()
+
+    def update_conformance_test(self, text: str) -> None:
+        """Update conformance test output and refresh."""
+        self.conformance_test_text = text
+        self._refresh_content()
+
+    def update_testing_env(self, text: str) -> None:
+        """Update testing env output and refresh."""
+        self.testing_env_text = text
+        self._refresh_content()
+
+    def _refresh_content(self) -> None:
+        """Refresh the bordered box content."""
+        try:
+            widget = self.query_one("#test-scripts-content", Static)
+            
+            # Collect lines to display
+            lines = []
+            if self.show_unit_test:
+                lines.append(f"  {self.unit_test_text}")
+            if self.show_conformance_test:
+                lines.append(f"  {self.conformance_test_text}")
+            if self.show_testing_env:
+                lines.append(f"  {self.testing_env_text}")
+            
+            if not lines:
+                widget.update("")
+                return
+            
+            # Find the longest line to determine border width
+            max_width = max(len(line) for line in lines)
+            border_width = max(max_width + 2, 80)  # Minimum width of 80 chars
+            
+            # Build the bordered box with title
+            title = " Latest test scripts "
+            top_border = "┌[#FFFFFF]" + title + "[/#FFFFFF]" + "─" * (border_width - len(title)) + "┐"
+            bottom_border = "└" + "─" * border_width + "┘"
+            
+            content_lines = [top_border]
+            # Add top padding (empty line)
+            content_lines.append(f"│{' ' * border_width}│")
+            for line in lines:
+                padding = border_width - len(line)
+                content_lines.append(f"│{line}{' ' * padding}│")
+            # Add bottom padding (empty line)
+            content_lines.append(f"│{' ' * border_width}│")
+            content_lines.append(bottom_border)
+            
+            widget.update("\n".join(content_lines))
+        except Exception:
+            pass
+
+    def on_mount(self) -> None:
+        """Initialize the box on mount."""
+        self._refresh_content()
+
+    def compose(self):
+        yield Static("", id="test-scripts-content", classes="test-scripts-box")
+
+
 class FRIDProgress(Vertical):
     """A widget to display the status of subcomponent tasks."""
 
@@ -198,16 +347,17 @@ class FRIDProgress(Vertical):
     REFACTORING_TEXT = "Refactoring"
     CONFORMANCE_TEST_VALIDATION_TEXT = "Conformance tests"
 
-    RENDERING_MODULE_TEXT = "Rendering module: "
-    RENDERING_FUNCTIONALITY_TEXT = "Rendering functionality:"
+    RENDERING_MODULE_TEXT = "Module: "
+    RENDERING_FUNCTIONALITY_TEXT = "Functionality:"
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
     def update_fr_text(self, text: str) -> None:
         try:
-            widget = self.query_one(f"#{TUIComponents.FRID_PROGRESS_HEADER.value}", Static)
-            widget.update(text)
+            # Update the rendering info box instead
+            info_box = self.query_one(RenderingInfoBox)
+            info_box.update_functionality(text)
         except Exception:
             pass
 
@@ -222,8 +372,7 @@ def on_mount(self) -> None:
         self.border_title = "FRID Progress"
 
     def compose(self):
-        yield Static(self.RENDERING_MODULE_TEXT, id=TUIComponents.RENDER_MODULE_NAME_WIDGET.value)
-        yield Static(self.RENDERING_FUNCTIONALITY_TEXT, id=TUIComponents.FRID_PROGRESS_HEADER.value)
+        yield RenderingInfoBox()
         yield ProgressItem(
             self.IMPLEMENTING_FUNCTIONALITY_TEXT,
             id=TUIComponents.FRID_PROGRESS_RENDER_FR.value,

tui/plain2code_tui.py

@@ -25,8 +25,10 @@
     FRIDProgress,
     LogFilterChanged,
     LogLevelFilter,
+    RenderingInfoBox,
     ScriptOutputType,
     StructuredLogView,
+    TestScriptsContainer,
     TUIComponents,
     CustomFooter,
 )
@@ -133,34 +135,18 @@ def compose(self) -> ComposeResult:
                         classes="codeplain-header"
                     )
                     yield Static(
-                        "Rendering in progress...",
+                        "[#FFFFFF]Rendering in progress...[/#FFFFFF]",
                         id=TUIComponents.RENDER_STATUS_WIDGET.value,
                     )
                     yield FRIDProgress(id=TUIComponents.FRID_PROGRESS.value)
 
-                    # Get active script types for proper label alignment
-                    active_script_types = self.get_active_script_types()
-
-                    # Conditionally display unit test output widget
-                    if self.unittests_script is not None:
-                        yield Static(
-                            ScriptOutputType.UNIT_TEST_OUTPUT_TEXT.get_padded_label(active_script_types),
-                            id=TUIComponents.UNIT_TEST_SCRIPT_OUTPUT_WIDGET.value,
-                        )
-
-                    # Conditionally display conformance test output widget
-                    if self.conformance_tests_script is not None:
-                        yield Static(
-                            ScriptOutputType.CONFORMANCE_TEST_OUTPUT_TEXT.get_padded_label(active_script_types),
-                            id=TUIComponents.CONFORMANCE_TESTS_SCRIPT_OUTPUT_WIDGET.value,
-                        )
-
-                    # Conditionally display testing environment preparation output widget
-                    if self.prepare_environment_script is not None:
-                        yield Static(
-                            ScriptOutputType.TESTING_ENVIRONMENT_OUTPUT_TEXT.get_padded_label(active_script_types),
-                            id=TUIComponents.TESTING_ENVIRONMENT_SCRIPT_OUTPUT_WIDGET.value,
-                        )
+                    # Test scripts container with border
+                    yield TestScriptsContainer(
+                        id="test-scripts-container",
+                        show_unit_test=self.unittests_script is not None,
+                        show_conformance_test=self.conformance_tests_script is not None,
+                        show_testing_env=self.prepare_environment_script is not None,
+                    )
             with Vertical(id=TUIComponents.LOG_VIEW.value):
                 yield LogLevelFilter(id=TUIComponents.LOG_FILTER.value)
                 yield Static("", classes="filter-spacer")
@@ -178,16 +164,18 @@ def action_toggle_logs(self) -> None:
     def on_render_module_started(self, event: RenderModuleStarted):
         """Update TUI based on the current state machine state."""
         try:
-            widget = self.query_one(f"#{TUIComponents.RENDER_MODULE_NAME_WIDGET.value}", Static)
-            widget.update(f"{FRIDProgress.RENDERING_MODULE_TEXT}{event.module_name}")
+            frid_progress = self.query_one(f"#{TUIComponents.FRID_PROGRESS.value}", FRIDProgress)
+            info_box = frid_progress.query_one(RenderingInfoBox)
+            info_box.update_module(f"{FRIDProgress.RENDERING_MODULE_TEXT}{event.module_name}")
         except Exception as e:
             console.debug(f"Error updating render module name: {type(e).__name__}: {e}")
 
     def on_render_module_completed(self, _event: RenderModuleCompleted):
         """Update TUI based on the current state machine state."""
         try:
-            widget = self.query_one(f"#{TUIComponents.RENDER_MODULE_NAME_WIDGET.value}", Static)
-            widget.update(FRIDProgress.RENDERING_MODULE_TEXT)
+            frid_progress = self.query_one(f"#{TUIComponents.FRID_PROGRESS.value}", FRIDProgress)
+            info_box = frid_progress.query_one(RenderingInfoBox)
+            info_box.update_module(FRIDProgress.RENDERING_MODULE_TEXT)
         except Exception as e:
             console.debug(f"Error resetting render module name: {type(e).__name__}: {e}")
 

spinner.py tui/spinner.pyspinner.py renamed to tui/spinner.py

@@ -232,29 +232,33 @@ def handle(self, _segments: list[str], snapshot: RenderContextSnapshot, previous
         # Get active script types for proper label alignment
         active_script_types = self.tui.get_active_script_types()
 
-        if any(segment == States.UNIT_TESTS_READY.value for segment in previous_state_segments):
-            update_widget_text(
-                self.tui,
-                TUIComponents.UNIT_TEST_SCRIPT_OUTPUT_WIDGET.value,
-                f"{ScriptOutputType.UNIT_TEST_OUTPUT_TEXT.get_padded_label(active_script_types)}{snapshot.script_execution_history.latest_unit_test_output_path}",  # type: ignore
-            )
+        # Update test scripts container
+        try:
+            from .components import TestScriptsContainer
+            container = self.tui.query_one("#test-scripts-container", TestScriptsContainer)
+            
+            if any(segment == States.UNIT_TESTS_READY.value for segment in previous_state_segments):
+                if snapshot.script_execution_history.latest_unit_test_output_path:
+                    container.update_unit_test(
+                        f"{ScriptOutputType.UNIT_TEST_OUTPUT_TEXT.value}{snapshot.script_execution_history.latest_unit_test_output_path}"
+                    )
 
-        if len(previous_state_segments) > 2 and previous_state_segments[2] == States.CONFORMANCE_TEST_GENERATED.value:
-            update_widget_text(
-                self.tui,
-                TUIComponents.TESTING_ENVIRONMENT_SCRIPT_OUTPUT_WIDGET.value,
-                f"{ScriptOutputType.TESTING_ENVIRONMENT_OUTPUT_TEXT.get_padded_label(active_script_types)}{snapshot.script_execution_history.latest_testing_environment_output_path}",  # type: ignore
-            )
+            if len(previous_state_segments) > 2 and previous_state_segments[2] == States.CONFORMANCE_TEST_GENERATED.value:
+                if snapshot.script_execution_history.latest_testing_environment_output_path:
+                    container.update_testing_env(
+                        f"{ScriptOutputType.TESTING_ENVIRONMENT_OUTPUT_TEXT.value}{snapshot.script_execution_history.latest_testing_environment_output_path}"
+                    )
 
-        if (
-            len(previous_state_segments) > 2
-            and previous_state_segments[2] == States.CONFORMANCE_TEST_ENV_PREPARED.value
-        ):
-            update_widget_text(
-                self.tui,
-                TUIComponents.CONFORMANCE_TESTS_SCRIPT_OUTPUT_WIDGET.value,
-                f"{ScriptOutputType.CONFORMANCE_TEST_OUTPUT_TEXT.get_padded_label(active_script_types)}{snapshot.script_execution_history.latest_conformance_test_output_path}",  # type: ignore
-            )
+            if (
+                len(previous_state_segments) > 2
+                and previous_state_segments[2] == States.CONFORMANCE_TEST_ENV_PREPARED.value
+            ):
+                if snapshot.script_execution_history.latest_conformance_test_output_path:
+                    container.update_conformance_test(
+                        f"{ScriptOutputType.CONFORMANCE_TEST_OUTPUT_TEXT.value}{snapshot.script_execution_history.latest_conformance_test_output_path}"
+                    )
+        except Exception:
+            pass
 
 
 class FridFullyImplementedHandler(StateHandler):