Add tool ranker fallback policy tests

This commit is contained in:
2026-05-18 16:23:32 +03:00
parent c3481dfcfe
commit 58f5a645fd
13 changed files with 125 additions and 46 deletions
+3 -3
View File
@@ -1,9 +1,9 @@
import {Mistral} from "@mistralai/mistralai";
import {Ollama} from "ollama";
import {OpenAI} from "openai";
import {Environment} from "../common/environment";
import {AiModelCapabilities} from "../model/ai-model-capabilities";
import {AiProvider} from "../model/ai-provider";
import {Environment} from "../common/environment.js";
import {AiModelCapabilities} from "../model/ai-model-capabilities.js";
import {AiProvider} from "../model/ai-provider.js";
export type AiCapabilityName = keyof AiModelCapabilities;
export type AiRuntimePurpose = AiCapabilityName | "chat";
+23
View File
@@ -0,0 +1,23 @@
import {ToolRankerFallbackPolicy} from "../common/policies.js";
export type ToolRankerFallbackSelection = {
toolNames: string[];
usedRanker: boolean;
};
export function resolveToolRankerFallbackSelection(params: {
fallbackPolicy: ToolRankerFallbackPolicy;
availableToolNames: readonly string[];
}): ToolRankerFallbackSelection {
if (params.fallbackPolicy === ToolRankerFallbackPolicy.NO_TOOLS) {
return {
toolNames: [],
usedRanker: false,
};
}
return {
toolNames: [...params.availableToolNames],
usedRanker: false,
};
}
+5 -5
View File
@@ -1,12 +1,12 @@
import type {BoundaryValue} from "../common/boundary-types";
import type {AiRuntimeTarget} from "./ai-runtime-target";
import {AiProvider} from "../model/ai-provider";
import {RuntimeConfigSnapshot, toolSchemaNames} from "./unified-ai-runner.shared";
import type {BoundaryValue} from "../common/boundary-types.js";
import type {AiRuntimeTarget} from "./ai-runtime-target.js";
import {AiProvider} from "../model/ai-provider.js";
import {RuntimeConfigSnapshot, toolSchemaNames} from "./unified-ai-runner.shared.js";
import {
buildToolRankerSystemPrompt,
getToolRankerAvailableToolInfos,
type ToolRankerToolInfo,
} from "./tool-ranker-metadata";
} from "./tool-ranker-metadata.js";
export type ToolRankerMessage = {
role?: string;
+4 -4
View File
@@ -2,11 +2,11 @@ import {spawn} from "node:child_process";
import {copyFile, lstat, mkdir, readdir, rm, writeFile} from "node:fs/promises";
import os from "node:os";
import path from "node:path";
import {AiTool} from "../tool-types";
import {Environment} from "../../common/environment";
import {toolsLogger} from "./tool-logger";
import {AiTool} from "../tool-types.js";
import {Environment} from "../../common/environment.js";
import {toolsLogger} from "./tool-logger.js";
import {randomUUID} from "node:crypto";
import {AiJsonObject} from "../tool-types";
import {AiJsonObject} from "../tool-types.js";
const logger = toolsLogger.child("python-interpreter");
+1 -1
View File
@@ -1,3 +1,3 @@
import {appLogger} from "../../logging/logger";
import {appLogger} from "../../logging/logger.js";
export const toolsLogger = appLogger.child("ai-tools");
+27 -24
View File
@@ -1,20 +1,21 @@
import {ChatCompletionMessageParam} from "openai/resources/chat/completions";
import {ChatRequest} from "ollama";
import {BoundaryValue} from "../common/boundary-types";
import {ToolRankerFallbackPolicy} from "../common/policies";
import {AiProvider} from "../model/ai-provider";
import {createMistralClient, createOllamaClient, createOpenAiClient, sameRuntimeEndpoint} from "./ai-runtime-target";
import {aiLog, aiLogDuration, aiLogProviderTarget} from "../logging/ai-logger";
import {providerChatTarget, RuntimeConfigSnapshot} from "./unified-ai-runner.shared";
import {BoundaryValue} from "../common/boundary-types.js";
import {ToolRankerFallbackPolicy} from "../common/policies.js";
import {AiProvider} from "../model/ai-provider.js";
import {createMistralClient, createOllamaClient, createOpenAiClient, sameRuntimeEndpoint} from "./ai-runtime-target.js";
import {aiLog, aiLogDuration, aiLogProviderTarget} from "../logging/ai-logger.js";
import {providerChatTarget, RuntimeConfigSnapshot} from "./unified-ai-runner.shared.js";
import {
buildRankerContext,
buildRankerTarget,
buildToolRankerPrompt,
filterRankedTools,
ToolRankerSelection,
} from "./tool-ranker-pipeline";
import {allToolSchemaNames} from "./unified-ai-runner.shared";
import {sanitizeToolRankerResult} from "./tool-ranker-metadata";
} from "./tool-ranker-pipeline.js";
import {allToolSchemaNames} from "./unified-ai-runner.shared.js";
import {sanitizeToolRankerResult} from "./tool-ranker-metadata.js";
import {resolveToolRankerFallbackSelection} from "./tool-ranker-fallback.js";
export class ToolRanker {
constructor(private readonly config: RuntimeConfigSnapshot) {
@@ -27,8 +28,15 @@ export class ToolRanker {
round: number;
signal: AbortSignal;
messages?: readonly { role?: string; content?: string | readonly { text?: string }[] }[];
runRanker?: (
provider: AiProvider,
target: NonNullable<ReturnType<typeof buildRankerTarget>>,
prompt: string,
userQuery: string,
) => Promise<string>;
}): Promise<ToolRankerSelection> {
const {availableTools, provider, round, signal, userQuery} = args;
const runRanker = args.runRanker ?? this.runRanker.bind(this);
const availableNames = allToolSchemaNames(availableTools);
const fallbackPolicy = this.config.toolRankerFallbackPolicy;
const configuredTarget = buildRankerTarget(this.config, provider);
@@ -41,11 +49,10 @@ export class ToolRanker {
const target = configuredTarget ?? (fallbackPolicy === ToolRankerFallbackPolicy.MAIN_MODEL ? mainModelTarget : undefined);
if (!target) {
if (fallbackPolicy === ToolRankerFallbackPolicy.NO_TOOLS) {
return {toolNames: [], usedRanker: false};
}
return {toolNames: availableNames, usedRanker: false};
return resolveToolRankerFallbackSelection({
fallbackPolicy,
availableToolNames: availableNames,
});
}
const startedAt = Date.now();
@@ -63,7 +70,7 @@ export class ToolRanker {
try {
if (signal.aborted) throw new Error("Aborted");
const raw = await this.runRanker(provider, target, ranker.prompt, userQuery);
const raw = await runRanker(provider, target, ranker.prompt, userQuery);
if (signal.aborted) throw new Error("Aborted");
const selectedNames = sanitizeToolRankerResult({
raw,
@@ -106,7 +113,7 @@ export class ToolRanker {
const fallbackRanker = buildToolRankerPrompt(
buildRankerContext(this.config, provider, mainModelTarget, round, userQuery, availableTools),
);
const raw = await this.runRanker(provider, mainModelTarget, fallbackRanker.prompt, userQuery);
const raw = await runRanker(provider, mainModelTarget, fallbackRanker.prompt, userQuery);
const selectedNames = sanitizeToolRankerResult({
raw,
availableToolNames: availableNames,
@@ -151,14 +158,10 @@ export class ToolRanker {
error: failureMessage,
});
if (fallbackPolicy === ToolRankerFallbackPolicy.NO_TOOLS) {
return {toolNames: [], usedRanker: false};
}
return {
toolNames: availableNames,
usedRanker: false,
};
return resolveToolRankerFallbackSelection({
fallbackPolicy,
availableToolNames: availableNames,
});
}
}