@xsai/shared-chat 0.0.28 → 0.0.30

package/dist/index.d.ts

@@ -1,6 +1,15 @@
 import { CommonRequestOptions } from '@xsai/shared';
 
-type Part = AudioPart | ImagePart | RefusalPart | TextPart;
+interface AudioBase64 {
+    /**
+     * Base64 encoded audio data.
+     */
+    data: string;
+    format: 'mp3' | 'wav';
+}
+interface AudioPart extends CommonPart<'input_audio'> {
+    input_audio: AudioBase64;
+}
 interface CommonPart<T extends string> {
     type: T;
 }
@@ -17,16 +26,7 @@ interface ImageURLorBase64 {
      */
     url: string;
 }
-interface AudioPart extends CommonPart<'input_audio'> {
-    input_audio: AudioBase64;
-}
-interface AudioBase64 {
-    /**
-     * Base64 encoded audio data.
-     */
-    data: string;
-    format: 'mp3' | 'wav';
-}
+type Part = AudioPart | ImagePart | RefusalPart | TextPart;
 interface RefusalPart extends CommonPart<'refusal'> {
     refusal: string;
 }
@@ -34,20 +34,23 @@ interface TextPart extends CommonPart<'text'> {
     text: string;
 }
 
-type Optional<T, K extends keyof T> = Omit<T, K> & Pick<Partial<T>, K>;
-type Message = AssistantMessage | SystemMessage | ToolMessage | UserMessage;
+interface AssistantMessage extends Optional<CommonMessage<'assistant', AssistantMessagePart>, 'content'> {
+    refusal?: null | string;
+    tool_calls?: ToolCall[];
+}
+type AssistantMessagePart = RefusalPart | TextPart;
+interface AssistantMessageResponse extends Omit<AssistantMessage, 'content'> {
+    content?: string;
+}
 interface CommonMessage<T extends string, P extends Part> {
     content: Array<P> | string;
     name?: string;
     role: T;
 }
-type SystemMessagePart = TextPart;
+type Message = AssistantMessage | SystemMessage | ToolMessage | UserMessage;
 interface SystemMessage extends CommonMessage<'system', SystemMessagePart> {
 }
