fix the JS issue where both ooba and aphro were using the same container ID
| @@ -1783,7 +1783,7 @@ | ||
| 1783 | 1783 | <div class="toggle-description widthUnset" data-i18n="Aphrodite only. Determines the order of samplers. Skew is always applied post-softmax, so it's not included here."> |
| 1784 | 1784 | Aphrodite only. Determines the order of samplers. |
| 1785 | 1785 | </div> |
| 1786 | 1786 | <div id="sampler_priority_containersampler_priority_container_aphrodite" class="prompt_order"> |
| 1787 | 1787 | <div data-name="dry" draggable="true"><span>DRY</span><small></small></div> |
| 1788 | 1788 | <div data-name="penalties" draggable="true"><span>Penalties</span><small></small></div> |
| 1789 | 1789 | <div data-name="no_repeat_ngram" draggable="true"><span>No Repeat Ngram</span><small></small></div> |
| @@ -571,6 +571,15 @@ function sortOobaItemsByOrder(orderArray) { | ||
| 571 | 571 | }); |
| 572 | 572 | } |
| 573 | 573 | |
| 574 | +function sortAphroditeItemsByOrder(orderArray) { | |
| 575 | + const $container = $('#sampler_priority_container_aphrodite'); | |
| 576 | + | |
| 577 | + orderArray.forEach((name) => { | |
| 578 | + const $item = $container.find(`[data-name="${name}"]`).detach(); | |
| 579 | + $container.append($item); | |
| 580 | + }); | |
| 581 | +} | |
| 582 | + | |
| 574 | 583 | jQuery(function () { |
| 575 | 584 | $('#koboldcpp_order').sortable({ |
| 576 | 585 | delay: getSortableDelay(), |
| @@ -624,6 +633,19 @@ jQuery(function () { | ||
| 624 | 633 | }, |
| 625 | 634 | }); |
| 626 | 635 | |
| 636 | + $('#sampler_priority_container_aphrodite').sortable({ | |
| 637 | + delay: getSortableDelay(), | |
| 638 | + stop: function () { | |
| 639 | + const order = []; | |
| 640 | + $('#sampler_priority_container_aphrodite').children().each(function () { | |
| 641 | + order.push($(this).data('name')); | |
| 642 | + }); | |
| 643 | + settings.samplers_priorities = order; | |
| 644 | + console.log('Samplers reordered:', settings.samplers_priorities); | |
| 645 | + saveSettingsDebounced(); | |
| 646 | + }, | |
| 647 | + }); | |
| 648 | + | |
| 627 | 649 | $('#tabby_json_schema').on('input', function () { |
| 628 | 650 | const json_schema_string = String($(this).val()); |
| 629 | 651 | |
| @@ -643,9 +665,9 @@ jQuery(function () { | ||
| 643 | 665 | }); |
| 644 | 666 | |
| 645 | 667 | $('#aphrodite_default_order').on('click', function () { |
| 646 | 668 | sortOobaItemsByOrdersortAphroditeItemsByOrder(APHRODITE_DEFAULT_ORDER); |
| 647 | 669 | settings.samplers_priortiessamplers_priorities = APHRODITE_DEFAULT_ORDER; |
| 648 | 670 | console.log('Default samplers order loaded:', settings.samplers_priortiessamplers_priorities); |
| 649 | 671 | saveSettingsDebounced(); |
| 650 | 672 | }); |
| 651 | 673 | |
| @@ -860,8 +882,8 @@ function setSettingByName(setting, value, trigger) { | ||
| 860 | 882 | if ('samplers_priority' === setting) { |
| 861 | 883 | value = Array.isArray(value) ? value : APHRODITE_DEFAULT_ORDER; |
| 862 | 884 | insertMissingArrayItems(APHRODITE_DEFAULT_ORDER, value); |
| 863 | 885 | sortOobaItemsByOrdersortAphroditeItemsByOrder(value); |
| 864 | 886 | settings.samplers_priortiessamplers_priorities = value; |
| 865 | 887 | return; |
| 866 | 888 | } |
| 867 | 889 | |
| @@ -1289,7 +1311,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate, | ||
| 1289 | 1311 | 'nsigma': settings.nsigma, |
| 1290 | 1312 | 'custom_token_bans': toIntArray(banned_tokens), |
| 1291 | 1313 | 'no_repeat_ngram_size': settings.no_repeat_ngram_size, |
| 1292 | 1314 | 'sampler_priority': settings.samplers_priortiestype === APHRODITE ? settings.samplers_priorities : undefined, |
| 1293 | 1315 | }; |
| 1294 | 1316 | |
| 1295 | 1317 | if (settings.type === OPENROUTER) { |