yaicli 0.5.6__py3-none-any.whl → 0.5.8__py3-none-any.whl

pyproject.toml

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

yaicli/chat.py

@@ -10,8 +10,8 @@ from rich.table import Table
 
 from .config import cfg
 from .console import YaiConsole, get_console
-from .schemas import ChatMessage
 from .exceptions import ChatDeleteError, ChatLoadError, ChatSaveError
+from .schemas import ChatMessage
 from .utils import option_callback
 
 console: YaiConsole = get_console()
@@ -68,7 +68,9 @@ class Chat:
                 data = json.load(f)
                 self.title = data.get("title", self.title)
                 self.date = data.get("date", self.date)
-                self.history = [ChatMessage(role=msg["role"], content=msg["content"]) for msg in data.get("history", [])]
+                self.history = [
+                    ChatMessage(role=msg["role"], content=msg["content"]) for msg in data.get("history", [])
+                ]
             return True
         except (json.JSONDecodeError, OSError) as e:
             raise ChatLoadError(f"Error loading chat: {e}") from e

yaicli/cli.py

@@ -17,7 +17,7 @@ from rich.panel import Panel
 from rich.prompt import Prompt
 
 from .chat import Chat, FileChatManager, chat_mgr
-from .client import LitellmClient, ChatMessage
+from .client import ChatMessage, LitellmClient
 from .config import cfg
 from .console import get_console
 from .const import (

yaicli/client.py

@@ -11,7 +11,7 @@ from rich.panel import Panel
 
 from .config import cfg
 from .console import get_console
-from .schemas import LLMResponse, ChatMessage, ToolCall
+from .schemas import ChatMessage, LLMResponse, ToolCall
 from .tools import (
     Function,
     FunctionName,
@@ -46,6 +46,8 @@ class LitellmClient:
     def __post_init__(self) -> None:
         """Initialize OpenAI client"""
         self.pre_tool_call_id = None
+        if cfg["PROVIDER"] == "openrouter":
+            cfg["EXTRA_HEADERS"].update({"X-Title": "Yaicli", "HTTP-Referer": "https://github.com/belingud/yaicli"})
 
     def _convert_messages(self, messages: List[ChatMessage]) -> List[Dict[str, Any]]:
         """Convert message format to OpenAI API required format"""
@@ -135,6 +137,10 @@ class LitellmClient:
         }
 
         # Add optional parameters
+        if cfg["EXTRA_HEADERS"]:
+            params["extra_headers"] = cfg["EXTRA_HEADERS"]
+        if cfg["EXTRA_BODY"]:
+            params["extra_body"] = cfg["EXTRA_BODY"]
         if cfg["ENABLE_FUNCTIONS"]:
             params["tools"] = self._convert_functions(list_functions())
             params["tool_choice"] = "auto"

yaicli/config.py

@@ -1,8 +1,9 @@
 import configparser
+import json
 from dataclasses import dataclass
 from functools import lru_cache
 from os import getenv
-from typing import Any, Optional
+from typing import Optional
 
 from rich import get_console
 from rich.console import Console
@@ -70,17 +71,12 @@ class Config(dict):
         self._load_from_env()
         self._apply_type_conversion()
 
-    def _load_defaults(self) -> dict[str, Any]:
-        """Load default configuration values as strings.
-
-        Returns:
-            Dictionary with default configuration values
-        """
+    def _load_defaults(self) -> None:
+        """Load default configuration values as strings."""
         defaults = {k: v["value"] for k, v in DEFAULT_CONFIG_MAP.items()}
         self.update(defaults)
-        return defaults
 
-    def _ensure_version_updated_config_keys(self):
+    def _ensure_version_updated_config_keys(self) -> None:
         """Ensure configuration keys added in version updates exist in the config file.
         Appends missing keys to the config file if they don't exist.
         """
@@ -133,7 +129,7 @@ class Config(dict):
         Updates the configuration dictionary in-place with properly typed values.
         Falls back to default values if conversion fails.
         """
-        default_values_str = {k: v["value"] for k, v in DEFAULT_CONFIG_MAP.items()}
+        default_values_map = {k: v["value"] for k, v in DEFAULT_CONFIG_MAP.items()}
 
         for key, config_info in DEFAULT_CONFIG_MAP.items():
             target_type = config_info["type"]
@@ -142,25 +138,29 @@ class Config(dict):
 
             try:
                 if raw_value is None:
-                    raw_value = default_values_str.get(key, "")
+                    raw_value = default_values_map.get(key, "")
                 if target_type is bool:
                     converted_value = str2bool(raw_value)
                 elif target_type in (int, float, str):
                     converted_value = target_type(raw_value)
-            except (ValueError, TypeError) as e:
+                elif target_type is dict and raw_value:
+                    converted_value = json.loads(raw_value)
+            except (ValueError, TypeError, json.JSONDecodeError) as e:
                 self.console.print(
                     f"[yellow]Warning:[/] Invalid value '{raw_value}' for '{key}'. "
-                    f"Expected type '{target_type.__name__}'. Using default value '{default_values_str[key]}'. Error: {e}",
+                    f"Expected type '{target_type.__name__}'. Using default value '{default_values_map[key]}'. Error: {e}",
                     style="dim",
                     justify=self["JUSTIFY"],
                 )
                 # Fallback to default string value if conversion fails
                 try:
                     if target_type is bool:
-                        converted_value = str2bool(default_values_str[key])
-                    else:
-                        converted_value = target_type(default_values_str[key])
-                except (ValueError, TypeError):
+                        converted_value = str2bool(default_values_map[key])
+                    elif target_type in (int, float, str):
+                        converted_value = target_type(default_values_map[key])
+                    elif target_type is dict:
+                        converted_value = json.loads(default_values_map[key])
+                except (ValueError, TypeError, json.JSONDecodeError):
                     # If default also fails (unlikely), keep the raw merged value or a sensible default
                     self.console.print(
                         f"[red]Error:[/red] Could not convert default value for '{key}'. Using raw value.",

yaicli/const.py

@@ -1,4 +1,11 @@
-from enum import StrEnum
+try:
+    from enum import StrEnum
+except ImportError:
+    from enum import Enum
+
+    class StrEnum(str, Enum):
+        """Compatible with python below 3.11"""
+
 from pathlib import Path
 from tempfile import gettempdir
 from typing import Any, Literal, Optional
@@ -51,6 +58,8 @@ DEFAULT_MAX_HISTORY: int = 500
 DEFAULT_AUTO_SUGGEST: BOOL_STR = "true"
 DEFAULT_SHOW_REASONING: BOOL_STR = "true"
 DEFAULT_TIMEOUT: int = 60
+DEFAULT_EXTRA_HEADERS: str = "{}"
+DEFAULT_EXTRA_BODY: str = "{}"
 DEFAULT_INTERACTIVE_ROUND: int = 25
 DEFAULT_CHAT_HISTORY_DIR: Path = Path(gettempdir()) / "yaicli/chats"
 DEFAULT_MAX_SAVED_CHATS = 20
@@ -61,21 +70,6 @@ DEFAULT_SHOW_FUNCTION_OUTPUT: BOOL_STR = "true"
 DEFAULT_REASONING_EFFORT: Optional[Literal["low", "high", "medium"]] = None
 
 
-class EventTypeEnum(StrEnum):
-    """Enumeration of possible event types from the SSE stream."""
-
-    ERROR = "error"
-    REASONING = "reasoning"
-    REASONING_END = "reasoning_end"
-    CONTENT = "content"
-    FINISH = "finish"
-    TOOL_CALL_START = "tool_call_start"
-    TOOL_CALL_DELTA = "tool_call_delta"
-    TOOL_CALL_END = "tool_call_end"
-    TOOL_RESULT = "tool_result"
-    TOOL_CALLS_FINISH = "tool_calls_finish"
-
-
 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}.
@@ -130,6 +124,8 @@ DEFAULT_CONFIG_MAP = {
     "TOP_P": {"value": DEFAULT_TOP_P, "env_key": "YAI_TOP_P", "type": float},
     "MAX_TOKENS": {"value": DEFAULT_MAX_TOKENS, "env_key": "YAI_MAX_TOKENS", "type": int},
     "TIMEOUT": {"value": DEFAULT_TIMEOUT, "env_key": "YAI_TIMEOUT", "type": int},
+    "EXTRA_HEADERS": {"value": DEFAULT_EXTRA_HEADERS, "env_key": "YAI_EXTRA_HEADERS", "type": dict},
+    "EXTRA_BODY": {"value": DEFAULT_EXTRA_BODY, "env_key": "YAI_EXTRA_BODY", "type": dict},
     "REASONING_EFFORT": {"value": DEFAULT_REASONING_EFFORT, "env_key": "YAI_REASONING_EFFORT", "type": str},
     "INTERACTIVE_ROUND": {
         "value": DEFAULT_INTERACTIVE_ROUND,
@@ -174,6 +170,10 @@ TEMPERATURE={DEFAULT_CONFIG_MAP["TEMPERATURE"]["value"]}
 TOP_P={DEFAULT_CONFIG_MAP["TOP_P"]["value"]}
 MAX_TOKENS={DEFAULT_CONFIG_MAP["MAX_TOKENS"]["value"]}
 TIMEOUT={DEFAULT_CONFIG_MAP["TIMEOUT"]["value"]}
+# json string
+EXTRA_HEADERS=
+# json string
+EXTRA_BODY=
 REASONING_EFFORT=
 
 # Interactive mode parameters

yaicli/printer.py

@@ -8,8 +8,8 @@ from rich.live import Live
 from .client import RefreshLive
 from .config import Config, get_config
 from .console import YaiConsole, get_console
-from .schemas import ChatMessage
 from .render import Markdown, plain_formatter
+from .schemas import ChatMessage
 
 if TYPE_CHECKING:
     from .schemas import LLMResponse

{yaicli-0.5.6.dist-info → yaicli-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaicli
-Version: 0.5.6
+Version: 0.5.8
 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
@@ -392,6 +392,9 @@ SHOW_FUNCTION_OUTPUT=true
 | `OS_NAME`              | Operating system                            | `auto`                      | `YAI_OS_NAME`              |
 | `STREAM`               | Enable streaming                            | `true`                      | `YAI_STREAM`               |
 | `TIMEOUT`              | API timeout (seconds)                       | `60`                        | `YAI_TIMEOUT`              |
+| `EXTRA_HEADERS`        | Extra headers                               | -                           | `YAI_EXTRA_HEADERS`        |
+| `EXTRA_BODY`           | Extra body                                  | -                           | `YAI_EXTRA_BODY`           |
+| `REASONING_EFFORT`     | Reasoning effort                            | -                           | `YAI_REASONING_EFFORT`     |
 | `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`          |
@@ -449,6 +452,28 @@ Browse available themes at: https://pygments.org/styles/
 
 ![monokia theme example](artwork/monokia.png)
 
+### Extra Headers and Body
+
+You can add extra headers and body to the API request by setting `EXTRA_HEADERS` and `EXTRA_BODY` in the config file.
+The value should be valid json string.
+
+```ini
+EXTRA_HEADERS={"X-Extra-Header": "value"}
+EXTRA_BODY={"extra_key": "extra_value"}
+```
+
+Example: If you want to disable Qwen3's thinking behavior, you can add the following to the config file.
+
+```ini
+EXTRA_BODY={"enable_thinking": false}
+```
+
+Or just limit thinking tokens:
+
+```ini
+EXTRA_BODY={"thinking_budget": 4096}
+```
+
 ## 🚀 Usage
 
 ### Quick Start
@@ -904,6 +929,8 @@ YAICLI is designed with a modular architecture that separates concerns and makes
 | [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 |
+| [litellm](https://litellm.ai/)                                  | LLM provider compatibility                         |
+| [json-repair](https://github.com/mangiucugna/json_repair)       | Repair llm function call arguments                 |
 
 ## 👨‍💻 Contributing
 

{yaicli-0.5.6.dist-info → yaicli-0.5.8.dist-info}/RECORD

@@ -1,15 +1,15 @@
-pyproject.toml,sha256=6p1uC3kyuCkJEw7qEwIFWQ2wgiAV9fqpDmGr6u9hsAs,1963
+pyproject.toml,sha256=uIesu0u5n1nVFJ4MJ4ZO4G9hr4EGlwcysyKybIG3PyM,1963
 yaicli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-yaicli/chat.py,sha256=DeTmOeBPU-oiOAIaDj2h-auJor0GyVVhrViLYF6zGIM,13638
-yaicli/cli.py,sha256=1Flt0FgrKzbabjJpZJCcvnUjXaaLwyD2paRyMixEQV0,22985
-yaicli/client.py,sha256=fKUDmn9s7tF9Q2wIB8WhbsjFYIpV0E29t_Vw0qVmVbI,16229
-yaicli/config.py,sha256=_mp8P6zXyrdp4TzBfHraOCkjv5DMZMOwiEhQnFYWwZA,6321
+yaicli/chat.py,sha256=_emvZEdgMBth2nQGaNWPf0P45oW2k3bpuIwqsxFcM5A,13676
+yaicli/cli.py,sha256=u4rq04CdLiL-IBzQ0IimPyFAh9XZg9YUTuvM4CxE3pE,22985
+yaicli/client.py,sha256=kdEI4HP1zZQHUf-7kNbE9ItpyRN8zcAGyKeBSb1R4Ro,16565
+yaicli/config.py,sha256=HrWYcelLXE61XX719eVcuuo3292xxf1BNQznWdvjQFQ,6535
 yaicli/console.py,sha256=vARPJd-3lafutsQWrGntQVjLrYqaJD3qisN82pmuhjU,1973
-yaicli/const.py,sha256=FYW8cNqFzZwnYbgr_HXZSzSS8OIU_UsFIn4SZ0zOJ8U,8129
+yaicli/const.py,sha256=mt_6m2jo5-tHEmk3DxKCEc5ek9DcyQGHFAn_HEeMP3k,8155
 yaicli/entry.py,sha256=gKzN8Yar3tpBd2Z2a80gD3k0W4Sf3lL7jdyws-2y-H0,8687
 yaicli/exceptions.py,sha256=WBYg8OTJJzaj7lt6HE7ZyBoe5T6A3yZRNCRfWd4iN0c,372
 yaicli/history.py,sha256=s-57X9FMsaQHF7XySq1gGH_jpd_cHHTYafYu2ECuG6M,2472
-yaicli/printer.py,sha256=a409R_4-ppNnen31Pt7KvaaNAFVCzBARYC0T0_EtMbU,8369
+yaicli/printer.py,sha256=J-QPrb0q4Zrx18vwBGIBDQk7RzT4wXJPwdJ9oXLoEVg,8369
 yaicli/render.py,sha256=k8o2P8fI44PJlyQbs7gmMiu2x2prwajdWn5JIt15BIA,505
 yaicli/role.py,sha256=PfwiVJIlzg7EzlvMM-kIy6vBK0d5d_J4M1I_fIZGnWk,7399
 yaicli/schemas.py,sha256=PiuSY7ORZaA4OL_tYm0inwqirHp5M-F3zcCipLwsH9E,571
@@ -17,8 +17,8 @@ yaicli/tools.py,sha256=d-5LXbEB-1Uq5VKSgwlAiNDVOGrHkku2DpmZoorq1zw,3098
 yaicli/utils.py,sha256=bpo3Xhozpxsaci3FtEIKZ32l4ZdyWMsrHjYGX0tB4J4,4541
 yaicli/functions/__init__.py,sha256=_FJooQ9GkijG8xLwuU0cr5GBrGnC9Nc6bnCeUjrsT0k,1271
 yaicli/functions/buildin/execute_shell_command.py,sha256=unl1-F8p6QZajeHdA0u5UpURMJM0WhdWMUWCCCHVRcI,1320
-yaicli-0.5.6.dist-info/METADATA,sha256=Vxp8bZrO89wYwWhtXB00o_2XVyF-6UyprAQd8bfVh1g,49194
-yaicli-0.5.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-yaicli-0.5.6.dist-info/entry_points.txt,sha256=iYVyQP0PJIm9tQnlQheqT435kK_xdGoi5j9aswGV9hA,66
-yaicli-0.5.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-yaicli-0.5.6.dist-info/RECORD,,
+yaicli-0.5.8.dist-info/METADATA,sha256=BRZEKpxpZ6kPABv88FGl4ipt8glgJdAn-9ZxiDLAAeo,50349
+yaicli-0.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+yaicli-0.5.8.dist-info/entry_points.txt,sha256=iYVyQP0PJIm9tQnlQheqT435kK_xdGoi5j9aswGV9hA,66
+yaicli-0.5.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+yaicli-0.5.8.dist-info/RECORD,,