Fixed tool calling with Groq and OpenRouter (#1003)
Build and Release / Determine run mode (push) Waiting to run
Build and Release / Read metadata (push) Blocked by required conditions
Build and Release / Sync Flatpak repo (push) Blocked by required conditions
Build and Release / Collect Flatpak artifacts (push) Blocked by required conditions
Build and Release / Verify (push) Waiting to run
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions
Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions
Build and Release / Prepare & create release (push) Blocked by required conditions
Build and Release / Publish release (push) Blocked by required conditions

This commit is contained in:
Thorsten Sommer authored and GitHub committed 2026-09-24 12:08:54 +02:00
1 parent 40ac215359
commit 0c585144e2
9 files changed
+516 -43

No files matched your search

@@ -1245,6 +1245,7 @@ public abstract class BaseProvider : IProvider, ISecretId
/// <param name="requestPath">The request path, relative to the provider base URL.</param>
/// <param name="headersAction">Optional additional headers to add.</param>
/// <param name="mayAskForSequentialToolCalls">Whether a request which offers tools may ask for one call at a time. False for a provider which rejects the parallel_tool_calls parameter.</param>
/// <param name="enforcesStrictToolSchemas">Whether the provider binds the model's tool calls to a strict schema. Only then are tools offered in strict mode; everywhere else a strict schema would only tell the model that every argument is required.</param>
/// <param name="token">The cancellation token.</param>
/// <typeparam name="TRequest">The request DTO type.</typeparam>
/// <typeparam name="TDelta">The delta stream line type.</typeparam>
@@ -1262,6 +1263,7 @@ public abstract class BaseProvider : IProvider, ISecretId
string requestPath = "chat/completions",
Action<HttpRequestHeaders>? headersAction = null,
bool mayAskForSequentialToolCalls = true,
bool enforcesStrictToolSchemas = false,
[EnumeratorCancellation] CancellationToken token = default)
where TRequest : ChatCompletionAPIRequest
where TDelta : IResponseStreamLine
@@ -1300,7 +1302,7 @@ public abstract class BaseProvider : IProvider, ISecretId
if (runnableTools.Count > 0)
{
var adapter = new ChatCompletionToolCallingAdapter<TRequest>(requestFactory, systemPrompt, apiParameters,
runnableTools.Select(x => ProviderToolAdapters.ToChatCompletionTool(x.Definition)).ToList(), mayAskForSequentialToolCalls, runnableTools,
runnableTools.Select(x => ProviderToolAdapters.ToChatCompletionTool(x.Definition, enforcesStrictToolSchemas)).ToList(), mayAskForSequentialToolCalls, runnableTools,
(requestDto, requestToken) => this.StreamChatCompletionRequest(requestDto, providerName, requestPath, requestedSecret, headersAction, requestToken),
ChatCompletionSourceReader.Read<TDelta, TAnnotation>,
this.logger);
@@ -168,6 +168,16 @@ public sealed class ProviderOpenAI() : BaseProvider(LLMProviders.OPEN_AI, new Ur
},
systemPromptRole: systemPromptRole,
requestPath: "chat/completions",
//
// OpenAI binds a strict function's arguments to its schema -- read on
// 2026-09-24 at https://developers.openai.com/api/docs/guides/function-calling.
// Most other hosts of this API do not: Groq applies strict mode to
// response formats only (https://console.groq.com/docs/structured-outputs,
// same day) and merely validates a tool call afterward, so it rejects
// every call that leaves out an argument the strict schema requires:
//
enforcesStrictToolSchemas: true,
token: token))
yield return content;
@@ -10,33 +10,47 @@ namespace AIStudio.Provider;
/// <remarks>
/// The definitions state a tool once, in plain JSON Schema. What differs per API is not only the
/// field names but how an optional argument is expressed, which is why the OpenAI shapes convert
/// the schema while Anthropic takes it as written.
/// the schema while Anthropic takes it as written.<br/><br/>
/// Strict mode is a promise of the host, not of the definition: only a host which binds the
/// model's output to the schema keeps it. Everywhere else the model merely reads a schema that
/// calls every argument required, and then either invents a value for an argument it meant to
/// leave out, or the host rejects the call for lacking one. That is why the Chat Completions
/// shape, which reaches every OpenAI-compatible host, only goes strict where the host says so.
/// </remarks>
public static class ProviderToolAdapters
{
/// <summary>
/// Builds the nested function tool shape used by Chat Completions compatible APIs.
/// </summary>
public static object ToChatCompletionTool(ToolDefinition definition) => new
/// <param name="definition">The tool to describe.</param>
/// <param name="hostEnforcesStrict">Whether the host binds the model's tool calls to a strict schema. Only then is the tool sent in strict mode.</param>
public static object ToChatCompletionTool(ToolDefinition definition, bool hostEnforcesStrict)
{
type = "function",
function = new
var isStrict = definition.Function.Strict && hostEnforcesStrict;
return new
{
name = definition.Function.Name,
description = definition.Function.DescriptionForLLM,
parameters = ToOpenAIParameters(definition),
strict = definition.Function.Strict,
}
};
type = "function",
function = new
{
name = definition.Function.Name,
description = definition.Function.DescriptionForLLM,
parameters = ToOpenAIParameters(definition, isStrict),
strict = isStrict,
}
};
}
/// <summary>
/// Builds the flat function tool shape used by the OpenAI Responses API.
/// </summary>
/// <remarks>
/// Only OpenAI speaks this API, and it enforces strict mode, so the definition alone decides.
/// </remarks>
public static ResponsesFunctionTool ToResponsesTool(ToolDefinition definition) => new()
{
Name = definition.Function.Name,
Description = definition.Function.DescriptionForLLM,
Parameters = ToOpenAIParameters(definition),
Parameters = ToOpenAIParameters(definition, definition.Function.Strict),
Strict = definition.Function.Strict,
};
@@ -59,7 +73,7 @@ public static class ProviderToolAdapters
/// <summary>
/// The parameter schema for the OpenAI APIs, converted only when strict mode asks for it.
/// </summary>
private static System.Text.Json.JsonElement ToOpenAIParameters(ToolDefinition definition) => definition.Function.Strict
private static System.Text.Json.JsonElement ToOpenAIParameters(ToolDefinition definition, bool isStrict) => isStrict
? OpenAIStrictToolSchema.FromToolParameters(definition.Function.Parameters)
: definition.Function.Parameters;
}
@@ -94,9 +94,28 @@ public sealed class WebSearchTool(IEnumerable<IWebSearchBackend> backends, WebPa
private const string LIMIT_ARGUMENT = "limit";
private const string TIME_RANGE_DAY = "day";
private const string TIME_RANGE_WEEK = "week";
private const string TIME_RANGE_MONTH = "month";
private const string TIME_RANGE_YEAR = "year";
/// <summary>
/// The time ranges a search can be restricted to.
/// </summary>
/// <remarks>
/// Those which both services with a time filter, SearXNG and Tavily, understand and take as
/// they are. Tavily documents all four. SearXNG's API documentation names no week, but its code accepts
/// one -- read on 2026-09-24 in parse_time_range of searx/webadapter.py. A model asked about
/// "this week" wants exactly that, and without it, it asks for a week again and again.<br/><br/>
/// The schema offers exactly these and the reader checks against them, so the two cannot drift
/// apart.
/// </remarks>
private static readonly string[] TIME_RANGES = [TIME_RANGE_DAY, TIME_RANGE_WEEK, TIME_RANGE_MONTH, TIME_RANGE_YEAR];
/// <summary>
/// How much of a wrongly passed argument an error message repeats back to the model.
/// </summary>
private const int MAX_ARGUMENT_ECHO_LENGTH = 40;
public string ImplementationKey => ToolSelectionRules.WEB_SEARCH_TOOL_ID;
/// <inheritdoc />
@@ -118,7 +137,7 @@ public sealed class WebSearchTool(IEnumerable<IWebSearchBackend> backends, WebPa
Parameters = ToolParameterSchemaBuilder.Create()
.RequiredString(QUERY_ARGUMENT, "The search query.")
.OptionalString(LANGUAGE_ARGUMENT, "Optional IETF language tag restricting the search to one language, such as 'de-DE', 'en-US', or 'all' for no restriction. Leave it out to search in the language configured for this tool. Do not pass a language name such as 'German': search engines expect the tag and silently return nothing for anything else.")
.OptionalEnum(TIME_RANGE_ARGUMENT, "Optional time range filter for the search.", TIME_RANGE_DAY, TIME_RANGE_MONTH, TIME_RANGE_YEAR)
.OptionalEnum(TIME_RANGE_ARGUMENT, "Optional time range filter for the search.", TIME_RANGES)
.OptionalInteger(PAGE_ARGUMENT, "Optional search result page number starting at 1.")
.OptionalInteger(LIMIT_ARGUMENT, $"Optional maximum number of ranked result pages to retrieve and return. The hard maximum is {MAX_RESULTS}.")
.Build(),
@@ -482,14 +501,11 @@ public sealed class WebSearchTool(IEnumerable<IWebSearchBackend> backends, WebPa
public async Task<ToolExecutionResult> ExecuteAsync(JsonElement arguments, ToolExecutionContext context, CancellationToken token = default)
{
var query = ReadRequiredString(arguments, QUERY_ARGUMENT);
var language = ReadOptionalString(arguments, LANGUAGE_ARGUMENT);
var timeRange = ReadOptionalString(arguments, TIME_RANGE_ARGUMENT);
var page = ReadOptionalPositiveInt(arguments, PAGE_ARGUMENT);
var requestedLimit = ReadOptionalPositiveInt(arguments, LIMIT_ARGUMENT);
if (timeRange is not null && timeRange is not (TIME_RANGE_DAY or TIME_RANGE_MONTH or TIME_RANGE_YEAR))
throw new ArgumentException($"Invalid time_range '{timeRange}'.");
var query = ReadQuery(arguments);
var language = ReadLanguage(arguments);
var timeRange = ReadTimeRange(arguments);
var page = ReadPage(arguments);
var requestedLimit = ReadLimit(arguments);
language = string.IsNullOrWhiteSpace(language) ? context.SettingsValues.GetValueOrDefault(DEFAULT_LANGUAGE_SETTING) : language;
var safeSearch = ReadSafeSearchPolicy(context.SettingsValues);
@@ -807,42 +823,99 @@ public sealed class WebSearchTool(IEnumerable<IWebSearchBackend> backends, WebPa
return result;
}
private static string ReadRequiredString(JsonElement arguments, string propertyName)
/// <summary>
/// Reads the search query, the one argument the model always has to pass.
/// </summary>
internal static string ReadQuery(JsonElement arguments)
{
var value = ReadOptionalString(arguments, propertyName);
if (string.IsNullOrWhiteSpace(value))
throw new ArgumentException($"Missing required argument '{propertyName}'.");
var query = ReadOptionalString(arguments, QUERY_ARGUMENT, whenLeftOut: null);
if (string.IsNullOrWhiteSpace(query))
throw new ArgumentException($"Missing required argument '{QUERY_ARGUMENT}'.");
return value;
return query;
}
private static string? ReadOptionalString(JsonElement arguments, string propertyName)
/// <summary>
/// Reads the language tag the model asked for, or null for the configured language.
/// </summary>
internal static string? ReadLanguage(JsonElement arguments) => ReadOptionalString(arguments, LANGUAGE_ARGUMENT, "to use the configured language");
/// <summary>
/// Reads the time range the model asked for, or null for no restriction.
/// </summary>
internal static string? ReadTimeRange(JsonElement arguments)
{
if (!arguments.TryGetProperty(propertyName, out var value))
if (!TryGetArgument(arguments, TIME_RANGE_ARGUMENT, out var value))
return null;
return value.ValueKind switch
{
JsonValueKind.Null => null,
JsonValueKind.String => value.GetString()?.Trim(),
_ => throw new ArgumentException($"Argument '{propertyName}' must be a string."),
};
var timeRange = value.ValueKind is JsonValueKind.String ? value.GetString()?.Trim() : null;
if (timeRange is null || !TIME_RANGES.Contains(timeRange, StringComparer.Ordinal))
throw InvalidArgument(TIME_RANGE_ARGUMENT, value, $"one of {string.Join(", ", TIME_RANGES)}", "to search without a time restriction");
return timeRange;
}
private static int? ReadOptionalPositiveInt(JsonElement arguments, string propertyName)
/// <summary>
/// Reads the result page the model asked for, or null for the first one.
/// </summary>
internal static int? ReadPage(JsonElement arguments) => ReadOptionalPositiveInt(arguments, PAGE_ARGUMENT, "to get the first page");
/// <summary>
/// Reads how many results the model asked for, or null for the configured number.
/// </summary>
internal static int? ReadLimit(JsonElement arguments) => ReadOptionalPositiveInt(arguments, LIMIT_ARGUMENT, "to get as many results as configured");
/// <summary>
/// Looks up an argument, treating null the same as leaving it out.
/// </summary>
private static bool TryGetArgument(JsonElement arguments, string propertyName, out JsonElement value) =>
arguments.TryGetProperty(propertyName, out value) && value.ValueKind is not JsonValueKind.Null;
private static string? ReadOptionalString(JsonElement arguments, string propertyName, string? whenLeftOut)
{
if (!arguments.TryGetProperty(propertyName, out var value))
if (!TryGetArgument(arguments, propertyName, out var value))
return null;
if (value.ValueKind is JsonValueKind.Null)
if (value.ValueKind is not JsonValueKind.String)
throw InvalidArgument(propertyName, value, "a string", whenLeftOut);
return value.GetString()?.Trim();
}
private static int? ReadOptionalPositiveInt(JsonElement arguments, string propertyName, string whenLeftOut)
{
if (!TryGetArgument(arguments, propertyName, out var value))
return null;
if (value.ValueKind is not JsonValueKind.Number || !value.TryGetInt32(out var intValue) || intValue <= 0)
throw new ArgumentException($"Argument '{propertyName}' must be a positive integer.");
throw InvalidArgument(propertyName, value, "a positive integer", whenLeftOut);
return intValue;
}
/// <summary>
/// Builds the error a model gets for an argument it passed wrongly.
/// </summary>
/// <remarks>
/// The model reads this and tries again, so it says what arrived, what would have been right,
/// and, for an optional argument, that leaving it out is always an option. A model which
/// believes the argument has to be there otherwise keeps trying placeholders, and every attempt
/// costs one of the tool calls an answer may make.
/// </remarks>
/// <param name="propertyName">The argument.</param>
/// <param name="value">What the model passed, as it arrived.</param>
/// <param name="expectation">What the argument must be, completing "must be ...".</param>
/// <param name="whenLeftOut">What happens without the argument, completing "Leave it out ...", or null for a required one.</param>
private static ArgumentException InvalidArgument(string propertyName, JsonElement value, string expectation, string? whenLeftOut)
{
var receivedValue = value.GetRawText();
if (receivedValue.Length > MAX_ARGUMENT_ECHO_LENGTH)
receivedValue = $"{receivedValue[..MAX_ARGUMENT_ECHO_LENGTH]}...";
var message = $"Argument '{propertyName}' must be {expectation}, but was {receivedValue}.";
return new ArgumentException(whenLeftOut is null ? message : $"{message} Leave it out {whenLeftOut}.");
}
private static string FormatQueryForLog(string query)
{
var singleLineQuery = query
@@ -8,6 +8,14 @@ public sealed class ToolFunctionDefinition
public string DescriptionForLLM { get; init; } = string.Empty;
/// <summary>
/// Whether this tool may be offered in strict mode.
/// </summary>
/// <remarks>
/// The host has a say as well: a tool goes strict only where the host binds the model's calls
/// to the schema, see ProviderToolAdapters. Setting this to false keeps a tool out of strict
/// mode everywhere, for a schema which strict mode cannot express.
/// </remarks>
public bool Strict { get; init; } = true;
public JsonElement Parameters { get; init; }