mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2026-01-08 14:29:15 +08:00
When sending requests to Gemini via proxy, the system returns: "模型不存在或者请求路径错误".
This commit is contained in:
parent
dabfb8dc0e
commit
6829a03437
@ -18,7 +18,7 @@ import { loggerService } from '@renderer/services/LoggerService'
|
|||||||
import store from '@renderer/store'
|
import store from '@renderer/store'
|
||||||
import { isSystemProvider, type Model, type Provider } from '@renderer/types'
|
import { isSystemProvider, type Model, type Provider } from '@renderer/types'
|
||||||
import { formatApiHost } from '@renderer/utils/api'
|
import { formatApiHost } from '@renderer/utils/api'
|
||||||
import { cloneDeep, isEmpty } from 'lodash'
|
import { cloneDeep, trim } from 'lodash'
|
||||||
|
|
||||||
import { aihubmixProviderCreator, newApiResolverCreator, vertexAnthropicProviderCreator } from './config'
|
import { aihubmixProviderCreator, newApiResolverCreator, vertexAnthropicProviderCreator } from './config'
|
||||||
import { getAiSdkProviderId } from './factory'
|
import { getAiSdkProviderId } from './factory'
|
||||||
@ -120,7 +120,7 @@ export function providerToAiSdkConfig(
|
|||||||
|
|
||||||
// 构建基础配置
|
// 构建基础配置
|
||||||
const baseConfig = {
|
const baseConfig = {
|
||||||
baseURL: actualProvider.apiHost,
|
baseURL: trim(actualProvider.apiHost),
|
||||||
apiKey: getRotatedApiKey(actualProvider)
|
apiKey: getRotatedApiKey(actualProvider)
|
||||||
}
|
}
|
||||||
// 处理OpenAI模式
|
// 处理OpenAI模式
|
||||||
@ -195,7 +195,10 @@ export function providerToAiSdkConfig(
|
|||||||
} else if (baseConfig.baseURL.endsWith('/v1')) {
|
} else if (baseConfig.baseURL.endsWith('/v1')) {
|
||||||
baseConfig.baseURL = baseConfig.baseURL.slice(0, -3)
|
baseConfig.baseURL = baseConfig.baseURL.slice(0, -3)
|
||||||
}
|
}
|
||||||
baseConfig.baseURL = isEmpty(baseConfig.baseURL) ? '' : baseConfig.baseURL
|
|
||||||
|
if (baseConfig.baseURL && !baseConfig.baseURL.includes('publishers/google')) {
|
||||||
|
baseConfig.baseURL = `${baseConfig.baseURL}/v1/projects/${project}/locations/${location}/publishers/google`
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 如果AI SDK支持该provider,使用原生配置
|
// 如果AI SDK支持该provider,使用原生配置
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user