@cloudbase/ai 2.8.20-beta.0 → 2.8.22-beta.0

package/src/type.ts

@@ -1,18 +1,16 @@
-import { type ParsedEvent } from './eventsource_parser'
+export abstract class SimpleChatModel {
+  public abstract doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput>
 
-export abstract class ChatModel {
-  public abstract generateText(data: BaseChatModelInput): Promise<{ text: string; rawResponse: any }>
-
-  public abstract streamText(data: BaseChatModelInput): Promise<StreamTextResult>
+  public abstract doStream(data: BaseChatModelInput): Promise<DoStreamOutput>
 }
 
-export type ChatModelConstructor = typeof ChatModel
+type RawResponse = { rawResponse?: any }
 
-export abstract class StreamTextResult {
-  public abstract eventSourceStream: AsyncIterableReadableStream<ParsedEvent>
-  public abstract dataStream: AsyncIterableReadableStream<any>
-  public abstract textStream: AsyncIterableReadableStream<string>
-}
+export type DoGenerateOutput = BaseDoGenerateOutput & RawResponse
+
+export type DoStreamOutput = AsyncIterableReadableStream<BaseDoStreamOutputChunk & RawResponse>
+
+export type ChatModelConstructor = typeof SimpleChatModel
 
 export type AsyncIterableReadableStream<T> = ReadableStream<T> & {
   [Symbol.asyncIterator]: () => { next(): Promise<IteratorResult<T>> }
@@ -41,14 +39,103 @@ export type BotReq = <T extends IBotReqInput>(
   props: T,
 ) => T['stream'] extends true ? Promise<ReadableStream<Uint8Array>> : Promise<Object>
 
-type ChatModelMessage = {
-  role: 'user' | 'system' | 'assistant'
+export type UserMessage = {
+  role: 'user'
+  content: string
+}
+
+export type SystemMessage = {
+  role: 'system'
+  content: string
+}
+
+export type AssistantMessage = PlainAssistantMessage | ToolCallAssistantMessage
+
+export type PlainAssistantMessage = {
+  role: 'assistant'
+  content: string
+}
+
+export type ToolCallAssistantMessage = {
+  role: 'assistant'
+  tool_calls: Array<ToolCall>
+  content?: string
+}
+
+export type ToolMessage = {
+  role: 'tool'
+  tool_call_id: string
   content: string
 }
 
+export type ChatModelMessage = UserMessage | SystemMessage | AssistantMessage | ToolMessage
+
+export type FunctionTool = {
+  name: string
+  description: string
+  fn: CallableFunction
+  parameters: object
+}
+
+// #region 大模型标准输入类型
 export interface BaseChatModelInput {
   model: string
   messages: Array<ChatModelMessage>
   temperature?: number
   top_p?: number
+  tools?: Array<ModelTool>
+  tool_choice?: 'none' | 'auto' | 'custom'
+}
+
+/**
+ * 给 LLM 发请求时要传的工具
+ */
+export type ModelTool = {
+  type: string
+  function?: ModelToolFunction
+}
+
+/**
+ * 给 LLM 发请求时要传的工具函数
+ */
+export type ModelToolFunction = {
+  name: string
+  description: string
+  /**
+   * 描述函数参数的 JSON Schema 字符串
+   */
+  parameters: string
+}
+// #endregion
+
+// #region 大模型标准响应类型
+export type ToolCall = {
+  id: string
+  type: string
+  function: { name: string; arguments: string }
+}
+
+type FinishReason = 'tool_calls' | (string & {})
+
+export type Usage = {
+  completion_tokens: number
+  prompt_tokens: number
+  total_tokens: number
+}
+
+export interface BaseDoGenerateOutput {
+  choices?: Array<{
+    finish_reason?: FinishReason
+    message?: ChatModelMessage
+  }>
+  usage?: Usage
+}
+
+export interface BaseDoStreamOutputChunk {
+  choices?: Array<{
+    finish_reason?: FinishReason
+    delta?: ChatModelMessage
+  }>
+  usage?: Usage
 }
+// #endregion

package/src/utils.ts

@@ -1,7 +1,13 @@
 import { TransformStream as _TransformStream, ReadableStream as _ReadableStream } from 'web-streams-polyfill'
 import { createReadableStreamWrapper } from '@mattiasbuelens/web-streams-adapter'
 import { createParser, type EventSourceParser, type ParsedEvent } from './eventsource_parser'
-import type { AsyncIterableReadableStream } from './type'
+import type {
+  AsyncIterableReadableStream,
+  ChatModelMessage,
+  ToolCallAssistantMessage,
+  ModelTool,
+  FunctionTool,
+} from './type'
 import { TextDecoder } from 'text-encoding-shim'
 
 export const ReadableStream = _ReadableStream as {
@@ -109,3 +115,49 @@ export function createAsyncIterable<T>(stream: ReadableStream<T>) {
   }
   return _stream
 }
+
+/**
+ * 将 SSE 二进制流转换为 T 类型的流
+ */
+export function intoStandardStream<T>(stream: ReadableStream<Uint8Array>): ReadableStream<T> {
+  return createAsyncIterable(stream
+    .pipeThrough(new TextDecoderStream())
+    .pipeThrough(createEventSourceParserTransformStream())
+    .pipeThrough(new TransformStream<ParsedEvent, T>({
+      transform(chunk, controller) {
+        try {
+          const data = JSON.parse(chunk.data) as T
+          controller.enqueue(data)
+        } catch (e) {
+          if (chunk.data !== '[DONE]') {
+            console.warn('Error when transforming event source data to json', e)
+          }
+        }
+      },
+    }),),)
+}
+
+export function createPromise<T = unknown>() {
+  let res: (value: T | PromiseLike<T>) => void
+  let rej: (reason?: any) => void
+  const promise = new Promise<T>((resolve, reject) => {
+    res = resolve
+    rej = reject
+  })
+  return { promise, res, rej }
+}
+
+export function isToolCallAssistantMessage(message: ChatModelMessage): message is ToolCallAssistantMessage {
+  return message.role === 'assistant' && 'tool_calls' in message && message.tool_calls[0] != null
+}
+
+export function functionToolToModelTool(tool: FunctionTool): ModelTool {
+  return {
+    type: 'function',
+    function: {
+      description: tool.description,
+      name: tool.name,
+      parameters: JSON.stringify(tool.parameters),
+    },
+  }
+}

package/dist/cjs/models/HunYuanBeta/type.d.ts

@@ -1,52 +0,0 @@
-type HunYuanMessage = {
-    Role: 'user' | 'system' | 'assistant' | 'tool';
-    Content?: string;
-    Contents?: Array<{
-        Type: 'text' | 'image_url';
-        Text?: string;
-        ImageUrl?: string;
-    }>;
-    ToolCallId?: string;
-    ToolCalls?: Array<{
-        Id: string;
-        Type: 'function';
-        Function: {
-            Name: string;
-            Arguments: string;
-        };
-    }>;
-};
-type HunYuanTool = {
-    Type: 'function';
-    Function: {
-        Name: string;
-        Arguments: string;
-    };
-};
-export type HunYuanInputData = {
-    Model: 'hunyuan-lite' | 'hunyuan-standard' | 'hunyuan-standard-256K' | 'hunyuan-pro' | 'hunyuan-code' | 'hunyuan-role' | 'hunyuan-functioncall' | 'hunyuan-vision';
-    Messages: Array<HunYuanMessage>;
-    StreamModeration?: boolean;
-    TopP?: number;
-    Temperature?: number;
-    EnableEnhancement?: boolean;
-    Tools?: Array<HunYuanTool>;
-    ToolChoice?: 'none' | 'auto' | 'custom';
-    CustomTool?: HunYuanTool;
-    SearchInfo?: boolean;
-};
-export type HunYaunGenerateTextOutput = {
-    choices?: Array<{
-        message?: {
-            content?: string;
-        };
-    }>;
-};
-export type HunYaunStreamTextOutput = {
-    choices?: Array<{
-        delta?: {
-            content?: string;
-        };
-    }>;
-};
-export {};

package/dist/cjs/models/HunYuanBeta/type.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tb2RlbHMvSHVuWXVhbkJldGEvdHlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsidHlwZSBIdW5ZdWFuTWVzc2FnZSA9IHtcbiAgUm9sZTogJ3VzZXInIHwgJ3N5c3RlbScgfCAnYXNzaXN0YW50JyB8ICd0b29sJ1xuICBDb250ZW50Pzogc3RyaW5nXG4gIENvbnRlbnRzPzogQXJyYXk8e1xuICAgIFR5cGU6ICd0ZXh0JyB8ICdpbWFnZV91cmwnXG4gICAgVGV4dD86IHN0cmluZ1xuICAgIEltYWdlVXJsPzogc3RyaW5nXG4gIH0+XG4gIFRvb2xDYWxsSWQ/OiBzdHJpbmdcbiAgVG9vbENhbGxzPzogQXJyYXk8e1xuICAgIElkOiBzdHJpbmdcbiAgICBUeXBlOiAnZnVuY3Rpb24nXG4gICAgRnVuY3Rpb246IHtcbiAgICAgIE5hbWU6IHN0cmluZ1xuICAgICAgQXJndW1lbnRzOiBzdHJpbmdcbiAgICB9XG4gIH0+XG59XG5cbnR5cGUgSHVuWXVhblRvb2wgPSB7XG4gIFR5cGU6ICdmdW5jdGlvbidcbiAgRnVuY3Rpb246IHtcbiAgICBOYW1lOiBzdHJpbmdcbiAgICBBcmd1bWVudHM6IHN0cmluZ1xuICB9XG59XG5cbmV4cG9ydCB0eXBlIEh1bll1YW5JbnB1dERhdGEgPSB7XG4gIE1vZGVsOlxuICB8ICdodW55dWFuLWxpdGUnXG4gIHwgJ2h1bnl1YW4tc3RhbmRhcmQnXG4gIHwgJ2h1bnl1YW4tc3RhbmRhcmQtMjU2SydcbiAgfCAnaHVueXVhbi1wcm8nXG4gIHwgJ2h1bnl1YW4tY29kZSdcbiAgfCAnaHVueXVhbi1yb2xlJ1xuICB8ICdodW55dWFuLWZ1bmN0aW9uY2FsbCdcbiAgfCAnaHVueXVhbi12aXNpb24nXG4gIE1lc3NhZ2VzOiBBcnJheTxIdW5ZdWFuTWVzc2FnZT5cbiAgU3RyZWFtTW9kZXJhdGlvbj86IGJvb2xlYW5cbiAgVG9wUD86IG51bWJlclxuICBUZW1wZXJhdHVyZT86IG51bWJlclxuICBFbmFibGVFbmhhbmNlbWVudD86IGJvb2xlYW5cbiAgVG9vbHM/OiBBcnJheTxIdW5ZdWFuVG9vbD5cbiAgVG9vbENob2ljZT86ICdub25lJyB8ICdhdXRvJyB8ICdjdXN0b20nXG4gIEN1c3RvbVRvb2w/OiBIdW5ZdWFuVG9vbFxuICBTZWFyY2hJbmZvPzogYm9vbGVhblxufVxuXG4vLyB0b2RvOiBtb3JlIHByZWNpc2VcbmV4cG9ydCB0eXBlIEh1bllhdW5HZW5lcmF0ZVRleHRPdXRwdXQgPSB7XG4gIGNob2ljZXM/OiBBcnJheTx7XG4gICAgbWVzc2FnZT86IHsgY29udGVudD86IHN0cmluZyB9XG4gIH0+XG59XG5cbi8vIHRvZG86IG1vcmUgcHJlY2lzZVxuZXhwb3J0IHR5cGUgSHVuWWF1blN0cmVhbVRleHRPdXRwdXQgPSB7XG4gIGNob2ljZXM/OiBBcnJheTx7XG4gICAgZGVsdGE/OiB7IGNvbnRlbnQ/OiBzdHJpbmcgfVxuICB9PlxufVxuIl19

package/dist/esm/models/HunYuanBeta/type.d.ts

@@ -1,52 +0,0 @@
-type HunYuanMessage = {
-    Role: 'user' | 'system' | 'assistant' | 'tool';
-    Content?: string;
-    Contents?: Array<{
-        Type: 'text' | 'image_url';
-        Text?: string;
-        ImageUrl?: string;
-    }>;
-    ToolCallId?: string;
-    ToolCalls?: Array<{
-        Id: string;
-        Type: 'function';
-        Function: {
-            Name: string;
-            Arguments: string;
-        };
-    }>;
-};
-type HunYuanTool = {
-    Type: 'function';
-    Function: {
-        Name: string;
-        Arguments: string;
-    };
-};
-export type HunYuanInputData = {
-    Model: 'hunyuan-lite' | 'hunyuan-standard' | 'hunyuan-standard-256K' | 'hunyuan-pro' | 'hunyuan-code' | 'hunyuan-role' | 'hunyuan-functioncall' | 'hunyuan-vision';
-    Messages: Array<HunYuanMessage>;
-    StreamModeration?: boolean;
-    TopP?: number;
-    Temperature?: number;
-    EnableEnhancement?: boolean;
-    Tools?: Array<HunYuanTool>;
-    ToolChoice?: 'none' | 'auto' | 'custom';
-    CustomTool?: HunYuanTool;
-    SearchInfo?: boolean;
-};
-export type HunYaunGenerateTextOutput = {
-    choices?: Array<{
-        message?: {
-            content?: string;
-        };
-    }>;
-};
-export type HunYaunStreamTextOutput = {
-    choices?: Array<{
-        delta?: {
-            content?: string;
-        };
-    }>;
-};
-export {};

package/dist/esm/models/HunYuanBeta/type.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tb2RlbHMvSHVuWXVhbkJldGEvdHlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsidHlwZSBIdW5ZdWFuTWVzc2FnZSA9IHtcbiAgUm9sZTogJ3VzZXInIHwgJ3N5c3RlbScgfCAnYXNzaXN0YW50JyB8ICd0b29sJ1xuICBDb250ZW50Pzogc3RyaW5nXG4gIENvbnRlbnRzPzogQXJyYXk8e1xuICAgIFR5cGU6ICd0ZXh0JyB8ICdpbWFnZV91cmwnXG4gICAgVGV4dD86IHN0cmluZ1xuICAgIEltYWdlVXJsPzogc3RyaW5nXG4gIH0+XG4gIFRvb2xDYWxsSWQ/OiBzdHJpbmdcbiAgVG9vbENhbGxzPzogQXJyYXk8e1xuICAgIElkOiBzdHJpbmdcbiAgICBUeXBlOiAnZnVuY3Rpb24nXG4gICAgRnVuY3Rpb246IHtcbiAgICAgIE5hbWU6IHN0cmluZ1xuICAgICAgQXJndW1lbnRzOiBzdHJpbmdcbiAgICB9XG4gIH0+XG59XG5cbnR5cGUgSHVuWXVhblRvb2wgPSB7XG4gIFR5cGU6ICdmdW5jdGlvbidcbiAgRnVuY3Rpb246IHtcbiAgICBOYW1lOiBzdHJpbmdcbiAgICBBcmd1bWVudHM6IHN0cmluZ1xuICB9XG59XG5cbmV4cG9ydCB0eXBlIEh1bll1YW5JbnB1dERhdGEgPSB7XG4gIE1vZGVsOlxuICB8ICdodW55dWFuLWxpdGUnXG4gIHwgJ2h1bnl1YW4tc3RhbmRhcmQnXG4gIHwgJ2h1bnl1YW4tc3RhbmRhcmQtMjU2SydcbiAgfCAnaHVueXVhbi1wcm8nXG4gIHwgJ2h1bnl1YW4tY29kZSdcbiAgfCAnaHVueXVhbi1yb2xlJ1xuICB8ICdodW55dWFuLWZ1bmN0aW9uY2FsbCdcbiAgfCAnaHVueXVhbi12aXNpb24nXG4gIE1lc3NhZ2VzOiBBcnJheTxIdW5ZdWFuTWVzc2FnZT5cbiAgU3RyZWFtTW9kZXJhdGlvbj86IGJvb2xlYW5cbiAgVG9wUD86IG51bWJlclxuICBUZW1wZXJhdHVyZT86IG51bWJlclxuICBFbmFibGVFbmhhbmNlbWVudD86IGJvb2xlYW5cbiAgVG9vbHM/OiBBcnJheTxIdW5ZdWFuVG9vbD5cbiAgVG9vbENob2ljZT86ICdub25lJyB8ICdhdXRvJyB8ICdjdXN0b20nXG4gIEN1c3RvbVRvb2w/OiBIdW5ZdWFuVG9vbFxuICBTZWFyY2hJbmZvPzogYm9vbGVhblxufVxuXG4vLyB0b2RvOiBtb3JlIHByZWNpc2VcbmV4cG9ydCB0eXBlIEh1bllhdW5HZW5lcmF0ZVRleHRPdXRwdXQgPSB7XG4gIGNob2ljZXM/OiBBcnJheTx7XG4gICAgbWVzc2FnZT86IHsgY29udGVudD86IHN0cmluZyB9XG4gIH0+XG59XG5cbi8vIHRvZG86IG1vcmUgcHJlY2lzZVxuZXhwb3J0IHR5cGUgSHVuWWF1blN0cmVhbVRleHRPdXRwdXQgPSB7XG4gIGNob2ljZXM/OiBBcnJheTx7XG4gICAgZGVsdGE/OiB7IGNvbnRlbnQ/OiBzdHJpbmcgfVxuICB9PlxufVxuIl19

package/src/models/HunYuanBeta/type.ts

@@ -1,61 +0,0 @@
-type HunYuanMessage = {
-  Role: 'user' | 'system' | 'assistant' | 'tool'
-  Content?: string
-  Contents?: Array<{
-    Type: 'text' | 'image_url'
-    Text?: string
-    ImageUrl?: string
-  }>
-  ToolCallId?: string
-  ToolCalls?: Array<{
-    Id: string
-    Type: 'function'
-    Function: {
-      Name: string
-      Arguments: string
-    }
-  }>
-}
-
-type HunYuanTool = {
-  Type: 'function'
-  Function: {
-    Name: string
-    Arguments: string
-  }
-}
-
-export type HunYuanInputData = {
-  Model:
-  | 'hunyuan-lite'
-  | 'hunyuan-standard'
-  | 'hunyuan-standard-256K'
-  | 'hunyuan-pro'
-  | 'hunyuan-code'
-  | 'hunyuan-role'
-  | 'hunyuan-functioncall'
-  | 'hunyuan-vision'
-  Messages: Array<HunYuanMessage>
-  StreamModeration?: boolean
-  TopP?: number
-  Temperature?: number
-  EnableEnhancement?: boolean
-  Tools?: Array<HunYuanTool>
-  ToolChoice?: 'none' | 'auto' | 'custom'
-  CustomTool?: HunYuanTool
-  SearchInfo?: boolean
-}
-
-// todo: more precise
-export type HunYaunGenerateTextOutput = {
-  choices?: Array<{
-    message?: { content?: string }
-  }>
-}
-
-// todo: more precise
-export type HunYaunStreamTextOutput = {
-  choices?: Array<{
-    delta?: { content?: string }
-  }>
-}