yaicli 0.0.8__tar.gz → 0.0.10__tar.gz

{yaicli-0.0.8 → yaicli-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaicli
-Version: 0.0.8
+Version: 0.0.10
 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
@@ -228,7 +228,9 @@ Description-Content-Type: text/markdown
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/yaicli?logo=pypi&style=for-the-badge)
 ![Pepy Total Downloads](https://img.shields.io/pepy/dt/yaicli?style=for-the-badge&logo=python)
 
-YAICLI is a powerful command-line AI assistant tool that enables you to interact with Large Language Models (LLMs) like ChatGPT's gpt-4o through your terminal. It offers multiple operation modes for everyday conversations, generating and executing shell commands, and one-shot quick queries.
+YAICLI is a compact yet potent command-line AI assistant, allowing you to engage with Large Language Models (LLMs) such as ChatGPT's gpt-4o directly via your terminal. It offers multiple operation modes for everyday conversations, generating and executing shell commands, and one-shot quick queries.
+
+Support regular and deep thinking models.
 
 > [!WARNING] 
 > This is a work in progress, some features could change or be removed in the future.
@@ -257,6 +259,9 @@ YAICLI is a powerful command-line AI assistant tool that enables you to interact
 - **Keyboard Shortcuts**:
   - Tab to switch between Chat and Execute modes
 
+- **History**:
+  - Save and recall previous queries
+
 ## Installation
 
 ### Prerequisites
@@ -296,6 +301,7 @@ The default configuration file is located at `~/.config/yaicli/config.ini`. Look
 
 ```ini
 [core]
+PROVIDER=OPENAI
 BASE_URL=https://api.openai.com/v1
 API_KEY=your_api_key_here
 MODEL=gpt-4o
@@ -327,6 +333,58 @@ Below are the available configuration options and override environment variables
 - **ANSWER_PATH**: Json path expression to extract answer from response, default: choices[0].message.content, env: AI_ANSWER_PATH
 - **STREAM**: Enable/disable streaming responses, default: true, env: AI_STREAM
 
+Default config of `COMPLETION_PATH` and `ANSWER_PATH` is OpenAI compatible. If you are using OpenAI or other OpenAI compatible LLM provider, you can use the default config.
+
+If you wish to use other providers that are not compatible with the openai interface, you can use the following config:
+
+- claude:
+  - BASE_URL: https://api.anthropic.com/v1
+  - COMPLETION_PATH: /messages
+  - ANSWER_PATH: content.0.text
+- cohere:
+  - BASE_URL: https://api.cohere.com/v2
+  - COMPLETION_PATH: /chat
+  - ANSWER_PATH: message.content.[0].text
+- google:
+  - BASE_URL: https://generativelanguage.googleapis.com/v1beta/openai
+  - COMPLETION_PATH: /chat/completions
+  - ANSWER_PATH: choices[0].message.content
+
+You can use google OpenAI complete endpoint and leave `COMPLETION_PATH` and `ANSWER_PATH` as default. BASE_URL: https://generativelanguage.googleapis.com/v1beta/openai. See https://ai.google.dev/gemini-api/docs/openai
+
+Claude also has a testable OpenAI-compatible interface, you can just use Calude endpoint and leave `COMPLETION_PATH` and `ANSWER_PATH` as default. See: https://docs.anthropic.com/en/api/openai-sdk
+
+If you not sure how to config `COMPLETION_PATH` and `ANSWER_PATH`, here is a guide:
+1. **Find the API Endpoint**:
+   - Visit the documentation of the LLM provider you want to use.
+   - Find the API endpoint for the completion task. This is usually under the "API Reference" or "Developer Documentation" section.
+2. **Identify the Response Structure**:
+   - Look for the structure of the response. This typically includes fields like `choices`, `completion`, etc.
+3. **Identify the Path Expression**:
+   Forexample, claude response structure like this:
+   ```json
+      {
+      "content": [
+        {
+          "text": "Hi! My name is Claude.",
+          "type": "text"
+        }
+      ],
+      "id": "msg_013Zva2CMHLNnXjNJJKqJ2EF",
+      "model": "claude-3-7-sonnet-20250219",
+      "role": "assistant",
+      "stop_reason": "end_turn",
+      "stop_sequence": null,
+      "type": "message",
+      "usage": {
+        "input_tokens": 2095,
+        "output_tokens": 503
+      }
+    }
+   ```
+    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`.
+
+
 ## Usage
 
 ### Basic Usage

{yaicli-0.0.8 → yaicli-0.0.10}/README.md

@@ -5,7 +5,9 @@
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/yaicli?logo=pypi&style=for-the-badge)
 ![Pepy Total Downloads](https://img.shields.io/pepy/dt/yaicli?style=for-the-badge&logo=python)
 
-YAICLI is a powerful command-line AI assistant tool that enables you to interact with Large Language Models (LLMs) like ChatGPT's gpt-4o through your terminal. It offers multiple operation modes for everyday conversations, generating and executing shell commands, and one-shot quick queries.
+YAICLI is a compact yet potent command-line AI assistant, allowing you to engage with Large Language Models (LLMs) such as ChatGPT's gpt-4o directly via your terminal. It offers multiple operation modes for everyday conversations, generating and executing shell commands, and one-shot quick queries.
+
+Support regular and deep thinking models.
 
 > [!WARNING] 
 > This is a work in progress, some features could change or be removed in the future.
@@ -34,6 +36,9 @@ YAICLI is a powerful command-line AI assistant tool that enables you to interact
 - **Keyboard Shortcuts**:
   - Tab to switch between Chat and Execute modes
 
+- **History**:
+  - Save and recall previous queries
+
 ## Installation
 
 ### Prerequisites
@@ -73,6 +78,7 @@ The default configuration file is located at `~/.config/yaicli/config.ini`. Look
 
 ```ini
 [core]
+PROVIDER=OPENAI
 BASE_URL=https://api.openai.com/v1
 API_KEY=your_api_key_here
 MODEL=gpt-4o
@@ -104,6 +110,58 @@ Below are the available configuration options and override environment variables
 - **ANSWER_PATH**: Json path expression to extract answer from response, default: choices[0].message.content, env: AI_ANSWER_PATH
 - **STREAM**: Enable/disable streaming responses, default: true, env: AI_STREAM
 
+Default config of `COMPLETION_PATH` and `ANSWER_PATH` is OpenAI compatible. If you are using OpenAI or other OpenAI compatible LLM provider, you can use the default config.
+
+If you wish to use other providers that are not compatible with the openai interface, you can use the following config:
+
+- claude:
+  - BASE_URL: https://api.anthropic.com/v1
+  - COMPLETION_PATH: /messages
+  - ANSWER_PATH: content.0.text
+- cohere:
+  - BASE_URL: https://api.cohere.com/v2
+  - COMPLETION_PATH: /chat
+  - ANSWER_PATH: message.content.[0].text
+- google:
+  - BASE_URL: https://generativelanguage.googleapis.com/v1beta/openai
+  - COMPLETION_PATH: /chat/completions
+  - ANSWER_PATH: choices[0].message.content
+
+You can use google OpenAI complete endpoint and leave `COMPLETION_PATH` and `ANSWER_PATH` as default. BASE_URL: https://generativelanguage.googleapis.com/v1beta/openai. See https://ai.google.dev/gemini-api/docs/openai
+
+Claude also has a testable OpenAI-compatible interface, you can just use Calude endpoint and leave `COMPLETION_PATH` and `ANSWER_PATH` as default. See: https://docs.anthropic.com/en/api/openai-sdk
+
+If you not sure how to config `COMPLETION_PATH` and `ANSWER_PATH`, here is a guide:
+1. **Find the API Endpoint**:
+   - Visit the documentation of the LLM provider you want to use.
+   - Find the API endpoint for the completion task. This is usually under the "API Reference" or "Developer Documentation" section.
+2. **Identify the Response Structure**:
+   - Look for the structure of the response. This typically includes fields like `choices`, `completion`, etc.
+3. **Identify the Path Expression**:
+   Forexample, claude response structure like this:
+   ```json
+      {
+      "content": [
+        {
+          "text": "Hi! My name is Claude.",
+          "type": "text"
+        }
+      ],
+      "id": "msg_013Zva2CMHLNnXjNJJKqJ2EF",
+      "model": "claude-3-7-sonnet-20250219",
+      "role": "assistant",
+      "stop_reason": "end_turn",
+      "stop_sequence": null,
+      "type": "message",
+      "usage": {
+        "input_tokens": 2095,
+        "output_tokens": 503
+      }
+    }
+   ```
+    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`.
+
+
 ## Usage
 
 ### Basic Usage

{yaicli-0.0.8 → yaicli-0.0.10}/pyproject.toml

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

{yaicli-0.0.8 → yaicli-0.0.10}/yaicli.py

@@ -2,7 +2,6 @@ import configparser
 import json
 import platform
 import subprocess
-import time
 from os import getenv
 from os.path import basename, pathsep
 from pathlib import Path
@@ -30,7 +29,7 @@ Rules:
 5. Return NOTHING except the ready-to-run command"""
 
 DEFAULT_PROMPT = (
-    "You are yaili, a system management and programing assistant, "
+    "You are YAICLI, a system management and programing assistant, "
     "You are managing {_os} operating system with {_shell} shell. "
     "Your responses should be concise and use Markdown format, "
     "unless the user explicitly requests more details."
@@ -232,44 +231,75 @@ STREAM=true"""
             raise typer.Exit(code=1) from None
         return response
 
-    def _print(self, response: requests.Response, stream: bool = True) -> str:
-        """Print response from LLM and return full completion"""
+    def get_reasoning_content(self, delta: dict) -> Optional[str]:
+        # reasoning: openrouter
+        # reasoning_content: infi-ai/deepseek
+        for k in ("reasoning_content", "reasoning"):
+            if k in delta:
+                return delta[k]
+        return None
+
+    def _print_stream(self, response: requests.Response) -> str:
+        """Print response from LLM in streaming mode"""
         full_completion = ""
-        if stream:
-            with Live() as live:
-                for line in response.iter_lines():
-                    # Skip empty lines
-                    if not line:
-                        continue
+        in_reasoning = False
 
-                    # Process server-sent events
-                    data = line.decode("utf-8")
-                    if not data.startswith("data: "):
-                        continue
+        with Live() as live:
+            for line in response.iter_lines():
+                if not line:
+                    continue
 
-                    # Extract data portion
-                    data = data[6:]
-                    if data == "[DONE]":
-                        break
+                data = line.decode("utf-8")
+                if not data.startswith("data: "):
+                    continue
+
+                data = data[6:]
+                if data == "[DONE]":
+                    break
+
+                try:
+                    json_data = json.loads(data)
+                    if not json_data.get("choices"):
+                        continue
 
-                    # Parse JSON and update display
-                    try:
-                        json_data = json.loads(data)
-                        content = json_data["choices"][0]["delta"].get("content", "")
+                    delta = json_data["choices"][0]["delta"]
+                    reason = self.get_reasoning_content(delta)
+
+                    if reason is not None:
+                        # reasoning started
+                        if not in_reasoning:
+                            in_reasoning = True
+                            full_completion = "> Reasoning:\n> "
+                        full_completion += reason.replace("\n", "\n> ")
+                    else:
+                        # reasoning stoped
+                        if in_reasoning:
+                            in_reasoning = False
+                            full_completion += "\n\n"
+                        content = delta.get("content", "") or ""
                         full_completion += content
-                        live.update(Markdown(markup=full_completion), refresh=True)
-                    except json.JSONDecodeError:
-                        self.console.print("[red]Error decoding response JSON[/red]")
-                        if self.verbose:
-                            self.console.print(f"[red]Error: {data}[/red]")
+                    live.update(Markdown(markup=full_completion), refresh=True)
+                except json.JSONDecodeError:
+                    self.console.print("[red]Error decoding response JSON[/red]")
+                    if self.verbose:
+                        self.console.print(f"[red]Error: {data}[/red]")
+
+        return full_completion
 
-                    time.sleep(0.01)
+    def _print_non_stream(self, response: requests.Response) -> str:
+        """Print response from LLM in non-streaming mode"""
+        full_completion = jmespath.search(self.config.get("ANSWER_PATH", "choices[0].message.content"), response.json())
+        self.console.print(Markdown(full_completion))
+        return full_completion
+
+    def _print(self, response: requests.Response, stream: bool = True) -> str:
+        """Print response from LLM and return full completion"""
+        if stream:
+            # Streaming response
+            full_completion = self._print_stream(response)
         else:
             # Non-streaming response
-            full_completion = jmespath.search(
-                self.config.get("ANSWER_PATH", "choices[0].message.content"), response.json()
-            )
-            self.console.print(Markdown(full_completion))
+            full_completion = self._print_non_stream(response)
         self.console.print()  # Add a newline after the response to separate from the next input
         return full_completion
 
@@ -292,7 +322,13 @@ STREAM=true"""
         """Run REPL loop, handling user input and generating responses, saving history, and executing commands"""
         # Show REPL instructions
         self._setup_key_bindings()
-        self.console.print("[bold]Starting REPL loop[/bold]")
+        self.console.print("""
+██    ██  █████  ██  ██████ ██      ██
+ ██  ██  ██   ██ ██ ██      ██      ██
+  ████   ███████ ██ ██      ██      ██
+   ██    ██   ██ ██ ██      ██      ██
+   ██    ██   ██ ██  ██████ ███████ ██
+""")
         self.console.print("[bold]Press TAB to change in chat and exec mode[/bold]")
         self.console.print("[bold]Type /clear to clear chat history[/bold]")
         self.console.print("[bold]Type /his to see chat history[/bold]")
@@ -355,24 +391,10 @@ STREAM=true"""
 
         self.console.print("[bold green]Exiting...[/bold green]")
 
-    def run(self, chat: bool, shell: bool, prompt: str) -> None:
-        """Run the CLI"""
-        self.load_config()
-        if not self.config.get("API_KEY"):
-            self.console.print("[bold red]API key not set[/bold red]")
-            self.console.print(
-                "[bold red]Please set API key in ~/.config/yaicli/config.ini or environment variable[/bold red]"
-            )
-            raise typer.Exit(code=1)
+    def _run_once(self, prompt: str, shell: bool = False) -> None:
+        """Run once with given prompt"""
         _os = self.detect_os()
         _shell = self.detect_shell()
-
-        # Handle chat mode
-        if chat:
-            self.current_mode = CHAT_MODE
-            self._run_repl()
-            return
-
         # Create appropriate system prompt based on mode
         system_prompt = SHELL_PROMPT if shell else DEFAULT_PROMPT
         system_content = system_prompt.format(_os=_os, _shell=_shell)
@@ -401,6 +423,24 @@ STREAM=true"""
                     self.console.print(f"[bold red]Command failed with return code {returncode}[/bold red]")
 
 
+    def run(self, chat: bool, shell: bool, prompt: str) -> None:
+        """Run the CLI"""
+        self.load_config()
+        if not self.config.get("API_KEY"):
+            self.console.print("[bold red]API key not set[/bold red]")
+            self.console.print(
+                "[bold red]Please set API key in ~/.config/yaicli/config.ini or environment variable[/bold red]"
+            )
+            raise typer.Exit(code=1)
+
+        # Handle chat mode
+        if chat:
+            self.current_mode = CHAT_MODE
+            self._run_repl()
+        else:
+            self._run_once(prompt, shell)
+
+
 @app.command()
 def main(
     ctx: typer.Context,