Add support for OpenAI-compatible API provider and optional base URL #68
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ import { Button } from "../ui/button"; | |
| import { Settings } from "lucide-react"; | ||
| import { useToast } from "../../contexts/toast"; | ||
|
|
||
| type APIProvider = "openai" | "gemini" | "anthropic" | "openai-compatible"; | ||
|
|
||
| type AIModel = { | ||
| id: string; | ||
|
|
@@ -181,6 +181,7 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| const [open, setOpen] = useState(externalOpen || false); | ||
| const [apiKey, setApiKey] = useState(""); | ||
| const [apiProvider, setApiProvider] = useState<APIProvider>("openai"); | ||
| const [baseUrl, setBaseUrl] = useState(""); | ||
| const [extractionModel, setExtractionModel] = useState("gpt-4o"); | ||
| const [solutionModel, setSolutionModel] = useState("gpt-4o"); | ||
| const [debuggingModel, setDebuggingModel] = useState("gpt-4o"); | ||
|
|
@@ -210,6 +211,7 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| interface Config { | ||
| apiKey?: string; | ||
| apiProvider?: APIProvider; | ||
| baseUrl?: string; | ||
| extractionModel?: string; | ||
| solutionModel?: string; | ||
| debuggingModel?: string; | ||
|
|
@@ -220,6 +222,7 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| .then((config: Config) => { | ||
| setApiKey(config.apiKey || ""); | ||
| setApiProvider(config.apiProvider || "openai"); | ||
| setBaseUrl(config.baseUrl || ""); | ||
| setExtractionModel(config.extractionModel || "gpt-4o"); | ||
| setSolutionModel(config.solutionModel || "gpt-4o"); | ||
| setDebuggingModel(config.debuggingModel || "gpt-4o"); | ||
|
|
@@ -251,6 +254,11 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| setExtractionModel("claude-3-7-sonnet-20250219"); | ||
| setSolutionModel("claude-3-7-sonnet-20250219"); | ||
| setDebuggingModel("claude-3-7-sonnet-20250219"); | ||
| } else if (provider === "openai-compatible") { | ||
| // For OpenAI-compatible APIs, we'll keep the current models or set defaults | ||
| if (!extractionModel) setExtractionModel("gpt-3.5-turbo"); | ||
| if (!solutionModel) setSolutionModel("gpt-3.5-turbo"); | ||
| if (!debuggingModel) setDebuggingModel("gpt-3.5-turbo"); | ||
|
Comment on lines
+257
to
+261
There was a problem hiding this comment. Here we are creating a new model but in |
||
| } | ||
| }; | ||
|
|
||
|
|
@@ -260,6 +268,7 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| const result = await window.electronAPI.updateConfig({ | ||
| apiKey, | ||
| apiProvider, | ||
| baseUrl: apiProvider === "openai-compatible" ? baseUrl : "", | ||
| extractionModel, | ||
| solutionModel, | ||
| debuggingModel, | ||
|
|
@@ -325,9 +334,9 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| {/* API Provider Selection */} | ||
| <div className="space-y-2"> | ||
| <label className="text-sm font-medium text-white">API Provider</label> | ||
| <div className="grid grid-cols-2 gap-2 mb-2"> | ||
|
|
||
| <div | ||
| className={`p-2 rounded-lg cursor-pointer transition-colors ${ | ||
| apiProvider === "openai" | ||
| ? "bg-white/10 border border-white/20" | ||
| : "bg-black/30 border border-white/5 hover:bg-white/5" | ||
|
|
@@ -347,7 +356,7 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| </div> | ||
| </div> | ||
| <div | ||
| className={`p-2 rounded-lg cursor-pointer transition-colors ${ | ||
| apiProvider === "gemini" | ||
| ? "bg-white/10 border border-white/20" | ||
| : "bg-black/30 border border-white/5 hover:bg-white/5" | ||
|
|
@@ -367,7 +376,7 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| </div> | ||
| </div> | ||
| <div | ||
| className={`p-2 rounded-lg cursor-pointer transition-colors ${ | ||
| apiProvider === "anthropic" | ||
| ? "bg-white/10 border border-white/20" | ||
| : "bg-black/30 border border-white/5 hover:bg-white/5" | ||
|
|
@@ -386,24 +395,46 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| </div> | ||
| </div> | ||
| </div> | ||
| <div | ||
| className={`p-2 rounded-lg cursor-pointer transition-colors ${ | ||
| apiProvider === "openai-compatible" | ||
| ? "bg-white/10 border border-white/20" | ||
| : "bg-black/30 border border-white/5 hover:bg-white/5" | ||
| }`} | ||
| onClick={() => handleProviderChange("openai-compatible")} | ||
| > | ||
| <div className="flex items-center gap-2"> | ||
| <div | ||
| className={`w-3 h-3 rounded-full ${ | ||
| apiProvider === "openai-compatible" ? "bg-white" : "bg-white/20" | ||
| }`} | ||
| /> | ||
| <div className="flex flex-col"> | ||
| <p className="font-medium text-white text-sm">OpenAI Compatible</p> | ||
| <p className="text-xs text-white/60">Open Router, etc.</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
Comment on lines
+398
to
+417
There was a problem hiding this comment. Again here, I would rather have you support a new model with everything made specifically for that model rather than creating new at some places and making changes in others |
||
| </div> | ||
| </div> | ||
|
|
||
| <div className="space-y-2"> | ||
| <label className="text-sm font-medium text-white" htmlFor="apiKey"> | ||
| {apiProvider === "openai" ? "OpenAI API Key" : | ||
| apiProvider === "gemini" ? "Gemini API Key" : | ||
| apiProvider === "anthropic" ? "Anthropic API Key" : | ||
| "API Key"} | ||
| </label> | ||
| <Input | ||
| id="apiKey" | ||
| type="password" | ||
| value={apiKey} | ||
| onChange={(e) => setApiKey(e.target.value)} | ||
| placeholder={ | ||
| apiProvider === "openai" ? "sk-..." : | ||
| apiProvider === "gemini" ? "Enter your Gemini API key" : | ||
| apiProvider === "anthropic" ? "sk-ant-..." : | ||
| "Enter your API key" | ||
| } | ||
| className="bg-black/50 border-white/10 text-white" | ||
| /> | ||
|
|
@@ -413,11 +444,36 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| </p> | ||
| )} | ||
| <p className="text-xs text-white/50"> | ||
| Your API key is stored locally and never sent to any server except { | ||
| apiProvider === "openai" ? "OpenAI" : | ||
| apiProvider === "gemini" ? "Google" : | ||
| apiProvider === "anthropic" ? "Anthropic" : | ||
| "the API provider you specified" | ||
| } | ||
| </p> | ||
|
|
||
| {apiProvider === "openai-compatible" && ( | ||
| <div className="space-y-2"> | ||
| <label className="text-sm font-medium text-white" htmlFor="customApiUrl"> | ||
| API URL | ||
| </label> | ||
| <Input | ||
| id="baseUrl" | ||
| type="text" | ||
| value={baseUrl} | ||
| onChange={(e) => setBaseUrl(e.target.value)} | ||
| placeholder="https://api.openrouter.ai/api/v1" | ||
| className="bg-black/50 border-white/10 text-white" | ||
| /> | ||
| <p className="text-xs text-white/50"> | ||
| Enter the base URL for the OpenAI-compatible API (e.g., Open Router) | ||
| </p> | ||
| </div> | ||
| )} | ||
|
|
||
| <div className="mt-2 p-2 rounded-md bg-white/5 border border-white/10"> | ||
| <p className="text-xs text-white/80 mb-1">Don't have an API key?</p> | ||
| {apiProvider === "openai" && ( | ||
|
|
||
| <> | ||
| <p className="text-xs text-white/60 mb-1">1. Create an account at <button | ||
| onClick={() => openExternalLink('https://platform.openai.com/signup')} | ||
|
|
@@ -429,7 +485,8 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| </p> | ||
| <p className="text-xs text-white/60">3. Create a new secret key and paste it here</p> | ||
| </> | ||
| )} | ||
| {apiProvider === "gemini" && ( | ||
| <> | ||
| <p className="text-xs text-white/60 mb-1">1. Create an account at <button | ||
| onClick={() => openExternalLink('https://aistudio.google.com/')} | ||
|
|
@@ -441,7 +498,8 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| </p> | ||
| <p className="text-xs text-white/60">3. Create a new API key and paste it here</p> | ||
| </> | ||
| )} | ||
| {apiProvider === "anthropic" && ( | ||
| <> | ||
| <p className="text-xs text-white/60 mb-1">1. Create an account at <button | ||
| onClick={() => openExternalLink('https://console.anthropic.com/signup')} | ||
|
|
@@ -454,6 +512,19 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| <p className="text-xs text-white/60">3. Create a new API key and paste it here</p> | ||
| </> | ||
| )} | ||
| {apiProvider === "openai-compatible" && ( | ||
| <> | ||
| <p className="text-xs text-white/60 mb-1">1. Create an account at <button | ||
| onClick={() => openExternalLink('https://openrouter.ai/')} | ||
| className="text-blue-400 hover:underline cursor-pointer">Open Router</button> | ||
| </p> | ||
| <p className="text-xs text-white/60 mb-1">2. Go to the <button | ||
| onClick={() => openExternalLink('https://openrouter.ai/dashboard/api-keys')} | ||
| className="text-blue-400 hover:underline cursor-pointer">API Keys</button> section | ||
| </p> | ||
| <p className="text-xs text-white/60">3. Create a new API key and paste it here</p> | ||
| </> | ||
| )} | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
@@ -512,6 +583,18 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| apiProvider === "openai" ? category.openaiModels : | ||
| apiProvider === "gemini" ? category.geminiModels : | ||
| category.anthropicModels; | ||
|
|
||
| // Determine which state to use based on category key | ||
| const currentValue = | ||
| category.key === 'extractionModel' ? extractionModel : | ||
| category.key === 'solutionModel' ? solutionModel : | ||
| debuggingModel; | ||
|
|
||
| // Determine which setter function to use | ||
| const setValue = | ||
| category.key === 'extractionModel' ? setExtractionModel : | ||
| category.key === 'solutionModel' ? setSolutionModel : | ||
| setDebuggingModel; | ||
|
|
||
| return ( | ||
| <div key={category.key} className="mb-4"> | ||
|
|
@@ -521,19 +604,18 @@ export function SettingsDialog({ open: externalOpen, onOpenChange }: SettingsDia | |
| <p className="text-xs text-white/60 mb-2">{category.description}</p> | ||
|
|
||
| <div className="space-y-2"> | ||
| {apiProvider === "openai-compatible" && ( | ||
| <Input | ||
| id="extractionModelCustom" | ||
| type="text" | ||
| value={currentValue} | ||
| onChange={(e) => setValue(e.target.value)} | ||
| placeholder="gpt-3.5-turbo" | ||
| className="bg-black/50 border-white/10 text-white" | ||
| /> | ||
| )} | ||
|
|
||
| {apiProvider !== "openai-compatible" && models.map((m) => { | ||
|
Comment on lines
+607
to
+618
There was a problem hiding this comment. Why separate handling? |
||
| return ( | ||
| <div | ||
| key={m.id} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure about this change
seems like it beats the point of the default model