-type UserMessagePart = AudioPart | ImagePart | TextPart;
-interface UserMessage extends CommonMessage<'user', UserMessagePart> {
-}
-type AssistantMessagePart = RefusalPart | TextPart;
+type SystemMessagePart = TextPart;
 interface ToolCall {
     function: {
         arguments: string;
@@ -56,17 +59,14 @@ interface ToolCall {
     id: string;
     type: 'function';
 }
-interface AssistantMessage extends Optional<CommonMessage<'assistant', AssistantMessagePart>, 'content'> {
-    refusal?: null | string;
-    tool_calls?: ToolCall[];
-}
-interface AssistantMessageResponse extends Omit<AssistantMessage, 'content'> {
-    content?: string;
-}
-type ToolMessagePart = TextPart;
 interface ToolMessage extends Omit<CommonMessage<'tool', ToolMessagePart>, 'name'> {
     tool_call_id: string;
 }
+type ToolMessagePart = TextPart;
+interface UserMessage extends CommonMessage<'user', UserMessagePart> {
+}
+type UserMessagePart = AudioPart | ImagePart | TextPart;
+type Optional<T, K extends keyof T> = Omit<T, K> & Pick<Partial<T>, K>;
 
 type ToolChoice = 'auto' | 'none' | 'required' | {
     function: {
@@ -81,10 +81,10 @@ interface ChatOptions extends CommonRequestOptions {
     toolChoice?: ToolChoice;
 }
 
-type FinishReason = 'content_filter' | 'error' | 'length' | 'other' | 'stop' | 'tool-calls' | ({} & string);
+type FinishReason = 'content_filter' | 'error' | 'length' | 'other' | 'stop' | 'tool-calls' | (string & {});
 
 interface Tool {
-    execute: (input: unknown) => Promise<string> | string;
+    execute: (input: unknown, options: ToolExecuteOptions) => Promise<string> | string;
     function: {
         description?: string;
         name: string;
@@ -93,6 +93,11 @@ interface Tool {
     };
     type: 'function';
 }
+interface ToolExecuteOptions {
+    abortSignal?: AbortSignal;
+    messages: Message[];
+    toolCallId: string;
+}
 
 interface Usage {
     completion_tokens: number;
@@ -102,23 +107,4 @@ interface Usage {
 
 declare const chat: <T extends ChatOptions>(options: T) => Promise<Response>;
 
-declare const messages: (...messages: Message[]) => Message[];
-declare const system: <C extends string | SystemMessagePart[]>(content: C) => SystemMessage;
-declare const user: <C extends Array<UserMessagePart> | string>(content: C) => UserMessage;
-declare const textPart: (text: string) => TextPart;
-declare const imagePart: (url: string) => ImagePart;
-declare const assistant: <C extends AssistantMessagePart[] | string | ToolCall>(content: C) => AssistantMessage;
-declare const tool: <C extends string | ToolMessagePart[]>(content: C, toolCall: ToolCall) => ToolMessage;
-
-declare const message_assistant: typeof assistant;
-declare const message_imagePart: typeof imagePart;
-declare const message_messages: typeof messages;
-declare const message_system: typeof system;
-declare const message_textPart: typeof textPart;
-declare const message_tool: typeof tool;
-declare const message_user: typeof user;
-declare namespace message {
-  export { message_assistant as assistant, message_imagePart as imagePart, message_messages as messages, message_system as system, message_textPart as textPart, message_tool as tool, message_user as user };
-}
-
-export { type AssistantMessage, type AssistantMessagePart, type AssistantMessageResponse, type AudioBase64, type AudioPart, type ChatOptions, type CommonMessage, type CommonPart, type FinishReason, type ImagePart, type ImageURLorBase64, type Message, type Part, type RefusalPart, type SystemMessage, type SystemMessagePart, type TextPart, type Tool, type ToolCall, type ToolChoice, type ToolMessage, type ToolMessagePart, type Usage, type UserMessage, type UserMessagePart, chat, message };
+export { type AssistantMessage, type AssistantMessagePart, type AssistantMessageResponse, type AudioBase64, type AudioPart, type ChatOptions, type CommonMessage, type CommonPart, type FinishReason, type ImagePart, type ImageURLorBase64, type Message, type Part, type RefusalPart, type SystemMessage, type SystemMessagePart, type TextPart, type Tool, type ToolCall, type ToolChoice, type ToolMessage, type ToolMessagePart, type Usage, type UserMessage, type UserMessagePart, chat };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { requestURL, requestBody, requestHeaders, responseCatch } from '@xsai/shared';
 
-const chat = async (options) => await (options.fetch ?? globalThis.fetch)(requestURL("chat/completions", options.baseURL), {
+const chat = async (options) => (options.fetch ?? globalThis.fetch)(requestURL("chat/completions", options.baseURL), {
   body: requestBody({
     ...options,
     tools: options.tools?.map((tool) => ({
@@ -16,27 +16,4 @@ const chat = async (options) => await (options.fetch ?? globalThis.fetch)(reques
   signal: options.abortSignal
 }).then(responseCatch);
 
-const messages = (...messages2) => messages2;
-const system = (content) => ({ content, role: "system" });
-const user = (content) => ({ content, role: "user" });
-const textPart = (text) => ({ text, type: "text" });
-const imagePart = (url) => ({ image_url: { url }, type: "image_url" });
-const assistant = (content) => typeof content === "string" || Array.isArray(content) ? { content, role: "assistant" } : { role: "assistant", tool_calls: [content] };
-const tool = (content, toolCall) => ({
-  content,
-  role: "tool",
-  tool_call_id: toolCall.id
-});
-
-var message = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  assistant: assistant,
-  imagePart: imagePart,
-  messages: messages,
-  system: system,
-  textPart: textPart,
-  tool: tool,
-  user: user
-});
-
-export { chat, message };
+export { chat };

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@xsai/shared-chat",
-  "version": "0.0.28",
   "type": "module",
+  "version": "0.0.30",
+  "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
   "author": "Moeru AI",
   "license": "MIT",
   "homepage": "https://xsai.js.org",
-  "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
-  "keywords": [
-    "xsai",
-    "openai",
-    "ai"
-  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/moeru-ai/xsai.git",
     "directory": "packages/shared-chat"
   },
   "bugs": "https://github.com/moeru-ai/xsai/issues",
+  "keywords": [
+    "xsai",
+    "openai",
+    "ai"
+  ],
   "sideEffects": false,
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     }
   },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],