Expose "Allow fallback providers" for OpenRouter

5f2a73ac9fce25752d5dbec3b237cc96a7fdf5e6

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: d8809238a7bba4640f428aafaa33c4db9dbff9d3

public/index.html+15 -14 Viewed

                                     <h4 data-i18n="Model Providers">Model Providers</h4>
                                     <select id="openrouter_providers_text" class="openrouter_providers" multiple>
                                     </select>
+                                    <label class="checkbox_label" for="openrouter_allow_fallbacks_textgenerationwebui" title="Automatically chooses an alternative provider if chosen providers can't serve your request.">
+                                        <input id="openrouter_allow_fallbacks_textgenerationwebui" type="checkbox" />
+                                        <span data-i18n="Allow fallback providers">Allow fallback providers</span>
+                                    </label>
                                 </div>
                             </div>
                             <div data-tg-type="infermaticai" class="flex-container flexFlowColumn">

                                     <option data-i18n="-- Connect to the API --">-- Connect to the API --</option>
                                 </select>
                             </div>
-                            <div>
+                            <label for="openrouter_use_fallback" class="checkbox_label marginTopBot5" data-i18n="[title]Allow fallback routes Description" title="Automatically chooses an alternative model if the chosen model can't serve your request.">
-                                <h4 data-i18n="Model Providers">Model Providers</h4>
+                                <input id="openrouter_use_fallback" type="checkbox" />
-                                <select id="openrouter_providers_chat" class="openrouter_providers" multiple>
+                                <span data-i18n="Allow fallback models">Allow fallback models</span>
-                                </select>
+                            </label>
-                            </div>
                             <div class="marginTopBot5">
                                 <div class="inline-drawer wide100p">
                                     <div class="inline-drawer-toggle inline-drawer-header">

                                     </div>
                                 </div>
                             </div>
-                            <div class="marginTopBot5">
+                            <div>
-                                <label for="openrouter_use_fallback" class="checkbox_label">
+                                <h4 data-i18n="Model Providers">Model Providers</h4>
-                                    <input id="openrouter_use_fallback" type="checkbox" />
+                                <select id="openrouter_providers_chat" class="openrouter_providers" multiple>
-                                    <span data-i18n="Allow fallback routes">Allow fallback routes</span>
+                                </select>
+                                <label class="checkbox_label marginTopBot5" for="openrouter_allow_fallbacks" title="Automatically chooses an alternative provider if chosen providers can't serve your request.">
+                                    <input id="openrouter_allow_fallbacks" type="checkbox" />
+                                    <span data-i18n="Allow fallback providers">Allow fallback providers</span>
                                 </label>
-                                <div class="toggle-description justifyLeft wide100p">
-                                    <span data-i18n="Allow fallback routes Description">
-                                        Automatically chooses an alternative model if the chosen model can't serve your request.
-                                    </span>
-                                </div>
                             </div>
                             <div class="marginTopBot5">
                                 <label for="openrouter_force_instruct" class="checkbox_label">

public/scripts/openai.js+12 -0 Viewed

     openrouter_group_models: false,
     openrouter_sort_models: 'alphabetically',
     openrouter_providers: [],
+    openrouter_allow_fallbacks: true,
     jailbreak_system: false,
     reverse_proxy: '',
     chat_completion_source: chat_completion_sources.OPENAI,

     openrouter_group_models: false,
     openrouter_sort_models: 'alphabetically',
     openrouter_providers: [],
+    openrouter_allow_fallbacks: true,
     jailbreak_system: false,
     reverse_proxy: '',
     chat_completion_source: chat_completion_sources.OPENAI,

         generate_data['top_a'] = Number(oai_settings.top_a_openai);
         generate_data['use_fallback'] = oai_settings.openrouter_use_fallback;
         generate_data['provider'] = oai_settings.openrouter_providers;
