fix(core): update API URL handling and improve request URL construction

Author: dingyi222666

packages/openai-compatible/src/config.ts

@@ -51,11 +51,11 @@ export const Config: Schema<Config> = Schema.intersect([
                 Schema.string().role('secret').required(),
                 Schema.string()
                     .description('请求 OpenAI API 的地址')
-                    .default('https://api.openai.com/v1')
+                    .default('https://api.openai.com/v1/')
             ])
         )
             .description('请求地址的 API Key 和请求地址列表')
-            .default([['', 'https://api.openai.com/v1']]),
+            .default([['', 'https://api.openai.com/v1/']]),
         additionCookies: Schema.array(
             Schema.tuple([
                 Schema.string().description('Cookie 名称'),

packages/openai-compatible/src/embedding-model.ts

@@ -54,7 +54,7 @@ export class OpenAICompatibleEmbeddingModel implements EmbeddingModel<string> {
         let providerConfig = this.providerConfig
         const generateResponse = async () => {
             const response = await this.fetch(
-                providerConfig.url('embeddings'),
+                providerConfig.url('/embeddings'),
                 {
                     method: 'POST',
                     headers: Object.assign(

packages/openai-compatible/src/get-latest-models.ts

@@ -32,7 +32,7 @@ export async function getLatestModels(
         }).then((res) => res.text())
 
         try {
-            const models = modelsSchema.parse(JSON.parse(resposeText)).data
+            const models = listModelSchema.parse(JSON.parse(resposeText)).data
 
             return models
                 .filter(
@@ -68,7 +68,7 @@ export async function getLatestModels(
         retries: currentConfig.config.maxRetries,
         maxTimeout: currentConfig.config.timeout,
         onRetry(error, attempt, retryInfo) {
-            console.log(`Retry attempt ${attempt} failed with error: ${error}`)
+            console.error(`Retry attempt ${attempt} failed with error`, error)
             currentConfig.disable()
             currentConfig = pool.getProvider()
         }
@@ -77,13 +77,13 @@ export async function getLatestModels(
     return retry(currentConfig.config)
 }
 
-const modelsSchema = z.object({
-    object: z.literal('list'),
+const listModelSchema = z.object({
+    object: z.literal('list').optional(),
     data: z.array(
         z.object({
             id: z.string(),
-            object: z.literal('model'),
-            owned_by: z.string()
+            object: z.string().optional(),
+            owned_by: z.string().optional()
         })
     )
 })

packages/openai-compatible/src/index.ts

@@ -2,6 +2,7 @@ import { Context } from 'cordis'
 import { Config } from './config.ts'
 import { createOpenAICompatibleProvider } from './provider.ts'
 import type {} from '@cordisjs/plugin-http'
+import { buildRequestUrl } from './utils.ts'
 
 export * from './provider.ts'
 export * from './types.ts'
@@ -37,31 +38,16 @@ export function apply(ctx: Context, config: Config) {
                 return response.data
             },
             'weighted-random',
-            config.apiKeys.map(([apiKey, url]) => ({
+            config.apiKeys.map(([apiKey, baseURL]) => ({
                 apiKey,
-                baseURL: url,
+                baseURL,
                 headers: {
                     Authorization: `Bearer ${apiKey}`,
                     Cookies: config.additionCookies
                         .map(([key, value]) => `${key}=${value}`)
                         .join('; ')
                 },
-                url: (subPath: string) => {
-                    // check has v1
-                    if (url.endsWith('/v1')) {
-                        return url + '/' + subPath
-                    } else if (url.endsWith('/v1/')) {
-                        return url + subPath
-                    }
-
-                    // check has /
-                    if (url.endsWith('/')) {
-                        return url + subPath
-                    }
-
-                    // add /v1
-                    return url + '/v1/' + subPath
-                },
+                url: (subPath: string) => buildRequestUrl(baseURL, subPath),
                 timeout: 300000
             }))
         )

packages/openai-compatible/src/language-model.ts

@@ -111,7 +111,7 @@ export class OpenAICompatibleLanguageModel implements LanguageModel {
         let providerConfig = this.providerConfig
         const generateResponse = async () => {
             const response = await this.fetch(
-                providerConfig.url('chat/completions'),
+                providerConfig.url('/chat/completions'),
                 {
                     method: 'POST',
                     headers: Object.assign(

packages/openai-compatible/src/provider.ts

@@ -15,6 +15,7 @@ import { defaultOpenAIModels } from './types.ts'
 import { getLatestModels } from './get-latest-models.ts'
 import { OpenAICompatibleLanguageModel } from './language-model.ts'
 import { OpenAICompatibleEmbeddingModel } from './embedding-model.ts'
+import { buildRequestUrl } from './utils.ts'
 
 export function createOpenAICompatibleProvider(
     name: string | 'openai-compatible',
@@ -112,29 +113,14 @@ export function createOpenAICompatibleProvider(
     provider.concurrencyLimiter = createConcurrencyLimiter(10)
 
     if (process.env.OPENAI_COMPATIBLE_API_KEY) {
-        const url = process.env.OPENAI_COMPATIBLE_API_URL!
+        const baseURL = process.env.OPENAI_COMPATIBLE_API_URL!
         configPool.addProvider({
             apiKey: process.env.OPENAI_COMPATIBLE_API_KEY,
-            baseURL: url,
+            baseURL,
             headers: {
                 Authorization: `Bearer ${process.env.OPENAI_COMPATIBLE_API_KEY}`
             },
-            url: (subPath: string) => {
-                // check has v1
-                if (url.endsWith('/v1')) {
-                    return url + '/' + subPath
-                } else if (url.endsWith('/v1/')) {
-                    return url + subPath
-                }
-
-                // check has /
-                if (url.endsWith('/')) {
-                    return url + subPath
-                }
-
-                // add /v1
-                return url + '/v1/' + subPath
-            },
+            url: (subPath: string) => buildRequestUrl(baseURL, subPath),
             timeout: 300000
         })
     }

packages/openai-compatible/src/utils.ts

@@ -39,3 +39,24 @@ export function isParsableJson(obj: string) {
         return false
     }
 }
+
+export function buildRequestUrl(baseUrl: string, subPath: string) {
+    const startWithSlash = subPath.startsWith('/')
+
+    const subPathWithoutSlash = !startWithSlash ? subPath : subPath.substring(1)
+
+    // check has v1
+    if (baseUrl.endsWith('/v1')) {
+        return baseUrl + '/' + subPathWithoutSlash
+    } else if (baseUrl.endsWith('/v1/')) {
+        return baseUrl + subPathWithoutSlash
+    }
+
+    // check has /
+    if (baseUrl.endsWith('/')) {
+        return baseUrl + subPathWithoutSlash
+    }
+
+    // add /v1
+    return baseUrl + '/v1/' + subPathWithoutSlash
+}