Skip to content

refactor(core): dedupe QWEN_CODE_API_TIMEOUT_MS env override logic #3

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

Closed
B-A-M-N wants to merge 1 commit into from
Closed

refactor(core): dedupe QWEN_CODE_API_TIMEOUT_MS env override logic #3

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
61 changes: 29 additions & 32 deletions packages/core/src/models/modelConfigResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,22 +247,7 @@ export function resolveModelConfig(
);

// ---- Env override: QWEN_CODE_API_TIMEOUT_MS ----
// Precedence: modelProvider > env > settings > default (CLI doesn't set timeout)
const modelProviderSetTimeout =
modelProvider?.generationConfig?.timeout !== undefined;
if (!modelProviderSetTimeout) {
const envTimeout = env['QWEN_CODE_API_TIMEOUT_MS'];
if (envTimeout !== undefined) {
const parsed = Number(envTimeout);
if (Number.isFinite(parsed) && parsed > 0) {
generationConfig.timeout = Math.floor(parsed);
sources['timeout'] = {
kind: 'env',
envKey: 'QWEN_CODE_API_TIMEOUT_MS',
};
}
}
}
applyTimeoutEnvOverride(generationConfig, sources, env, modelProvider);

// Build final config
const config: ContentGeneratorConfig = {
Expand Down Expand Up @@ -343,22 +328,7 @@ function resolveQwenOAuthConfig(
);

// ---- Env override: QWEN_CODE_API_TIMEOUT_MS ----
// Precedence: modelProvider > env > settings > default
const modelProviderSetTimeoutOAuth =
modelProvider?.generationConfig?.timeout !== undefined;
if (!modelProviderSetTimeoutOAuth) {
const envTimeoutOAuth = input.env['QWEN_CODE_API_TIMEOUT_MS'];
if (envTimeoutOAuth !== undefined) {
const parsed = Number(envTimeoutOAuth);
if (Number.isFinite(parsed) && parsed > 0) {
generationConfig.timeout = Math.floor(parsed);
sources['timeout'] = {
kind: 'env',
envKey: 'QWEN_CODE_API_TIMEOUT_MS',
};
}
}
}
applyTimeoutEnvOverride(generationConfig, sources, input.env, modelProvider);

const config: ContentGeneratorConfig = {
authType: AuthType.QWEN_OAUTH,
Expand All @@ -371,6 +341,33 @@ function resolveQwenOAuthConfig(
return { config, sources, warnings };
}

/**
* Apply QWEN_CODE_API_TIMEOUT_MS env override to generation config.
* Precedence: modelProvider > env > settings > default.
*/
function applyTimeoutEnvOverride(
generationConfig: Partial<ContentGeneratorConfig>,
sources: ConfigSources,
env: Record<string, string | undefined>,
modelProvider?: ModelProviderConfig,
): void {
const modelProviderSetTimeout =
modelProvider?.generationConfig?.timeout !== undefined;
if (!modelProviderSetTimeout) {
const envTimeout = env['QWEN_CODE_API_TIMEOUT_MS'];
if (envTimeout !== undefined) {
const parsed = Number(envTimeout);
if (Number.isFinite(parsed) && parsed > 0) {
generationConfig.timeout = Math.floor(parsed);
sources['timeout'] = {
kind: 'env',
envKey: 'QWEN_CODE_API_TIMEOUT_MS',
};
}
}
}
}

/**
* Resolve generation config fields (samplingParams, timeout, etc.)
*/
Expand Down
Loading