ai-sdk-ollama 3.7.1 → 3.8.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 3.8.1
+
+### Patch Changes
+
+- aeafdd6: - Update `generateText` to detect and use the stable `output` option instead of the deprecated `experimental_output` when `enableToolsWithStructuredOutput` is enabled, including a two-phase tools + structured output path and an integration test to guard this behavior.
+
+## 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

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
@@ -16423,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({
@@ -16455,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({
@@ -16657,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({
@@ -16909,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
     });
@@ -16939,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 })
@@ -16959,6 +17066,17 @@ var ollama = createOllama();
 
 // src/functions/generate-text.ts
 var import_ai3 = require("ai");
+function resultWithOverrides(base, overrides) {
+  const descriptors = {};
+  for (const key of Object.keys(overrides)) {
+    descriptors[key] = {
+      value: overrides[key],
+      enumerable: true,
+      configurable: true
+    };
+  }
+  return Object.create(base, descriptors);
+}
 async function generateText(options) {
   const { enhancedOptions = {}, ...generateTextOptions } = options;
   const {
@@ -16969,33 +17087,42 @@ async function generateText(options) {
     enableToolsWithStructuredOutput = false
   } = enhancedOptions;
   const hasTools = generateTextOptions.tools && Object.keys(generateTextOptions.tools).length > 0;
-  const hasExperimentalOutput = "experimental_output" in generateTextOptions;
+  const hasOutput = "output" in generateTextOptions;
   const requiresTools = generateTextOptions.toolChoice === "required" || typeof generateTextOptions.toolChoice === "object" && "type" in generateTextOptions.toolChoice && generateTextOptions.toolChoice.type === "tool";
-  if (enableToolsWithStructuredOutput && hasExperimentalOutput && requiresTools && hasTools) {
-    const toolResult = await (0, import_ai3.generateText)({
-      ...generateTextOptions,
-      experimental_output: void 0
-    });
+  if (enableToolsWithStructuredOutput && hasOutput && requiresTools && hasTools) {
+    const phase1Options = Object.fromEntries(
+      Object.entries(generateTextOptions).filter(([key]) => key !== "output")
+    );
+    const toolResult = await (0, import_ai3.generateText)(
+      phase1Options
+    );
     if (toolResult.toolCalls && toolResult.toolCalls.length > 0) {
       const toolContext = toolResult.toolResults?.map(
-        (tr, i) => `${toolResult.toolCalls?.[i]?.toolName}: ${JSON.stringify(tr.output || tr)}`
+        (tr, i) => `${toolResult.toolCalls?.[i]?.toolName}: ${JSON.stringify(tr.output ?? tr)}`
       ).join("\n");
-      const contextualPrompt = typeof generateTextOptions.prompt === "string" ? `${generateTextOptions.prompt}
+      const toolResultsSuffix = `
 
 Tool Results:
 ${toolContext}
 
-Please provide a structured response based on these tool results.` : generateTextOptions.prompt;
-      const _generateTextOptions = {
-        ...generateTextOptions,
-        prompt: contextualPrompt,
-        tools: void 0,
-        toolChoice: void 0
-      };
+Please provide a structured response based on these tool results.`;
+      const phase2Base = Object.fromEntries(
+        Object.entries(generateTextOptions).filter(
+          ([key]) => key !== "tools" && key !== "toolChoice"
+        )
+      );
+      const phase2OptionsWithPrompt = typeof phase2Base.prompt === "string" ? { ...phase2Base, prompt: phase2Base.prompt + toolResultsSuffix } : phase2Base.messages ? {
+        ...phase2Base,
+        prompt: void 0,
+        messages: [
+          ...phase2Base.messages,
+          { role: "user", content: toolResultsSuffix.trim() }
+        ]
+      } : phase2Base;
       const structuredResult = await (0, import_ai3.generateText)(
-        _generateTextOptions
+        phase2OptionsWithPrompt
       );
-      const enhancedResult = Object.assign(structuredResult, {
+      const enhancedResult = resultWithOverrides(structuredResult, {
         toolCalls: toolResult.toolCalls,
         toolResults: toolResult.toolResults,
         staticToolCalls: toolResult.staticToolCalls,
@@ -17003,9 +17130,9 @@ Please provide a structured response based on these tool results.` : generateTex
         staticToolResults: toolResult.staticToolResults,
         dynamicToolResults: toolResult.dynamicToolResults,
         usage: {
-          inputTokens: (toolResult.usage.inputTokens || 0) + (structuredResult.usage.inputTokens || 0),
-          outputTokens: (toolResult.usage.outputTokens || 0) + (structuredResult.usage.outputTokens || 0),
-          totalTokens: (toolResult.usage.totalTokens || 0) + (structuredResult.usage.totalTokens || 0)
+          inputTokens: (toolResult.usage.inputTokens ?? 0) + (structuredResult.usage.inputTokens ?? 0),
+          outputTokens: (toolResult.usage.outputTokens ?? 0) + (structuredResult.usage.outputTokens ?? 0),
+          totalTokens: (toolResult.usage.totalTokens ?? 0) + (structuredResult.usage.totalTokens ?? 0)
         }
       });
       return enhancedResult;
@@ -17016,7 +17143,9 @@ Please provide a structured response based on these tool results.` : generateTex
     // Only set stopWhen default if user didn't provide one and tools are enabled
     stopWhen: generateTextOptions.stopWhen ?? (hasTools ? (0, import_ai3.stepCountIs)(5) : void 0)
   });
-  const toolsWereCalled = result.steps?.some((step) => step.toolCalls && step.toolCalls.length > 0) ?? false;
+  const toolsWereCalled = result.steps?.some(
+    (step) => step.toolCalls && step.toolCalls.length > 0
+  ) ?? false;
   const hasMinimalText = !result.text || result.text.trim().length < minResponseLength;
   if (!hasTools || !toolsWereCalled || !hasMinimalText || !enableSynthesis) {
     return result;
@@ -17048,11 +17177,16 @@ Tool results:
 ${toolContext}
 
 ${synthesisPrompt}`;
-      const { tools, prompt, messages, ...baseOptions } = generateTextOptions;
-      const synthesisOptions = messages ? {
+      const generateOptions = generateTextOptions;
+      const baseOptions = Object.fromEntries(
+        Object.entries(generateOptions).filter(
+          ([key]) => key !== "tools" && key !== "prompt" && key !== "messages"
+        )
+      );
+      const synthesisOptions = generateOptions.messages ? {
         ...baseOptions,
         messages: [
-          ...messages || [],
+          ...generateOptions.messages || [],
           { role: "user", content: fullSynthesisPrompt }
         ]
       } : {
@@ -17063,12 +17197,12 @@ ${synthesisPrompt}`;
         synthesisOptions
       );
       if (synthesisResult.text && synthesisResult.text.trim().length >= minResponseLength) {
-        const enhancedResult = Object.assign(result, {
+        const enhancedResult = resultWithOverrides(result, {
           text: synthesisResult.text,
           usage: {
-            inputTokens: (result.usage.inputTokens || 0) + (synthesisResult.usage.inputTokens || 0),
-            outputTokens: (result.usage.outputTokens || 0) + (synthesisResult.usage.outputTokens || 0),
-            totalTokens: (result.usage.totalTokens || 0) + (synthesisResult.usage.totalTokens || 0)
+            inputTokens: (result.usage.inputTokens ?? 0) + (synthesisResult.usage.inputTokens ?? 0),
+            outputTokens: (result.usage.outputTokens ?? 0) + (synthesisResult.usage.outputTokens ?? 0),
+            totalTokens: (result.usage.totalTokens ?? 0) + (synthesisResult.usage.totalTokens ?? 0)
           }
         });
         return enhancedResult;