Merge ebbd9a816d into c52bdb9a4a

Use new command names in examples
Add aliases for group member commands
2024-05-17 17:59:32 +00:00 · 2024-05-17 20:59:00 +03:00 · 2024-05-17 20:57:03 +03:00 · 2024-05-17 18:21:13 +03:00 · 2024-05-17 17:47:40 +03:00 · 2024-05-17 17:47:18 +03:00
7 changed files with 84 additions and 14 deletions
--- a/public/index.html
+++ b/public/index.html
@ -1267,6 +1267,37 @@
                                            </div>
                                        </div>
                                    </div>
+                                    <div data-newbie-hidden data-tg-type="mancer, ooba, koboldcpp, aphrodite, tabby" name="dryBlock" class="wide100p">
+                                        <h4 class="wide100p textAlignCenter">
+                                            <label data-i18n="DRY Sampling">DRY Sampling</label>
+                                            <div class=" fa-solid fa-circle-info opacity50p " data-i18n="[title]DRY Sampling" title="Allows you to apply the DRY repetition penalty as outlined in https://github.com/oobabooga/text-generation-webui/pull/5677. Set multiplier to 0 to disable"></div>
+                                        </h4>
+                                        <div data-tg-type="mancer, ooba, koboldcpp, aphrodite, tabby" class="flex-container flexFlowRow gap10px flexShrink">
+                                            <div data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                                <small data-i18n="Allowed Length">Allowed Length</small>
+                                                <input class="neo-range-slider" type="range" id="dry_allowed_length_textgenerationwebui" name="volume" min="1" max="20" step="1" />
+                                                <input class="neo-range-input" type="number" min="1" max="20" step="1" data-for="dry_allowed_length_textgenerationwebui" id="dry_allowed_length_counter_textgenerationwebui">
+                                            </div>
+                                            <div data-tg-type="mancer, ooba, koboldcpp, aphrodite" data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                                <small data-i18n="Multiplier">Multiplier</small>
+                                                <input class="neo-range-slider" type="range" id="dry_multiplier_textgenerationwebui" name="volume" min="0" max="10" step="0.01" />
+                                                <input class="neo-range-input" type="number" min="0" max="5" step="0.01" data-for="dry_multiplier_textgenerationwebui" id="dry_multiplier_counter_textgenerationwebui">
+                                            </div>
+                                            <div data-tg-type="mancer, ooba, koboldcpp, aphrodite" data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                                <small data-i18n="Base">Base</small>
+                                                <input class="neo-range-slider" type="range" id="dry_base_textgenerationwebui" name="volume" min="1" max="4" step="0.01" />
+                                                <input class="neo-range-input" type="number" min="1" max="4" step="0.01" data-for="dry_base_textgenerationwebui" id="dry_base_counter_textgenerationwebui">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="range-block">
+                                        <div class="range-block-title justifyLeft">
+                                            <span data-i18n="DRY Sequence Breakers">DRY Sequence Breakers</span>
+                                        </div>
+                                        <div class="wide100p">
+                                            <textarea id="dry_sequence_breakers_textgenerationwebui" class="text_pole textarea_compact" name="sequence_breakers" rows="3" data-i18n="[placeholder]Sequence breakers for DRY sampling can be added here as a comma separated list enclosed in brackets, where each element is enclosed in double quotation marks" placeholder="Sequence breakers for DRY sampling can be added here as a comma separated list enclosed in brackets, where each element is enclosed in double quotation marks."></textarea>
+                                        </div>
+                                    </div>																																																											 
                                    <div data-newbie-hidden data-tg-type="ooba, mancer, koboldcpp, tabby, llamacpp, aphrodite" name="dynaTempBlock" class="wide100p">
                                        <h4 class="wide100p textAlignCenter" data-i18n="DynaTemp">
                                            <div class="flex-container alignitemscenter" style="justify-content: center;">
--- a/public/scripts/extensions/quick-reply/src/QuickReply.js
+++ b/public/scripts/extensions/quick-reply/src/QuickReply.js
@ -342,6 +342,16 @@ export class QuickReply {
            message.addEventListener('scroll', (evt)=>{
                updateScrollDebounced();
            });
+            /** @type {any} */
+            const resizeListener = debounce((evt) => {
+                updateSyntax();
+                updateScrollDebounced(evt);
+                if (document.activeElement == message) {
+                    message.blur();
+                    message.focus();
+                }
+            });
+            window.addEventListener('resize', resizeListener);
            message.style.color = 'transparent';
            message.style.background = 'transparent';
            message.style.setProperty('text-shadow', 'none', 'important');
@ -514,6 +524,8 @@ export class QuickReply {
            });

            await popupResult;
