c930a66d · permissionBRICK/SillyTavern

default/content/index.json+8 -0 Viewed

         "type": "instruct"
     },
+    {
 +        "filename": "presets/instruct/Tulu.json",
 +        "type": "instruct"
 +    },
 +    {
 +        "filename": "presets/context/Tulu.json",
 +        "type": "context"
 +    },
 +    {
         "filename": "presets/instruct/Vicuna 1.0.json",
         "type": "instruct"
     },

default/content/presets/context/Tulu.json+11 -0 Viewed

 +{
 +    "story_string": "<|system|>\n{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}{{trim}}\n",
 +    "example_separator": "",
 +    "chat_start": "",
 +    "use_stop_strings": false,
 +    "allow_jailbreak": false,
 +    "always_force_name2": true,
 +    "trim_sentences": false,
 +    "single_line": false,
 +    "name": "Tulu"
 +}

default/content/presets/instruct/Tulu.json+22 -0 Viewed

 +{
 +    "input_sequence": "<|user|>\n",
 +    "output_sequence": "<|assistant|>\n",
 +    "first_output_sequence": "",
 +    "last_output_sequence": "",
 +    "system_sequence_prefix": "",
 +    "system_sequence_suffix": "",
 +    "stop_sequence": "<|end_of_text|>",
 +    "wrap": false,
 +    "macro": true,
 +    "names_behavior": "always",
 +    "activation_regex": "",
 +    "skip_examples": false,
 +    "output_suffix": "<|end_of_text|>\n",
 +    "input_suffix": "\n",
 +    "system_sequence": "<|system|>\n",
 +    "system_suffix": "\n",
 +    "user_alignment_message": "",
 +    "last_system_sequence": "",
 +    "system_same_as_user": false,
 +    "name": "Tulu"
 +}

default/content/presets/openai/Default.json+0 -1 Viewed

     "show_external_models": false,
     "assistant_prefill": "",
     "assistant_impersonation": "",
 -    "human_sysprompt_message": "Let's get started. Please generate your response based on the information and instructions provided above.",
     "claude_use_sysprompt": false,
     "use_alt_scale": false,
     "squash_system_messages": false,

package-lock.json+2 -255 Viewed

+{
     "name": "sillytavern",
     "version": "1.12.78",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
             "version": "1.12.78",
             "hasInstallScript": true,
             "license": "AGPL-3.0",
             "dependencies": {

                 "vectra": "^0.2.2",
                 "wavefile": "^11.0.0",
                 "webpack": "^5.95.0",
 -                "webpack-dev-middleware": "^7.4.2",
                 "write-file-atomic": "^5.0.1",
                 "ws": "^8.17.1",
                 "yaml": "^2.3.4",

                 "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
         },
 -        "node_modules/@jsonjoy.com/base64": {
 -            "version": "1.1.2",
 -            "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
 -            "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
 -            "license": "Apache-2.0",
 -            "engines": {
 -                "node": ">=10.0"
 -            },
 -            "funding": {
 -                "type": "github",
 -                "url": "https://github.com/sponsors/streamich"
 -            },
 -            "peerDependencies": {
 -                "tslib": "2"
 -            }
 -        },
 -        "node_modules/@jsonjoy.com/json-pack": {
 -            "version": "1.1.0",
 -            "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz",
 -            "integrity": "sha512-zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==",
 -            "license": "Apache-2.0",
 -            "dependencies": {
 -                "@jsonjoy.com/base64": "^1.1.1",
 -                "@jsonjoy.com/util": "^1.1.2",
 -                "hyperdyperid": "^1.2.0",
 -                "thingies": "^1.20.0"
 -            },
 -            "engines": {
 -                "node": ">=10.0"
 -            },
 -            "funding": {
 -                "type": "github",
 -                "url": "https://github.com/sponsors/streamich"
 -            },
 -            "peerDependencies": {
 -                "tslib": "2"
 -            }
 -        },
 -        "node_modules/@jsonjoy.com/util": {
 -            "version": "1.5.0",
 -            "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.5.0.tgz",
 -            "integrity": "sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==",
 -            "license": "Apache-2.0",
 -            "engines": {
 -                "node": ">=10.0"
 -            },
 -            "funding": {
 -                "type": "github",
 -                "url": "https://github.com/sponsors/streamich"
 -            },
 -            "peerDependencies": {
 -                "tslib": "2"
 -            }
 -        },
         "node_modules/@kwsites/file-exists": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz",

                 "url": "https://github.com/sponsors/epoberezkin"
+            }
         },
 -        "node_modules/ajv-formats": {
 -            "version": "2.1.1",
 -            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
 -            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
 -            "license": "MIT",
 -            "dependencies": {
 -                "ajv": "^8.0.0"
 -            },
 -            "peerDependencies": {
 -                "ajv": "^8.0.0"
 -            },
 -            "peerDependenciesMeta": {
 -                "ajv": {
 -                    "optional": true
 -                }
 -            }
 -        },
 -        "node_modules/ajv-formats/node_modules/ajv": {
 -            "version": "8.17.1",
 -            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
 -            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 -            "license": "MIT",
 -            "dependencies": {
 -                "fast-deep-equal": "^3.1.3",
 -                "fast-uri": "^3.0.1",
 -                "json-schema-traverse": "^1.0.0",
 -                "require-from-string": "^2.0.2"
 -            },
 -            "funding": {
 -                "type": "github",
 -                "url": "https://github.com/sponsors/epoberezkin"
 -            }
 -        },
 -        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
 -            "version": "1.0.0",
 -            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 -            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 -            "license": "MIT"
 -        },
         "node_modules/ajv-keywords": {
             "version": "3.5.2",
             "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",

             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
             "license": "MIT"
         },
 -        "node_modules/colorette": {
 -            "version": "2.0.20",
 -            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
 -            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
 -            "license": "MIT"
 -        },
         "node_modules/combined-stream": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",

             "dev": true,
             "license": "MIT"
         },
 -        "node_modules/fast-uri": {
 -            "version": "3.0.3",
 -            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
 -            "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
 -            "license": "BSD-3-Clause"
 -        },
         "node_modules/fastq": {
             "version": "1.15.0",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",

                 "ms": "^2.0.0"
+            }
         },
 -        "node_modules/hyperdyperid": {
 -            "version": "1.2.0",
 -            "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
 -            "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
 -            "license": "MIT",
 -            "engines": {
 -                "node": ">=10.18"
 -            }
 -        },
         "node_modules/iconv-lite": {
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",

                 "node": ">= 0.6"
+            }
         },
 -        "node_modules/memfs": {
 -            "version": "4.14.0",
 -            "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.14.0.tgz",
 -            "integrity": "sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==",
 -            "license": "Apache-2.0",
 -            "dependencies": {
 -                "@jsonjoy.com/json-pack": "^1.0.3",
 -                "@jsonjoy.com/util": "^1.3.0",
 -                "tree-dump": "^1.0.1",
 -                "tslib": "^2.0.0"
 -            },
 -            "engines": {
 -                "node": ">= 4.0.0"
 -            },
 -            "funding": {
 -                "type": "github",
 -                "url": "https://github.com/sponsors/streamich"
 -            }
 -        },
         "node_modules/merge-descriptors": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",

                 "node": ">=0.10.0"