+        generate_data['allow_fallbacks'] = oai_settings.openrouter_allow_fallbacks;
         if (isTextCompletion) {
             generate_data['stop'] = getStoppingStrings(isImpersonate, isContinue);

     oai_settings.openrouter_sort_models = settings.openrouter_sort_models ?? default_settings.openrouter_sort_models;
     oai_settings.openrouter_use_fallback = settings.openrouter_use_fallback ?? default_settings.openrouter_use_fallback;
     oai_settings.openrouter_force_instruct = settings.openrouter_force_instruct ?? default_settings.openrouter_force_instruct;
+    oai_settings.openrouter_allow_fallbacks = settings.openrouter_allow_fallbacks ?? default_settings.openrouter_allow_fallbacks;
     oai_settings.ai21_model = settings.ai21_model ?? default_settings.ai21_model;
     oai_settings.mistralai_model = settings.mistralai_model ?? default_settings.mistralai_model;
     oai_settings.cohere_model = settings.cohere_model ?? default_settings.cohere_model;

     $('#openrouter_use_fallback').prop('checked', oai_settings.openrouter_use_fallback);
     $('#openrouter_force_instruct').prop('checked', oai_settings.openrouter_force_instruct);
     $('#openrouter_group_models').prop('checked', oai_settings.openrouter_group_models);
+    $('#openrouter_allow_fallbacks').prop('checked', oai_settings.openrouter_allow_fallbacks);
     $('#openrouter_providers_chat').val(oai_settings.openrouter_providers).trigger('change');
     $('#squash_system_messages').prop('checked', oai_settings.squash_system_messages);
     $('#continue_prefill').prop('checked', oai_settings.continue_prefill);

         openrouter_group_models: settings.openrouter_group_models,
         openrouter_sort_models: settings.openrouter_sort_models,
         openrouter_providers: settings.openrouter_providers,
+        openrouter_allow_fallbacks: settings.openrouter_allow_fallbacks,
         ai21_model: settings.ai21_model,
         mistralai_model: settings.mistralai_model,
         cohere_model: settings.cohere_model,

         openrouter_group_models: ['#openrouter_group_models', 'openrouter_group_models', false],
         openrouter_sort_models: ['#openrouter_sort_models', 'openrouter_sort_models', false],
         openrouter_providers: ['#openrouter_providers_chat', 'openrouter_providers', false],
+        openrouter_allow_fallbacks: ['#openrouter_allow_fallbacks', 'openrouter_allow_fallbacks', true],
         ai21_model: ['#model_ai21_select', 'ai21_model', false],
         mistralai_model: ['#model_mistralai_select', 'mistralai_model', false],
         cohere_model: ['#model_cohere_select', 'cohere_model', false],

         saveSettingsDebounced();
     });
+    $('#openrouter_allow_fallbacks').on('input', function () {
+        oai_settings.openrouter_allow_fallbacks = !!$(this).prop('checked');
+        saveSettingsDebounced();
+    });
     $('#squash_system_messages').on('input', function () {
         oai_settings.squash_system_messages = !!$(this).prop('checked');
         saveSettingsDebounced();

public/scripts/preset-manager.js+1 -0 Viewed

             'featherless_model',
             'max_tokens_second',
             'openrouter_providers',
+            'openrouter_allow_fallbacks',
         ];
         const settings = Object.assign({}, getSettingsByApiId(this.apiId));

public/scripts/textgen-settings.js+3 -0 Viewed

     server_urls: {},
     custom_model: '',
     bypass_status_check: false,
+    openrouter_allow_fallbacks: true,
 };
 export let textgenerationwebui_banned_in_macros = [];

     'logit_bias',
     'custom_model',
     'bypass_status_check',
+    'openrouter_allow_fallbacks',
 ];
 const DYNATEMP_BLOCK = document.getElementById('dynatemp_block_ooba');

     if (settings.type === OPENROUTER) {
         params.provider = settings.openrouter_providers;
+        params.allow_fallbacks = settings.openrouter_allow_fallbacks;
+    }
     if (settings.type === KOBOLDCPP) {

src/endpoints/backends/chat-completions.js+1 -1 Viewed

         if (Array.isArray(request.body.provider) && request.body.provider.length > 0) {
             bodyParams['provider'] = {
-                allow_fallbacks: true,
+                allow_fallbacks: request.body.allow_fallbacks ?? true,
                 order: request.body.provider ?? [],
             };
+        }

src/endpoints/backends/text-completions.js+1 -1 Viewed

         if (request.body.api_type === TEXTGEN_TYPES.OPENROUTER) {
             if (Array.isArray(request.body.provider) && request.body.provider.length > 0) {
                 request.body.provider = {
-                    allow_fallbacks: true,
+                    allow_fallbacks: request.body.allow_fallbacks ?? true,
                     order: request.body.provider,
                 };
             } else {