mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2026-01-08 06:19:05 +08:00
fix: add Perplexity provider support and update API host formatting (#11162)
* feat: add Perplexity provider support and update API host formatting - Introduced `isPerplexityProvider` function to identify Perplexity providers. - Updated `formatProviderApiHost` to handle Perplexity provider API host formatting. - Added unit tests for Perplexity provider configuration to ensure correct API host formatting behavior. * fix: add 'perplexity' to unsupported API version providers list
This commit is contained in:
parent
1103449a4f
commit
83e4d4363f
@ -39,6 +39,7 @@ vi.mock('@renderer/config/providers', async (importOriginal) => {
|
|||||||
return {
|
return {
|
||||||
...actual,
|
...actual,
|
||||||
isCherryAIProvider: vi.fn(),
|
isCherryAIProvider: vi.fn(),
|
||||||
|
isPerplexityProvider: vi.fn(),
|
||||||
isAnthropicProvider: vi.fn(() => false),
|
isAnthropicProvider: vi.fn(() => false),
|
||||||
isAzureOpenAIProvider: vi.fn(() => false),
|
isAzureOpenAIProvider: vi.fn(() => false),
|
||||||
isGeminiProvider: vi.fn(() => false),
|
isGeminiProvider: vi.fn(() => false),
|
||||||
@ -52,7 +53,7 @@ vi.mock('@renderer/hooks/useVertexAI', () => ({
|
|||||||
createVertexProvider: vi.fn()
|
createVertexProvider: vi.fn()
|
||||||
}))
|
}))
|
||||||
|
|
||||||
import { isCherryAIProvider } from '@renderer/config/providers'
|
import { isCherryAIProvider, isPerplexityProvider } from '@renderer/config/providers'
|
||||||
import { getProviderByModel } from '@renderer/services/AssistantService'
|
import { getProviderByModel } from '@renderer/services/AssistantService'
|
||||||
import type { Model, Provider } from '@renderer/types'
|
import type { Model, Provider } from '@renderer/types'
|
||||||
import { formatApiHost } from '@renderer/utils/api'
|
import { formatApiHost } from '@renderer/utils/api'
|
||||||
@ -97,6 +98,16 @@ const createCherryAIProvider = (): Provider => ({
|
|||||||
isSystem: false
|
isSystem: false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const createPerplexityProvider = (): Provider => ({
|
||||||
|
id: 'perplexity',
|
||||||
|
type: 'openai',
|
||||||
|
name: 'Perplexity',
|
||||||
|
apiKey: 'test-key',
|
||||||
|
apiHost: 'https://api.perplexity.ai',
|
||||||
|
models: [],
|
||||||
|
isSystem: false
|
||||||
|
})
|
||||||
|
|
||||||
describe('Copilot responses routing', () => {
|
describe('Copilot responses routing', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
;(globalThis as any).window = {
|
;(globalThis as any).window = {
|
||||||
@ -195,3 +206,70 @@ describe('CherryAI provider configuration', () => {
|
|||||||
expect(actualProvider.apiHost).toBe('')
|
expect(actualProvider.apiHost).toBe('')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe('Perplexity provider configuration', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
;(globalThis as any).window = {
|
||||||
|
...(globalThis as any).window,
|
||||||
|
keyv: createWindowKeyv()
|
||||||
|
}
|
||||||
|
vi.clearAllMocks()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('formats Perplexity provider apiHost with false parameter', () => {
|
||||||
|
const provider = createPerplexityProvider()
|
||||||
|
const model = createModel('sonar', 'Sonar', 'perplexity')
|
||||||
|
|
||||||
|
// Mock the functions to simulate Perplexity provider detection
|
||||||
|
vi.mocked(isCherryAIProvider).mockReturnValue(false)
|
||||||
|
vi.mocked(isPerplexityProvider).mockReturnValue(true)
|
||||||
|
vi.mocked(getProviderByModel).mockReturnValue(provider)
|
||||||
|
|
||||||
|
// Call getActualProvider which should trigger formatProviderApiHost
|
||||||
|
const actualProvider = getActualProvider(model)
|
||||||
|
|
||||||
|
// Verify that formatApiHost was called with false as the second parameter
|
||||||
|
expect(formatApiHost).toHaveBeenCalledWith('https://api.perplexity.ai', false)
|
||||||
|
expect(actualProvider.apiHost).toBe('https://api.perplexity.ai')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('does not format non-Perplexity provider with false parameter', () => {
|
||||||
|
const provider = {
|
||||||
|
id: 'openai',
|
||||||
|
type: 'openai',
|
||||||
|
name: 'OpenAI',
|
||||||
|
apiKey: 'test-key',
|
||||||
|
apiHost: 'https://api.openai.com',
|
||||||
|
models: [],
|
||||||
|
isSystem: false
|
||||||
|
} as Provider
|
||||||
|
const model = createModel('gpt-4', 'GPT-4', 'openai')
|
||||||
|
|
||||||
|
// Mock the functions to simulate non-Perplexity provider
|
||||||
|
vi.mocked(isCherryAIProvider).mockReturnValue(false)
|
||||||
|
vi.mocked(isPerplexityProvider).mockReturnValue(false)
|
||||||
|
vi.mocked(getProviderByModel).mockReturnValue(provider)
|
||||||
|
|
||||||
|
// Call getActualProvider
|
||||||
|
const actualProvider = getActualProvider(model)
|
||||||
|
|
||||||
|
// Verify that formatApiHost was called with default parameters (true)
|
||||||
|
expect(formatApiHost).toHaveBeenCalledWith('https://api.openai.com')
|
||||||
|
expect(actualProvider.apiHost).toBe('https://api.openai.com/v1')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('handles Perplexity provider with empty apiHost', () => {
|
||||||
|
const provider = createPerplexityProvider()
|
||||||
|
provider.apiHost = ''
|
||||||
|
const model = createModel('sonar', 'Sonar', 'perplexity')
|
||||||
|
|
||||||
|
vi.mocked(isCherryAIProvider).mockReturnValue(false)
|
||||||
|
vi.mocked(isPerplexityProvider).mockReturnValue(true)
|
||||||
|
vi.mocked(getProviderByModel).mockReturnValue(provider)
|
||||||
|
|
||||||
|
const actualProvider = getActualProvider(model)
|
||||||
|
|
||||||
|
expect(formatApiHost).toHaveBeenCalledWith('', false)
|
||||||
|
expect(actualProvider.apiHost).toBe('')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
@ -11,7 +11,8 @@ import {
|
|||||||
isAzureOpenAIProvider,
|
isAzureOpenAIProvider,
|
||||||
isCherryAIProvider,
|
isCherryAIProvider,
|
||||||
isGeminiProvider,
|
isGeminiProvider,
|
||||||
isNewApiProvider
|
isNewApiProvider,
|
||||||
|
isPerplexityProvider
|
||||||
} from '@renderer/config/providers'
|
} from '@renderer/config/providers'
|
||||||
import {
|
import {
|
||||||
getAwsBedrockAccessKeyId,
|
getAwsBedrockAccessKeyId,
|
||||||
@ -103,6 +104,8 @@ function formatProviderApiHost(provider: Provider): Provider {
|
|||||||
formatted.apiHost = formatVertexApiHost(formatted)
|
formatted.apiHost = formatVertexApiHost(formatted)
|
||||||
} else if (isCherryAIProvider(formatted)) {
|
} else if (isCherryAIProvider(formatted)) {
|
||||||
formatted.apiHost = formatApiHost(formatted.apiHost, false)
|
formatted.apiHost = formatApiHost(formatted.apiHost, false)
|
||||||
|
} else if (isPerplexityProvider(formatted)) {
|
||||||
|
formatted.apiHost = formatApiHost(formatted.apiHost, false)
|
||||||
} else {
|
} else {
|
||||||
formatted.apiHost = formatApiHost(formatted.apiHost)
|
formatted.apiHost = formatApiHost(formatted.apiHost)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1490,6 +1490,10 @@ export function isCherryAIProvider(provider: Provider): boolean {
|
|||||||
return provider.id === 'cherryai'
|
return provider.id === 'cherryai'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function isPerplexityProvider(provider: Provider): boolean {
|
||||||
|
return provider.id === 'perplexity'
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 判断是否为 OpenAI 兼容的提供商
|
* 判断是否为 OpenAI 兼容的提供商
|
||||||
* @param {Provider} provider 提供商对象
|
* @param {Provider} provider 提供商对象
|
||||||
@ -1515,7 +1519,7 @@ export function isGeminiProvider(provider: Provider): boolean {
|
|||||||
return provider.type === 'gemini'
|
return provider.type === 'gemini'
|
||||||
}
|
}
|
||||||
|
|
||||||
const NOT_SUPPORT_API_VERSION_PROVIDERS = ['github', 'copilot'] as const satisfies SystemProviderId[]
|
const NOT_SUPPORT_API_VERSION_PROVIDERS = ['github', 'copilot', 'perplexity'] as const satisfies SystemProviderId[]
|
||||||
|
|
||||||
export const isSupportAPIVersionProvider = (provider: Provider) => {
|
export const isSupportAPIVersionProvider = (provider: Provider) => {
|
||||||
if (isSystemProvider(provider)) {
|
if (isSystemProvider(provider)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user