scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: merge native tool defaults for openai-compatible provider (#10213)

Browse source
This commit is contained in:
Hannes Rudolph 2025-12-19 13:18:10 -07:00 • committed by GitHub
parent bb358fb8f9
commit 397328cb53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 110 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
webview-ui/src/components/ui/hooks/__tests__/useSelectedModel.spec.ts
View file

@ -5,7 +5,13 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
import { renderHook } from "@testing-library/react"
import type { Mock } from "vitest"
import { ProviderSettings, ModelInfo, BEDROCK_1M_CONTEXT_MODEL_IDS, litellmDefaultModelInfo } from "@roo-code/types"
import {
ProviderSettings,
ModelInfo,
BEDROCK_1M_CONTEXT_MODEL_IDS,
litellmDefaultModelInfo,
openAiModelInfoSaneDefaults,
} from "@roo-code/types"
import { useSelectedModel } from "../useSelectedModel"
import { useRouterModels } from "../useRouterModels"
@ -661,4 +667,100 @@ describe("useSelectedModel", () => {
expect(result.current.info?.defaultToolProtocol).toBe("native")
})
})
describe("openai provider", () => {
beforeEach(() => {
mockUseRouterModels.mockReturnValue({
data: {
openrouter: {},
requesty: {},
unbound: {},
litellm: {},
"io-intelligence": {},
},
isLoading: false,
isError: false,
} as any)
mockUseOpenRouterModelProviders.mockReturnValue({
data: {},
isLoading: false,
isError: false,
} as any)
})
it("should use openAiModelInfoSaneDefaults when no custom model info is provided", () => {
const apiConfiguration: ProviderSettings = {
apiProvider: "openai",
openAiModelId: "gpt-4o",
}
const wrapper = createWrapper()
const { result } = renderHook(() => useSelectedModel(apiConfiguration), { wrapper })
expect(result.current.provider).toBe("openai")
expect(result.current.id).toBe("gpt-4o")
expect(result.current.info).toEqual(openAiModelInfoSaneDefaults)
expect(result.current.info?.supportsNativeTools).toBe(true)
expect(result.current.info?.defaultToolProtocol).toBe("native")
})
it("should merge native tool defaults with custom model info", () => {
const customModelInfo: ModelInfo = {
maxTokens: 16384,
contextWindow: 128000,
supportsImages: true,
supportsPromptCache: false,
inputPrice: 0.01,
outputPrice: 0.03,
description: "Custom OpenAI-compatible model",
}
const apiConfiguration: ProviderSettings = {
apiProvider: "openai",
openAiModelId: "custom-model",
openAiCustomModelInfo: customModelInfo,
}
const wrapper = createWrapper()
const { result } = renderHook(() => useSelectedModel(apiConfiguration), { wrapper })
expect(result.current.provider).toBe("openai")
expect(result.current.id).toBe("custom-model")
// Should merge native tool defaults with custom model info
const nativeToolDefaults = {
supportsNativeTools: openAiModelInfoSaneDefaults.supportsNativeTools,
defaultToolProtocol: openAiModelInfoSaneDefaults.defaultToolProtocol,
}
expect(result.current.info).toEqual({ ...nativeToolDefaults, ...customModelInfo })
expect(result.current.info?.supportsNativeTools).toBe(true)
expect(result.current.info?.defaultToolProtocol).toBe("native")
})
it("should allow custom model info to override native tool defaults", () => {
const customModelInfo: ModelInfo = {
maxTokens: 8192,
contextWindow: 32000,
supportsImages: false,
supportsPromptCache: false,
supportsNativeTools: false, // Explicitly disable
defaultToolProtocol: "xml", // Override default to use XML instead of native
}
const apiConfiguration: ProviderSettings = {
apiProvider: "openai",
openAiModelId: "custom-model-no-tools",
openAiCustomModelInfo: customModelInfo,
}
const wrapper = createWrapper()
const { result } = renderHook(() => useSelectedModel(apiConfiguration), { wrapper })
expect(result.current.provider).toBe("openai")
expect(result.current.id).toBe("custom-model-no-tools")
// Custom model info should override the native tool defaults
expect(result.current.info?.supportsNativeTools).toBe(false)
expect(result.current.info?.defaultToolProtocol).toBe("xml")
})
})
})

8
webview-ui/src/components/ui/hooks/useSelectedModel.ts
View file

@ -280,7 +280,13 @@ function getSelectedModel({
}
case "openai": {
const id = apiConfiguration.openAiModelId ?? ""
const info = apiConfiguration?.openAiCustomModelInfo ?? openAiModelInfoSaneDefaults
const customInfo = apiConfiguration?.openAiCustomModelInfo
// Only merge native tool call defaults, not prices or other model-specific info
const nativeToolDefaults = {
supportsNativeTools: openAiModelInfoSaneDefaults.supportsNativeTools,
defaultToolProtocol: openAiModelInfoSaneDefaults.defaultToolProtocol,
}
const info = customInfo ? { ...nativeToolDefaults, ...customInfo } : openAiModelInfoSaneDefaults
return { id, info }
}
case "ollama": {