Skip to content

fix: resolve web search env api keys #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
C1-BA-B1-F3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve web search env api keys #285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 31 additions & 12 deletions ui/server/routes/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,22 @@ router.post('/test-connection', async (req, res) => {
*/
router.post('/test-web-search', async (req, res) => {
const { provider, apiKey, endpoint, customProvider } = req.body || {};
const selectedProvider = provider === 'tavily' || provider === 'custom' ? provider : 'glm';
const trimmedKey = typeof apiKey === 'string' ? apiKey.trim() : '';
const selectedProvider = provider === 'tavily' || provider === 'custom'
? provider
: trimmedKey
? 'glm'
: readEnvValue('TAVILY_API_KEY')
? 'tavily'
: 'glm';
const custom = customProvider && typeof customProvider === 'object' ? customProvider : {};
const customAuth = typeof custom.auth === 'string' ? custom.auth : 'bearer';
const customMethod = custom.method === 'GET' ? 'GET' : 'POST';
const queryParam = typeof custom.queryParam === 'string' && custom.queryParam.trim() ? custom.queryParam.trim() : 'query';
const apiKeyParam = typeof custom.apiKeyParam === 'string' && custom.apiKeyParam.trim() ? custom.apiKeyParam.trim() : 'api_key';
const resultsPath = typeof custom.resultsPath === 'string' ? custom.resultsPath.trim() : '';
const trimmedKey = typeof apiKey === 'string' ? apiKey.trim() : '';
if (!trimmedKey && !(selectedProvider === 'custom' && customAuth === 'none')) {
const effectiveApiKey = resolveWebSearchApiKey(trimmedKey, selectedProvider);
if (!effectiveApiKey && !(selectedProvider === 'custom' && customAuth === 'none')) {
return res.status(400).json({ ok: false, error: 'API key is required.' });
}
const trimmedEndpoint = typeof endpoint === 'string' ? endpoint.trim() : '';
Expand All @@ -347,7 +354,7 @@ router.post('/test-web-search', async (req, res) => {
Accept: 'application/json',
},
body: JSON.stringify({
api_key: trimmedKey,
api_key: effectiveApiKey,
query: 'hello',
max_results: 3,
include_answer: true,
Expand All @@ -363,13 +370,13 @@ router.post('/test-web-search', async (req, res) => {
headers['Content-Type'] = 'application/json';
body[queryParam] = 'hello';
}
if (customAuth === 'bearer' && trimmedKey) {
headers.Authorization = `Bearer ${trimmedKey}`;
} else if (customAuth === 'queryApiKey' && trimmedKey) {
url.searchParams.set(apiKeyParam, trimmedKey);
} else if (customAuth === 'bodyApiKey' && trimmedKey) {
if (customMethod === 'GET') url.searchParams.set(apiKeyParam, trimmedKey);
else body[apiKeyParam] = trimmedKey;
if (customAuth === 'bearer' && effectiveApiKey) {
headers.Authorization = `Bearer ${effectiveApiKey}`;
} else if (customAuth === 'queryApiKey' && effectiveApiKey) {
url.searchParams.set(apiKeyParam, effectiveApiKey);
} else if (customAuth === 'bodyApiKey' && effectiveApiKey) {
if (customMethod === 'GET') url.searchParams.set(apiKeyParam, effectiveApiKey);
else body[apiKeyParam] = effectiveApiKey;
}
requestUrl = url.toString();
requestInit = {
Expand All @@ -382,7 +389,7 @@ router.post('/test-web-search', async (req, res) => {
requestInit = {
method: 'POST',
headers: {
Authorization: `Bearer ${trimmedKey}`,
Authorization: `Bearer ${effectiveApiKey}`,
'Content-Type': 'application/json',
Accept: 'application/json',
},
Expand Down Expand Up @@ -441,6 +448,18 @@ router.post('/test-web-search', async (req, res) => {
}
});

function resolveWebSearchApiKey(inlineKey, provider) {
if (inlineKey) return inlineKey;
if (provider === 'tavily') return readEnvValue('TAVILY_API_KEY');
if (provider === 'custom') return readEnvValue('CUSTOM_WEB_SEARCH_API_KEY');
return readEnvValue('GLM_WEB_SEARCH_API_KEY') || readEnvValue('ZAI_API_KEY');
}

function readEnvValue(name) {
const value = process.env[name]?.trim();
return value && value.length > 0 ? value : '';
}

function readPath(value, pathValue) {
return pathValue.split('.').reduce((current, segment) => {
if (!current || typeof current !== 'object' || Array.isArray(current)) return undefined;
Expand Down