Adjusted naming and validation

f8bccb472f2c088161c2c878165649b30a8c8f61

pl752 <maximpl752@gmail.com>

Parents: bfe50403affc507aeb6310dffbe24032cd633881

public/scripts/extensions/vectors/index.js+13 -6 Viewed

 const moduleWorker = new ModuleWorkerWrapper(synchronizeChat);
 const webllmProvider = new WebLlmVectorProvider();
 const cachedSummaries = new Map();
-const vector_api_requires_url = ['llamacpp', 'vllm', 'ollama', 'koboldcpp'];
+const vectorApiRequiresUrl = ['llamacpp', 'vllm', 'ollama', 'koboldcpp'];
 /**
  * Gets the Collection ID for a file embedded in the chat.

         throw new Error('Vectors: API key missing', { cause: 'api_key_missing' });
+    }
+    if (vectorApiRequiresUrl.includes(settings.source) && settings.use_alt_endpoint) {
+        if (!settings.alt_endpoint_url) {
+            throw new Error('Vectors: API URL missing', { cause: 'api_url_missing' });
+        }
+    }
+    else {
         if (settings.source === 'ollama' && !textgenerationwebui_settings.server_urls[textgen_types.OLLAMA] ||
             settings.source === 'vllm' && !textgenerationwebui_settings.server_urls[textgen_types.VLLM] ||
             settings.source === 'koboldcpp' && !textgenerationwebui_settings.server_urls[textgen_types.KOBOLDCPP] ||
             settings.source === 'llamacpp' && !textgenerationwebui_settings.server_urls[textgen_types.LLAMACPP]) {
             throw new Error('Vectors: API URL missing', { cause: 'api_url_missing' });
+        }
+    }
     if (settings.source === 'ollama' && !settings.ollama_model || settings.source === 'vllm' && !settings.vllm_model) {
         throw new Error('Vectors: API model missing', { cause: 'api_model_missing' });

     $('#webllm_vectorsModel').toggle(settings.source === 'webllm');
     $('#koboldcpp_vectorsModel').toggle(settings.source === 'koboldcpp');
     $('#google_vectorsModel').toggle(settings.source === 'palm');
-    $('#altEndpointUrl').toggle(vector_api_requires_url.includes(settings.source));
+    $('#vector_altEndpointUrl').toggle(vectorApiRequiresUrl.includes(settings.source));
     if (settings.source === 'webllm') {
         loadWebLlmModels();
+    }

         saveSettingsDebounced();
         toggleSettings();
     });
-    $('#altEndpointUrl_enabled').prop('checked', settings.use_alt_endpoint).on('input', () => {
+    $('#vector_altEndpointUrl_enabled').prop('checked', settings.use_alt_endpoint).on('input', () => {
-        settings.use_alt_endpoint = $('#altEndpointUrl_enabled').prop('checked');
+        settings.use_alt_endpoint = $('#vector_altEndpointUrl_enabled').prop('checked');
         Object.assign(extension_settings.vectors, settings);
         saveSettingsDebounced();
     });
-    $('#altEndpoint_address').val(settings.alt_endpoint_url).on('change', () => {
+    $('#vector_altEndpoint_address').val(settings.alt_endpoint_url).on('change', () => {
-        settings.alt_endpoint_url = String($('#altEndpoint_address').val());
+        settings.alt_endpoint_url = String($('#vector_altEndpoint_address').val());
         Object.assign(extension_settings.vectors, settings);
         saveSettingsDebounced();
     });

public/scripts/extensions/vectors/settings.html+5 -5 Viewed

                     <option value="webllm" data-i18n="WebLLM Extension">WebLLM Extension</option>
                 </select>
             </div>
-            <div class="flex-container flexFlowColumn" id="altEndpointUrl">
+            <div class="flex-container flexFlowColumn" id="vector_altEndpointUrl">
-                <label class="checkbox_label" for="altEndpointUrl_enabled" title="Enable secondary endpoint URL usage, instead of the main one.">
+                <label class="checkbox_label" for="vector_altEndpointUrl_enabled" title="Enable secondary endpoint URL usage, instead of the main one.">
-                    <input id="altEndpointUrl_enabled" type="checkbox" class="checkbox">
+                    <input id="vector_altEndpointUrl_enabled" type="checkbox" class="checkbox">
                     <span data-i18n="Use secondary URL">Use secondary URL</span>
                 </label>
-                <label for="altEndpoint_address" data-i18n="Secondary Embedding endpoint URL">
+                <label for="vector_altEndpoint_address" data-i18n="Secondary Embedding endpoint URL">
                     Secondary Embedding endpoint URL
                 </label>
-                <input id="altEndpoint_address" class="text_pole" type="text" placeholder="URL for secondary endpoint" />
+                <input id="vector_altEndpoint_address" class="text_pole" type="text" placeholder="URL for secondary endpoint" />
             </div>
             <div class="flex-container flexFlowColumn" id="webllm_vectorsModel">
                 <label for="vectors_webllm_model" data-i18n="Vectorization Model">