@ai-sdk/openai-compatible 1.0.0-canary.1 → 1.0.0-canary.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @ai-sdk/openai-compatible
 
+## 1.0.0-canary.2
+
+### Patch Changes
+
+- Updated dependencies [c57e248]
+- Updated dependencies [33f4a6a]
+  - @ai-sdk/provider@2.0.0-canary.1
+  - @ai-sdk/provider-utils@3.0.0-canary.2
+
 ## 1.0.0-canary.1
 
 ### Patch Changes

package/dist/index.js

@@ -38,7 +38,7 @@ var import_provider = require("@ai-sdk/provider");
 var import_provider_utils = require("@ai-sdk/provider-utils");
 function getOpenAIMetadata(message) {
   var _a, _b;
-  return (_b = (_a = message == null ? void 0 : message.providerMetadata) == null ? void 0 : _a.openaiCompatible) != null ? _b : {};
+  return (_b = (_a = message == null ? void 0 : message.providerOptions) == null ? void 0 : _a.openaiCompatible) != null ? _b : {};
 }
 function convertToOpenAICompatibleChatMessages(prompt) {
   const messages = [];
@@ -191,16 +191,14 @@ var defaultOpenAICompatibleErrorStructure = {
 // src/openai-compatible-prepare-tools.ts
 var import_provider2 = require("@ai-sdk/provider");
 function prepareTools({
-  mode,
-  structuredOutputs
+  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) {
-    return { tools: void 0, tool_choice: void 0, toolWarnings };
+    return { tools: void 0, toolChoice: void 0, toolWarnings };
   }
-  const toolChoice = mode.toolChoice;
   const openaiCompatTools = [];
   for (const tool of tools) {
     if (tool.type === "provider-defined") {
@@ -217,22 +215,20 @@ function prepareTools({
     }
   }
   if (toolChoice == null) {
-    return { tools: openaiCompatTools, 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: openaiCompatTools, tool_choice: type, toolWarnings };
+      return { tools: openaiCompatTools, toolChoice: type, toolWarnings };
     case "tool":
       return {
         tools: openaiCompatTools,
-        tool_choice: {
+        toolChoice: {
           type: "function",
-          function: {
-            name: toolChoice.toolName
-          }
+          function: { name: toolChoice.toolName }
         },
         toolWarnings
       };
@@ -271,7 +267,6 @@ var OpenAICompatibleChatLanguageModel = class {
     return this.config.provider.split(".")[0].trim();
   }
   getArgs({
-    mode,
     prompt,
     maxTokens,
     temperature,
@@ -279,19 +274,17 @@ var OpenAICompatibleChatLanguageModel = class {
     topK,
     frequencyPenalty,
     presencePenalty,
-    providerMetadata,
+    providerOptions,
     stopSequences,
     responseFormat,
-    seed
+    seed,
+    toolChoice,
+    tools
   }) {
-    var _a, _b;
-    const type = mode.type;
+    var _a;
     const warnings = [];
     if (topK != null) {
-      warnings.push({
-        type: "unsupported-setting",
-        setting: "topK"
-      });
+      warnings.push({ type: "unsupported-setting", setting: "topK" });
     }
     if ((responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && !this.supportsStructuredOutputs) {
       warnings.push({
@@ -300,85 +293,45 @@ var OpenAICompatibleChatLanguageModel = 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,
-      // standardized settings:
-      max_tokens: maxTokens,
-      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
-        }
-      } : { type: "json_object" } : void 0,
-      stop: stopSequences,
-      seed,
-      ...providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName],
-      // messages:
-      messages: convertToOpenAICompatibleChatMessages(prompt)
+    const {
+      tools: openaiTools,
+      toolChoice: openaiToolChoice,
+      toolWarnings
+    } = prepareTools({
+      tools,
+      toolChoice
+    });
+    return {
+      args: {
+        // model id:
+        model: this.modelId,
+        // model specific settings:
+        user: this.settings.user,
+        // standardized settings:
+        max_tokens: maxTokens,
+        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
+          }
+        } : { type: "json_object" } : void 0,
+        stop: stopSequences,
+        seed,
+        ...providerOptions == null ? void 0 : providerOptions[this.providerOptionsName],
+        // messages:
+        messages: convertToOpenAICompatibleChatMessages(prompt),
+        // tools:
+        tools: openaiTools,
+        tool_choice: openaiToolChoice
+      },
+      warnings: [...warnings, ...toolWarnings]
     };
-    switch (type) {
-      case "regular": {
-        const { tools, tool_choice, toolWarnings } = prepareTools({
-          mode,
-          structuredOutputs: this.supportsStructuredOutputs
-        });
-        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,
-                name: (_b = mode.name) != null ? _b : "response",
-                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}`);
-      }
-    }
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
@@ -799,7 +752,6 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_zod2.z.union
 ]);
 
 // src/openai-compatible-completion-language-model.ts
-var import_provider5 = require("@ai-sdk/provider");
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_zod3 = require("zod");
 
@@ -910,7 +862,6 @@ var OpenAICompatibleCompletionLanguageModel = class {
     return this.config.provider.split(".")[0].trim();
   }
   getArgs({
-    mode,
     inputFormat,
     prompt,
     maxTokens,
@@ -922,16 +873,19 @@ var OpenAICompatibleCompletionLanguageModel = class {
     stopSequences: userStopSequences,
     responseFormat,
     seed,
-    providerMetadata
+    providerOptions,
+    tools,
+    toolChoice
   }) {
-    var _a;
-    const type = mode.type;
     const warnings = [];
     if (topK != null) {
-      warnings.push({
-        type: "unsupported-setting",
-        setting: "topK"
-      });
+      warnings.push({ type: "unsupported-setting", setting: "topK" });
+    }
+    if (tools == null ? void 0 : tools.length) {
+      warnings.push({ type: "unsupported-setting", setting: "tools" });
+    }
+    if (toolChoice != null) {
+      warnings.push({ type: "unsupported-setting", setting: "toolChoice" });
     }
     if (responseFormat != null && responseFormat.type !== "text") {
       warnings.push({
@@ -942,56 +896,30 @@ var OpenAICompatibleCompletionLanguageModel = class {
     }
     const { prompt: completionPrompt, stopSequences } = convertToOpenAICompatibleCompletionPrompt({ prompt, inputFormat });
     const stop = [...stopSequences != null ? stopSequences : [], ...userStopSequences != null ? userStopSequences : []];
-    const baseArgs = {
-      // model id:
-      model: this.modelId,
-      // model specific settings:
-      echo: this.settings.echo,
-      logit_bias: this.settings.logitBias,
-      suffix: this.settings.suffix,
-      user: this.settings.user,
-      // standardized settings:
-      max_tokens: maxTokens,
-      temperature,
-      top_p: topP,
-      frequency_penalty: frequencyPenalty,
-      presence_penalty: presencePenalty,
-      seed,
-      ...providerMetadata == null ? void 0 : providerMetadata[this.providerOptionsName],
-      // prompt:
-      prompt: completionPrompt,
-      // stop sequences:
-      stop: stop.length > 0 ? stop : void 0
+    return {
+      args: {
+        // model id:
+        model: this.modelId,
+        // model specific settings:
+        echo: this.settings.echo,
+        logit_bias: this.settings.logitBias,
+        suffix: this.settings.suffix,
+        user: this.settings.user,
+        // standardized settings:
+        max_tokens: maxTokens,
+        temperature,
+        top_p: topP,
+        frequency_penalty: frequencyPenalty,
+        presence_penalty: presencePenalty,
+        seed,
+        ...providerOptions == null ? void 0 : providerOptions[this.providerOptionsName],
+        // prompt:
+        prompt: completionPrompt,
+        // stop sequences:
+        stop: stop.length > 0 ? stop : void 0
+      },
+      warnings
     };
-    switch (type) {
-      case "regular": {
-        if ((_a = mode.tools) == null ? void 0 : _a.length) {
-          throw new import_provider5.UnsupportedFunctionalityError({
-            functionality: "tools"
-          });
-        }
-        if (mode.toolChoice) {
-          throw new import_provider5.UnsupportedFunctionalityError({
-            functionality: "toolChoice"
-          });
-        }
-        return { args: baseArgs, warnings };
-      }
-      case "object-json": {
-        throw new import_provider5.UnsupportedFunctionalityError({
-          functionality: "object-json mode"
-        });
-      }
-      case "object-tool": {
-        throw new import_provider5.UnsupportedFunctionalityError({
-          functionality: "object-tool mode"
-        });
-      }
-      default: {
-        const _exhaustiveCheck = type;
-        throw new Error(`Unsupported type: ${_exhaustiveCheck}`);
-      }
-    }
   }
   async doGenerate(options) {
     var _a, _b, _c, _d;
@@ -1150,7 +1078,7 @@ var createOpenAICompatibleCompletionChunkSchema = (errorSchema) => import_zod3.z
 ]);
 
 // src/openai-compatible-embedding-model.ts
-var import_provider6 = require("@ai-sdk/provider");
+var import_provider5 = require("@ai-sdk/provider");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
 var import_zod4 = require("zod");
 var OpenAICompatibleEmbeddingModel = class {
@@ -1178,7 +1106,7 @@ var OpenAICompatibleEmbeddingModel = class {
   }) {
     var _a;
     if (values.length > this.maxEmbeddingsPerCall) {
-      throw new import_provider6.TooManyEmbeddingValuesForCallError({
+      throw new import_provider5.TooManyEmbeddingValuesForCallError({
         provider: this.provider,
         modelId: this.modelId,
         maxEmbeddingsPerCall: this.maxEmbeddingsPerCall,