@sisu-ai/adapter-ollama 7.0.0 → 8.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sisu-ai/adapter-ollama",
-  "version": "7.0.0",
+  "version": "8.0.1",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -24,7 +24,7 @@
     "build": "tsc -b"
   },
   "peerDependencies": {
-    "@sisu-ai/core": "2.1.0"
+    "@sisu-ai/core": "2.2.1"
   },
   "keywords": [
     "sisu",

package/dist/src/index.d.ts

@@ -1,7 +0,0 @@
-import type { LLM } from '@sisu-ai/core';
-export interface OllamaAdapterOptions {
-    model: string;
-    baseUrl?: string;
-    headers?: Record<string, string>;
-}
-export declare function ollamaAdapter(opts: OllamaAdapterOptions): LLM;

package/dist/src/index.js

@@ -1,112 +0,0 @@
-export function ollamaAdapter(opts) {
-    const envBase = process.env.OLLAMA_BASE_URL || process.env.BASE_URL;
-    const baseUrl = (opts.baseUrl ?? envBase ?? 'http://localhost:11434').replace(/\/$/, '');
-    const modelName = `ollama:${opts.model}`;
-    return {
-        name: modelName,
-        capabilities: { functionCall: true, streaming: false },
-        async generate(messages, genOpts) {
-            // Map messages to Ollama format; include assistant tool_calls and tool messages
-            const mapped = messages.map((m) => {
-                const base = { role: m.role };
-                if (m.role === 'assistant' && Array.isArray(m.tool_calls)) {
-                    base.tool_calls = m.tool_calls.map((tc) => ({ id: tc.id, type: 'function', function: { name: tc.name, arguments: (tc.arguments ?? {}) } }));
-                    base.content = m.content ? String(m.content) : null;
-                }
-                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)
-                        base.name = m.name;
-                }
-                else {
-                    base.content = String(m.content ?? '');
-                }
-                return base;
-            });
-            const toolsParam = (genOpts?.tools ?? []).map(toOllamaTool);
-            const body = { model: opts.model, messages: mapped, stream: false };
-            if (toolsParam.length)
-                body.tools = toolsParam;
-            const res = await fetch(`${baseUrl}/api/chat`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    Accept: 'application/json',
-                    ...(opts.headers ?? {}),
-                },
-                body: JSON.stringify(body),
-            });
-            const raw = await res.text();
-            if (!res.ok) {
-                let details = raw;
-                try {
-                    const j = JSON.parse(raw);
-                    details = j.error ?? j.message ?? raw;
-                }
-                catch { }
-                throw new Error(`Ollama API error: ${res.status} ${res.statusText} — ${String(details).slice(0, 500)}`);
-            }
-            const data = raw ? JSON.parse(raw) : {};
-            // /api/chat response example (non-stream): { message: { role:'assistant', content:'...', tool_calls?: [...] }, done: true }
-            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) }))
-                : undefined;
-            const out = { role: 'assistant', content: String(content ?? '') };
-            if (tcs)
-                out.tool_calls = tcs;
-            return { message: out };
-        },
-    };
-}
-function toOllamaTool(tool) {
-    return {
-        type: 'function',
-        function: {
-            name: tool.name,
-            description: tool.description,
-            parameters: toJsonSchema(tool.schema),
-        },
-    };
-}
-function toJsonSchema(schema) {
-    if (!schema)
-        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;
-        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')
-                required.push(key);
-        }
-        return { type: 'object', properties: props, ...(required.length ? { required } : {}) };
-    }
-    return { type: 'object' };
-}
-function safeJson(s) {
-    if (typeof s !== 'string')
-        return s;
-    try {
-        return JSON.parse(s);
-    }
-    catch {
-        return s;
-    }
-}