yaicli 0.0.13__py3-none-any.whl → 0.0.14__py3-none-any.whl

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "yaicli"
-version = "0.0.13"
+version = "0.0.14"
 description = "A simple CLI tool to interact with LLM"
 authors = [{ name = "belingud", email = "im.victor@qq.com" }]
 readme = "README.md"

{yaicli-0.0.13.dist-info → yaicli-0.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaicli
-Version: 0.0.13
+Version: 0.0.14
 Summary: A simple CLI tool to interact with LLM
 Project-URL: Homepage, https://github.com/belingud/yaicli
 Project-URL: Repository, https://github.com/belingud/yaicli

yaicli-0.0.14.dist-info/RECORD

@@ -0,0 +1,7 @@
+pyproject.toml,sha256=D0K1CAn3p9Tf-E9VMq82Ml0jX44Eh6gYRzn5qKQD5xs,1452
+yaicli.py,sha256=5tQBYifI2CFJj_7BpRfRox7yeEYhDu9T9rDkKBppKzE,21392
+yaicli-0.0.14.dist-info/METADATA,sha256=738uxK3JVEOXwcR3m_KZqni9CRSSnj9RLbEOVIzXgCQ,29445
+yaicli-0.0.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+yaicli-0.0.14.dist-info/entry_points.txt,sha256=gdduQwAuu_LeDqnDU81Fv3NPmD2tRQ1FffvolIP3S1Q,34
+yaicli-0.0.14.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+yaicli-0.0.14.dist-info/RECORD,,

yaicli.py

@@ -2,6 +2,7 @@ import configparser
 import json
 import platform
 import subprocess
+import time
 from os import getenv
 from os.path import basename, pathsep
 from pathlib import Path
@@ -11,7 +12,7 @@ import httpx
 import jmespath
 import typer
 from distro import name as distro_name
-from prompt_toolkit import PromptSession
+from prompt_toolkit import PromptSession, prompt
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.key_binding import KeyBindings, KeyPressEvent
@@ -19,6 +20,7 @@ from prompt_toolkit.keys import Keys
 from rich.console import Console
 from rich.live import Live
 from rich.markdown import Markdown
+from rich.panel import Panel
 from rich.prompt import Prompt
 
 SHELL_PROMPT = """Your are a Shell Command Generator.
@@ -325,6 +327,8 @@ class CLI:
         self.console.print("Assistant:", style="bold green")
         full_completion = ""
         in_reasoning = False
+        cursor_chars = ["_", " "]
+        cursor_index = 0
 
         with Live() as live:
             for line in response.iter_lines():
@@ -344,15 +348,17 @@ class CLI:
                         delta.get("content", "") or "", full_completion, in_reasoning
                     )
 
-                live.update(Markdown(markup=full_completion), refresh=True)
-        # self.console.print()
+                live.update(Markdown(markup=full_completion + cursor_chars[cursor_index]), refresh=True)
+                cursor_index = (cursor_index + 1) % 2
+                time.sleep(0.005)  # Slow down the printing speed, avoiding screen flickering
+            live.update(Markdown(markup=full_completion), refresh=True)
         return full_completion
 
     def _print_normal(self, response: httpx.Response) -> str:
         """Print response from LLM in non-streaming mode"""
         self.console.print("Assistant:", style="bold green")
         full_completion = jmespath.search(self.config.get("ANSWER_PATH", "choices[0].message.content"), response.json())
-        self.console.print(Markdown(full_completion + '\n'))
+        self.console.print(Markdown(full_completion + "\n"))
         return full_completion
 
     def get_prompt_tokens(self) -> list[tuple[str, str]]:
@@ -384,13 +390,19 @@ class CLI:
         if not cmd:
             self.console.print("No command generated", style="bold red")
             return
-        self.console.print(f"\n[bold magenta]Generated command:[/bold magenta] {cmd}")
-        _input = Prompt.ask("Execute this command?", choices=['y', 'n', 'e'], default="n", case_sensitive=False)
-        if _input == 'y':  # execute cmd
+        self.console.print(Panel(cmd, title="Command", title_align="left", border_style="bold magenta", expand=False))
+        _input = Prompt.ask(
+            r"Execute command? \[e]dit, \[y]es, \[n]o",
+            choices=["y", "n", "e"],
+            default="n",
+            case_sensitive=False,
+            show_choices=False,
+        )
+        if _input == "y":  # execute cmd
             self.console.print("Output:", style="bold green")
             subprocess.call(cmd, shell=True)
-        elif _input == 'e':  # edit cmd
-            cmd = self.session.prompt("Edit command, press enter to execute:\n", key_bindings=None, default=cmd)
+        elif _input == "e":  # edit cmd
+            cmd = prompt("Edit command, press enter to execute:\n", default=cmd)
             self.console.print("Output:", style="bold green")
             subprocess.call(cmd, shell=True)
 
@@ -398,7 +410,7 @@ class CLI:
         return [
             {"role": "system", "content": self.get_system_prompt()},
             *self.history,
-            {"role": "user", "content": user_input}
+            {"role": "user", "content": user_input},
         ]
 
     def _handle_llm_response(self, response: httpx.Response, user_input: str) -> str:

yaicli-0.0.13.dist-info/RECORD

@@ -1,7 +0,0 @@
-pyproject.toml,sha256=15od1R0Bb-b7YKSSlz1SmzGoaNNbfHgv8y5Zr0gXfBU,1452
-yaicli.py,sha256=Cby2e0HHoh7sAOIvAxEKoZA0TRS3A3ikkfZ6o3bem0o,20955
-yaicli-0.0.13.dist-info/METADATA,sha256=5Yc9O8k_N66OpBTqKG9kVGUvXzj2-L3UrXaiZziWfVU,29445
-yaicli-0.0.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-yaicli-0.0.13.dist-info/entry_points.txt,sha256=gdduQwAuu_LeDqnDU81Fv3NPmD2tRQ1FffvolIP3S1Q,34
-yaicli-0.0.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-yaicli-0.0.13.dist-info/RECORD,,