sdaduanbilei/cc-haha
1
0
Fork 0
mirror of https://github.com/NanmiCoder/cc-haha synced 2026-07-18 13:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #902 from zhbdesign/patch-7

Browse Source 
修复第三方API在响应中返回的model与请求的modelid不一致导致上下文显示200000
This commit is contained in:
程序员阿江-Relakkes 2026-07-02 15:44:01 +08:00 committed by GitHub
commit 8508f8588b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/server/services/sessionService.ts
View File

@ -1413,17 +1413,52 @@ export class SessionService {
if (activeId) providerIds.push(activeId)
}
// Provider env model keys — these are the configured model names that
// should be used as fallback matching keys when the transcript model name
// (from the API response) doesn't match the modelContextWindows keys.
// Third-party APIs may return model names with provider-specific suffixes
// (e.g. "LongCat-2.0-Preview-LongCatAI" instead of "LongCat-2.0-Preview").
const providerEnvModelKeys = [
'ANTHROPIC_MODEL',
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
'ANTHROPIC_DEFAULT_SONNET_MODEL',
'ANTHROPIC_DEFAULT_OPUS_MODEL',
] as const
for (const providerId of providerIds) {
const env = await this.providerService.getProviderRuntimeEnv(providerId).catch(() => null)
const rawContextWindows = env?.[MODEL_CONTEXT_WINDOWS_ENV_KEY] ?? null
// Step 1: Try matching the transcript model name directly (current behavior)
const contextWindow = getModelContextWindowFromEnvValue(
model,
env?.[MODEL_CONTEXT_WINDOWS_ENV_KEY],
rawContextWindows,
)
if (contextWindow !== undefined) {
if (contextWindow > MODEL_CONTEXT_WINDOW_DEFAULT && is1mContextDisabled()) {
return MODEL_CONTEXT_WINDOW_DEFAULT
}
return contextWindow
}
// Step 2: If transcript model name didn't match, try matching with
// the provider's configured model names as fallback keys.
// This handles the case where the API response returns a model name
// that differs from the user-configured model name (e.g. provider
// appends its own suffix like "-LongCatAI").
if (env && rawContextWindows) {
for (const envKey of providerEnvModelKeys) {
const configuredModel = env[envKey]
if (!configuredModel) continue
const fallbackWindow = getModelContextWindowFromEnvValue(
configuredModel,
rawContextWindows,
)
if (fallbackWindow !== undefined) {
if (fallbackWindow > MODEL_CONTEXT_WINDOW_DEFAULT && is1mContextDisabled()) {
return MODEL_CONTEXT_WINDOW_DEFAULT
}
return fallbackWindow
}
}
}
}
@ -1437,15 +1472,40 @@ export class SessionService {
private async getUniqueSavedProviderContextWindow(model: string): Promise<number | undefined> {
const { providers } = await this.providerService.listProviders().catch(() => ({ providers: [] }))
const matches: number[] = []
const providerEnvModelKeys = [
'ANTHROPIC_MODEL',
'ANTHROPIC_DEFAULT_HAIKU_MODEL',
'ANTHROPIC_DEFAULT_SONNET_MODEL',
'ANTHROPIC_DEFAULT_OPUS_MODEL',
] as const
for (const provider of providers) {
const env = await this.providerService.getProviderRuntimeEnv(provider.id).catch(() => null)
const contextWindow = getModelContextWindowFromEnvValue(
const rawContextWindows = env?.[MODEL_CONTEXT_WINDOWS_ENV_KEY] ?? null
// Step 1: Try matching the transcript model name directly
const contextWindow = getModelContextWindowFromEnvValue(
model,
env?.[MODEL_CONTEXT_WINDOWS_ENV_KEY],
rawContextWindows,
)
if (contextWindow !== undefined) {
matches.push(contextWindow)
continue
}
// Step 2: Fallback — try matching with provider's configured model names
if (env && rawContextWindows) {
for (const envKey of providerEnvModelKeys) {
const configuredModel = env[envKey]
if (!configuredModel) continue
const fallbackWindow = getModelContextWindowFromEnvValue(
configuredModel,
rawContextWindows,
)
if (fallbackWindow !== undefined) {
matches.push(fallbackWindow)
break // One match per provider is enough
}
}
}
}