yaicli 0.6.4__tar.gz → 0.7.0__tar.gz

{yaicli-0.6.4 → yaicli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaicli
-Version: 0.6.4
+Version: 0.7.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
@@ -265,6 +265,7 @@ generate and execute shell commands, or get quick answers without leaving your w
 > [!NOTE]
 > YAICLI is actively developed. While core functionality is stable, some features may evolve in future releases.
 
+> We support MCP since v0.7.0!
 > We support Function Call since v0.5.0!
 
 ## ✨ Key Features
@@ -362,7 +363,6 @@ pip install .
 - Deepseek
 - Doubao
 - Gemini
-- Vertex AI
 - Groq
 - Huggingface
 - Minimax
@@ -372,6 +372,7 @@ pip install .
 - Sambanova
 - Siliconflow
 - Targon
+- Vertex ai
 - X AI
 - Yi
 - Unlimited OpenAI-compatible providers
@@ -438,6 +439,10 @@ ROLE_MODIFY_WARNING=true
 ENABLE_FUNCTIONS=true
 # Set to false to disable showing function output in the response
 SHOW_FUNCTION_OUTPUT=true
+
+# MCP settings
+ENABLE_MCP=false
+SHOW_MCP_OUTPUT=false
 ```
 
 ### Configuration Options Reference
@@ -468,7 +473,10 @@ SHOW_FUNCTION_OUTPUT=true
 | `MAX_SAVED_CHATS`      | Max saved chats                             | `20`                     | `YAI_MAX_SAVED_CHATS`      |
 | `ROLE_MODIFY_WARNING`  | Warn user when modifying role               | `true`                   | `YAI_ROLE_MODIFY_WARNING`  |
 | `ENABLE_FUNCTIONS`     | Enable function calling                     | `true`                   | `YAI_ENABLE_FUNCTIONS`     |
-| `SHOW_FUNCTION_OUTPUT` | Show function output in response            | `true`                   | `YAI_SHOW_FUNCTION_OUTPUT` |
+| `SHOW_FUNCTION_OUTPUT` | Show function output when calling function  | `true`                   | `YAI_SHOW_FUNCTION_OUTPUT` |
+| `ENABLE_MCP`           | Enable MCP tools                            | `false`                  | `YAI_ENABLE_MCP`           |
+| `SHOW_MCP_OUTPUT`      | Show MCP output when calling mcp            | `true`                   | `YAI_SHOW_MCP_OUTPUT`      |
+
 
 ### LLM Provider Configuration
 
@@ -571,8 +579,10 @@ LOCATION=
 
 #### Huggingface
 
+Default `HF_PROVIDER` is `auto`.
+
 ```ini
-HF_PROVIDER=sambanova
+HF_PROVIDER=auto
 PROVIDER=huggingface
 API_KEY=
 MODEL=deepseek-ai/DeepSeek-R1-0528
@@ -1252,6 +1262,83 @@ Thinking:
 Current directory size: 156M (using du -sh .).
 ```
 
+### MCP
+
+Add your MCP config in `~/.config/yaicli/mcp.json` (`C:\Users\<user>\.config\yaicli\mcp.json` on Windows.).
+
+`--enable-mcp` option is corresponds to the configuration key `ENABLE_MCP`.
+
+Example:
+
+```shell
+ai 'What is the latest exchange rate between the BTC and the US dollar?' --enable-mcp --show-mcp-output
+
+Assistant:
+
+@Mcp call: bing_search({"query": "latest exchange rate between BTC and US dollar"})
+╭─ Mcp output ──────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ [                                                                                                                         │
+│   {                                                                                                                       │
+│     "id": "result_1751024997243_0",                                                                                       │
+│     "title": "BTC to USD - Bitcoin to US Dollar Conversion - Exchange Rates",                                             │
+│     "link": "https://www.exchange-rates.org/converter/btc-usd",                                                           │
+│     "snippet": "11 小时之前 · 1 Bitcoin = 107,304 US Dollars as of June 27, 2025 03:00 AM UTC. You can get live exchange  │
+│ rates between Bitcoin and US Dollars using exchange-rates.org, which aggregates …"                                        │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997245_1",                                                                                       │
+│     "title": "Live Bitcoin to US Dollars Exchange Rate - ₿ 1 …",                                                          │
+│     "link": "https://btc.currencyrate.today/usd",                                                                         │
+│     "snippet": ".b_imgcap_altitle p strong,.b_imgcap_altitle .b_factrow strong{color:#767676}#b_results                   │
+│ .b_imgcap_altitle{line-height:22px}.b_hList img{display:block}..."                                                        │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997246_2",                                                                                       │
+│     "title": "1 BTC to USD - Bitcoins to US Dollars Exchange Rate - Xe",                                                  │
+│     "link": "https://www.xe.com/currencyconverter/convert/?From=BTC&To=USD",                                              │
+│     "snippet": "2025年6月15日 · Get the latest 1 Bitcoin to US Dollar rate for FREE with the original Universal Currency  │
+│ Converter. Set rate alerts for to and learn more about Bitcoins and US Dollars from …"                                    │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997246_3",                                                                                       │
+│     "title": "BTC to USD Exchange Rates | Best Exchange Rates",                                                           │
+│     "link": "https://bestexchangerates.com/rates/btc-to-usd",                                                             │
+│     "snippet": "Bitcoin (BTC) to US dollar (USD) market data - latest interbank exchange rate, trend, chart & historic    │
+│ rates. Sell BTC → Buy USD"                                                                                                │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997247_4",                                                                                       │
+│     "title": "BTC to USD | Bitcoin to US Dollar - Investing.com",                                                         │
+│     "link": "https://www.investing.com/crypto/bitcoin/btc-usd",                                                           │
+│     "snippet": "Bitcoin Eyes 120k as Fed Rate Cuts Hopes Rise, US Dollar Falls to Multi-Year Lows BTC hovers around       │
+│ 107.5k after attempts at 108k Fed rate cut optimism rises USD falls to its lowest level …"                                │
+│   }                                                                                                                       │
+│ ]                                                                                                                         │
+╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
+Here are some current exchange rates for Bitcoin (BTC) to US Dollar (USD):                                                   
+
+ 1 Exchange-Rates.org:                                                                                                       
+   ₿1 Bitcoin = 💵107,304 US Dollars (as of June 27, 2025, 03:00 AM UTC).                                                    
+   Link                                                                                                                      
+ 2 BTC.CurrencyRate.Today:                                                                                                   
+   Live Bitcoin to US Dollars exchange rate.                                                                                 
+   Link                                                                                                                      
+ 3 Xe.com:                                                                                                                   
+   Latest conversion rate and information about Bitcoin to US Dollars.                                                       
+   Link                                                                                                                      
+ 4 BestExchangeRates.com:                                                                                                    
+   Current BTC to USD market data, including charts and historic rates.                                                      
+   Link                                                                                                                      
+ 5 Investing.com:                                                                                                            
+   Bitcoin price analysis and live BTC to USD updates.                                                                       
+   Link                                                                                                                      
+
+For the most accurate and up-to-date rate, I recommend checking one of these sources directly.                               
+```
+
+![mcp](artwork/mcp_example.png)
+
+
 ## 💻 Technical Details
 
 ### Architecture

{yaicli-0.6.4 → yaicli-0.7.0}/README.md

@@ -22,6 +22,7 @@ generate and execute shell commands, or get quick answers without leaving your w
 > [!NOTE]
 > YAICLI is actively developed. While core functionality is stable, some features may evolve in future releases.
 
+> We support MCP since v0.7.0!
 > We support Function Call since v0.5.0!
 
 ## ✨ Key Features
@@ -119,7 +120,6 @@ pip install .
 - Deepseek
 - Doubao
 - Gemini
-- Vertex AI
 - Groq
 - Huggingface
 - Minimax
@@ -129,6 +129,7 @@ pip install .
 - Sambanova
 - Siliconflow
 - Targon
+- Vertex ai
 - X AI
 - Yi
 - Unlimited OpenAI-compatible providers
@@ -195,6 +196,10 @@ ROLE_MODIFY_WARNING=true
 ENABLE_FUNCTIONS=true
 # Set to false to disable showing function output in the response
 SHOW_FUNCTION_OUTPUT=true
+
+# MCP settings
+ENABLE_MCP=false
+SHOW_MCP_OUTPUT=false
 ```
 
 ### Configuration Options Reference
@@ -225,7 +230,10 @@ SHOW_FUNCTION_OUTPUT=true
 | `MAX_SAVED_CHATS`      | Max saved chats                             | `20`                     | `YAI_MAX_SAVED_CHATS`      |
 | `ROLE_MODIFY_WARNING`  | Warn user when modifying role               | `true`                   | `YAI_ROLE_MODIFY_WARNING`  |
 | `ENABLE_FUNCTIONS`     | Enable function calling                     | `true`                   | `YAI_ENABLE_FUNCTIONS`     |
-| `SHOW_FUNCTION_OUTPUT` | Show function output in response            | `true`                   | `YAI_SHOW_FUNCTION_OUTPUT` |
+| `SHOW_FUNCTION_OUTPUT` | Show function output when calling function  | `true`                   | `YAI_SHOW_FUNCTION_OUTPUT` |
+| `ENABLE_MCP`           | Enable MCP tools                            | `false`                  | `YAI_ENABLE_MCP`           |
+| `SHOW_MCP_OUTPUT`      | Show MCP output when calling mcp            | `true`                   | `YAI_SHOW_MCP_OUTPUT`      |
+
 
 ### LLM Provider Configuration
 
@@ -328,8 +336,10 @@ LOCATION=
 
 #### Huggingface
 
+Default `HF_PROVIDER` is `auto`.
+
 ```ini
-HF_PROVIDER=sambanova
+HF_PROVIDER=auto
 PROVIDER=huggingface
 API_KEY=
 MODEL=deepseek-ai/DeepSeek-R1-0528
@@ -1009,6 +1019,83 @@ Thinking:
 Current directory size: 156M (using du -sh .).
 ```
 
+### MCP
+
+Add your MCP config in `~/.config/yaicli/mcp.json` (`C:\Users\<user>\.config\yaicli\mcp.json` on Windows.).
+
+`--enable-mcp` option is corresponds to the configuration key `ENABLE_MCP`.
+
+Example:
+
+```shell
+ai 'What is the latest exchange rate between the BTC and the US dollar?' --enable-mcp --show-mcp-output
+
+Assistant:
+
+@Mcp call: bing_search({"query": "latest exchange rate between BTC and US dollar"})
+╭─ Mcp output ──────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ [                                                                                                                         │
+│   {                                                                                                                       │
+│     "id": "result_1751024997243_0",                                                                                       │
+│     "title": "BTC to USD - Bitcoin to US Dollar Conversion - Exchange Rates",                                             │
+│     "link": "https://www.exchange-rates.org/converter/btc-usd",                                                           │
+│     "snippet": "11 小时之前 · 1 Bitcoin = 107,304 US Dollars as of June 27, 2025 03:00 AM UTC. You can get live exchange  │
+│ rates between Bitcoin and US Dollars using exchange-rates.org, which aggregates …"                                        │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997245_1",                                                                                       │
+│     "title": "Live Bitcoin to US Dollars Exchange Rate - ₿ 1 …",                                                          │
+│     "link": "https://btc.currencyrate.today/usd",                                                                         │
+│     "snippet": ".b_imgcap_altitle p strong,.b_imgcap_altitle .b_factrow strong{color:#767676}#b_results                   │
+│ .b_imgcap_altitle{line-height:22px}.b_hList img{display:block}..."                                                        │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997246_2",                                                                                       │
+│     "title": "1 BTC to USD - Bitcoins to US Dollars Exchange Rate - Xe",                                                  │
+│     "link": "https://www.xe.com/currencyconverter/convert/?From=BTC&To=USD",                                              │
+│     "snippet": "2025年6月15日 · Get the latest 1 Bitcoin to US Dollar rate for FREE with the original Universal Currency  │
+│ Converter. Set rate alerts for to and learn more about Bitcoins and US Dollars from …"                                    │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997246_3",                                                                                       │
+│     "title": "BTC to USD Exchange Rates | Best Exchange Rates",                                                           │
+│     "link": "https://bestexchangerates.com/rates/btc-to-usd",                                                             │
+│     "snippet": "Bitcoin (BTC) to US dollar (USD) market data - latest interbank exchange rate, trend, chart & historic    │
+│ rates. Sell BTC → Buy USD"                                                                                                │
+│   },                                                                                                                      │
+│   {                                                                                                                       │
+│     "id": "result_1751024997247_4",                                                                                       │
+│     "title": "BTC to USD | Bitcoin to US Dollar - Investing.com",                                                         │
+│     "link": "https://www.investing.com/crypto/bitcoin/btc-usd",                                                           │
+│     "snippet": "Bitcoin Eyes 120k as Fed Rate Cuts Hopes Rise, US Dollar Falls to Multi-Year Lows BTC hovers around       │
+│ 107.5k after attempts at 108k Fed rate cut optimism rises USD falls to its lowest level …"                                │
+│   }                                                                                                                       │
+│ ]                                                                                                                         │
+╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
+Here are some current exchange rates for Bitcoin (BTC) to US Dollar (USD):                                                   
+
+ 1 Exchange-Rates.org:                                                                                                       
+   ₿1 Bitcoin = 💵107,304 US Dollars (as of June 27, 2025, 03:00 AM UTC).                                                    
+   Link                                                                                                                      
+ 2 BTC.CurrencyRate.Today:                                                                                                   
+   Live Bitcoin to US Dollars exchange rate.                                                                                 
+   Link                                                                                                                      
+ 3 Xe.com:                                                                                                                   
+   Latest conversion rate and information about Bitcoin to US Dollars.                                                       
+   Link                                                                                                                      
+ 4 BestExchangeRates.com:                                                                                                    
+   Current BTC to USD market data, including charts and historic rates.                                                      
+   Link                                                                                                                      
+ 5 Investing.com:                                                                                                            
+   Bitcoin price analysis and live BTC to USD updates.                                                                       
+   Link                                                                                                                      
+
+For the most accurate and up-to-date rate, I recommend checking one of these sources directly.                               
+```
+
+![mcp](artwork/mcp_example.png)
+
+
 ## 💻 Technical Details
 
 ### Architecture

{yaicli-0.6.4 → yaicli-0.7.0}/pyproject.toml

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

{yaicli-0.6.4 → yaicli-0.7.0}/yaicli/const.py

@@ -16,7 +16,7 @@ from rich.console import JustifyMethod
 BOOL_STR = Literal["true", "false", "yes", "no", "y", "n", "1", "0", "on", "off"]
 
 
-class JustifyEnum(StrEnum):
+class JustifyEnum(StrEnum):  # type: ignore
     DEFAULT = "default"
     LEFT = "left"
     CENTER = "center"
@@ -43,6 +43,7 @@ HISTORY_FILE = Path("~/.yaicli_history").expanduser()
 CONFIG_PATH = Path("~/.config/yaicli/config.ini").expanduser()
 ROLES_DIR = CONFIG_PATH.parent / "roles"
 FUNCTIONS_DIR = CONFIG_PATH.parent / "functions"
+MCP_JSON_PATH = CONFIG_PATH.parent / "mcp.json"
 
 # Default configuration values
 DEFAULT_CODE_THEME = "monokai"
@@ -69,6 +70,8 @@ DEFAULT_ROLE_MODIFY_WARNING: BOOL_STR = "true"
 DEFAULT_ENABLE_FUNCTIONS: BOOL_STR = "true"
 DEFAULT_SHOW_FUNCTION_OUTPUT: BOOL_STR = "true"
 DEFAULT_REASONING_EFFORT: Optional[Literal["low", "high", "medium"]] = None
+DEFAULT_ENABLE_MCP: BOOL_STR = "false"
+DEFAULT_SHOW_MCP_OUTPUT: BOOL_STR = "false"
 
 
 SHELL_PROMPT = """You are YAICLI, a shell command generator.
@@ -93,16 +96,16 @@ CODER_PROMPT = (
 )
 
 
-class DefaultRoleNames(StrEnum):
+class DefaultRoleNames(StrEnum):  # type: ignore
     SHELL = "Shell Command Generator"
     DEFAULT = "DEFAULT"
     CODER = "Code Assistant"
 
 
 DEFAULT_ROLES: dict[str, dict[str, Any]] = {
-    DefaultRoleNames.SHELL.value: {"name": DefaultRoleNames.SHELL.value, "prompt": SHELL_PROMPT},
-    DefaultRoleNames.DEFAULT.value: {"name": DefaultRoleNames.DEFAULT.value, "prompt": DEFAULT_PROMPT},
-    DefaultRoleNames.CODER.value: {"name": DefaultRoleNames.CODER.value, "prompt": CODER_PROMPT},
+    DefaultRoleNames.SHELL.value: {"name": DefaultRoleNames.SHELL.value, "prompt": SHELL_PROMPT},  # type: ignore
+    DefaultRoleNames.DEFAULT.value: {"name": DefaultRoleNames.DEFAULT.value, "prompt": DEFAULT_PROMPT},  # type: ignore
+    DefaultRoleNames.CODER.value: {"name": DefaultRoleNames.CODER.value, "prompt": CODER_PROMPT},  # type: ignore
 }
 
 # DEFAULT_CONFIG_MAP is a dictionary of the configuration options.
@@ -151,6 +154,8 @@ DEFAULT_CONFIG_MAP = {
         "env_key": "YAI_SHOW_FUNCTION_OUTPUT",
         "type": bool,
     },
+    "ENABLE_MCP": {"value": DEFAULT_ENABLE_MCP, "env_key": "YAI_ENABLE_MCP", "type": bool},
+    "SHOW_MCP_OUTPUT": {"value": DEFAULT_SHOW_MCP_OUTPUT, "env_key": "YAI_SHOW_MCP_OUTPUT", "type": bool},
 }
 
 DEFAULT_CONFIG_INI = f"""[core]
@@ -201,6 +206,12 @@ ROLE_MODIFY_WARNING={DEFAULT_CONFIG_MAP["ROLE_MODIFY_WARNING"]["value"]}
 # Function settings
 # Set to false to disable sending functions in API requests
 ENABLE_FUNCTIONS={DEFAULT_CONFIG_MAP["ENABLE_FUNCTIONS"]["value"]}
-# Set to false to disable showing function output in the response
+# Set to false to disable showing function output when calling functions
 SHOW_FUNCTION_OUTPUT={DEFAULT_CONFIG_MAP["SHOW_FUNCTION_OUTPUT"]["value"]}
+
+# MCP settings
+# Set to false to disable MCP in API requests
+ENABLE_MCP={DEFAULT_CONFIG_MAP["ENABLE_MCP"]["value"]}
+# Set to false to disable showing MCP output when calling MCP tools
+SHOW_MCP_OUTPUT={DEFAULT_CONFIG_MAP["SHOW_MCP_OUTPUT"]["value"]}
 """

{yaicli-0.6.4 → yaicli-0.7.0}/yaicli/entry.py

@@ -6,7 +6,7 @@ import typer
 from .chat import FileChatManager
 from .config import cfg
 from .const import DEFAULT_CONFIG_INI, DefaultRoleNames, JustifyEnum
-from .functions import install_functions, print_functions
+from .functions import install_functions, print_functions, print_mcp
 from .role import RoleManager
 
 app = typer.Typer(
@@ -209,6 +209,29 @@ def main(
         show_default=False,
         callback=override_config,
     ),
+    # ------------------- MCP Options -------------------
+    enable_mcp: bool = typer.Option(  # noqa: F841
+        cfg["ENABLE_MCP"],
+        "--enable-mcp/--disable-mcp",
+        help=f"Enable/disable MCP in API requests [dim](default: {'enabled' if cfg['ENABLE_MCP'] else 'disabled'})[/dim]",
+        rich_help_panel="MCP Options",
+        callback=override_config,
+    ),
+    show_mcp_output: bool = typer.Option(  # noqa: F841
+        cfg["SHOW_MCP_OUTPUT"],
+        "--show-mcp-output/--hide-mcp-output",
+        help=f"Show the output of MCP [dim](default: {'show' if cfg['SHOW_MCP_OUTPUT'] else 'hide'})[/dim]",
+        rich_help_panel="MCP Options",
+        show_default=False,
+        callback=override_config,
+    ),
+    list_mcp: bool = typer.Option(  # noqa: F841
+        False,
+        "--list-mcp",
+        help="List all available mcp.",
+        rich_help_panel="MCP Options",
+        callback=print_mcp,
+    ),
 ):
     """YAICLI: Your AI assistant in the command line.
 

{yaicli-0.6.4 → yaicli-0.7.0}/yaicli/functions/__init__.py

@@ -1,9 +1,10 @@
+import json
 import shutil
 from pathlib import Path
 from typing import Any
 
 from ..console import get_console
-from ..const import FUNCTIONS_DIR
+from ..const import FUNCTIONS_DIR, MCP_JSON_PATH
 from ..utils import option_callback
 
 console = get_console()
@@ -37,3 +38,14 @@ def print_functions(cls, _: Any) -> None:
         if file.name.startswith("_"):
             continue
         console.print(file)
+
+
+@option_callback
+def print_mcp(cls, _: Any) -> None:
+    """List all available mcp"""
+    if not MCP_JSON_PATH.exists():
+        console.print("No mcp config found, please add your mcp config in ~/.config/yaicli/mcp.json")
+        return
+    with open(MCP_JSON_PATH, "r") as f:
+        mcp_config = json.load(f)
+    console.print_json(data=mcp_config)

yaicli-0.7.0/yaicli/llms/client.py

@@ -0,0 +1,153 @@
+from typing import Generator, List, Optional, Union
+
+from ..config import cfg
+from ..console import get_console
+from ..schemas import ChatMessage, LLMResponse, RefreshLive, ToolCall
+from ..tools import execute_tool_call
+from ..tools.mcp import MCP_TOOL_NAME_PREFIX
+from .provider import Provider, ProviderFactory
+
+
+class LLMClient:
+    """
+    LLM Client that coordinates provider interactions and tool calling
+
+    This class handles the higher level logic of:
+    1. Getting responses from LLM providers
+    2. Managing tool calls and their execution
+    3. Handling conversation flow with tools
+    """
+
+    def __init__(
+        self,
+        provider: Optional[Provider] = None,
+        provider_name: str = "",
+        config: dict = cfg,
+        verbose: bool = False,
+        **kwargs,
+    ):
+        """
+        Initialize LLM client
+
+        Args:
+            provider: Optional pre-initialized Provider instance
+            provider_name: Name of the provider to use if provider not provided
+            config: Configuration dictionary
+            verbose: Whether to enable verbose logging
+        """
+        self.config = config
+        self.verbose = verbose
+        self.console = get_console()
+        self.enable_function = self.config["ENABLE_FUNCTIONS"]
+        self.enable_mcp = self.config["ENABLE_MCP"]
+
+        # Use provided provider or create one
+        if provider:
+            self.provider = provider
+        elif provider_name:
+            self.provider = ProviderFactory.create_provider(provider_name, config=config, verbose=verbose, **kwargs)
+        else:
+            provider_name = config.get("PROVIDER", "openai").lower()
+            self.provider = ProviderFactory.create_provider(provider_name, config=config, verbose=verbose, **kwargs)
+
+        self.max_recursion_depth = config.get("MAX_RECURSION_DEPTH", 5)
+
+    def completion_with_tools(
+        self,
+        messages: List[ChatMessage],
+        stream: bool = False,
+        recursion_depth: int = 0,
+    ) -> Generator[Union[LLMResponse, RefreshLive], None, None]:
+        """
+        Get completion from provider with tool calling support
+
+        Args:
+            messages: List of messages for the conversation
+            stream: Whether to stream the response
+            recursion_depth: Current recursion depth for tool calls
+
+        Yields:
+            LLMResponse objects and control signals
+        """
+        if recursion_depth >= self.max_recursion_depth:
+            self.console.print(
+                f"Maximum recursion depth ({self.max_recursion_depth}) reached, stopping further tool calls",
+                style="yellow",
+            )
+            return
+
+        # Get completion from provider and collect response data
+        assistant_response_content = ""
+        # Providers may return identical tool calls with the same ID in a single response during streaming
+        tool_calls: dict[str, ToolCall] = {}
+
+        # Stream responses and collect data
+        for llm_response in self.provider.completion(messages, stream=stream):
+            yield llm_response  # Forward response to caller
+
+            # Collect content and tool calls for potential tool execution
+            if llm_response.content:
+                assistant_response_content += llm_response.content
+            if llm_response.tool_call and llm_response.tool_call.id not in tool_calls:
+                tool_calls[llm_response.tool_call.id] = llm_response.tool_call
+
+        # Check if we need to execute tools
+        if not tool_calls or not (self.enable_function or self.enable_mcp):
+            return
+
+        # Filter valid tool calls based on enabled features
+        valid_tool_calls = self._get_valid_tool_calls(tool_calls)
+        if not valid_tool_calls:
+            return
+
+        # Execute tools and continue conversation
+        yield from self._execute_tools_and_continue(
+            messages, assistant_response_content, valid_tool_calls, stream, recursion_depth
+        )
+
+    def _get_valid_tool_calls(self, tool_calls: dict[str, ToolCall]) -> List[ToolCall]:
+        """Filter tool calls based on enabled features"""
+        valid_tool_calls = []
+
+        for tool_call in tool_calls.values():
+            is_mcp = tool_call.name.startswith(MCP_TOOL_NAME_PREFIX)
+
+            if is_mcp and self.enable_mcp:
+                valid_tool_calls.append(tool_call)
+            elif not is_mcp and self.enable_function:
+                valid_tool_calls.append(tool_call)
+
+        return valid_tool_calls
+
+    def _execute_tools_and_continue(
+        self,
+        messages: List[ChatMessage],
+        assistant_response_content: str,
+        tool_calls: List[ToolCall],
+        stream: bool,
+        recursion_depth: int,
+    ) -> Generator[Union[LLMResponse, RefreshLive], None, None]:
+        """Execute tool calls and continue the conversation"""
+        # Signal that new content is coming
+        yield RefreshLive()
+
+        # Add assistant message with tool calls to history (only once)
+        messages.append(ChatMessage(role="assistant", content=assistant_response_content, tool_calls=tool_calls))
+
+        # Execute each tool call and add results to messages
+        tool_role = self.provider.detect_tool_role()
+
+        for tool_call in tool_calls:
+            function_result, _ = execute_tool_call(tool_call)
+
+            messages.append(
+                ChatMessage(
+                    role=tool_role,
+                    content=function_result,
+                    name=tool_call.name,
+                    tool_call_id=tool_call.id,
+                )
+            )
+
+        # Continue the conversation with updated history
+        yield from self.completion_with_tools(messages, stream=stream, recursion_depth=recursion_depth + 1)

{yaicli-0.6.4 → yaicli-0.7.0}/yaicli/llms/providers/ai21_provider.py

@@ -63,7 +63,7 @@ class AI21Provider(OpenAIProvider):
             if finish_reason == "tool_calls" and not content:
                 # tool call assistant message, content can't be empty
                 # Error code: 422 - {'detail': {'error': ['Value error, message content must not be an empty string']}}
-                content = tool_call.id
+                content = tool_call.id if tool_call else ""
 
             # Generate response object
             yield LLMResponse(
@@ -72,3 +72,35 @@ class AI21Provider(OpenAIProvider):
                 tool_call=tool_call if finish_reason == "tool_calls" else None,
                 finish_reason=finish_reason,
             )
+
+    def _process_tool_call_chunk(self, tool_calls, existing_tool_call=None):
+        """Process a tool call chunk from AI21 API response
+
+        Tool calls from AI21 are delivered across multiple chunks:
+        - First chunk contains function name
+        - Subsequent chunks contain arguments data
+        - Final chunk (with finish_reason='tool_calls') contains complete arguments
+
+        Args:
+            tool_calls: Tool call data from current chunk
+            existing_tool_call: Previously accumulated tool call object
+
+        Returns:
+            ToolCall: Updated tool call object with accumulated data
+        """
+        # Get the first (and only) tool call from the chunk
+        call = tool_calls[0]
+
+        if existing_tool_call is None:
+            # First chunk - create new tool call with function name
+            return ToolCall(id=call.id, name=call.function.name, arguments="{}")
+        else:
+            # Update existing tool call with new arguments data
+            # Keep existing data and update with new information
+            existing_arguments = existing_tool_call.arguments
+            new_arguments = call.function.arguments if hasattr(call.function, "arguments") else "{}"
+
+            # Combine arguments (new arguments should override if available)
+            combined_arguments = new_arguments if new_arguments else existing_arguments
+
+            return ToolCall(id=existing_tool_call.id, name=existing_tool_call.name, arguments=combined_arguments)