Merge pull request #3165 from AlpinDale/default_order aphrodite: send an empty list if using the default sampler priority

2922f19a2a6f417eafaefa36d2056653907430e3

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

Signed

public/scripts/textgen-settings.js+6 -2 Viewed

 import { getEventSourceStream } from './sse-stream.js';
 import { getCurrentDreamGenModelTokenizer, getCurrentOpenRouterModelTokenizer } from './textgen-models.js';
 import { ENCODE_TOKENIZERS, TEXTGEN_TOKENIZERS, getTextTokens, tokenizers } from './tokenizers.js';
-import { getSortableDelay, onlyUnique } from './utils.js';
+import { getSortableDelay, onlyUnique, arraysEqual } from './utils.js';
 export const textgen_types = {
     OOBA: 'ooba',

         'nsigma': settings.nsigma,
         'custom_token_bans': toIntArray(banned_tokens),
         'no_repeat_ngram_size': settings.no_repeat_ngram_size,
-        'sampler_priority': settings.type === APHRODITE ? settings.samplers_priorities : undefined,
+        'sampler_priority': settings.type === APHRODITE && !arraysEqual(
+            settings.samplers_priorities,
+            APHRODITE_DEFAULT_ORDER)
+            ? settings.samplers_priorities
+            : undefined,
     };
     if (settings.type === OPENROUTER) {

public/scripts/utils.js+17 -0 Viewed

     if (index === -1) throw new Error(`Character not found: ${char.avatar}`);
     return index;
+}
+/**
+ * Compares two arrays for equality
+ * @param {any[]} a - The first array
+ * @param {any[]} b - The second array
+ * @returns {boolean} True if the arrays are equal, false otherwise
+ */
+export function arraysEqual(a, b) {
+    if (a === b) return true;
+    if (a == null || b == null) return false;
+    if (a.length !== b.length) return false;
+    for (let i = 0; i < a.length; i++) {
+        if (a[i] !== b[i]) return false;
+    }
+    return true;
+}