Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 58 additions & 1 deletion src/api/providers/fetchers/__tests__/openrouter.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe("OpenRouter API", () => {
description: expect.any(String),
supportsReasoningBudget: true,
requiredReasoningBudget: true,
supportsReasoningEffort: true,
supportsReasoningEffort: ["low", "medium", "high", "xhigh", "max"],
Comment thread
coderabbitai[bot] marked this conversation as resolved.
supportedParameters: ["max_tokens", "temperature", "reasoning", "include_reasoning"],
})

Expand Down Expand Up @@ -539,5 +539,62 @@ describe("OpenRouter API", () => {

expect(resultWithoutTools.supportedParameters).toContain("max_tokens")
})

it("leaves supportsReasoningEffort undefined when reasoning is absent or supportedParameters is unset", () => {
const mockModel = {
name: "Reasoning Effort Model",
description: "Model without reasoning parameter support",
context_length: 128000,
max_completion_tokens: 8192,
pricing: {
prompt: "0.000003",
completion: "0.000015",
},
}

const resultWithoutReasoningParam = parseOpenRouterModel({
id: "test/no-reasoning-model",
model: mockModel,
inputModality: ["text"],
outputModality: ["text"],
maxTokens: 8192,
supportedParameters: ["max_tokens", "temperature"],
})

const resultWithoutSupportedParameters = parseOpenRouterModel({
id: "test/unset-parameters-model",
model: mockModel,
inputModality: ["text"],
outputModality: ["text"],
maxTokens: 8192,
})

expect(resultWithoutReasoningParam.supportsReasoningEffort).toBeUndefined()
expect(resultWithoutSupportedParameters.supportsReasoningEffort).toBeUndefined()
})

it("sets supportsReasoningEffort when supportedParameters includes reasoning", () => {
const mockModel = {
name: "Reasoning Effort Model",
description: "Model with reasoning parameter support",
context_length: 128000,
max_completion_tokens: 8192,
pricing: {
prompt: "0.000003",
completion: "0.000015",
},
}

const resultWithReasoningParam = parseOpenRouterModel({
id: "test/reasoning-effort-model",
model: mockModel,
inputModality: ["text"],
outputModality: ["text"],
maxTokens: 8192,
supportedParameters: ["reasoning", "max_tokens", "temperature"],
})

expect(resultWithReasoningParam.supportsReasoningEffort).toEqual(["low", "medium", "high", "xhigh", "max"])
})
})
})
4 changes: 3 additions & 1 deletion src/api/providers/fetchers/openrouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,9 @@ export const parseOpenRouterModel = ({
cacheWritesPrice,
cacheReadsPrice,
description: model.description,
supportsReasoningEffort: supportedParameters ? supportedParameters.includes("reasoning") : undefined,
supportsReasoningEffort: supportedParameters?.includes("reasoning")
? ["low", "medium", "high", "xhigh", "max"]
: undefined,
supportedParameters: supportedParameters ? supportedParameters.filter(isModelParameter) : undefined,
}

Expand Down
103 changes: 102 additions & 1 deletion webview-ui/src/components/settings/providers/OpenRouter.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useCallback, useState } from "react"
import { useCallback, useEffect, useRef, useState } from "react"
import { useQueryClient } from "@tanstack/react-query"
import { Checkbox } from "vscrui"
import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"

Expand All @@ -7,17 +8,31 @@ import {
type OrganizationAllowList,
type RouterModels,
openRouterDefaultModelId,
allRouterModelsProvider,
providerIdentifiers,
RouterModelsMessageType,
type ExtensionMessage,
} from "@roo-code/types"
import type { RouterName } from "@roo/api"

import { useAppTranslation } from "@src/i18n/TranslationContext"
import { getOpenRouterAuthUrl } from "@src/oauth/urls"
import { VSCodeButtonLink } from "@src/components/common/VSCodeButtonLink"
import { vscode } from "@src/utils/vscode"
import { Button } from "@src/components/ui"

import { inputEventTransform } from "../transforms"

import { ModelPicker } from "../ModelPicker"
import { OpenRouterBalanceDisplay } from "./OpenRouterBalanceDisplay"

