separate chat command

Author: dsfaccini

clai/README.md

@@ -25,26 +25,26 @@ export OPENAI_API_KEY='your-api-key-here'
 Then with [`uvx`](https://docs.astral.sh/uv/guides/tools/), run:
 
 ```bash
-uvx clai
+uvx clai chat
 ```
 
 Or to install `clai` globally [with `uv`](https://docs.astral.sh/uv/guides/tools/#installing-tools), run:
 
 ```bash
 uv tool install clai
 ...
-clai
+clai chat
 ```
 
 Or with `pip`, run:
 
 ```bash
 pip install clai
 ...
-clai
+clai chat
 ```
 
-Either way, running `clai` will start an interactive session where you can chat with the AI model. Special commands available in interactive mode:
+Either way, running `clai chat` will start an interactive session where you can chat with the AI model. Special commands available in interactive mode:
 
 - `/exit`: Exit the session
 - `/markdown`: Show the last response in markdown format
@@ -112,30 +112,17 @@ For full documentation, see [Web Chat UI](https://ai.pydantic.dev/ui/web/).
 ## Help
 
 ```
-usage: clai [-h] [-m [MODEL]] [-a AGENT] [-l] [-t [CODE_THEME]] [--no-stream] [--version] [prompt] {web} ...
+usage: clai [-h] [-l] [--version] {chat,web} ...
 
 Pydantic AI CLI v...
 
-Special prompts:
-* `/exit` - exit the interactive mode (ctrl-c and ctrl-d also work)
-* `/markdown` - show the last markdown output of the last question
-* `/multiline` - toggle multiline mode
-* `/cp` - copy the last response to clipboard
-
 positional arguments:
-  prompt                AI Prompt, if omitted fall into interactive mode
-  {web}                 Available commands
-    web                 Launch web chat UI for an agent
+  {chat,web}         Available commands
+    chat             Interactive chat with an AI model
+    web              Launch web chat UI for an agent
 
 options:
-  -h, --help            show this help message and exit
-  -m [MODEL], --model [MODEL]
-                        Model to use, in format "<provider>:<model>" e.g. "openai:gpt-5" or "anthropic:claude-sonnet-4-5". Defaults to "openai:gpt-5".
-  -a AGENT, --agent AGENT
-                        Custom Agent to use, in format "module:variable", e.g. "mymodule.submodule:my_agent"
-  -l, --list-models     List all available models and exit
-  -t [CODE_THEME], --code-theme [CODE_THEME]
-                        Which colors to use for code, can be "dark", "light" or any theme from pygments.org/styles/. Defaults to "dark" which works well on dark terminals.
-  --no-stream           Disable streaming from the model
-  --version             Show version and exit
+  -h, --help         show this help message and exit
+  -l, --list-models  List all available models and exit
+  --version          Show version and exit
 ```

docs/cli.md

@@ -22,26 +22,26 @@ export OPENAI_API_KEY='your-api-key-here'
 Then with [`uvx`](https://docs.astral.sh/uv/guides/tools/), run:
 
 ```bash
-uvx clai
+uvx clai chat
 ```
 
 Or to install `clai` globally [with `uv`](https://docs.astral.sh/uv/guides/tools/#installing-tools), run:
 
 ```bash
 uv tool install clai
 ...
-clai
+clai chat
 ```
 
 Or with `pip`, run:
 
 ```bash
 pip install clai
 ...
-clai
+clai chat
 ```
 
-Either way, running `clai` will start an interactive session where you can chat with the AI model. Special commands available in interactive mode:
+Either way, running `clai chat` will start an interactive session where you can chat with the AI model. Special commands available in interactive mode:
 
 - `/exit`: Exit the session
 - `/markdown`: Show the last response in markdown format
@@ -122,14 +122,16 @@ To get help on the CLI, use the `--help` flag:
 
 ```bash
 uvx clai --help
+uvx clai chat --help
+uvx clai web --help
 ```
 
 ### Choose a model
 
 You can specify which model to use with the `--model` flag:
 
 ```bash
-uvx clai --model anthropic:claude-sonnet-4-0
+uvx clai chat --model anthropic:claude-sonnet-4-0
 ```
 
 (a full list of models available can be printed with `uvx clai --list-models`)
@@ -147,7 +149,7 @@ agent = Agent('openai:gpt-5', instructions='You always respond in Italian.')
 Then run:
 
 ```bash
-uvx clai --agent custom_agent:agent "What's the weather today?"
+uvx clai chat --agent custom_agent:agent "What's the weather today?"
 ```
 
 The format must be `module:variable` where:

docs/ui/web.md

@@ -50,11 +50,11 @@ Create a web app from an agent instance using [`Agent.to_web()`][pydantic_ai.age
     from pydantic_ai import Agent
     from pydantic_ai.builtin_tools import WebSearchTool
     from pydantic_ai.models.anthropic import AnthropicModel
-    from pydantic_ai.models.openai import OpenAIModel
+    from pydantic_ai.models.openai import OpenAIChatModel
 
     # Create separate models with their own custom configuration
     anthropic_model = AnthropicModel('claude-sonnet-4-5')
-    openai_model = OpenAIModel('gpt-5', api_key='custom-key')
+    openai_model = OpenAIChatModel('gpt-5', provider='openai')
 
     agent = Agent(openai_model)
 

pydantic_ai_slim/pydantic_ai/_cli/__init__.py

@@ -128,18 +128,34 @@ def cli_exit(prog_name: str = 'pai'):  # pragma: no cover
     sys.exit(cli(prog_name=prog_name))
 
 
-def cli(  # noqa: C901
-    args_list: Sequence[str] | None = None, *, prog_name: str = 'pai', default_model: str = 'openai:gpt-5'
-) -> int:
+def cli(args_list: Sequence[str] | None = None, *, prog_name: str = 'pai', default_model: str = 'openai:gpt-5') -> int:
     """Run the CLI and return the exit code for the process."""
     # we don't want to autocomplete or list models that don't include the provider,
     # e.g. we want to show `openai:gpt-4o` but not `gpt-4o`
     qualified_model_names = [n for n in get_literal_values(KnownModelName.__value__) if ':' in n]
 
     parser = argparse.ArgumentParser(
         prog=prog_name,
-        description=f"""\
-Pydantic AI CLI v{__version__}\n\n
+        description=f'Pydantic AI CLI v{__version__}',
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
+
+    parser.add_argument(
+        '-l',
+        '--list-models',
+        action='store_true',
+        help='List all available models and exit',
+    )
+    parser.add_argument('--version', action='store_true', help='Show version and exit')
+
+    subparsers = parser.add_subparsers(dest='command', help='Available commands')
+
+    # Chat subcommand
+    chat_parser = subparsers.add_parser(
+        'chat',
+        help='Interactive chat with an AI model',
+        description="""\
+Interactive chat mode with an AI model.
 
 Special prompts:
 * `/exit` - exit the interactive mode (ctrl-c and ctrl-d also work)
@@ -149,39 +165,29 @@ def cli(  # noqa: C901
 """,
         formatter_class=argparse.RawTextHelpFormatter,
     )
-
-    parser.add_argument('prompt', nargs='?', help='AI Prompt, if omitted fall into interactive mode')
-
-    arg = parser.add_argument(
+    chat_parser.add_argument('prompt', nargs='?', help='AI Prompt, if omitted fall into interactive mode')
+    chat_model_arg = chat_parser.add_argument(
         '-m',
         '--model',
         nargs='?',
         help=f'Model to use, in format "<provider>:<model>" e.g. "openai:gpt-5" or "anthropic:claude-sonnet-4-5". Defaults to "{default_model}".',
     )
-    arg.completer = argcomplete.ChoicesCompleter(qualified_model_names)  # type: ignore[reportPrivateUsage]
-    parser.add_argument(
+    chat_model_arg.completer = argcomplete.ChoicesCompleter(qualified_model_names)  # type: ignore[reportPrivateUsage]
+    chat_parser.add_argument(
         '-a',
         '--agent',
         help='Custom Agent to use, in format "module:variable", e.g. "mymodule.submodule:my_agent"',
     )
-    parser.add_argument(
-        '-l',
-        '--list-models',
-        action='store_true',
-        help='List all available models and exit',
-    )
-    parser.add_argument(
+    chat_parser.add_argument(
         '-t',
         '--code-theme',
         nargs='?',
         help='Which colors to use for code, can be "dark", "light" or any theme from pygments.org/styles/. Defaults to "dark" which works well on dark terminals.',
         default='dark',
     )
-    parser.add_argument('--no-stream', action='store_true', help='Disable streaming from the model')
-    parser.add_argument('--version', action='store_true', help='Show version and exit')
-
-    subparsers = parser.add_subparsers(dest='command', help='Available commands')
+    chat_parser.add_argument('--no-stream', action='store_true', help='Disable streaming from the model')
 
+    # Web subcommand
     web_parser = subparsers.add_parser(
         'web',
         help='Launch web chat UI for an agent',
@@ -211,7 +217,6 @@ def cli(  # noqa: C901
         help=f'Builtin tool to enable (can be repeated, e.g., -t web_search -t code_execution). '
         f'Available: {", ".join(_CLI_TOOL_IDS)}.',
     )
-
     web_parser.add_argument(
         '-i',
         '--instructions',
@@ -229,6 +234,18 @@ def cli(  # noqa: C901
     argcomplete.autocomplete(parser)
     args = parser.parse_args(args_list)
 
+    console = Console()
+    name_version = f'[green]{prog_name} - Pydantic AI CLI v{__version__}[/green]'
+
+    if args.version:
+        console.print(name_version, highlight=False)
+        return 0
+    if args.list_models:
+        console.print(f'{name_version}\n\n[green]Available models:[/green]')
+        for model in qualified_model_names:
+            console.print(f'  {model}', highlight=False)
+        return 0
+
     if args.command == 'web':
         from .web import run_web_command
 
@@ -242,17 +259,18 @@ def cli(  # noqa: C901
             mcp=args.mcp,
         )
 
-    console = Console()
-    name_version = f'[green]{prog_name} - Pydantic AI CLI v{__version__}[/green]'
-    if args.version:
-        console.print(name_version, highlight=False)
-        return 0
-    if args.list_models:
-        console.print(f'{name_version}\n\n[green]Available models:[/green]')
-        for model in qualified_model_names:
-            console.print(f'  {model}', highlight=False)
-        return 0
+    if args.command == 'chat':
+        return _run_chat_command(args, console, name_version, default_model, prog_name)
 
+    # No command specified - show help
+    parser.print_help()
+    return 0
+
+
+def _run_chat_command(
+    args: argparse.Namespace, console: Console, name_version: str, default_model: str, prog_name: str
+) -> int:
+    """Handle the chat subcommand."""
     agent: Agent[None, str] = cli_agent
     if args.agent:
         loaded = load_agent(args.agent)

tests/models/test_outlines.py

@@ -479,7 +479,7 @@ def test_request_image_url(transformers_multimodal_model: OutlinesModel) -> None
 def test_tool_definition(llamacpp_model: OutlinesModel) -> None:
     # builtin tools
     agent = Agent(llamacpp_model, builtin_tools=[WebSearchTool()])
-    with pytest.raises(UserError, match='Builtin tool WebSearchTool is not supported by this model'):
+    with pytest.raises(UserError, match=r"Builtin tool\(s\) \['WebSearchTool'\] not supported by this model"):
         agent.run_sync('Hello')
 
     # function tools