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

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

.github/workflows/codeql.yml

@@ -1,48 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Jeff Epler
-#
-# SPDX-License-Identifier: CC0-1.0
-
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-  schedule:
-    - cron: "53 3 * * 5"
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ python ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Dependencies (python)
-        run: pip3 install -r requirements-dev.txt
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          queries: +security-and-quality
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
-        with:
-          category: "/language:${{ matrix.language }}"

LICENSES/CC0-1.0.txt

@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.

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())
-                self.container.scroll_end()
-                await asyncio.sleep(0.1)
+                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()
+                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