yaicli 0.3.2__tar.gz → 0.4.0__tar.gz

{yaicli-0.3.2 → yaicli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaicli
-Version: 0.3.2
+Version: 0.4.0
 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
@@ -213,9 +213,10 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
+Requires-Dist: cohere>=5.15.0
 Requires-Dist: distro>=1.9.0
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: jmespath>=1.0.1
+Requires-Dist: openai>=1.76.0
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: rich>=13.9.4
 Requires-Dist: socksio>=1.0.0
@@ -235,9 +236,7 @@ generate and execute shell commands, or get quick answers without leaving your w
 
 **Supports both standard and deep reasoning models across all major LLM providers.**
 
-<p align="center">
-  <img src="https://vhs.charm.sh/vhs-5U1BBjJkTUBReRswsSgIVx.gif" alt="YAICLI Chat Demo" width="85%">
-</p>
+<a href="https://asciinema.org/a/vyreM0n576GjGL2asjI3QzUIY" target="_blank"><img src="https://asciinema.org/a/vyreM0n576GjGL2asjI3QzUIY.svg" width="85%"/></a>
 
 > [!NOTE]
 > YAICLI is actively developed. While core functionality is stable, some features may evolve in future releases.
@@ -329,10 +328,6 @@ MODEL = gpt-4o
 SHELL_NAME = auto
 OS_NAME = auto
 
-# API paths (usually no need to change for OpenAI compatible APIs)
-COMPLETION_PATH = chat/completions
-ANSWER_PATH = choices[0].message.content
-
 # true: streaming response, false: non-streaming
 STREAM = true
 
@@ -362,29 +357,28 @@ MAX_SAVED_CHATS = 20
 
 ### Configuration Options Reference
 
-| Option              | Description                                 | Default                      | Env Variable            |
-|---------------------|---------------------------------------------|------------------------------|-------------------------|
-| `PROVIDER`          | LLM provider (openai, claude, cohere, etc.) | `openai`                     | `YAI_PROVIDER`          |
-| `BASE_URL`          | API endpoint URL                            | `https://api.openai.com/v1`  | `YAI_BASE_URL`          |
-| `API_KEY`           | Your API key                                | -                            | `YAI_API_KEY`           |
-| `MODEL`             | LLM model to use                            | `gpt-4o`                     | `YAI_MODEL`             |
-| `SHELL_NAME`        | Shell type                                  | `auto`                       | `YAI_SHELL_NAME`        |
-| `OS_NAME`           | Operating system                            | `auto`                       | `YAI_OS_NAME`           |
-| `COMPLETION_PATH`   | API completion path                         | `chat/completions`           | `YAI_COMPLETION_PATH`   |
-| `ANSWER_PATH`       | JSON path for response                      | `choices[0].message.content` | `YAI_ANSWER_PATH`       |
-| `STREAM`            | Enable streaming                            | `true`                       | `YAI_STREAM`            |
-| `TIMEOUT`           | API timeout (seconds)                       | `60`                         | `YAI_TIMEOUT`           |
-| `INTERACTIVE_ROUND` | Interactive mode rounds                     | `25`                         | `YAI_INTERACTIVE_ROUND` |
-| `CODE_THEME`        | Syntax highlighting theme                   | `monokai`                    | `YAI_CODE_THEME`        |
-| `TEMPERATURE`       | Response randomness                         | `0.7`                        | `YAI_TEMPERATURE`       |
-| `TOP_P`             | Top-p sampling                              | `1.0`                        | `YAI_TOP_P`             |
-| `MAX_TOKENS`        | Max response tokens                         | `1024`                       | `YAI_MAX_TOKENS`        |
-| `MAX_HISTORY`       | Max history entries                         | `500`                        | `YAI_MAX_HISTORY`       |
-| `AUTO_SUGGEST`      | Enable history suggestions                  | `true`                       | `YAI_AUTO_SUGGEST`      |
-| `SHOW_REASONING`    | Enable reasoning display                    | `true`                       | `YAI_SHOW_REASONING`    |
-| `JUSTIFY`           | Text alignment                              | `default`                    | `YAI_JUSTIFY`           |
-| `CHAT_HISTORY_DIR`  | Chat history directory                      | `<tempdir>/yaicli/history`   | `YAI_CHAT_HISTORY_DIR`  |
-| `MAX_SAVED_CHATS`   | Max saved chats                             | `20`                         | `YAI_MAX_SAVED_CHATS`   |
+| Option                | Description                                 | Default                     | Env Variable              |
+| --------------------- | ------------------------------------------- | --------------------------- | ------------------------- |
+| `PROVIDER`            | LLM provider (openai, claude, cohere, etc.) | `openai`                    | `YAI_PROVIDER`            |
+| `BASE_URL`            | API endpoint URL                            | `https://api.openai.com/v1` | `YAI_BASE_URL`            |
+| `API_KEY`             | Your API key                                | -                           | `YAI_API_KEY`             |
+| `MODEL`               | LLM model to use                            | `gpt-4o`                    | `YAI_MODEL`               |
+| `SHELL_NAME`          | Shell type                                  | `auto`                      | `YAI_SHELL_NAME`          |
+| `OS_NAME`             | Operating system                            | `auto`                      | `YAI_OS_NAME`             |
+| `STREAM`              | Enable streaming                            | `true`                      | `YAI_STREAM`              |
+| `TIMEOUT`             | API timeout (seconds)                       | `60`                        | `YAI_TIMEOUT`             |
+| `INTERACTIVE_ROUND`   | Interactive mode rounds                     | `25`                        | `YAI_INTERACTIVE_ROUND`   |
+| `CODE_THEME`          | Syntax highlighting theme                   | `monokai`                   | `YAI_CODE_THEME`          |
+| `TEMPERATURE`         | Response randomness                         | `0.7`                       | `YAI_TEMPERATURE`         |
+| `TOP_P`               | Top-p sampling                              | `1.0`                       | `YAI_TOP_P`               |
+| `MAX_TOKENS`          | Max response tokens                         | `1024`                      | `YAI_MAX_TOKENS`          |
+| `MAX_HISTORY`         | Max history entries                         | `500`                       | `YAI_MAX_HISTORY`         |
+| `AUTO_SUGGEST`        | Enable history suggestions                  | `true`                      | `YAI_AUTO_SUGGEST`        |
+| `SHOW_REASONING`      | Enable reasoning display                    | `true`                      | `YAI_SHOW_REASONING`      |
+| `JUSTIFY`             | Text alignment                              | `default`                   | `YAI_JUSTIFY`             |
+| `CHAT_HISTORY_DIR`    | Chat history directory                      | `<tempdir>/yaicli/history`  | `YAI_CHAT_HISTORY_DIR`    |
+| `MAX_SAVED_CHATS`     | Max saved chats                             | `20`                        | `YAI_MAX_SAVED_CHATS`     |
+| `ROLE_MODIFY_WARNING` | Warn user when modifying role               | `true`                      | `YAI_ROLE_MODIFY_WARNING` |
 
 ### LLM Provider Configuration
 
@@ -393,52 +387,23 @@ other providers.
 
 #### Pre-configured Provider Settings
 
-| Provider                       | BASE_URL                                                  | COMPLETION_PATH    | ANSWER_PATH                  |
-|--------------------------------|-----------------------------------------------------------|--------------------|------------------------------|
-| **OpenAI** (default)           | `https://api.openai.com/v1`                               | `chat/completions` | `choices[0].message.content` |
-| **Claude** (native API)        | `https://api.anthropic.com/v1`                            | `messages`         | `content[0].text`            |
-| **Claude** (OpenAI-compatible) | `https://api.anthropic.com/v1/openai`                     | `chat/completions` | `choices[0].message.content` |
-| **Cohere**                     | `https://api.cohere.com/v2`                               | `chat`             | `message.content[0].text`    |
-| **Google Gemini**              | `https://generativelanguage.googleapis.com/v1beta/openai` | `chat/completions` | `choices[0].message.content` |
+`provider` is not case sensitive.
+
+Claude and gemini native api will support soon.
+
+| Provider                       | BASE_URL                                                  |
+| ------------------------------ | --------------------------------------------------------- |
+| **OpenAI** (default)           | `https://api.openai.com/v1`                               |
+| **Claude** (native API)        | `https://api.anthropic.com/v1`                            |
+| **Claude** (OpenAI-compatible) | `https://api.anthropic.com/v1/openai`                     |
+| **Cohere**                     | `https://api.cohere.com`                                  |
+| **Gemini**                     | `https://generativelanguage.googleapis.com/v1beta/openai` |
 
 > **Note**: Many providers offer OpenAI-compatible endpoints that work with the default settings.
 >
 > - Google Gemini: https://ai.google.dev/gemini-api/docs/openai
 > - Claude: https://docs.anthropic.com/en/api/openai-sdk
 
-#### Custom Provider Configuration Guide
-
-To configure a custom provider:
-
-1. **Find the API Endpoint**:
-
-    - Check the provider's API documentation for their chat completion endpoint
-
-2. **Identify the Response Structure**:
-
-    - Look at the JSON response format to find where the text content is located
-
-3. **Set the Path Expression**:
-    - Use jmespath syntax to specify the path to the text content
-
-**Example**: For Claude's native API, the response looks like:
-
-```json
-{
-  "content": [
-    {
-      "text": "Hi! My name is Claude.",
-      "type": "text"
-    }
-  ],
-  "id": "msg_013Zva2CMHLNnXjNJJKqJ2EF",
-  "model": "claude-3-7-sonnet-20250219",
-  "role": "assistant"
-}
-```
-
-The path to extract the text is: `content.[0].text`
-
 ### Syntax Highlighting Themes
 
 YAICLI supports all Pygments syntax highlighting themes. You can set your preferred theme in the config file:
@@ -449,7 +414,7 @@ CODE_THEME = monokai
 
 Browse available themes at: https://pygments.org/styles/
 
-![monokai theme example](artwork/monokia.png)
+![monokia theme example](artwork/monokia.png)
 
 ## 🚀 Usage
 
@@ -849,12 +814,10 @@ YAICLI is designed with a modular architecture that separates concerns and makes
 ### Dependencies
 
 | Library                                                         | Purpose                                            |
-|-----------------------------------------------------------------|----------------------------------------------------|
+| --------------------------------------------------------------- | -------------------------------------------------- |
 | [Typer](https://typer.tiangolo.com/)                            | Command-line interface with type hints             |
 | [Rich](https://rich.readthedocs.io/)                            | Terminal formatting and beautiful display          |
 | [prompt_toolkit](https://python-prompt-toolkit.readthedocs.io/) | Interactive input with history and auto-completion |
-| [httpx](https://www.python-httpx.org/)                          | Modern HTTP client with async support              |
-| [jmespath](https://jmespath.org/)                               | JSON data extraction                               |
 
 ## 👨‍💻 Contributing
 

{yaicli-0.3.2 → yaicli-0.4.0}/README.md

@@ -11,9 +11,7 @@ generate and execute shell commands, or get quick answers without leaving your w
 
 **Supports both standard and deep reasoning models across all major LLM providers.**
 
-<p align="center">
-  <img src="https://vhs.charm.sh/vhs-5U1BBjJkTUBReRswsSgIVx.gif" alt="YAICLI Chat Demo" width="85%">
-</p>
+<a href="https://asciinema.org/a/vyreM0n576GjGL2asjI3QzUIY" target="_blank"><img src="https://asciinema.org/a/vyreM0n576GjGL2asjI3QzUIY.svg" width="85%"/></a>
 
 > [!NOTE]
 > YAICLI is actively developed. While core functionality is stable, some features may evolve in future releases.
@@ -105,10 +103,6 @@ MODEL = gpt-4o
 SHELL_NAME = auto
 OS_NAME = auto
 
-# API paths (usually no need to change for OpenAI compatible APIs)
-COMPLETION_PATH = chat/completions
-ANSWER_PATH = choices[0].message.content
-
 # true: streaming response, false: non-streaming
 STREAM = true
 
@@ -138,29 +132,28 @@ MAX_SAVED_CHATS = 20
 
 ### Configuration Options Reference
 
-| Option              | Description                                 | Default                      | Env Variable            |
-|---------------------|---------------------------------------------|------------------------------|-------------------------|
-| `PROVIDER`          | LLM provider (openai, claude, cohere, etc.) | `openai`                     | `YAI_PROVIDER`          |
-| `BASE_URL`          | API endpoint URL                            | `https://api.openai.com/v1`  | `YAI_BASE_URL`          |
-| `API_KEY`           | Your API key                                | -                            | `YAI_API_KEY`           |
-| `MODEL`             | LLM model to use                            | `gpt-4o`                     | `YAI_MODEL`             |
-| `SHELL_NAME`        | Shell type                                  | `auto`                       | `YAI_SHELL_NAME`        |
-| `OS_NAME`           | Operating system                            | `auto`                       | `YAI_OS_NAME`           |
-| `COMPLETION_PATH`   | API completion path                         | `chat/completions`           | `YAI_COMPLETION_PATH`   |
-| `ANSWER_PATH`       | JSON path for response                      | `choices[0].message.content` | `YAI_ANSWER_PATH`       |
-| `STREAM`            | Enable streaming                            | `true`                       | `YAI_STREAM`            |
-| `TIMEOUT`           | API timeout (seconds)                       | `60`                         | `YAI_TIMEOUT`           |
-| `INTERACTIVE_ROUND` | Interactive mode rounds                     | `25`                         | `YAI_INTERACTIVE_ROUND` |
-| `CODE_THEME`        | Syntax highlighting theme                   | `monokai`                    | `YAI_CODE_THEME`        |
-| `TEMPERATURE`       | Response randomness                         | `0.7`                        | `YAI_TEMPERATURE`       |
-| `TOP_P`             | Top-p sampling                              | `1.0`                        | `YAI_TOP_P`             |
-| `MAX_TOKENS`        | Max response tokens                         | `1024`                       | `YAI_MAX_TOKENS`        |
-| `MAX_HISTORY`       | Max history entries                         | `500`                        | `YAI_MAX_HISTORY`       |
-| `AUTO_SUGGEST`      | Enable history suggestions                  | `true`                       | `YAI_AUTO_SUGGEST`      |
-| `SHOW_REASONING`    | Enable reasoning display                    | `true`                       | `YAI_SHOW_REASONING`    |
-| `JUSTIFY`           | Text alignment                              | `default`                    | `YAI_JUSTIFY`           |
-| `CHAT_HISTORY_DIR`  | Chat history directory                      | `<tempdir>/yaicli/history`   | `YAI_CHAT_HISTORY_DIR`  |
-| `MAX_SAVED_CHATS`   | Max saved chats                             | `20`                         | `YAI_MAX_SAVED_CHATS`   |
+| Option                | Description                                 | Default                     | Env Variable              |
+| --------------------- | ------------------------------------------- | --------------------------- | ------------------------- |
+| `PROVIDER`            | LLM provider (openai, claude, cohere, etc.) | `openai`                    | `YAI_PROVIDER`            |
+| `BASE_URL`            | API endpoint URL                            | `https://api.openai.com/v1` | `YAI_BASE_URL`            |
+| `API_KEY`             | Your API key                                | -                           | `YAI_API_KEY`             |
+| `MODEL`               | LLM model to use                            | `gpt-4o`                    | `YAI_MODEL`               |
+| `SHELL_NAME`          | Shell type                                  | `auto`                      | `YAI_SHELL_NAME`          |
+| `OS_NAME`             | Operating system                            | `auto`                      | `YAI_OS_NAME`             |
+| `STREAM`              | Enable streaming                            | `true`                      | `YAI_STREAM`              |
+| `TIMEOUT`             | API timeout (seconds)                       | `60`                        | `YAI_TIMEOUT`             |
+| `INTERACTIVE_ROUND`   | Interactive mode rounds                     | `25`                        | `YAI_INTERACTIVE_ROUND`   |
+| `CODE_THEME`          | Syntax highlighting theme                   | `monokai`                   | `YAI_CODE_THEME`          |
+| `TEMPERATURE`         | Response randomness                         | `0.7`                       | `YAI_TEMPERATURE`         |
+| `TOP_P`               | Top-p sampling                              | `1.0`                       | `YAI_TOP_P`               |
+| `MAX_TOKENS`          | Max response tokens                         | `1024`                      | `YAI_MAX_TOKENS`          |
+| `MAX_HISTORY`         | Max history entries                         | `500`                       | `YAI_MAX_HISTORY`         |
+| `AUTO_SUGGEST`        | Enable history suggestions                  | `true`                      | `YAI_AUTO_SUGGEST`        |
+| `SHOW_REASONING`      | Enable reasoning display                    | `true`                      | `YAI_SHOW_REASONING`      |
+| `JUSTIFY`             | Text alignment                              | `default`                   | `YAI_JUSTIFY`             |
+| `CHAT_HISTORY_DIR`    | Chat history directory                      | `<tempdir>/yaicli/history`  | `YAI_CHAT_HISTORY_DIR`    |
+| `MAX_SAVED_CHATS`     | Max saved chats                             | `20`                        | `YAI_MAX_SAVED_CHATS`     |
+| `ROLE_MODIFY_WARNING` | Warn user when modifying role               | `true`                      | `YAI_ROLE_MODIFY_WARNING` |
 
 ### LLM Provider Configuration
 
@@ -169,52 +162,23 @@ other providers.
 
 #### Pre-configured Provider Settings
 
-| Provider                       | BASE_URL                                                  | COMPLETION_PATH    | ANSWER_PATH                  |
-|--------------------------------|-----------------------------------------------------------|--------------------|------------------------------|
-| **OpenAI** (default)           | `https://api.openai.com/v1`                               | `chat/completions` | `choices[0].message.content` |
-| **Claude** (native API)        | `https://api.anthropic.com/v1`                            | `messages`         | `content[0].text`            |
-| **Claude** (OpenAI-compatible) | `https://api.anthropic.com/v1/openai`                     | `chat/completions` | `choices[0].message.content` |
-| **Cohere**                     | `https://api.cohere.com/v2`                               | `chat`             | `message.content[0].text`    |
-| **Google Gemini**              | `https://generativelanguage.googleapis.com/v1beta/openai` | `chat/completions` | `choices[0].message.content` |
+`provider` is not case sensitive.
+
+Claude and gemini native api will support soon.
+
+| Provider                       | BASE_URL                                                  |
+| ------------------------------ | --------------------------------------------------------- |
+| **OpenAI** (default)           | `https://api.openai.com/v1`                               |
+| **Claude** (native API)        | `https://api.anthropic.com/v1`                            |
+| **Claude** (OpenAI-compatible) | `https://api.anthropic.com/v1/openai`                     |
+| **Cohere**                     | `https://api.cohere.com`                                  |
+| **Gemini**                     | `https://generativelanguage.googleapis.com/v1beta/openai` |
 
 > **Note**: Many providers offer OpenAI-compatible endpoints that work with the default settings.
 >
 > - Google Gemini: https://ai.google.dev/gemini-api/docs/openai
 > - Claude: https://docs.anthropic.com/en/api/openai-sdk
 
-#### Custom Provider Configuration Guide
-
-To configure a custom provider:
-
-1. **Find the API Endpoint**:
-
-    - Check the provider's API documentation for their chat completion endpoint
-
-2. **Identify the Response Structure**:
-
-    - Look at the JSON response format to find where the text content is located
-
-3. **Set the Path Expression**:
-    - Use jmespath syntax to specify the path to the text content
-
-**Example**: For Claude's native API, the response looks like:
-
-```json
-{
-  "content": [
-    {
-      "text": "Hi! My name is Claude.",
-      "type": "text"
-    }
-  ],
-  "id": "msg_013Zva2CMHLNnXjNJJKqJ2EF",
-  "model": "claude-3-7-sonnet-20250219",
-  "role": "assistant"
-}
-```
-
-The path to extract the text is: `content.[0].text`
-
 ### Syntax Highlighting Themes
 
 YAICLI supports all Pygments syntax highlighting themes. You can set your preferred theme in the config file:
@@ -225,7 +189,7 @@ CODE_THEME = monokai
 
 Browse available themes at: https://pygments.org/styles/
 
-![monokai theme example](artwork/monokia.png)
+![monokia theme example](artwork/monokia.png)
 
 ## 🚀 Usage
 
@@ -625,12 +589,10 @@ YAICLI is designed with a modular architecture that separates concerns and makes
 ### Dependencies
 
 | Library                                                         | Purpose                                            |
-|-----------------------------------------------------------------|----------------------------------------------------|
+| --------------------------------------------------------------- | -------------------------------------------------- |
 | [Typer](https://typer.tiangolo.com/)                            | Command-line interface with type hints             |
 | [Rich](https://rich.readthedocs.io/)                            | Terminal formatting and beautiful display          |
 | [prompt_toolkit](https://python-prompt-toolkit.readthedocs.io/) | Interactive input with history and auto-completion |
-| [httpx](https://www.python-httpx.org/)                          | Modern HTTP client with async support              |
-| [jmespath](https://jmespath.org/)                               | JSON data extraction                               |
 
 ## 👨‍💻 Contributing
 

{yaicli-0.3.2 → yaicli-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "yaicli"
-version = "0.3.2"
+version = "0.4.0"
 description = "A simple CLI tool to interact with LLM"
 authors = [{ name = "belingud", email = "im.victor@qq.com" }]
 readme = "README.md"
@@ -30,9 +30,10 @@ keywords = [
     "interact with llms",
 ]
 dependencies = [
+    "cohere>=5.15.0",
     "distro>=1.9.0",
     "httpx>=0.28.1",
-    "jmespath>=1.0.1",
+    "openai>=1.76.0",
     "prompt-toolkit>=3.0.50",
     "rich>=13.9.4",
     "socksio>=1.0.0",

{yaicli-0.3.2 → yaicli-0.4.0}/yaicli/cli.py

@@ -16,7 +16,6 @@ from rich.padding import Padding
 from rich.panel import Panel
 from rich.prompt import Prompt
 
-from yaicli.api import ApiClient
 from yaicli.chat_manager import ChatFileInfo, ChatManager, FileChatManager
 from yaicli.config import CONFIG_PATH, Config, cfg
 from yaicli.console import get_console
@@ -40,6 +39,7 @@ from yaicli.const import (
 )
 from yaicli.history import LimitedFileHistory
 from yaicli.printer import Printer
+from yaicli.providers import BaseClient, create_api_client
 from yaicli.roles import RoleManager
 from yaicli.utils import detect_os, detect_shell, filter_command
 
@@ -51,7 +51,7 @@ class CLI:
         self,
         verbose: bool = False,
         stdin: Optional[str] = None,
-        api_client: Optional[ApiClient] = None,
+        api_client: Optional[BaseClient] = None,
         printer: Optional[Printer] = None,
         chat_manager: Optional[ChatManager] = None,
         role: Optional[str] = None,
@@ -64,9 +64,10 @@ class CLI:
         self.config: Config = cfg
         self.current_mode: str = TEMP_MODE
         self.role: str = role or DefaultRoleNames.DEFAULT.value
+        self.init_role: str = self.role  # --role can specify a role when enter interactive chat
 
         # Initialize role manager
-        self.role_manager = RoleManager()
+        self.role_manager = RoleManager()  # Singleton
 
         # Validate role
         if not self.role_manager.role_exists(self.role):
@@ -102,7 +103,7 @@ class CLI:
             self.console.print(f"Current role: {self.role}")
             self.console.print(Markdown("---", code_theme=self.config.get("CODE_THEME", DEFAULT_CODE_THEME)))
 
-        self.api_client = api_client or ApiClient(self.config, self.console, self.verbose)
+        self.api_client = api_client or create_api_client(self.config, self.console, self.verbose)
         self.printer = printer or Printer(self.config, self.console, self.verbose, markdown=True)
 
         _origin_stderr = None
@@ -344,12 +345,11 @@ class CLI:
     def get_system_prompt(self) -> str:
         """Get the system prompt based on current role and mode"""
         # Use the role manager to get the system prompt
-        self.console.print(f"Using role: {self.role}")
         return self.role_manager.get_system_prompt(self.role)
 
     def _build_messages(self, user_input: str) -> List[dict]:
         """Build message list for LLM API"""
-        # Create the message list
+        # Create the message list with system prompt
         messages = [{"role": "system", "content": self.get_system_prompt()}]
 
         # Add previous conversation if available
@@ -420,7 +420,7 @@ class CLI:
    ████   ███████ ██ ██      ██      ██
     ██    ██   ██ ██ ██      ██      ██
     ██    ██   ██ ██  ██████ ███████ ██
- """,
+""",
             style="bold cyan",
         )
         self.console.print("Welcome to YAICLI!", style="bold")
@@ -500,7 +500,7 @@ class CLI:
         @self.bindings.add(Keys.ControlI)  # TAB
         def _(event: KeyPressEvent) -> None:
             self.current_mode = EXEC_MODE if self.current_mode == CHAT_MODE else CHAT_MODE
-            self.role = DefaultRoleNames.SHELL if self.current_mode == EXEC_MODE else DefaultRoleNames.DEFAULT
+            self.role = DefaultRoleNames.SHELL if self.current_mode == EXEC_MODE else self.init_role
 
     def _run_once(self, input: str, shell: bool) -> None:
         """Run a single command (non-interactive)."""

{yaicli-0.3.2 → yaicli-0.4.0}/yaicli/config.py

@@ -13,6 +13,7 @@ from yaicli.const import (
     DEFAULT_CONFIG_MAP,
     DEFAULT_JUSTIFY,
     DEFAULT_MAX_SAVED_CHATS,
+    DEFAULT_ROLE_MODIFY_WARNING,
 )
 from yaicli.utils import str2bool
 
@@ -78,6 +79,10 @@ class Config(dict):
                 f.write(f"\nMAX_SAVED_CHATS={DEFAULT_MAX_SAVED_CHATS}\n")
             if "JUSTIFY" not in config_content.strip():
                 f.write(f"\nJUSTIFY={DEFAULT_JUSTIFY}\n")
+            if "ROLE_MODIFY_WARNING" not in config_content.strip():
+                f.write(
+                    f"\n# Set to false to disable warnings about modified built-in roles\nROLE_MODIFY_WARNING={DEFAULT_ROLE_MODIFY_WARNING}\n"
+                )
 
     def _load_from_file(self) -> None:
         """Load configuration from the config file.
@@ -160,7 +165,7 @@ class Config(dict):
             self[key] = converted_value
 
 
-@lru_cache(maxsize=1)
+@lru_cache(1)
 def get_config() -> Config:
     """Get the configuration singleton"""
     return Config()

{yaicli-0.3.2 → yaicli-0.4.0}/yaicli/const.py

@@ -1,10 +1,12 @@
 from enum import StrEnum
 from pathlib import Path
 from tempfile import gettempdir
-from typing import Any
+from typing import Any, Literal
 
 from rich.console import JustifyMethod
 
+BOOL_STR = Literal["true", "false", "yes", "no", "y", "n", "1", "0", "on", "off"]
+
 
 class JustifyEnum(StrEnum):
     DEFAULT = "default"
@@ -33,25 +35,24 @@ ROLES_DIR = CONFIG_PATH.parent / "roles"
 
 # Default configuration values
 DEFAULT_CODE_THEME = "monokai"
-DEFAULT_COMPLETION_PATH = "chat/completions"
-DEFAULT_ANSWER_PATH = "choices[0].message.content"
 DEFAULT_PROVIDER = "openai"
 DEFAULT_BASE_URL = "https://api.openai.com/v1"
 DEFAULT_MODEL = "gpt-4o"
 DEFAULT_SHELL_NAME = "auto"
 DEFAULT_OS_NAME = "auto"
-DEFAULT_STREAM = "true"
+DEFAULT_STREAM: BOOL_STR = "true"
 DEFAULT_TEMPERATURE: float = 0.7
 DEFAULT_TOP_P: float = 1.0
 DEFAULT_MAX_TOKENS: int = 1024
 DEFAULT_MAX_HISTORY: int = 500
-DEFAULT_AUTO_SUGGEST = "true"
-DEFAULT_SHOW_REASONING = "true"
+DEFAULT_AUTO_SUGGEST: BOOL_STR = "true"
+DEFAULT_SHOW_REASONING: BOOL_STR = "true"
 DEFAULT_TIMEOUT: int = 60
 DEFAULT_INTERACTIVE_ROUND: int = 25
-DEFAULT_CHAT_HISTORY_DIR = Path(gettempdir()) / "yaicli/chats"
+DEFAULT_CHAT_HISTORY_DIR: Path = Path(gettempdir()) / "yaicli/chats"
 DEFAULT_MAX_SAVED_CHATS = 20
 DEFAULT_JUSTIFY: JustifyMethod = "default"
+DEFAULT_ROLE_MODIFY_WARNING: BOOL_STR = "true"
 
 
 class EventTypeEnum(StrEnum):
@@ -64,12 +65,11 @@ class EventTypeEnum(StrEnum):
     FINISH = "finish"
 
 
-SHELL_PROMPT = """Your are a Shell Command Generator named YAICLI.
-Generate a command EXCLUSIVELY for {_os} OS with {_shell} shell.
-If details are missing, offer the most logical solution.
-Ensure the output is a valid shell command.
-Combine multiple steps with `&&` when possible.
-Supply plain text only, avoiding Markdown formatting."""
+SHELL_PROMPT = """You are YAICLI, a shell command generator.
+The context conversation may contain other types of messages, 
+but you should only respond with a single valid {_shell} shell command for {_os}.
+Do not include any explanations, comments, or formatting — only the command as plain text, avoiding Markdown formatting.
+"""
 
 DEFAULT_PROMPT = """
 You are YAICLI, a system management and programing assistant, 
@@ -113,9 +113,6 @@ DEFAULT_CONFIG_MAP = {
     # System detection hints
     "SHELL_NAME": {"value": DEFAULT_SHELL_NAME, "env_key": "YAI_SHELL_NAME", "type": str},
     "OS_NAME": {"value": DEFAULT_OS_NAME, "env_key": "YAI_OS_NAME", "type": str},
-    # API paths (usually no need to change for OpenAI compatible APIs)
-    "COMPLETION_PATH": {"value": DEFAULT_COMPLETION_PATH, "env_key": "YAI_COMPLETION_PATH", "type": str},
-    "ANSWER_PATH": {"value": DEFAULT_ANSWER_PATH, "env_key": "YAI_ANSWER_PATH", "type": str},
     # API call parameters
     "STREAM": {"value": DEFAULT_STREAM, "env_key": "YAI_STREAM", "type": bool},
     "TEMPERATURE": {"value": DEFAULT_TEMPERATURE, "env_key": "YAI_TEMPERATURE", "type": float},
@@ -136,6 +133,8 @@ DEFAULT_CONFIG_MAP = {
     # Chat history settings
     "CHAT_HISTORY_DIR": {"value": DEFAULT_CHAT_HISTORY_DIR, "env_key": "YAI_CHAT_HISTORY_DIR", "type": str},
     "MAX_SAVED_CHATS": {"value": DEFAULT_MAX_SAVED_CHATS, "env_key": "YAI_MAX_SAVED_CHATS", "type": int},
+    # Role settings
+    "ROLE_MODIFY_WARNING": {"value": DEFAULT_ROLE_MODIFY_WARNING, "env_key": "YAI_ROLE_MODIFY_WARNING", "type": bool},
 }
 
 DEFAULT_CONFIG_INI = f"""[core]
@@ -148,10 +147,6 @@ MODEL={DEFAULT_CONFIG_MAP["MODEL"]["value"]}
 SHELL_NAME={DEFAULT_CONFIG_MAP["SHELL_NAME"]["value"]}
 OS_NAME={DEFAULT_CONFIG_MAP["OS_NAME"]["value"]}
 
-# 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
 STREAM={DEFAULT_CONFIG_MAP["STREAM"]["value"]}
 
@@ -177,4 +172,8 @@ JUSTIFY={DEFAULT_CONFIG_MAP["JUSTIFY"]["value"]}
 # Chat history settings
 CHAT_HISTORY_DIR={DEFAULT_CONFIG_MAP["CHAT_HISTORY_DIR"]["value"]}
 MAX_SAVED_CHATS={DEFAULT_CONFIG_MAP["MAX_SAVED_CHATS"]["value"]}
+
+# Role settings
+# Set to false to disable warnings about modified built-in roles
+ROLE_MODIFY_WARNING={DEFAULT_CONFIG_MAP["ROLE_MODIFY_WARNING"]["value"]}
 """

yaicli-0.4.0/yaicli/providers/__init__.py

@@ -0,0 +1,34 @@
+from yaicli.const import DEFAULT_PROVIDER
+from yaicli.providers.base import BaseClient
+from yaicli.providers.cohere import CohereClient
+from yaicli.providers.openai import OpenAIClient
+
+
+def create_api_client(config, console, verbose):
+    """Factory function to create the appropriate API client based on provider.
+
+    Args:
+        config: The configuration dictionary
+        console: The rich console for output
+        verbose: Whether to enable verbose output
+
+    Returns:
+        An instance of the appropriate ApiClient implementation
+    """
+    provider = config.get("PROVIDER", DEFAULT_PROVIDER).lower()
+
+    if provider == "openai":
+        return OpenAIClient(config, console, verbose)
+    elif provider == "cohere":
+        return CohereClient(config, console, verbose)
+    # elif provider == "google":
+    #     return GoogleApiClient(config, console, verbose)
+    # elif provider == "claude":
+    #     return ClaudeApiClient(config, console, verbose)
+    else:
+        # Fallback to openai client
+        console.print(f"Using generic HTTP client for provider: {provider}", style="yellow")
+        return OpenAIClient(config, console, verbose)
+
+
+__all__ = ["BaseClient", "OpenAIClient", "CohereClient", "create_api_client"]