+
+            window.removeEventListener('resize', resizeListener);
        } else {
            warn('failed to fetch qrEditor template');
        }
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@ -675,6 +675,7 @@ async function CreateZenSliders(elmnt) {
        sliderID == 'top_k' ||
        sliderID == 'mirostat_mode_kobold' ||
        sliderID == 'rep_pen_range' ||
+		sliderID == 'dry_allowed_length_textgenerationwebui' ||
        sliderID == 'max_tokens_second_textgenerationwebui') {
        decimals = 0;
    }
@ -683,6 +684,8 @@ async function CreateZenSliders(elmnt) {
        sliderID == 'dynatemp_exponent_textgenerationwebui' ||
        sliderID == 'smoothing_curve_textgenerationwebui' ||
        sliderID == 'smoothing_factor_textgenerationwebui') {
+		sliderID == 'dry_multiplier_textgenerationwebui' ||
+        sliderID == 'dry_base_textgenerationwebui') {
        decimals = 2;
    }
    if (sliderID == 'eta_cutoff_textgenerationwebui' ||
@ -743,6 +746,7 @@ async function CreateZenSliders(elmnt) {
        sliderID == 'rep_pen_slope' ||
        sliderID == 'smoothing_factor_textgenerationwebui' ||
        sliderID == 'smoothing_curve_textgenerationwebui' ||
+		sliderID == 'dry_multiplier_textgenerationwebui' ||											 
        sliderID == 'min_length_textgenerationwebui') {
        offVal = 0;
    }
--- a/public/scripts/slash-commands.js
+++ b/public/scripts/slash-commands.js
@ -447,8 +447,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'unhide',
    ],
    helpString: 'Unhides a message from the prompt.',
 }));
-SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'disable',
+SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-disable',
    callback: disableGroupMemberCallback,
+    aliases: ['disable', 'disablemember', 'memberdisable'],
    unnamedArgumentList: [
        new SlashCommandArgument(
            'member index or name', [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.STRING], true,
@ -456,7 +457,8 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'disable',
    ],
    helpString: 'Disables a group member from being drafted for replies.',
 }));
-SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'enable',
+SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-enable',
+    aliases: ['enable', 'enablemember', 'memberenable'],
    callback: enableGroupMemberCallback,
    unnamedArgumentList: [
        new SlashCommandArgument(
@ -465,9 +467,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'enable',
    ],
    helpString: 'Enables a group member to be drafted for replies.',
 }));
-SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'memberadd',
+SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-add',
    callback: addGroupMemberCallback,
-    aliases: ['addmember'],
+    aliases: ['addmember', 'memberadd'],
    unnamedArgumentList: [
        new SlashCommandArgument(
            'character name', [ARGUMENT_TYPE.STRING], true,
@ -481,15 +483,15 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'memberadd',
            <strong>Example:</strong>
            <ul>
                <li>
-                    <pre><code>/memberadd John Doe</code></pre>
+                    <pre><code>/member-add John Doe</code></pre>
                </li>
            </ul>
        </div>
    `,
 }));
-SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'memberremove',
+SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-remove',
    callback: removeGroupMemberCallback,
-    aliases: ['removemember'],
+    aliases: ['removemember', 'memberremove'],
    unnamedArgumentList: [
        new SlashCommandArgument(
            'member index or name', [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.STRING], true,
@ -503,16 +505,16 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'memberremove
            <strong>Example:</strong>
            <ul>
                <li>
-                    <pre><code>/memberremove 2</code></pre>
-                    <pre><code>/memberremove John Doe</code></pre>
+                    <pre><code>/member-remove 2</code></pre>
+                    <pre><code>/member-remove John Doe</code></pre>
                </li>
            </ul>
        </div>
    `,
 }));
-SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'memberup',
+SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-up',
    callback: moveGroupMemberUpCallback,
-    aliases: ['upmember'],
+    aliases: ['upmember', 'memberup'],
    unnamedArgumentList: [
        new SlashCommandArgument(
            'member index or name', [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.STRING], true,
@ -520,9 +522,9 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'memberup',
    ],
    helpString: 'Moves a group member up in the group chat list.',
 }));
-SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'memberdown',
+SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'member-down',
    callback: moveGroupMemberDownCallback,
-    aliases: ['downmember'],
+    aliases: ['downmember', 'memberdown'],
    unnamedArgumentList: [
        new SlashCommandArgument(
            'member index or name', [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.STRING], true,
--- a/public/scripts/slash-commands/SlashCommandAutoCompleteNameResult.js
+++ b/public/scripts/slash-commands/SlashCommandAutoCompleteNameResult.js
@ -58,6 +58,9 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
                return new RegExp('=(.*)');
            }
        }
+        if (!Array.isArray(this.executor.command?.namedArgumentList)) {
+            return null;
+        }
        const notProvidedNamedArguments = this.executor.command.namedArgumentList.filter(arg=>!this.executor.namedArgumentList.find(it=>it.name == arg.name));
        let name;
        let value;
