@cloudbase/ai 2.11.0 → 2.12.1

package/src/models/HunYuanBeta/index.ts

@@ -12,6 +12,7 @@ import type {
   DoStreamOutput,
   BaseDoStreamOutputChunk,
   DoGenerateOutput,
+  ReqOptions,
 } from '../../type'
 import { processInput } from '../HunYuan/util'
 import { HunYuanGenerateTextOutput, HunYuanStreamTextOutput } from '../HunYuan/type'
@@ -28,7 +29,7 @@ export class HunYuanBetaSimpleModel implements SimpleChatModel {
     return `${this.baseUrl}/${this.subUrl}`
   }
 
-  public async doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput> {
+  public async doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput> {
     const res = (await this.req({
       url: this.url,
       data: {
@@ -36,11 +37,12 @@ export class HunYuanBetaSimpleModel implements SimpleChatModel {
         stream: false,
       },
       stream: false,
+      timeout: options?.timeout,
     })) as HunYuanGenerateTextOutput
     return { ...res, rawResponse: res }
   }
 
-  public async doStream(data: BaseChatModelInput): Promise<DoStreamOutput> {
+  public async doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput> {
     let isToolCall: null | boolean = null
 
     const _stream = await this.req({
@@ -50,6 +52,7 @@ export class HunYuanBetaSimpleModel implements SimpleChatModel {
         stream: true,
       },
       stream: true,
+      timeout: options?.timeout,
     })
     const stream = toPolyfillReadable(_stream) as typeof _stream
 

package/src/models/HunYuanOpen/index.ts

@@ -12,6 +12,7 @@ import type {
   DoStreamOutput,
   BaseDoStreamOutputChunk,
   DoGenerateOutput,
+  ReqOptions,
 } from '../../type'
 import { processInput } from '../HunYuan/util'
 import { HunYuanGenerateTextOutput, HunYuanStreamTextOutput } from '../HunYuan/type'
@@ -28,7 +29,7 @@ export class HunYuanOpenSimpleModel implements SimpleChatModel {
     return `${this.baseUrl}/${this.subUrl}`
   }
 
-  public async doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput> {
+  public async doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput> {
     const res = (await this.req({
       url: this.url,
       data: {
@@ -36,11 +37,12 @@ export class HunYuanOpenSimpleModel implements SimpleChatModel {
         stream: false,
       },
       stream: false,
+      timeout: options?.timeout,
     })) as HunYuanGenerateTextOutput
     return { ...res, rawResponse: res }
   }
 
-  public async doStream(data: BaseChatModelInput): Promise<DoStreamOutput> {
+  public async doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput> {
     let isToolCall: null | boolean = null
 
     const _stream = await this.req({
@@ -50,6 +52,7 @@ export class HunYuanOpenSimpleModel implements SimpleChatModel {
         stream: true,
       },
       stream: true,
+      timeout: options?.timeout,
     })
     const stream = toPolyfillReadable(_stream) as typeof _stream
 

package/src/models/Moonshot/index.ts

@@ -13,6 +13,7 @@ import type {
   DoStreamOutput,
   SimpleChatModel,
   BaseChatModelInput,
+  ReqOptions,
 } from '../../type'
 
 function processInput(input: BaseChatModelInput): MoonshotInputData {
@@ -40,7 +41,7 @@ export class MoonshotSimpleModel implements SimpleChatModel {
     return `${this.baseUrl}/${this.subUrl}`
   }
 
-  public async doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput> {
+  public async doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput> {
     const res = (await this.req({
       url: this.url,
       data: {
@@ -48,11 +49,12 @@ export class MoonshotSimpleModel implements SimpleChatModel {
         stream: false,
       },
       stream: false,
+      timeout: options?.timeout,
     })) as MoonshotGenerateTextOutput
     return { ...res, rawResponse: res }
   }
 
-  public async doStream(data: BaseChatModelInput): Promise<DoStreamOutput> {
+  public async doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput> {
     let isToolCall: null | boolean = null
     const _stream = await this.req({
       url: this.url,
@@ -61,6 +63,7 @@ export class MoonshotSimpleModel implements SimpleChatModel {
         stream: true,
       },
       stream: true,
+      timeout: options?.timeout,
     })
     const stream = toPolyfillReadable(_stream) as typeof _stream
 

package/src/models/Yi/index.ts

@@ -13,6 +13,7 @@ import type {
   DoStreamOutput,
   BaseDoStreamOutputChunk,
   SimpleChatModel,
+  ReqOptions,
 } from '../../type'
 
 function processInput(input: BaseChatModelInput): YiInput {
@@ -41,7 +42,7 @@ export class YiSimpleModel implements SimpleChatModel {
     return `${this.baseUrl}/${this.subUrl}`
   }
 
-  public async doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput> {
+  public async doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput> {
     const res = (await this.req({
       url: this.url,
       data: {
@@ -49,11 +50,12 @@ export class YiSimpleModel implements SimpleChatModel {
         stream: false,
       },
       stream: false,
+      timeout: options?.timeout,
     })) as YiGenerateOutput
     return { ...res, rawResponse: res }
   }
 
-  public async doStream(data: BaseChatModelInput): Promise<DoStreamOutput> {
+  public async doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput> {
     let isToolCall: null | boolean = null
     const _stream = await this.req({
       url: this.url,
@@ -62,6 +64,7 @@ export class YiSimpleModel implements SimpleChatModel {
         stream: true,
       },
       stream: true,
+      timeout: options?.timeout,
     })
     const stream = toPolyfillReadable(_stream) as typeof _stream
 

package/src/models/ZhiPu/index.ts

@@ -13,6 +13,7 @@ import type {
   DoStreamOutput,
   BaseDoStreamOutputChunk,
   DoGenerateOutput,
+  ReqOptions,
 } from '../../type'
 
 function processInput(input: BaseChatModelInput): ZhiPuInputData {
@@ -48,7 +49,7 @@ export class ZhiPuSimpleModel implements SimpleChatModel {
     return `${this.baseUrl}/${this.subUrl}`
   }
 
-  public async doGenerate(_data: BaseChatModelInput): Promise<DoGenerateOutput> {
+  public async doGenerate(_data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput> {
     const data = processInput(_data)
     const res = (await this.req({
       url: this.url,
@@ -57,11 +58,12 @@ export class ZhiPuSimpleModel implements SimpleChatModel {
         stream: false,
       },
       stream: false,
+      timeout: options?.timeout,
     })) as ZhiPuGenerateTextOutput
     return { ...res, rawResponse: res }
   }
 
-  public async doStream(_data: BaseChatModelInput): Promise<DoStreamOutput> {
+  public async doStream(_data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput> {
     const data = processInput(_data)
     let isToolCall: null | boolean = null
     const _stream = await this.req({
@@ -71,6 +73,7 @@ export class ZhiPuSimpleModel implements SimpleChatModel {
         stream: true,
       },
       stream: true,
+      timeout: options?.timeout,
     })
     const stream = toPolyfillReadable(_stream) as typeof _stream
 

package/src/models/model.ts

@@ -18,6 +18,7 @@ import {
   ToolCallAssistantMessage,
   ModelTool,
   FunctionTool,
+  ReqOptions,
 } from '../type'
 
 type ReactModelInput = ReactProps &
@@ -69,7 +70,7 @@ function processInput(obj: ReactModelInput): [ReactProps, BaseChatModelInput] {
 export class ReactModel {
   constructor(private model: SimpleChatModel) {}
 
-  public async generateText(_input: ReactModelInput): Promise<{
+  public async generateText(_input: ReactModelInput, options?: ReqOptions): Promise<{
     text: string
     messages: Array<ChatModelMessage>
     usage: Usage
@@ -81,7 +82,7 @@ export class ReactModel {
 
     const [{ onStepFinish, maxSteps = 10 }, input] = processInput(_input)
 
-    const doGenerate = () => this.model.doGenerate(input) // 后续代码会直接对 input.messages 原地修改，这里一直用同一个对象就行
+    const doGenerate = () => this.model.doGenerate(input, options) // 后续代码会直接对 input.messages 原地修改，这里一直用同一个对象就行
     let currentRes = await doGenerate()
     let currentStep = 1
     currentRes.rawResponse && rawResponses.push(currentRes.rawResponse)
@@ -152,7 +153,7 @@ export class ReactModel {
     }
   }
 
-  public async streamText(_input: ReactModelInput): Promise<{
+  public async streamText(_input: ReactModelInput, options?: ReqOptions): Promise<{
     dataStream: DoStreamOutput
     textStream: AsyncIterableReadableStream<string>
     messages: Promise<Array<ChatModelMessage>>
@@ -162,7 +163,7 @@ export class ReactModel {
     const totalUsage: Usage = { completion_tokens: 0, prompt_tokens: 0, total_tokens: 0 }
 
     const [{ onStepFinish, maxSteps = 10 }, input] = processInput(_input)
-    const doStream = () => this.model.doStream(input) // 后续代码会直接对 input.messages 原地修改，这里一直用同一个对象就行
+    const doStream = () => this.model.doStream(input, options) // 后续代码会直接对 input.messages 原地修改，这里一直用同一个对象就行
     let currentRes = await doStream()
     const currentStep = 1
     let readResult: { message: ToolCallAssistantMessage; usage: Usage } | null = null

package/src/type.ts

@@ -1,7 +1,7 @@
 export abstract class SimpleChatModel {
-  public abstract doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput>
+  public abstract doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput>
 
-  public abstract doStream(data: BaseChatModelInput): Promise<DoStreamOutput>
+  public abstract doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput>
 }
 
 type RawResponse = { rawResponse?: any }
@@ -20,7 +20,8 @@ export interface IModelReqInput {
   url: string
   headers?: Record<string, string>
   data?: Object
-  stream?: boolean
+  stream?: boolean,
+  timeout?: number
 }
 
 export type ModelReq = <T extends IModelReqInput>(
@@ -33,6 +34,11 @@ export interface IBotReqInput {
   headers?: Record<string, string>
   data?: Object
   stream?: boolean
+  timeout?: number
+}
+
+export interface ReqOptions {
+  timeout?: number
 }
 
 export type BotReq = <T extends IBotReqInput>(