From 9611e314817d82054bab6fc65d4a2b443643bf77 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Wed, 18 Oct 2023 14:25:05 +0300 Subject: [PATCH] Respect trusted worker flag if auto-adjust is enabled --- public/scripts/horde.js | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/public/scripts/horde.js b/public/scripts/horde.js index ffdf3a630..f62d5c18d 100644 --- a/public/scripts/horde.js +++ b/public/scripts/horde.js @@ -73,6 +73,11 @@ async function adjustHordeGenerationParams(max_context_length, max_length) { for (const model of selectedModels) { for (const worker of workers) { if (model.cluster == worker.cluster && worker.models.includes(model.name)) { + // Skip workers that are not trusted if the option is enabled + if (horde_settings.trusted_workers_only && !worker.trusted) { + continue; + } + availableWorkers.push(worker); } } @@ -92,6 +97,14 @@ async function adjustHordeGenerationParams(max_context_length, max_length) { return { maxContextLength, maxLength }; } +function setContextSizePreview() { + if (horde_settings.models.length) { + adjustHordeGenerationParams(max_context, amount_gen); + } else { + $("#adjustedHordeParams").text(`Context: --, Response: --`); + } +} + async function generateHorde(prompt, params, signal, reportProgress) { validateHordeModel(); delete params.prompt; @@ -213,6 +226,8 @@ async function getHordeModels() { if (horde_settings.models.length && models.filter(m => horde_settings.models.includes(m.name)).length === 0) { horde_settings.models = []; } + + setContextSizePreview(); } function loadHordeSettings(settings) { @@ -263,26 +278,19 @@ jQuery(function () { $("#horde_auto_adjust_response_length").on("input", function () { horde_settings.auto_adjust_response_length = !!$(this).prop("checked"); - if (horde_settings.models.length) { - adjustHordeGenerationParams(max_context, amount_gen) - } else { - $("#adjustedHordeParams").text(`Context: --, Response: --`) - } + setContextSizePreview(); saveSettingsDebounced(); }); $("#horde_auto_adjust_context_length").on("input", function () { horde_settings.auto_adjust_context_length = !!$(this).prop("checked"); - if (horde_settings.models.length) { - adjustHordeGenerationParams(max_context, amount_gen); - } else { - $("#adjustedHordeParams").text(`Context: --, Response: --`) - } + setContextSizePreview(); saveSettingsDebounced(); }); $("#horde_trusted_workers_only").on("input", function () { horde_settings.trusted_workers_only = !!$(this).prop("checked"); + setContextSizePreview(); saveSettingsDebounced(); }) @@ -313,3 +321,4 @@ jQuery(function () { }); } }) +