Adding requesty base url (#6992)

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
Co-authored-by: John Costa <[email protected]>
Co-authored-by: Roo Code <[email protected]>

Author: 4 people

packages/types/src/provider-settings.ts

@@ -225,6 +225,7 @@ const unboundSchema = baseProviderSettingsSchema.extend({
 })
 
 const requestySchema = baseProviderSettingsSchema.extend({
+	requestyBaseUrl: z.string().optional(),
 	requestyApiKey: z.string().optional(),
 	requestyModelId: z.string().optional(),
 })

src/api/providers/__tests__/requesty.spec.ts

@@ -65,6 +65,21 @@ describe("RequestyHandler", () => {
 		})
 	})
 
+	it("can use a base URL instead of the default", () => {
+		const handler = new RequestyHandler({ ...mockOptions, requestyBaseUrl: "some-base-url" })
+		expect(handler).toBeInstanceOf(RequestyHandler)
+
+		expect(OpenAI).toHaveBeenCalledWith({
+			baseURL: "some-base-url",
+			apiKey: mockOptions.requestyApiKey,
+			defaultHeaders: {
+				"HTTP-Referer": "https://github.com/RooVetGit/Roo-Cline",
+				"X-Title": "Roo Code",
+				"User-Agent": `RooCode/${Package.version}`,
+			},
+		})
+	})
+
 	describe("fetchModel", () => {
 		it("returns correct model info when options are provided", async () => {
 			const handler = new RequestyHandler(mockOptions)

src/api/providers/requesty.ts

@@ -47,7 +47,7 @@ export class RequestyHandler extends BaseProvider implements SingleCompletionHan
 		this.options = options
 
 		this.client = new OpenAI({
-			baseURL: "https://router.requesty.ai/v1",
+			baseURL: options.requestyBaseUrl || "https://router.requesty.ai/v1",
 			apiKey: this.options.requestyApiKey ?? "not-provided",
 			defaultHeaders: DEFAULT_HEADERS,
 		})

webview-ui/src/components/settings/providers/Requesty.tsx

@@ -1,5 +1,5 @@
-import { useCallback, useState } from "react"
-import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
+import { useCallback, useEffect, useState } from "react"
+import { VSCodeCheckbox, VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
 
 import { type ProviderSettings, type OrganizationAllowList, requestyDefaultModelId } from "@roo-code/types"
 
@@ -35,6 +35,13 @@ export const Requesty = ({
 
 	const [didRefetch, setDidRefetch] = useState<boolean>()
 
+	const [requestyEndpointSelected, setRequestyEndpointSelected] = useState(!!apiConfiguration.requestyBaseUrl)
+
+	// This ensures that the "Use custom URL" checkbox is hidden when the user deletes the URL.
+	useEffect(() => {
+		setRequestyEndpointSelected(!!apiConfiguration?.requestyBaseUrl)
+	}, [apiConfiguration?.requestyBaseUrl])
+
 	const handleInputChange = useCallback(
 		<K extends keyof ProviderSettings, E>(
 			field: K,
@@ -72,6 +79,31 @@ export const Requesty = ({
 					{t("settings:providers.getRequestyApiKey")}
 				</VSCodeButtonLink>
 			)}
+
+			<VSCodeCheckbox
+				checked={requestyEndpointSelected}
+				onChange={(e: any) => {
+					const isChecked = e.target.checked === true
+					if (!isChecked) {
+						setApiConfigurationField("requestyBaseUrl", undefined)
+					}
+
+					setRequestyEndpointSelected(isChecked)
+				}}>
+				{t("settings:providers.requestyUseCustomBaseUrl")}
+			</VSCodeCheckbox>
+			{requestyEndpointSelected && (
+				<VSCodeTextField
+					value={apiConfiguration?.requestyBaseUrl || ""}
+					type="text"
+					onInput={handleInputChange("requestyBaseUrl")}
+					placeholder={t("settings:providers.getRequestyBaseUrl")}
+					className="w-full">
+					<div className="flex justify-between items-center mb-1">
+						<label className="block font-medium">{t("settings:providers.getRequestyBaseUrl")}</label>
+					</div>
+				</VSCodeTextField>
+			)}
 			<Button
 				variant="outline"
 				onClick={() => {

webview-ui/src/i18n/locales/ca/settings.json

@@ -252,6 +252,8 @@
 			"error": "Failed to refresh models list. Please try again."
 		},
 		"getRequestyApiKey": "Get Requesty API Key",
+		"getRequestyBaseUrl": "Base URL",
+		"requestyUseCustomBaseUrl": "Use custom base URL",
 		"openRouterTransformsText": "Compress prompts and message chains to the context size (<a>OpenRouter Transforms</a>)",
 		"anthropicApiKey": "Anthropic API Key",
 		"getAnthropicApiKey": "Get Anthropic API Key",