@cloudbase/ai 2.7.16-beta.0 → 2.7.18-beta.0

package/src/index.ts

@@ -1,6 +1,7 @@
 import type { ICloudbase } from '@cloudbase/types'
 import type { ICloudbaseComponent } from '@cloudbase/types/component'
 import type { SDKRequestInterface } from '@cloudbase/adapter-interface'
+import { Bot } from './bot'
 import * as models from './models'
 import * as types from './type'
 import * as utils from './utils'
@@ -8,9 +9,29 @@ import * as utils from './utils'
 const { MODELS, ...restModels } = models
 
 class AI {
-  constructor(private req: SDKRequestInterface, public baseUrl: string) {}
+  public aiBaseUrl: string
+  public aiBotBaseUrl: string
+  public bot: Bot
 
-  request: types.ModelReq = async ({ url, data, headers, stream }) => (
+  constructor(private req: SDKRequestInterface, public baseUrl: string) {
+    this.aiBaseUrl = `${baseUrl}/ai`
+    this.aiBotBaseUrl = `${baseUrl}/aibot`
+    this.bot = new Bot(this.botRequest, this.aiBotBaseUrl)
+  }
+
+  createModel<T extends keyof typeof MODELS>(model: T) {
+    return new MODELS[model](this.modelRequest, this.aiBaseUrl) as InstanceType<(typeof MODELS)[T]>
+  }
+
+  registerModel(name: string, model: types.ChatModelConstructor) {
+    if (MODELS[name] != null) {
+      console.warn(`AI model ${name} already exists!`)
+      return
+    }
+    MODELS[name] = model
+  }
+
+  modelRequest: types.ModelReq = async ({ url, data, headers, stream }) => (
     await this.req.fetch({
       method: 'post',
       headers: {
@@ -22,16 +43,26 @@ class AI {
     })
   ).data
 
-  createModel<T extends keyof typeof MODELS>(model: T) {
-    return new MODELS[model](this.request, this.baseUrl) as InstanceType<(typeof MODELS)[T]>
-  }
+  botRequest: types.BotReq = async ({ method, url, data = {}, headers, stream }) => {
+    if (method === 'get') {
+      return (await this.req.fetch({ url: `${url}?${objectToParam(data)}`, method, headers, stream })).data
+    }
 
-  registerModel(name: string, model: types.ChatModelConstructor) {
-    if (MODELS[name] != null) {
-      console.warn(`AI model ${name} already exists!`)
-      return
+    return (
+      await this.req.fetch({
+        url,
+        body: JSON.stringify(data),
+        headers: { 'Content-Type': 'application/json', ...headers },
+        stream,
+        method,
+      })
+    ).data
+
+    function objectToParam(obj: Object) {
+      return Object.entries(obj)
+        .map(([key, value]) => `${key}=${value}`)
+        .join('&')
     }
-    MODELS[name] = model
   }
 }
 
@@ -39,7 +70,6 @@ const COMPONENT_NAME = 'ai'
 
 interface AIInitOption {
   env?: string
-  region?: string
   baseUrl?: string
 }
 
@@ -55,8 +85,7 @@ async function ai(this: ICloudbase, options?: AIInitOption) {
     : { accessToken: '', env: '' }
 
   const env = options?.env ?? accessTokenFromAuth.env
-  const region = options?.region ?? 'ap-shanghai'
-  const baseUrl = options?.baseUrl ?? `https://${env}.${region}.api.tcloudbasegateway.com/v1/ai`
+  const baseUrl = options?.baseUrl ?? `https://${env}.api.tcloudbasegateway.com/v1`
 
   return new AI(req, baseUrl)
 }
@@ -74,4 +103,4 @@ function registerAi(app: ICloudbase) {
   }
 }
 
-export { types, utils, restModels as models, registerAi, AI }
+export { types, utils, restModels as models, registerAi, AI, Bot }

package/src/models/Ark/index.ts

@@ -76,7 +76,9 @@ class ArkModelStreamResult implements StreamTextResult {
           const data = JSON.parse(chunk.data) as ArkStreamTextOutput
           controller.enqueue(data)
         } catch (e) {
-          console.warn('Error when transforming event source data to json', e)
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
         }
       },
     }),),)

package/src/models/DashScope/index.ts

@@ -76,7 +76,9 @@ class DashScopeModelStreamResult implements StreamTextResult {
           const data = JSON.parse(chunk.data) as DashScopeStreamTextOutput
           controller.enqueue(data)
         } catch (e) {
-          console.warn('Error when transforming event source data to json', e)
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
         }
       },
     }),),)

package/src/models/HunYuan/index.ts

@@ -94,7 +94,9 @@ class HunyuanModelStreamResult implements StreamTextResult {
           const data = JSON.parse(chunk.data) as HunYaunStreamTextOutput
           controller.enqueue(data)
         } catch (e) {
-          console.warn('Error when transforming event source data to json', e)
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
         }
       },
     }),),)

package/src/models/HunYuanBeta/index.ts

@@ -94,7 +94,9 @@ class HunyuanModelStreamResult implements StreamTextResult {
           const data = JSON.parse(chunk.data) as HunYaunStreamTextOutput
           controller.enqueue(data)
         } catch (e) {
-          console.warn('Error when transforming event source data to json', e)
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
         }
       },
     }),),)

package/src/models/Moonshot/index.ts

@@ -76,7 +76,9 @@ class MoonshotModelStreamResult implements StreamTextResult {
           const data = JSON.parse(chunk.data) as MoonshotStreamTextOutput
           controller.enqueue(data)
         } catch (e) {
-          console.warn('Error when transforming event source data to json', e)
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
         }
       },
     }),),)

package/src/models/Yi/index.ts

@@ -76,7 +76,9 @@ class YiModelStreamResult implements StreamTextResult {
           const data = JSON.parse(chunk.data) as YiStreamTextOutput
           controller.enqueue(data)
         } catch (e) {
-          console.warn('Error when transforming event source data to json', e)
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
         }
       },
     }),),)

package/src/models/ZhiPu/index.ts

@@ -76,7 +76,9 @@ class ZhiPuModelStreamResult implements StreamTextResult {
           const data = JSON.parse(chunk.data) as ZhiPuStreamTextOutput
           controller.enqueue(data)
         } catch (e) {
-          console.warn('Error when transforming event source data to json', e)
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
         }
       },
     }),),)

package/src/type.ts

@@ -29,6 +29,18 @@ export type ModelReq = <T extends IModelReqInput>(
   props: T,
 ) => T['stream'] extends true ? Promise<ReadableStream<Uint8Array>> : Promise<Object>
 
+export interface IBotReqInput {
+  url: string
+  method: string
+  headers?: Record<string, string>
+  data?: Object
+  stream?: boolean
+}
+
+export type BotReq = <T extends IBotReqInput>(
+  props: T,
+) => T['stream'] extends true ? Promise<ReadableStream<Uint8Array>> : Promise<Object>
+
 type ChatModelMessage = {
   role: 'user' | 'system' | 'assistant'
   content: string

package/src/utils.ts

@@ -2,6 +2,7 @@ import { TransformStream as _TransformStream, ReadableStream as _ReadableStream
 import { createReadableStreamWrapper } from '@mattiasbuelens/web-streams-adapter'
 import { createParser, type EventSourceParser, type ParsedEvent } from 'eventsource-parser'
 import type { AsyncIterableReadableStream } from './type'
+import { TextDecoder } from 'text-encoding-shim'
 
 export const ReadableStream = _ReadableStream as {
   prototype: ReadableStream