enum RefreshStatus {
Idle = "idle",
Loading = "loading",
Success = "success",
Error = "error",
}

type OpenRouterProps = {
apiConfiguration: ProviderSettings
setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void
Expand All @@ -42,6 +57,65 @@ export const OpenRouter = ({

const [openRouterBaseUrlSelected, setOpenRouterBaseUrlSelected] = useState(!!apiConfiguration?.openRouterBaseUrl)

const queryClient = useQueryClient()
const [refreshStatus, setRefreshStatus] = useState<RefreshStatus>(RefreshStatus.Idle)
const [refreshError, setRefreshError] = useState<string | undefined>()
// Stryker disable next-line BooleanLiteral : initial value never read before reset in handleRefreshModels
const errorJustReceived = useRef(false)

useEffect(() => {
const handleMessage = (event: MessageEvent<ExtensionMessage>) => {
const message = event.data
if (message.type === RouterModelsMessageType.singleRouterModelFetchResponse && !message.success) {
const providerName = message.values?.provider as RouterName
if (providerName === providerIdentifiers.openrouter && refreshStatus === RefreshStatus.Loading) {
errorJustReceived.current = true
setRefreshStatus(RefreshStatus.Error)
setRefreshError(message.error)
}
} else if (message.type === RouterModelsMessageType.routerModels) {
const providerName = message.values?.provider as RouterName | undefined
// Scoped responses must match our provider; unscoped (legacy/global)
// broadcasts are still accepted so Loading cannot hang.
if (
(providerName === undefined || providerName === providerIdentifiers.openrouter) &&
refreshStatus === RefreshStatus.Loading &&
!errorJustReceived.current
) {
setRefreshStatus(RefreshStatus.Success)
void queryClient.invalidateQueries({
queryKey: [RouterModelsMessageType.routerModels, providerIdentifiers.openrouter],
})
void queryClient.invalidateQueries({
queryKey: [RouterModelsMessageType.routerModels, allRouterModelsProvider],
})
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

window.addEventListener("message", handleMessage)
return () => window.removeEventListener("message", handleMessage)
}, [refreshStatus, queryClient])

const handleRefreshModels = useCallback(
() => {
errorJustReceived.current = false
setRefreshStatus(RefreshStatus.Loading)
// Stryker disable next-line CallExpression : refreshError is unobservable outside Error status; every Error transition re-sets it in the same batch
setRefreshError(undefined)

vscode.postMessage({
type: RouterModelsMessageType.requestRouterModels,
values: {
provider: providerIdentifiers.openrouter,
refresh: true,
},
})
},
// Stryker disable next-line ArrayDeclaration : deps array is constant; replacing it with any constant array is memoization-equivalent
[],
)

const handleInputChange = useCallback(
<K extends keyof ProviderSettings, E>(
field: K,
Expand Down Expand Up @@ -103,6 +177,33 @@ export const OpenRouter = ({
)}
</div>
)}
<Button
variant="outline"
onClick={handleRefreshModels}
disabled={refreshStatus === RefreshStatus.Loading}
className="w-full">
<div className="flex items-center gap-2">
{refreshStatus === RefreshStatus.Loading ? (
<span className="codicon codicon-loading codicon-modifier-spin" />
) : (
<span className="codicon codicon-refresh" />
)}
{t("settings:providers.refreshModels.label")}
</div>
</Button>
{refreshStatus === RefreshStatus.Loading && (
<div className="text-sm text-vscode-descriptionForeground">
{t("settings:providers.refreshModels.loading")}
</div>
)}
{refreshStatus === RefreshStatus.Success && (
<div className="text-sm text-vscode-foreground">{t("settings:providers.refreshModels.success")}</div>
)}
{refreshStatus === RefreshStatus.Error && (
<div className="text-sm text-vscode-errorForeground">
{refreshError || t("settings:providers.refreshModels.error")}
</div>
)}
<ModelPicker
apiConfiguration={apiConfiguration}
setApiConfigurationField={setApiConfigurationField}
Expand Down
Loading
Loading