yaicli 0.0.13__tar.gz → 0.0.15__tar.gz

{yaicli-0.0.13 → yaicli-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaicli
-Version: 0.0.13
+Version: 0.0.15
 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
@@ -233,7 +233,7 @@ YAICLI is a compact yet potent command-line AI assistant, allowing you to engage
 
 Support regular and deep thinking models.
 
-> [!WARNING] 
+> [!WARNING]
 > This is a work in progress, some features could change or be removed in the future.
 
 ## Features
@@ -319,6 +319,7 @@ ANSWER_PATH=choices[0].message.content
 # true: streaming response
 # false: non-streaming response
 STREAM=true
+CODE_THEME=monokia
 
 TEMPERATURE=0.7
 TOP_P=1.0
@@ -337,6 +338,7 @@ Below are the available configuration options and override environment variables
 - **COMPLETION_PATH**: Path for completions endpoint, default: /chat/completions, env: YAI_COMPLETION_PATH
 - **ANSWER_PATH**: Json path expression to extract answer from response, default: choices[0].message.content, env: YAI_ANSWER_PATH
 - **STREAM**: Enable/disable streaming responses, default: true, env: YAI_STREAM
+- **CODE_THEME**: Theme for code blocks, default: monokia, env: YAI_CODE_THEME
 - **TEMPERATURE**: Temperature for response generation (default: 0.7), env: YAI_TEMPERATURE
 - **TOP_P**: Top-p sampling for response generation (default: 1.0), env: YAI_TOP_P
 - **MAX_TOKENS**: Maximum number of tokens for response generation (default: 1024), env: YAI_MAX_TOKENS
@@ -392,6 +394,12 @@ If you not sure how to config `COMPLETION_PATH` and `ANSWER_PATH`, here is a gui
    ```
     We are looking for the `text` field, so the path should be 1.Key `content`, 2.First obj `[0]`, 3.Key `text`. So it should be `content.[0].text`.
 
+**CODE_THEME**
+
+You can find the list of code theme here: https://pygments.org/styles/
+
+Default: monokia
+![alt text](artwork/monokia.png)
 
 ## Usage
 
@@ -430,10 +438,10 @@ Run Options:
 ```bash
 ai -h
 
-Usage: ai [OPTIONS] [PROMPT]                                                                                                                                              
-                                                                                                                                                                           
- yaicli - Your AI interface in cli.                                                                                                                                        
-                                                                                                                                                                           
+Usage: ai [OPTIONS] [PROMPT]
+
+ yaicli - Your AI interface in cli.
+
 ╭─ Arguments ─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
 │   prompt      [PROMPT]  The prompt send to the LLM                                                                                                                      │
 ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
@@ -484,9 +492,10 @@ The capital of France is Paris.
 $ ai -s 'Check the current directory size'
 Assistant:
 du -sh .
-
-Generated command: du -sh .
-Execute this command? [y/n/e] (n): e
+╭─ Command ─╮
+│ du -sh .  │
+╰───────────╯
+Execute command? [e]dit, [y]es, [n]o (n): e
 Edit command, press enter to execute:
 du -sh ./
 Output:
@@ -530,9 +539,10 @@ Certainly! Here’s a brief overview of the solar system:
 🚀 > Check the current directory size
 Assistant:
 du -sh .
-
-Generated command: du -sh .
-Execute this command? [y/n/e] (n): e
+╭─ Command ─╮
+│ du -sh .  │
+╰───────────╯
+Execute command? [e]dit, [y]es, [n]o (n): e
 Edit command, press enter to execute:
 du -sh ./
 Output:
@@ -544,11 +554,13 @@ Output:
 
 ```bash
 $ ai --shell "Find all PDF files in my Downloads folder"
-
-Generated command: find ~/Downloads -type f -name "*.pdf"
-Execute this command? [y/n]: y
-
-Executing command: find ~/Downloads -type f -name "*.pdf"
+Assistant:
+find ~/Downloads -type f -name "*.pdf"
+╭─ Command ──────────────────────────────╮
+│ find ~/Downloads -type f -name "*.pdf" │
+╰────────────────────────────────────────╯
+Execute command? [e]dit, [y]es, [n]o (n): y
+Output:
 
 /Users/username/Downloads/document1.pdf
 /Users/username/Downloads/report.pdf

{yaicli-0.0.13 → yaicli-0.0.15}/README.md

@@ -9,7 +9,7 @@ YAICLI is a compact yet potent command-line AI assistant, allowing you to engage
 
 Support regular and deep thinking models.
 
-> [!WARNING] 
+> [!WARNING]
 > This is a work in progress, some features could change or be removed in the future.
 
 ## Features
@@ -95,6 +95,7 @@ ANSWER_PATH=choices[0].message.content
 # true: streaming response
 # false: non-streaming response
 STREAM=true
+CODE_THEME=monokia
 
 TEMPERATURE=0.7
 TOP_P=1.0
@@ -113,6 +114,7 @@ Below are the available configuration options and override environment variables
 - **COMPLETION_PATH**: Path for completions endpoint, default: /chat/completions, env: YAI_COMPLETION_PATH
 - **ANSWER_PATH**: Json path expression to extract answer from response, default: choices[0].message.content, env: YAI_ANSWER_PATH
 - **STREAM**: Enable/disable streaming responses, default: true, env: YAI_STREAM
+- **CODE_THEME**: Theme for code blocks, default: monokia, env: YAI_CODE_THEME
 - **TEMPERATURE**: Temperature for response generation (default: 0.7), env: YAI_TEMPERATURE
 - **TOP_P**: Top-p sampling for response generation (default: 1.0), env: YAI_TOP_P
 - **MAX_TOKENS**: Maximum number of tokens for response generation (default: 1024), env: YAI_MAX_TOKENS
@@ -168,6 +170,12 @@ If you not sure how to config `COMPLETION_PATH` and `ANSWER_PATH`, here is a gui
    ```
     We are looking for the `text` field, so the path should be 1.Key `content`, 2.First obj `[0]`, 3.Key `text`. So it should be `content.[0].text`.
 
+**CODE_THEME**
+
+You can find the list of code theme here: https://pygments.org/styles/
+
+Default: monokia
+![alt text](artwork/monokia.png)
 
 ## Usage
 
@@ -206,10 +214,10 @@ Run Options:
 ```bash
 ai -h
 
-Usage: ai [OPTIONS] [PROMPT]                                                                                                                                              
-                                                                                                                                                                           
- yaicli - Your AI interface in cli.                                                                                                                                        
-                                                                                                                                                                           
+Usage: ai [OPTIONS] [PROMPT]
+
+ yaicli - Your AI interface in cli.
+
 ╭─ Arguments ─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
 │   prompt      [PROMPT]  The prompt send to the LLM                                                                                                                      │
 ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
@@ -260,9 +268,10 @@ The capital of France is Paris.
 $ ai -s 'Check the current directory size'
 Assistant:
 du -sh .
-
-Generated command: du -sh .
-Execute this command? [y/n/e] (n): e
+╭─ Command ─╮
+│ du -sh .  │
+╰───────────╯
+Execute command? [e]dit, [y]es, [n]o (n): e
 Edit command, press enter to execute:
 du -sh ./
 Output:
@@ -306,9 +315,10 @@ Certainly! Here’s a brief overview of the solar system:
 🚀 > Check the current directory size
 Assistant:
 du -sh .
-
-Generated command: du -sh .
-Execute this command? [y/n/e] (n): e
+╭─ Command ─╮
+│ du -sh .  │
+╰───────────╯
+Execute command? [e]dit, [y]es, [n]o (n): e
 Edit command, press enter to execute:
 du -sh ./
 Output:
@@ -320,11 +330,13 @@ Output:
 
 ```bash
 $ ai --shell "Find all PDF files in my Downloads folder"
-
-Generated command: find ~/Downloads -type f -name "*.pdf"
-Execute this command? [y/n]: y
-
-Executing command: find ~/Downloads -type f -name "*.pdf"
+Assistant:
+find ~/Downloads -type f -name "*.pdf"
+╭─ Command ──────────────────────────────╮
+│ find ~/Downloads -type f -name "*.pdf" │
+╰────────────────────────────────────────╯
+Execute command? [e]dit, [y]es, [n]o (n): y
+Output:
 
 /Users/username/Downloads/document1.pdf
 /Users/username/Downloads/report.pdf

{yaicli-0.0.13 → yaicli-0.0.15}/pyproject.toml

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

{yaicli-0.0.13 → yaicli-0.0.15}/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.
@@ -54,6 +56,7 @@ DEFAULT_CONFIG_MAP = {
     "COMPLETION_PATH": {"value": "chat/completions", "env_key": "YAI_COMPLETION_PATH"},
     "ANSWER_PATH": {"value": "choices[0].message.content", "env_key": "YAI_ANSWER_PATH"},
     "STREAM": {"value": "true", "env_key": "YAI_STREAM"},
+    "CODE_THEME": {"value": "monokia", "env_key": "YAI_CODE_THEME"},
     "TEMPERATURE": {"value": "0.7", "env_key": "YAI_TEMPERATURE"},
     "TOP_P": {"value": "1.0", "env_key": "YAI_TOP_P"},
     "MAX_TOKENS": {"value": "1024", "env_key": "YAI_MAX_TOKENS"},
@@ -77,6 +80,7 @@ ANSWER_PATH=choices[0].message.content
 # true: streaming response
 # false: non-streaming response
 STREAM=true
+CODE_THEME=monokia
 
 TEMPERATURE=0.7
 TOP_P=1.0
@@ -192,7 +196,7 @@ class CLI:
         if current_platform in ("Windows", "nt"):
             is_powershell = len(getenv("PSModulePath", "").split(pathsep)) >= 3
             return "powershell.exe" if is_powershell else "cmd.exe"
-        return basename(getenv("SHELL", "/bin/sh"))
+        return basename(getenv("SHELL", None) or "/bin/sh")
 
     def _filter_command(self, command: str) -> Optional[str]:
         """Filter out unwanted characters from command
@@ -323,10 +327,12 @@ class CLI:
     def _print_stream(self, response: httpx.Response) -> str:
         """Print response from LLM in streaming mode"""
         self.console.print("Assistant:", style="bold green")
-        full_completion = ""
+        full_content = ""
         in_reasoning = False
+        cursor_chars = ["_", " "]
+        cursor_index = 0
 
-        with Live() as live:
+        with Live(console=self.console) as live:
             for line in response.iter_lines():
                 json_data = self._parse_stream_line(line)
                 if not json_data:
@@ -336,24 +342,25 @@ class CLI:
                 reason = self.get_reasoning_content(delta)
 
                 if reason is not None:
-                    full_completion, in_reasoning = self._process_reasoning_content(
-                        reason, full_completion, in_reasoning
-                    )
+                    full_content, in_reasoning = self._process_reasoning_content(reason, full_content, in_reasoning)
                 else:
-                    full_completion, in_reasoning = self._process_regular_content(
-                        delta.get("content", "") or "", full_completion, in_reasoning
+                    full_content, in_reasoning = self._process_regular_content(
+                        delta.get("content", "") or "", full_content, in_reasoning
                     )
 
-                live.update(Markdown(markup=full_completion), refresh=True)
-        # self.console.print()
-        return full_completion
+                cursor = cursor_chars[cursor_index]
+                live.update(Markdown(markup=full_content + cursor, code_theme=self.config["CODE_THEME"]), 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_content, code_theme=self.config["CODE_THEME"]), refresh=True)
+        return full_content
 
     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'))
-        return full_completion
+        full_content = jmespath.search(self.config.get("ANSWER_PATH", "choices[0].message.content"), response.json())
+        self.console.print(Markdown(full_content + "\n", code_theme=self.config["CODE_THEME"]))
+        return full_content
 
     def get_prompt_tokens(self) -> list[tuple[str, str]]:
         """Return prompt tokens for current mode"""
@@ -384,13 +391,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 +411,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: