ai-sdk-ollama 3.7.0 → 3.8.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 3.8.0
+
+### Minor Changes
+
+- ed617f1: - **Fix:** Make `OllamaProviderOptions`, `OllamaChatProviderOptions`, and `OllamaEmbeddingProviderOptions` compatible with the AI SDK's `providerOptions` (`Record<string, JSONObject>`). They are now defined as type aliases from Zod schemas (`z.infer`), so passing e.g. `providerOptions: { ollama: { structuredOutputs: true } }` into `streamText`, `generateText`, or `ToolLoopAgent` type-checks correctly (fixes #548).
+  - **New:** Export provider option Zod schemas: `ollamaProviderOptionsSchema`, `ollamaChatProviderOptionsSchema`, `ollamaEmbeddingProviderOptionsSchema`, and `ollamaRerankingProviderOptionsSchema` for validation or parsing.
+  - **New:** Image generation support via `ollama.imageModel(modelId)` and `OllamaImageModel`, using the AI SDK's `generateImage()` and experimental Ollama image models (e.g. `x/z-image-turbo`, `x/flux2-klein`). Supports `providerOptions.ollama` (e.g. `steps`, `negative_prompt`).
+  - **Change:** Reranking model now uses `parseProviderOptions` from `@ai-sdk/provider-utils` for `providerOptions.ollama`; `OllamaRerankingProviderOptions` is now a type inferred from the exported schema.
+
+## 3.7.1
+
+### Patch Changes
+
+- 70def97: Support media/image content in tool result messages. When a tool returns `output.type === 'content'` with `image-data`, `image-url`, or `file-data` (image) parts, the provider now sends them in the tool message's `images` array to Ollama. Fixes #527.
+
 ## 3.7.0
 
 ### Minor Changes

package/dist/index.browser.cjs

