@sisu-ai/adapter-ollama 9.0.1 → 9.0.2

package/README.md

@@ -1,3 +1,9 @@
+<div align="right">
+  <a href="https://github.com/finger-gun/sisu"><img src="https://github.com/finger-gun/sisu/raw/main/sisu-light.svg" alt="ProjectSpecs" width="100" /></a>
+</div>
+
+---
+
 # @sisu-ai/adapter-ollama
 
 Ollama Chat adapter with native tools support.
@@ -116,3 +122,78 @@ Discover what you can do through examples or documentation. Check it out at http
 - [License](https://github.com/finger-gun/sisu/blob/main/LICENSE)
 - [Report a Bug](https://github.com/finger-gun/sisu/issues/new?template=bug_report.md)
 - [Request a Feature](https://github.com/finger-gun/sisu/issues/new?template=feature_request.md)
+
+---
+
+## Documentation
+
+**Core** — [Package docs](packages/core/README.md) · [Error types](packages/core/ERROR_TYPES.md)
+
+**Adapters** — [OpenAI](packages/adapters/openai/README.md) · [Anthropic](packages/adapters/anthropic/README.md) · [Ollama](packages/adapters/ollama/README.md)
+
+<details>
+<summary>All middleware packages</summary>
+
+- [@sisu-ai/mw-agent-run-api](packages/middleware/agent-run-api/README.md)
+- [@sisu-ai/mw-context-compressor](packages/middleware/context-compressor/README.md)
+- [@sisu-ai/mw-control-flow](packages/middleware/control-flow/README.md)
+- [@sisu-ai/mw-conversation-buffer](packages/middleware/conversation-buffer/README.md)
+- [@sisu-ai/mw-cors](packages/middleware/cors/README.md)
+- [@sisu-ai/mw-error-boundary](packages/middleware/error-boundary/README.md)
+- [@sisu-ai/mw-guardrails](packages/middleware/guardrails/README.md)
+- [@sisu-ai/mw-invariants](packages/middleware/invariants/README.md)
+- [@sisu-ai/mw-orchestration](packages/middleware/orchestration/README.md)
+- [@sisu-ai/mw-rag](packages/middleware/rag/README.md)
+- [@sisu-ai/mw-react-parser](packages/middleware/react-parser/README.md)
+- [@sisu-ai/mw-register-tools](packages/middleware/register-tools/README.md)
+- [@sisu-ai/mw-tool-calling](packages/middleware/tool-calling/README.md)
+- [@sisu-ai/mw-trace-viewer](packages/middleware/trace-viewer/README.md)
+- [@sisu-ai/mw-usage-tracker](packages/middleware/usage-tracker/README.md)
+</details>
+
+<details>
+<summary>All tool packages</summary>
+
+- [@sisu-ai/tool-aws-s3](packages/tools/aws-s3/README.md)
+- [@sisu-ai/tool-azure-blob](packages/tools/azure-blob/README.md)
+- [@sisu-ai/tool-extract-urls](packages/tools/extract-urls/README.md)
+- [@sisu-ai/tool-github-projects](packages/tools/github-projects/README.md)
+- [@sisu-ai/tool-summarize-text](packages/tools/summarize-text/README.md)
+- [@sisu-ai/tool-terminal](packages/tools/terminal/README.md)
+- [@sisu-ai/tool-vec-chroma](packages/tools/vec-chroma/README.md)
+- [@sisu-ai/tool-web-fetch](packages/tools/web-fetch/README.md)
+- [@sisu-ai/tool-web-search-duckduckgo](packages/tools/web-search-duckduckgo/README.md)
+- [@sisu-ai/tool-web-search-google](packages/tools/web-search-google/README.md)
+- [@sisu-ai/tool-web-search-openai](packages/tools/web-search-openai/README.md)
+- [@sisu-ai/tool-wikipedia](packages/tools/wikipedia/README.md)
+</details>
+
+<details>
+<summary>All examples</summary>
+
+**Anthropic** — [hello](examples/anthropic-hello/README.md) · [control-flow](examples/anthropic-control-flow/README.md) · [stream](examples/anthropic-stream/README.md) · [weather](examples/anthropic-weather/README.md)
+
+**Ollama** — [hello](examples/ollama-hello/README.md) · [stream](examples/ollama-stream/README.md) · [vision](examples/ollama-vision/README.md) · [weather](examples/ollama-weather/README.md) · [web-search](examples/ollama-web-search/README.md)
+
+**OpenAI** — [hello](examples/openai-hello/README.md) · [weather](examples/openai-weather/README.md) · [stream](examples/openai-stream/README.md) · [vision](examples/openai-vision/README.md) · [reasoning](examples/openai-reasoning/README.md) · [react](examples/openai-react/README.md) · [control-flow](examples/openai-control-flow/README.md) · [branch](examples/openai-branch/README.md) · [parallel](examples/openai-parallel/README.md) · [graph](examples/openai-graph/README.md) · [orchestration](examples/openai-orchestration/README.md) · [orchestration-adaptive](examples/openai-orchestration-adaptive/README.md) · [guardrails](examples/openai-guardrails/README.md) · [error-handling](examples/openai-error-handling/README.md) · [rag-chroma](examples/openai-rag-chroma/README.md) · [web-search](examples/openai-web-search/README.md) · [web-fetch](examples/openai-web-fetch/README.md) · [wikipedia](examples/openai-wikipedia/README.md) · [terminal](examples/openai-terminal/README.md) · [github-projects](examples/openai-github-projects/README.md) · [server](examples/openai-server/README.md) · [aws-s3](examples/openai-aws-s3/README.md) · [azure-blob](examples/openai-azure-blob/README.md)
+</details>
+
+---
+
+## Contributing
+
+We build Sisu in the open. Contributions welcome.
+
+[Contributing Guide](CONTRIBUTING.md) · [Report a Bug](https://github.com/finger-gun/sisu/issues/new?template=bug_report.md) · [Request a Feature](https://github.com/finger-gun/sisu/issues/new?template=feature_request.md) · [Code of Conduct](CODE_OF_CONDUCT.md)
+
+---
+
+<div align="center">
+
+**[Star on GitHub](https://github.com/finger-gun/sisu)** if Sisu helps you build better agents.
+
+*Quiet, determined, relentlessly useful.*
+
+[Apache 2.0 License](LICENSE)
+
+</div>

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { LLM } from '@sisu-ai/core';
+import type { LLM } from "@sisu-ai/core";
 export interface OllamaAdapterOptions {
     model: string;
     baseUrl?: string;

package/dist/index.js

@@ -1,24 +1,29 @@
-import { firstConfigValue } from '@sisu-ai/core';
+import { firstConfigValue } from "@sisu-ai/core";
 export function ollamaAdapter(opts) {
-    const envBase = firstConfigValue(['OLLAMA_BASE_URL', 'BASE_URL']);
-    const baseUrl = (opts.baseUrl ?? envBase ?? 'http://localhost:11434').replace(/\/$/, '');
+    const envBase = firstConfigValue(["OLLAMA_BASE_URL", "BASE_URL"]);
+    const baseUrl = (opts.baseUrl ?? envBase ?? "http://localhost:11434").replace(/\/$/, "");
     const modelName = `ollama:${opts.model}`;
-    function generate(messages, genOpts) {
+    const generate = ((messages, genOpts) => {
         // Map messages to Ollama format; include assistant tool_calls and tool messages
         async function mapMessagesWithImages() {
             const out = [];
             for (const m of messages) {
                 const base = { role: m.role };
                 const anyM = m;
-                if (m.role === 'assistant' && Array.isArray(anyM.tool_calls)) {
-                    base.tool_calls = anyM.tool_calls.map((tc) => ({ id: tc.id, type: 'function', function: { name: tc.name, arguments: (tc.arguments ?? {}) } }));
+                if (m.role === "assistant" && Array.isArray(anyM.tool_calls)) {
+                    base.tool_calls = anyM.tool_calls.map((tc) => ({
+                        id: tc.id,
+                        type: "function",
+                        function: { name: tc.name, arguments: tc.arguments ?? {} },
+                    }));
                     const ti = buildTextAndImages(anyM);
-                    base.content = ti.content ?? (m.content !== undefined ? m.content : null);
+                    base.content =
+                        ti.content ?? (m.content !== undefined ? m.content : null);
                     if (ti.images?.length)
                         base.images = await toBase64Images(ti.images);
                 }
-                else if (m.role === 'tool') {
-                    base.content = String(m.content ?? '');
+                else if (m.role === "tool") {
+                    base.content = String(m.content ?? "");
                     if (m.tool_call_id)
                         base.tool_call_id = m.tool_call_id;
                     if (m.name && !m.tool_call_id)
@@ -26,7 +31,7 @@ export function ollamaAdapter(opts) {
                 }
                 else {
                     const ti = buildTextAndImages(anyM);
-                    base.content = ti.content ?? (m.content ?? '');
+                    base.content = ti.content ?? m.content ?? "";
                     if (ti.images?.length)
                         base.images = await toBase64Images(ti.images);
                     if (m.name)
@@ -40,14 +45,17 @@ export function ollamaAdapter(opts) {
             return (async function* () {
                 const toolsParam = (genOpts?.tools ?? []).map(toOllamaTool);
                 const mapped = await mapMessagesWithImages();
-                const baseBody = { model: opts.model, messages: mapped };
+                const baseBody = {
+                    model: opts.model,
+                    messages: mapped,
+                };
                 if (toolsParam.length)
                     baseBody.tools = toolsParam;
                 const res = await fetch(`${baseUrl}/api/chat`, {
-                    method: 'POST',
+                    method: "POST",
                     headers: {
-                        'Content-Type': 'application/json',
-                        Accept: 'application/json',
+                        "Content-Type": "application/json",
+                        Accept: "application/json",
                         ...(opts.headers ?? {}),
                     },
                     body: JSON.stringify({ ...baseBody, stream: true }),
@@ -57,30 +65,33 @@ export function ollamaAdapter(opts) {
                     throw new Error(`Ollama API error: ${res.status} ${res.statusText} — ${String(err).slice(0, 500)}`);
                 }
                 const decoder = new TextDecoder();
-                let buf = '';
-                let full = '';
+                let buf = "";
+                let full = "";
                 for await (const chunk of res.body) {
-                    const piece = typeof chunk === 'string' ? chunk : decoder.decode(chunk);
+                    const piece = typeof chunk === "string" ? chunk : decoder.decode(chunk);
                     buf += piece;
-                    const lines = buf.split('\n');
-                    buf = lines.pop() ?? '';
+                    const lines = buf.split("\n");
+                    buf = lines.pop() ?? "";
                     for (const line of lines) {
                         if (!line.trim())
                             continue;
                         try {
                             const j = JSON.parse(line);
                             if (j.done) {
-                                yield { type: 'assistant_message', message: { role: 'assistant', content: full } };
+                                yield {
+                                    type: "assistant_message",
+                                    message: { role: "assistant", content: full },
+                                };
                                 return;
                             }
                             const token = j.message?.content;
-                            if (typeof token === 'string' && token) {
+                            if (typeof token === "string" && token) {
                                 full += token;
-                                yield { type: 'token', token };
+                                yield { type: "token", token };
                             }
                         }
                         catch (e) {
-                            console.error('[DEBUG_LLM] stream_parse_error', { error: e });
+                            console.error("[DEBUG_LLM] stream_parse_error", { error: e });
                         }
                     }
                 }
@@ -90,14 +101,17 @@ export function ollamaAdapter(opts) {
         return (async () => {
             const toolsParam = (genOpts?.tools ?? []).map(toOllamaTool);
             const mapped = await mapMessagesWithImages();
-            const baseBody = { model: opts.model, messages: mapped };
+            const baseBody = {
+                model: opts.model,
+                messages: mapped,
+            };
             if (toolsParam.length)
                 baseBody.tools = toolsParam;
             const res = await fetch(`${baseUrl}/api/chat`, {
-                method: 'POST',
+                method: "POST",
                 headers: {
-                    'Content-Type': 'application/json',
-                    Accept: 'application/json',
+                    "Content-Type": "application/json",
+                    Accept: "application/json",
                     ...(opts.headers ?? {}),
                 },
                 body: JSON.stringify({ ...baseBody, stream: false }),
@@ -110,31 +124,40 @@ export function ollamaAdapter(opts) {
                     details = j.error ?? j.message ?? raw;
                 }
                 catch (e) {
-                    console.error('[DEBUG_LLM] request_error', { error: e });
+                    console.error("[DEBUG_LLM] request_error", { error: e });
                 }
                 throw new Error(`Ollama API error: ${res.status} ${res.statusText} — ${String(details).slice(0, 500)}`);
             }
             const data = raw ? JSON.parse(raw) : {};
-            const choice = data?.message ?? {};
-            const content = choice?.content;
-            const tcs = Array.isArray(choice?.tool_calls)
-                ? choice.tool_calls.map((tc) => ({ id: tc.id, name: tc.function?.name, arguments: safeJson(tc.function?.arguments) }))
+            const choice = data
+                .message ?? {};
+            const content = choice.content;
+            const tcs = Array.isArray(choice.tool_calls)
+                ? choice.tool_calls
+                    .map((tc) => ({
+                    id: tc.id ?? "",
+                    name: tc.function?.name ?? "",
+                    arguments: safeJson(tc.function?.arguments),
+                }))
+                    .filter((tc) => tc.id && tc.name)
                 : undefined;
-            const out = { role: 'assistant', content: content ?? '' };
-            if (tcs)
-                out.tool_calls = tcs;
+            const out = {
+                role: "assistant",
+                content: typeof content === "string" ? content : "",
+                ...(tcs ? { tool_calls: tcs } : {}),
+            };
             return { message: out };
         })();
-    }
+    });
     return {
         name: modelName,
         capabilities: { functionCall: true, streaming: true },
-        generate: generate,
+        generate,
     };
 }
 function toOllamaTool(tool) {
     return {
-        type: 'function',
+        type: "function",
         function: {
             name: tool.name,
             description: tool.description,
@@ -144,34 +167,43 @@ function toOllamaTool(tool) {
 }
 function toJsonSchema(schema) {
     if (!schema)
-        return { type: 'object' };
+        return { type: "object" };
     const t = schema?._def?.typeName;
-    if (t === 'ZodString')
-        return { type: 'string' };
-    if (t === 'ZodNumber')
-        return { type: 'number' };
-    if (t === 'ZodBoolean')
-        return { type: 'boolean' };
-    if (t === 'ZodArray')
-        return { type: 'array', items: toJsonSchema(schema._def?.type) };
-    if (t === 'ZodOptional')
-        return toJsonSchema(schema._def?.innerType);
-    if (t === 'ZodObject') {
-        const shape = typeof schema._def?.shape === 'function' ? schema._def.shape() : schema._def?.shape;
+    if (t === "ZodString")
+        return { type: "string" };
+    if (t === "ZodNumber")
+        return { type: "number" };
+    if (t === "ZodBoolean")
+        return { type: "boolean" };
+    if (t === "ZodArray")
+        return {
+            type: "array",
+            items: toJsonSchema(schema?._def?.type),
+        };
+    if (t === "ZodOptional")
+        return toJsonSchema(schema?._def?.innerType);
+    if (t === "ZodObject") {
+        const shape = typeof schema?._def?.shape === "function"
+            ? schema._def?.shape?.()
+            : schema?._def?.shape;
         const props = {};
         const required = [];
         for (const [key, val] of Object.entries(shape ?? {})) {
             props[key] = toJsonSchema(val);
             const innerTypeName = val?._def?.typeName;
-            if (innerTypeName !== 'ZodOptional' && innerTypeName !== 'ZodDefault')
+            if (innerTypeName !== "ZodOptional" && innerTypeName !== "ZodDefault")
                 required.push(key);
         }
-        return { type: 'object', properties: props, ...(required.length ? { required } : {}) };
+        return {
+            type: "object",
+            properties: props,
+            ...(required.length ? { required } : {}),
+        };
     }
-    return { type: 'object' };
+    return { type: "object" };
 }
 function safeJson(s) {
-    if (typeof s !== 'string')
+    if (typeof s !== "string")
         return s;
     try {
         return JSON.parse(s);
@@ -183,49 +215,56 @@ function safeJson(s) {
 // Accept OpenAI-style content parts or convenience fields and map to
 // Ollama's expected shape: { content: string, images?: string[] }
 function buildTextAndImages(m) {
-    if (!m || typeof m !== 'object')
+    if (!m || typeof m !== "object")
         return {};
     const obj = m;
     // If content is parts, normalize
     if (Array.isArray(obj.content) || Array.isArray(obj.contentParts)) {
-        const parts = Array.isArray(obj.content) ? obj.content : obj.contentParts;
+        const parts = Array.isArray(obj.content)
+            ? obj.content
+            : obj.contentParts;
         const texts = [];
         const images = [];
         for (const p of parts) {
-            if (typeof p === 'string') {
+            if (typeof p === "string") {
                 texts.push(p);
                 continue;
             }
-            if (!p || typeof p !== 'object')
+            if (!p || typeof p !== "object")
                 continue;
             const po = p;
             const t = po.type;
-            if (t === 'text' && typeof po.text === 'string') {
+            if (t === "text" && typeof po.text === "string") {
                 texts.push(po.text);
                 continue;
             }
-            if (t === 'image_url') {
+            if (t === "image_url") {
                 const iu = po.image_url;
-                if (typeof iu === 'string')
+                if (typeof iu === "string")
                     images.push(iu);
-                else if (iu && typeof iu === 'object' && typeof iu.url === 'string')
+                else if (iu &&
+                    typeof iu === "object" &&
+                    typeof iu.url === "string")
                     images.push(String(iu.url));
                 continue;
             }
-            if (t === 'image' && typeof po.url === 'string') {
+            if (t === "image" && typeof po.url === "string") {
                 images.push(String(po.url));
                 continue;
             }
-            if (typeof po.image_url === 'string') {
+            if (typeof po.image_url === "string") {
                 images.push(String(po.image_url));
                 continue;
             }
-            if (typeof po.image === 'string') {
+            if (typeof po.image === "string") {
                 images.push(String(po.image));
                 continue;
             }
         }
-        return { content: texts.join('\n\n'), images: images.length ? images : undefined };
+        return {
+            content: texts.join("\n\n"),
+            images: images.length ? images : undefined,
+        };
     }
     // Otherwise, use content string (if any) and collect convenience images
     const images = [];
@@ -233,11 +272,11 @@ function buildTextAndImages(m) {
         images.push(...obj.images);
     if (Array.isArray(obj.image_urls))
         images.push(...obj.image_urls);
-    if (typeof obj.image_url === 'string')
+    if (typeof obj.image_url === "string")
         images.push(obj.image_url);
-    if (typeof obj.image === 'string')
+    if (typeof obj.image === "string")
         images.push(obj.image);
-    const content = typeof obj.content === 'string' ? obj.content : undefined;
+    const content = typeof obj.content === "string" ? obj.content : undefined;
     return { content, images: images.length ? images : undefined };
 }
 async function toBase64Images(images) {
@@ -253,11 +292,11 @@ function isDataUrl(s) {
     return /^data:/i.test(s);
 }
 function fromDataUrl(s) {
-    const i = s.indexOf(',');
-    return i >= 0 ? s.slice(i + 1) : '';
+    const i = s.indexOf(",");
+    return i >= 0 ? s.slice(i + 1) : "";
 }
 function isProbablyBase64(s) {
-    if (!s || /[:\/]/.test(s))
+    if (!s || /[:/]/.test(s))
         return false; // exclude URLs
     // Basic base64 check: valid chars and length % 4 == 0
     if (s.length % 4 !== 0)
@@ -272,7 +311,7 @@ async function toBase64(src) {
         if (!res.ok)
             throw new Error(`Failed to fetch image: ${res.status} ${res.statusText}`);
         const buf = Buffer.from(await res.arrayBuffer());
-        return buf.toString('base64');
+        return buf.toString("base64");
     }
     return isProbablyBase64(src) ? src : src;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sisu-ai/adapter-ollama",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -21,7 +21,7 @@
     "url": "https://github.com/finger-gun/sisu/issues"
   },
   "peerDependencies": {
-    "@sisu-ai/core": "^2.3.1"
+    "@sisu-ai/core": "^2.3.2"
   },
   "keywords": [
     "sisu",