@friendliai/ai-provider 0.2.5 → 0.2.7-alpha.0

package/dist/index.js

@@ -47,7 +47,8 @@ var import_zod2 = require("zod");
 var import_zod = require("zod");
 var import_provider_utils = require("@ai-sdk/provider-utils");
 var friendliaiErrorSchema = import_zod.z.object({
-  message: import_zod.z.string()
+  message: import_zod.z.string(),
+  error: import_zod.z.record(import_zod.z.any())
 });
 var friendliaiErrorStructure = {
   errorSchema: friendliaiErrorSchema,
@@ -60,70 +61,51 @@ var friendliaiFailedResponseHandler = (0, import_provider_utils.createJsonErrorR
 // src/friendli-prepare-tools.ts
 var import_provider = require("@ai-sdk/provider");
 function prepareTools({
-  mode,
-  tools: hostedTools
+  tools,
+  toolChoice
 }) {
-  var _a;
-  const tools = ((_a = mode.tools) == null ? void 0 : _a.length) ? mode.tools : void 0;
+  tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
-  if (tools == null && hostedTools == null) {
-    return { tools: void 0, tool_choice: void 0, toolWarnings };
+  if (tools == null) {
+    return { tools: void 0, toolChoice: void 0, toolWarnings };
   }
-  const toolChoice = mode.toolChoice;
-  const mappedTools = [];
-  if (tools) {
-    for (const tool of tools) {
-      if (tool.type === "provider-defined") {
-        toolWarnings.push({ type: "unsupported-tool", tool });
-      } else {
-        mappedTools.push({
-          type: "function",
-          function: {
-            name: tool.name,
-            description: tool.description,
-            parameters: tool.parameters
-          }
-        });
-      }
+  const openaiCompatTools = [];
+  for (const tool of tools) {
+    if (tool.type === "provider-defined") {
+      toolWarnings.push({ type: "unsupported-tool", tool });
+    } else {
+      openaiCompatTools.push({
+        type: "function",
+        function: {
+          name: tool.name,
+          description: tool.description,
+          parameters: tool.parameters
+        }
+      });
     }
   }
-  const mappedHostedTools = hostedTools == null ? void 0 : hostedTools.map((tool) => {
-    return {
-      type: tool.type
-    };
-  });
   if (toolChoice == null) {
-    return {
-      tools: [...mappedTools != null ? mappedTools : [], ...mappedHostedTools != null ? mappedHostedTools : []],
-      tool_choice: void 0,
-      toolWarnings
-    };
+    return { tools: openaiCompatTools, toolChoice: void 0, toolWarnings };
   }
   const type = toolChoice.type;
   switch (type) {
     case "auto":
     case "none":
     case "required":
-      return {
-        tools: [...mappedTools != null ? mappedTools : [], ...mappedHostedTools != null ? mappedHostedTools : []],
-        tool_choice: type,
-        toolWarnings
-      };
+      return { tools: openaiCompatTools, toolChoice: type, toolWarnings };
     case "tool":
       return {
-        tools: [...mappedTools != null ? mappedTools : [], ...mappedHostedTools != null ? mappedHostedTools : []],
-        tool_choice: {
+        tools: openaiCompatTools,
+        toolChoice: {
           type: "function",
-          function: {
-            name: toolChoice.toolName
-          }
+          function: { name: toolChoice.toolName }
         },
         toolWarnings
       };
     default: {
       const _exhaustiveCheck = type;
       throw new import_provider.UnsupportedFunctionalityError({
-        functionality: `Unsupported tool choice type: ${_exhaustiveCheck}`
+        functionality: `tool choice type: ${_exhaustiveCheck}`
       });
     }
   }
@@ -131,39 +113,48 @@ function prepareTools({
 
 // src/friendli-chat-language-model.ts
 var FriendliAIChatLanguageModel = class {
-  constructor(modelId, settings, config) {
-    this.specificationVersion = "v1";
+  // type inferred via constructor
+  constructor(modelId, config) {
+    this.specificationVersion = "v2";
     var _a;
     this.modelId = modelId;
-    this.settings = settings;
     this.config = config;
+    const errorStructure = friendliaiErrorStructure;
+    this.chunkSchema = createOpenAICompatibleChatChunkSchema(
+      errorStructure.errorSchema
+    );
     this.failedResponseHandler = (0, import_provider_utils2.createJsonErrorResponseHandler)(
       friendliaiErrorStructure
     );
     this.supportsStructuredOutputs = (_a = config.supportsStructuredOutputs) != null ? _a : true;
   }
-  get defaultObjectGenerationMode() {
-    var _a;
-    return (_a = this.config.defaultObjectGenerationMode) != null ? _a : "json";
-  }
   get provider() {
     return this.config.provider;
   }
-  getArgs({
-    mode,
+  get supportedUrls() {
+    var _a, _b, _c;
+    return (_c = (_b = (_a = this.config).supportedUrls) == null ? void 0 : _b.call(_a)) != null ? _c : {};
+  }
+  async getArgs({
     prompt,
-    maxTokens,
+    maxOutputTokens,
     temperature,
     topP,
     topK,
     frequencyPenalty,
     presencePenalty,
+    // providerOptions,
     stopSequences,
     responseFormat,
-    seed
+    seed,
+    toolChoice,
+    tools
   }) {
-    const type = mode.type;
+    var _a;
     const warnings = [];
+    if (topK != null) {
+      warnings.push({ type: "unsupported-setting", setting: "topK" });
+    }
     if ((responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !this.supportsStructuredOutputs) {
       warnings.push({
         type: "unsupported-setting",
@@ -171,220 +162,173 @@ var FriendliAIChatLanguageModel = class {
         details: "JSON response format schema is only supported with structuredOutputs"
       });
     }
-    const baseArgs = {
-      // model id:
-      model: this.modelId,
-      // model specific settings:
-      user: this.settings.user,
-      parallel_tool_calls: this.settings.parallelToolCalls,
-      // standardized settings:
-      max_tokens: maxTokens,
-      temperature,
-      top_p: topP,
-      top_k: topK,
-      frequency_penalty: frequencyPenalty,
-      presence_penalty: presencePenalty,
-      response_format: (responseFormat == null ? void 0 : responseFormat.type) === "json" ? this.supportsStructuredOutputs === true && responseFormat.schema != null ? {
-        type: "json_schema",
-        json_schema: {
-          schema: responseFormat.schema,
-          description: responseFormat.description
-        }
-      } : { type: "json_object" } : void 0,
-      stop: stopSequences,
-      seed,
-      // messages:
-      messages: (0, import_internal.convertToOpenAICompatibleChatMessages)(prompt)
-    };
-    if (this.settings.regex != null && type !== "regular") {
-      throw new import_provider2.UnsupportedFunctionalityError({
-        functionality: "egular expression is only supported with regular mode (generateText, streamText)"
-      });
-    }
-    switch (type) {
-      case "regular": {
-        if (this.settings.regex != null) {
-          if (this.settings.tools != null || mode.tools != null) {
-            throw new import_provider2.UnsupportedFunctionalityError({
-              functionality: "Regular expression and tools cannot be used together. Use either regular expression or tools."
-            });
+    const {
+      tools: openaiTools,
+      toolChoice: openaiToolChoice,
+      toolWarnings
+    } = prepareTools({
+      tools,
+      toolChoice
+    });
+    return {
+      args: {
+        // model id:
+        model: this.modelId,
+        // model specific settings:
+        // user: compatibleOptions.user,
+        // standardized settings:
+        max_tokens: maxOutputTokens,
+        temperature,
+        top_p: topP,
+        frequency_penalty: frequencyPenalty,
+        presence_penalty: presencePenalty,
+        response_format: (responseFormat == null ? void 0 : responseFormat.type) === "json" ? this.supportsStructuredOutputs === true && responseFormat.schema != null ? {
+          type: "json_schema",
+          json_schema: {
+            schema: responseFormat.schema,
+            name: (_a = responseFormat.name) != null ? _a : "response",
+            description: responseFormat.description
           }
-          return {
-            args: {
-              ...baseArgs,
-              response_format: {
-                type: "regex",
-                schema: this.settings.regex.source
-              }
-            },
-            warnings
-          };
-        }
-        const { tools, tool_choice, toolWarnings } = prepareTools({
-          mode,
-          tools: this.settings.tools
-        });
-        return {
-          args: { ...baseArgs, tools, tool_choice },
-          warnings: [...warnings, ...toolWarnings]
-        };
-      }
-      case "object-json": {
-        return {
-          args: {
-            ...baseArgs,
-            response_format: this.supportsStructuredOutputs === true && mode.schema != null ? {
-              type: "json_schema",
-              json_schema: {
-                schema: mode.schema,
-                description: mode.description
-              }
-            } : { type: "json_object" }
-          },
-          warnings
-        };
-      }
-      case "object-tool": {
-        return {
-          args: {
-            ...baseArgs,
-            tool_choice: {
-              type: "function",
-              function: { name: mode.tool.name }
-            },
-            tools: [
-              {
-                type: "function",
-                function: {
-                  name: mode.tool.name,
-                  description: mode.tool.description,
-                  parameters: mode.tool.parameters
-                }
-              }
-            ]
-          },
-          warnings
-        };
-      }
-      default: {
-        const _exhaustiveCheck = type;
-        throw new Error(`Unsupported type: ${_exhaustiveCheck}`);
-      }
-    }
+        } : { type: "json_object" } : void 0,
+        stop: stopSequences,
+        seed,
+        // ...providerOptions?.[this.providerOptionsName],
+        // reasoning_effort: compatibleOptions.reasoningEffort,
+        // messages:
+        messages: (0, import_internal.convertToOpenAICompatibleChatMessages)(prompt),
+        // tools:
+        tools: openaiTools,
+        tool_choice: openaiToolChoice
+      },
+      warnings: [...warnings, ...toolWarnings]
+    };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f;
-    const { args, warnings } = this.getArgs({ ...options });
-    const body = JSON.stringify({ ...args, stream: false });
-    const { responseHeaders, value: response } = await (0, import_provider_utils2.postJsonToApi)({
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    const { args, warnings } = await this.getArgs({ ...options });
+    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,
-        stream: false
-      },
+      body: args,
       failedResponseHandler: this.failedResponseHandler,
       successfulResponseHandler: (0, import_provider_utils2.createJsonResponseHandler)(
-        friendliAIChatResponseSchema
+        OpenAICompatibleChatResponseSchema
       ),
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const { messages: rawPrompt, ...rawSettings } = args;
-    const choice = response.choices[0];
-    return {
-      text: (_a = choice.message.content) != null ? _a : void 0,
-      toolCalls: (_b = choice.message.tool_calls) == null ? void 0 : _b.map((toolCall) => {
-        var _a2;
-        return {
+    const choice = responseBody.choices[0];
+    const content = [];
+    const text = choice.message.content;
+    if (text != null && text.length > 0) {
+      content.push({ type: "text", text });
+    }
+    const reasoning = choice.message.reasoning_content;
+    if (reasoning != null && reasoning.length > 0) {
+      content.push({
+        type: "reasoning",
+        text: reasoning
+      });
+    }
+    if (choice.message.tool_calls != null) {
+      for (const toolCall of choice.message.tool_calls) {
+        content.push({
+          type: "tool-call",
           toolCallType: "function",
-          toolCallId: (_a2 = toolCall.id) != null ? _a2 : (0, import_provider_utils2.generateId)(),
+          toolCallId: (_a = toolCall.id) != null ? _a : (0, import_provider_utils2.generateId)(),
           toolName: toolCall.function.name,
-          args: typeof toolCall.function.arguments === "string" ? toolCall.function.arguments : JSON.stringify(toolCall.function.arguments)
-        };
-      }),
+          args: toolCall.function.arguments
+        });
+      }
+    }
+    return {
+      content,
       finishReason: (0, import_internal.mapOpenAICompatibleFinishReason)(choice.finish_reason),
       usage: {
-        promptTokens: (_d = (_c = response.usage) == null ? void 0 : _c.prompt_tokens) != null ? _d : NaN,
-        completionTokens: (_f = (_e = response.usage) == null ? void 0 : _e.completion_tokens) != null ? _f : NaN
+        inputTokens: (_c = (_b = responseBody.usage) == null ? void 0 : _b.prompt_tokens) != null ? _c : void 0,
+        outputTokens: (_e = (_d = responseBody.usage) == null ? void 0 : _d.completion_tokens) != null ? _e : void 0,
+        totalTokens: (_g = (_f = responseBody.usage) == null ? void 0 : _f.total_tokens) != null ? _g : void 0,
+        reasoningTokens: (_j = (_i = (_h = responseBody.usage) == null ? void 0 : _h.completion_tokens_details) == null ? void 0 : _i.reasoning_tokens) != null ? _j : void 0,
+        cachedInputTokens: (_m = (_l = (_k = responseBody.usage) == null ? void 0 : _k.prompt_tokens_details) == null ? void 0 : _l.cached_tokens) != null ? _m : void 0
       },
-      rawCall: { rawPrompt, rawSettings },
-      rawResponse: { headers: responseHeaders },
-      response: (0, import_internal.getResponseMetadata)(response),
-      warnings,
-      request: { body }
+      // providerMetadata,
+      request: { body },
+      response: {
+        ...(0, import_internal.getResponseMetadata)(responseBody),
+        headers: responseHeaders,
+        body: rawResponse
+      },
+      warnings
     };
   }
   async doStream(options) {
-    const { args, warnings } = this.getArgs({ ...options });
-    const body = JSON.stringify({ ...args, stream: true });
+    var _a;
+    const { args, warnings } = await this.getArgs({ ...options });
+    const body = {
+      ...args,
+      stream: true,
+      // only include stream_options when in strict compatibility mode:
+      stream_options: this.config.includeUsage ? { include_usage: true } : void 0
+    };
+    const metadataExtractor = (_a = this.config.metadataExtractor) == null ? void 0 : _a.createStreamExtractor();
     const { responseHeaders, value: response } = 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,
-        stream: true,
-        stream_options: { include_usage: true }
-      },
-      failedResponseHandler: friendliaiFailedResponseHandler,
+      body,
+      failedResponseHandler: this.failedResponseHandler,
       successfulResponseHandler: (0, import_provider_utils2.createEventSourceResponseHandler)(
-        friendliaiChatChunkSchema
+        this.chunkSchema
       ),
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const { messages: rawPrompt, ...rawSettings } = args;
     const toolCalls = [];
     let finishReason = "unknown";
-    let usage = {
+    const usage = {
+      completionTokens: void 0,
+      completionTokensDetails: {
+        reasoningTokens: void 0,
+        acceptedPredictionTokens: void 0,
+        rejectedPredictionTokens: void 0
+      },
       promptTokens: void 0,
-      completionTokens: void 0
+      promptTokensDetails: {
+        cachedTokens: void 0
+      },
+      totalTokens: void 0
     };
     let isFirstChunk = true;
-    let providerMetadata;
+    const providerOptionsName = "friendliai";
     return {
       stream: response.pipeThrough(
         new TransformStream({
+          start(controller) {
+            controller.enqueue({ type: "stream-start", warnings });
+          },
+          // TODO we lost type safety on Chunk, most likely due to the error schema. MUST FIX
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
             if (!chunk.success) {
               finishReason = "error";
               controller.enqueue({ type: "error", error: chunk.error });
               return;
             }
             const value = chunk.value;
-            if ("status" in value) {
-              switch (value.status) {
-                case "STARTED":
-                  break;
-                case "UPDATING":
-                  break;
-                case "ENDED":
-                  break;
-                case "ERRORED":
-                  finishReason = "error";
-                  break;
-                default:
-                  finishReason = "error";
-                  controller.enqueue({
-                    type: "error",
-                    error: new Error(
-                      `Unsupported tool call status: ${value.status}`
-                    )
-                  });
-              }
-              return;
-            }
-            if ("message" in value) {
-              console.error("Error chunk:", value);
+            metadataExtractor == null ? void 0 : metadataExtractor.processChunk(chunk.rawValue);
+            if ("error" in value) {
               finishReason = "error";
-              controller.enqueue({ type: "error", error: value.message });
+              controller.enqueue({ type: "error", error: value.error.message });
               return;
             }
             if (isFirstChunk) {
@@ -395,10 +339,28 @@ var FriendliAIChatLanguageModel = class {
               });
             }
             if (value.usage != null) {
-              usage = {
-                promptTokens: (_a = value.usage.prompt_tokens) != null ? _a : void 0,
-                completionTokens: (_b = value.usage.completion_tokens) != null ? _b : void 0
-              };
+              const {
+                prompt_tokens,
+                completion_tokens,
+                total_tokens,
+                prompt_tokens_details,
+                completion_tokens_details
+              } = value.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;
+              }
             }
             const choice = value.choices[0];
             if ((choice == null ? void 0 : choice.finish_reason) != null) {
@@ -410,10 +372,16 @@ var FriendliAIChatLanguageModel = class {
               return;
             }
             const delta = choice.delta;
+            if (delta.reasoning_content != null) {
+              controller.enqueue({
+                type: "reasoning",
+                text: delta.reasoning_content
+              });
+            }
             if (delta.content != null) {
               controller.enqueue({
-                type: "text-delta",
-                textDelta: delta.content
+                type: "text",
+                text: delta.content
               });
             }
             if (delta.tool_calls != null) {
@@ -432,7 +400,7 @@ var FriendliAIChatLanguageModel = class {
                       message: `Expected 'id' to be a string.`
                     });
                   }
-                  if (((_c = toolCallDelta.function) == null ? void 0 : _c.name) == null) {
+                  if (((_a2 = toolCallDelta.function) == null ? void 0 : _a2.name) == null) {
                     throw new import_provider2.InvalidResponseDataError({
                       data: toolCallDelta,
                       message: `Expected 'function.name' to be a string.`
@@ -443,11 +411,12 @@ var FriendliAIChatLanguageModel = class {
                     type: "function",
                     function: {
                       name: toolCallDelta.function.name,
-                      arguments: (_d = toolCallDelta.function.arguments) != null ? _d : ""
-                    }
+                      arguments: (_b = toolCallDelta.function.arguments) != null ? _b : ""
+                    },
+                    hasFinished: false
                   };
                   const toolCall2 = toolCalls[index];
-                  if (((_e = toolCall2.function) == null ? void 0 : _e.name) != null && ((_f = toolCall2.function) == null ? void 0 : _f.arguments) != null) {
+                  if (((_c = toolCall2.function) == null ? void 0 : _c.name) != null && ((_d = toolCall2.function) == null ? void 0 : _d.arguments) != null) {
                     if (toolCall2.function.arguments.length > 0) {
                       controller.enqueue({
                         type: "tool-call-delta",
@@ -461,55 +430,71 @@ var FriendliAIChatLanguageModel = class {
                       controller.enqueue({
                         type: "tool-call",
                         toolCallType: "function",
-                        toolCallId: (_g = toolCall2.id) != null ? _g : (0, import_provider_utils2.generateId)(),
+                        toolCallId: (_e = toolCall2.id) != null ? _e : (0, import_provider_utils2.generateId)(),
                         toolName: toolCall2.function.name,
                         args: toolCall2.function.arguments
                       });
+                      toolCall2.hasFinished = true;
                     }
                   }
                   continue;
                 }
                 const toolCall = toolCalls[index];
-                if (((_h = toolCallDelta.function) == null ? void 0 : _h.arguments) != null) {
-                  toolCall.function.arguments += (_j = (_i = toolCallDelta.function) == null ? void 0 : _i.arguments) != null ? _j : "";
+                if (toolCall.hasFinished) {
+                  continue;
+                }
+                if (((_f = toolCallDelta.function) == null ? void 0 : _f.arguments) != null) {
+                  toolCall.function.arguments += (_h = (_g = toolCallDelta.function) == null ? void 0 : _g.arguments) != null ? _h : "";
                 }
                 controller.enqueue({
                   type: "tool-call-delta",
                   toolCallType: "function",
                   toolCallId: toolCall.id,
                   toolName: toolCall.function.name,
-                  argsTextDelta: (_k = toolCallDelta.function.arguments) != null ? _k : ""
+                  argsTextDelta: (_i = toolCallDelta.function.arguments) != null ? _i : ""
                 });
-                if (((_l = toolCall.function) == null ? void 0 : _l.name) != null && ((_m = toolCall.function) == null ? void 0 : _m.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
+                if (((_j = toolCall.function) == null ? void 0 : _j.name) != null && ((_k = toolCall.function) == null ? void 0 : _k.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
                   controller.enqueue({
                     type: "tool-call",
                     toolCallType: "function",
-                    toolCallId: (_n = toolCall.id) != null ? _n : (0, import_provider_utils2.generateId)(),
+                    toolCallId: (_l = toolCall.id) != null ? _l : (0, import_provider_utils2.generateId)(),
                     toolName: toolCall.function.name,
                     args: toolCall.function.arguments
                   });
+                  toolCall.hasFinished = true;
                 }
               }
             }
           },
           flush(controller) {
-            var _a, _b;
+            var _a2, _b, _c, _d, _e;
+            const providerMetadata = {
+              [providerOptionsName]: {},
+              ...metadataExtractor == null ? void 0 : metadataExtractor.buildMetadata()
+            };
+            if (usage.completionTokensDetails.acceptedPredictionTokens != null) {
+              providerMetadata[providerOptionsName].acceptedPredictionTokens = usage.completionTokensDetails.acceptedPredictionTokens;
+            }
+            if (usage.completionTokensDetails.rejectedPredictionTokens != null) {
+              providerMetadata[providerOptionsName].rejectedPredictionTokens = usage.completionTokensDetails.rejectedPredictionTokens;
+            }
             controller.enqueue({
               type: "finish",
               finishReason,
               usage: {
-                promptTokens: (_a = usage.promptTokens) != null ? _a : NaN,
-                completionTokens: (_b = usage.completionTokens) != null ? _b : NaN
+                inputTokens: (_a2 = usage.promptTokens) != null ? _a2 : void 0,
+                outputTokens: (_b = usage.completionTokens) != null ? _b : void 0,
+                totalTokens: (_c = usage.totalTokens) != null ? _c : void 0,
+                reasoningTokens: (_d = usage.completionTokensDetails.reasoningTokens) != null ? _d : void 0,
+                cachedInputTokens: (_e = usage.promptTokensDetails.cachedTokens) != null ? _e : void 0
               },
-              ...providerMetadata != null ? { providerMetadata } : {}
+              providerMetadata
             });
           }
         })
       ),
-      rawCall: { rawPrompt, rawSettings },
-      rawResponse: { headers: responseHeaders },
-      warnings,
-      request: { body }
+      request: { body },
+      response: { headers: responseHeaders }
     };
   }
 };
@@ -593,6 +578,75 @@ var friendliaiChatChunkSchema = import_zod2.z.union([
   }),
   friendliaiErrorSchema
 ]);
+var openaiCompatibleTokenUsageSchema = import_zod2.z.object({
+  prompt_tokens: import_zod2.z.number().nullish(),
+  completion_tokens: import_zod2.z.number().nullish(),
+  total_tokens: import_zod2.z.number().nullish(),
+  prompt_tokens_details: import_zod2.z.object({
+    cached_tokens: import_zod2.z.number().nullish()
+  }).nullish(),
+  completion_tokens_details: import_zod2.z.object({
+    reasoning_tokens: import_zod2.z.number().nullish(),
+    accepted_prediction_tokens: import_zod2.z.number().nullish(),
+    rejected_prediction_tokens: import_zod2.z.number().nullish()
+  }).nullish()
+}).nullish();
+var OpenAICompatibleChatResponseSchema = import_zod2.z.object({
+  id: import_zod2.z.string().nullish(),
+  created: import_zod2.z.number().nullish(),
+  model: import_zod2.z.string().nullish(),
+  choices: import_zod2.z.array(
+    import_zod2.z.object({
+      message: import_zod2.z.object({
+        role: import_zod2.z.literal("assistant").nullish(),
+        content: import_zod2.z.string().nullish(),
+        reasoning_content: import_zod2.z.string().nullish(),
+        tool_calls: import_zod2.z.array(
+          import_zod2.z.object({
+            id: import_zod2.z.string().nullish(),
+            type: import_zod2.z.literal("function"),
+            function: import_zod2.z.object({
+              name: import_zod2.z.string(),
+              arguments: import_zod2.z.string()
+            })
+          })
+        ).nullish()
+      }),
+      finish_reason: import_zod2.z.string().nullish()
+    })
+  ),
+  usage: openaiCompatibleTokenUsageSchema
+});
+var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_zod2.z.union([
+  import_zod2.z.object({
+    id: import_zod2.z.string().nullish(),
+    created: import_zod2.z.number().nullish(),
+    model: import_zod2.z.string().nullish(),
+    choices: import_zod2.z.array(
+      import_zod2.z.object({
+        delta: import_zod2.z.object({
+          role: import_zod2.z.enum(["assistant"]).nullish(),
+          content: import_zod2.z.string().nullish(),
+          reasoning_content: import_zod2.z.string().nullish(),
+          tool_calls: import_zod2.z.array(
+            import_zod2.z.object({
+              index: import_zod2.z.number(),
+              id: import_zod2.z.string().nullish(),
+              type: import_zod2.z.literal("function").nullish(),
+              function: import_zod2.z.object({
+                name: import_zod2.z.string().nullish(),
+                arguments: import_zod2.z.string().nullish()
+              })
+            })
+          ).nullish()
+        }).nullish(),
+        finish_reason: import_zod2.z.string().nullish()
+      })
+    ),
+    usage: openaiCompatibleTokenUsageSchema
+  }),
+  errorSchema
+]);
 
 // src/friendli-provider.ts
 function createFriendli(options = {}) {
@@ -645,28 +699,29 @@ function createFriendli(options = {}) {
       };
     }
   };
-  const createChatModel = (modelId, settings = {}) => {
+  const createChatModel = (modelId) => {
     const { baseURL, type } = baseURLAutoSelect(
       modelId,
-      settings.endpoint || "auto",
-      options.baseURL,
-      settings.tools
+      // settings.endpoint || 'auto',
+      "auto",
+      options.baseURL
+      // settings.tools,
     );
-    return new FriendliAIChatLanguageModel(modelId, settings, {
+    return new FriendliAIChatLanguageModel(modelId, {
       provider: `friendliai.${type}.chat`,
       url: ({ path }) => `${baseURL}${path}`,
       headers: getHeaders,
-      fetch: options.fetch,
-      defaultObjectGenerationMode: "json"
+      fetch: options.fetch
     });
   };
-  const createCompletionModel = (modelId, settings = {}) => {
+  const createCompletionModel = (modelId) => {
     const { baseURL, type } = baseURLAutoSelect(
       modelId,
-      settings.endpoint || "auto",
+      // settings.endpoint || 'auto',
+      "auto",
       options.baseURL
     );
-    return new import_openai_compatible.OpenAICompatibleCompletionLanguageModel(modelId, settings, {
+    return new import_openai_compatible.OpenAICompatibleCompletionLanguageModel(modelId, {
       provider: `friendliai.${type}.completion`,
       url: ({ path }) => `${baseURL}${path}`,
       headers: getHeaders,
@@ -674,25 +729,24 @@ function createFriendli(options = {}) {
       errorStructure: friendliaiErrorStructure
     });
   };
-  const createBetaModel = (modelId, settings = {}) => {
+  const createBetaModel = (modelId) => {
     const { baseURL, type } = baseURLAutoSelect(
       modelId,
       "beta",
       options.baseURL
     );
-    return new FriendliAIChatLanguageModel(modelId, settings, {
+    return new FriendliAIChatLanguageModel(modelId, {
       provider: `friendliai.${type}.chat`,
       url: ({ path }) => `${baseURL}${path}`,
       headers: getHeaders,
-      fetch: options.fetch,
-      defaultObjectGenerationMode: "json"
+      fetch: options.fetch
     });
   };
   const createTextEmbeddingModel = (modelId) => {
     throw new import_provider3.NoSuchModelError({ modelId, modelType: "textEmbeddingModel" });
   };
-  const provider = function(modelId, settings) {
-    return createChatModel(modelId, settings);
+  const provider = function(modelId) {
+    return createChatModel(modelId);
   };
   provider.beta = createBetaModel;
   provider.chat = createChatModel;