@@ -35,7 +35,6 @@ __export(index_browser_exports, {
 module.exports = __toCommonJS(index_browser_exports);
 
 // src/provider.browser.ts
-var import_provider = require("@ai-sdk/provider");
 var import_browser = require("ollama/browser");
 
 // src/utils/tool-calling-reliability.ts
@@ -375,6 +374,29 @@ ${finalInstruction}`;
 }
 
 // src/utils/convert-to-ollama-messages.ts
+function normalizeImageDataForOllama(imageData) {
+  if (imageData instanceof URL) {
+    if (imageData.protocol === "data:") {
+      const base64Match = imageData.href.match(/data:[^;]+;base64,(.+)/);
+      const extracted = base64Match?.[1];
+      if (typeof extracted === "string") return extracted;
+      return imageData.href;
+    }
+    return imageData.href;
+  }
+  if (typeof imageData === "string") {
+    if (imageData.startsWith("data:")) {
+      const base64Match = imageData.match(/data:[^;]+;base64,(.+)/);
+      const extracted = base64Match?.[1];
+      if (typeof extracted === "string") return extracted;
+    }
+    return imageData;
+  }
+  if (imageData instanceof Uint8Array) {
+    return Buffer.from(imageData).toString("base64");
+  }
+  return null;
+}
 function convertToOllamaChatMessages(prompt) {
   const messages = [];
   for (const message of prompt) {
@@ -396,35 +418,7 @@ function convertToOllamaChatMessages(prompt) {
           const textParts = message.content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
           const imageParts = message.content.filter(
             (part) => part.type === "file"
-          ).filter((part) => {
-            return part.mediaType?.startsWith("image/") || false;
-          }).map((part) => {
-            const imageData = part.data;
-            if (imageData instanceof URL) {
-              if (imageData.protocol === "data:") {
-                const base64Match = imageData.href.match(
-                  /data:[^;]+;base64,(.+)/
-                );
-                if (base64Match) {
-                  return base64Match[1];
-                }
-                return imageData.href;
-              }
-              return imageData.href;
-            } else if (typeof imageData === "string") {
-              if (imageData.startsWith("data:")) {
-                const base64Match = imageData.match(/data:[^;]+;base64,(.+)/);
-                if (base64Match) {
-                  return base64Match[1];
-                }
-              }
-              return imageData;
-            } else if (imageData instanceof Uint8Array) {
-              return Buffer.from(imageData).toString("base64");
-            } else {
-              return null;
-            }
-          }).filter((img) => img !== null);
+          ).filter((part) => part.mediaType?.startsWith("image/") ?? false).map((part) => normalizeImageDataForOllama(part.data)).filter((img) => img !== null);
           messages.push({
             role: "user",
             content: textParts || "",
@@ -473,14 +467,48 @@ function convertToOllamaChatMessages(prompt) {
           });
         } else {
           for (const part of message.content) {
-            if (part.type === "tool-result") {
-              const contentValue = part.output.type === "text" || part.output.type === "error-text" ? part.output.value : part.output.type === "json" || part.output.type === "error-json" ? JSON.stringify(part.output.value) : JSON.stringify(part.output);
+            if (part.type !== "tool-result") continue;
+            if (part.output.type === "content") {
+              const textParts = [];
+              const imageParts = [];
+              for (const item of part.output.value) {
+                switch (item.type) {
+                  case "text": {
+                    textParts.push(item.text);
+                    break;
+                  }
+                  case "image-data": {
+                    const normalized = normalizeImageDataForOllama(item.data);
+                    if (normalized) imageParts.push(normalized);
+                    break;
+                  }
+                  case "image-url": {
+                    imageParts.push(item.url);
+                    break;
+                  }
+                  case "file-data": {
+                    if (item.mediaType?.startsWith("image/")) {
+                      const normalized = normalizeImageDataForOllama(item.data);
+                      if (normalized) imageParts.push(normalized);
+                    }
+                    break;
+                  }
+                }
+              }
               messages.push({
                 role: "tool",
-                content: contentValue,
-                tool_name: part.toolName
+                content: textParts.join("\n") || "",
+                tool_name: part.toolName,
+                images: imageParts.length > 0 ? imageParts : void 0
               });
+              continue;
             }
+            const contentValue = part.output.type === "text" || part.output.type === "error-text" ? part.output.value : part.output.type === "json" || part.output.type === "error-json" ? JSON.stringify(part.output.value) : part.output.type === "execution-denied" ? "" : JSON.stringify(part.output);
+            messages.push({
+              role: "tool",
+              content: contentValue,
+              tool_name: part.toolName
+            });
           }
         }
         break;
@@ -16394,6 +16422,7 @@ var ollamaRerankingResponseSchema = external_exports.object({
   )
 });
 var ollamaRerankingProviderOptionsSchema = external_exports.object({
+  /** Custom instruction for this specific reranking call. Overrides the instruction set in model settings. */
   instruction: external_exports.string().optional()
 });
 var ollamaErrorSchema = external_exports.object({
@@ -16426,15 +16455,11 @@ var OllamaRerankingModel = class {
     providerOptions
   }) {
     const warnings = [];
-    let rerankingOptions;
-    if (providerOptions?.ollama) {
-      const parsed = ollamaRerankingProviderOptionsSchema.safeParse(
-        providerOptions.ollama
-      );
-      if (parsed.success) {
-        rerankingOptions = parsed.data;
-      }
-    }
+    const rerankingOptions = await (0, import_provider_utils2.parseProviderOptions)({
+      provider: "ollama",
+      providerOptions,
+      schema: ollamaRerankingProviderOptionsSchema
+    });
     let documentValues;
     if (documents.type === "object") {
       warnings.push({
@@ -16628,6 +16653,115 @@ var OllamaEmbeddingRerankingModel = class {
   }
 };
 
+// src/models/image-model.ts
+var import_provider_utils3 = require("@ai-sdk/provider-utils");
+var ollamaImageProviderOptionsSchema = external_exports.object({
+  steps: external_exports.number().optional(),
+  negative_prompt: external_exports.string().optional()
+});
+var OllamaImageModel = class {
+  constructor(modelId, config2) {
+    this.config = config2;
+    __publicField(this, "specificationVersion", "v3");
+    __publicField(this, "provider");
+    __publicField(this, "modelId");
+    __publicField(this, "maxImagesPerCall", 1);
+    this.modelId = modelId;
+    this.provider = config2.provider;
+  }
+  async doGenerate(options) {
+    const {
+      prompt,
+      size,
+      aspectRatio,
+      seed,
+      providerOptions,
+      abortSignal,
+      headers: optHeaders
+    } = options;
+    if (prompt == null || prompt === "") {
+      throw new OllamaError({ message: "Image generation requires a prompt" });
+    }
+    const url2 = `${this.config.baseURL.replace(/\/$/, "")}/api/generate`;
+    const body = {
+      model: this.modelId,
+      prompt,
+      stream: false
+    };
+    if (size) {
+      const [w, h] = size.split("x").map(Number);
+      if (!Number.isNaN(w)) body.width = w;
+      if (!Number.isNaN(h)) body.height = h;
+    }
+    if (aspectRatio && body.width == null && body.height == null) {
+      const [ratioW, ratioH] = aspectRatio.split(":").map(Number);
+      if (ratioW != null && ratioH != null && !Number.isNaN(ratioW) && !Number.isNaN(ratioH) && ratioW > 0 && ratioH > 0) {
+        const target = 1024;
+        body.width = Math.round(target * Math.sqrt(ratioW / ratioH));
+        body.height = Math.round(target * Math.sqrt(ratioH / ratioW));
+      }
+    }
+    if (seed != null) {
+      const opts = typeof body.options === "object" && body.options ? body.options : {};
+      body.options = { ...opts, seed };
+    }
+    const po = await (0, import_provider_utils3.parseProviderOptions)({
+      provider: "ollama",
+      providerOptions,
+      schema: ollamaImageProviderOptionsSchema
+    });
+    if (po?.steps != null) body.steps = po.steps;
+    if (po?.negative_prompt != null) body.negative_prompt = po.negative_prompt;
+    const headers = {
+      "Content-Type": "application/json",
+      ...this.config.headers(),
+      ...optHeaders
+    };
+    const res = await (this.config.fetch ?? fetch)(url2, {
+      method: "POST",
+      headers,
+      body: JSON.stringify(body),
+      signal: abortSignal
+    });
+    if (!res.ok) {
+      const errBody = await res.json().catch(() => ({}));
+      throw new OllamaError({
+        message: errBody.error ?? `Ollama API error: ${res.status} ${res.statusText}`
+      });
+    }
+    const data = await res.json();
+    const images = [];
+    if (Array.isArray(data.images) && data.images.length > 0) {
+      images.push(...data.images);
+    } else if (typeof data.image === "string" && data.image.trim().length > 0) {
+      images.push(data.image.trim());
+    } else if (typeof data.response === "string" && data.response.trim().length > 0) {
+      const trimmed = data.response.trim();
+      if (/^[A-Za-z0-9+/=]+$/.test(trimmed) && trimmed.length > 100) {
+        images.push(trimmed);
+      }
+    }
+    const responseHeaders = {};
+    for (const [key, value] of res.headers.entries()) {
+      responseHeaders[key] = value;
+    }
+    return {
+      images,
+      warnings: [],
+      response: {
+        timestamp: /* @__PURE__ */ new Date(),
+        modelId: data.model ?? this.modelId,
+        headers: Object.keys(responseHeaders).length > 0 ? responseHeaders : void 0
+      },
+      usage: data.eval_count == null ? void 0 : {
+        inputTokens: void 0,
+        outputTokens: data.eval_count,
+        totalTokens: data.eval_count
+      }
+    };
+  }
+};
+
 // src/tool/web-search.ts
 var import_ai = require("ai");
 var webSearchInputSchema = external_exports.object({
@@ -16880,10 +17014,10 @@ function createOllama(options = {}) {
     });
   };
   const createRerankingModel = (modelId, settings = {}) => {
-    const baseURL = options.baseURL ?? "http://127.0.0.1:11434";
+    const baseURL2 = options.baseURL ?? "http://127.0.0.1:11434";
     return new OllamaRerankingModel(modelId, settings, {
       provider: "ollama.reranking",
-      baseURL,
+      baseURL: baseURL2,
       headers: () => normalizedHeaders,
       fetch: options.fetch
     });
@@ -16910,13 +17044,15 @@ function createOllama(options = {}) {
   provider.reranking = createRerankingModel;
   provider.rerankingModel = createRerankingModel;
   provider.embeddingReranking = createEmbeddingRerankingModel;
-  provider.imageModel = (modelId) => {
-    throw new import_provider.NoSuchModelError({
-      modelId,
-      modelType: "imageModel",
-      message: "Image generation is not supported by Ollama"
-    });
-  };
+  const baseURL = options.baseURL ?? "http://127.0.0.1:11434";
+  const createImageModel = (modelId) => new OllamaImageModel(modelId, {
+    provider: "ollama",
+    modelId,
+    baseURL,
+    headers: () => normalizedHeaders,
+    fetch: options.fetch
+  });
+  provider.imageModel = createImageModel;
   const toolsWithClient = {
     webSearch: (options2 = {}) => ollamaTools.webSearch({ ...options2, client }),
     webFetch: (options2 = {}) => ollamaTools.webFetch({ ...options2, client })