Use constants instead of hard-coded strings in buildApiHandler; fix

vercel copy/pasta

Signed-off-by: Geoff Wilson <[email protected]>

Author: suprjinx

packages/types/src/constants.ts

@@ -24,7 +24,7 @@ export const API_KEYS = {
 	IO_INTELLIGENCE: 'IOINTELLIGENCE_API_KEY',
 	MOONSHOOT: 'MOONSHOT_API_KEY',
 	SAMBA_NOVA: 'SAMBANOVA_API_KEY',
-	VERCEL_NOVA: 'VERCEL_API_KEY',
+	VERCEL: 'VERCEL_API_KEY',
 	ZAI: 'ZAI_API_KEY',
 } as const
 

src/api/index.ts

@@ -1,6 +1,7 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 
 import type { ProviderSettings, ModelInfo } from "@roo-code/types"
+import { API_KEYS } from "@roo-code/types"
 
 import { ApiStream } from "./transform/stream"
 
@@ -107,19 +108,19 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 	switch (apiProvider) {
 		case "anthropic":
 			if (options.anthropicConfigUseEnvVars) {
-				options.apiKey = getEnvVar("ANTHROPIC_API_KEY", options.apiKey)
+				options.apiKey = getEnvVar(API_KEYS.ANTHROPIC, options.apiKey)
 			}
 			return new AnthropicHandler(options)
 		case "claude-code":
 			return new ClaudeCodeHandler(options)
 		case "glama":
 			if (options.glamaConfigUseEnvVars) {
-				options.glamaApiKey = getEnvVar("GLAMA_API_KEY", options.glamaApiKey)
+				options.glamaApiKey = getEnvVar(API_KEYS.GLAMA, options.glamaApiKey)
 			}
 			return new GlamaHandler(options)
 		case "openrouter":
 			if (options.openRouterConfigUseEnvVars) {
-				options.openRouterApiKey = getEnvVar("OPENROUTER_API_KEY", options.openRouterApiKey)
+				options.openRouterApiKey = getEnvVar(API_KEYS.OPEN_ROUTER, options.openRouterApiKey)
 			}
 			return new OpenRouterHandler(options)
 		case "bedrock":
@@ -130,7 +131,7 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 				: new VertexHandler(options)
 		case "openai":
 			if (options.openAiConfigUseEnvVars) {
-				options.openAiApiKey = getEnvVar("OPENAI_API_KEY", options.openAiApiKey)
+				options.openAiApiKey = getEnvVar(API_KEYS.OPENAI, options.openAiApiKey)
 			}
 			return new OpenAiHandler(options)
 		case "ollama":
@@ -139,46 +140,46 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new LmStudioHandler(options)
 		case "gemini":
 			if (options.geminiConfigUseEnvVars) {
-				options.geminiApiKey = getEnvVar("GEMINI_API_KEY", options.geminiApiKey)
+				options.geminiApiKey = getEnvVar(API_KEYS.GEMINI, options.geminiApiKey)
 			}
 			return new GeminiHandler(options)
 		case "openai-native":
 			if (options.openAiNativeConfigUseEnvVars) {
-				options.openAiNativeApiKey = getEnvVar("OPENAI_API_KEY", options.openAiNativeApiKey)
+				options.openAiNativeApiKey = getEnvVar(API_KEYS.OPENAI, options.openAiNativeApiKey)
 			}
 			return new OpenAiNativeHandler(options)
 		case "deepseek":
 			if (options.deepSeekConfigUseEnvVars) {
-				options.deepSeekApiKey = getEnvVar("DEEPSEEK_API_KEY", options.deepSeekApiKey)
+				options.deepSeekApiKey = getEnvVar(API_KEYS.DEEP_SEEK, options.deepSeekApiKey)
 			}
 			return new DeepSeekHandler(options)
 		case "doubao":
 			if (options.doubaoConfigUseEnvVars) {
-				options.doubaoApiKey = getEnvVar("DOUBAO_API_KEY", options.doubaoApiKey)
+				options.doubaoApiKey = getEnvVar(API_KEYS.DOUBAO, options.doubaoApiKey)
 			}
 			return new DoubaoHandler(options)
 		case "qwen-code":
 			return new QwenCodeHandler(options)
 		case "moonshot":
 			if (options.moonshotConfigUseEnvVars) {
-				options.moonshotApiKey = getEnvVar("MOONSHOT_API_KEY", options.moonshotApiKey)
+				options.moonshotApiKey = getEnvVar(API_KEYS.MOONSHOOT, options.moonshotApiKey)
 			}
 			return new MoonshotHandler(options)
 		case "vscode-lm":
 			return new VsCodeLmHandler(options)
 		case "mistral":
 			if (options.mistralConfigUseEnvVars) {
-				options.mistralApiKey = getEnvVar("MISTRAL_API_KEY", options.mistralApiKey)
+				options.mistralApiKey = getEnvVar(API_KEYS.MISTRAL, options.mistralApiKey)
 			}
 			return new MistralHandler(options)
 		case "unbound":
 			if (options.unboundConfigUseEnvVars) {
-				options.unboundApiKey = getEnvVar("UNBOUND_API_KEY", options.unboundApiKey)
+				options.unboundApiKey = getEnvVar(API_KEYS.UNBOUND, options.unboundApiKey)
 			}
 			return new UnboundHandler(options)
 		case "requesty":
 			if (options.requestyConfigUseEnvVars) {
-				options.requestyApiKey = getEnvVar("REQUESTY_API_KEY", options.requestyApiKey)
+				options.requestyApiKey = getEnvVar(API_KEYS.REQUESTY, options.requestyApiKey)
 			}
 			return new RequestyHandler(options)
 		case "human-relay":
@@ -187,57 +188,57 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new FakeAIHandler(options)
 		case "xai":
 			if (options.xaiConfigUseEnvVars) {
-				options.xaiApiKey = getEnvVar("XAI_API_KEY", options.xaiApiKey)
+				options.xaiApiKey = getEnvVar(API_KEYS.XAI, options.xaiApiKey)
 			}
 			return new XAIHandler(options)
 		case "groq":
 			if (options.groqConfigUseEnvVars) {
-				options.groqApiKey = getEnvVar("GROQ_API_KEY", options.groqApiKey)
+				options.groqApiKey = getEnvVar(API_KEYS.GROQ, options.groqApiKey)
 			}
 			return new GroqHandler(options)
 		case "deepinfra":
 			if (options.deepInfraConfigUseEnvVars) {
-				options.deepInfraApiKey = getEnvVar("DEEPINFRA_API_KEY", options.deepInfraApiKey)
+				options.deepInfraApiKey = getEnvVar(API_KEYS.DEEP_INFRA, options.deepInfraApiKey)
 			}
 			return new DeepInfraHandler(options)
 		case "huggingface":
 			if (options.huggingFaceConfigUseEnvVars) {
-				options.huggingFaceApiKey = getEnvVar("HUGGINGFACE_API_KEY", options.huggingFaceApiKey)
+				options.huggingFaceApiKey = getEnvVar(API_KEYS.HUGGING_FACE, options.huggingFaceApiKey)
 			}
 			return new HuggingFaceHandler(options)
 		case "chutes":
 			if (options.chutesConfigUseEnvVars) {
-				options.chutesApiKey = getEnvVar("CHUTES_API_KEY", options.chutesApiKey)
+				options.chutesApiKey = getEnvVar(API_KEYS.CHUTES, options.chutesApiKey)
 			}
 			return new ChutesHandler(options)
 		case "litellm":
 			if (options.litellmConfigUseEnvVars) {
-				options.litellmApiKey = getEnvVar("LITELLM_API_KEY", options.litellmApiKey)
+				options.litellmApiKey = getEnvVar(API_KEYS.LITELLM, options.litellmApiKey)
 			}
 			return new LiteLLMHandler(options)
 		case "cerebras":
 			if (options.cerebrasConfigUseEnvVars) {
-				options.cerebrasApiKey = getEnvVar("CEREBRAS_API_KEY", options.cerebrasApiKey)
+				options.cerebrasApiKey = getEnvVar(API_KEYS.CEREBRAS, options.cerebrasApiKey)
 			}
 			return new CerebrasHandler(options)
 		case "sambanova":
 			if (options.sambaNovaConfigUseEnvVars) {
-				options.sambaNovaApiKey = getEnvVar("SAMBANOVA_API_KEY", options.sambaNovaApiKey)
+				options.sambaNovaApiKey = getEnvVar(API_KEYS.SAMBA_NOVA, options.sambaNovaApiKey)
 			}
 			return new SambaNovaHandler(options)
 		case "zai":
 			if (options.zaiConfigUseEnvVars) {
-				options.zaiApiKey = getEnvVar("ZAI_API_KEY", options.zaiApiKey)
+				options.zaiApiKey = getEnvVar(API_KEYS.ZAI, options.zaiApiKey)
 			}
 			return new ZAiHandler(options)
 		case "fireworks":
 			if (options.fireworksConfigUseEnvVars) {
-				options.fireworksApiKey = getEnvVar("FIREWORKS_API_KEY", options.fireworksApiKey)
+				options.fireworksApiKey = getEnvVar(API_KEYS.FIREWORKS, options.fireworksApiKey)
 			}
 			return new FireworksHandler(options)
 		case "io-intelligence":
 			if (options.ioIntelligenceConfigUseEnvVars) {
-				options.ioIntelligenceApiKey = getEnvVar("IOINTELLIGENCE_API_KEY", options.ioIntelligenceApiKey)
+				options.ioIntelligenceApiKey = getEnvVar(API_KEYS.IO_INTELLIGENCE, options.ioIntelligenceApiKey)
 			}
 			return new IOIntelligenceHandler(options)
 		case "roo":
@@ -246,12 +247,12 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new RooHandler(options)
 		case "featherless":
 			if (options.featherlessConfigUseEnvVars) {
-				options.featherlessApiKey = getEnvVar("FEATHERLESS_API_KEY", options.featherlessApiKey)
+				options.featherlessApiKey = getEnvVar(API_KEYS.FEATHERLESS, options.featherlessApiKey)
 			}
 			return new FeatherlessHandler(options)
 		case "vercel-ai-gateway":
 			if (options.vercelConfigUseEnvVars) {
-				options.vercelAiGatewayApiKey = getEnvVar("VERCEL_API_KEY", options.vercelAiGatewayApiKey)
+				options.vercelAiGatewayApiKey = getEnvVar(API_KEYS.VERCEL, options.vercelAiGatewayApiKey)
 			}
 			return new VercelAiGatewayHandler(options)
 		default:

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

@@ -29,7 +29,7 @@ export const VercelAiGateway = ({
 		<>
 			<ApiKey
 				apiKey={apiConfiguration?.vercelAiGatewayApiKey || ""}
-				apiKeyEnvVar={API_KEYS.VERCEL_NOVA}
+				apiKeyEnvVar={API_KEYS.VERCEL}
 				configUseEnvVars={!!apiConfiguration?.vercelConfigUseEnvVars}
 				setApiKey={(value: string) => setApiConfigurationField("vercelAiGatewayApiKey", value)}
 				setConfigUseEnvVars={(value: boolean) => setApiConfigurationField("vercelConfigUseEnvVars", value)}