yaicli 0.0.17__tar.gz → 0.0.19__tar.gz

{yaicli-0.0.17 → yaicli-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaicli
-Version: 0.0.17
+Version: 0.0.19
 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
@@ -238,32 +238,28 @@ Support regular and deep thinking models.
 
 ## Features
 
-- **Multiple Operation Modes**:
-  - **Chat Mode (💬)**: Interactive conversation with the AI assistant
-  - **Execute Mode (🚀)**: Generate and execute shell commands specific to your OS and shell
-  - **Temp Mode**: Quick queries without entering interactive mode
+- **Smart Interaction Modes**:
+  - 💬 Chat Mode: Persistent dialogue with context tracking
+  - 🚀 Execute Mode: Generate & verify OS-specific commands (Windows/macOS/Linux)
+  - ⚡ Quick Query: Single-shot responses without entering REPL
 
-- **Smart Environment Detection**:
-  - Automatically detects your operating system and shell
-  - Customizes responses and commands for your specific environment
+- **Environment Intelligence**:
+  - Auto-detects shell type (CMD/PowerShell/bash/zsh)
+  - Dynamic command validation with 3-step confirmation
+  - Pipe input support (`cat log.txt | ai "analyze errors"`)
 
-- **Rich Terminal Interface**:
-  - Markdown rendering for formatted responses
-  - Streaming responses for real-time feedback
-  - Color-coded output for better readability
+- **Enterprise LLM Support**:
+  - OpenAI API compatible endpoints
+  - Claude/Gemini/Cohere integration guides
+  - Custom JSON parsing with jmespath
 
-- **Configurable**:
-  - Customizable API endpoints
-  - Support for different LLM providers
-  - Adjustable response parameters
+- **Terminal Experience**:
+  - Real-time streaming with cursor animation
+  - LRU history management (500 entries default)
 
-- **Keyboard Shortcuts**:
-  - Tab to switch between Chat and Execute modes
-  - `↑/↓` to navigate history
-  - `Ctrl+R` to search history
-
-- **History**:
-  - Save and recall previous queries
+- **DevOps Ready**:
+  - Layered configuration (Env > File > Defaults)
+  - Verbose debug mode with API tracing
 
 ## Installation
 
@@ -345,6 +341,7 @@ Below are the available configuration options and override environment variables
 - **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
 - **MAX_HISTORY**: Max history size, default: 500, env: YAI_MAX_HISTORY
+- **AUTO_SUGGEST**: Auto suggest from history, default: true, env: YAI_AUTO_SUGGEST
 
 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.
 

{yaicli-0.0.17 → yaicli-0.0.19}/README.md

@@ -14,32 +14,28 @@ Support regular and deep thinking models.
 
 ## Features
 
-- **Multiple Operation Modes**:
-  - **Chat Mode (💬)**: Interactive conversation with the AI assistant
-  - **Execute Mode (🚀)**: Generate and execute shell commands specific to your OS and shell
-  - **Temp Mode**: Quick queries without entering interactive mode
+- **Smart Interaction Modes**:
+  - 💬 Chat Mode: Persistent dialogue with context tracking
+  - 🚀 Execute Mode: Generate & verify OS-specific commands (Windows/macOS/Linux)
+  - ⚡ Quick Query: Single-shot responses without entering REPL
 
-- **Smart Environment Detection**:
-  - Automatically detects your operating system and shell
-  - Customizes responses and commands for your specific environment
+- **Environment Intelligence**:
+  - Auto-detects shell type (CMD/PowerShell/bash/zsh)
+  - Dynamic command validation with 3-step confirmation
+  - Pipe input support (`cat log.txt | ai "analyze errors"`)
 
-- **Rich Terminal Interface**:
-  - Markdown rendering for formatted responses
-  - Streaming responses for real-time feedback
-  - Color-coded output for better readability
+- **Enterprise LLM Support**:
+  - OpenAI API compatible endpoints
+  - Claude/Gemini/Cohere integration guides
+  - Custom JSON parsing with jmespath
 
-- **Configurable**:
-  - Customizable API endpoints
-  - Support for different LLM providers
-  - Adjustable response parameters
+- **Terminal Experience**:
+  - Real-time streaming with cursor animation
+  - LRU history management (500 entries default)
 
-- **Keyboard Shortcuts**:
-  - Tab to switch between Chat and Execute modes
-  - `↑/↓` to navigate history
-  - `Ctrl+R` to search history
-
-- **History**:
-  - Save and recall previous queries
+- **DevOps Ready**:
+  - Layered configuration (Env > File > Defaults)
+  - Verbose debug mode with API tracing
 
 ## Installation
 
@@ -121,6 +117,7 @@ Below are the available configuration options and override environment variables
 - **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
 - **MAX_HISTORY**: Max history size, default: 500, env: YAI_MAX_HISTORY
+- **AUTO_SUGGEST**: Auto suggest from history, default: true, env: YAI_AUTO_SUGGEST
 
 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.
 

{yaicli-0.0.17 → yaicli-0.0.19}/pyproject.toml

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

{yaicli-0.0.17 → yaicli-0.0.19}/yaicli.py

@@ -7,14 +7,14 @@ import time
 from os import getenv
 from os.path import basename, exists, pathsep, devnull
 from pathlib import Path
-from typing import Annotated, Optional, Union
+from typing import Annotated, Any, Dict, Optional, Union
 
 import httpx
 import jmespath
 import typer
 from distro import name as distro_name
 from prompt_toolkit import PromptSession, prompt
-# from prompt_toolkit.completion import WordCompleter
+from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from prompt_toolkit.history import FileHistory, _StrOrBytesPath
 from prompt_toolkit.key_binding import KeyBindings, KeyPressEvent
 from prompt_toolkit.keys import Keys
@@ -49,46 +49,54 @@ CHAT_MODE = "chat"
 TEMP_MODE = "temp"
 
 DEFAULT_CONFIG_MAP = {
-    "BASE_URL": {"value": "https://api.openai.com/v1", "env_key": "YAI_BASE_URL"},
-    "API_KEY": {"value": "", "env_key": "YAI_API_KEY"},
-    "MODEL": {"value": "gpt-4o", "env_key": "YAI_MODEL"},
-    "SHELL_NAME": {"value": "auto", "env_key": "YAI_SHELL_NAME"},
-    "OS_NAME": {"value": "auto", "env_key": "YAI_OS_NAME"},
-    "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"},
-    "MAX_HISTORY": {"value": "500", "env_key": "YAI_MAX_HISTORY"},
+    # Core API settings
+    "BASE_URL": {"value": "https://api.openai.com/v1", "env_key": "YAI_BASE_URL", "type": str},
+    "API_KEY": {"value": "", "env_key": "YAI_API_KEY", "type": str},
+    "MODEL": {"value": "gpt-4o", "env_key": "YAI_MODEL", "type": str},
+    # System detection hints
+    "SHELL_NAME": {"value": "auto", "env_key": "YAI_SHELL_NAME", "type": str},
+    "OS_NAME": {"value": "auto", "env_key": "YAI_OS_NAME", "type": str},
+    # API response parsing
+    "COMPLETION_PATH": {"value": "chat/completions", "env_key": "YAI_COMPLETION_PATH", "type": str},
+    "ANSWER_PATH": {"value": "choices[0].message.content", "env_key": "YAI_ANSWER_PATH", "type": str},
+    # API call parameters
+    "STREAM": {"value": "true", "env_key": "YAI_STREAM", "type": bool},
+    "TEMPERATURE": {"value": "0.7", "env_key": "YAI_TEMPERATURE", "type": float},
+    "TOP_P": {"value": "1.0", "env_key": "YAI_TOP_P", "type": float},
+    "MAX_TOKENS": {"value": "1024", "env_key": "YAI_MAX_TOKENS", "type": int},
+    # UI/UX settings
+    "CODE_THEME": {"value": "monokai", "env_key": "YAI_CODE_THEME", "type": str},
+    "MAX_HISTORY": {"value": "500", "env_key": "YAI_MAX_HISTORY", "type": int},  # readline history file limit
+    "AUTO_SUGGEST": {"value": "true", "env_key": "YAI_AUTO_SUGGEST", "type": bool},
 }
 
