tuieval 0.2.0.dev33__tar.gz → 0.2.0.dev35__tar.gz

{tuieval-0.2.0.dev33 → tuieval-0.2.0.dev35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: tuieval
-Version: 0.2.0.dev33
+Version: 0.2.0.dev35
 Summary: Evaluate local and frontier LLMs on your own questions: accuracy, speed, tokens and PASS/FAIL verdicts, in the terminal.
 Project-URL: Homepage, https://github.com/ashe-wb/tuieval
 Project-URL: Issues, https://github.com/ashe-wb/tuieval/issues

{tuieval-0.2.0.dev33 → tuieval-0.2.0.dev35}/src/tuieval/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.0.dev33'
-__version_tuple__ = version_tuple = (0, 2, 0, 'dev33')
+__version__ = version = '0.2.0.dev35'
+__version_tuple__ = version_tuple = (0, 2, 0, 'dev35')
 
 __commit_id__ = commit_id = None

{tuieval-0.2.0.dev33 → tuieval-0.2.0.dev35}/src/tuieval/tui.py

@@ -10,9 +10,10 @@ Run screen:    live reasoning and answer, per-test ✓/✗, TTFT and tokens/s, p
                k skips the current model, c cancels everything, f pauses auto-scroll.
                r shows results at any time (also mid-run); n starts a new run when it ends.
                Enter on a Recent results row shows that answer in full.
-Results:       ctrl+r reloads (it also reloads when a run's pack finishes). Per question compares
-               each model's tokens and seconds on the same question. Enter on a Failures row or a
-               Per question cell shows the answer: grading and checks, reasoning, answer, question.
+Results:       opens on Per question, which compares each model's tokens and seconds on the same
+               question. ctrl+r reloads (it also reloads when a run's pack finishes). Enter on a
+               Failures row or a Per question cell shows the answer: grading and checks, reasoning,
+               answer, question.
 Answer detail: [ and ] step to the previous/next answer; esc/q close.
 Anywhere:      esc/q go back (q quits only on Setup), ctrl+q quits, w lists this session's runs and
                tunes. Leaving a live run or tune keeps it going; the header shows its progress.
@@ -180,7 +181,8 @@ def fmt_secs(secs):
 
 
 class StreamView(TextArea):
-    """Read-only, word-wrapped text that grows as tokens stream in. Scroll it with the mouse."""
+    """Read-only, word-wrapped text that grows as tokens stream in. Scroll it with the mouse; it follows
+    new text only while scrolled to the bottom."""
 
     can_focus = False
 
@@ -188,14 +190,28 @@ class StreamView(TextArea):
 
     def __init__(self, **kw):
         super().__init__(read_only=True, soft_wrap=True, show_cursor=False, max_checkpoints=1, **kw)
+        self.trim_pending = False
 
     def append(self, text, follow=True):
+        # Follow only when already at the bottom: scrolled up to read, the view stays put.
+        follow = follow and self.scroll_y >= self.max_scroll_y - 1
         self.insert(text, self.document.end)
         if len(self.text) > self.MAX_CHARS:
-            self.load_text("…" + self.text[-self.MAX_CHARS // 2:])
+            if follow:
+                self.trim()
+            elif not self.trim_pending:   # once the new text is laid out, so the place is measured right
+                self.trim_pending = True
+                self.call_after_refresh(self.trim)
         if follow:
             self.scroll_end(animate=False)
 
+    def trim(self):
+        """Drop the oldest text, keeping the view the same distance from the end (the text that's left)."""
+        self.trim_pending = False
+        from_end = self.max_scroll_y - self.scroll_y
+        self.load_text("…" + self.text[-self.MAX_CHARS // 2:])
+        self.call_after_refresh(lambda: self.scroll_to(y=max(0, self.max_scroll_y - from_end), animate=False))
+
 
 # ------------------------------------------------------------------ answer detail
 def answer_entry(row):
@@ -315,8 +331,8 @@ with the model's reasoning and answer as they stream, then recent results with t
   v  with several models at a time: stream the next one (k skips the one streaming)""",
     "ResultsScreen": """[b]Results[/b]
 
-Start with [b]Production readiness[/b]: one verdict per model and use case, and what's missing when
-it's INCONCLUSIVE. The other tabs are the evidence:
+Opens on [b]Per question[/b]. [b]Production readiness[/b] gives one verdict per model and use case,
+and what's missing when it's INCONCLUSIVE. The other tabs are the evidence:
   Scorecard              accuracy, critical failures and truncation per model and pack
   Speed & tokens         time and tokens per answer (★ = nothing beats it on both accuracy and time)
   Per question           every question, model by model
@@ -2324,7 +2340,7 @@ class ResultsScreen(Screen):
             yield Static(id="results-info")
             if self.smoke_dir:
                 yield Button("Show this Smoke run's results", id="toggle-smoke")
-        with TabbedContent():
+        with TabbedContent(initial="tab-per-question"):
             with TabPane("Production readiness"):
                 yield Static(id="readiness-short")
                 yield Static(self.READINESS_HELP, id="readiness-help")

{tuieval-0.2.0.dev33 → tuieval-0.2.0.dev35}/tests/test_tuieval.py

@@ -733,6 +733,64 @@ class FirstRun(unittest.TestCase):
                              env=dict(os.environ, TUIEVAL_HOME=self.ws, TUIEVAL_DETECT_PORTS=""), timeout=60).stdout.strip()
         self.assertEqual(out, "['first'] ['my-model'] smoke False")   # tuning shows once something has run
 
+    def test_results_open_on_per_question(self):
+        tuieval(self.ws, "add", "my-model", "--server", "local")
+        code = textwrap.dedent("""
+            import asyncio
+            from tuieval.tui import EvalsApp
+            from textual.widgets import TabbedContent
+            async def go():
+                app = EvalsApp({})
+                async with app.run_test(size=(140, 40)) as pilot:
+                    await pilot.pause()
+                    await pilot.press("r")
+                    await pilot.pause()
+                    print(type(app.screen).__name__, app.screen.query_one(TabbedContent).active)
+            asyncio.run(go())
+        """)
+        out = subprocess.run([sys.executable, "-c", code], capture_output=True, text=True,
+                             env=dict(os.environ, TUIEVAL_HOME=self.ws, TUIEVAL_DETECT_PORTS=""), timeout=60).stdout.strip()
+        self.assertEqual(out, "ResultsScreen tab-per-question")
+
+    def test_stream_follows_only_at_the_bottom(self):
+        code = textwrap.dedent("""
+            import asyncio
+            from textual.app import App
+            from tuieval.tui import StreamView
+            class A(App):
+                def compose(self):
+                    yield StreamView()
+            async def go():
+                app = A()
+                async with app.run_test(size=(60, 12)) as pilot:
+                    s = app.query_one(StreamView)
+                    for i in range(100):
+                        s.append(f"line {i}\\n")
+                    await pilot.pause()
+                    s.scroll_to(y=20, animate=False)
+                    await pilot.pause()
+                    for i in range(100):
+                        s.append("more\\n")
+                        await pilot.pause()
+                    held = s.scroll_y
+                    s.scroll_end(animate=False)
+                    await pilot.pause()
+                    s.append("last\\n")
+                    await pilot.pause()
+                    following = s.scroll_y == s.max_scroll_y
+                    s.MAX_CHARS = len(s.text) + 100        # the next text trims the oldest
+                    s.scroll_to(y=s.max_scroll_y - 30, animate=False)
+                    await pilot.pause()
+                    top = s.document.get_line(s.scroll_y)
+                    s.append("x\\n" * 60)
+                    await pilot.pause()
+                    await pilot.pause()
+                    print(held, following, s.text.startswith("…"), s.document.get_line(s.scroll_y) == top)
+            asyncio.run(go())
+        """)
+        out = subprocess.run([sys.executable, "-c", code], capture_output=True, text=True, timeout=60).stdout.strip()
+        self.assertEqual(out, "20 True True True")   # scrolled up stays put, also through a trim; bottom follows
+
     def test_doctor(self):
         tuieval(self.ws, "add", "mock", "--server", "local", "--label", "wanted")
         p = tuieval(self.ws, "doctor", check=False, ports=self.port)