@friendliai/ai-provider 1.1.3 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @friendliai/ai-provider
 
+## 1.1.4
+
+### Patch Changes
+
+- f97fb70: Remove K-EXAONE from FSE model list
+- 3664158: Improve AI SDK compatibility in @friendliai/ai-provider by updating core SDK dependencies, wrapping Friendli JSON envelope chat errors as APICallError, and aligning chat usage and tool streaming events.
+
 ## 1.1.3
 
 ### Patch Changes

package/dist/index.d.mts

@@ -12,7 +12,7 @@ declare const friendliaiErrorSchema: z.ZodUnion<readonly [z.ZodObject<{
 }, z.core.$strip>]>;
 type FriendliAIErrorData = z.infer<typeof friendliaiErrorSchema>;
 
-declare const FriendliAIServerlessModelIds: readonly ["LGAI-EXAONE/K-EXAONE-236B-A23B", "MiniMaxAI/MiniMax-M2.5", "MiniMaxAI/MiniMax-M2.1", "zai-org/GLM-5", "zai-org/GLM-4.7", "zai-org/GLM-4.6", "LGAI-EXAONE/EXAONE-4.0.1-32B", "deepseek-ai/DeepSeek-V3.1", "meta-llama/Llama-4-Maverick-17B-128E-Instruct", "meta-llama/Llama-4-Scout-17B-16E-Instruct", "meta-llama/Llama-3.3-70B-Instruct", "meta-llama-3.3-70b-instruct", "meta-llama/Llama-3.1-8B-Instruct", "meta-llama-3.1-8b-instruct", "Qwen/Qwen3-235B-A22B-Thinking-2507", "Qwen/Qwen3-235B-A22B-Instruct-2507", "Qwen/Qwen3-30B-A3B", "Qwen/Qwen3-32B"];
+declare const FriendliAIServerlessModelIds: readonly ["MiniMaxAI/MiniMax-M2.5", "MiniMaxAI/MiniMax-M2.1", "zai-org/GLM-5", "zai-org/GLM-4.7", "zai-org/GLM-4.6", "meta-llama/Llama-4-Maverick-17B-128E-Instruct", "meta-llama/Llama-4-Scout-17B-16E-Instruct", "meta-llama/Llama-3.3-70B-Instruct", "meta-llama-3.3-70b-instruct", "meta-llama/Llama-3.1-8B-Instruct", "meta-llama-3.1-8b-instruct", "Qwen/Qwen3-235B-A22B-Thinking-2507", "Qwen/Qwen3-235B-A22B-Instruct-2507", "Qwen/Qwen3-30B-A3B", "Qwen/Qwen3-32B", "deepseek-ai/DeepSeek-V3.1", "LGAI-EXAONE/EXAONE-4.0.1-32B"];
 type FriendliAIServerlessModelId = (typeof FriendliAIServerlessModelIds)[number];
 type FriendliAILanguageModelId = FriendliAIServerlessModelId | (string & {});
 

package/dist/index.d.ts

@@ -12,7 +12,7 @@ declare const friendliaiErrorSchema: z.ZodUnion<readonly [z.ZodObject<{
 }, z.core.$strip>]>;
 type FriendliAIErrorData = z.infer<typeof friendliaiErrorSchema>;
 
-declare const FriendliAIServerlessModelIds: readonly ["LGAI-EXAONE/K-EXAONE-236B-A23B", "MiniMaxAI/MiniMax-M2.5", "MiniMaxAI/MiniMax-M2.1", "zai-org/GLM-5", "zai-org/GLM-4.7", "zai-org/GLM-4.6", "LGAI-EXAONE/EXAONE-4.0.1-32B", "deepseek-ai/DeepSeek-V3.1", "meta-llama/Llama-4-Maverick-17B-128E-Instruct", "meta-llama/Llama-4-Scout-17B-16E-Instruct", "meta-llama/Llama-3.3-70B-Instruct", "meta-llama-3.3-70b-instruct", "meta-llama/Llama-3.1-8B-Instruct", "meta-llama-3.1-8b-instruct", "Qwen/Qwen3-235B-A22B-Thinking-2507", "Qwen/Qwen3-235B-A22B-Instruct-2507", "Qwen/Qwen3-30B-A3B", "Qwen/Qwen3-32B"];
+declare const FriendliAIServerlessModelIds: readonly ["MiniMaxAI/MiniMax-M2.5", "MiniMaxAI/MiniMax-M2.1", "zai-org/GLM-5", "zai-org/GLM-4.7", "zai-org/GLM-4.6", "meta-llama/Llama-4-Maverick-17B-128E-Instruct", "meta-llama/Llama-4-Scout-17B-16E-Instruct", "meta-llama/Llama-3.3-70B-Instruct", "meta-llama-3.3-70b-instruct", "meta-llama/Llama-3.1-8B-Instruct", "meta-llama-3.1-8b-instruct", "Qwen/Qwen3-235B-A22B-Thinking-2507", "Qwen/Qwen3-235B-A22B-Instruct-2507", "Qwen/Qwen3-30B-A3B", "Qwen/Qwen3-32B", "deepseek-ai/DeepSeek-V3.1", "LGAI-EXAONE/EXAONE-4.0.1-32B"];
 type FriendliAIServerlessModelId = (typeof FriendliAIServerlessModelIds)[number];
 type FriendliAILanguageModelId = FriendliAIServerlessModelId | (string & {});
 