@ -130,6 +133,9 @@ export class SlashCommandAutoCompleteNameResult extends AutoCompleteNameResult {
    }

    getUnnamedArgumentAt(text, index, isSelect) {
+        if (!Array.isArray(this.executor.command?.unnamedArgumentList)) {
+            return null;
+        }
        const lastArgIsBlank = this.executor.unnamedArgumentList.slice(-1)[0]?.value == '';
        const notProvidedArguments = this.executor.command.unnamedArgumentList.slice(this.executor.unnamedArgumentList.length - (lastArgIsBlank ? 1 : 0));
        let value;
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@ -116,6 +116,10 @@ const settings = {
    dynatemp_exponent: 1.0,
    smoothing_factor: 0.0,
    smoothing_curve: 1.0,
+	dry_allowed_length: 2,				   
+	dry_multiplier: 0.0,				 
+	dry_base: 1.75,			
+	dry_sequence_breakers: '',
    max_tokens_second: 0,
    seed: -1,
    preset: 'Default',
@ -190,6 +194,10 @@ const setting_names = [
    'dynatemp_exponent',
    'smoothing_factor',
    'smoothing_curve',
+	'dry_allowed_length',
+	'dry_multiplier',
+	'dry_base',
+	'dry_sequence_breakers',
    'max_tokens_second',
    'encoder_rep_pen',
    'freq_pen',
@ -665,6 +673,9 @@ jQuery(function () {
            'guidance_scale_textgenerationwebui': 1,
            'smoothing_factor_textgenerationwebui': 0,
            'smoothing_curve_textgenerationwebui': 1,
+			'dry_allowed_length_textgenerationwebui': 2,
+			'dry_multiplier_textgenerationwebui': 0,
+			'dry_base_textgenerationwebui': 1.75,
        };

        for (const [id, value] of Object.entries(inputs)) {
@ -1028,6 +1039,10 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
        'dynatemp_exponent': settings.dynatemp ? settings.dynatemp_exponent : undefined,
        'smoothing_factor': settings.smoothing_factor,
        'smoothing_curve': settings.smoothing_curve,
+		'dry_allowed_length': settings.dry_allowed_length,
+		'dry_multiplier': settings.dry_multiplier,
+		'dry_base': settings.dry_base,
+		'dry_sequence_breakers': settings.dry_sequence_breakers,
        'max_tokens_second': settings.max_tokens_second,
        'sampler_priority': settings.type === OOBA ? settings.sampler_priority : undefined,
        'samplers': settings.type === LLAMACPP ? settings.samplers : undefined,
--- a/public/scripts/variables.js
+++ b/public/scripts/variables.js
@ -518,7 +518,7 @@ async function executeSubCommands(command, scope = null, parserFlags = null) {
        command = command.slice(1, -1);
    }

-    const result = await executeSlashCommands(command, true, scope, true, parserFlags);
+    const result = await executeSlashCommands(command, true, scope, false, parserFlags);

    if (!result || typeof result !== 'object') {
        return '';
Author	SHA1	Message	Date
kokansei	8ee25f434c	Merge `ebbd9a816d` into `c52bdb9a4a`	2024-05-17 17:59:32 +00:00
Cohee	c52bdb9a4a	Use new command names in examples	2024-05-17 20:59:00 +03:00
Cohee	bbd9c89357	Add aliases for group member commands	2024-05-17 20:57:03 +03:00
Cohee	fb2190ace1	#2254 Don't suppress abort in subcommands	2024-05-17 18:21:13 +03:00
Cohee	deb09bf5bf	Fix console errors on not found command autocomplete	2024-05-17 17:47:40 +03:00
Cohee	d951beb626	#2260 Handle window resize in script editor	2024-05-17 17:47:18 +03:00
kokansei	ebbd9a816d	Update index.html	2024-05-10 21:43:39 -04:00
kokansei	5588da0ee5	Update power-user.js	2024-05-10 21:28:11 -04:00
kokansei	868e116101	Add files via upload	2024-05-10 21:18:37 -04:00
kokansei	f398019aeb	Delete public/scripts/power-user.js	2024-05-10 21:18:24 -04:00
kokansei	f4087dc217	Add files via upload	2024-05-10 21:14:54 -04:00
kokansei	52e96134bc	Delete public/scripts/power-user.js	2024-05-10 21:14:15 -04:00
kokansei	ef84cb5bfa	Add files via upload	2024-05-10 21:08:45 -04:00
kokansei	0b3cd4cb31	Delete public/scripts/textgen-settings.js	2024-05-10 21:08:30 -04:00
kokansei	524b199b5a	Add files via upload	2024-05-10 20:57:32 -04:00
kokansei	bf25e46d41	Delete public/index.html	2024-05-10 20:53:44 -04:00
kokansei	d91c1cd85a	Add files via upload	2024-05-10 15:31:40 -04:00
kokansei	ea6b5001a8	Add files via upload	2024-05-10 15:28:52 -04:00