rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Respect trusted worker flag if auto-adjust is enabled

This commit is contained in:
Cohee 2023-10-18 14:25:05 +03:00
parent 5d1fff3df6
commit 9611e31481
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/scripts/horde.js
View File

@ -73,6 +73,11 @@ async function adjustHordeGenerationParams(max_context_length, max_length) {
for (const model of selectedModels) { for (const model of selectedModels) {
for (const worker of workers) { for (const worker of workers) {
if (model.cluster == worker.cluster && worker.models.includes(model.name)) { 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); availableWorkers.push(worker);
} }
} }
@ -92,6 +97,14 @@ async function adjustHordeGenerationParams(max_context_length, max_length) {
return { maxContextLength, maxLength }; 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) { async function generateHorde(prompt, params, signal, reportProgress) {
validateHordeModel(); validateHordeModel();
delete params.prompt; 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) { if (horde_settings.models.length && models.filter(m => horde_settings.models.includes(m.name)).length === 0) {
horde_settings.models = []; horde_settings.models = [];
} }
setContextSizePreview();
} }
function loadHordeSettings(settings) { function loadHordeSettings(settings) {
@ -263,26 +278,19 @@ jQuery(function () {
$("#horde_auto_adjust_response_length").on("input", function () { $("#horde_auto_adjust_response_length").on("input", function () {
horde_settings.auto_adjust_response_length = !!$(this).prop("checked"); horde_settings.auto_adjust_response_length = !!$(this).prop("checked");
if (horde_settings.models.length) { setContextSizePreview();
adjustHordeGenerationParams(max_context, amount_gen)
} else {
$("#adjustedHordeParams").text(`Context: --, Response: --`)
}
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$("#horde_auto_adjust_context_length").on("input", function () { $("#horde_auto_adjust_context_length").on("input", function () {
horde_settings.auto_adjust_context_length = !!$(this).prop("checked"); horde_settings.auto_adjust_context_length = !!$(this).prop("checked");
if (horde_settings.models.length) { setContextSizePreview();
adjustHordeGenerationParams(max_context, amount_gen);
} else {
$("#adjustedHordeParams").text(`Context: --, Response: --`)
}
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$("#horde_trusted_workers_only").on("input", function () { $("#horde_trusted_workers_only").on("input", function () {
horde_settings.trusted_workers_only = !!$(this).prop("checked"); horde_settings.trusted_workers_only = !!$(this).prop("checked");
setContextSizePreview();
saveSettingsDebounced(); saveSettingsDebounced();
}) })
@ -313,3 +321,4 @@ jQuery(function () {
}); });
} }
}) })