+            }
         },
 -        "node_modules/require-from-string": {
 -            "version": "2.0.2",
 -            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 -            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
 -            "license": "MIT",
 -            "engines": {
 -                "node": ">=0.10.0"
 -            }
 -        },
         "node_modules/resolve-alpn": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",

             "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
             "license": "ISC"
         },
 -        "node_modules/schema-utils": {
 -            "version": "4.2.0",
 -            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
 -            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
 -            "license": "MIT",
 -            "dependencies": {
 -                "@types/json-schema": "^7.0.9",
 -                "ajv": "^8.9.0",
 -                "ajv-formats": "^2.1.1",
 -                "ajv-keywords": "^5.1.0"
 -            },
 -            "engines": {
 -                "node": ">= 12.13.0"
 -            },
 -            "funding": {
 -                "type": "opencollective",
 -                "url": "https://opencollective.com/webpack"
 -            }
 -        },
 -        "node_modules/schema-utils/node_modules/ajv": {
 -            "version": "8.17.1",
 -            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
 -            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 -            "license": "MIT",
 -            "dependencies": {
 -                "fast-deep-equal": "^3.1.3",
 -                "fast-uri": "^3.0.1",
 -                "json-schema-traverse": "^1.0.0",
 -                "require-from-string": "^2.0.2"
 -            },
 -            "funding": {
 -                "type": "github",
 -                "url": "https://github.com/sponsors/epoberezkin"
 -            }
 -        },
 -        "node_modules/schema-utils/node_modules/ajv-keywords": {
 -            "version": "5.1.0",
 -            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
 -            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 -            "license": "MIT",
 -            "dependencies": {
 -                "fast-deep-equal": "^3.1.3"
 -            },
 -            "peerDependencies": {
 -                "ajv": "^8.8.2"
 -            }
 -        },
 -        "node_modules/schema-utils/node_modules/json-schema-traverse": {
 -            "version": "1.0.0",
 -            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 -            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 -            "license": "MIT"
 -        },
         "node_modules/seedrandom": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",

             "dev": true,
             "license": "MIT"
         },
 -        "node_modules/thingies": {
 -            "version": "1.21.0",
 -            "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
 -            "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
 -            "license": "Unlicense",
 -            "engines": {
 -                "node": ">=10.18"
 -            },
 -            "peerDependencies": {
 -                "tslib": "^2"
 -            }
 -        },
         "node_modules/tiktoken": {
             "version": "1.0.16",
             "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.16.tgz",

                 "node": ">=18"
+            }
         },
 -        "node_modules/tree-dump": {
 -            "version": "1.0.2",
 -            "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz",
 -            "integrity": "sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==",
 -            "license": "Apache-2.0",
 -            "engines": {
 -                "node": ">=10.0"
 -            },
 -            "funding": {
 -                "type": "github",
 -                "url": "https://github.com/sponsors/streamich"
 -            },
 -            "peerDependencies": {
 -                "tslib": "2"
 -            }
 -        },
         "node_modules/truncate-utf8-bytes": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",

