Skip to content

Commit 1230e1f

Browse files
author
Zoo (VP)
committed
fix(openrouter): support extended reasoning efforts and add refresh models button
1 parent 78c712a commit 1230e1f

2 files changed

Lines changed: 94 additions & 2 deletions

File tree

‎src/api/providers/fetchers/openrouter.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,9 @@ export const parseOpenRouterModel = ({
217217
cacheWritesPrice,
218218
cacheReadsPrice,
219219
description: model.description,
220-
supportsReasoningEffort: supportedParameters ? supportedParameters.includes("reasoning") : undefined,
220+
supportsReasoningEffort: supportedParameters?.includes("reasoning")
221+
? ["low", "medium", "high", "xhigh", "max"]
222+
: undefined,
221223
supportedParameters: supportedParameters ? supportedParameters.filter(isModelParameter) : undefined,
222224
}
223225

‎webview-ui/src/components/settings/providers/OpenRouter.tsx‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { useCallback, useState } from "react"
1+
import { useCallback, useEffect, useRef, useState } from "react"
2+
import { useQueryClient } from "@tanstack/react-query"
23
import { Checkbox } from "vscrui"
34
import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
45

@@ -7,17 +8,31 @@ import {
78
type OrganizationAllowList,
89
type RouterModels,
910
openRouterDefaultModelId,
11+
allRouterModelsProvider,
12+
providerIdentifiers,
13+
RouterModelsMessageType,
14+
type ExtensionMessage,
1015
} from "@roo-code/types"
16+
import type { RouterName } from "@roo/api"
1117

1218
import { useAppTranslation } from "@src/i18n/TranslationContext"
1319
import { getOpenRouterAuthUrl } from "@src/oauth/urls"
1420
import { VSCodeButtonLink } from "@src/components/common/VSCodeButtonLink"
21+
import { vscode } from "@src/utils/vscode"
22+
import { Button } from "@src/components/ui"
1523

1624
import { inputEventTransform } from "../transforms"
1725

1826
import { ModelPicker } from "../ModelPicker"
1927
import { OpenRouterBalanceDisplay } from "./OpenRouterBalanceDisplay"
2028

29+
enum RefreshStatus {
30+
Idle = "idle",
31+
Loading = "loading",
32+
Success = "success",
33+
Error = "error",
34+
}
35+
2136
type OpenRouterProps = {
2237
apiConfiguration: ProviderSettings
2338
setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void
@@ -42,6 +57,54 @@ export const OpenRouter = ({
4257

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

60+
const queryClient = useQueryClient()
61+
const [refreshStatus, setRefreshStatus] = useState<RefreshStatus>(RefreshStatus.Idle)
62+
const [refreshError, setRefreshError] = useState<string | undefined>()
63+
const errorJustReceived = useRef(false)
64+
65+
useEffect(() => {
66+
const handleMessage = (event: MessageEvent<ExtensionMessage>) => {
67+
const message = event.data
68+
if (message.type === RouterModelsMessageType.singleRouterModelFetchResponse && !message.success) {
69+
const providerName = message.values?.provider as RouterName
70+
if (providerName === providerIdentifiers.openrouter && refreshStatus === RefreshStatus.Loading) {
71+
errorJustReceived.current = true
72+
setRefreshStatus(RefreshStatus.Error)
73+
setRefreshError(message.error)
74+
}
75+
} else if (message.type === RouterModelsMessageType.routerModels) {
76+
if (refreshStatus === RefreshStatus.Loading) {
77+
if (!errorJustReceived.current) {
78+
setRefreshStatus(RefreshStatus.Success)
79+
void queryClient.invalidateQueries({
80+
queryKey: [RouterModelsMessageType.routerModels, providerIdentifiers.openrouter],
81+
})
82+
void queryClient.invalidateQueries({
83+
queryKey: [RouterModelsMessageType.routerModels, allRouterModelsProvider],
84+
})
85+
}
86+
}
87+
}
88+
}
89+
90+
window.addEventListener("message", handleMessage)
91+
return () => window.removeEventListener("message", handleMessage)
92+
}, [refreshStatus, queryClient])
93+
94+
const handleRefreshModels = useCallback(() => {
95+
errorJustReceived.current = false
96+
setRefreshStatus(RefreshStatus.Loading)
97+
setRefreshError(undefined)
98+
99+
vscode.postMessage({
100+
type: RouterModelsMessageType.requestRouterModels,
101+
values: {
102+
provider: providerIdentifiers.openrouter,
103+
refresh: true,
104+
},
105+
})
106+
}, [])
107+
45108
const handleInputChange = useCallback(
46109
<K extends keyof ProviderSettings, E>(
47110
field: K,
@@ -103,6 +166,33 @@ export const OpenRouter = ({
103166
)}
104167
</div>
105168
)}
169+
<Button
170+
variant="outline"
171+
onClick={handleRefreshModels}
172+
disabled={refreshStatus === RefreshStatus.Loading}
173+
className="w-full">
174+
<div className="flex items-center gap-2">
175+
{refreshStatus === RefreshStatus.Loading ? (
176+
<span className="codicon codicon-loading codicon-modifier-spin" />
177+
) : (
178+
<span className="codicon codicon-refresh" />
179+
)}
180+
{t("settings:providers.refreshModels.label")}
181+
</div>
182+
</Button>
183+
{refreshStatus === RefreshStatus.Loading && (
184+
<div className="text-sm text-vscode-descriptionForeground">
185+
{t("settings:providers.refreshModels.loading")}
186+
</div>
187+
)}
188+
{refreshStatus === RefreshStatus.Success && (
189+
<div className="text-sm text-vscode-foreground">{t("settings:providers.refreshModels.success")}</div>
190+
)}
191+
{refreshStatus === RefreshStatus.Error && (
192+
<div className="text-sm text-vscode-errorForeground">
193+
{refreshError || t("settings:providers.refreshModels.error")}
194+
</div>
195+
)}
106196
<ModelPicker
107197
apiConfiguration={apiConfiguration}
108198
setApiConfigurationField={setApiConfigurationField}

0 commit comments

Comments
 (0)