fix: 修复模型的问题
This commit is contained in:
parent
c3af45023d
commit
86df024e75
|
|
@ -24,7 +24,7 @@ import { getModelStrings, resolveOverriddenModel } from './modelStrings.js'
|
||||||
import { formatModelPricing, getOpus46CostTier } from '../modelCost.js'
|
import { formatModelPricing, getOpus46CostTier } from '../modelCost.js'
|
||||||
import { getSettings_DEPRECATED } from '../settings/settings.js'
|
import { getSettings_DEPRECATED } from '../settings/settings.js'
|
||||||
import type { PermissionMode } from '../permissions/PermissionMode.js'
|
import type { PermissionMode } from '../permissions/PermissionMode.js'
|
||||||
import { getAPIProvider } from './providers.js'
|
import { getAPIProvider, isFirstPartyAnthropicBaseUrl } from './providers.js'
|
||||||
import { LIGHTNING_BOLT } from '../../constants/figures.js'
|
import { LIGHTNING_BOLT } from '../../constants/figures.js'
|
||||||
import { isModelAllowed } from './modelAllowlist.js'
|
import { isModelAllowed } from './modelAllowlist.js'
|
||||||
import { type ModelAlias, isModelAlias } from './aliases.js'
|
import { type ModelAlias, isModelAlias } from './aliases.js'
|
||||||
|
|
@ -360,7 +360,8 @@ export function isOpus1mMergeEnabled(): boolean {
|
||||||
if (
|
if (
|
||||||
is1mContextDisabled() ||
|
is1mContextDisabled() ||
|
||||||
isProSubscriber() ||
|
isProSubscriber() ||
|
||||||
getAPIProvider() !== 'firstParty'
|
getAPIProvider() !== 'firstParty' ||
|
||||||
|
!isFirstPartyAnthropicBaseUrl()
|
||||||
) {
|
) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user