+                }
+            }
         },
 -        "node_modules/webpack-dev-middleware": {
 -            "version": "7.4.2",
 -            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
 -            "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
 -            "license": "MIT",
 -            "dependencies": {
 -                "colorette": "^2.0.10",
 -                "memfs": "^4.6.0",
 -                "mime-types": "^2.1.31",
 -                "on-finished": "^2.4.1",
 -                "range-parser": "^1.2.1",
 -                "schema-utils": "^4.0.0"
 -            },
 -            "engines": {
 -                "node": ">= 18.12.0"
 -            },
 -            "funding": {
 -                "type": "opencollective",
 -                "url": "https://opencollective.com/webpack"
 -            },
 -            "peerDependencies": {
 -                "webpack": "^5.0.0"
 -            },
 -            "peerDependenciesMeta": {
 -                "webpack": {
 -                    "optional": true
 -                }
 -            }
 -        },
         "node_modules/webpack-sources": {
             "version": "3.2.3",
             "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",

package.json+1 -2 Viewed

         "vectra": "^0.2.2",
         "wavefile": "^11.0.0",
         "webpack": "^5.95.0",
 -        "webpack-dev-middleware": "^7.4.2",
         "write-file-atomic": "^5.0.1",
         "ws": "^8.17.1",
         "yaml": "^2.3.4",

         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
     "version": "1.12.78",
     "scripts": {
         "start": "node server.js",
         "start:deno": "deno run --allow-run --allow-net --allow-read --allow-write --allow-sys --allow-env server.js",

public/css/login.css+6 -0 Viewed

 body.login .userSelect:hover {
     background-color: var(--black30a);
+}
++
 +body.login #handleEntryBlock,
 +body.login #passwordEntryBlock,
 +body.login #passwordRecoveryBlock {
 +    margin: 2px;
 +}

public/index.html+12 -18 Viewed

                                         <input class="neo-range-slider" type="range" id="presence_pen_textgenerationwebui" name="volume" min="-2" max="2" step="0.01" />
                                         <input class="neo-range-input" type="number" min="-2" max="2" step="0.01" data-for="presence_pen_textgenerationwebui" id="presence_pen_counter_textgenerationwebui">
                                     </div>
                                     <div data-tg-type="aphrodite, ooba" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
                                         <small data-i18n="No Repeat Ngram Size">No Repeat Ngram Size</small>
                                         <input class="neo-range-slider" type="range" id="no_repeat_ngram_size_textgenerationwebui" name="volume" min="0" max="20" step="1">
                                         <input class="neo-range-input" type="number" min="0" max="20" step="1" data-for="no_repeat_ngram_size_textgenerationwebui" id="no_repeat_ngram_size_counter_textgenerationwebui">
                                     </div>
                                     <div data-tg-type="tabby, aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
                                         <small data-i18n="Skew">Skew</small>
                                         <input class="neo-range-slider" type="range" id="skew_textgenerationwebui" name="volume" min="-5" max="5" step="0.01" />
                                         <input class="neo-range-input" type="number" min="-5" max="5" step="0.01" data-for="skew_textgenerationwebui" id="skew_counter_textgenerationwebui">

                                         </div>
                                     </div>
                                     <div data-tg-type="aphrodite, ooba, koboldcpp, tabby, llamacpp" id="dryBlock" class="wide100p">
                                         <h4 class="wide100p textAlignCenter" title="DRY penalizes tokens that would extend the end of the input into a sequence that has previously occurred in the input. Set multiplier to 0 to disable." data-i18n="[title]DRY_Repetition_Penalty_desc">
                                             <label data-i18n="DRY Repetition Penalty">DRY Repetition Penalty</label>
                                             <a href="https://github.com/oobabooga/text-generation-webui/pull/5677" target="_blank">

                                                 Send the system prompt for supported models. If disabled, the user message is added to the beginning of the prompt.
                                             </span>
                                         </div>
 -                                        <div id="claude_human_sysprompt_message_block" class="wide100p">
 -                                            <div class="range-block-title openai_restorable">
 -                                                <span data-i18n="User first message">User first message</span>
 -                                                <div id="claude_human_sysprompt_message_restore" title="Restore User first message" data-i18n="[title]Restore User first message" class="right_menu_button">
 -                                                    <div class="fa-solid fa-clock-rotate-left"></div>
 -                                                </div>
 -                                            </div>
 -                                            <textarea id="claude_human_sysprompt_textarea" class="text_pole textarea_compact autoSetHeight" rows="2" data-i18n="[placeholder]Human message" placeholder="Human message, instruction, etc.&#10;Adds nothing when empty, i.e. requires a new prompt with the role 'user'."></textarea>
 -                                        </div>
                                     </div>
                                 </div>
                                 <div class="range-block m-t-1" data-source="openai,openrouter,scale,custom">

                             Advanced Formatting
                         </span>
                         <a href="https://docs.sillytavern.app/usage/promptscore-concepts/advancedformatting/" class="notes-link" target="_blank">
                             <span class="fa-solid fa-circle-question note-link-span"></span>
                         </a>
                     </h3>

                     </div>
                     <h3 class="margin0">
                         <span data-i18n="Worlds/Lorebooks">Worlds/Lorebooks</span>
                         <a href="https://docs.sillytavern.app/usage/core-concepts/worldinfo/" class="notes-link" target="_blank">
                             <span class="fa-solid fa-circle-question note-link-span"></span>
                         </a>
                     </h3>

                     <div name="userSettingsRowOne" class="flex-container flexFlowRow alignitemscenter spaceBetween">
                         <div class="flex-container">
                             <div class="flex-container flexnowrap alignItemsBaseline">
 -                                <h3 class="margin0"><span data-i18n="User Settings">User Settings</span></h3>
 +                                <h3 class="margin0">
 +                                    <span data-i18n="User Settings">User Settings</span>
++
 +                                    <a href="https://docs.sillytavern.app/usage/user_settings/" class="notes-link" target="_blank">
 +                                        <span class="fa-solid fa-circle-question note-link-span"></span>
 +                                    </a>
 +                                </h3>
                             </div>
                         </div>
                         <div id="UI-language-block" class="flex-container alignItemsBaseline">

                                 <audio id="audio_message_sound" src="sounds/message.mp3" hidden></audio>
                                 <span>
                                     <small data-i18n="Message Sound">Message Sound</small>
 -                                    <a href="https://docs.sillytavern.app/usage/user_settings/uicustomization/#message-sound" class="notes-link" target="_blank">
 -                                        <span class="fa-solid fa-circle-question note-link-span"></span>
 -                                    </a>
                                 </span>
                             </label>
                             <label for="play_sound_unfocused" class="checkbox_label" title="Only play a sound when ST's browser tab is unfocused." data-i18n="[title]Only play a sound when ST's browser tab is unfocused">

public/script.js+4 -3 Viewed

             subEntities = filterByTagState(entities, { subForEntity: entity });
             if (doFilter) {
                 // sub entities filter "hacked" because folder filter should not be applied there, so even in "only folders" mode characters show up
                 subEntities = entitiesFilter.applyFilters(subEntities, { clearScoreCache: false, tempOverrides: { [FILTER_TYPES.FOLDER]: FILTER_STATES.UNDEFINED }, clearFuzzySearchCaches: false });
+            }
             if (doSort) {
                 sortEntitiesList(subEntities);

@@ -1646,11 +1646,11 @@ export function getEntitiesList({ doFilter = false, doSort = true } = {}) {
1646	1646	// Second run filters, hiding whatever should be filtered later
1647	1647	if (doFilter) {
1648	1648	const beforeFinalEntities = filterByTagState(entities, { globalDisplayFilters: true });
1649	1649	entities = entitiesFilter.applyFilters(beforeFinalEntities, { clearFuzzySearchCaches: false });
1650	1650
1651	1651	// Magic for folder filter. If that one is enabled, and no folders are display anymore, we remove that filter to actually show the characters.
1652	1652	if (isFilterState(entitiesFilter.getFilterData(FILTER_TYPES.FOLDER), FILTER_STATES.SELECTED) && entities.filter(x => x.type == 'tag').length == 0) {
1653	1653	entities = entitiesFilter.applyFilters(beforeFinalEntities, { tempOverrides: { [FILTER_TYPES.FOLDER]: FILTER_STATES.UNDEFINED }, clearFuzzySearchCaches: false });
1654	1654	}
1655	1655	}
1656	1656

@@ -1666,6 +1666,7 @@ export function getEntitiesList({ doFilter = false, doSort = true } = {}) {
1666	1666	if (doSort) {
1667	1667	sortEntitiesList(entities);
1668	1668	}
	1669	+ entitiesFilter.clearFuzzySearchCaches();
1669	1670	return entities;
1670	1671	}
1671	1672

public/scripts/chat-templates.js+6 -0 Viewed

         // command-r-08-2024
         'Command R'
+    ,
++
 +    // Tulu
 +    'ac7498a36a719da630e99d48e6ebc4409de85a77556c2b6159eeb735bcbd11df':
 +        // Tulu-3-8B
 +        // Tulu-3-70B
 +        'Tulu'
 };
 const substr_derivations = {

public/scripts/extensions/quick-reply/src/SlashCommandHandler.js+28 -15 Viewed

             namedArgumentList: [
                 SlashCommandNamedArgument.fromProps({
                     name: 'set',
                     description: 'Name of QR set nameto add the context menu to',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'label',
                     description: 'Label of Quick Reply labelto add the context menu to',
                     typeList: [ARGUMENT_TYPE.STRING],
                     enumProvider: localEnumProviders.qrEntries,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'id',
                     description: 'numericNumeric ID of Quick Reply to add the QRcontext menu to, e.g., id=42',
                     typeList: [ARGUMENT_TYPE.NUMBER],
                     enumProvider: localEnumProviders.qrIds,
                 }),
                 new SlashCommandNamedArgument(
 -                    'chain', 'boolean', [ARGUMENT_TYPE.BOOLEAN], false, false, 'false',
 +                    'chain',
 +                    'If true, button QR is sent together with (before) the clicked QR from the context menu',
 +                    [ARGUMENT_TYPE.BOOLEAN],
 +                    false,
 +                    false,
 +                    'false',
                 ),
             ],
             unnamedArgumentList: [
                 SlashCommandArgument.fromProps({
                     description: 'Name of QR set nameto add as a context menu',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,

             ],
             helpString: `
                 <div>
                     Add a context menu preset to a QR.
 +                </div>
 +                <div>
 +                    If <code>id</code> and <code>label</code> are both provided, <code>id</code> will be used.
                 </div>
                 <div>
                     <strong>Example:</strong>
                     <ul>
                         <li>
                             <pre><code>/qr-contextadd set=MyPresetMyQRSetWithTheButton label=MyButton chain=true MyOtherPresetMyQRSetWithContextItems</code></pre>
                         </li>
                     </ul>
                 </div>

             namedArgumentList: [
                 SlashCommandNamedArgument.fromProps({
                     name: 'set',
                     description: 'Name of QR set nameto remove the context menu from',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'label',
                     description: 'Label of Quick Reply labelto remove the context menu from',
                     typeList: [ARGUMENT_TYPE.STRING],
                     enumProvider: localEnumProviders.qrEntries,
                 }),
                 SlashCommandNamedArgument.fromProps({
                     name: 'id',
                     description: 'numericNumeric ID of Quick Reply to remove the QRcontext menu from, e.g., id=42',
                     typeList: [ARGUMENT_TYPE.NUMBER],
                     enumProvider: localEnumProviders.qrIds,
                 }),
             ],
             unnamedArgumentList: [
                 SlashCommandArgument.fromProps({
                     description: 'Name of QR set nameto remove',
                     typeList: [ARGUMENT_TYPE.STRING],
                     isRequired: true,
                     enumProvider: localEnumProviders.qrSets,

                     Remove context menu preset from a QR.
                 </div>
                 <div>
 +                    If <code>id</code> and <code>label</code> are both provided, <code>id</code> will be used.
 +                </div>
 +                <div>
                     <strong>Example:</strong>
                     <ul>
                         <li>

                     Remove all context menu presets from a QR.
                 </div>
                 <div>
 +                    If <code>id</code> and a label are both provided, <code>id</code> will be used.
 +                </div>
 +                <div>
                     <strong>Example:</strong>
                     <ul>
                         <li>

+        }
+    }
+-
     createContextItem(args, name) {
         try {
             this.api.createContextItem(
                 args.set,
 -                args.label,
 +                args.id !== undefined ? Number(args.id) : args.label,
                 name,
                 isTrueBoolean(args.chain),
             );

@@ -923,14 +936,14 @@ export class SlashCommandHandler {
923	936	}
924	937	deleteContextItem(args, name) {
925	938	try {
926	939	this.api.deleteContextItem(args.set, args.id !== undefined ? Number(args.id) : args.label, name);
927	940	} catch (ex) {
928	941	toastr.error(ex.message);
929	942	}
930	943	}
931	944	clearContextMenu(args, label) {
932	945	try {
933	946	this.api.clearContextMenu(args.set, args.id !== undefined ? Number(args.id) : args.label ?? label);
934	947	} catch (ex) {
935	948	toastr.error(ex.message);
936	949	}

public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js+20 -2 Viewed

         this.itemList = this.build(qr).children;
         this.itemList.forEach(item => {
             item.onExpand = () => {
                 this.itemList.filter(it => it !== item)
                     .forEach(it => it.collapse());
             };
         });

             icon: qr.icon,
             showLabel: qr.showLabel,
             label: qr.label,
 +            title: qr.title,
             message: (chainedMessage && qr.message ? `${chainedMessage} | ` : '') + qr.message,
             children: [],
         };

                 const nextHierarchy = [...hierarchy, cl.set];
                 const nextLabelHierarchy = [...labelHierarchy, tree.label];
                 tree.children.push(new MenuHeader(cl.set.name));
 -                cl.set.qrList.forEach(subQr => {
++
 +                // If the Quick Reply's own set is added as a context menu,
 +                // show only the sub-QRs that are Invisible but have an icon
 +                // intent: allow a QR set to be assigned to one of its own QR buttons for a "burger" menu
 +                // with "UI" QRs either in the bar or in the menu, and "library function" QRs still hidden.
 +                // - QRs already visible on the bar are filtered out,
 +                // - hidden QRs without an icon are filtered out,
 +                // - hidden QRs **with an icon** are shown in the menu
 +                // so everybody is happy
 +                const qrsOwnSetAddedAsContextMenu = cl.set.qrList.includes(qr);
 +                const visible = (subQr) => {
 +                    return qrsOwnSetAddedAsContextMenu
 +                        ? subQr.isHidden && !!subQr.icon  // yes .isHidden gets inverted here
 +                        : !subQr.isHidden;
 +                };
++
 +                cl.set.qrList.filter(visible).forEach(subQr => {
                     const subTree = this.build(subQr, cl.isChained ? tree.message : null, nextHierarchy, nextLabelHierarchy);
                     tree.children.push(new MenuItem(
                         subTree.icon,
                         subTree.showLabel,
                         subTree.label,
 +                        subTree.title,
                         subTree.message,
                         (evt) => {
                             evt.stopPropagation();

public/scripts/extensions/quick-reply/src/ui/ctx/MenuHeader.js+1 -1 Viewed

@@ -2,7 +2,7 @@ import { MenuItem } from './MenuItem.js';
2	2
3	3	export class MenuHeader extends MenuItem {
4	4	constructor(/*@type {String}/label) {
5	5	super(null, null, label, null, null, null, []);
6	6	}
7	7
8	8

public/scripts/extensions/quick-reply/src/ui/ctx/MenuItem.js+11 -7 Viewed

     /**@type {string}*/ icon;
     /**@type {boolean}*/ showLabel;
     /**@type {string}*/ label;
 +    /**@type {string}*/ title;
     /**@type {object}*/ value;
     /**@type {function}*/ callback;
     /**@type {MenuItem[]}*/ childList = [];
     /**@type {SubMenu}*/ subMenu;
 -    /**@type {boolean}*/ isForceExpanded = false;
     /**@type {HTMLElement}*/ root;

     /**
+     *
      * @param {?string} icon
      * @param {?boolean} showLabel
      * @param {string} label
 +     * @param {?string} title Tooltip
      * @param {object} value
      * @param {function} callback
      * @param {MenuItem[]} children
      */
     constructor(icon, showLabel, label, title, value, callback, children = []) {
         this.icon = icon;
         this.showLabel = showLabel;
         this.label = label;
 +        this.title = title;
         this.value = value;
         this.callback = callback;
         this.childList = children;

                 this.root = item;
                 item.classList.add('list-group-item');
                 item.classList.add('ctx-item');
 -                item.title = this.value;
++
 +                // if a title/tooltip is set, add it, otherwise use the QR content
 +                // same as for the main QR list
 +                item.title = this.title || this.value;
++
                 if (this.callback) {
                     item.addEventListener('click', (evt) => this.callback(evt, this));
+                }
                 const icon = document.createElement('div'); {
 -                    this.domIcon = icon;
                     icon.classList.add('qr--button-icon');
                     icon.classList.add('fa-solid');
                     if (!this.icon) icon.classList.add('qr--hidden');

                     item.append(icon);
+                }
                 const lbl = document.createElement('div'); {
 -                    this.domLabel = lbl;
                     lbl.classList.add('qr--button-label');
                     if (this.icon && !this.showLabel) lbl.classList.add('qr--hidden');
                     lbl.textContent = this.label;

public/scripts/extensions/quick-reply/style.css+3 -0 Viewed

   position: absolute;
   overflow: visible;
+}
 +.ctx-menu .ctx-item .qr--hidden {
 +    display: none;
 +}
 .list-group .list-group-item.ctx-header {
   font-weight: bold;
   cursor: default;

public/scripts/extensions/quick-reply/style.less+4 -0 Viewed

     overflow: visible;
+}
 +.ctx-menu .ctx-item .qr--hidden {
 +    display: none;
 +}
++
 .list-group .list-group-item.ctx-header {
     font-weight: bold;
     cursor: default;

public/scripts/filters.js+45 -6 Viewed

+}
 /**
 + * The fuzzy search categories
 + * @type {{ characters: string, worldInfo: string, personas: string, tags: string, groups: string }}
 + */
 +export const fuzzySearchCategories = Object.freeze({
 +    characters: 'characters',
 +    worldInfo: 'worldInfo',
 +    personas: 'personas',
 +    tags: 'tags',
 +    groups: 'groups',
 +});
++
++
 +/**
  * Helper class for filtering data.
  * @example
  * const filterHelper = new FilterHelper(() => console.log('data changed'));

     scoreCache;
     /**
 +     * Cache for fuzzy search results per category.
 +     * @type {Object.<string, { resultMap: Map<string, any> }>}
 +     */
 +    fuzzySearchCaches;
++
 +    /**
      * Creates a new FilterHelper
      * @param {Function} onDataChanged Callback to trigger when the filter data changes
      */
     constructor(onDataChanged) {
         this.onDataChanged = onDataChanged;
         this.scoreCache = new Map();
 +        this.fuzzySearchCaches = {
 +            [fuzzySearchCategories.characters]: { resultMap: new Map() },
 +            [fuzzySearchCategories.worldInfo]: { resultMap: new Map() },
 +            [fuzzySearchCategories.personas]: { resultMap: new Map() },
 +            [fuzzySearchCategories.tags]: { resultMap: new Map() },
 +            [fuzzySearchCategories.groups]: { resultMap: new Map() },
 +        };
+    }
     /**

             return data;
+        }
         const fuzzySearchResults = fuzzySearchWorldInfo(data, term, this.fuzzySearchCaches);
         this.cacheScores(FILTER_TYPES.WORLD_INFO_SEARCH, new Map(fuzzySearchResults.map(i => [i.item?.uid, i.score])));
         const filteredData = data.filter(entity => fuzzySearchResults.find(x => x.item === entity));

             return data;
+        }
         const fuzzySearchResults = fuzzySearchPersonas(data, term, this.fuzzySearchCaches);
         this.cacheScores(FILTER_TYPES.PERSONA_SEARCH, new Map(fuzzySearchResults.map(i => [i.item.key, i.score])));
         const filteredData = data.filter(name => fuzzySearchResults.find(x => x.item.key === name));

         // Save fuzzy search results and scores if enabled
         if (power_user.fuzzy_search) {
             const fuzzySearchCharactersResults = fuzzySearchCharacters(searchValue, this.fuzzySearchCaches);
             const fuzzySearchGroupsResults = fuzzySearchGroups(searchValue, this.fuzzySearchCaches);
             const fuzzySearchTagsResult = fuzzySearchTags(searchValue, this.fuzzySearchCaches);
             this.cacheScores(FILTER_TYPES.SEARCH, new Map(fuzzySearchCharactersResults.map(i => [`character.${i.refIndex}`, i.score])));
             this.cacheScores(FILTER_TYPES.SEARCH, new Map(fuzzySearchGroupsResults.map(i => [`group.${i.item.id}`, i.score])));
             this.cacheScores(FILTER_TYPES.SEARCH, new Map(fuzzySearchTagsResult.map(i => [`tag.${i.item.id}`, i.score])));

      * @param {object} options - Optional call parameters
      * @param {boolean} [options.clearScoreCache=true] - Whether the score cache should be cleared.
      * @param {Object.<FilterType, any>} [options.tempOverrides={}] - Temporarily override specific filters for this filter application
 +     * @param {boolean} [options.clearFuzzySearchCaches=true] - Whether the fuzzy search caches should be cleared.
      * @returns {any[]} The filtered data.
      */
     applyFilters(data, { clearScoreCache = true, tempOverrides = {}, clearFuzzySearchCaches = true } = {}) {
         if (clearScoreCache) this.clearScoreCache();
 +        if (clearFuzzySearchCaches) this.clearFuzzySearchCaches();
++
         // Save original filter states
         const originalStates = {};
         for (const key in tempOverrides) {

@@ -411,4 +440,14 @@ export class FilterHelper {
411	440	this.scoreCache = new Map();
412	441	}
413	442	}
	443	+
	444	+ /**
	445	+ * Clears fuzzy search caches
	446	+ */
	447	+ clearFuzzySearchCaches() {
	448	+ for (const cache of Object.values(this.fuzzySearchCaches)) {
	449	+ cache.resultMap.clear();
	450	+ }
	451	+ console.log('All fuzzy search caches cleared');
	452	+ }
414	453	}

public/scripts/openai.js+0 -24 Viewed

 const default_new_chat_prompt = '[Start a new Chat]';
 const default_new_group_chat_prompt = '[Start a new group chat. Group members: {{group}}]';
 const default_new_example_chat_prompt = '[Example Chat]';
 -const default_claude_human_sysprompt_message = 'Let\'s get started. Please generate your response based on the information and instructions provided above.';
 const default_continue_nudge_prompt = '[Continue the following message. Do not include ANY parts of the original message. Use capitalization and punctuation as if your reply is a part of the original message: {{lastChatMessage}}]';
 const default_bias = 'Default (none)';
 const default_personality_format = '[{{char}}\'s personality: {{personality}}]';

     proxy_password: '',
     assistant_prefill: '',
     assistant_impersonation: '',
 -    human_sysprompt_message: default_claude_human_sysprompt_message,
     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     use_alt_scale: false,

     proxy_password: '',
     assistant_prefill: '',
     assistant_impersonation: '',
 -    human_sysprompt_message: default_claude_human_sysprompt_message,
     claude_use_sysprompt: false,
     use_makersuite_sysprompt: true,
     use_alt_scale: false,

         generate_data['top_k'] = Number(oai_settings.top_k_openai);
         generate_data['claude_use_sysprompt'] = oai_settings.claude_use_sysprompt;
         generate_data['stop'] = getCustomStoppingStrings(); // Claude shouldn't have limits on stop strings.
 -        generate_data['human_sysprompt_message'] = substituteParams(oai_settings.human_sysprompt_message);
         // Don't add a prefill on quiet gens (summarization) and when using continue prefill.
         if (!isQuiet && !(isContinue && oai_settings.continue_prefill)) {
             generate_data['assistant_prefill'] = isImpersonate ? substituteParams(oai_settings.assistant_impersonation) : substituteParams(oai_settings.assistant_prefill);

     oai_settings.proxy_password = settings.proxy_password ?? default_settings.proxy_password;
     oai_settings.assistant_prefill = settings.assistant_prefill ?? default_settings.assistant_prefill;
     oai_settings.assistant_impersonation = settings.assistant_impersonation ?? default_settings.assistant_impersonation;
 -    oai_settings.human_sysprompt_message = settings.human_sysprompt_message ?? default_settings.human_sysprompt_message;
     oai_settings.image_inlining = settings.image_inlining ?? default_settings.image_inlining;
     oai_settings.inline_image_quality = settings.inline_image_quality ?? default_settings.inline_image_quality;
     oai_settings.bypass_status_check = settings.bypass_status_check ?? default_settings.bypass_status_check;

     $('#openai_proxy_password').val(oai_settings.proxy_password);
     $('#claude_assistant_prefill').val(oai_settings.assistant_prefill);
     $('#claude_assistant_impersonation').val(oai_settings.assistant_impersonation);
 -    $('#claude_human_sysprompt_textarea').val(oai_settings.human_sysprompt_message);
     $('#openai_image_inlining').prop('checked', oai_settings.image_inlining);
     $('#openai_bypass_status_check').prop('checked', oai_settings.bypass_status_check);

         show_external_models: settings.show_external_models,
         assistant_prefill: settings.assistant_prefill,
         assistant_impersonation: settings.assistant_impersonation,
 -        human_sysprompt_message: settings.human_sysprompt_message,
         claude_use_sysprompt: settings.claude_use_sysprompt,
         use_makersuite_sysprompt: settings.use_makersuite_sysprompt,
         use_alt_scale: settings.use_alt_scale,

         proxy_password: ['#openai_proxy_password', 'proxy_password', false],
         assistant_prefill: ['#claude_assistant_prefill', 'assistant_prefill', false],
         assistant_impersonation: ['#claude_assistant_impersonation', 'assistant_impersonation', false],
 -        human_sysprompt_message: ['#claude_human_sysprompt_textarea', 'human_sysprompt_message', false],
         claude_use_sysprompt: ['#claude_use_sysprompt', 'claude_use_sysprompt', true],
         use_makersuite_sysprompt: ['#use_makersuite_sysprompt', 'use_makersuite_sysprompt', true],
         use_alt_scale: ['#use_alt_scale', 'use_alt_scale', true],

         const validSources = $(this).data('source').split(',');
         $(this).toggle(validSources.includes(oai_settings.chat_completion_source));
     });
+-
 -    if (chat_completion_sources.CLAUDE == oai_settings.chat_completion_source) {
 -        $('#claude_human_sysprompt_message_block').toggle(oai_settings.claude_use_sysprompt);
 -    }
+}
 async function testApiConnection() {

     $('#claude_use_sysprompt').on('change', function () {
         oai_settings.claude_use_sysprompt = !!$('#claude_use_sysprompt').prop('checked');
 -        $('#claude_human_sysprompt_message_block').toggle(oai_settings.claude_use_sysprompt);
         saveSettingsDebounced();
     });

         saveSettingsDebounced();
     });
 -    $('#claude_human_sysprompt_message_restore').on('click', function () {
 -        oai_settings.human_sysprompt_message = default_claude_human_sysprompt_message;
 -        $('#claude_human_sysprompt_textarea').val(oai_settings.human_sysprompt_message);
 -        saveSettingsDebounced();
 -    });
+-
     $('#newgroupchat_prompt_restore').on('click', function () {
         oai_settings.new_group_chat_prompt = default_new_group_chat_prompt;
         $('#newgroupchat_prompt_textarea').val(oai_settings.new_group_chat_prompt);

         saveSettingsDebounced();
     });
 -    $('#claude_human_sysprompt_textarea').on('input', function () {
 -        oai_settings.human_sysprompt_message = String($('#claude_human_sysprompt_textarea').val());
 -        saveSettingsDebounced();
 -    });
+-
     $('#openrouter_use_fallback').on('input', function () {
         oai_settings.openrouter_use_fallback = !!$(this).prop('checked');
         saveSettingsDebounced();

public/scripts/power-user.js+87 -84 Viewed

 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { POPUP_TYPE, callGenericPopup } from './popup.js';
 import { loadSystemPrompts } from './sysprompt.js';
 +import { fuzzySearchCategories } from './filters.js';
 export {
     loadPowerUserSettings,

     });
+}
++
 /**
  * FuzzyCommon searchfunction charactersto byperform afuzzy search termwith optional caching
 + * @param {string} type - Type of search from fuzzySearchCategories
 + * @param {any[]} data - Data array to search in
 + * @param {Array<{name: string, weight: number, getFn?: Function}>} keys - Fuse.js keys configuration
  * @param {string} searchValue - The search term
 + * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 -export function fuzzySearchCharacters(searchValue) {
 +function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches = null) {
 +    // Check cache if provided
 +    if (fuzzySearchCaches) {
 +        const cache = fuzzySearchCaches[type];
 +        if (cache?.resultMap.has(searchValue)) {
 +            return cache.resultMap.get(searchValue);
 +        }
 +    }
++
     // @ts-ignore
     const fuse = new Fuse(charactersdata, {
         keys: [keys,
 -            { name: 'data.name', weight: 20 },
 -            { name: '#tags', weight: 10, getFn: (character) => getTagsList(character.avatar).map(x => x.name).join('||') },
 -            { name: 'data.description', weight: 3 },
 -            { name: 'data.mes_example', weight: 3 },
 -            { name: 'data.scenario', weight: 2 },
 -            { name: 'data.personality', weight: 2 },
 -            { name: 'data.first_mes', weight: 2 },
 -            { name: 'data.creator_notes', weight: 2 },
 -            { name: 'data.creator', weight: 1 },
 -            { name: 'data.tags', weight: 1 },
 -            { name: 'data.alternate_greetings', weight: 1 },
 -        ],
         includeScore: true,
         ignoreLocation: true,
         useExtendedSearch: true,

     });
     const results = fuse.search(searchValue);
 -    console.debug('Characters fuzzy search results for ' + searchValue, results);
++
 +    // Store in cache if provided
 +    if (fuzzySearchCaches) {
 +        fuzzySearchCaches[type].resultMap.set(searchValue, results);
 +    }
     return results;
+}
 /**
 + * Fuzzy search characters by a search term
 + * @param {string} searchValue - The search term
 + * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
 + * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
 + */
 +export function fuzzySearchCharacters(searchValue, fuzzySearchCaches = null) {
 +    const keys = [
 +        { name: 'data.name', weight: 20 },
 +        { name: '#tags', weight: 10, getFn: (character) => getTagsList(character.avatar).map(x => x.name).join('||') },
 +        { name: 'data.description', weight: 3 },
 +        { name: 'data.mes_example', weight: 3 },
 +        { name: 'data.scenario', weight: 2 },
 +        { name: 'data.personality', weight: 2 },
 +        { name: 'data.first_mes', weight: 2 },
 +        { name: 'data.creator_notes', weight: 2 },
 +        { name: 'data.creator', weight: 1 },
 +        { name: 'data.tags', weight: 1 },
 +        { name: 'data.alternate_greetings', weight: 1 },
 +    ];
++
 +    return performFuzzySearch(fuzzySearchCategories.characters, characters, keys, searchValue, fuzzySearchCaches);
 +}
++
 +/**
  * Fuzzy search world info entries by a search term
  * @param {*[]} data - WI items data array
  * @param {string} searchValue - The search term
 + * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchWorldInfo(data, searchValue, fuzzySearchCaches = null) {
 -    // @ts-ignore
 +    const keys = [
 -    const fuse = new Fuse(data, {
 +        { name: 'key', weight: 20 },
 -        keys: [
 +        { name: 'group', weight: 15 },
                     { name: 'keycomment', weight: 2010 },
                     { name: 'groupkeysecondary', weight: 1510 },
                     { name: 'commentcontent', weight: 103 },
                     { name: 'keysecondaryuid', weight: 101 },
                     { name: 'contentautomationId', weight: 31 },
 -            { name: 'uid', weight: 1 },
 +    ];
 -            { name: 'automationId', weight: 1 },
 -        ],
 -        includeScore: true,
 -        ignoreLocation: true,
 -        useExtendedSearch: true,
 -        threshold: 0.2,
 -    });
 -    const results = fuse.search(searchValue);
 +    return performFuzzySearch(fuzzySearchCategories.worldInfo, data, keys, searchValue, fuzzySearchCaches);
 -    console.debug('World Info fuzzy search results for ' + searchValue, results);
 -    return results;
+}
 /**
  * Fuzzy search persona entries by a search term
  * @param {*[]} data - persona data array
  * @param {string} searchValue - The search term
 + * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchPersonas(data, searchValue, fuzzySearchCaches = null) {
 -    data = data.map(x => ({ key: x, name: power_user.personas[x] ?? '', description: power_user.persona_descriptions[x]?.description ?? '' }));
 +    const mappedData = data.map(x => ({
 -    // @ts-ignore
 +        key: x,
 -    const fuse = new Fuse(data, {
 +        name: power_user.personas[x] ?? '',
 -        keys: [
 +        description: power_user.persona_descriptions[x]?.description ?? ''
 -            { name: 'name', weight: 20 },
 +    }));
 -            { name: 'description', weight: 3 },
 -        ],
 -        includeScore: true,
 -        ignoreLocation: true,
 -        useExtendedSearch: true,
 -        threshold: 0.2,
 -    });
     const resultskeys = fuse.search(searchValue);[
 -    console.debug('Personas fuzzy search results for ' + searchValue, results);
 +        { name: 'name', weight: 20 },
 -    return results;
 +        { name: 'description', weight: 3 },
 +    ];
++
 +    return performFuzzySearch(fuzzySearchCategories.personas, mappedData, keys, searchValue, fuzzySearchCaches);
+}
 /**
  * Fuzzy search tags by a search term
  * @param {string} searchValue - The search term
 + * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchTags(searchValue, fuzzySearchCaches = null) {
 -    // @ts-ignore
 +    const keys = [
 -    const fuse = new Fuse(tags, {
 +        { name: 'name', weight: 1 },
 -        keys: [
 +    ];
 -            { name: 'name', weight: 1 },
 -        ],
 -        includeScore: true,
 -        ignoreLocation: true,
 -        useExtendedSearch: true,
 -        threshold: 0.2,
 -    });
 -    const results = fuse.search(searchValue);
 +    return performFuzzySearch(fuzzySearchCategories.tags, tags, keys, searchValue, fuzzySearchCaches);
 -    console.debug('Tags fuzzy search results for ' + searchValue, results);
 -    return results;
+}
 /**
  * Fuzzy search groups by a search term
  * @param {string} searchValue - The search term
 + * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score
  */
 export function fuzzySearchGroups(searchValue, fuzzySearchCaches = null) {
 -    // @ts-ignore
 +    const keys = [
 -    const fuse = new Fuse(groups, {
 +        { name: 'name', weight: 20 },
 -        keys: [
 +        { name: 'members', weight: 15 },
 -            { name: 'name', weight: 20 },
 +        { name: '#tags', weight: 10, getFn: (group) => getTagsList(group.id).map(x => x.name).join('||') },
                     { name: 'membersid', weight: 151 },
 -            { name: '#tags', weight: 10, getFn: (group) => getTagsList(group.id).map(x => x.name).join('||') },
 +    ];
 -            { name: 'id', weight: 1 },
 -        ],
 -        includeScore: true,
 -        ignoreLocation: true,
 -        useExtendedSearch: true,
 -        threshold: 0.2,
 -    });
 -    const results = fuse.search(searchValue);
 +    return performFuzzySearch(fuzzySearchCategories.groups, groups, keys, searchValue, fuzzySearchCaches);
 -    console.debug('Groups fuzzy search results for ' + searchValue, results);
 -    return results;
+}
 /**

public/scripts/textgen-settings.js+1 -0 Viewed

         'xtc_probability': settings.xtc_probability,
         'nsigma': settings.nsigma,
         'custom_token_bans': toIntArray(banned_tokens),
 +        'no_repeat_ngram_size': settings.no_repeat_ngram_size,
     };
     if (settings.type === OPENROUTER) {

server.js+1 -5 Viewed

     (':' + server_port),
 );
 -function prepareFrontendBundle() {
 -    return new Promise((resolve) => webpackMiddleware.waitUntilValid(resolve));
 -}
+-
 /**
  * Tasks that need to be run before the server starts listening.
  */

     initRequestProxy({ enabled: proxyEnabled, url: proxyUrl, bypass: proxyBypass });
     // Wait for frontend libs to compile
     await prepareFrontendBundlewebpackMiddleware.runWebpackCompiler();
 };
 /**

src/endpoints/backends/chat-completions.js+1 -1 Viewed

         const additionalHeaders = {};
         const useTools = request.body.model.startsWith('claude-3') && Array.isArray(request.body.tools) && request.body.tools.length > 0;
         const useSystemPrompt = (request.body.model.startsWith('claude-2') || request.body.model.startsWith('claude-3')) && request.body.claude_use_sysprompt;
         const convertedPrompt = convertClaudeMessages(request.body.messages, request.body.assistant_prefill, useSystemPrompt, useTools, request.body.human_sysprompt_message, request.body.char_name, request.body.user_name);
         // Add custom stop sequences
         const stopSequences = [];
         if (Array.isArray(request.body.stop)) {

src/endpoints/characters.js+6 -2 Viewed

 import { AVATAR_WIDTH, AVATAR_HEIGHT } from '../constants.js';
 import { jsonParser, urlencodedParser } from '../express-common.js';
 import { deepMerge, humanizedISO8601DateTime, tryParse, extractFileFromZipBuffer, MemoryLimitedMap } from '../util.js';
 import { TavernCardValidator } from '../validator/TavernCardValidator.js';
 import { parse, write } from '../character-card-parser.js';
 import { readWorldInfoFile } from './worldinfo.js';

 const defaultAvatarPath = './public/img/ai4.png';
 // KV-store for parsed character data
 -const characterDataCache = new Map();
 +// 100 MB limit. Would take roughly 3000 characters to reach this limit
 +const characterDataCache = new MemoryLimitedMap(1024 * 1024 * 100);
 // Some Android devices require tighter memory management
 const isAndroid = process.platform === 'android';

     try {
         // Reset the cache
         for (const key of characterDataCache.keys()) {
 +            if (Buffer.isBuffer(inputFile)) {
 +                break;
 +            }
             if (key.startsWith(inputFile)) {
                 characterDataCache.delete(key);
                 break;

src/middleware/webpack-serve.js+36 -11 Viewed

 import processpath from 'node:processpath';
 import webpack from 'webpack';
 -import middleware from 'webpack-dev-middleware';
 import { publicLibConfig } from '../../webpack.config.js';
 export default function getWebpackServeMiddleware() {
 +    const outputPath = publicLibConfig.output?.path;
 +    const outputFile = publicLibConfig.output?.filename;
     const compiler = webpack(publicLibConfig);
 -    if (process.env.NODE_ENV === 'production' || process.platform === 'android') {
 +    /**
 -        compiler.hooks.done.tap('serve', () => {
 +     * A very spartan recreation of webpack-dev-middleware.
 -            if (compiler.watching) {
 +     * @param {import('express').Request} req Request object.
 -                compiler.watching.close(() => { });
 +     * @param {import('express').Response} res Response object.
 -            }
 +     * @param {import('express').NextFunction} next Next function.
 -            compiler.watchFileSystem = null;
 +     * @type {import('express').RequestHandler}
 -            compiler.watchMode = false;
 +     */
 -        });
 +    function devMiddleware(req, res, next) {
 +        if (req.method === 'GET' && path.parse(req.path).base === outputFile) {
 +            return res.sendFile(outputFile, { root: outputPath });
 +        }
++
 +        next();
+    }
 -    return middleware(compiler, {});
 +    /**
 +     * Wait until Webpack is done compiling.
 +     * @returns {Promise<void>}
 +     */
 +    devMiddleware.runWebpackCompiler = () => {
 +        return new Promise((resolve) => {
 +            console.log();
 +            console.log('Compiling frontend libraries...');
 +            compiler.run((_error, stats) => {
 +                const output = stats?.toString(publicLibConfig.stats);
 +                if (output) {
 +                    console.log(output);
 +                    console.log();
 +                }
 +                resolve();
 +            });
 +        });
 +    };
++
 +    return devMiddleware;
+}

src/prompt-converters.js+3 -4 Viewed

  * @param {string}   prefillString User determined prefill string
  * @param {boolean}  useSysPrompt See if we want to use a system prompt
  * @param {boolean}  useTools See if we want to use tools
 - * @param {string}   humanMsgFix Add Human message between system prompt and assistant.
  * @param {string}   charName Character name
  * @param {string}   userName User name
  */
 export function convertClaudeMessages(messages, prefillString, useSysPrompt, useTools, humanMsgFix, charName = '', userName = '') {
     let systemPrompt = [];
     if (useSysPrompt) {
         // Collect all the system messages up until the first instance of a non-system message, and then remove them from the messages array.

@@ -122,10 +121,10 @@ export function convertClaudeMessages(messages, prefillString, useSysPrompt, use
122	121
123	122	// Check if the first message in the array is of type user, if not, interject with humanMsgFix or a blank message.
124	123	// Also prevents erroring out if the messages array is empty.
125	124	if (messages.length === 0 \|\| (messages.length > 0 && messages[0].role !== 'user')) {
126	125	messages.unshift({
127	126	role: 'user',
128	127	content: humanMsgFix \|\| PROMPT_PLACEHOLDER,
129	128	});
130	129	}
131	130	}

src/util.js+179 -0 Viewed

         return false;
+    }
+}
++
 +/**
 + * MemoryLimitedMap class that limits the memory usage of string values.
 + */
 +export class MemoryLimitedMap {
 +    /**
 +     * Creates an instance of MemoryLimitedMap.
 +     * @param {number} maxMemoryInBytes - The maximum allowed memory in bytes for string values.
 +     */
 +    constructor(maxMemoryInBytes) {
 +        if (typeof maxMemoryInBytes !== 'number' || maxMemoryInBytes <= 0) {
 +            throw new Error('maxMemoryInBytes must be a positive number');
 +        }
 +        this.maxMemory = maxMemoryInBytes;
 +        this.currentMemory = 0;
 +        this.map = new Map();
 +        this.queue = [];
 +    }
++
 +    /**
 +     * Estimates the memory usage of a string in bytes.
 +     * Assumes each character occupies 2 bytes (UTF-16).
 +     * @param {string} str
 +     * @returns {number}
 +     */
 +    static estimateStringSize(str) {
 +        return str ? str.length * 2 : 0;
 +    }
++
 +    /**
 +     * Adds or updates a key-value pair in the map.
 +     * If adding the new value exceeds the memory limit, evicts oldest entries.
 +     * @param {string} key
 +     * @param {string} value
 +     */
 +    set(key, value) {
 +        if (typeof key !== 'string' || typeof value !== 'string') {
 +            return;
 +        }
++
 +        const newValueSize = MemoryLimitedMap.estimateStringSize(value);
++
 +        // If the new value itself exceeds the max memory, reject it
 +        if (newValueSize > this.maxMemory) {
 +            return;
 +        }
++
 +        // Check if the key already exists to adjust memory accordingly
 +        if (this.map.has(key)) {
 +            const oldValue = this.map.get(key);
 +            const oldValueSize = MemoryLimitedMap.estimateStringSize(oldValue);
 +            this.currentMemory -= oldValueSize;
 +            // Remove the key from its current position in the queue
 +            const index = this.queue.indexOf(key);
 +            if (index > -1) {
 +                this.queue.splice(index, 1);
 +            }
 +        }
++
 +        // Evict oldest entries until there's enough space
 +        while (this.currentMemory + newValueSize > this.maxMemory && this.queue.length > 0) {
 +            const oldestKey = this.queue.shift();
 +            const oldestValue = this.map.get(oldestKey);
 +            const oldestValueSize = MemoryLimitedMap.estimateStringSize(oldestValue);
 +            this.map.delete(oldestKey);
 +            this.currentMemory -= oldestValueSize;
 +        }
++
 +        // After eviction, check again if there's enough space
 +        if (this.currentMemory + newValueSize > this.maxMemory) {
 +            return;
 +        }
++
 +        // Add the new key-value pair
 +        this.map.set(key, value);
 +        this.queue.push(key);
 +        this.currentMemory += newValueSize;
 +    }
++
 +    /**
 +     * Retrieves the value associated with the given key.
 +     * @param {string} key
 +     * @returns {string | undefined}
 +     */
 +    get(key) {
 +        return this.map.get(key);
 +    }
++
 +    /**
 +     * Checks if the map contains the given key.
 +     * @param {string} key
 +     * @returns {boolean}
 +     */
 +    has(key) {
 +        return this.map.has(key);
 +    }
++
 +    /**
 +     * Deletes the key-value pair associated with the given key.
 +     * @param {string} key
 +     * @returns {boolean} - Returns true if the key was found and deleted, else false.
 +     */
 +    delete(key) {
 +        if (!this.map.has(key)) {
 +            return false;
 +        }
 +        const value = this.map.get(key);
 +        const valueSize = MemoryLimitedMap.estimateStringSize(value);
 +        this.map.delete(key);
 +        this.currentMemory -= valueSize;
++
 +        // Remove the key from the queue
 +        const index = this.queue.indexOf(key);
 +        if (index > -1) {
 +            this.queue.splice(index, 1);
 +        }
++
 +        return true;
 +    }
++
 +    /**
 +     * Clears all entries from the map.
 +     */
 +    clear() {
 +        this.map.clear();
 +        this.queue = [];
 +        this.currentMemory = 0;
 +    }
++
 +    /**
 +     * Returns the number of key-value pairs in the map.
 +     * @returns {number}
 +     */
 +    size() {
 +        return this.map.size;
 +    }
++
 +    /**
 +     * Returns the current memory usage in bytes.
 +     * @returns {number}
 +     */
 +    totalMemory() {
 +        return this.currentMemory;
 +    }
++
 +    /**
 +     * Returns an iterator over the keys in the map.
 +     * @returns {IterableIterator<string>}
 +     */
 +    keys() {
 +        return this.map.keys();
 +    }
++
 +    /**
 +     * Returns an iterator over the values in the map.
 +     * @returns {IterableIterator<string>}
 +     */
 +    values() {
 +        return this.map.values();
 +    }
++
 +    /**
 +     * Iterates over the map in insertion order.
 +     * @param {Function} callback - Function to execute for each element.
 +     */
 +    forEach(callback) {
 +        this.map.forEach((value, key) => {
 +            callback(value, key, this);
 +        });
 +    }
++
 +    /**
 +     * Makes the MemoryLimitedMap iterable.
 +     * @returns {Iterator} - Iterator over [key, value] pairs.
 +     */
 +    [Symbol.iterator]() {
 +        return this.map[Symbol.iterator]();
 +    }
 +}

webpack.config.js+5 -0 Viewed

     cache: {
         type: 'filesystem',
         cacheDirectory: path.resolve(process.cwd(), 'dist/webpack'),
 +        store: 'pack',
 +        compression: 'gzip',
     },
     devtool: false,
     watch: false,

         preset: 'minimal',
         assets: false,
         modules: false,
 +        colors: true,
 +        timings: true,
     },
     experiments: {
         outputModule: true,

         hints: false,
     },
     output: {
 +        path: path.resolve(process.cwd(), 'dist'),
         filename: 'lib.js',
         libraryTarget: 'module',
     },

Merge branch 'staging' into 202411-backend-maxctx