Skip to content

Commit 30f7c00

Browse files
fix: using base url sent from the frontend
1 parent 5148255 commit 30f7c00

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/activate/handleUri.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ export const handleUri = async (uri: vscode.Uri) => {
3030
}
3131
case "/requesty": {
3232
const code = query.get("code")
33+
const baseUrl = query.get("baseUrl")
3334
if (code) {
34-
await visibleProvider.handleRequestyCallback(code)
35+
await visibleProvider.handleRequestyCallback(code, baseUrl)
3536
}
3637
break
3738
}

src/core/webview/ClineProvider.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ import type { ClineMessage } from "@roo-code/types"
9494
import { readApiMessages, saveApiMessages, saveTaskMessages } from "../task-persistence"
9595
import { getNonce } from "./getNonce"
9696
import { getUri } from "./getUri"
97+
import { REQUESTY_BASE_URL } from "../../shared/utils/requesty"
9798

9899
/**
99100
* https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts
@@ -1456,14 +1457,22 @@ export class ClineProvider
14561457

14571458
// Requesty
14581459

1459-
async handleRequestyCallback(code: string) {
1460-
const { apiConfiguration } = await this.getState()
1460+
async handleRequestyCallback(code: string, baseUrl: string | null) {
1461+
let { apiConfiguration } = await this.getState()
14611462

14621463
const newConfiguration: ProviderSettings = {
14631464
...apiConfiguration,
14641465
apiProvider: "requesty",
14651466
requestyApiKey: code,
1466-
requestyModelId: requestyDefaultModelId,
1467+
requestyModelId: apiConfiguration?.requestyModelId || requestyDefaultModelId,
1468+
}
1469+
1470+
// set baseUrl as undefined if we don't provide one
1471+
// or if it is the default requesty url
1472+
if (!baseUrl || baseUrl === REQUESTY_BASE_URL) {
1473+
newConfiguration.requestyBaseUrl = undefined
1474+
} else {
1475+
newConfiguration.requestyBaseUrl = baseUrl
14671476
}
14681477

14691478
await this.upsertProviderProfile("Requesty", newConfiguration)

src/shared/utils/requesty.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const REQUESTY_BASE_URL = "https://router.requesty.ai/v1"
1+
export const REQUESTY_BASE_URL = "https://router.requesty.ai/v1"
22

33
type URLType = "router" | "app" | "api"
44

0 commit comments

Comments
 (0)