package/dist/index.js

@@ -119,6 +119,33 @@ var friendliaiFailedResponseHandler = async ({
     })
   };
 };
+var tryWrapFriendliJsonEnvelopeError = async (error) => {
+  if (!import_provider.APICallError.isInstance(error)) {
+    return void 0;
+  }
+  const responseBody = error.responseBody;
+  if (typeof responseBody !== "string" || responseBody.trim() === "") {
+    return void 0;
+  }
+  const parsedError = await (0, import_provider_utils.safeParseJSON)({
+    text: responseBody,
+    schema: friendliaiErrorSchema
+  });
+  if (!parsedError.success) {
+    return void 0;
+  }
+  return new import_provider.APICallError({
+    message: friendliaiErrorStructure.errorToMessage(parsedError.value),
+    url: error.url,
+    requestBodyValues: error.requestBodyValues,
+    statusCode: error.statusCode,
+    responseHeaders: error.responseHeaders,
+    responseBody: error.responseBody,
+    cause: error,
+    isRetryable: error.isRetryable,
+    data: parsedError.value
+  });
+};
 
 // src/friendli-prepare-tools.ts
 var import_provider2 = require("@ai-sdk/provider");
@@ -343,25 +370,32 @@ var FriendliAIChatLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a, _b;
     const { args, warnings } = await this.getArgs({ ...options, stream: false });
     const body = JSON.stringify(args);
-    const {
-      responseHeaders,
-      value: responseBody,
-      rawValue: rawResponse
-    } = await (0, import_provider_utils2.postJsonToApi)({
-      url: this.config.url({
-        path: "/chat/completions",
-        modelId: this.modelId
-      }),
-      headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
-      body: args,
-      failedResponseHandler: this.failedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils2.createJsonResponseHandler)(OpenAICompatibleChatResponseSchema),
-      abortSignal: options.abortSignal,
-      fetch: this.config.fetch
-    });
+    const response = await (async () => {
+      try {
+        return await (0, import_provider_utils2.postJsonToApi)({
+          url: this.config.url({
+            path: "/chat/completions",
+            modelId: this.modelId
+          }),
+          headers: (0, import_provider_utils2.combineHeaders)(this.config.headers(), options.headers),
+          body: args,
+          failedResponseHandler: this.failedResponseHandler,
+          successfulResponseHandler: (0, import_provider_utils2.createJsonResponseHandler)(OpenAICompatibleChatResponseSchema),
+          abortSignal: options.abortSignal,
+          fetch: this.config.fetch
+        });
+      } catch (error) {
+        const wrappedError = await tryWrapFriendliJsonEnvelopeError(error);
+        if (wrappedError != null) {
+          throw wrappedError;
+        }
+        throw error;
+      }
+    })();
+    const { responseHeaders, value: responseBody, rawValue: rawResponse } = response;
     const choice = responseBody.choices[0];
     const content = [];
     const text = choice.message.content;
@@ -391,19 +425,7 @@ var FriendliAIChatLanguageModel = class {
         unified: (0, import_internal.mapOpenAICompatibleFinishReason)(choice.finish_reason),
         raw: (_b = choice.finish_reason) != null ? _b : void 0
       },
