Merge pull request #46 from jepler/behavioral-fixes-new-textual

ctrl-c can now be copy instead of yank (yay!)

requirements.txt

@@ -8,6 +8,6 @@ lorem-text
 platformdirs
 pyperclip
 simple_parsing
-textual[syntax]
+textual[syntax] >= 4
 tiktoken
 websockets

src/chap/commands/tui.css

@@ -58,4 +58,4 @@ Markdown {
     margin: 0 1 0 0;
 }
 
-SubmittableTextArea { height: 3 }
+SubmittableTextArea { height: auto; min-height: 5; margin: 0; border: none; border-left: heavy $primary }

src/chap/commands/tui.py

@@ -38,7 +38,7 @@ ANSI_SEQUENCES_KEYS["\x1b\n"] = (Keys.F9,)  # type: ignore
 
 class SubmittableTextArea(TextArea):
     BINDINGS = [
-        Binding("f9", "submit", "Submit", show=True),
+        Binding("f9", "app.submit", "Submit", show=True),
         Binding("tab", "focus_next", show=False, priority=True),  # no inserting tabs
     ]
 
@@ -51,10 +51,10 @@ def parser_factory() -> MarkdownIt:
 
 class ChapMarkdown(Markdown, can_focus=True, can_focus_children=False):
     BINDINGS = [
-        Binding("ctrl+y", "yank", "Yank text", show=True),
-        Binding("ctrl+r", "resubmit", "resubmit", show=True),
-        Binding("ctrl+x", "redraft", "redraft", show=True),
-        Binding("ctrl+q", "toggle_history", "history toggle", show=True),
+        Binding("ctrl+c", "app.yank", "Copy text", show=True),
+        Binding("ctrl+r", "app.resubmit", "resubmit", show=True),
+        Binding("ctrl+x", "app.redraft", "redraft", show=True),
+        Binding("ctrl+q", "app.toggle_history", "history toggle", show=True),
     ]
 
 
@@ -75,7 +75,7 @@ class CancelButton(Button):
 class Tui(App[None]):
     CSS_PATH = "tui.css"
     BINDINGS = [
-        Binding("ctrl+c", "quit", "Quit", show=True, priority=True),
+        Binding("ctrl+q", "quit", "Quit", show=True, priority=True),
     ]
 
     def __init__(
@@ -145,7 +145,6 @@ class Tui(App[None]):
         await self.container.mount_all(
             [markdown_for_step(User(query)), output], before="#pad"
         )
-        tokens: list[str] = []
         update: asyncio.Queue[bool] = asyncio.Queue(1)
 
         for markdown in self.container.children:
@@ -166,15 +165,22 @@ class Tui(App[None]):
         )
 
         async def render_fun() -> None:
+            old_len = 0
             while await update.get():
-                if tokens:
-                    output.update("".join(tokens).strip())
+                content = message.content
+                new_len = len(content)
+                new_content = content[old_len:new_len]
+                if new_content:
+                    if old_len:
+                        await output.append(new_content)
+                    else:
+                        output.update(content)
                     self.container.scroll_end()
-                await asyncio.sleep(0.1)
+                old_len = new_len
+                await asyncio.sleep(0.01)
 
         async def get_token_fun() -> None:
             async for token in self.api.aask(session, query):
-                tokens.append(token)
                 message.content += token
                 try:
                     update.put_nowait(True)

src/chap/core.py

@@ -44,6 +44,7 @@ else:
 conversations_path = platformdirs.user_state_path("chap") / "conversations"
 conversations_path.mkdir(parents=True, exist_ok=True)
 configuration_path = platformdirs.user_config_path("chap")
+preset_path = configuration_path / "preset"
 
 
 class ABackend(Protocol):
@@ -363,7 +364,7 @@ def expand_splats(args: list[str]) -> list[str]:
             result.append(a)
             continue
         if a.startswith("@:"):
-            fn: pathlib.Path = configuration_path / "preset" / a[2:]
+            fn: pathlib.Path = preset_path / a[2:]
         else:
             fn = pathlib.Path(a[1:])
         fn = maybe_add_txt_extension(fn)
@@ -403,6 +404,19 @@ class MyCLI(click.Group):
         except ModuleNotFoundError as exc:
             raise click.UsageError(f"Invalid subcommand {cmd_name!r}", ctx) from exc
 
+    def gather_preset_info(self) -> list[tuple[str, str]]:
+        result = []
+        for p in preset_path.glob("*"):
+            if p.is_file():
+                with p.open() as f:
+                    first_line = f.readline()
+                if first_line.startswith("#"):
+                    help_str = first_line[1:].strip()
+                else:
+                    help_str = "(A comment on the first line would be shown here)"
+            result.append((f"@:{p.name}", help_str))
+        return result
+
     def format_splat_options(
         self, ctx: click.Context, formatter: click.HelpFormatter
     ) -> None:
@@ -436,6 +450,13 @@ class MyCLI(click.Group):
                     the extension may be omitted."""
                 )
             )
+            formatter.write_paragraph()
+            if preset_info := self.gather_preset_info():
+                formatter.write_text("Presets found:")
+                formatter.write_paragraph()
+                formatter.indent()
+                formatter.write_dl(preset_info)
+                formatter.dedent()
 
     def format_options(
         self, ctx: click.Context, formatter: click.HelpFormatter