@openrouter/ai-sdk-provider 0.0.4 → 0.0.6

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { LanguageModelV1 } from '@ai-sdk/provider';
+export { LanguageModelV1 } from '@ai-sdk/provider';
 
 type OpenRouterChatModelId = string;
 interface OpenRouterChatSettings {
@@ -49,6 +50,7 @@ type OpenRouterChatConfig = {
         path: string;
     }) => string;
     fetch?: typeof fetch;
+    extraBody?: Record<string, unknown>;
 };
 declare class OpenRouterChatLanguageModel implements LanguageModelV1 {
     readonly specificationVersion = "v1";
@@ -63,7 +65,7 @@ declare class OpenRouterChatLanguageModel implements LanguageModelV1 {
     doStream(options: Parameters<LanguageModelV1["doStream"]>[0]): Promise<Awaited<ReturnType<LanguageModelV1["doStream"]>>>;
 }
 
-type OpenRouterCompletionModelId = "openai/gpt-3.5-turbo-instruct" | (string & {});
+type OpenRouterCompletionModelId = string & {};
 interface OpenRouterCompletionSettings {
     /**
   Echo back the prompt in addition to the completion.
@@ -116,6 +118,7 @@ type OpenRouterCompletionConfig = {
         path: string;
     }) => string;
     fetch?: typeof fetch;
+    extraBody?: Record<string, unknown>;
 };
 declare class OpenRouterCompletionLanguageModel implements LanguageModelV1 {
     readonly specificationVersion = "v1";
@@ -158,14 +161,6 @@ interface OpenRouterProviderSettings {
        */
     apiKey?: string;
     /**
-  OpenRouter Organization.
-       */
-    organization?: string;
-    /**
-  OpenRouter project.
-       */
-    project?: string;
-    /**
   Custom headers to include in the requests.
        */
     headers?: Record<string, string>;
@@ -180,6 +175,10 @@ interface OpenRouterProviderSettings {
   or to provide a custom fetch implementation for e.g. testing.
       */
     fetch?: typeof fetch;
+    /**
+  A JSON object to send as the request body to access OpenRouter features & upstream provider features.
+    */
+    extraBody?: Record<string, unknown>;
 }
 /**
 Create an OpenRouter provider instance.
@@ -201,18 +200,10 @@ declare class OpenRouter {
     readonly baseURL: string;
     /**
   API key that is being send using the `Authorization` header.
-  It defaults to the `OPENAI_API_KEY` environment variable.
+  It defaults to the `OPENROUTER_API_KEY` environment variable.
    */
     readonly apiKey?: string;
     /**
-  OpenRouter Organization.
-     */
-    readonly organization?: string;
-    /**
-  OpenRouter project.
-     */
-    readonly project?: string;
-    /**
   Custom headers to include in the requests.
      */
     readonly headers?: Record<string, string>;
@@ -225,4 +216,6 @@ declare class OpenRouter {
     completion(modelId: OpenRouterCompletionModelId, settings?: OpenRouterCompletionSettings): OpenRouterCompletionLanguageModel;
 }
 
-export { OpenRouter, type OpenRouterProvider, type OpenRouterProviderSettings, createOpenRouter, openrouter };
+type OpenRouterLanguageModel = LanguageModelV1;
+
+export { OpenRouter, type OpenRouterLanguageModel, type OpenRouterProvider, type OpenRouterProviderSettings, createOpenRouter, openrouter };

package/dist/index.js

@@ -79,24 +79,39 @@ function convertToOpenRouterChatMessages(prompt) {
           messages.push({ role: "user", content: content[0].text });
           break;
         }
-        messages.push({
-          role: "user",
-          content: content.map((part) => {
+        const contentParts = content.map(
+          (part) => {
             var _a2;
             switch (part.type) {
-              case "text": {
-                return { type: "text", text: part.text };
-              }
-              case "image": {
+              case "text":
+                return {
+                  type: "text",
+                  text: part.text
+                };
+              case "image":
                 return {
                   type: "image_url",
                   image_url: {
                     url: part.image instanceof URL ? part.image.toString() : `data:${(_a2 = part.mimeType) != null ? _a2 : "image/jpeg"};base64,${(0, import_provider_utils.convertUint8ArrayToBase64)(part.image)}`
                   }
                 };
+              case "file":
+                return {
+                  type: "text",
+                  text: part.data instanceof URL ? part.data.toString() : part.data
+                };
+              default: {
+                const _exhaustiveCheck = part;
+                throw new Error(
+                  `Unsupported content part type: ${_exhaustiveCheck}`
+                );
               }
             }
-          })
+          }
+        );
+        messages.push({
+          role: "user",
+          content: contentParts
         });
         break;
       }
@@ -199,6 +214,9 @@ var openrouterFailedResponseHandler = (0, import_provider_utils2.createJsonError
 });
 
 // src/openrouter-chat-language-model.ts
+function isFunctionTool(tool) {
+  return "parameters" in tool;
+}
 var OpenRouterChatLanguageModel = class {
   constructor(modelId, settings, config) {
     this.specificationVersion = "v1";
@@ -221,7 +239,7 @@ var OpenRouterChatLanguageModel = class {
     seed
   }) {
     const type = mode.type;
-    const baseArgs = {
+    const baseArgs = __spreadValues({
       // model id:
       model: this.modelId,
       // model specific settings:
@@ -239,7 +257,7 @@ var OpenRouterChatLanguageModel = class {
       seed,
       // messages:
       messages: convertToOpenRouterChatMessages(prompt)
-    };
+    }, this.config.extraBody);
     switch (type) {
       case "regular": {
         return __spreadValues(__spreadValues({}, baseArgs), prepareToolsAndToolChoice(mode));
@@ -264,14 +282,11 @@ var OpenRouterChatLanguageModel = class {
           ]
         });
       }
-      case "object-grammar": {
-        throw new import_provider.UnsupportedFunctionalityError({
-          functionality: "object-grammar mode"
-        });
-      }
       default: {
         const _exhaustiveCheck = type;
-        throw new Error(`Unsupported type: ${_exhaustiveCheck}`);
+        throw new import_provider.UnsupportedFunctionalityError({
+          functionality: `${_exhaustiveCheck} mode`
+        });
       }
     }
   }
@@ -574,14 +589,25 @@ function prepareToolsAndToolChoice(mode) {
   if (tools == null) {
     return { tools: void 0, tool_choice: void 0 };
   }
-  const mappedTools = tools.map((tool) => ({
-    type: "function",
-    function: {
-      name: tool.name,
-      description: tool.description,
-      parameters: tool.parameters
+  const mappedTools = tools.map((tool) => {
+    if (isFunctionTool(tool)) {
+      return {
+        type: "function",
+        function: {
+          name: tool.name,
+          description: tool.description,
+          parameters: tool.parameters
+        }
+      };
+    } else {
+      return {
+        type: "function",
+        function: {
+          name: tool.name
+        }
+      };
     }
-  }));
+  });
   const toolChoice = mode.toolChoice;
   if (toolChoice == null) {
     return { tools: mappedTools, tool_choice: void 0 };
@@ -651,6 +677,15 @@ function convertToOpenRouterCompletionPrompt({
                 functionality: "images"
               });
             }
+            case "file": {
+              throw new import_provider2.UnsupportedFunctionalityError({
+                functionality: "file attachments"
+              });
+            }
+            default: {
+              const _exhaustiveCheck = part;
+              throw new Error(`Unsupported content type: ${_exhaustiveCheck}`);
+            }
           }
         }).join("");
         text += `${user}:
@@ -670,6 +705,10 @@ ${userMessage}
                 functionality: "tool-call messages"
               });
             }
+            default: {
+              const _exhaustiveCheck = part;
+              throw new Error(`Unsupported content type: ${_exhaustiveCheck}`);
+            }
           }
         }).join("");
         text += `${assistant}:
@@ -741,7 +780,7 @@ var OpenRouterCompletionLanguageModel = class {
     var _a;
     const type = mode.type;
     const { prompt: completionPrompt, stopSequences } = convertToOpenRouterCompletionPrompt({ prompt, inputFormat });
-    const baseArgs = {
+    const baseArgs = __spreadValues({
       // model id:
       model: this.modelId,
       // model specific settings:
@@ -761,7 +800,7 @@ var OpenRouterCompletionLanguageModel = class {
       prompt: completionPrompt,
       // stop sequences:
       stop: stopSequences
-    };
+    }, this.config.extraBody);
     switch (type) {
       case "regular": {
         if ((_a = mode.tools) == null ? void 0 : _a.length) {
@@ -786,14 +825,11 @@ var OpenRouterCompletionLanguageModel = class {
           functionality: "object-tool mode"
         });
       }
-      case "object-grammar": {
-        throw new import_provider3.UnsupportedFunctionalityError({
-          functionality: "object-grammar mode"
-        });
-      }
       default: {
         const _exhaustiveCheck = type;
-        throw new Error(`Unsupported type: ${_exhaustiveCheck}`);
+        throw new import_provider3.UnsupportedFunctionalityError({
+          functionality: `${_exhaustiveCheck} mode`
+        });
       }
     }
   }
@@ -961,22 +997,17 @@ var OpenRouter = class {
     var _a, _b;
     this.baseURL = (_b = (0, import_provider_utils5.withoutTrailingSlash)((_a = options.baseURL) != null ? _a : options.baseUrl)) != null ? _b : "https://openrouter.ai/api/v1";
     this.apiKey = options.apiKey;
-    this.organization = options.organization;
-    this.project = options.project;
     this.headers = options.headers;
   }
   get baseConfig() {
     return {
-      organization: this.organization,
       baseURL: this.baseURL,
       headers: () => __spreadValues({
         Authorization: `Bearer ${(0, import_provider_utils5.loadApiKey)({
           apiKey: this.apiKey,
-          environmentVariableName: "OPENAI_API_KEY",
+          environmentVariableName: "OPENROUTER_API_KEY",
           description: "OpenRouter"
-        })}`,
-        "OpenRouter-Organization": this.organization,
-        "OpenRouter-Project": this.project
+        })}`
       }, this.headers)
     };
   }
@@ -1007,25 +1038,25 @@ function createOpenRouter(options = {}) {
   const getHeaders = () => __spreadValues({
     Authorization: `Bearer ${(0, import_provider_utils6.loadApiKey)({
       apiKey: options.apiKey,
-      environmentVariableName: "OPENAI_API_KEY",
+      environmentVariableName: "OPENROUTER_API_KEY",
       description: "OpenRouter"
-    })}`,
-    "OpenRouter-Organization": options.organization,
-    "OpenRouter-Project": options.project
+    })}`
   }, options.headers);
   const createChatModel = (modelId, settings = {}) => new OpenRouterChatLanguageModel(modelId, settings, {
     provider: "openrouter.chat",
     url: ({ path }) => `${baseURL}${path}`,
     headers: getHeaders,
     compatibility,
-    fetch: options.fetch
+    fetch: options.fetch,
+    extraBody: options.extraBody
   });
   const createCompletionModel = (modelId, settings = {}) => new OpenRouterCompletionLanguageModel(modelId, settings, {
     provider: "openrouter.completion",
     url: ({ path }) => `${baseURL}${path}`,
     headers: getHeaders,
     compatibility,
-    fetch: options.fetch
+    fetch: options.fetch,
+    extraBody: options.extraBody
   });
   const createLanguageModel = (modelId, settings) => {
     if (new.target) {