-      usage: {
-        inputTokens: {
-          total: (_d = (_c = responseBody.usage) == null ? void 0 : _c.prompt_tokens) != null ? _d : void 0,
-          noCache: void 0,
-          cacheRead: (_g = (_f = (_e = responseBody.usage) == null ? void 0 : _e.prompt_tokens_details) == null ? void 0 : _f.cached_tokens) != null ? _g : void 0,
-          cacheWrite: void 0
-        },
-        outputTokens: {
-          total: (_i = (_h = responseBody.usage) == null ? void 0 : _h.completion_tokens) != null ? _i : void 0,
-          text: void 0,
-          reasoning: (_l = (_k = (_j = responseBody.usage) == null ? void 0 : _j.completion_tokens_details) == null ? void 0 : _k.reasoning_tokens) != null ? _l : void 0
-        }
-      },
+      usage: (0, import_internal.convertOpenAICompatibleChatUsage)(responseBody.usage),
       // providerMetadata,
       request: { body },
       response: {
@@ -441,19 +463,7 @@ var FriendliAIChatLanguageModel = class {
       unified: "other",
       raw: void 0
     };
-    const usage = {
-      completionTokens: void 0,
-      completionTokensDetails: {
-        reasoningTokens: void 0,
-        acceptedPredictionTokens: void 0,
-        rejectedPredictionTokens: void 0
-      },
-      promptTokens: void 0,
-      promptTokensDetails: {
-        cachedTokens: void 0
-      },
-      totalTokens: void 0
-    };
+    let usage = void 0;
     let isFirstChunk = true;
     const providerOptionsName = "friendliai";
     let currentTextId = null;
@@ -468,6 +478,9 @@ var FriendliAIChatLanguageModel = class {
           // We narrow with type guards for safe handling.
           transform(chunk, controller) {
             var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+            if (options.includeRawChunks) {
+              controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
+            }
             if (!chunk.success) {
               finishReason = { unified: "error", raw: void 0 };
               controller.enqueue({ type: "error", error: chunk.error });
@@ -541,28 +554,7 @@ var FriendliAIChatLanguageModel = class {
               });
             }
             if (chunkValue.usage != null) {
-              const {
-                prompt_tokens,
-                completion_tokens,
-                total_tokens,
-                prompt_tokens_details,
-                completion_tokens_details
-              } = chunkValue.usage;
-              usage.promptTokens = prompt_tokens != null ? prompt_tokens : void 0;
-              usage.completionTokens = completion_tokens != null ? completion_tokens : void 0;
-              usage.totalTokens = total_tokens != null ? total_tokens : void 0;
-              if ((completion_tokens_details == null ? void 0 : completion_tokens_details.reasoning_tokens) != null) {
-                usage.completionTokensDetails.reasoningTokens = completion_tokens_details == null ? void 0 : completion_tokens_details.reasoning_tokens;
-              }
-              if ((completion_tokens_details == null ? void 0 : completion_tokens_details.accepted_prediction_tokens) != null) {
-                usage.completionTokensDetails.acceptedPredictionTokens = completion_tokens_details == null ? void 0 : completion_tokens_details.accepted_prediction_tokens;
-              }
-              if ((completion_tokens_details == null ? void 0 : completion_tokens_details.rejected_prediction_tokens) != null) {
-                usage.completionTokensDetails.rejectedPredictionTokens = completion_tokens_details == null ? void 0 : completion_tokens_details.rejected_prediction_tokens;
-              }
-              if ((prompt_tokens_details == null ? void 0 : prompt_tokens_details.cached_tokens) != null) {
-                usage.promptTokensDetails.cachedTokens = prompt_tokens_details == null ? void 0 : prompt_tokens_details.cached_tokens;
-              }
+              usage = chunkValue.usage;
             }
             const choice = chunkValue.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
@@ -634,6 +626,11 @@ var FriendliAIChatLanguageModel = class {
                     },
                     hasFinished: false
                   };
+                  controller.enqueue({
+                    type: "tool-input-start",
+                    id: toolCallDelta.id,
+                    toolName: toolCallDelta.function.name
+                  });
                   const toolCall2 = toolCalls[index];
                   if (((_g = toolCall2.function) == null ? void 0 : _g.name) != null && ((_h = toolCall2.function) == null ? void 0 : _h.arguments) != null) {
                     if (toolCall2.function.arguments.length > 0) {
@@ -644,6 +641,10 @@ var FriendliAIChatLanguageModel = class {
                       });
                     }
                     if ((0, import_provider_utils2.isParsableJson)(toolCall2.function.arguments)) {
+                      controller.enqueue({
+                        type: "tool-input-end",
+                        id: toolCall2.id
+                      });
                       controller.enqueue({
                         type: "tool-call",
                         toolCallId: (_i = toolCall2.id) != null ? _i : (0, import_provider_utils2.generateId)(),
@@ -668,6 +669,10 @@ var FriendliAIChatLanguageModel = class {
                   delta: (_n = (_m = toolCallDelta.function) == null ? void 0 : _m.arguments) != null ? _n : ""
                 });
                 if (((_o = toolCall.function) == null ? void 0 : _o.name) != null && ((_p = toolCall.function) == null ? void 0 : _p.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
+                  controller.enqueue({
+                    type: "tool-input-end",
+                    id: toolCall.id
+                  });
                   controller.enqueue({
                     type: "tool-call",
                     toolCallId: (_q = toolCall.id) != null ? _q : (0, import_provider_utils2.generateId)(),
@@ -680,7 +685,7 @@ var FriendliAIChatLanguageModel = class {
             }
           },
           flush(controller) {
-            var _a2, _b, _c, _d;
+            var _a2, _b, _c;
             if (currentReasoningId != null) {
               controller.enqueue({
                 type: "reasoning-end",
@@ -693,32 +698,34 @@ var FriendliAIChatLanguageModel = class {
                 id: currentTextId
               });
             }
+            for (const toolCall of toolCalls.filter(
+              (pendingToolCall) => !pendingToolCall.hasFinished
+            )) {
+              controller.enqueue({
+                type: "tool-input-end",
+                id: toolCall.id
+              });
+              controller.enqueue({
+                type: "tool-call",
+                toolCallId: (_a2 = toolCall.id) != null ? _a2 : (0, import_provider_utils2.generateId)(),
+                toolName: toolCall.function.name,
+                input: toolCall.function.arguments
+              });
+            }
             const providerMetadata = {
               [providerOptionsName]: {},
               ...metadataExtractor == null ? void 0 : metadataExtractor.buildMetadata()
             };
-            if (usage.completionTokensDetails.acceptedPredictionTokens != null) {
-              providerMetadata[providerOptionsName].acceptedPredictionTokens = usage.completionTokensDetails.acceptedPredictionTokens;
+            if (((_b = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _b.accepted_prediction_tokens) != null) {
+              providerMetadata[providerOptionsName].acceptedPredictionTokens = usage.completion_tokens_details.accepted_prediction_tokens;
             }
-            if (usage.completionTokensDetails.rejectedPredictionTokens != null) {
-              providerMetadata[providerOptionsName].rejectedPredictionTokens = usage.completionTokensDetails.rejectedPredictionTokens;
+            if (((_c = usage == null ? void 0 : usage.completion_tokens_details) == null ? void 0 : _c.rejected_prediction_tokens) != null) {
+              providerMetadata[providerOptionsName].rejectedPredictionTokens = usage.completion_tokens_details.rejected_prediction_tokens;
             }
             controller.enqueue({
               type: "finish",
               finishReason,
-              usage: {
-                inputTokens: {
-                  total: (_a2 = usage.promptTokens) != null ? _a2 : void 0,
-                  noCache: void 0,
-                  cacheRead: (_b = usage.promptTokensDetails.cachedTokens) != null ? _b : void 0,
-                  cacheWrite: void 0
-                },
-                outputTokens: {
-                  total: (_c = usage.completionTokens) != null ? _c : void 0,
-                  text: void 0,
-                  reasoning: (_d = usage.completionTokensDetails.reasoningTokens) != null ? _d : void 0
-                }
-              },
+              usage: (0, import_internal.convertOpenAICompatibleChatUsage)(usage),
               providerMetadata
             });
           }
@@ -848,14 +855,11 @@ var friendliProviderOptionsSchema = import_v4.z.object({
 
 // src/friendli-settings.ts
 var FriendliAIServerlessModelIds = [
-  "LGAI-EXAONE/K-EXAONE-236B-A23B",
   "MiniMaxAI/MiniMax-M2.5",
   "MiniMaxAI/MiniMax-M2.1",
   "zai-org/GLM-5",
   "zai-org/GLM-4.7",
   "zai-org/GLM-4.6",
-  "LGAI-EXAONE/EXAONE-4.0.1-32B",
-  "deepseek-ai/DeepSeek-V3.1",
   "meta-llama/Llama-4-Maverick-17B-128E-Instruct",
   "meta-llama/Llama-4-Scout-17B-16E-Instruct",
   "meta-llama/Llama-3.3-70B-Instruct",
@@ -865,7 +869,9 @@ var FriendliAIServerlessModelIds = [
   "Qwen/Qwen3-235B-A22B-Thinking-2507",
   "Qwen/Qwen3-235B-A22B-Instruct-2507",
   "Qwen/Qwen3-30B-A3B",
-  "Qwen/Qwen3-32B"
+  "Qwen/Qwen3-32B",
+  "deepseek-ai/DeepSeek-V3.1",
+  "LGAI-EXAONE/EXAONE-4.0.1-32B"
 ];
 
 // src/friendli-tools.ts