mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-04-28 03:30:40 +00:00
f6271c61b6
* feat(auth): discontinue Qwen OAuth free tier (2026-04-15 cutoff) The Qwen OAuth free tier has reached its end-of-life date. This updates all client-side messaging, blocks new OAuth signups, and guides existing users to alternative providers. * fix(test): add getModelsConfig mock and update QWEN_OAUTH test expectations - Add getModelsConfig() to Config mocks in gemini.test.tsx (3 failures) - Update validateNonInterActiveAuth test to expect exit for QWEN_OAUTH since validateAuthMethod now returns an error for discontinued free tier
114 lines
3.4 KiB
TypeScript
114 lines
3.4 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2025 Qwen
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import type { WebSearchProviderConfig } from '@qwen-code/qwen-code-core';
|
|
import type { Settings } from './settings.js';
|
|
|
|
/**
|
|
* CLI arguments related to web search configuration
|
|
*/
|
|
export interface WebSearchCliArgs {
|
|
tavilyApiKey?: string;
|
|
googleApiKey?: string;
|
|
googleSearchEngineId?: string;
|
|
webSearchDefault?: string;
|
|
}
|
|
|
|
/**
|
|
* Web search configuration structure
|
|
*/
|
|
export interface WebSearchConfig {
|
|
provider: WebSearchProviderConfig[];
|
|
default: string;
|
|
}
|
|
|
|
/**
|
|
* Build webSearch configuration from multiple sources with priority:
|
|
* 1. settings.json (new format) - highest priority
|
|
* 2. Command line args + environment variables
|
|
* 3. Legacy tavilyApiKey (backward compatibility)
|
|
*
|
|
* @param argv - Command line arguments
|
|
* @param settings - User settings from settings.json
|
|
* @param authType - Authentication type (e.g., 'qwen-oauth')
|
|
* @returns WebSearch configuration or undefined if no providers available
|
|
*/
|
|
export function buildWebSearchConfig(
|
|
argv: WebSearchCliArgs,
|
|
settings: Settings,
|
|
_authType?: string,
|
|
): WebSearchConfig | undefined {
|
|
// Step 1: Collect providers from settings or command line/env
|
|
let providers: WebSearchProviderConfig[] = [];
|
|
let userDefault: string | undefined;
|
|
|
|
if (settings.webSearch) {
|
|
// Use providers from settings.json
|
|
providers = [...settings.webSearch.provider];
|
|
userDefault = settings.webSearch.default;
|
|
} else {
|
|
// Build providers from command line args and environment variables
|
|
const tavilyKey =
|
|
argv.tavilyApiKey ||
|
|
settings.advanced?.tavilyApiKey ||
|
|
process.env['TAVILY_API_KEY'];
|
|
if (tavilyKey) {
|
|
providers.push({
|
|
type: 'tavily',
|
|
apiKey: tavilyKey,
|
|
} as WebSearchProviderConfig);
|
|
}
|
|
|
|
const googleKey = argv.googleApiKey || process.env['GOOGLE_API_KEY'];
|
|
const googleEngineId =
|
|
argv.googleSearchEngineId || process.env['GOOGLE_SEARCH_ENGINE_ID'];
|
|
if (googleKey && googleEngineId) {
|
|
providers.push({
|
|
type: 'google',
|
|
apiKey: googleKey,
|
|
searchEngineId: googleEngineId,
|
|
} as WebSearchProviderConfig);
|
|
}
|
|
}
|
|
|
|
// Step 2: DashScope auto-injection for qwen-oauth was removed when the
|
|
// free tier was discontinued on 2026-04-15. Users who explicitly configure
|
|
// a dashscope provider in settings.json still get it (handled in Step 1).
|
|
|
|
// Step 3: If no providers available, return undefined
|
|
if (providers.length === 0) {
|
|
return undefined;
|
|
}
|
|
|
|
// Step 4: Determine default provider
|
|
// Priority: user explicit config > CLI arg > first available provider (tavily > google > dashscope)
|
|
const providerPriority: Array<'tavily' | 'google' | 'dashscope'> = [
|
|
'tavily',
|
|
'google',
|
|
'dashscope',
|
|
];
|
|
|
|
// Determine default provider based on availability
|
|
let defaultProvider = userDefault || argv.webSearchDefault;
|
|
if (!defaultProvider) {
|
|
// Find first available provider by priority order
|
|
for (const providerType of providerPriority) {
|
|
if (providers.some((p) => p.type === providerType)) {
|
|
defaultProvider = providerType;
|
|
break;
|
|
}
|
|
}
|
|
// Fallback to first available provider if none found in priority list
|
|
if (!defaultProvider) {
|
|
defaultProvider = providers[0]?.type || 'dashscope';
|
|
}
|
|
}
|
|
|
|
return {
|
|
provider: providers,
|
|
default: defaultProvider,
|
|
};
|
|
}
|