diff --git a/gui.py b/gui.py index 2f24ab1..c6c272c 100644 --- a/gui.py +++ b/gui.py @@ -1052,6 +1052,14 @@ class App: self.ai_status = status if dpg.does_item_exist("ai_status"): dpg.set_value("ai_status", f"Status: {status}") + + if dpg.does_item_exist("thinking_indicator"): + is_thinking = status in ["sending...", "running powershell..."] + dpg.configure_item("thinking_indicator", show=is_thinking) + + if dpg.does_item_exist("operations_live_indicator"): + is_running = status in ["running powershell...", "fetching url...", "searching web..."] + dpg.configure_item("operations_live_indicator", show=is_running) def _update_response(self, text: str): self.ai_response = text @@ -2001,7 +2009,11 @@ class App: pass # Message Composer in Middle - dpg.add_text("Message", color=_SUBHDR_COLOR) + with dpg.group(horizontal=True): + dpg.add_text("Message", color=_SUBHDR_COLOR) + dpg.add_spacer(width=20) + dpg.add_text("THINKING...", tag="thinking_indicator", color=(255, 100, 100), show=False) + dpg.add_input_text( tag="ai_input", multiline=True, @@ -2040,6 +2052,11 @@ class App: no_close=False, no_collapse=True, ): + with dpg.group(horizontal=True): + dpg.add_text("OPERATIONS", color=_SUBHDR_COLOR) + dpg.add_spacer(width=20) + dpg.add_text("LIVE", tag="operations_live_indicator", color=(100, 255, 100), show=False) + with dpg.tab_bar(): with dpg.tab(label="Comms Log"): with dpg.group(horizontal=True): @@ -2061,26 +2078,29 @@ class App: with dpg.tab(label="Diagnostics"): dpg.add_text("Performance Telemetry") - with dpg.group(horizontal=True): - dpg.add_text("FPS:") - dpg.add_text("0.0", tag="perf_fps_text", color=(180, 255, 180)) - dpg.add_spacer(width=20) - dpg.add_text("Frame:") - dpg.add_text("0.0ms", tag="perf_frame_text", color=(100, 200, 255)) + with dpg.table(header_row=False, borders_innerH=True, borders_outerH=True, borders_innerV=True, borders_outerV=True): + dpg.add_table_column() + dpg.add_table_column() + dpg.add_table_column() + dpg.add_table_column() + with dpg.table_row(): + dpg.add_text("FPS", color=_LABEL_COLOR) + dpg.add_text("0.0", tag="perf_fps_text", color=(180, 255, 180)) + dpg.add_text("Frame", color=_LABEL_COLOR) + dpg.add_text("0.0ms", tag="perf_frame_text", color=(100, 200, 255)) + with dpg.table_row(): + dpg.add_text("CPU", color=_LABEL_COLOR) + dpg.add_text("0.0%", tag="perf_cpu_text", color=(255, 220, 100)) + dpg.add_text("Lag", color=_LABEL_COLOR) + dpg.add_text("0.0ms", tag="perf_lag_text", color=(255, 180, 80)) + dpg.add_spacer(height=4) dpg.add_plot(label="Frame Time (ms)", tag="plot_frame", height=120, width=-1, no_mouse_pos=True) dpg.add_plot_axis(dpg.mvXAxis, label="samples", no_tick_labels=True, parent="plot_frame") with dpg.plot_axis(dpg.mvYAxis, label="ms", tag="axis_frame_y", parent="plot_frame"): dpg.add_line_series(list(range(100)), self.perf_history["frame_time"], label="frame time", tag="perf_frame_plot") dpg.set_axis_limits("axis_frame_y", 0, 50) - with dpg.group(horizontal=True): - dpg.add_text("CPU:") - dpg.add_text("0.0%", tag="perf_cpu_text", color=(255, 220, 100)) - dpg.add_spacer(width=20) - dpg.add_text("Input Lag:") - dpg.add_text("0.0ms", tag="perf_lag_text", color=(255, 180, 80)) - dpg.add_plot(label="CPU Usage (%)", tag="plot_cpu", height=120, width=-1, no_mouse_pos=True) dpg.add_plot_axis(dpg.mvXAxis, label="samples", no_tick_labels=True, parent="plot_cpu") with dpg.plot_axis(dpg.mvYAxis, label="%", tag="axis_cpu_y", parent="plot_cpu"): @@ -2254,8 +2274,21 @@ class App: self._process_pending_gui_tasks() self.perf_monitor.end_component("GUI_Tasks") - # Handle retro arcade blinking effect self.perf_monitor.start_component("Blinking") + + # Thinking Indicator Blink (Continuous while shown) + if dpg.does_item_exist("thinking_indicator") and dpg.is_item_shown("thinking_indicator"): + elapsed = time.time() + val = math.sin(elapsed * 10 * math.pi) + alpha = 255 if val > 0 else 0 + dpg.configure_item("thinking_indicator", color=(255, 100, 100, alpha)) + + if dpg.does_item_exist("operations_live_indicator") and dpg.is_item_shown("operations_live_indicator"): + elapsed = time.time() + val = math.sin(elapsed * 10 * math.pi) + alpha = 255 if val > 0 else 0 + dpg.configure_item("operations_live_indicator", color=(100, 255, 100, alpha)) + if self._trigger_script_blink: self._trigger_script_blink = False self._is_script_blinking = True diff --git a/tests/test_layout_reorganization.py b/tests/test_layout_reorganization.py index 1355166..2a37abc 100644 --- a/tests/test_layout_reorganization.py +++ b/tests/test_layout_reorganization.py @@ -42,14 +42,10 @@ def test_new_hubs_defined_in_window_info(): assert l == label or label in l, f"Label mismatch for {tag}: expected {label}, found {l}" assert found, f"Expected window label {label} not found in window_info" -def test_old_windows_removed_from_window_info(): +def test_old_windows_removed_from_window_info(app_instance_simple): """ Verifies that the old fragmented windows are removed from window_info. """ - from unittest.mock import patch - with patch('gui.load_config', return_value={}): - app = App() - old_tags = [ "win_projects", "win_files", "win_screenshots", "win_provider", "win_system_prompts", @@ -58,4 +54,49 @@ def test_old_windows_removed_from_window_info(): ] for tag in old_tags: - assert tag not in app.window_info.values(), f"Old window tag {tag} should have been removed from window_info" + assert tag not in app_instance_simple.window_info.values(), f"Old window tag {tag} should have been removed from window_info" + +@pytest.fixture +def app_instance_simple(): + from unittest.mock import patch + from gui import App + with patch('gui.load_config', return_value={}): + app = App() + return app + +def test_hub_windows_have_correct_flags(app_instance_simple): + """ + Verifies that the new Hub windows have appropriate flags for a professional workspace. + (e.g., no_collapse should be True for main hubs). + """ + import dearpygui.dearpygui as dpg + dpg.create_context() + + # We need to actually call the build methods to check the configuration + app_instance_simple._build_context_hub() + app_instance_simple._build_ai_settings_hub() + app_instance_simple._build_discussion_hub() + app_instance_simple._build_operations_hub() + + hubs = ["win_context_hub", "win_ai_settings_hub", "win_discussion_hub", "win_operations_hub"] + for hub in hubs: + assert dpg.does_item_exist(hub) + # We can't easily check 'no_collapse' after creation without internal DPG calls + # but we can check if it's been configured if we mock dpg.window or check it manually + + dpg.destroy_context() + +def test_indicators_exist(app_instance_simple): + """ + Verifies that the new thinking and live indicators exist in the UI. + """ + import dearpygui.dearpygui as dpg + dpg.create_context() + + app_instance_simple._build_discussion_hub() + app_instance_simple._build_operations_hub() + + assert dpg.does_item_exist("thinking_indicator") + assert dpg.does_item_exist("operations_live_indicator") + + dpg.destroy_context()