Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/app/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,11 @@
"title": "API Key",
"description": "Your Google AI API key for authentication",
"placeholder": "Enter your Google AI API key"
},
"baseURL": {
"title": "Base URL",
"description": "The base URL for Google AI API endpoint",
"placeholder": "Enter your Google AI API base URL"
}
},
"models": {
Expand Down
5 changes: 5 additions & 0 deletions src/app/i18n/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,11 @@
"title": "API密钥",
"description": "用于身份验证的Google AI API密钥",
"placeholder": "输入您的Google AI API密钥"
},
"baseURL": {
"title": "基础URL",
"description": "Google AI API端点的基础URL",
"placeholder": "请输入您的Google AI API基础URL"
}
},
"models": {
Expand Down
2 changes: 1 addition & 1 deletion src/app/routes/settings/provider/$providerId.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function ProviderDetailPage() {
return (
<SettingsContent title={provider.name} isMobile={isMobile}>
<div className="space-y-16">
<ProviderSettingsForm provider={provider} onSave={handleSave} />
<ProviderSettingsForm key={provider.id} provider={provider} onSave={handleSave} />
<ModelList providerId={providerId} />
</div>
</SettingsContent>
Expand Down
14 changes: 12 additions & 2 deletions src/server/ai/provider/google.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,26 @@ const googleSettingsSchema = [
type: "password",
required: true,
},
{
key: "baseURL",
type: "url",
required: false,
},
] as const satisfies ApiProviderSettingsItem[];

// Automatically generate type from schema
export type GoogleSettings = ProviderSettingsType<typeof googleSettingsSchema>;

// Single image generation helper function
const generateSingle = async (request: TypixGenerateRequest, settings: ApiProviderSettings): Promise<string[]> => {
const { apiKey } = Google.parseSettings<GoogleSettings>(settings);
const { apiKey, baseURL } = Google.parseSettings<GoogleSettings>(settings);

const ai = new GoogleGenAI({ apiKey });
const ai = new GoogleGenAI({
apiKey,
httpOptions: {
baseUrl: baseURL,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because baseURL is optional, baseUrl will be undefined when unset; depending on @google/genai, explicitly passing httpOptions.baseUrl: undefined may override the SDK default endpoint and cause requests to fail. Consider only providing httpOptions when baseURL is defined (or setting a defaultValue).

Severity: medium

Fix This in Augment

🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.

},
});

const ability = chooseAblility(request, findModel(Google, request.modelId).ability);

Expand Down