UX improvements

Author: pablogsal

Lib/profiling/sampling/live_collector/collector.py

@@ -894,18 +894,26 @@ def _handle_input(self):
                 self._trend_tracker.toggle()
 
         elif ch == curses.KEY_LEFT or ch == curses.KEY_UP:
-            # Navigate to previous thread in PER_THREAD mode
-            if self.view_mode == "PER_THREAD" and len(self.thread_ids) > 0:
-                self.current_thread_index = (
-                    self.current_thread_index - 1
-                ) % len(self.thread_ids)
+            # Navigate to previous thread in PER_THREAD mode, or switch from ALL to PER_THREAD
+            if len(self.thread_ids) > 0:
+                if self.view_mode == "ALL":
+                    self.view_mode = "PER_THREAD"
+                    self.current_thread_index = 0
+                else:
+                    self.current_thread_index = (
+                        self.current_thread_index - 1
+                    ) % len(self.thread_ids)
 
         elif ch == curses.KEY_RIGHT or ch == curses.KEY_DOWN:
-            # Navigate to next thread in PER_THREAD mode
-            if self.view_mode == "PER_THREAD" and len(self.thread_ids) > 0:
-                self.current_thread_index = (
-                    self.current_thread_index + 1
-                ) % len(self.thread_ids)
+            # Navigate to next thread in PER_THREAD mode, or switch from ALL to PER_THREAD
+            if len(self.thread_ids) > 0:
+                if self.view_mode == "ALL":
+                    self.view_mode = "PER_THREAD"
+                    self.current_thread_index = 0
+                else:
+                    self.current_thread_index = (
+                        self.current_thread_index + 1
+                    ) % len(self.thread_ids)
 
     def init_curses(self, stdscr):
         """Initialize curses display and suppress stdout/stderr."""

Lib/profiling/sampling/sample.py

@@ -965,7 +965,7 @@ def main():
         action="store_const",
         const=SORT_MODE_NSAMPLES,
         dest="sort",
-        help="Sort by number of direct samples (nsamples column)",
+        help="Sort by number of direct samples (nsamples column, default)",
     )
     sort_group.add_argument(
         "--sort-tottime",
@@ -979,7 +979,7 @@ def main():
         action="store_const",
         const=SORT_MODE_CUMTIME,
         dest="sort",
-        help="Sort by cumulative time (cumtime column, default)",
+        help="Sort by cumulative time (cumtime column)",
     )
     sort_group.add_argument(
         "--sort-sample-pct",
@@ -1039,7 +1039,7 @@ def main():
     elif args.format == "live":
         _validate_live_format_args(args, parser)
 
-    sort_value = args.sort if args.sort is not None else SORT_MODE_CUMTIME
+    sort_value = args.sort if args.sort is not None else SORT_MODE_NSAMPLES
 
     if args.module is not None and not args.module:
         parser.error("argument -m/--module: expected one argument")

Lib/test/test_profiling/test_sampling_profiler/test_cli.py

@@ -79,7 +79,7 @@ def test_cli_module_argument_parsing(self):
             self._verify_coordinator_command(mock_popen, ("-m", "mymodule"))
             mock_sample.assert_called_once_with(
                 12345,
-                sort=2,  # default sort (sort_value from args.sort)
+                sort=0,  # default sort (sort_value from args.sort)
                 sample_interval_usec=100,
                 duration_sec=10,
                 filename=None,
@@ -118,7 +118,7 @@ def test_cli_module_with_arguments(self):
             )
             mock_sample.assert_called_once_with(
                 12345,
-                sort=2,
+                sort=0,
                 sample_interval_usec=100,
                 duration_sec=10,
                 filename=None,
@@ -148,7 +148,7 @@ def test_cli_script_argument_parsing(self):
             self._verify_coordinator_command(mock_popen, ("myscript.py",))
             mock_sample.assert_called_once_with(
                 12345,
-                sort=2,
+                sort=0,
                 sample_interval_usec=100,
                 duration_sec=10,
                 filename=None,
@@ -323,7 +323,7 @@ def test_cli_script_with_profiler_options(self):
             # Verify profiler options were passed correctly
             mock_sample.assert_called_once_with(
                 12345,
-                sort=2,  # default sort
+                sort=0,  # default sort
                 sample_interval_usec=2000,
                 duration_sec=60,
                 filename="output.txt",
@@ -628,7 +628,7 @@ def test_argument_parsing_basic(self):
                 filename=None,
                 all_threads=False,
                 limit=15,
-                sort=2,
+                sort=0,
                 show_summary=True,
                 output_format="pstats",
                 realtime_stats=False,

Lib/test/test_profiling/test_sampling_profiler/test_live_collector_interaction.py

@@ -779,13 +779,13 @@ def test_arrow_up_navigates_like_left(self):
         self.collector._handle_input()
         self.assertEqual(self.collector.current_thread_index, 2)  # Wrapped
 
-    def test_arrow_keys_do_nothing_in_all_mode(self):
-        """Test that arrow keys have no effect in ALL mode."""
+    def test_arrow_keys_switch_to_per_thread_mode(self):
+        """Test that arrow keys switch from ALL mode to PER_THREAD mode."""
         self.assertEqual(self.collector.view_mode, "ALL")
 
         self.mock_display.simulate_input(curses.KEY_RIGHT)
         self.collector._handle_input()
-        self.assertEqual(self.collector.view_mode, "ALL")
+        self.assertEqual(self.collector.view_mode, "PER_THREAD")
         self.assertEqual(self.collector.current_thread_index, 0)
 
     def test_stats_list_in_all_mode(self):