-DEFAULT_CONFIG_INI = """[core]
+DEFAULT_CONFIG_INI = f"""[core]
 PROVIDER=openai
-BASE_URL=https://api.openai.com/v1
-API_KEY=
-MODEL=gpt-4o
+BASE_URL={DEFAULT_CONFIG_MAP["BASE_URL"]["value"]}
+API_KEY={DEFAULT_CONFIG_MAP["API_KEY"]["value"]}
+MODEL={DEFAULT_CONFIG_MAP["MODEL"]["value"]}
 
-# auto detect shell and os
-SHELL_NAME=auto
-OS_NAME=auto
+# auto detect shell and os (or specify manually, e.g., bash, zsh, powershell.exe)
+SHELL_NAME={DEFAULT_CONFIG_MAP["SHELL_NAME"]["value"]}
+OS_NAME={DEFAULT_CONFIG_MAP["OS_NAME"]["value"]}
 
-# if you want to use custom completions path, you can set it here
-COMPLETION_PATH=/chat/completions
-# if you want to use custom answer path, you can set it here
-ANSWER_PATH=choices[0].message.content
+# API paths (usually no need to change for OpenAI compatible APIs)
+COMPLETION_PATH={DEFAULT_CONFIG_MAP["COMPLETION_PATH"]["value"]}
+ANSWER_PATH={DEFAULT_CONFIG_MAP["ANSWER_PATH"]["value"]}
 
