plugin-image-generation tsconfig.json fix & ollama error handling

packages/core/elizaConfig.example.yaml

@@ -1,6 +1,6 @@
 # Load custom actions from the actions directory
 
-# Close this into a elizaConfig.yaml file that is ignored by git
+# Clone this into a elizaConfig.yaml file that is ignored by git
 
 # Paths are relative to the core/src directory
 

packages/core/src/core/defaultCharacter.ts

@@ -1,12 +1,13 @@
-import { Character, ModelProvider } from "./types.ts";
+import { Character, ModelProvider, Clients } from "./types.ts";
 
 export const defaultCharacter: Character = {
     name: "Eliza",
     plugins: [],
     clients: [],
     modelProvider: ModelProvider.LLAMALOCAL,
     settings: {
-        secrets: {},
+        secrets: {
+        },
         voice: {
             model: "en_US-hfc_female-medium",
         },

packages/core/src/services/OllamaService.ts

@@ -35,16 +35,21 @@ class OllamaService {
   private isProcessing: boolean = false;
 
   private constructor() {
-    debug('Constructing OllamaService');
-    dotenv.config();
-    this.modelName = process.env.OLLAMA_MODEL || 'llama3.2';
-    this.openai = new OpenAI({
-      baseURL: process.env.OLLAMA_SERVER_URL || 'http://localhost:11434/v1',
-      apiKey: 'ollama',
-      dangerouslyAllowBrowser: true
-    });
-    debug(`Using model: ${this.modelName}`);
-    debug('OpenAI client initialized');
+    try {
+      debug('Constructing OllamaService');
+      dotenv.config();
+      this.modelName = process.env.OLLAMA_MODEL || 'llama3.2';
+      this.openai = new OpenAI({
+        baseURL: process.env.OLLAMA_SERVER_URL || 'http://localhost:11434/v1',
+        apiKey: 'ollama',
+        dangerouslyAllowBrowser: true
+      });
+      debug(`Using model: ${this.modelName}`);
+      debug('OpenAI client initialized');
+    } catch (error) {
+      debug('Failed to initialize OllamaService:', error);
+      throw new Error(`Failed to initialize Ollama service: ${error}`);
+    }
   }
 
   public static getInstance(): OllamaService {

packages/core/src/services/llama.ts

@@ -11,11 +11,13 @@ class LlamaService implements ILlamaService {
     private delegate: ILlamaService;
 
     private constructor() {
-      const provider = settings.LOCAL_LLAMA_PROVIDER;
+      const provider = process.env.LOCAL_LLAMA_PROVIDER;
       console.log("provider: ", provider)
       if (provider === ModelProvider.OLLAMA) {
+        console.log("running ollama")
         this.delegate = OllamaService.getInstance();
       } else {
+        console.log("running llama-cpp")
         this.delegate = LlamaCppService.getInstance();
       }
     }

packages/core/tsconfig.json

@@ -29,4 +29,4 @@
     },
     "include": ["src/**/*"],
     "exclude": ["node_modules", "dist", "src/**/*.d.ts", "types/**/*.test.ts"]
-}
+}

packages/plugin-image-generation/tsconfig.json

@@ -1,8 +1,15 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "outDir": "dist",
-        "rootDir": "./src"
+      "outDir": "dist",
+      "rootDir": ".",
+      "module": "ESNext",
+      "moduleResolution": "Bundler",
+      "types": ["node"]
     },
-    "include": ["src"]
-}
+    "include": ["src"],
+    "references": [
+      { "path": "../core" }
+    ]
+  }
+