- Streamlined the model loading process in SmartModel and DefaultEntitiesVectorAdapter by consolidating error handling and loading logic, improving robustness and maintainability.

- Enhanced error handling to provide clearer feedback when loading fails, including retry logic in `SmartModel`.

Author: brianpetro

smart-embed-model/adapters/ollama.js

@@ -179,32 +179,27 @@ export class SmartEmbedOllamaAdapter extends SmartEmbedModelApiAdapter {
    */
   async get_models(refresh = false) {
     if(!this.model_data || refresh) {
-      try {
-        const list_resp = await this.http_adapter.request({
-          url: this.models_endpoint,
-          method: 'GET',
+      const list_resp = await this.http_adapter.request({
+        url: this.models_endpoint,
+        method: 'GET',
+      });
+      if (list_resp.ok === false) {
+        throw new Error(`Failed to fetch models list: ${list_resp.statusText}`);
+      }
+      const list_data = await list_resp.json();
+      const models_raw = [];
+      for (const m of filter_embedding_models(list_data.models || [])) {
+        const detail_resp = await this.http_adapter.request({
+          url: 'http://localhost:11434/api/show',
+          method: 'POST',
+          body: JSON.stringify({ model: m.name }),
         });
-        if (list_resp.ok === false) {
-          throw new Error(`Failed to fetch models list: ${list_resp.statusText}`);
-        }
-        const list_data = await list_resp.json();
-        const models_raw = [];
-        for (const m of filter_embedding_models(list_data.models || [])) {
-          const detail_resp = await this.http_adapter.request({
-            url: 'http://localhost:11434/api/show',
-            method: 'POST',
-            body: JSON.stringify({ model: m.name }),
-          });
-          models_raw.push({ ...(await detail_resp.json()), name: m.name });
-        }
-        const model_data = this.parse_model_data(models_raw);
-        this.model_data = model_data;
-        this.model.re_render_settings();
-        return model_data;
-      } catch (error) {
-        console.error('Failed to fetch model data:', error);
-        return { "_": { id: `Failed to fetch models from ${this.model.adapter_name}` } };
+        models_raw.push({ ...(await detail_resp.json()), name: m.name });
       }
+      const model_data = this.parse_model_data(models_raw);
+      this.model_data = model_data;
+      this.model.re_render_settings();
+      return model_data;
     }
     return this.model_data;
   }

smart-entities/adapters/default.js

@@ -112,6 +112,15 @@ export class DefaultEntitiesVectorAdapter extends EntitiesVectorAdapter {
       return;
     }
     this._is_processing_embed_queue = true;
+    // load the embed_model if not already loaded
+    try {
+      if(!this.collection.embed_model.is_loaded) {
+        await this.collection.embed_model.load();
+      }
+    } catch (e) {
+      this.notices?.show('Failed to load embed_model');
+      return;
+    }
 
     try {
       const embed_queue = this.collection.embed_queue;

smart-model/adapters/_adapter.js

@@ -116,6 +116,7 @@ export class SmartModelAdapter {
 
   /**
    * Set the adapter's state.
+   * @deprecated should be handled in SmartModel (only handle once)
    * @param {('unloaded'|'loading'|'loaded'|'unloading')} new_state - The new state
    * @throws {Error} If the state is invalid
    */

smart-model/smart_model.js

@@ -163,8 +163,23 @@ export class SmartModel {
    */
   async load() {
     this.set_state('loading');
-    if (!this.adapter?.is_loaded) {
-      await this.invoke_adapter_method('load');
+    try {
+      if (!this.adapter?.is_loaded) {
+        await this.invoke_adapter_method('load');
+      }
+    } catch (err) {
+      this.set_state('unloaded');
+
+      // try to reload once per minute
+      if(!this.reload_model_timeout) {
+        this.reload_model_timeout = setTimeout(async () => {
+          this.reload_model_timeout = null;
+          await this.load();
+          this.set_state('loaded');
+          this.notices?.show('Loaded model: ' + this.model_key);
+        }, 60000);
+      }
+      throw new Error(`Failed to load model: ${err.message}`);
     }
     this.set_state('loaded');
   }

smart-notices/notices.js

@@ -170,8 +170,6 @@ export const NOTICES = {
     en: 'Reloaded sources in {{time_ms}}ms'
   },
 
-
-
 };