Merge branch 'staging' into fix-srw-trim

c5d4bdcd0bab5bf5698c0495f4700b5676137e35

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

Parents: 0607ac98db3092c848b8ec841f9efa3b262a99ea fb2f8dce10a5568e4b1f5c3369a97ef5b4a4f54c
44 files changed, +350 -101Showing whitespace changes
.eslintrc.cjs+4 -0
@@ -3,6 +3,9 @@ module.exports = {
33 extends: [
44 'eslint:recommended',
55 ],
6+ plugins: [
7+ 'jsdoc',
8+ ],
69 env: {
710 es6: true,
811 },
@@ -78,6 +81,7 @@ module.exports = {
7881 'public/scripts/extensions/tts/lib/**',
7982 ],
8083 rules: {
84+ 'jsdoc/no-undefined-types': ['warn', { disableReporting: true, markVariablesAsUsed: true }],
8185 'no-unused-vars': ['error', { args: 'none' }],
8286 'no-control-regex': 'off',
8387 'no-constant-condition': ['error', { checkLoops: false }],
.github/workflows/pr-auto-manager.yml+41 -0
@@ -11,6 +11,41 @@ permissions:
1111 pull-requests: write
1212
1313jobs:
14+ run-eslint:
15+ name: ✅ Check ESLint on PR
16+ runs-on: ubuntu-latest
17+ # Only needs to run when code is changed
18+ if: github.event.action == 'opened' || github.event.action == 'synchronize'
19+
20+ steps:
21+ - name: Checkout Repository
22+ # Checkout
23+ # https://github.com/marketplace/actions/checkout
24+ uses: actions/checkout@v4.2.2
25+
26+ - name: Setup Node.js
27+ # Setup Node.js environment
28+ # https://github.com/marketplace/actions/setup-node-js-environment
29+ uses: actions/setup-node@v4.3.0
30+ with:
31+ node-version: 20
32+
33+ - name: Run npm install
34+ run: npm ci
35+
36+ - name: Run ESLint
37+ # Action ESLint
38+ # https://github.com/marketplace/actions/action-eslint
39+ uses: sibiraj-s/action-eslint@v3.0.1
40+ with:
41+ token: ${{ secrets.GITHUB_TOKEN }}
42+ eslint-args: '--ignore-path=.gitignore --quiet'
43+ extensions: 'js,ts'
44+ annotations: true
45+ ignore-patterns: |
46+ dist/
47+ lib/
48+
1449 label-by-size:
1550 name: 🏷️ Label PR by Size
1651 # This job should run after all others, to prevent possible concurrency issues
@@ -186,6 +221,12 @@ jobs:
186221 runs-on: ubuntu-latest
187222 if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'staging'
188223
224+ # Override permissions, We need to be able to write to issues
225+ permissions:
226+ contents: read
227+ issues: write
228+ pull-requests: write
229+
189230 steps:
190231 - name: Extract Linked Issues From PR Description
191232 id: extract_issues
package-lock.json+202 -4
@@ -110,7 +110,8 @@
110110 "@types/write-file-atomic": "^4.0.3",
111111 "@types/yargs": "^17.0.33",
112112 "@types/yauzl": "^2.10.3",
113113 "eslint": "^8.57.1",
114+ "eslint-plugin-jsdoc": "^48.10.0"
114115 },
115116 "engines": {
116117 "node": ">= 18"
@@ -147,6 +148,21 @@
147148 "integrity": "sha512-KlmTftToTtmb6aLVdne4NluS+POWputPF5J8v25UN/EQS+K9vahWEIe1NPRSFqBQclObkqHaj7JOnFrmnSm5MA==",
148149 "license": "Apache-2.0"
149150 },
151+ "node_modules/@es-joy/jsdoccomment": {
152+ "version": "0.46.0",
153+ "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.46.0.tgz",
154+ "integrity": "sha512-C3Axuq1xd/9VqFZpW4YAzOx5O9q/LP46uIQy/iNDpHG3fmPa6TBtvfglMCs3RBiBxAIi0Go97r8+jvTt55XMyQ==",
155+ "dev": true,
156+ "license": "MIT",
157+ "dependencies": {
158+ "comment-parser": "1.4.1",
159+ "esquery": "^1.6.0",
160+ "jsdoc-type-pratt-parser": "~4.0.0"
161+ },
162+ "engines": {
163+ "node": ">=16"
164+ }
165+ },
150166 "node_modules/@eslint-community/eslint-utils": {
151167 "version": "4.4.0",
152168 "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -970,6 +986,19 @@
970986 "node": ">=14"
971987 }
972988 },
989+ "node_modules/@pkgr/core": {
990+ "version": "0.1.1",
991+ "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
992+ "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
993+ "dev": true,
994+ "license": "MIT",
995+ "engines": {
996+ "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
997+ },
998+ "funding": {
999+ "url": "https://opencollective.com/unts"
1000+ }
1001+ },
9731002 "node_modules/@popperjs/core": {
9741003 "version": "2.11.8",
9751004 "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -2099,6 +2128,16 @@
20992128 "safe-buffer": "~5.2.0"
21002129 }
21012130 },
2131+ "node_modules/are-docs-informative": {
2132+ "version": "0.0.2",
2133+ "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz",
2134+ "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==",
2135+ "dev": true,
2136+ "license": "MIT",
2137+ "engines": {
2138+ "node": ">=14"
2139+ }
2140+ },
21022141 "node_modules/argparse": {
21032142 "version": "2.0.1",
21042143 "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -2614,6 +2653,16 @@
26142653 "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
26152654 "license": "MIT"
26162655 },
2656+ "node_modules/comment-parser": {
2657+ "version": "1.4.1",
2658+ "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
2659+ "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
2660+ "dev": true,
2661+ "license": "MIT",
2662+ "engines": {
2663+ "node": ">= 12.0.0"
2664+ }
2665+ },
26172666 "node_modules/compress-commons": {
26182667 "version": "6.0.2",
26192668 "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
@@ -3560,6 +3609,69 @@
35603609 "url": "https://opencollective.com/eslint"
35613610 }
35623611 },
3612+ "node_modules/eslint-plugin-jsdoc": {
3613+ "version": "48.10.0",
3614+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.10.0.tgz",
3615+ "integrity": "sha512-BEli0k8E0dzhJairAllwlkGnyYDZVKNn4WDmyKy+v6J5qGNuofjzxwNUi+55BOGmyO9mKBhqaidwGy+dxndn/Q==",
3616+ "dev": true,
3617+ "license": "BSD-3-Clause",
3618+ "dependencies": {
3619+ "@es-joy/jsdoccomment": "~0.46.0",
3620+ "are-docs-informative": "^0.0.2",
3621+ "comment-parser": "1.4.1",
3622+ "debug": "^4.3.5",
3623+ "escape-string-regexp": "^4.0.0",
3624+ "esquery": "^1.6.0",
3625+ "parse-imports": "^2.1.1",
3626+ "semver": "^7.6.3",
3627+ "spdx-expression-parse": "^4.0.0",
3628+ "synckit": "^0.9.1"
3629+ },
3630+ "engines": {
3631+ "node": ">=18"
3632+ },
3633+ "peerDependencies": {
3634+ "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
3635+ }
3636+ },
3637+ "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
3638+ "version": "4.4.0",
3639+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
3640+ "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
3641+ "dev": true,
3642+ "license": "MIT",
3643+ "dependencies": {
3644+ "ms": "^2.1.3"
3645+ },
3646+ "engines": {
3647+ "node": ">=6.0"
3648+ },
3649+ "peerDependenciesMeta": {
3650+ "supports-color": {
3651+ "optional": true
3652+ }
3653+ }
3654+ },
3655+ "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
3656+ "version": "4.0.0",
3657+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
3658+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
3659+ "dev": true,
3660+ "license": "MIT",
3661+ "engines": {
3662+ "node": ">=10"
3663+ },
3664+ "funding": {
3665+ "url": "https://github.com/sponsors/sindresorhus"
3666+ }
3667+ },
3668+ "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
3669+ "version": "2.1.3",
3670+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
3671+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
3672+ "dev": true,
3673+ "license": "MIT"
3674+ },
35633675 "node_modules/eslint-scope": {
35643676 "version": "7.2.2",
35653677 "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -3690,9 +3802,9 @@
36903802 }
36913803 },
36923804 "node_modules/esquery": {
36933805 "version": "1.56.0",
36943806 "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.56.0.tgz",
36953807 "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idISca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/9fIU5GjG73IgjKMVg5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
36963808 "dev": true,
36973809 "license": "BSD-3-Clause",
36983810 "dependencies": {
@@ -5015,6 +5127,16 @@
50155127 "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
50165128 "license": "MIT"
50175129 },
5130+ "node_modules/jsdoc-type-pratt-parser": {
5131+ "version": "4.0.0",
5132+ "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
5133+ "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
5134+ "dev": true,
5135+ "license": "MIT",
5136+ "engines": {
5137+ "node": ">=12.0.0"
5138+ }
5139+ },
50185140 "node_modules/json-buffer": {
50195141 "version": "3.0.1",
50205142 "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -5891,6 +6013,20 @@
58916013 "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==",
58926014 "license": "MIT"
58936015 },
6016+ "node_modules/parse-imports": {
6017+ "version": "2.2.1",
6018+ "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.2.1.tgz",
6019+ "integrity": "sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==",
6020+ "dev": true,
6021+ "license": "Apache-2.0 AND MIT",
6022+ "dependencies": {
6023+ "es-module-lexer": "^1.5.3",
6024+ "slashes": "^3.0.12"
6025+ },
6026+ "engines": {
6027+ "node": ">= 18"
6028+ }
6029+ },
58946030 "node_modules/parse5": {
58956031 "version": "7.1.2",
58966032 "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
@@ -6600,6 +6736,19 @@
66006736 "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
66016737 "license": "MIT"
66026738 },
6739+ "node_modules/semver": {
6740+ "version": "7.7.1",
6741+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
6742+ "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
6743+ "dev": true,
6744+ "license": "ISC",
6745+ "bin": {
6746+ "semver": "bin/semver.js"
6747+ },
6748+ "engines": {
6749+ "node": ">=10"
6750+ }
6751+ },
66036752 "node_modules/send": {
66046753 "version": "0.19.0",
66056754 "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
@@ -6811,6 +6960,13 @@
68116960 "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
68126961 "license": "MIT"
68136962 },
6963+ "node_modules/slashes": {
6964+ "version": "3.0.12",
6965+ "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
6966+ "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
6967+ "dev": true,
6968+ "license": "ISC"
6969+ },
68146970 "node_modules/sliced": {
68156971 "version": "1.0.1",
68166972 "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
@@ -6903,6 +7059,31 @@
69037059 "source-map": "^0.6.0"
69047060 }
69057061 },
7062+ "node_modules/spdx-exceptions": {
7063+ "version": "2.5.0",
7064+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
7065+ "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
7066+ "dev": true,
7067+ "license": "CC-BY-3.0"
7068+ },
7069+ "node_modules/spdx-expression-parse": {
7070+ "version": "4.0.0",
7071+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz",
7072+ "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==",
7073+ "dev": true,
7074+ "license": "MIT",
7075+ "dependencies": {
7076+ "spdx-exceptions": "^2.1.0",
7077+ "spdx-license-ids": "^3.0.0"
7078+ }
7079+ },
7080+ "node_modules/spdx-license-ids": {
7081+ "version": "3.0.21",
7082+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
7083+ "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
7084+ "dev": true,
7085+ "license": "CC0-1.0"
7086+ },
69067087 "node_modules/sprintf-js": {
69077088 "version": "1.1.3",
69087089 "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
@@ -7042,6 +7223,23 @@
70427223 "node": ">=8"
70437224 }
70447225 },
7226+ "node_modules/synckit": {
7227+ "version": "0.9.2",
7228+ "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz",
7229+ "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==",
7230+ "dev": true,
7231+ "license": "MIT",
7232+ "dependencies": {
7233+ "@pkgr/core": "^0.1.0",
7234+ "tslib": "^2.6.2"
7235+ },
7236+ "engines": {
7237+ "node": "^14.18.0 || >=16.0.0"
7238+ },
7239+ "funding": {
7240+ "url": "https://opencollective.com/unts"
7241+ }
7242+ },
70457243 "node_modules/tapable": {
70467244 "version": "2.2.1",
70477245 "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
package.json+2 -1
@@ -140,6 +140,7 @@
140140 "@types/write-file-atomic": "^4.0.3",
141141 "@types/yargs": "^17.0.33",
142142 "@types/yauzl": "^2.10.3",
143143 "eslint": "^8.57.1",
144+ "eslint-plugin-jsdoc": "^48.10.0"
144145 }
145146}
public/index.html+9 -7
@@ -3415,13 +3415,6 @@
34153415 <div class="flex-container">
34163416 <select id="model_custom_select" class="text_pole model_custom_select"></select>
34173417 </div>
3418- <h4 data-i18n="Prompt Post-Processing">Prompt Post-Processing</h4>
3419- <select id="custom_prompt_post_processing" class="text_pole" title="Applies additional processing to the prompt before sending it to the API." data-i18n="[title]Applies additional processing to the prompt before sending it to the API.">
3420- <option data-i18n="prompt_post_processing_none" value="">None</option>
3421- <option data-i18n="prompt_post_processing_merge" value="merge">Merge consecutive roles</option>
3422- <option data-i18n="prompt_post_processing_semi" value="semi">Semi-strict (alternating roles)</option>
3423- <option data-i18n="prompt_post_processing_strict" value="strict">Strict (user first, alternating roles)</option>
3424- </select>
34253418 </form>
34263419 <div id="01ai_form" data-source="01ai">
34273420 <h4>
@@ -3440,6 +3433,15 @@
34403433 <select id="model_01ai_select">
34413434 </select>
34423435 </div>
3436+ <div id="prompt_post_porcessing_form" data-source="custom,openrouter">
3437+ <h4 data-i18n="Prompt Post-Processing">Prompt Post-Processing</h4>
3438+ <select id="custom_prompt_post_processing" class="text_pole" title="Applies additional processing to the prompt before sending it to the API." data-i18n="[title]Applies additional processing to the prompt before sending it to the API.">
3439+ <option data-i18n="prompt_post_processing_none" value="">None</option>
3440+ <option data-i18n="prompt_post_processing_merge" value="merge">Merge consecutive roles</option>
3441+ <option data-i18n="prompt_post_processing_semi" value="semi">Semi-strict (alternating roles)</option>
3442+ <option data-i18n="prompt_post_processing_strict" value="strict">Strict (user first, alternating roles)</option>
3443+ </select>
3444+ </div>
34433445 <div class="flex-container flex">
34443446 <div id="api_button_openai" class="api_button menu_button menu_button_icon" type="submit" data-i18n="Connect">Connect</div>
34453447 <div class="api_loading menu_button menu_button_icon" data-i18n="Cancel">Cancel</div>
public/script.js+1 -1
@@ -595,7 +595,7 @@ let is_delete_mode = false;
595595let fav_ch_checked = false;
596596let scrollLock = false;
597597export let abortStatusCheck = new AbortController();
598598export let charDragDropHandler = null;
599599
600600/** @type {debounce_timeout} The debounce timeout used for chat/settings save. debounce_timeout.long: 1.000 ms */
601601export const DEFAULT_SAVE_EDIT_TIMEOUT = debounce_timeout.relaxed;
public/scripts/PromptManager.js+1 -1
@@ -4,7 +4,7 @@ import { DOMPurify, Popper } from '../lib.js';
44
55import { event_types, eventSource, is_send_press, main_api, substituteParams } from '../script.js';
66import { is_group_generating } from './group-chats.js';
77import { Message, MessageCollection, TokenHandler } from './openai.js';
88import { power_user } from './power-user.js';
99import { debounce, waitUntilCondition, escapeHtml } from './utils.js';
1010import { debounce_timeout } from './constants.js';
public/scripts/autocomplete/AutoComplete.js+0 -2
@@ -3,10 +3,8 @@ import { debounce, escapeRegex } from '../utils.js';
33import { AutoCompleteOption } from './AutoCompleteOption.js';
44import { AutoCompleteFuzzyScore } from './AutoCompleteFuzzyScore.js';
55import { BlankAutoCompleteOption } from './BlankAutoCompleteOption.js';
6-// eslint-disable-next-line no-unused-vars
76import { AutoCompleteNameResult } from './AutoCompleteNameResult.js';
87import { AutoCompleteSecondaryNameResult } from './AutoCompleteSecondaryNameResult.js';
9-import { Popup, getTopmostModalLayer } from '../popup.js';
108
119/**@readonly*/
1210/**@enum {Number}*/
public/scripts/autocomplete/AutoCompleteNameResultBase.js+0 -1
@@ -1,4 +1,3 @@
1-import { SlashCommandNamedArgumentAutoCompleteOption } from '../slash-commands/SlashCommandNamedArgumentAutoCompleteOption.js';
21import { AutoCompleteOption } from './AutoCompleteOption.js';
32
43
public/scripts/autocomplete/AutoCompleteOption.js+0 -1
@@ -1,4 +1,3 @@
1-import { SlashCommand } from '../slash-commands/SlashCommand.js';
21import { AutoCompleteFuzzyScore } from './AutoCompleteFuzzyScore.js';
32
43
public/scripts/bookmarks.js+1 -2
@@ -1,7 +1,6 @@
11import {
22 characters,
33 saveChat,
4- system_messages,
54 system_message_types,
65 this_chid,
76 openCharacterChat,
@@ -13,7 +12,7 @@ import {
1312 saveChatConditional,
1413 saveItemizedPrompts,
1514} from '../script.js';
1615import { humanizedDateTime, getMessageTimeStamp } from './RossAscends-mods.js';
1716import {
1817 getGroupPastChats,
1918 group_activation_strategy,
public/scripts/extensions/expressions/index.js+53 -15
@@ -4,7 +4,7 @@ import { characters, eventSource, event_types, generateRaw, getRequestHeaders, m
44import { dragElement, isMobile } from '../../RossAscends-mods.js';
55import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js';
66import { loadMovingUIState, performFuzzySearch, power_user } from '../../power-user.js';
77import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar, isFalseBoolean } from '../../utils.js';
88import { hideMutedSprites, selected_group } from '../../group-chats.js';
99import { isJsonSchemaSupported } from '../../textgen-settings.js';
1010import { debounce_timeout } from '../../constants.js';
@@ -679,7 +679,7 @@ async function setSpriteFolderCommand(_, folder) {
679679 return '';
680680}
681681
682682async function classifyCallback(/** @type {{api: string?, filter: string?, prompt: string?}} */ { api = null, filter = null, prompt = null }, text) {
683683 if (!text) {
684684 toastr.error('No text provided');
685685 return '';
@@ -690,13 +690,14 @@ async function classifyCallback(/** @type {{api: string?, prompt: string?}} */ {
690690 }
691691
692692 const expressionApi = EXPRESSION_API[api] || extension_settings.expressions.api;
693+ const filterAvailable = !isFalseBoolean(filter);
693694
694695 if (!modules.includes('classify') && expressionApi == EXPRESSION_API.extras) {
695696 toastr.warning('Text classification is disabled or not available');
696697 return '';
697698 }
698699
699700 const label = await getExpressionLabel(text, expressionApi, { filterAvailable: filterAvailable, customPrompt: prompt });
700701 console.debug(`Classification result for "${text}": ${label}`);
701702 return label;
702703}
@@ -992,10 +993,11 @@ function onTextGenSettingsReady(args) {
992993 * @param {string} text - The text to classify and retrieve the expression label for.
993994 * @param {EXPRESSION_API} [expressionsApi=extension_settings.expressions.api] - The expressions API to use for classification.
994995 * @param {object} [options={}] - Optional arguments.
996+ * @param {boolean?} [options.filterAvailable=null] - Whether to filter available expressions. If not specified, uses the extension setting.
995997 * @param {string?} [options.customPrompt=null] - The custom prompt to use for classification.
996998 * @returns {Promise<string?>} - The label of the expression.
997999 */
9981000export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api, { filterAvailable = null, customPrompt = null } = {}) {
9991001 // Return if text is undefined, saving a costly fetch request
10001002 if ((!modules.includes('classify') && expressionsApi == EXPRESSION_API.extras) || !text) {
10011003 return extension_settings.expressions.fallback_expression;
@@ -1007,6 +1009,11 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin
10071009
10081010 text = sampleClassifyText(text);
10091011
1012+ filterAvailable ??= extension_settings.expressions.filterAvailable;
1013+ if (filterAvailable && ![EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(expressionsApi)) {
1014+ console.debug('Filter available is only supported for LLM and WebLLM expressions');
1015+ }
1016+
10101017 try {
10111018 switch (expressionsApi) {
10121019 // Local BERT pipeline
@@ -1031,7 +1038,7 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin
10311038 return extension_settings.expressions.fallback_expression;
10321039 }
10331040
10341041 const expressionsList = await getExpressionsList({ filterAvailable: filterAvailable });
10351042 const prompt = substituteParamsExtended(customPrompt, { labels: expressionsList }) || await getLlmPrompt(expressionsList);
10361043 eventSource.once(event_types.TEXT_COMPLETION_SETTINGS_READY, onTextGenSettingsReady);
10371044 const emotionResponse = await generateRaw(text, main_api, false, false, prompt);
@@ -1044,7 +1051,7 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin
10441051 return extension_settings.expressions.fallback_expression;
10451052 }
10461053
10471054 const expressionsList = await getExpressionsList({ filterAvailable: filterAvailable });
10481055 const prompt = substituteParamsExtended(customPrompt, { labels: expressionsList }) || await getLlmPrompt(expressionsList);
10491056 const messages = [
10501057 { role: 'user', content: text + '\n\n' + prompt },
@@ -1324,12 +1331,28 @@ function getCachedExpressions() {
13241331 return [...expressionsList, ...extension_settings.expressions.custom].filter(onlyUnique);
13251332}
13261333
13271334export async function getExpressionsList({ filterAvailable = false } = {}) {
13281335 // ReturnIf there is no cached list, ifload availableand cache it
13291336 if (!Array.isArray(expressionsList)) {
13301337 returnexpressionsList getCachedExpressions= await resolveExpressionsList();
1338+ }
1339+
1340+ const expressions = getCachedExpressions();
1341+
1342+ // Filtering is only available for llm and webllm APIs
1343+ if (!filterAvailable || ![EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(extension_settings.expressions.api)) {
1344+ return expressions;
13311345 }
13321346
1347+ // Get expressions with available sprites
1348+ const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
1349+ const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
1350+
1351+ return expressions.filter(label => {
1352+ const expression = spriteCache[spriteFolderName]?.find(x => x.label === label);
1353+ return (expression?.files.length ?? 0) > 0;
1354+ });
1355+
13331356 /**
13341357 * Returns the list of expressions from the API or fallback in offline mode.
13351358 * @returns {Promise<string[]>}
@@ -1376,9 +1399,6 @@ export async function getExpressionsList() {
13761399 expressionsList = DEFAULT_EXPRESSIONS.slice();
13771400 return expressionsList;
13781401 }
1379-
1380- const result = await resolveExpressionsList();
1381- return [...result, ...extension_settings.expressions.custom].filter(onlyUnique);
13821402}
13831403
13841404/**
@@ -2106,6 +2126,10 @@ function migrateSettings() {
21062126 extension_settings.expressions.rerollIfSame = !!$(this).prop('checked');
21072127 saveSettingsDebounced();
21082128 });
2129+ $('#expressions_filter_available').prop('checked', extension_settings.expressions.filterAvailable).on('input', function () {
2130+ extension_settings.expressions.filterAvailable = !!$(this).prop('checked');
2131+ saveSettingsDebounced();
2132+ });
21092133 $('#expression_override_cleanup_button').on('click', onClickExpressionOverrideRemoveAllButton);
21102134 $(document).on('dragstart', '.expression', (e) => {
21112135 e.preventDefault();
@@ -2283,13 +2307,13 @@ function migrateSettings() {
22832307 SlashCommandParser.addCommandObject(SlashCommand.fromProps({
22842308 name: 'expression-list',
22852309 aliases: ['expressions'],
22862310 /** @type {(args: {return: string, filter: string}) => Promise<string>} */
22872311 callback: async (args) => {
22882312 let returnType =
22892313 /** @type {import('../../slash-commands/SlashCommandReturnHelper.js').SlashCommandReturnType} */
22902314 (args.return);
22912315
22922316 const list = await getExpressionsList({ filterAvailable: !isFalseBoolean(args.filter) });
22932317
22942318 return await slashCommandReturnHelper.doReturn(returnType ?? 'pipe', list, { objectToStringFunc: list => list.join(', ') });
22952319 },
@@ -2302,6 +2326,13 @@ function migrateSettings() {
23022326 enumList: slashCommandReturnHelper.enumList({ allowObject: true }),
23032327 forceEnum: true,
23042328 }),
2329+ SlashCommandNamedArgument.fromProps({
2330+ name: 'filter',
2331+ description: 'Filter the list to only include expressions that have available sprites for the current character.',
2332+ typeList: [ARGUMENT_TYPE.BOOLEAN],
2333+ enumList: commonEnumProviders.boolean('trueFalse')(),
2334+ defaultValue: 'true',
2335+ }),
23052336 ],
23062337 returns: 'The comma-separated list of available expressions, including custom expressions.',
23072338 helpString: 'Returns a list of available expressions, including custom expressions.',
@@ -2318,6 +2349,13 @@ function migrateSettings() {
23182349 enumList: Object.keys(EXPRESSION_API).map(api => new SlashCommandEnumValue(api, null, enumTypes.enum)),
23192350 }),
23202351 SlashCommandNamedArgument.fromProps({
2352+ name: 'filter',
2353+ description: 'Filter the list to only include expressions that have available sprites for the current character.',
2354+ typeList: [ARGUMENT_TYPE.BOOLEAN],
2355+ enumList: commonEnumProviders.boolean('trueFalse')(),
2356+ defaultValue: 'true',
2357+ }),
2358+ SlashCommandNamedArgument.fromProps({
23212359 name: 'prompt',
23222360 description: 'Custom prompt for classification. Only relevant if Classifier API is set to LLM.',
23232361 typeList: [ARGUMENT_TYPE.STRING],
public/scripts/extensions/expressions/settings.html+5 -1
@@ -29,7 +29,11 @@
2929 </select>
3030 </div>
3131 <div class="expression_llm_prompt_block m-b-1 m-t-1">
32- <label for="expression_llm_prompt" class="title_restorable">
32+ <label class="checkbox_label" for="expressions_filter_available" title="When using LLM or WebLLM classifier, only show and use expressions that have sprites assigned to them." data-i18n="[title]When using LLM or WebLLM classifier, only show and use expressions that have sprites assigned to them.">
33+ <input id="expressions_filter_available" type="checkbox">
34+ <span data-i18n="Filter expressions for available sprites">Filter expressions for available sprites</span>
35+ </label>
36+ <label for="expression_llm_prompt" class="title_restorable m-t-1">
3337 <span data-i18n="LLM Prompt">LLM Prompt</span>
3438 <div id="expression_llm_prompt_restore" title="Restore default value" class="right_menu_button">
3539 <i class="fa-solid fa-clock-rotate-left fa-sm"></i>
public/scripts/extensions/quick-reply/api/QuickReplyApi.js+0 -3
@@ -1,10 +1,7 @@
1-// eslint-disable-next-line no-unused-vars
21import { QuickReply } from '../src/QuickReply.js';
32import { QuickReplyContextLink } from '../src/QuickReplyContextLink.js';
43import { QuickReplySet } from '../src/QuickReplySet.js';
5-// eslint-disable-next-line no-unused-vars
64import { QuickReplySettings } from '../src/QuickReplySettings.js';
7-// eslint-disable-next-line no-unused-vars
85import { SettingsUi } from '../src/ui/SettingsUi.js';
96import { onlyUnique } from '../../../utils.js';
107
public/scripts/extensions/quick-reply/src/AutoExecuteHandler.js+0 -2
@@ -1,7 +1,5 @@
11import { warn } from '../index.js';
2-// eslint-disable-next-line no-unused-vars
32import { QuickReply } from './QuickReply.js';
4-// eslint-disable-next-line no-unused-vars
53import { QuickReplySettings } from './QuickReplySettings.js';
64
75export class AutoExecuteHandler {
public/scripts/extensions/quick-reply/src/QuickReply.js+0 -2
@@ -635,7 +635,6 @@ export class QuickReply {
635635 }, { passive:true });
636636 const getLineStart = ()=>{
637637 const start = message.selectionStart;
638- const end = message.selectionEnd;
639638 let lineStart;
640639 if (start == 0 || message.value[start - 1] == '\n') {
641640 // cursor is already at beginning of line
@@ -701,7 +700,6 @@ export class QuickReply {
701700 } else if (evt.key == 'Enter' && !evt.ctrlKey && !evt.shiftKey && !evt.altKey && !(ac.isReplaceable && ac.isActive)) {
702701 // new line, keep indent
703702 const start = message.selectionStart;
704- const end = message.selectionEnd;
705703 let lineStart = getLineStart();
706704 const indent = /^([^\S\n]*)/.exec(message.value.slice(lineStart))[1] ?? '';
707705 if (indent.length) {
public/scripts/extensions/quick-reply/src/SlashCommandHandler.js+0 -1
@@ -8,7 +8,6 @@ import { SlashCommandEnumValue, enumTypes } from '../../../slash-commands/SlashC
88import { SlashCommandParser } from '../../../slash-commands/SlashCommandParser.js';
99import { SlashCommandScope } from '../../../slash-commands/SlashCommandScope.js';
1010import { isTrueBoolean } from '../../../utils.js';
11-// eslint-disable-next-line no-unused-vars
1211import { QuickReplyApi } from '../api/QuickReplyApi.js';
1312import { QuickReply } from './QuickReply.js';
1413import { QuickReplySet } from './QuickReplySet.js';
public/scripts/extensions/quick-reply/src/ui/ButtonUi.js+0 -1
@@ -1,7 +1,6 @@
11import { animation_duration } from '../../../../../script.js';
22import { dragElement } from '../../../../RossAscends-mods.js';
33import { loadMovingUIState } from '../../../../power-user.js';
4-// eslint-disable-next-line no-unused-vars
54import { QuickReplySettings } from '../QuickReplySettings.js';
65
76export class ButtonUi {
public/scripts/extensions/quick-reply/src/ui/SettingsUi.js+0 -1
@@ -3,7 +3,6 @@ import { getSortableDelay } from '../../../../utils.js';
33import { log, warn } from '../../index.js';
44import { QuickReply } from '../QuickReply.js';
55import { QuickReplySet } from '../QuickReplySet.js';
6-// eslint-disable-next-line no-unused-vars
76import { QuickReplySettings } from '../QuickReplySettings.js';
87
98export class SettingsUi {
public/scripts/extensions/quick-reply/src/ui/ctx/ContextMenu.js+0 -1
@@ -1,5 +1,4 @@
11import { QuickReply } from '../../QuickReply.js';
2-// eslint-disable-next-line no-unused-vars
32import { QuickReplySet } from '../../QuickReplySet.js';
43import { MenuHeader } from './MenuHeader.js';
54import { MenuItem } from './MenuItem.js';
public/scripts/extensions/stable-diffusion/index.js+0 -1
@@ -3772,7 +3772,6 @@ async function addSDGenButtons() {
37723772 $('#sd_wand_container').append(buttonHtml);
37733773 $(document.body).append(dropdownHtml);
37743774
3775- const messageButton = $('.sd_message_gen');
37763775 const button = $('#sd_gen');
37773776 const dropdown = $('#sd_dropdown');
37783777 dropdown.hide();
public/scripts/extensions/token-counter/index.js+0 -0
public/scripts/extensions/tts/gpt-sovits-v2.js+0 -2
@@ -183,8 +183,6 @@ class GptSovitsV2Provider {
183183
184184 let prompt_text = replaceSpeaker(voiceId);
185185
186- const streaming = this.settings.streaming;
187-
188186 const params = {
189187 text: inputText,
190188 prompt_text: prompt_text,
public/scripts/extensions/tts/index.js+1 -1
@@ -1,5 +1,5 @@
11import { cancelTtsPlay, eventSource, event_types, getCurrentChatId, isStreamingEnabled, name2, saveSettingsDebounced, substituteParams } from '../../../script.js';
22import { ModuleWorkerWrapper, doExtrasFetch, extension_settings, getApiUrl, getContext, modules, renderExtensionTemplateAsync } from '../../extensions.js';
33import { delay, escapeRegex, getBase64Async, getStringHash, onlyUnique } from '../../utils.js';
44import { EdgeTtsProvider } from './edge.js';
55import { ElevenLabsTtsProvider } from './elevenlabs.js';
public/scripts/group-chats.js+0 -1
@@ -46,7 +46,6 @@ import {
4646 hideSwipeButtons,
4747 chat_metadata,
4848 updateChatMetadata,
49- isStreamingEnabled,
5049 getThumbnailUrl,
5150 getRequestHeaders,
5251 setMenuType,
public/scripts/nai-settings.js+1 -0
@@ -795,6 +795,7 @@ export function parseNovelAILogprobs(data) {
795795
796796 // Add the chosen token to `merged` if it's not already there. This can
797797 // happen if the chosen token was not among the top 10 most likely ones.
798+ // eslint-disable-next-line no-unused-vars
798799 const [[chosenId], [_, chosenAfter]] = data.chosen[0];
799800 if (!merged.some(([id]) => id === chosenId)) {
800801 merged.push([chosenId, chosenAfter]);
public/scripts/openai.js+1 -1
@@ -2020,6 +2020,7 @@ async function sendOpenAIRequest(type, messages, signal) {
20202020 'reasoning_effort': String(oai_settings.reasoning_effort),
20212021 'enable_web_search': Boolean(oai_settings.enable_web_search),
20222022 'request_images': Boolean(oai_settings.request_images),
2023+ 'custom_prompt_post_processing': oai_settings.custom_prompt_post_processing,
20232024 };
20242025
20252026 if (!canMultiSwipe && ToolManager.canPerformToolCalls(type)) {
@@ -2100,7 +2101,6 @@ async function sendOpenAIRequest(type, messages, signal) {
21002101 generate_data['custom_include_body'] = oai_settings.custom_include_body;
21012102 generate_data['custom_exclude_body'] = oai_settings.custom_exclude_body;
21022103 generate_data['custom_include_headers'] = oai_settings.custom_include_headers;
2103- generate_data['custom_prompt_post_processing'] = oai_settings.custom_prompt_post_processing;
21042104 }
21052105
21062106 if (isCohere) {
public/scripts/slash-commands.js+5 -3
@@ -69,12 +69,14 @@ import { SlashCommand } from './slash-commands/SlashCommand.js';
6969import { SlashCommandAbortController } from './slash-commands/SlashCommandAbortController.js';
7070import { SlashCommandNamedArgumentAssignment } from './slash-commands/SlashCommandNamedArgumentAssignment.js';
7171import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
7272import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
7373import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
7474import { SlashCommandBreakController } from './slash-commands/SlashCommandBreakController.js';
7575import { SlashCommandExecutionError } from './slash-commands/SlashCommandExecutionError.js';
7676import { slashCommandReturnHelper } from './slash-commands/SlashCommandReturnHelper.js';
7777import { accountStorage } from './util/AccountStorage.js';
78+import { SlashCommandDebugController } from './slash-commands/SlashCommandDebugController.js';
79+import { SlashCommandScope } from './slash-commands/SlashCommandScope.js';
7880export {
7981 executeSlashCommands, executeSlashCommandsWithOptions, getSlashCommandsHelp, registerSlashCommand,
8082};
@@ -4345,7 +4347,7 @@ const clearCommandProgressDebounced = debounce(clearCommandProgress);
43454347 * @prop {boolean} [handleParserErrors] (true) Whether to handle parser errors (show toast on error) or throw.
43464348 * @prop {SlashCommandScope} [scope] (null) The scope to be used when executing the commands.
43474349 * @prop {boolean} [handleExecutionErrors] (false) Whether to handle execution errors (show toast on error) or throw
43484350 * @prop {{[id:PARSER_FLAG]:boolean}import('./slash-commands/SlashCommandParser.js').ParserFlags} [parserFlags] (null) Parser flags to apply
43494351 * @prop {SlashCommandAbortController} [abortController] (null) Controller used to abort or pause command execution
43504352 * @prop {SlashCommandDebugController} [debugController] (null) Controller used to control debug execution
43514353 * @prop {(done:number, total:number)=>void} [onProgress] (null) Callback to handle progress events
@@ -4355,7 +4357,7 @@ const clearCommandProgressDebounced = debounce(clearCommandProgress);
43554357/**
43564358 * @typedef ExecuteSlashCommandsOnChatInputOptions
43574359 * @prop {SlashCommandScope} [scope] (null) The scope to be used when executing the commands.
43584360 * @prop {{[id:PARSER_FLAG]:boolean}import('./slash-commands/SlashCommandParser.js').ParserFlags} [parserFlags] (null) Parser flags to apply
43594361 * @prop {boolean} [clearChatInput] (false) Whether to clear the chat input textarea
43604362 * @prop {string} [source] (null) String indicating where the code come from (e.g., QR name)
43614363 */
public/scripts/slash-commands/SlashCommand.js+1 -5
@@ -3,16 +3,12 @@ import { SlashCommandAbortController } from './SlashCommandAbortController.js';
33import { SlashCommandArgument, SlashCommandNamedArgument } from './SlashCommandArgument.js';
44import { SlashCommandClosure } from './SlashCommandClosure.js';
55import { SlashCommandDebugController } from './SlashCommandDebugController.js';
6-import { PARSER_FLAG } from './SlashCommandParser.js';
76import { SlashCommandScope } from './SlashCommandScope.js';
87
9-
10-
11-
128/**
139 * @typedef {{
1410 * _scope:SlashCommandScope,
15- * _parserFlags:{[id:PARSER_FLAG]:boolean},
11+ * _parserFlags:import('./SlashCommandParser.js').ParserFlags,
1612 * _abortController:SlashCommandAbortController,
1713 * _debugController:SlashCommandDebugController,
1814 * _hasUnnamedArgument:boolean,
public/scripts/slash-commands/SlashCommandAutoCompleteNameResult.js+0 -3
@@ -1,9 +1,6 @@
11import { AutoCompleteNameResult } from '../autocomplete/AutoCompleteNameResult.js';
2-import { AutoCompleteOption } from '../autocomplete/AutoCompleteOption.js';
32import { AutoCompleteSecondaryNameResult } from '../autocomplete/AutoCompleteSecondaryNameResult.js';
43import { SlashCommand } from './SlashCommand.js';
5-import { SlashCommandNamedArgument } from './SlashCommandArgument.js';
6-import { SlashCommandClosure } from './SlashCommandClosure.js';
74import { SlashCommandCommandAutoCompleteOption } from './SlashCommandCommandAutoCompleteOption.js';
85import { SlashCommandEnumAutoCompleteOption } from './SlashCommandEnumAutoCompleteOption.js';
96import { SlashCommandExecutor } from './SlashCommandExecutor.js';
public/scripts/slash-commands/SlashCommandClosure.js+0 -3
@@ -2,7 +2,6 @@ import { substituteParams } from '../../script.js';
22import { delay, escapeRegex, uuidv4 } from '../utils.js';
33import { SlashCommand } from './SlashCommand.js';
44import { SlashCommandAbortController } from './SlashCommandAbortController.js';
5-import { SlashCommandNamedArgument } from './SlashCommandArgument.js';
65import { SlashCommandBreak } from './SlashCommandBreak.js';
76import { SlashCommandBreakController } from './SlashCommandBreakController.js';
87import { SlashCommandBreakPoint } from './SlashCommandBreakPoint.js';
@@ -16,9 +15,7 @@ import { SlashCommandScope } from './SlashCommandScope.js';
1615export class SlashCommandClosure {
1716 /** @type {SlashCommandScope} */ scope;
1817 /** @type {boolean} */ executeNow = false;
19- // @ts-ignore
2018 /** @type {SlashCommandNamedArgumentAssignment[]} */ argumentList = [];
21- // @ts-ignore
2219 /** @type {SlashCommandNamedArgumentAssignment[]} */ providedArgumentList = [];
2320 /** @type {SlashCommandExecutor[]} */ executorList = [];
2421 /** @type {SlashCommandAbortController} */ abortController;
public/scripts/slash-commands/SlashCommandDebugController.js+0 -0
public/scripts/slash-commands/SlashCommandEnumValue.js+0 -4
@@ -1,7 +1,3 @@
1-import { SlashCommandExecutor } from './SlashCommandExecutor.js';
2-import { SlashCommandScope } from './SlashCommandScope.js';
3-
4-
51/**
62 * @typedef {'enum' | 'command' | 'namedArgument' | 'variable' | 'qr' | 'macro' | 'number' | 'name'} EnumType
73 */
public/scripts/slash-commands/SlashCommandExecutor.js+1 -6
@@ -1,11 +1,7 @@
1-// eslint-disable-next-line no-unused-vars
21import { uuidv4 } from '../utils.js';
32import { SlashCommand } from './SlashCommand.js';
4-// eslint-disable-next-line no-unused-vars
53import { SlashCommandClosure } from './SlashCommandClosure.js';
64import { SlashCommandNamedArgumentAssignment } from './SlashCommandNamedArgumentAssignment.js';
7-// eslint-disable-next-line no-unused-vars
8-import { PARSER_FLAG } from './SlashCommandParser.js';
95import { SlashCommandUnnamedArgumentAssignment } from './SlashCommandUnnamedArgumentAssignment.js';
106
117export class SlashCommandExecutor {
@@ -29,10 +25,9 @@ export class SlashCommandExecutor {
2925 }
3026 }
3127 /** @type {SlashCommand} */ command;
32- // @ts-ignore
3328 /** @type {SlashCommandNamedArgumentAssignment[]} */ namedArgumentList = [];
3429 /** @type {SlashCommandUnnamedArgumentAssignment[]} */ unnamedArgumentList = [];
3530 /** @type {{[id:PARSER_FLAG]:boolean}import('./SlashCommandParser.js').ParserFlags} */ parserFlags;
3631
3732 get commandCount() {
3833 return 1
public/scripts/slash-commands/SlashCommandNamedArgumentAssignment.js+0 -0
public/scripts/slash-commands/SlashCommandNamedArgumentAutoCompleteOption.js+0 -1
@@ -1,7 +1,6 @@
11import { AutoCompleteOption } from '../autocomplete/AutoCompleteOption.js';
22import { SlashCommand } from './SlashCommand.js';
33import { SlashCommandNamedArgument } from './SlashCommandArgument.js';
4-import { SlashCommandNamedArgumentAssignment } from './SlashCommandNamedArgumentAssignment.js';
54
65export class SlashCommandNamedArgumentAutoCompleteOption extends AutoCompleteOption {
76 /** @type {SlashCommandNamedArgument} */ arg;
public/scripts/slash-commands/SlashCommandParser.js+5 -6
@@ -8,11 +8,9 @@ import { SlashCommandExecutor } from './SlashCommandExecutor.js';
88import { SlashCommandParserError } from './SlashCommandParserError.js';
99import { AutoCompleteNameResult } from '../autocomplete/AutoCompleteNameResult.js';
1010import { SlashCommandQuickReplyAutoCompleteOption } from './SlashCommandQuickReplyAutoCompleteOption.js';
11-// eslint-disable-next-line no-unused-vars
1211import { SlashCommandScope } from './SlashCommandScope.js';
1312import { SlashCommandVariableAutoCompleteOption } from './SlashCommandVariableAutoCompleteOption.js';
1413import { SlashCommandNamedArgumentAssignment } from './SlashCommandNamedArgumentAssignment.js';
15-// eslint-disable-next-line no-unused-vars
1614import { SlashCommandAbortController } from './SlashCommandAbortController.js';
1715import { SlashCommandAutoCompleteNameResult } from './SlashCommandAutoCompleteNameResult.js';
1816import { SlashCommandUnnamedArgumentAssignment } from './SlashCommandUnnamedArgumentAssignment.js';
@@ -28,15 +26,17 @@ import { t } from '../i18n.js';
2826/** @typedef {import('./SlashCommand.js').NamedArgumentsCapture} NamedArgumentsCapture */
2927/** @typedef {import('./SlashCommand.js').NamedArguments} NamedArguments */
3028
3129/**@readonly*/
3230/* * @enum {Number}*/
31+ * @readonly
32+ * @typedef {{[id:PARSER_FLAG]:boolean}} ParserFlags
33+ */
3334export const PARSER_FLAG = {
3435 'STRICT_ESCAPING': 1,
3536 'REPLACE_GETVAR': 2,
3637};
3738
3839export class SlashCommandParser {
39- // @ts-ignore
4040 /** @type {Object.<string, SlashCommand>} */ static commands = {};
4141
4242 /**
@@ -101,7 +101,6 @@ export class SlashCommandParser {
101101 get commands() {
102102 return SlashCommandParser.commands;
103103 }
104- // @ts-ignore
105104 /** @type {Object.<string, string>} */ helpStrings = {};
106105 /** @type {boolean} */ verifyCommandNames = true;
107106 /** @type {string} */ text;
public/scripts/slash-commands/SlashCommandScope.js+0 -0
public/scripts/slash-commands/SlashCommandUnnamedArgumentAssignment.js+0 -0
public/scripts/tags.js+0 -1
@@ -13,7 +13,6 @@ import {
1313 DEFAULT_PRINT_TIMEOUT,
1414 printCharacters,
1515} from '../script.js';
16-// eslint-disable-next-line no-unused-vars
1716import { FILTER_TYPES, FILTER_STATES, DEFAULT_FILTER_STATE, isFilterState, FilterHelper } from './filters.js';
1817
1918import { groupCandidatesFilter, groups, selected_group } from './group-chats.js';
public/scripts/variables.js+2 -2
@@ -9,7 +9,7 @@ import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';
99import { SlashCommandClosureResult } from './slash-commands/SlashCommandClosureResult.js';
1010import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
1111import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
1212import { PARSER_FLAG, SlashCommandParser } from './slash-commands/SlashCommandParser.js';
1313import { slashCommandReturnHelper } from './slash-commands/SlashCommandReturnHelper.js';
1414import { SlashCommandScope } from './slash-commands/SlashCommandScope.js';
1515import { isFalseBoolean, convertValueType, isTrueBoolean } from './utils.js';
@@ -583,7 +583,7 @@ export function evalBoolean(rule, a, b) {
583583 * Executes a slash command from a string (may be enclosed in quotes) and returns the result.
584584 * @param {string} command Command to execute. May contain escaped macro and batch separators.
585585 * @param {SlashCommandScope} [scope] The scope to use.
586586 * @param {{[id:PARSER_FLAG]:boolean}import('./slash-commands/SlashCommandParser.js').ParserFlags} [parserFlags] The parser flags to use.
587587 * @param {SlashCommandAbortController} [abortController] The abort controller to use.
588588 * @returns {Promise<SlashCommandClosureResult>} Closure execution result
589589 */
public/scripts/world-info.js+1 -1
@@ -1,6 +1,6 @@
11import { Fuse } from '../lib.js';
22
33import { saveSettings, callPopup, substituteParams, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types, getExtensionPromptByName, saveMetadata, getCurrentChatId, extension_prompt_roles } from '../script.js';
44import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, getCharaFilename, getSortableDelay, escapeRegex, PAGINATION_TEMPLATE, navigation_option, waitUntilCondition, isTrueBoolean, setValueByPath, flashHighlight, select2ModifyOptions, getSelect2OptionId, dynamicSelect2DataViaAjax, highlightRegex, select2ChoiceClickSubscribe, isFalseBoolean, getSanitizedFilename, checkOverwriteExistingData, getStringHash, parseStringArray, cancelDebounce, findChar, onlyUnique } from './utils.js';
55import { extension_settings, getContext } from './extensions.js';
66import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from './authors-note.js';
src/endpoints/backends/chat-completions.js+9 -8
@@ -1048,6 +1048,15 @@ router.post('/generate', function (request, response) {
10481048 let bodyParams;
10491049 const isTextCompletion = Boolean(request.body.model && TEXT_COMPLETION_MODELS.includes(request.body.model)) || typeof request.body.messages === 'string';
10501050
1051+ const postProcessTypes = [CHAT_COMPLETION_SOURCES.CUSTOM, CHAT_COMPLETION_SOURCES.OPENROUTER];
1052+ if (Array.isArray(request.body.messages) && postProcessTypes.includes(request.body.chat_completion_source) && request.body.custom_prompt_post_processing) {
1053+ console.info('Applying custom prompt post-processing of type', request.body.custom_prompt_post_processing);
1054+ request.body.messages = postProcessPrompt(
1055+ request.body.messages,
1056+ request.body.custom_prompt_post_processing,
1057+ getPromptNames(request));
1058+ }
1059+
10511060 if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.OPENAI) {
10521061 apiUrl = new URL(request.body.reverse_proxy || API_OPENAI).toString();
10531062 apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.OPENAI);
@@ -1121,14 +1130,6 @@ router.post('/generate', function (request, response) {
11211130
11221131 mergeObjectWithYaml(bodyParams, request.body.custom_include_body);
11231132 mergeObjectWithYaml(headers, request.body.custom_include_headers);
1124-
1125- if (request.body.custom_prompt_post_processing) {
1126- console.info('Applying custom prompt post-processing of type', request.body.custom_prompt_post_processing);
1127- request.body.messages = postProcessPrompt(
1128- request.body.messages,
1129- request.body.custom_prompt_post_processing,
1130- getPromptNames(request));
1131- }
11321133 } else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.PERPLEXITY) {
11331134 apiUrl = API_PERPLEXITY;
11341135 apiKey = readSecret(request.user.directories, SECRET_KEYS.PERPLEXITY);
src/endpoints/chats.js+4 -5
@@ -783,12 +783,11 @@ router.post('/search', validateAvatarUrlMiddleware, function (request, response)
783783 continue;
784784 }
785785
786786 // Search through title and messages of the chat
787787 const fragments = query.trim().toLowerCase().split(/\s+/).filter(x => x);
788- const hasMatch = messages.some(message => {
788+ const text = [path.parse(chatFile.path).name,
789789 const text...messages.map(message => message?.mes?)].join('\n').toLowerCase();
790790 return const texthasMatch &&= fragments.every(fragment => text.includes(fragment));
791- });
792791
793792 if (hasMatch) {
794793 results.push({