@mandujs/core 0.9.0 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mandujs/core",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Mandu Framework Core - Spec, Generator, Guard, Runtime",
   "type": "module",
   "main": "./src/index.ts",
@@ -45,5 +45,8 @@
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "zod": ">=3.0.0"
+  },
+  "dependencies": {
+    "ollama": "^0.6.3"
   }
 }

package/src/brain/adapters/ollama.ts

@@ -2,9 +2,11 @@
  * Brain v0.1 - Ollama LLM Adapter
  *
  * Default adapter for local sLLM via Ollama.
- * Recommended models: llama3.2, codellama, mistral
+ * Uses official ollama npm package for reliable API integration.
+ * Recommended models: ministral-3:3b, llama3.2, codellama, mistral
  */
 
+import { Ollama } from "ollama";
 import { BaseLLMAdapter } from "./base";
 import type {
   AdapterConfig,
@@ -27,28 +29,6 @@ export const DEFAULT_OLLAMA_CONFIG: AdapterConfig = {
   timeout: 30000, // 30 seconds
 };
 
-/**
- * Ollama API response types
- */
-interface OllamaTagsResponse {
-  models: Array<{
-    name: string;
-    size: number;
-    modified_at: string;
-  }>;
-}
-
-interface OllamaChatResponse {
-  model: string;
-  message: {
-    role: string;
-    content: string;
-  };
-  done: boolean;
-  eval_count?: number;
-  prompt_eval_count?: number;
-}
-
 /**
  * Ollama LLM Adapter
  *
@@ -57,12 +37,17 @@ interface OllamaChatResponse {
  */
 export class OllamaAdapter extends BaseLLMAdapter {
   readonly name = "ollama";
+  private client: Ollama;
 
   constructor(config: Partial<AdapterConfig> = {}) {
     super({
       ...DEFAULT_OLLAMA_CONFIG,
       ...config,
     });
+
+    this.client = new Ollama({
+      host: this.baseUrl,
+    });
   }
 
   /**
@@ -70,28 +55,8 @@ export class OllamaAdapter extends BaseLLMAdapter {
    */
   async checkStatus(): Promise<AdapterStatus> {
     try {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(
-        () => controller.abort(),
-        this.config.timeout ?? 5000
-      );
-
-      const response = await fetch(`${this.baseUrl}/api/tags`, {
-        signal: controller.signal,
-      });
-
-      clearTimeout(timeoutId);
-
-      if (!response.ok) {
-        return {
-          available: false,
-          model: null,
-          error: `Ollama API error: ${response.status}`,
-        };
-      }
-
-      const data = (await response.json()) as OllamaTagsResponse;
-      const models = data.models || [];
+      const response = await this.client.list();
+      const models = response.models || [];
 
       // Check if configured model is available
       const modelAvailable = models.some(
@@ -122,21 +87,14 @@ export class OllamaAdapter extends BaseLLMAdapter {
         model: this.config.model,
       };
     } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
-        return {
-          available: false,
-          model: null,
-          error: "Ollama connection timeout",
-        };
-      }
-
       const errorMessage =
         error instanceof Error ? error.message : "Unknown error";
 
       // Check for common connection errors
       if (
         errorMessage.includes("ECONNREFUSED") ||
-        errorMessage.includes("fetch failed")
+        errorMessage.includes("fetch failed") ||
+        errorMessage.includes("Unable to connect")
       ) {
         return {
           available: false,
@@ -163,47 +121,26 @@ export class OllamaAdapter extends BaseLLMAdapter {
     const { temperature = 0.7, maxTokens = 2048 } = options;
 
     try {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(
-        () => controller.abort(),
-        this.config.timeout ?? 30000
-      );
-
-      const response = await fetch(`${this.baseUrl}/api/chat`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
+      const response = await this.client.chat({
+        model: this.config.model,
+        messages: messages.map((m) => ({
+          role: m.role,
+          content: m.content,
+        })),
+        stream: false,
+        options: {
+          temperature,
+          num_predict: maxTokens,
         },
-        body: JSON.stringify({
-          model: this.config.model,
-          messages: messages.map((m) => ({
-            role: m.role,
-            content: m.content,
-          })),
-          stream: false,
-          options: {
-            temperature,
-            num_predict: maxTokens,
-          },
-        }),
-        signal: controller.signal,
       });
 
-      clearTimeout(timeoutId);
-
-      if (!response.ok) {
-        const errorText = await response.text();
-        throw new Error(`Ollama API error: ${response.status} - ${errorText}`);
-      }
-
-      const data = (await response.json()) as OllamaChatResponse;
-
       return {
-        content: data.message?.content || "",
+        content: response.message?.content || "",
         usage: {
-          promptTokens: data.prompt_eval_count || 0,
-          completionTokens: data.eval_count || 0,
-          totalTokens: (data.prompt_eval_count || 0) + (data.eval_count || 0),
+          promptTokens: response.prompt_eval_count || 0,
+          completionTokens: response.eval_count || 0,
+          totalTokens:
+            (response.prompt_eval_count || 0) + (response.eval_count || 0),
         },
       };
     } catch (error) {
@@ -215,28 +152,77 @@ export class OllamaAdapter extends BaseLLMAdapter {
   }
 
   /**
-   * Pull a model from Ollama registry
+   * Pull a model from Ollama registry with progress callback
    */
-  async pullModel(modelName?: string): Promise<boolean> {
+  async pullModel(
+    modelName?: string,
+    onProgress?: (status: string, completed?: number, total?: number) => void
+  ): Promise<{ success: boolean; error?: string }> {
     const model = modelName ?? this.config.model;
 
     try {
-      const response = await fetch(`${this.baseUrl}/api/pull`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          name: model,
-          stream: false,
-        }),
+      const stream = await this.client.pull({
+        model,
+        stream: true,
       });
 
-      return response.ok;
+      for await (const progress of stream) {
+        if (onProgress && progress.status) {
+          onProgress(
+            progress.status,
+            progress.completed,
+            progress.total
+          );
+        }
+      }
+
+      return { success: true };
+    } catch (error) {
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : "Unknown error",
+      };
+    }
+  }
+
+  /**
+   * Check if Ollama server is reachable
+   */
+  async isServerRunning(): Promise<boolean> {
+    try {
+      await this.client.list();
+      return true;
     } catch {
       return false;
     }
   }
+
+  /**
+   * List all available models
+   */
+  async listModels(): Promise<string[]> {
+    try {
+      const response = await this.client.list();
+      return (response.models || []).map((m) => m.name);
+    } catch {
+      return [];
+    }
+  }
+
+  /**
+   * Generate embeddings for text
+   */
+  async embed(text: string, model?: string): Promise<number[] | null> {
+    try {
+      const response = await this.client.embed({
+        model: model ?? this.config.model,
+        input: text,
+      });
+      return response.embeddings?.[0] ?? null;
+    } catch {
+      return null;
+    }
+  }
 }
 
 /**