-# true: streaming response
-# false: non-streaming response
-STREAM=true
-CODE_THEME=monokia
+# true: streaming response, false: non-streaming
+STREAM={DEFAULT_CONFIG_MAP["STREAM"]["value"]}
 
-TEMPERATURE=0.7
-TOP_P=1.0
-MAX_TOKENS=1024
+# LLM parameters
+TEMPERATURE={DEFAULT_CONFIG_MAP["TEMPERATURE"]["value"]}
+TOP_P={DEFAULT_CONFIG_MAP["TOP_P"]["value"]}
+MAX_TOKENS={DEFAULT_CONFIG_MAP["MAX_TOKENS"]["value"]}
 
-MAX_HISTORY=500"""
+# UI/UX
+CODE_THEME={DEFAULT_CONFIG_MAP["CODE_THEME"]["value"]}
+MAX_HISTORY={DEFAULT_CONFIG_MAP["MAX_HISTORY"]["value"]} # Max entries kept in history file
+AUTO_SUGGEST={DEFAULT_CONFIG_MAP["AUTO_SUGGEST"]["value"]}
+"""
 
 app = typer.Typer(
     name="yaicli",
@@ -184,10 +192,6 @@ class CLI:
         self.max_history_length = 25
         self.current_mode = TEMP_MODE
 
-    def is_stream(self) -> bool:
-        """Check if streaming is enabled"""
-        return self.config["STREAM"] == "true"
-
     def prepare_chat_loop(self) -> None:
         """Setup key bindings and history for chat mode"""
         self._setup_key_bindings()
@@ -196,10 +200,10 @@ class CLI:
         self.session = PromptSession(
             key_bindings=self.bindings,
             # completer=WordCompleter(["/clear", "/exit", "/his"]),
-            complete_while_typing=True,
             history=LimitedFileHistory(
                 Path("~/.yaicli_history").expanduser(), max_entries=int(self.config["MAX_HISTORY"])
             ),
+            auto_suggest=AutoSuggestFromHistory() if self.config["AUTO_SUGGEST"] else None,
             enable_history_search=True,
         )
 
@@ -210,42 +214,66 @@ class CLI:
         def _(event: KeyPressEvent) -> None:
             self.current_mode = EXEC_MODE if self.current_mode == CHAT_MODE else CHAT_MODE
 
-    def load_config(self) -> dict[str, str]:
+    def load_config(self) -> dict[str, Any]:  # Changed return type hint
         """Load LLM API configuration with priority:
         1. Environment variables (highest priority)
         2. Configuration file
         3. Default values (lowest priority)
 
+        Applies type conversion based on DEFAULT_CONFIG_MAP after merging sources.
+
         Returns:
-            dict: merged configuration
+            dict: merged configuration with appropriate types
         """
-        # Start with default configuration (lowest priority)
-        merged_config = {k: v["value"] for k, v in DEFAULT_CONFIG_MAP.items()}
+        # Start with default configuration string values (lowest priority)
+        # These serve as the base and also for fallback on type errors
+        default_values_str = {k: v["value"] for k, v in DEFAULT_CONFIG_MAP.items()}
+        merged_config: Dict[str, Any] = default_values_str.copy()  # Use Any for value type
 
         # Create default config file if it doesn't exist
         if not self.CONFIG_PATH.exists():
             self.console.print("[bold yellow]Creating default configuration file.[/bold yellow]")
             self.CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
-            with open(self.CONFIG_PATH, "w") as f:
+            with open(self.CONFIG_PATH, "w", encoding="utf-8") as f:  # Added encoding
                 f.write(DEFAULT_CONFIG_INI)
         else:
             # Load from configuration file (middle priority)
             config_parser = CasePreservingConfigParser()
-            config_parser.read(self.CONFIG_PATH)
+            # Read with UTF-8 encoding
+            config_parser.read(self.CONFIG_PATH, encoding="utf-8")
             if "core" in config_parser:
-                # Update with non-empty values from config file
-                merged_config.update({k: v for k, v in config_parser["core"].items() if v.strip()})
+                # Update with non-empty values from config file (values are strings)
+                merged_config.update(
+                    {k: v for k, v in config_parser["core"].items() if k in DEFAULT_CONFIG_MAP and v.strip()}
+                )
 
         # Override with environment variables (highest priority)
-        for key, config in DEFAULT_CONFIG_MAP.items():
-            env_value = getenv(config["env_key"])
+        for key, config_info in DEFAULT_CONFIG_MAP.items():
+            env_value = getenv(config_info["env_key"])
             if env_value is not None:
+                # Env values are strings
                 merged_config[key] = env_value
-
-        merged_config["STREAM"] = str(merged_config.get("STREAM", "true")).lower()
-
+            target_type = config_info["type"]
+            # Fallback, shouldn't be needed here, but safe
+            raw_value: Any = merged_config.get(key, default_values_str.get(key))
+            converted_value = None
+            try:
+                if target_type is bool:
+                    converted_value = str(raw_value).strip().lower() == "true"
+                elif target_type in (int, float, str):
+                    converted_value = target_type(raw_value)
+            except (ValueError, TypeError) as e:
+                self.console.print(
+                    f"[yellow]Warning:[/yellow] Invalid value '{raw_value}' for '{key}'. "
+                    f"Expected type '{target_type.__name__}'. Using default value '{default_values_str[key]}'. Error: {e}",
+                    style="dim",
+                )
+                # Fallback to default string value
+                converted_value = target_type(default_values_str[key])
+
+            merged_config[key] = converted_value
         self.config = merged_config
-        return merged_config
+        return self.config
 
     def detect_os(self) -> str:
         """Detect operating system + version"""
@@ -329,14 +357,16 @@ class CLI:
         body = {
             "messages": message,
             "model": self.config.get("MODEL", "gpt-4o"),
-            "stream": self.is_stream(),
+            "stream": self.config["STREAM"],
             "temperature": self._get_number_with_type(key="TEMPERATURE", _type=float, default="0.7"),
             "top_p": self._get_number_with_type(key="TOP_P", _type=float, default="1.0"),
             "max_tokens": self._get_number_with_type(key="MAX_TOKENS", _type=int, default="1024"),
         }
         with httpx.Client(timeout=120.0) as client:
             response = client.post(
-                url, json=body, headers={"Authorization": f"Bearer {self.config.get('API_KEY', '')}"}
+                url,
+                json=body,
+                headers={"Authorization": f"Bearer {self.config.get('API_KEY', '')}"},
             )
         try:
             response.raise_for_status()
@@ -421,7 +451,10 @@ class CLI:
                     )
 
                 cursor = cursor_chars[cursor_index]
