diff --git a/packages/shared/api/index.ts b/packages/shared/api/index.ts index 0cf652b427..5ee19611d8 100644 --- a/packages/shared/api/index.ts +++ b/packages/shared/api/index.ts @@ -53,12 +53,16 @@ export function formatAzureOpenAIApiHost(host: string): string { return formatApiHost(normalizedHost + '/openai', false) } -export function formatVertexApiHost(provider: MinimalProvider, project: string, location: string): string { +export function formatVertexApiHost( + provider: MinimalProvider, + project: string = 'test-project', + location: string = 'us-central1' +): string { const { apiHost } = provider const trimmedHost = withoutTrailingSlash(trim(apiHost)) if (!trimmedHost || trimmedHost.endsWith('aiplatform.googleapis.com')) { const host = - location == 'global' ? 'https://aiplatform.googleapis.com' : `https://${location}-aiplatform.googleapis.com` + location === 'global' ? 'https://aiplatform.googleapis.com' : `https://${location}-aiplatform.googleapis.com` return `${formatApiHost(host)}/projects/${project}/locations/${location}` } return formatApiHost(trimmedHost) diff --git a/packages/shared/provider/config/helper.ts b/packages/shared/provider/config/helper.ts index 4e821a6c8f..95f53f885a 100644 --- a/packages/shared/provider/config/helper.ts +++ b/packages/shared/provider/config/helper.ts @@ -18,11 +18,11 @@ export const endpointIs = * @param provider 原始provider对象 * @returns 解析出的provider对象 */ -export function provider2Provider< - M extends MinimalModel, - R extends MinimalProvider, - P extends R = R ->(ruleSet: RuleSet, model: M, provider: P): P { +export function provider2Provider( + ruleSet: RuleSet, + model: M, + provider: P +): P { for (const rule of ruleSet.rules) { if (rule.match(model)) { return rule.provider(provider) as P diff --git a/packages/shared/provider/resolve.ts b/packages/shared/provider/resolve.ts index 9055a36c6e..385da6a586 100644 --- a/packages/shared/provider/resolve.ts +++ b/packages/shared/provider/resolve.ts @@ -25,8 +25,7 @@ export function resolveActualProvider