ai 2.2.29 → 2.2.30

package/svelte/dist/index.d.ts

@@ -13,6 +13,38 @@ interface FunctionCall {
      */
     name?: string;
 }
+/**
+ * The tool calls generated by the model, such as function calls.
+ */
+interface ToolCall {
+    id: string;
+    type: string;
+    function: {
+        name: string;
+        arguments: string;
+    };
+}
+/**
+ * Controls which (if any) function is called by the model.
+ * - none means the model will not call a function and instead generates a message.
+ * - auto means the model can pick between generating a message or calling a function.
+ * - Specifying a particular function via {"type: "function", "function": {"name": "my_function"}} forces the model to call that function.
+ * none is the default when no functions are present. auto is the default if functions are present.
+ */
+type ToolChoice = 'none' | 'auto' | {
+    type: 'function';
+    function: {
+        name: string;
+    };
+};
+/**
+ * A list of tools the model may call. Currently, only functions are supported as a tool.
+ * Use this to provide a list of functions the model may generate JSON inputs for.
+ */
+interface Tool {
+    type: 'function';
+    function: Function;
+}
 interface Function {
     /**
      * The name of the function to be called. Must be a-z, A-Z, 0-9, or contain
@@ -41,10 +73,11 @@ type IdGenerator = () => string;
  */
 interface Message {
     id: string;
+    tool_call_id?: string;
     createdAt?: Date;
     content: string;
     ui?: string | JSX.Element | JSX.Element[] | null | undefined;
-    role: 'system' | 'user' | 'assistant' | 'function' | 'data';
+    role: 'system' | 'user' | 'assistant' | 'function' | 'data' | 'tool';
     /**
      * If the message has a role of `function`, the `name` field is the name of the function.
      * Otherwise, the name field should not be set.
@@ -53,10 +86,15 @@ interface Message {
     /**
      * If the assistant role makes a function call, the `function_call` field
      * contains the function call name and arguments. Otherwise, the field should
-     * not be set.
+     * not be set. (Deprecated and replaced by tool_calls.)
      */
     function_call?: string | FunctionCall;
     data?: JSONValue;
+    /**
+     * If the assistant role makes a tool call, the `tool_calls` field contains
+     * the tool call name and arguments. Otherwise, the field should not be set.
+     */
+    tool_calls?: string | ToolCall[];
 }
 type CreateMessage = Omit<Message, 'id'> & {
     id?: Message['id'];
@@ -67,8 +105,11 @@ type ChatRequest = {
     functions?: Array<Function>;
     function_call?: FunctionCall;
     data?: Record<string, string>;
+    tools?: Array<Tool>;
+    tool_choice?: ToolChoice;
 };
 type FunctionCallHandler = (chatMessages: Message[], functionCall: FunctionCall) => Promise<ChatRequest | void>;
+type ToolCallHandler = (chatMessages: Message[], toolCalls: ToolCall[]) => Promise<ChatRequest | void>;
 type RequestOptions = {
     headers?: Record<string, string> | Headers;
     body?: object;
@@ -77,6 +118,8 @@ type ChatRequestOptions = {
     options?: RequestOptions;
     functions?: Array<Function>;
     function_call?: FunctionCall;
+    tools?: Array<Tool>;
+    tool_choice?: ToolChoice;
     data?: Record<string, string>;
 };
 type UseChatOptions = {
@@ -105,6 +148,12 @@ type UseChatOptions = {
      * automatically to the API and will be used to update the chat.
      */
     experimental_onFunctionCall?: FunctionCallHandler;
+    /**
+     * Callback function to be called when a tool call is received.
+     * If the function returns a `ChatRequest` object, the request will be sent
+     * automatically to the API and will be used to update the chat.
+     */
+    experimental_onToolCall?: ToolCallHandler;
     /**
      * Callback function to be called when the API response is received.
      */
@@ -250,7 +299,7 @@ type UseChatHelpers = {
     /** Additional data added on the server via StreamData */
     data: Readable<JSONValue[] | undefined>;
 };
-declare function useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, experimental_onFunctionCall, onResponse, onFinish, onError, credentials, headers, body, generateId, }?: UseChatOptions): UseChatHelpers;
+declare function useChat({ api, id, initialMessages, initialInput, sendExtraMessageFields, experimental_onFunctionCall, experimental_onToolCall, onResponse, onFinish, onError, credentials, headers, body, generateId, }?: UseChatOptions): UseChatHelpers;
 
 type UseCompletionHelpers = {
     /** The current completion result */

package/svelte/dist/index.js

@@ -407,7 +407,7 @@ var H = class {
   }
 };
 
-// ../../node_modules/.pnpm/sswr@2.0.0_svelte@4.0.1/node_modules/sswr/dist/sswr.mjs
+// ../../node_modules/.pnpm/sswr@2.0.0_svelte@4.2.3/node_modules/sswr/dist/sswr.mjs
 var import_svelte = require("svelte");
 function p() {
 }
@@ -621,6 +621,23 @@ var dataMessageStreamPart = {
     };
   }
 };
+var toolCallStreamPart = {
+  code: "7",
+  name: "tool_calls",
+  parse: (value) => {
+    if (value == null || typeof value !== "object" || !("tool_calls" in value) || typeof value.tool_calls !== "object" || value.tool_calls == null || !Array.isArray(value.tool_calls) || value.tool_calls.some((tc) => {
+      tc == null || typeof tc !== "object" || !("id" in tc) || typeof tc.id !== "string" || !("type" in tc) || typeof tc.type !== "string" || !("function" in tc) || tc.function == null || typeof tc.function !== "object" || !("arguments" in tc.function) || typeof tc.function.name !== "string" || typeof tc.function.arguments !== "string";
+    })) {
+      throw new Error(
+        '"tool_calls" parts expect an object with a ToolCallPayload.'
+      );
+    }
+    return {
+      type: "tool_calls",
+      value
+    };
+  }
+};
 var streamParts = [
   textStreamPart,
   functionCallStreamPart,
@@ -628,7 +645,8 @@ var streamParts = [
   errorStreamPart,
   assistantMessageStreamPart,
   assistantControlDataStreamPart,
-  dataMessageStreamPart
+  dataMessageStreamPart,
+  toolCallStreamPart
 ];
 var streamPartsByCode = {
   [textStreamPart.code]: textStreamPart,
@@ -637,7 +655,8 @@ var streamPartsByCode = {
   [errorStreamPart.code]: errorStreamPart,
   [assistantMessageStreamPart.code]: assistantMessageStreamPart,
   [assistantControlDataStreamPart.code]: assistantControlDataStreamPart,
-  [dataMessageStreamPart.code]: dataMessageStreamPart
+  [dataMessageStreamPart.code]: dataMessageStreamPart,
+  [toolCallStreamPart.code]: toolCallStreamPart
 };
 var StreamStringPrefixes = {
   [textStreamPart.name]: textStreamPart.code,
@@ -646,7 +665,8 @@ var StreamStringPrefixes = {
   [errorStreamPart.name]: errorStreamPart.code,
   [assistantMessageStreamPart.name]: assistantMessageStreamPart.code,
   [assistantControlDataStreamPart.name]: assistantControlDataStreamPart.code,
-  [dataMessageStreamPart.name]: dataMessageStreamPart.code
+  [dataMessageStreamPart.name]: dataMessageStreamPart.code,
+  [toolCallStreamPart.name]: toolCallStreamPart.code
 };
 var validCodes = streamParts.map((part) => part.code);
 var parseStreamPart = (line) => {
@@ -772,20 +792,35 @@ async function parseComplexResponse({
       };
       functionCallMessage = prefixMap["function_call"];
     }
+    let toolCallMessage = null;
+    if (type === "tool_calls") {
+      prefixMap["tool_calls"] = {
+        id: generateId(),
+        role: "assistant",
+        content: "",
+        tool_calls: value.tool_calls,
+        createdAt
+      };
+      toolCallMessage = prefixMap["tool_calls"];
+    }
     if (type === "data") {
       prefixMap["data"].push(...value);
     }
     const responseMessage = prefixMap["text"];
-    const merged = [functionCallMessage, responseMessage].filter(
-      Boolean
-    );
+    const merged = [
+      functionCallMessage,
+      toolCallMessage,
+      responseMessage
+    ].filter(Boolean);
     update(merged, [...prefixMap["data"]]);
   }
   onFinish == null ? void 0 : onFinish(prefixMap);
   return {
-    messages: [prefixMap.text, prefixMap.function_call].filter(
-      Boolean
-    ),
+    messages: [
+      prefixMap.text,
+      prefixMap.function_call,
+      prefixMap.tool_calls
+    ].filter(Boolean),
     data: prefixMap.data
   };
 }
@@ -871,6 +906,8 @@ async function callChatApi({
       streamedResponse += decode(value);
       if (streamedResponse.startsWith('{"function_call":')) {
         responseMessage["function_call"] = streamedResponse;
+      } else if (streamedResponse.startsWith('{"tool_calls":')) {
+        responseMessage["tool_calls"] = streamedResponse;
       } else {
         responseMessage["content"] = streamedResponse;
       }
@@ -885,6 +922,11 @@ async function callChatApi({
       responseMessage["function_call"] = parsedFunctionCall;
       appendMessage({ ...responseMessage });
     }
+    if (streamedResponse.startsWith('{"tool_calls":')) {
+      const parsedToolCalls = JSON.parse(streamedResponse).tool_calls;
+      responseMessage["tool_calls"] = parsedToolCalls;
+      appendMessage({ ...responseMessage });
+    }
     if (onFinish) {
       onFinish(responseMessage);
     }
@@ -896,6 +938,7 @@ async function callChatApi({
 async function processChatStream({
   getStreamedResponse: getStreamedResponse2,
   experimental_onFunctionCall,
+  experimental_onToolCall,
   updateChatRequest,
   getCurrentMessages
 }) {
@@ -904,12 +947,18 @@ async function processChatStream({
     if ("messages" in messagesAndDataOrJustMessage) {
       let hasFollowingResponse = false;
       for (const message of messagesAndDataOrJustMessage.messages) {
-        if (message.function_call === void 0 || typeof message.function_call === "string") {
+        if ((message.function_call === void 0 || typeof message.function_call === "string") && (message.tool_calls === void 0 || typeof message.tool_calls === "string")) {
           continue;
         }
         hasFollowingResponse = true;
         if (experimental_onFunctionCall) {
           const functionCall = message.function_call;
+          if (typeof functionCall !== "object") {
+            console.warn(
+              "experimental_onFunctionCall should not be defined when using tools"
+            );
+            continue;
+          }
           const functionCallResponse = await experimental_onFunctionCall(
             getCurrentMessages(),
             functionCall
@@ -920,22 +969,83 @@ async function processChatStream({
           }
           updateChatRequest(functionCallResponse);
         }
+        if (experimental_onToolCall) {
+          const toolCalls = message.tool_calls;
+          if (!Array.isArray(toolCalls) || toolCalls.some((toolCall) => typeof toolCall !== "object")) {
+            console.warn(
+              "experimental_onToolCall should not be defined when using tools"
+            );
+            continue;
+          }
+          const toolCallResponse = await experimental_onToolCall(getCurrentMessages(), toolCalls);
+          if (toolCallResponse === void 0) {
+            hasFollowingResponse = false;
+            break;
+          }
+          updateChatRequest(toolCallResponse);
+        }
       }
       if (!hasFollowingResponse) {
         break;
       }
     } else {
+      let fixFunctionCallArguments2 = function(response) {
+        for (const message of response.messages) {
+          if (message.tool_calls !== void 0) {
+            for (const toolCall of message.tool_calls) {
+              if (typeof toolCall === "object") {
+                if (toolCall.function.arguments && typeof toolCall.function.arguments !== "string") {
+                  toolCall.function.arguments = JSON.stringify(
+                    toolCall.function.arguments
+                  );
+                }
+              }
+            }
+          }
+          if (message.function_call !== void 0) {
+            if (typeof message.function_call === "object") {
+              if (message.function_call.arguments && typeof message.function_call.arguments !== "string") {
+                message.function_call.arguments = JSON.stringify(
+                  message.function_call.arguments
+                );
+              }
+            }
+          }
+        }
+      };
+      var fixFunctionCallArguments = fixFunctionCallArguments2;
       const streamedResponseMessage = messagesAndDataOrJustMessage;
-      if (streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") {
+      if ((streamedResponseMessage.function_call === void 0 || typeof streamedResponseMessage.function_call === "string") && (streamedResponseMessage.tool_calls === void 0 || typeof streamedResponseMessage.tool_calls === "string")) {
         break;
       }
       if (experimental_onFunctionCall) {
         const functionCall = streamedResponseMessage.function_call;
+        if (!(typeof functionCall === "object")) {
+          console.warn(
+            "experimental_onFunctionCall should not be defined when using tools"
+          );
+          continue;
+        }
         const functionCallResponse = await experimental_onFunctionCall(getCurrentMessages(), functionCall);
         if (functionCallResponse === void 0)
           break;
+        fixFunctionCallArguments2(functionCallResponse);
         updateChatRequest(functionCallResponse);
       }
+      if (experimental_onToolCall) {
+        const toolCalls = streamedResponseMessage.tool_calls;
+        if (!(typeof toolCalls === "object")) {
+          console.warn(
+            "experimental_onToolCall should not be defined when using functions"
+          );
+          continue;
+        }
+        const toolCallResponse = await experimental_onToolCall(getCurrentMessages(), toolCalls);
+        if (toolCallResponse === void 0)
+          break;
+        fixFunctionCallArguments2(toolCallResponse);
+        updateChatRequest(toolCallResponse);
+      }
     }
   }
 }
@@ -944,14 +1054,20 @@ async function processChatStream({
 var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, existingData, extraMetadata, previousMessages, abortControllerRef, generateId, onFinish, onResponse, sendExtraMessageFields) => {
   var _a, _b;
   mutate(chatRequest.messages);
-  const constructedMessagesPayload = sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(({ role, content, name, function_call }) => ({
-    role,
-    content,
-    ...name !== void 0 && { name },
-    ...function_call !== void 0 && {
-      function_call
-    }
-  }));
+  const constructedMessagesPayload = sendExtraMessageFields ? chatRequest.messages : chatRequest.messages.map(
+    ({ role, content, name, function_call, tool_calls, tool_call_id }) => ({
+      role,
+      content,
+      tool_call_id,
+      ...name !== void 0 && { name },
+      ...function_call !== void 0 && {
+        function_call
+      },
+      ...tool_calls !== void 0 && {
+        tool_calls
+      }
+    })
+  );
   return await callChatApi({
     api,
     messages: constructedMessagesPayload,
@@ -963,6 +1079,12 @@ var getStreamedResponse = async (api, chatRequest, mutate, mutateStreamData, exi
       },
       ...chatRequest.function_call !== void 0 && {
         function_call: chatRequest.function_call
+      },
+      ...chatRequest.tools !== void 0 && {
+        tools: chatRequest.tools
+      },
+      ...chatRequest.tool_choice !== void 0 && {
+        tool_choice: chatRequest.tool_choice
       }
     },
     credentials: extraMetadata.credentials,
@@ -995,6 +1117,7 @@ function useChat({
   initialInput = "",
   sendExtraMessageFields,
   experimental_onFunctionCall,
+  experimental_onToolCall,
   onResponse,
   onFinish,
   onError,
@@ -1051,6 +1174,7 @@ function useChat({
           sendExtraMessageFields
         ),
         experimental_onFunctionCall,
+        experimental_onToolCall,
         updateChatRequest: (chatRequestParam) => {
           chatRequest = chatRequestParam;
         },
@@ -1071,7 +1195,13 @@ function useChat({
       loading.set(false);
     }
   }
-  const append = async (message, { options, functions, function_call } = {}) => {
+  const append = async (message, {
+    options,
+    functions,
+    function_call,
+    tools,
+    tool_choice
+  } = {}) => {
     if (!message.id) {
       message.id = generateId();
     }
@@ -1079,14 +1209,18 @@ function useChat({
       messages: (0, import_store.get)(messages).concat(message),
       options,
       ...functions !== void 0 && { functions },
-      ...function_call !== void 0 && { function_call }
+      ...function_call !== void 0 && { function_call },
+      ...tools !== void 0 && { tools },
+      ...tool_choice !== void 0 && { tool_choice }
     };
     return triggerRequest(chatRequest);
   };
   const reload = async ({
     options,
     functions,
-    function_call
+    function_call,
+    tools,
+    tool_choice
   } = {}) => {
     const messagesSnapshot = (0, import_store.get)(messages);
     if (messagesSnapshot.length === 0)
@@ -1097,7 +1231,9 @@ function useChat({
         messages: messagesSnapshot.slice(0, -1),
         options,
         ...functions !== void 0 && { functions },
-        ...function_call !== void 0 && { function_call }
+        ...function_call !== void 0 && { function_call },
+        ...tools !== void 0 && { tools },
+        ...tool_choice !== void 0 && { tool_choice }
       };
       return triggerRequest(chatRequest2);
     }
@@ -1105,7 +1241,9 @@ function useChat({
       messages: messagesSnapshot,
       options,
       ...functions !== void 0 && { functions },
-      ...function_call !== void 0 && { function_call }
+      ...function_call !== void 0 && { function_call },
+      ...tools !== void 0 && { tools },
+      ...tool_choice !== void 0 && { tool_choice }
     };
     return triggerRequest(chatRequest);
   };