-                live.update(Markdown(markup=full_content + cursor, code_theme=self.config["CODE_THEME"]), refresh=True)
+                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)
@@ -488,7 +521,7 @@ class CLI:
 
     def _handle_llm_response(self, response: httpx.Response, user_input: str) -> str:
         """Print LLM response and update history"""
-        content = self._print_stream(response) if self.is_stream() else self._print_normal(response)
+        content = self._print_stream(response) if self.config["STREAM"] else self._print_normal(response)
         self.history.extend([{"role": "user", "content": user_input}, {"role": "assistant", "content": content}])
         self._check_history_len()
         return content
@@ -539,7 +572,7 @@ class CLI:
             # Handle clear command
             if user_input.lower() == CMD_CLEAR and self.current_mode == CHAT_MODE:
                 self.history = []
-                self.console.print("[bold yellow]Chat history cleared[/bold yellow]\n")
+                self.console.print("Chat history cleared\n", style="bold yellow")
                 continue
             elif user_input.lower() == CMD_HISTORY:
                 self.console.print(self.history)
@@ -564,17 +597,17 @@ class CLI:
         """Run the CLI"""
         self.load_config()
         if self.verbose:
-            self.console.print(f"CODE_THEME: {self.config['CODE_THEME']}")
-            self.console.print(f"ANSWER_PATH: {self.config['ANSWER_PATH']}")
+            self.console.print(f"CODE_THEME:      {self.config['CODE_THEME']}")
+            self.console.print(f"ANSWER_PATH:     {self.config['ANSWER_PATH']}")
             self.console.print(f"COMPLETION_PATH: {self.config['COMPLETION_PATH']}")
