changed plugin-image-gen tsconfig.json & added error handling ollama …

…initialization
o-on-x · Nov 7, 2024 · d4268b3 · d4268b3
1 parent 5b79da6
commit d4268b3
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 41 deletions.
diff --git a/packages/core/src/services/OllamaService.ts b/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 {

diff --git a/packages/core/src/services/llama.ts b/packages/core/src/services/llama.ts
@@ -13,7 +13,7 @@ class LlamaService implements ILlamaService {
     private constructor() {
       const provider = process.env.LOCAL_LLAMA_PROVIDER;
       console.log("provider: ", provider)
-      if (true){//provider === ModelProvider.OLLAMA) {
+      if (provider === ModelProvider.OLLAMA) {
         console.log("running ollama")
         this.delegate = OllamaService.getInstance();
       } else {

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -29,4 +29,4 @@
     },
     "include": ["src/**/*"],
     "exclude": ["node_modules", "dist", "src/**/*.d.ts", "types/**/*.test.ts"]
-}
+}
diff --git a/packages/plugin-image-generation/tsconfig.json b/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" }
+    ]
+  }
+
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,4 @@ @@
         },
         "include": ["src/**/*"],
         "exclude": ["node_modules", "dist", "src/**/*.d.ts", "types/**/*.test.ts"]
-    }
+    }