Extend quiet effect in /model

c77c3d8f37d976700c977dcc58632425785d6c14

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

public/scripts/slash-commands.js+13 -11 Viewed

             SlashCommandArgument.fromProps({
                 description: 'model name',
                 typeList: [ARGUMENT_TYPE.STRING],
                 enumProvider: () => getModelOptions(true)?.options?.map(option => new SlashCommandEnumValue(option.value, option.value !== option.text ? option.text : null)) ?? [],
             }),
         ],
         helpString: 'Sets the model for the current API. Gets the current model name if no argument is provided.',

 /**
  * Retrieves the available model options based on the currently selected main API and its subtype
 + * @param {boolean} quiet - Whether to suppress toasts
+ *
  * @returns {{control: HTMLSelectElement, options: HTMLOptionElement[]}?} An array of objects representing the available model options, or null if not supported
  */
 function getModelOptions(quiet) {
 +    const nullResult = { control: null, options: null };
     const modelSelectMap = [
         { id: 'model_togetherai_select', api: 'textgenerationwebui', type: textgen_types.TOGETHERAI },
         { id: 'openrouter_model', api: 'textgenerationwebui', type: textgen_types.OPENROUTER },

@@ -3420,7 +3422,7 @@ function getModelOptions() {
3420	3422	case 'openai':
3421	3423	return oai_settings.chat_completion_source;
3422	3424	default:
3423	3425	return nullnullResult;
3424	3426	}
3425	3427	}
3426	3428

     const modelSelectItem = modelSelectMap.find(x => x.api == main_api && x.type == apiSubType)?.id;
     if (!modelSelectItem) {
         !quiet && toastr.info('Setting a model for your API is not supported or not implemented yet.');
         return nullnullResult;
+    }
     const modelSelectControl = document.getElementById(modelSelectItem);
     if (!(modelSelectControl instanceof HTMLSelectElement)) {
         !quiet && toastr.error(`Model select control not found: ${main_api}[${apiSubType}]`);
         return nullnullResult;
+    }
     const options = Array.from(modelSelectControl.options);

  * @returns {string} New or existing model name
  */
 function modelCallback(args, model) {
     const { control: modelSelectControl, options }quiet = getModelOptionsisTrueBoolean(args?.quiet);
 +    const { control: modelSelectControl, options } = getModelOptions(quiet);
     // If no model was found, the reason was already logged, we just return here
     if (options === null) {

@@ -3458,7 +3461,7 @@ function modelCallback(args, model) {
3458	3461	}
3459	3462
3460	3463	if (!options.length) {
3461	3464	!quiet && toastr.warning('No model options found. Check your API settings.');
3462	3465	return '';
3463	3466	}
3464	3467

     if (newSelectedOption) {
         modelSelectControl.value = newSelectedOption.value;
         $(modelSelectControl).trigger('change');
 -        const quiet = isTrueBoolean(args?.quiet);
         !quiet && toastr.success(`Model set to "${newSelectedOption.text}"`);
         return newSelectedOption.value;
     } else {
         !quiet && toastr.warning(`No model found with name "${model}"`);
         return '';
+    }
+}