-            self.console.print(f"BASE_URL: {self.config['BASE_URL']}")
-            self.console.print(f"MODEL: {self.config['MODEL']}")
-            self.console.print(f"SHELL_NAME: {self.config['SHELL_NAME']}")
-            self.console.print(f"OS_NAME: {self.config['OS_NAME']}")
-            self.console.print(f"STREAM: {self.config['STREAM']}")
-            self.console.print(f"TEMPERATURE: {self.config['TEMPERATURE']}")
-            self.console.print(f"TOP_P: {self.config['TOP_P']}")
-            self.console.print(f"MAX_TOKENS: {self.config['MAX_TOKENS']}")
+            self.console.print(f"BASE_URL:        {self.config['BASE_URL']}")
+            self.console.print(f"MODEL:           {self.config['MODEL']}")
+            self.console.print(f"SHELL_NAME:      {self.config['SHELL_NAME']}")
+            self.console.print(f"OS_NAME:         {self.config['OS_NAME']}")
+            self.console.print(f"STREAM:          {self.config['STREAM']}")
+            self.console.print(f"TEMPERATURE:     {self.config['TEMPERATURE']}")
+            self.console.print(f"TOP_P:           {self.config['TOP_P']}")
+            self.console.print(f"MAX_TOKENS:      {self.config['MAX_TOKENS']}")
         if not self.config.get("API_KEY"):
             self.console.print(
                 "[yellow]API key not set. Please set in ~/.config/yaicli/config.ini or AI_API_KEY env[/]"
@@ -596,10 +629,17 @@ def main(
         bool, typer.Option("--chat", "-c", help="Start in chat mode", rich_help_panel="Run Options")
     ] = False,
     shell: Annotated[
-        bool, typer.Option("--shell", "-s", help="Generate and execute shell command", rich_help_panel="Run Options")
+        bool,
+        typer.Option(
+            "--shell",
+            "-s",
+            help="Generate and execute shell command",
+            rich_help_panel="Run Options",
+        ),
     ] = False,
     verbose: Annotated[
-        bool, typer.Option("--verbose", "-V", help="Show verbose information", rich_help_panel="Run Options")
+        bool,
+        typer.Option("--verbose", "-V", help="Show verbose information", rich_help_panel="Run Options"),
     ] = False,
     template: Annotated[bool, typer.Option("--template", help="Show the config template.")] = False,
 ):