refactor(shared): request-url util

moeru-ai · Dec 18, 2024 · d1dab26 · d1dab26
1 parent 7f9974b
commit d1dab26
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 18 deletions.
diff --git a/packages/embed/src/utils/embed-many.ts b/packages/embed/src/utils/embed-many.ts
@@ -1,4 +1,4 @@
-import { type CommonRequestOptions, requestBody, requestHeaders } from '@xsai/shared'
+import { type CommonRequestOptions, requestBody, requestHeaders, requestURL } from '@xsai/shared'
 
 import type { EmbedResponse, EmbedResponseUsage } from './embed'
 
@@ -14,7 +14,7 @@ export interface EmbedManyResult {
 }
 
 export const embedMany = async (options: EmbedManyOptions): Promise<EmbedManyResult> =>
-  await (options.fetch ?? globalThis.fetch)(new URL('embeddings', options.baseURL), {
+  await (options.fetch ?? globalThis.fetch)(requestURL('embeddings', options.baseURL), {
     body: requestBody(options),
     headers: requestHeaders({
       'Content-Type': 'application/json',

diff --git a/packages/embed/src/utils/embed.ts b/packages/embed/src/utils/embed.ts
@@ -1,4 +1,4 @@
-import { type CommonRequestOptions, requestBody, requestHeaders } from '@xsai/shared'
+import { type CommonRequestOptions, requestBody, requestHeaders, requestURL } from '@xsai/shared'
 
 export interface EmbedOptions extends CommonRequestOptions {
   [key: string]: unknown
@@ -29,7 +29,7 @@ export interface EmbedResult {
 }
 
 export const embed = async (options: EmbedOptions): Promise<EmbedResult> =>
-  await (options.fetch ?? globalThis.fetch)(new URL('embeddings', options.baseURL), {
+  await (options.fetch ?? globalThis.fetch)(requestURL('embeddings', options.baseURL), {
     body: requestBody(options),
     headers: requestHeaders({
       'Content-Type': 'application/json',

diff --git a/packages/generate-speech/src/index.ts b/packages/generate-speech/src/index.ts
@@ -1,4 +1,4 @@
-import { type CommonRequestOptions, requestBody, requestHeaders } from '@xsai/shared'
+import { type CommonRequestOptions, requestBody, requestHeaders, requestURL } from '@xsai/shared'
 
 export interface GenerateSpeechOptions extends CommonRequestOptions {
   [key: string]: unknown
@@ -16,7 +16,7 @@ export interface GenerateSpeechOptions extends CommonRequestOptions {
  * @returns audio array buffer
  */
 export const generateSpeech = async (options: GenerateSpeechOptions): Promise<ArrayBuffer> =>
-  await (options.fetch ?? globalThis.fetch)(new URL('audio/speech', options.baseURL), {
+  await (options.fetch ?? globalThis.fetch)(requestURL('audio/speech', options.baseURL), {
     body: requestBody(options),
     headers: requestHeaders({
       'Content-Type': 'application/json',

diff --git a/packages/generate-transcription/src/index.ts b/packages/generate-transcription/src/index.ts
@@ -1,4 +1,4 @@
-import { type CommonRequestOptions, requestHeaders } from '@xsai/shared'
+import { type CommonRequestOptions, requestHeaders, requestURL } from '@xsai/shared'
 
 export interface GenerateTranscriptionOptions extends CommonRequestOptions {
   file: Blob
@@ -24,7 +24,7 @@ export const generateTranscription = async (options: GenerateTranscriptionOption
   body.append('model', options.model)
   body.append('file', options.file, options.fileName)
 
-  return await (options.fetch ?? globalThis.fetch)(new URL('audio/transcriptions', options.baseURL), {
+  return await (options.fetch ?? globalThis.fetch)(requestURL('audio/transcriptions', options.baseURL), {
     body,
     headers: requestHeaders(options.headers, options.apiKey),
     method: 'POST',

diff --git a/packages/model/src/utils/list-models.ts b/packages/model/src/utils/list-models.ts
@@ -1,4 +1,4 @@
-import { type CommonRequestOptions, requestHeaders } from '@xsai/shared'
+import { type CommonRequestOptions, requestHeaders, requestURL } from '@xsai/shared'
 
 import type { Model } from '../types/model'
 
@@ -10,7 +10,7 @@ export interface ListModelsResponse {
 }
 
 export const listModels = async (options: ListModelsOptions): Promise<Model[]> =>
-  await (options.fetch ?? globalThis.fetch)(new URL('models', options.baseURL), {
+  await (options.fetch ?? globalThis.fetch)(requestURL('models', options.baseURL), {
     headers: requestHeaders({
       'Content-Type': 'application/json',
       ...options.headers,

diff --git a/packages/model/src/utils/retrieve-model.ts b/packages/model/src/utils/retrieve-model.ts
@@ -1,11 +1,11 @@
-import { type CommonRequestOptions, requestHeaders } from '@xsai/shared'
+import { type CommonRequestOptions, requestHeaders, requestURL } from '@xsai/shared'
 
 import type { Model } from '../types/model'
 
 export interface RetrieveModelOptions extends CommonRequestOptions {}
 
 export const retrieveModel = async (options: RetrieveModelOptions): Promise<Model> =>
-  await (options.fetch ?? globalThis.fetch)(new URL(`models/${options.model}`, options.baseURL), {
+  await (options.fetch ?? globalThis.fetch)(requestURL(`models/${options.model}`, options.baseURL), {
     headers: requestHeaders({
       'Content-Type': 'application/json',
       ...options.headers,

diff --git a/packages/shared-chat/src/utils/chat.ts b/packages/shared-chat/src/utils/chat.ts
@@ -1,9 +1,9 @@
-import { requestBody, requestHeaders } from '@xsai/shared'
+import { requestBody, requestHeaders, requestURL } from '@xsai/shared'
 
 import type { ChatOptions, Tool } from '../types'
 
 export const chat = async <T extends ChatOptions>(options: T) =>
-  await (options.fetch ?? globalThis.fetch)(new URL('chat/completions', options.baseURL), {
+  await (options.fetch ?? globalThis.fetch)(requestURL('chat/completions', options.baseURL), {
     body: requestBody({
       ...options,
       tools: (options.tools as Tool[] | undefined)?.map(tool => ({

diff --git a/packages/shared/src/types/common-request-options.ts b/packages/shared/src/types/common-request-options.ts
@@ -1,10 +1,7 @@
 export interface CommonRequestOptions {
   abortSignal?: AbortSignal
   apiKey?: string
-  /**
-   * @example `https://openai.com/v1/`
-   * @remarks make sure the baseURL ends with a slash.
-   */
+  /** @example `https://openai.com/v1/` */
   baseURL: string | URL
   fetch?: typeof globalThis.fetch
   /** @default `undefined` */

diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts
@@ -2,3 +2,4 @@ export { objCamelToSnake, strCamelToSnake } from './case'
 export { clean } from './clean'
 export { requestBody } from './request-body'
 export { requestHeaders } from './request-headers'
+export { requestURL } from './request-url'
diff --git a/packages/shared/src/utils/request-url.ts b/packages/shared/src/utils/request-url.ts
@@ -0,0 +1,5 @@
+export const requestURL = (path: string, baseURL: string | URL) => {
+  const base = baseURL.toString()
+
+  return new URL(path, base.endsWith('/') ? base : `${base}/`)
+}