Compare commits

...
177 Commits
Author SHA1 Message Date
Cohee 9a191c41e8 Merge pull request #4316 from SillyTavern/staging
Staging
2025-07-26 22:16:05 +03:00
Cohee e8247ca8e9 Remove ⌛ from readmes 2025-07-26 21:27:22 +03:00
Cohee ce1b5ba91c Fix header level nesting 2025-07-26 21:23:07 +03:00
Cohee 24ec287fa5 Cull down the repo readme to bare minimum (#4315)
* Cull down the repo readme to bare minimum

* Return some fluff sections

* Update localized readmes

* Fix image url
2025-07-26 21:20:10 +03:00
Cohee 2c0d8d71bc Browser launch: Add support for Brave browser 2025-07-26 18:29:15 +03:00
Cohee def315eb98 Bump version to 1.13.2 2025-07-26 18:26:47 +03:00
Cohee a8bb8a6703 Add hint popup on string length overflow 2025-07-26 18:20:45 +03:00
Cohee 27487f1f2a MistralAI: new magistral subversions 2025-07-26 01:52:35 +03:00
Cohee 82d9fa79e8 Add vectorization via Vertex AI (#4311)
* Add vectorization via Vertex AI

* Enable batching for Google vectors

* Add batch embeddings for Vertex

* Split embed methods for Vertex/AI Studio
2025-07-25 23:59:30 +03:00
Cohee c094e5d8ef Fix type errors in variables.js 2025-07-25 22:37:09 +03:00
IceFog72 8948d9773e Adding unique galleryImageDraggable class to draggable div with gallery Image inside (#4310) 2025-07-25 22:32:59 +03:00
Cohee 2a971a517c Adjust tags list to use screen size relative units 2025-07-25 22:31:30 +03:00
Cohee fdc51a1211 Claude model deprecations (#4306)
* Claude: deprecate Claude 2 models

* Claude: flatten tool call schema

* Remove deprecated Sonnet 3 from captioning list
2025-07-25 22:06:12 +03:00
Cohee 6224e20cbe Merge pull request #4305 from SillyTavern/feat/allow-empty-setvar
Allow empty values in {{setvar/setglobalvar}}
2025-07-25 22:04:56 +03:00
Cohee 29702a3f1b Merge pull request #4302 from cloudskytian/staging
Console access log output is now controlled by enableAccessLog
2025-07-25 22:02:27 +03:00
cloudskytian 9cd7910aff Update config.yaml for Console access log output is now controlled by enableAccessLog 2025-07-25 10:18:42 +08:00
Coheeandzonde306 90adf2f104 Allow extensions to add or exclude WI entries (#4304)
* Allows control of Lore books entries by extensions

* WORLDINFO_SORTING changed to WORLDINFO_ENTRIES_LOADED

---------

Co-authored-by: zonde306 <anonymous@localhost>
2025-07-24 23:21:48 +03:00
zonde306 53d96deaff WORLDINFO_SORTING changed to WORLDINFO_ENTRIES_LOADED 2025-07-25 04:09:33 +08:00
zonde306 ac759e5b7e Allows control of Lore books entries by extensions 2025-07-25 03:36:01 +08:00
Cohee d641cbecc4 Remove Scale Spellbook from CC sources (#4293) 2025-07-24 22:02:45 +03:00
Cohee d3818244e6 Merge branch 'release' into staging 2025-07-24 21:34:00 +03:00
Cohee bcf5f65759 Fix audit in tests 2025-07-24 21:33:54 +03:00
Cohee 487c7fa120 Fix npm audit 2025-07-24 21:33:15 +03:00
Cohee 38a5e4a4f2 Refactor BYAF parsing (#4303)
* Refactor BYAF parsing

* Refactor ByafParser to use private field for data and improve type annotations
2025-07-24 21:31:45 +03:00
cloudskytian d1a82c85a5 Console access log output is now controlled by enableAccessLog 2025-07-24 19:16:21 +08:00
Cohee 7edd81f183 Remove legacy key from config extras.promptExpansionModel 2025-07-24 00:58:12 +03:00
Cohee c627d77c46 Add toggle and user agent filter for CacheBuster middleware (#4301)
* Add toggle and user agent filter for CacheBuster middleware
Closes #4290 [BUG] SillyTavern takes ~45 seconds to load initially

* Use single instance of CacheBuster class

* Cache config values

* Consistent log header

* Remove unnecessary empty line at the beginning of byaf.js
2025-07-24 00:45:42 +03:00
CoheeandCopilot e0b020f211 Import BYAF (#4300)
* allow byaf import format

* Add byaf import converters

* Fix import of image and scenario

* Update src/byaf.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Log JSON parsing errors

* Use fsPromises for file acces

* Fix callback variable name

* Clear file input value after file upload to allow re-uploading

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-23 23:05:14 +03:00
Cohee 87ece15faf Fix phantom scroll in WI entry editor 2025-07-23 21:15:02 +03:00
RossAscends e18cde0095 tweak margins on rm_tag_controls to account for collapsed tag lists. 2025-07-23 13:10:57 +09:00
RossAscends b2cae4032c Make charlist tag filter list scrollable 2025-07-23 13:01:53 +09:00
afa3261746 Redesign Creator's Note block (#4298)
* Restyle creator's notes block

* Creator Notes to standoutHeader styling, allows for viewing Note without hiding chardefs

* Fix closing tag

* Remove stray close tag

* Adjust spoiler-free mode toggle

* Make the whole toggle area clickable

* Remove redundant comment

* Add empty state for creator's notes

* Adjust paddings

* Update public/index.html

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

---------

Co-authored-by: RossAscends <124905043+RossAscends@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-07-23 00:08:56 +03:00
Cohee 0bfb5e1302 Update config.yaml 2025-07-22 23:34:41 +03:00
Cohee 9698c78725 Fix index.html formatting 2025-07-22 20:00:50 +03:00
Cohee 7429726eb1 Remove Window AI from CC sources (#4294) 2025-07-22 19:45:54 +03:00
Cohee 6217ea9888 Navbar: Do not wait for animation duration if it's zero 2025-07-21 21:11:16 +03:00
Cohee d070982ad7 Bump multer field size limit
Closes #4291
2025-07-21 20:26:18 +03:00
Cohee bec05909eb STscript: fix REPLACE_GETVAR with non-lowercase {{getvar}} 2025-07-21 04:02:09 +03:00
Cohee 4177c829d1 Add default global scan data for checkWorldInfo 2025-07-21 01:58:26 +03:00
Coheeandgemini-code-assist[bot] 5d56992ea8 Feat/global install (#4289)
* Update npm dependencies

* Add global paths mode
Closes #4209

* Update src/command-line.js

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* Async => Promise.resolve

* Remove unnecessary Promise.resolve()

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-07-21 00:24:49 +03:00
Cohee 5f32fba499 Increase padding of rm fixed top 2025-07-20 00:25:13 +03:00
Cohee c292f64163 Add generation type triggers to world info (#4286)
* Add generation type triggers to world info

* Simplify includes check

* Refactor getEntryField validation and default value handling

* Remove invalid attribute

* Check for a valid trigger
2025-07-20 00:22:54 +03:00
Cohee 786d8f43db Merge branch 'release' into staging 2025-07-19 21:07:36 +03:00
Cohee 8f2a194617 [chore] Only HIGH priority comments 2025-07-19 21:05:22 +03:00
Cohee 192236f8dd Add config for jeremy code assist 2025-07-19 21:02:16 +03:00
Cohee fb86dedf29 Show controls when editing compact messages 2025-07-18 22:10:09 +03:00
Cohee 4fd39e8ad3 Improve right menu kbd nav when no char is selected 2025-07-18 22:03:43 +03:00
Cohee c6fe918556 Update .text_muted styles for improved readability and theme consistency 2025-07-18 21:18:00 +03:00
Cohee 043e3bfc50 Make rm_button_bar wrap 2025-07-18 20:55:57 +03:00
CoheeandCopilot ba12b32a1f Characters list top panel touchup (#4282)
* Move search bar under buttons
Closes #4275

* Remove horizontal rules from right menu

* Add toggle for search form

* Add container for extension rm buttons

* Be square or be there

* Adjust font sizes

* Square enlargement program

* Adjust margins

* Remove margin from pagination outlet buttons

* Adjust margin on tag controls

* Collapse 1px margins

* Update public/script.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Remove variable assignment

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-18 20:01:44 +03:00
kallewoof c3e3fdb0ca chat templates: add Kimi K2 (Moonshot AI) chat template derivation (#4283)
* chat templates: add Kimi K2 (Moonshot AI) chat template derivation

* tweak chatml substring derivation
2025-07-18 11:04:57 +03:00
Cohee 4a8ef76d6f Merge branch 'release' into staging 2025-07-18 01:37:20 +03:00
Cohee f1d6a2e6c9 Fix npm audit 2025-07-18 01:35:46 +03:00
Cohee 808f3ac174 Replace NanoGPT logo 2025-07-18 01:32:04 +03:00
Cohee 13ed0d3ad9 Add height limit to global WI picker
Closes #4278
2025-07-17 21:47:59 +03:00
Cohee d9f4028952 CC/PM: Add generation type trigger prompt filter (#4281)
* CC/PM: Add generation type trigger prompt filter
Closes #4276

* Fix element cast type

* Narrower element types

* Change trigger to multiple select

* Extract class scope function

* Fix control name

* Add 'enabled' property to Prompt class and update type annotations in PromptManager methods

* Clarify placeholder of multiselect
2025-07-17 21:27:26 +03:00
Cohee e7ad36a758 Merge branch 'release' into staging 2025-07-17 13:49:35 +00:00
Cohee a64aae3edf Fix recover.js script 2025-07-17 13:49:15 +00:00
Cohee fddfbc5529 Fix CC import 2025-07-16 00:58:55 +03:00
Cohee 7894e4d361 Google: Fix video inlining with PPP
Fixes #4268
2025-07-15 23:28:26 +03:00
Cohee 0e1d29acfe Bump request payload limits 2025-07-15 23:23:07 +03:00
Cohee 1a92157643 Refactor generateRaw/generateQuietPrompt calls (#4277)
* generateQuietPrompt: Update to object arguments

* generateRaw: Update to object arguments

* Fix jsdoc

* Fix lint

* Unwrap JSON schema options

* Remove default args from gen call
2025-07-15 23:11:31 +03:00
Cohee f8f9ee8a0e NanoGPT: Add backend web search 2025-07-15 22:47:10 +03:00
bmen25124andCohee cd176039ef Added structured output for common APIs (#4272)
* Added structured output for common APIs

* eslint

* Added frontend impl

* Type name change

* Unprefix json_schema, apply review suggestions

* Add schema to generateQuietPrompt, add comments

* Prettify diff

* Extract JSON from Claude response

* Add structured gen for Mistral

* Hack to support schema for DeepSeek

* Hack JSON schema for AI21

* Add Groq structured gen

* Add JSON mode for pollinations

* Add JSON schema for perplexity

* Add JSON schema for AIML

* Using extractJsonFromData in custom-request, added google rules for flattenSchema

* Fix response parsing

* Fix Google

* Fixed json parse

* Expose generateRaw to getContext

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-15 21:54:36 +03:00
cloak1505andCohee 87f8a3eb2c Add Moonshot AI instruct template (#4270)
* Add Moonshot AI instruct template

* This is not needed anymore

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-15 00:17:12 +03:00
Cohee a4ec66f230 Pollinations: write voice request URL to console 2025-07-14 22:45:01 +03:00
Cohee d3a19f795e Fix type error in falai response handler 2025-07-14 22:42:27 +03:00
Cohee 4607132576 Pollinations: add as TTS provider 2025-07-14 22:29:30 +03:00
Cohee 9a86f8a6bb NovelAI: Fix TTS preview 2025-07-14 22:26:39 +03:00
Frédéric BolvinandCohee 71a3ad0edb apply gemini safety settings as extra_body in OpenRouter requests (#4256)
* apply gemini safety settings as extra_body in OpenRouter requests

* revert adding new gemini safety category

* Make it actually work

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-14 21:03:46 +03:00
556fb4ba08 adding prefill parameter to generateRaw() (#4266)
* adding prefill parameter to generateRaw()

* additional comments

* Substitute params in prefill

* Add prefill prompt for /genraw command

* Fix param comment

* fixing generateRaw param comment

* fixing param comment

---------

Co-authored-by: qvink <qvink@users.noreply.github.com>
Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-14 20:51:53 +03:00
Cohee 3edb5a5616 Add Moonshot AI to OpenRouter providers (#4269) 2025-07-14 10:19:34 +03:00
cloak1505 0c2e2f90a8 Add Moonshot AI to OpenRouter providers 2025-07-14 01:56:55 -05:00
db318cd75c Ability to specify multiple messages and roles in generateRaw() (#4264)
* adding capability for generateRaw() to specify roles of messages for chat completion

* linting

* additional comments

* Apply review comments, fix type errors

* Fix joiner for non-instruct prompts

* Format joint prompt for novel, fix prefix for non-instruct

* Fix role for string prompts

* Do not trim sysprompt for instruct

* Do not prefix names for CC

* Append newline to systemPrompt in instruct

---------

Co-authored-by: qvink <qvink@users.noreply.github.com>
Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-13 22:04:44 +03:00
Cohee 9a392afee3 Fix type checks 2025-07-13 16:58:34 +03:00
Cohee c9111596c0 Prefer node-fetch instead of native 2025-07-13 16:57:22 +03:00
Cohee 9197527c13 Sync OpenRouter providers 2025-07-13 15:51:57 +03:00
Forkoz c4b5236ed4 Fix nsigma in sampler order value (#4259) 2025-07-12 01:26:06 +03:00
Cohee 4f3eb7417e Fix oai_settings assignment in getPresetList 2025-07-11 22:31:51 +03:00
Forkoz b233402ac9 Ooba nsigma support. (#4258)
* nsigma index.html

* nsigma textgen-settings.js
2025-07-11 22:27:49 +03:00
Cohee 19a8a8625c Move event types + new events (#4257)
* Move app events to separate module

* Add event emission for preset changes and deletions

* Remove unnecessary blank line at the beginning of events.js

* Add await to selectPreset call in initTextGenSettings

* Emit events for preset deletion and change in initPresetManager

* Move event emit out of PRESET_CHANGED
2025-07-11 22:00:04 +03:00
Cohee febb02ffcb /inject: auto-generate ID and fix argument description (#4253)
* /inject: auto-generate ID and fix argument description

* Fix default depth and role handling

* Return ID of the new inject
2025-07-11 13:25:29 +03:00
equal-l2 9842598325 Add vision support for Grok 4 (#4254) 2025-07-10 23:35:30 +03:00
Cohee 13e1d3190e gork-4 2025-07-10 19:44:36 +03:00
Cohee 0ae171985d MistralAI: Add new devstral models 2025-07-10 19:30:04 +03:00
Cohee f8b0e8f2ad Move system messages init into separate module (#4251)
* Move system messages init into separate module

* getSystemMessages => initSystemMessages
2025-07-10 19:22:16 +03:00
Cohee d785e7a7ce Makes sense that a new temp chat starts if you were already on a temp chat 2025-07-10 09:21:10 +00:00
Cohee f477ed1d74 Move CHAT_CHANGED injects revive listener to initDefaultSlashCommands 2025-07-10 00:11:00 +03:00
Cohee ea5181af08 Preset Manager: Add methods for reading/writing custom data (#4246)
* Preset Manager: Add methods for reading/writing custom data

* Fix loading novel extensions on load

* Move ensurePlainObject to utils

* Init empty object in convertNovelPreset
2025-07-09 23:55:08 +03:00
Cohee 489d46b9a0 Perplexity: unlock reasoning effort 2025-07-09 20:51:21 +03:00
Cohee dd7dbaea5e Perplexity: Add sonar-deep-research to the list 2025-07-09 20:38:56 +03:00
Cohee 0567cdc473 Perplexity: Fix frequency_penalty normalization 2025-07-09 20:36:19 +03:00
Cohee 6ee5d7ff9c MistralAI: Add small-2506 to the list 2025-07-09 20:30:43 +03:00
Cohee 86bac00a81 Groq: Pull models list from endpoint 2025-07-09 20:25:20 +03:00
Cohee 5be2323e23 AI21: Add Jamba 1.7 models 2025-07-09 20:09:34 +03:00
Cohee b737af47b5 Refactor OpenAI preset API endpoints to unify save and delete operations 2025-07-08 21:32:58 +03:00
Cohee 5a6d93fc03 Vectors: Fix passing model id to AI Studio 2025-07-08 09:41:28 +00:00
Cohee de3d91670a Fix add max height and scroll overflow to hamburger and wand menus
Fixes #4242
2025-07-07 21:55:45 +03:00
Cohee a029a6e1f1 Fix convertTextToBase64 for large files
Reference: https://github.com/google/closure-library/blob/b312823ec5f84239ff1db7526f4a75cba0420a33/closure/goog/crypt/crypt.js#L104-L123
2025-07-07 12:57:48 +00:00
Cohee 96bdc13937 Replace ajax with fetch (#4241)
* Replace ajax with fetch
Fix type errors in power-user / group-chats modules

* Fix single sprite upload

* Return empty object on failed upload
2025-07-06 23:27:53 +03:00
Cohee 55ca4c89b6 Disallow message edits while in delete mode 2025-07-06 20:55:16 +03:00
CoheeandCopilot 28189bb1c7 Move default slash commands to respective module (#4240)
* Move default slash commands to respective module

* Update public/scripts/slash-commands.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-06 17:17:19 +03:00
Cohee 8449b4bb27 Move Horde status check to respective module 2025-07-06 16:38:52 +03:00
Cohee c51ce1d018 Move text completion settings to respective module (#4239) 2025-07-06 16:32:48 +03:00
Cohee 3d488a5e7b Move DOMPurify hooks to chats module 2025-07-06 16:13:22 +03:00
CoheeandCopilot 2f56a73368 Move NovelAI settings to respective module (#4238)
* Move NovelAI settings to respective module

* Update public/scripts/nai-settings.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-06 16:05:26 +03:00
Cohee 88ef9ca0de Properly save chat QR metadata in groups
Fixes #4121
2025-07-06 15:11:00 +03:00
Jenner La Fave b45477578f Fix FAL.AI models list endpoint (#4236)
The FAL.AI endpoint seems to have switched to a paginated format where the
results are nested under an `items` key. This updates the endpoint handler to
fetch all pages and extract the model options correctly.
2025-07-06 14:53:41 +03:00
CoheeandCopilot e1a55408b6 OpenRouter: match both id/text in select2 (#4237)
* OpenRouter: match both id/text in select2

* Update public/scripts/utils.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-06 14:41:25 +03:00
Marcela Petra Ferraz de NovaesandCohee 38a7668535 Feature/add character tags to message div option (#4225)
* Adding toggle.

* Adding events for the new toggle. Reloading chat when toggled.

* Adding chat reload when tags are added or removed to char.

* Adding main applyCharacterTagsToMessageDivs function to add tags to divs.

* Adding information that the class name is normalized and lowercased to the tooltip.

* Correcting console.traces to console.debug for minimal console printing.

* Lint indentation fix.

* Adding simple cache.

* Adding reload event when a new message is added to chat.

* Changing tags applied from classes to HTML data API.

* Adding guide showing how to select data attributes with CSS.

* Fixing trailing comma pointed out by lint.

* Simplifying re-rendering by deleting previous attributes.

* Adding the feature as default behavior, removing toggles. Will add docs to ST docs.

* Removing code that is no longer needed.

* Re-rendering divs after other tag operations.

* Filtering message ids to only re-render specific divs. Adding suggested changes.

* After testing, it seems to add all messages by one, so it appears it's not needed call this in the printMessages function.

* Lint fixes.

* Cache jquery selector

* Fix local variables assignment

* Move new functions to tags module

* Normalizing tag names before adding them as data-*

* Replace commas with spaces to avoid issues with tag names containing commas.

* Correcting where the comma replacing should go.

* Add error handling for applyCharacterTagsToMessageDivs

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-05 22:37:43 +03:00
CoheeandCopilot e0469b4808 Move Kobold Classic settings into related module (#4234)
* Move Kobold Classic settings into related module

* Update public/scripts/kai-settings.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-05 21:00:06 +03:00
Cohee fad1fa3a33 Hide prompt cost block for non-TC APIs 2025-07-05 20:52:29 +03:00
CoheeandCopilot 8a6e6503f5 Move itemized prompts into separate module (#4229)
* Move itemized prompts into separate module

* Update public/scripts/itemized-prompts.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update public/scripts/itemized-prompts.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-07-05 16:21:17 +03:00
Cohee 85f38542b6 Improve sanitation of CSS pseudo-classes (#4230) 2025-07-05 16:13:35 +03:00
Cohee a68d31b1b9 Non-streaming narrate by paragraphs setting now actually works automatically regardless of streaming-related settings. Resolves #4228. (#4232) 2025-07-05 12:22:17 +03:00
Gness Erquint 9aab4ea648 Non-streaming narrate by paragraphs setting now actually works automatically regardless of streaming-related settings. Resolves #4228. 2025-07-05 08:25:03 +03:00
Cohee 257883a5f9 Fix creation of characters with additional WI files assigned 2025-07-04 20:33:17 +03:00
GregW6andCohee 1547a53d7c Refactor: Replace Deprecated Code (#4221)
* refactor: ♻️ Replace deprecated code defined within this repository

- Replace ““/public/scripts.js” > `callPopup`” with ““/public/scripts/popup.js” > `callGenericPopup`”.
- Replace ““/public/scripts/tokenizers.js” > `getTokenCount`” with ““/public/scripts/tokenizers.js” > `getTokenCountAsync`”.
- Replace ““/public/scripts/extensions/assets/index.js” > `executeSlashCommands`” with ““/public/scripts/extensions/assets/index.js” > `executeSlashCommandsWithOptions`”.

* refactor: ♻️ Replace deprecated code from standard library

1. Replace set of deprecated `escape` and deprecated `unescape` functions with `encodeURIComponent` and `decodeURIComponent` functions.
2. Replace set of `encodeURIComponent` and deprecated `unescape` functions with a custom `convertTextToBinaryString` function.

* refactor: ♻️ Replace deprecated code imported from external library

All of them is from jQuery.
1. Replace `$(document).ready(() => { ... })` → `jQuery(() => { ... })`.
2. Replace event type direct calls.
    1) Change
        - `$('...').change(function () { ... })` → `$('...').on('change', function () { ... })`.
    2) Click
        - `$('...').click(function () { ... })` → `$('...').on('click', function () { ... })`.
        - `$('...').click()` → `$('...').trigger('click')`.
    3) Focus
        - `$('...').focus(function () { ... })` → `$('...').on('focus', function () { ... })`.
        - `$('...').focus()` → `$('...').trigger('focus')`.
    4) Blur
        - `$('...').blur(function () { ... })` → `$('...').on('blur', function () { ... })`.
    5) Keyup
        - `$('...').keyup(function () { ... })` → `$('...').on('keyup', function () { ... })`.

* refactor(Attachment): ♻️ Merge `convertTextToBinaryString` and `convertTextToBase64`

`convertTextToBase64` function use `Uint8Array.prototype.toBase64` if supported by the Browser and use a combination of `Window.btoa` and `String.fromCharCode` as fallback.

* fix: 🐛 Fix Bind World Info to Character Card

Using the new `Popup` class.

* fix: 🐛 Fix Bind World Info to Character Card

Using the new `Popup` class.

* refactor: 🐛 Refactor and fix Character World Info popup

Add singleton back and some optimization.

-   **🛡️ Singleton Pattern:** Implemented a singleton pattern using the `characterWorldPopup` variable. This prevents multiple instances of the popup from being created, ensuring a clean and predictable UI. If the popup is already open, it will be brought into focus instead of creating a duplicate.
-   **♻️ Improved Readability:** The event handling logic has been extracted into clearly named functions (`handlePrimaryWorldSelect`, `handleExtrasWorldSelect`), making the `Popup` constructor cleaner and the overall code more readable and maintainable.
-   **⚙️ Optimized Performance:** The new implementation caches frequently accessed values and jQuery selectors, reducing redundant DOM lookups and improving performance.

---

* refactor(Chat): ♻️ Modernize chat deletion confirmation

Replaces the deprecated `callPopup` with the modern `callGenericPopup` for the chat deletion confirmation dialog.

* Fix /delchat command

* Remove unused code

* Fix type. Change value to debug log

* Remove value logs

* Remove singleton pattern for openCharacterWorldPopup

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-04 19:42:51 +03:00
Cohee 649a4b19f4 Revert old logic of zoomed img resolve 2025-07-04 01:33:08 +03:00
Cohee 46eb01d8be Fix clickable avatar 2025-07-04 01:29:08 +03:00
Cohee 1e63fdd4b3 Clean-up console.trace calls 2025-07-04 01:25:47 +03:00
Cohee 9cdfb8b596 Remove console.debug from tags colorize handler 2025-07-04 01:24:36 +03:00
Marcela Petra Ferraz de Novaes 3f842d2049 Bugfix - Clicking on tag view list toggles checkbox (#4227)
* Adding event.preventDefault() to prevent checkbox toggle when clicking to open pop-up.

* Adjusting comment.
2025-07-04 01:23:51 +03:00
VhalloandCohee 61b12ec657 Current Mistral Small 24B Instruct Format (#4226)
* Current Mistral Small 24B Instruct Format

* Current Mistral Small 24B Instruct Format

* Add new files to index

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-07-03 21:59:16 +03:00
Cohee 51904c2f10 Add persona titles (#4224)
* Add persona titles

* Refactor persona title editing
2025-07-03 19:28:09 +03:00
Cohee d41725cd4f Fix thumbnails for backgrounds containing a single quote 2025-06-30 23:07:50 +03:00
Cohee fbb6180bc1 Adjust scoped variable naming, format comments 2025-06-29 18:09:47 +03:00
kallewoofandCohee 1b2976ae1d feature: customizable mappings for presets per model name / chat template (#4153)
* feature: customizable mappings for presets per chat template

This adds the ability to assign custom context/instruct presets on a per-chat-template(-hash) basis. Users using custom templates may use this feature to auto-enable the preset of their choice, rather than the built-in defaults.

* fix: do not use chat tempate based instruct preset derivation if a preset was auto-selected already

This fixes issues where regex matched presets are overridden.

* reset chat template hash on connect

* handle derive_mappings being null

* unorthodox eslint requirement adherence

* button styling

* un-nest derivation related properties

* Migrate setting

* add bind model to preset button to the miscellaneous section

* switch to unified button for model preset mappings

* fix bind UI

* eslint

* do not include koboldcpp/ggml-model-xxx.gguf in preset saving

* review fixes

* stray console.log / eslint

* Update checkbox state if no model map exists

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-06-29 18:04:00 +03:00
Cohee 380c88d401 Stop click propagation on copy from code blocks
Fixes #4214
2025-06-29 17:26:42 +03:00
Vin AstralisandCohee a7783b62a8 Add Speed Control to ElevenLabs TTS Provider (#4213)
* add speed

* Adjust speed range

* More granular step

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-06-29 02:30:24 +03:00
Cohee 4efed978f0 Enhance file name validation by allowing objects with toString method 2025-06-28 22:36:21 +03:00
Cohee 1e3fada8d7 Prefer sanitize filename with extension 2025-06-28 22:25:14 +03:00
Cohee cdefddef6c Implement persona thumbnails (#4210)
* Implement persona thumbnails

* Dear Firefox, fix your overzealous image cache

* Add cache busting for avatar uploads when overwriting existing files
2025-06-28 21:39:32 +03:00
Cohee 37528c81b3 Caption: Add 'Show captions in chat' setting 2025-06-28 20:00:38 +03:00
Cohee a6b9fffbf7 Merge branch 'release' into staging 2025-06-28 16:29:54 +03:00
Cohee 31e7c65397 Downgrade webpack to 5.98.0 2025-06-28 16:29:24 +03:00
Marcela Petra Ferraz de NovaesandCohee 34118bbdc2 Feature/Perchance AI Character Chat import (#4211)
* Adding ZLib and Jimp imports.

* Adding checks to see if UUID or URL are from Perchance.

* Adding conversion for Perchance cards and avatar.

* Adding label and example for Perchance character import.

* Adding localization of Perchance import option.

* Lint dangling comma fix.

* Simplifying one liner arrow function.

* Checking .gz at the end of Perchance url.

* Refactoring.

* Handling Base64 avatars.

* Fixing issue with UUID and refactoring.

* Adding char name to Perchance UUID example.

* Undoing unwanted variable name change of avatarBuffer to defaultAvatarBuffer

* Adding null check.

* Minor adjustments: renaming variable and organizing imports.

* Simple refactoring and reducing level of console messages.

* Add character source for perchance

* Add null check

* Use slug for source

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-06-28 16:18:26 +03:00
Vin Astralis 363192dd39 feat(elevenlabs): add new models and deprecate old ones (#4212)
* feat(elevenlabs): add new models and deprecate old ones

* feat(elevenlabs): update default model to eleven_turbo_v2_5 and enhance extended settings check
2025-06-28 15:58:09 +03:00
Cohee d91c6c28cb Translate: Update API key management 2025-06-28 15:32:29 +03:00
Cohee 579ef1e86c Refactor API key management in extensions 2025-06-26 21:24:51 +03:00
Cohee 0f73e361df Remove nomicai from secrets input map 2025-06-26 20:53:36 +03:00
Cohee b618f7e4ce select2: Replace line-height with vertical padding 2025-06-26 20:50:44 +03:00
Cohee 780bd1fc65 Add backfill for missing WI entries fields (#4203)
* Add backfill for missing WI entries fields
Fixes #4202

* Backfill before filter/sorting

* Fix array wrapping

* Check if characterFilter is array

* Add console debug for isArray check

* Add isArray check for entry
2025-06-26 20:48:24 +03:00
Cohee 1ad7662f10 select2: adjust single selection placeholder override 2025-06-26 20:31:30 +03:00
qvinkandqvink b3bc065713 Select2 visual bug fix (#4207)
* attempt at fixing select2 spacing issue across browsers

* found the actual problem

* fixing placeholder text

* fixing placeholder text again

* removing references to the select2_multi_sameline

---------

Co-authored-by: qvink <qvink@users.noreply.github.com>
2025-06-26 20:24:21 +03:00
Wolfsblvt b1887a0cc2 Fix default emojis expression setting resetting (#4206)
Adjusts conditions to properly enforce mutual exclusivity between fallback expression and default emoji settings

- Ensures "[ No fallback ]" option only appears when both settings are inactive
- Updates migration logic to ONLY reset default emoji setting when fallback is active

Fixes #4205
2025-06-26 09:47:16 +03:00
Cohee 6f5f945eb2 Merge pull request #4208 from qvink/staging
Removing zh-tw translations for specific extension
2025-06-26 09:45:54 +03:00
Cohee 28f5b74cc7 OpenRouter: Use display name for options on text completion 2025-06-25 22:05:16 +03:00
Cohee 7bf1da7384 Perform save if fixing placement 2025-06-25 22:03:25 +03:00
Cohee 7d7f1b1e29 Check if regex script placement is an array 2025-06-25 22:01:45 +03:00
Cohee 17511c444f Hide image models from Together textgen select 2025-06-25 21:39:24 +03:00
Cohee dbe0111034 Refactor saveBase64AsFile uploads (#4200)
* Refactor saveBase64AsFile uploads

* Add request body check

* Extract server-side constants

* Allow .jfif media attachments

* Allow .bmp uploads

* Enhance image prompt handling: support additional MIME types and prevent upscaling in thumbnails

* Convert file extension to lowercase

* Enhance thumbnail creation: improve image quality and add white background

* Add toast for error in media upload
2025-06-25 21:34:08 +03:00
Cohee 7755fc50a5 Image Generation: Support video outputs for ComfyUI (#4194)
* ImgGen: ComfyUI support video outputs

* Fix video format check to handle undefined and case sensitivity

* Fix error handling and add output debug log in comfy workflows

* Refactor Comfy generation result

* Add video file extensions constant
2025-06-25 20:11:09 +03:00
Cohee 9e6fbde3cf Webpack: Use cache version scoping in Docker 2025-06-25 10:52:04 +00:00
Cohee 66adbea12b Merge branch 'release' into staging 2025-06-25 10:39:14 +00:00
Cohee 12a54d901e WI: exclude characterFilter fields from new entry template 2025-06-25 10:38:08 +00:00
Cohee d641089107 Merge pull request #4199 from GregW6/fix/file-attachment-1
Fix attachment file extension extraction
2025-06-25 00:21:04 +03:00
Cohee f8d7a3e853 Verify if passed a jimp instance to applyAvatarCropResize 2025-06-24 23:38:25 +03:00
GregW6 9bfb4163d3 refactor(Attachment): ♻️ Simplify extension extraction to one line
Removing temporary variable.
2025-06-25 02:27:00 +07:00
GregW6 4785d7580c fix(Attachment): 🐛 Extract file attachment extension through file name 2025-06-24 22:03:11 +07:00
Cohee f30cc04e9e Fix npm audit in tests 2025-06-24 12:59:54 +00:00
Cohee dc533b5ae8 Merge branch 'release' into staging 2025-06-24 12:59:18 +00:00
Cohee 06db0c15db Scope webpack cache by version 2025-06-24 12:58:43 +00:00
Cohee 5b96dc3547 Scope webpack cache by version 2025-06-24 12:54:39 +00:00
qvink b37b4d0357 removing zh-tw translations specific to the qvink memory extension 2025-06-23 15:12:01 -06:00
02lokaandCohee e3923a7be3 Fixed minor avatar cropping bug in avatars.js (#4192)
* Fixed avatar cropping bug in avatars.js

Persona icons/profile pictures were forced to a 2:3 ratio despite "Never resize avatars" being enabled.

Moved a misplaced line of code inside the crop condition to fix this behavior.

* Fix indentation for ESLint compliance

**Attempted** to correct indentation on line 49 of avatars.js to pass ESLint check.

* Update avatars.js

Gave my best to fix it :(

At the very least the issue is known now.

* Update avatars.js

Removed empty characters (formatting)

* Fixed avatars.js

Fixed the issue of avatar's not changing after my recent revision.

* Update avatars.js

Accidentally left a duplicate line; removed it now

* Extract reusable function for avatar resize

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2025-06-23 23:09:54 +03:00
Cohee 2b7c0a3d37 Extensions: Check if directory is a repo root before updating/getting status 2025-06-23 22:03:41 +03:00
Cohee f84d5a037e Merge pull request #4193 from henk717/staging
KoboldAI Instruct format preset
2025-06-23 20:47:34 +03:00
Henk 42eb25dcd0 KoboldAI Instruct format preset 2025-06-23 18:56:08 +02:00
Cohee 0fa1b26fa4 Add deletion control for attached videos 2025-06-23 01:01:44 +03:00
Cohee b357e5d25e Add video preview to clean-up dialog 2025-06-23 00:39:21 +03:00
Cohee 2a1d07c46a Don't treat attached videos as unused files 2025-06-23 00:16:44 +03:00
Cohee 0599b91609 Pass yaml library to frontend 2025-06-22 23:37:44 +03:00
Cohee ebfd8a2256 Fix "Test Message" font size 2025-06-22 23:36:21 +03:00
Cohee 5ea2c48bf8 Allow message swipe gens with image attachments (#4184)
* Allow message swipe gens with image attachments

* Replace JSON.parse with structuredClone
2025-06-22 20:55:54 +03:00
Cohee 9481f9989a Closes #4187 [FEATURE_REQUEST] Allow wildcards in Banned Strings List 2025-06-22 20:35:46 +03:00
Cohee 50cd88c5dc Ollama: deprecate Mirostat params
Closes #4188
2025-06-22 18:39:28 +03:00
153 changed files with 6737 additions and 6414 deletions
+1
View File
@@ -14,3 +14,4 @@ access.log
.DS_Store
/public/scripts/extensions/third-party
/colab
.gemini
+10
View File
@@ -0,0 +1,10 @@
have_fun: true
code_review:
disable: false
comment_severity_threshold: HIGH
max_review_comments: -1
pull_request_opened:
help: false
summary: false
code_review: false
ignore_patterns: []
+12 -301
View File
@@ -1,6 +1,5 @@
> [!IMPORTANT]
> Die hier veröffentlichten Informationen sind möglicherweise veraltet oder unvollständig. Für aktuelle Informationen nutzen Sie bitte die englische Version.
> Letztes Update dieser README: 28.9.2024
<a name="readme-top"></a>
@@ -11,7 +10,7 @@
[English](readme.md) | German | [中文](readme-zh_cn.md) | [繁體中文](readme-zh_tw.md) | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md) | [한국어](readme-ko_kr.md)
[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/forks)
[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues)
[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls)
@@ -27,7 +26,7 @@ Wir haben eine [Dokumentationswebsite](https://docs.sillytavern.app/), um die me
SillyTavern (oder ST abgekürtz) ist eine lokal installierte Benutzeroberfläche, die es dir ermöglicht, mit Textgenerations-LLMs, Bildgenerierungsmaschinen und TTS-Sprachmodellen zu interagieren.
Angefangen im Februar 2023 als Fork von TavernAI 1.2.8 hat SillyTavern nun über 100 Mitwirkende und 2 Jahre unabhängiger Entwicklung hinter sich und dient weiterhin als führende Software für versierte KI-Hobbyisten.
Angefangen im Februar 2023 als Fork von TavernAI 1.2.8 hat SillyTavern nun über 200 Mitwirkende und 2 Jahre unabhängiger Entwicklung hinter sich und dient weiterhin als führende Software für versierte KI-Hobbyisten.
## Unsere Vision
@@ -35,29 +34,9 @@ Angefangen im Februar 2023 als Fork von TavernAI 1.2.8 hat SillyTavern nun über
2. Wir bieten weder Online- oder gehosteten Dienste an, noch verfolgen wir programmgesteuert Benutzerdaten.
3. SillyTavern ist ein Herzensprojekt, das von einer engagierten Community von LLM-Enthusiasten unterstützt wird, und wird immer kostenlos und Open Source sein.
## Branches
## Brauche ich einen leistungsstarken PC, um SillyTavern auszuführen?
SillyTavern wird mit einem Branchsystem entwickelt, um ein reibungsloses Erlebnis für alle Nutzer zu gewährleisten.
* `release` -🌟 **Empfohlen für die meisten Nutzer.** Dies ist der stabilste und empfohlene Branch, der nur aktualisiert wird, wenn wichtige Versionen veröffentlicht werden. Er ist für die Mehrheit der Nutzer geeignet. Typischerweise einmal im Monat aktualisiert.
* `staging` - ⚠️ **Nicht für den gelegentlichen Gebrauch empfohlen.** Dieser Branch enthält die neuesten Funktionen, kann jedoch jederzeit instabil sein. Nur für Power-User und Enthusiasten. Mehrmals täglich aktualisiert.
Wenn du nicht vertraut mit der Verwendung der git CLI bist oder nicht verstehst, was ein Branch ist, mach dir keine Sorgen! Der Release-Branch ist immer die bevorzugte Option für dich.
## Was brauche ich zusätzlich zu SillyTavern?
Da SillyTavern nur eine Benutzeroberfläche ist, benötigst du Zugriff auf ein LLM-Backend, um Inferenz bereitzustellen. Du kannst AI Horde für sofortiges Chatten ohne weitere Einrichtung verwenden. Darüber hinaus unterstützen wir viele andere lokale und cloudbasierte LLM-Backends: OpenAI-kompatible API, KoboldAI, Tabby und viele mehr. Du kannst mehr über unsere unterstützten APIs in [der FAQ](https://docs.sillytavern.app/usage/api-connections/) lesen.
### Brauche ich einen leistungsstarken PC, um SillyTavern auszuführen?
Die Hardwareanforderungen sind minimal: Es läuft auf allem, was NodeJS 18 oder höher ausführen kann. Wenn du LLM-Inferenz auf deinem lokalen Rechner durchführen möchtest, empfehlen wir eine NVIDIA-Grafikkarte der 3000er-Serie mit mindestens 6 GB VRAM. Überprüfe die Dokumentation deines Backends für weitere Einzelheiten.
### Vorgeschlagene Backends (keine Partnerschaft oder Werbebeziehung)
* [AI Horde](https://aihorde.net/) - verwende Modelle, die von Freiwilligen gehostet werden. Erfordert keine weitere Einrichtung
* [KoboldCpp](https://github.com/LostRuins/koboldcpp) - ein Favorit der Community, um GGUF-Modelle lokal auszuführen
* [tabbyAPI](https://github.com/theroyallab/tabbyAPI) - eine beliebte, portable, speicherplatzoptimierte und lokal gehostete exl2 Inferenz-API
* [OpenRouter](https://openrouter.ai) - eine einzige API für viele Cloud-Anbieter (OpenAI, Claude, Meta Llama usw.) sowie beliebte Community-Modelle.
Die Hardwareanforderungen sind minimal: Es läuft auf allem, was NodeJS 18 oder höher ausführen kann. Wenn du LLM-Inferenz auf deinem lokalen Rechner durchführen möchtest, empfehlen wir eine NVIDIA-Grafikkarte der 3000er-Serie mit mindestens 6 GB VRAM, aber die tatsächlichen Anforderungen können je nach Modell und Backend, das du verwendest, variieren.
## Fragen oder Vorschläge?
@@ -83,287 +62,18 @@ Oder nimm direkt Kontakt mit den Entwicklern auf:
<img width="500" alt="image" src="https://github.com/user-attachments/assets/9b5f32f0-c3b3-4102-b3f5-0e9213c0f50f">
<img width="500" alt="image" src="https://github.com/user-attachments/assets/913fdbaa-7d33-42f1-ae2c-89dca41c53d1">
## Charakterkarten
## Installation
SillyTavern basiert auf dem Konzept der "Charakterkarten". Eine Charakterkarte ist eine Sammlung von Prompts, die das Verhalten des LLM festlegen und erforderlich sind, um persistente Gespräche in SillyTavern zu führen. Sie funktionieren ähnlich wie ChatGPT's GPTs oder Poe's Bots. Der Inhalt einer Charakterkarte kann alles sein: ein abstraktes Szenario, ein Assistent, der für eine bestimmte Aufgabe maßgeschneidert ist, eine berühmte Persönlichkeit oder ein fiktiver Charakter.
Für detaillierte Installationsanweisungen besuche bitte unsere Dokumentation:
Das Namensfeld ist der einzige erforderliche Eingabewert für die Charakterkarte. Um ein neutrales Gespräch mit dem LLM zu beginnen, erstelle eine neue Karte, die einfach "Assistent" genannt wird, und lasse die restlichen Felder leer. Für einen thematischeren Chat kannst du dem LLM verschiedene Hintergrundinformationen, Verhaltensweisen und Schreibmuster sowie ein Szenario geben, um das Gespräch zu beginnen.
Um ein schnelles Gespräch zu führen, ohne eine Charakterkarte auszuwählen, oder um einfach die LLM-Verbindung zu testen, gib einfach dein Prompt in die Eingabezeile auf dem Willkommensbildschirm ein, nachdem du SillyTavern geöffnet hast. Bitte beachte, dass solche Chats vorübergehend sind und nicht gespeichert werden.
Um eine allgemeine Vorstellung davon zu bekommen, wie man Charakterkarten definiert, sieh dir die mitgelieferte Charakterkarte (Seraphina) an oder lade ausgewählte von der Community erstellte Karten im Menü "Erweiterungen & Assets herunterladen" herunter.
## Wichtigste Features
* Erweiterte Text-Generierungs-Einstellungen mit vielen von der Community erstellten mitgelieferten Einstellungen (Presets)
* Unterstützung für World Info: Erstelle reichhaltige Lore oder reduziere die Tokens in deiner Charakterkarte
* Gruppenchats: Multi-Bot-Räume für Charaktere, die mit dir und/oder untereinander sprechen
* Reichhaltige UI-Anpassungsoptionen: Themes zur Farbenwahl, Hintergrundbilder, benutzerdefiniertes CSS und mehr
* Benutzer-Personas: Lass die KI ein wenig über dich wissen, um die Immersion zu erhöhen
* Eingebaute RAG-Unterstützung: Füge Dokumente zu deinen Chats hinzu, auf die die KI verweisen kann
* Umfangreiches "Chat-Befehle"-System und eigene [Scripting-Engine](https://docs.sillytavern.app/usage/st-script/)
## Erweiterungen
SillyTavern unterstützt Erweiterungen.
* Emotionale Ausdrucksformen von Charakteren (Sprites)
* Automatische Zusammenfassung des Chatverlaufs
* Automatische UI- und Chat-Übersetzung
* Bildgenerierung mit Stable Diffusion/FLUX/DALL-E
* Text-to-Speech für KI-Antwortnachrichten (über ElevenLabs, Silero oder die TTS-Funktion des Betriebssystems)
* Websuchfunktionen zum Hinzufügen zusätzlicher realer Kontexte zu deinen Eingabeaufforderungen
* Viele weitere sind im Menü "Erweiterungen & Assets herunterladen" verfügbar.
Tutorials zur Nutzung findest du in der [Dokumentation](https://docs.sillytavern.app/).
# ⌛ Installation
> \[!WARNING]
>
> * INSTALLIERE NICHT IN EINEM VON WINDOWS KONTROLLIERTEN ORDNER (Programme, System32 usw.).
> * FÜHRE START.BAT NICHT MIT ADMIN-BERECHTIGUNGEN AUS.
> * DIE INSTALLATION AUF WINDOWS 7 IST UNMÖGLICH, DA ES NODEJS 18.16 NICHT AUSFÜHREN KANN.
## 🪟 Windows
### Installation über Git
1. Installiere [NodeJS](https://nodejs.org/en) (die neueste LTS-Version wird empfohlen).
2. Installiere [Git für Windows](https://gitforwindows.org/).
3. Öffne den Windows-Explorer (`Win+E`).
4. Gehe zu oder erstelle einen Ordner, der nicht von Windows kontrolliert oder überwacht wird. (z.B.: C:\MySpecialFolder\)
5. Öffne ein Eingabeaufforderungsfenster in diesem Ordner, indem du in die 'Adressleiste' oben klickst, `cmd` eingibst und Enter drückst.
6. Sobald das schwarze Fenster (Eingabeaufforderung) erscheint, gib EINE der folgenden Optionen ein und drücke Enter:
* für den Release-Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release`
* für den Staging-Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
7. Sobald alles geklont ist, doppelklicke auf `Start.bat`, damit NodeJS seine Anforderungen installiert.
8. Der Server wird dann gestartet, und SillyTavern wird in deinem Browser geöffnet.
### Installation über GitHub Desktop
(Dies ermöglicht die Nutzung von git **nur** in GitHub Desktop. Wenn du `git` auch in der Eingabeaufforderung verwenden möchtest, musst du auch [Git für Windows](https://gitforwindows.org/) installieren.)
1. Installiere [NodeJS](https://nodejs.org/en) (die neueste LTS-Version wird empfohlen).
2. Installiere [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32).
3. Klicke nach der Installation von GitHub Desktop auf `Ein Repository aus dem Internet klonen....` (Hinweis: Du **musst kein** GitHub-Konto für diesen Schritt erstellen).
4. Klicke im Menü auf den Tab URL, gib diese URL ein `https://github.com/SillyTavern/SillyTavern` und klicke auf Klonen. Du kannst den lokalen Pfad ändern, um festzulegen, wohin SillyTavern heruntergeladen werden soll.
5. Um SillyTavern zu öffnen, durchsuche mit dem Windows-Explorer den Ordner, in den du das Repository geklont hast. Standardmäßig wird das Repository hier hin geklont: `C:\Users\[Dein Windows-Benutzername]\Documents\GitHub\SillyTavern`.
6. Doppelklicke auf die Datei `start.bat`. (Hinweis: Der Teil `.bat` des Dateinamens könnte von deinem Betriebssystem verborgen sein. In diesem Fall sieht es aus wie eine Datei namens "`Start`". Dies ist die Datei, auf die du doppelklickst, um SillyTavern auszuführen.)
7. Nach dem Doppelklicken sollte ein großes schwarzes Konsolenfenster erscheinen, und SillyTavern beginnt, das zu installieren, was es zum Betrieb benötigt.
8. Nach dem Installationsprozess sollte das Konsolenfenster so aussehen, und ein SillyTavern-Tab sollte in deinem Browser geöffnet sein.
9. Verbinde dich mit einer der [unterstützten APIs](https://docs.sillytavern.app/usage/api-connections/) und beginne zu chatten!
## 🐧 Linux & 🍎 MacOS
Für MacOS/Linux werden all diese Schritte in einem Terminal durchgeführt.
1. Installiere git und nodeJS (die Methode zur Durchführung hängt von deinem Betriebssystem ab).
2. Klone das Repository.
* für den Release-Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release`
* für den Staging-Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
3. `cd SillyTavern`, um in den Installationsordner zu navigieren.
4. Führe das Skript `start.sh` mit einem dieser Befehle aus:
* `./start.sh`
* `bash start.sh`
## ⚡ Installation über SillyTavern Launcher
Der SillyTavern Launcher ist ein Installationsassistent, der dir bei der Einrichtung mit vielen Optionen helfen wird, einschließlich der Installation eines Backends für lokale Inferenz.
### Für Windows-Nutzer
1. Drücke auf deiner Tastatur **`WINDOWS + R`**, um das Ausführen-Dialogfeld zu öffnen. Führe dann den folgenden Befehl aus, um git zu installieren:
```shell
cmd /c winget install -e --id Git.Git
```
2. Drücke auf deiner Tastatur **`WINDOWS + E`**, um den Datei-Explorer zu öffnen, und navigiere dann zu dem Ordner, in dem du den Launcher installieren möchtest. Gib im gewünschten Ordner in die Adressleiste `cmd` ein und drücke Enter. Führe dann den folgenden Befehl aus:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher && start installer.bat
```
### Für Linux-Nutzer
1. Öffne dein bevorzugtes Terminal und installiere git.
2. Klone den SillyTavern-Launcher mit:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
3. Starte die installer.sh mit:
```shell
chmod +x install.sh && ./install.sh
```
4. Nach der Installation starte die launcher.sh mit:
```shell
chmod +x launcher.sh && ./launcher.sh
```
### Für Mac-Nutzer
1. Öffne ein Terminal und installiere brew mit:
```shell
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
```
2. Installiere git mit:
```shell
brew install git
```
3. Klone den SillyTavern-Launcher mit:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
4. Starte die installer.sh mit:
```shell
chmod +x install.sh && ./install.sh
```
5. Nach der Installation starte die launcher.sh mit:
```shell
chmod +x launcher.sh && ./launcher.sh
```
## 🐋 Installation über Docker
Diese Anweisungen setzen voraus, dass du Docker installiert hast, auf deine Befehlszeile für die Installation von Containern zugreifen kannst und mit deren allgemeiner Funktionsweise vertraut bist.
### Image selbst bauen
Wir haben einen umfassenden Leitfaden zur Nutzung von SillyTavern in Docker [hier](http://docs.sillytavern.app/installation/docker/) der die Installationen auf Windows, macOS und Linux abdeckt! Lies ihn, wenn du das Image selbst bauen möchtest.
### Verwendung der GitHub Container Registry (am einfachsten)
Du benötigst zwei zwingende Verzeichniszuordnungen und eine Portzuordnung, um SillyTavern funktionsfähig zu machen. Ersetze in dem Befehl deine Auswahl an den folgenden Stellen:
#### Container-Variablen
##### Volumen-Zuordnungen
* [config] - Das Verzeichnis, in dem die SillyTavern-Konfigurationsdateien auf deinem Host-Computer gespeichert werden
* [data] - Das Verzeichnis, in dem die Benutzerdaten von SillyTavern (einschließlich Charaktere) auf deinem Host-Computer gespeichert werden
* [plugins] - (optional) Das Verzeichnis, in dem die SillyTavern-Server-Plugins auf deinem Host-Computer gespeichert werden
##### Port-Zuordnungen
* [PublicPort] - Der Port, über den der Datenverkehr ausgegeben werden soll. Dies ist zwingend erforderlich, da du auf die Instanz von außerhalb des virtuellen Maschinencontainers zugreifst. EXPOSIERE DIES NICHT IM INTERNET, OHNE EINEN GETRENNTEN SERVICE FÜR DIE SICHERHEIT ZU IMPLEMENTIEREN.
##### Zusätzliche Einstellungen
* [DockerNet] - Das Docker-Netzwerk, mit dem der Container erstellt werden soll. Wenn du nicht weißt, was das ist, sieh dir die [offizielle Docker-Dokumentation](https://docs.docker.com/reference/cli/docker/network/) an.
* [version] - Auf der rechten Seite dieser GitHub-Seite siehst du "Packages". Wähle das Paket "sillytavern" und du siehst die Imageversionen. Das Image-Tag "latest" hält dich auf dem Laufenden mit dem aktuellen Release. Du kannst auch "staging" und "release" Tags nutzen, die auf die nightly images der jeweiligen Branche verweisen, aber das könnte unangemessen sein, wenn du Erweiterungen verwendest, die möglicherweise kaputt sind und Zeit benötigen, um aktualisiert zu werden.
#### Installationsbefehl
1. Öffne deine Befehlszeile.
2. Führe den folgenden Befehl aus:
`docker create --name='sillytavern' --net='[DockerNet]' -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
> Beachte, dass 8000 ein Standard-Listening-Port ist. Vergiss nicht, einen geeigneten Port zu verwenden, wenn du ihn in der Konfiguration änderst.
## 📱 Installation über Termux auf Android OS
> \[!HINWEIS]
> **SillyTavern kann nativ auf Android-Geräten über Termux ausgeführt werden, aber wir bieten keine offizielle Unterstützung für diesen Anwendungsfall.**
>
> **Bitte beziehe dich auf diesen Leitfaden von ArroganceComplex#2659:**
>
> * <https://rentry.org/STAI-Termux>
**Nicht unterstützte Plattform: android arm LEtime-web.** 32-Bit-Android benötigt eine externe Abhängigkeit, die nicht mit npm installiert werden kann. Verwende den folgenden Befehl, um sie zu installieren: `pkg install esbuild`. Führe dann die üblichen Installationsschritte aus.
## API-Schlüsselverwaltung
SillyTavern speichert deine API-Schlüssel in einer Datei `secrets.json` im Benutzerdatenverzeichnis (`/data/default-user/secrets.json` ist der Standardpfad).
Standardmäßig sind API-Schlüssel nach dem Speichern und Aktualisieren der Seite nicht mehr über die Benutzeroberfläche sichtbar.
Um die Ansicht deiner Schlüssel zu aktivieren:
1. Setze den Wert von `allowKeysExposure` auf `true` in der Datei `config.yaml`.
2. Starte den SillyTavern-Server neu.
3. Klicke auf den Link 'Verborgene API-Schlüssel anzeigen' in der unteren rechten Ecke des API-Verbindungsfeldes.
## Befehlszeilenargumente
Sie können Befehlszeilenargumente an den Start des SillyTavern-Servers übergeben, um einige Einstellungen in `config.yaml` zu überschreiben.
### Beispiele
```shell
node server.js --port 8000 --listen false
# oder
npm run start -- --port 8000 --listen false
# oder (nur Windows)
Start.bat --port 8000 --listen false
```
### Unterstützte Argumente
| Option | Beschreibung | Typ |
|----------------------------------|--------------------------------------------------------------------------------------------------|----------|
| `--version` | Versionsnummer anzeigen | boolean |
| `--enableIPv6` | Aktiviert IPv6. | boolean |
| `--enableIPv4` | Aktiviert IPv4. | boolean |
| `--port` | Legt den Port fest, unter dem SillyTavern ausgeführt wird. | number |
| `--dnsPreferIPv6` | Bevorzugt IPv6 für DNS. Wenn nicht angegeben. | boolean |
| `--browserLaunchEnabled` | Startet SillyTavern automatisch im Browser. | boolean |
| `--browserLaunchHostname` | Der Autorun-Hostname, am besten auf „auto" belassen. | string |
| `--browserLaunchPort` | Überschreibt den Port für Autorun. | string |
| `--browserLaunchAvoidLocalhost` | Vermeidet die Verwendung von „localhost" für Autorun im Auto-Modus. | boolean |
| `--listen` | SillyTavern lauscht auf allen Netzwerkschnittstellen. | boolean |
| `--corsProxy` | Aktiviert CORS-Proxy. Wenn nicht angegeben. | boolean |
| `--disableCsrf` | Deaktiviert CSRF-Schutz | boolean |
| `--ssl` | Aktiviert SSL | boolean |
| `--certPath` | Pfad zu Ihrer Zertifikatsdatei. | string |
| `--keyPath` | Pfad zu Ihrer privaten Schlüsseldatei. | string |
| `--whitelist` | Aktiviert den Whitelist-Modus | boolean |
| `--dataRoot` | Stammverzeichnis für Datenspeicherung | string |
| `--basicAuthMode` | Aktiviert die grundlegende Authentifizierung | boolean |
| `--requestProxyEnabled` | Aktiviert die Verwendung eines Proxys für ausgehende Anfragen | boolean |
| `--requestProxyUrl` | Proxy-URL anfordern (HTTP- oder SOCKS-Protokolle) | string |
| `--requestProxyBypass` | Proxy-Bypass-Liste anfordern (durch Leerzeichen getrennte Liste von Hosts) | Array |
## Remoteverbindungen
Dies ist in den meisten Fällen für Personen gedacht, die SillyTavern auf ihren Mobiltelefonen verwenden möchten, während ihr PC den ST-Server im selben WLAN-Netzwerk betreibt. Es kann jedoch auch verwendet werden, um Remoteverbindungen von überall her zu ermöglichen.
Lies die ausführliche Anleitung zum Einrichten von Remoteverbindungen in den [Docs](https://docs.sillytavern.app/usage/remoteconnections/).
Möglicherweise möchtest du SillyTavern-Benutzerprofile auch mit (optionalem) Kennwortschutz konfigurieren: [Benutzer](https://docs.sillytavern.app/installation/st-1.12.0-migration-guide/#users).
## Leistungsprobleme?
1. Deaktiviere den Unschärfeeffekt und aktiviere "Verringerte Bewegung" im Bedienfeld "Benutzereinstellungen" (UI-Design schaltet Kategorie um).
2. Wenn du Response Streaming verwendest, stelle die Streaming-FPS auf einen niedrigeren Wert ein (10-15 FPS werden empfohlen).
3. Stelle sicher, dass der Browser die GPU-Beschleunigung zum Rendern verwenden kann.
* **[Windows Installationsanleitung](https://docs.sillytavern.app/installation/windows/)**
* **[MacOS/Linux Installationsanleitung](https://docs.sillytavern.app/installation/linuxmacos/)**
* **[Android (Termux) Installationsanleitung](https://docs.sillytavern.app/installation/android-(termux)/)**
* **[Docker Installationsanleitung](https://docs.sillytavern.app/installation/docker/)**
## Lizenz und Danksagungen
**Dieses Programm wird in der Hoffnung verbreitet, dass es nützlich ist,
aber OHNE JEGLICHE GARANTIE; nicht einmal die stillschweigende Garantie der
MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Siehe die
GNU Affero General Public License für weitere Details.**
**Dieses Programm wird in der Hoffnung verbreitet, dass es nützlich ist, aber OHNE JEGLICHE GARANTIE; nicht einmal die stillschweigende Garantie der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. Siehe die GNU Affero General Public License für weitere Details.**
* [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 von Humi: MIT-Lizenz
* Teile von CncAnons TavernAITurbo-Mod werden mit Genehmigung verwendet
@@ -372,6 +82,7 @@ GNU Affero General Public License für weitere Details.**
* Symboldesign von Font Awesome <https://fontawesome.com> (Symbole: CC BY 4.0, Schriftarten: SIL OFL 1.1, Code: MIT-Lizenz)
* Standardinhalt von @OtisAlejandro (Seraphina-Charakter und Lorebook) und @kallmeflocc (10.000 Discord-Benutzer-Feierhintergrund)
* Docker-Anleitung von [@mrguymiah](https://github.com/mrguymiah) und [@Bronya-Rand](https://github.com/Bronya-Rand)
* kokoro-js library by [@hexgrad](https://github.com/hexgrad) (Apache-2.0 License)
## Top Contributors
+50 -286
View File
@@ -1,6 +1,8 @@
> [!IMPORTANT]
> ここに掲載されている情報は、古かったり不完全であったりする可能性があります。最新の情報は英語版をご利用ください。
<a name="readme-top"></a>
![][cover]
<div align="center">
@@ -8,7 +10,7 @@
[English](readme.md) | [German](readme-de_de.md) | [中文](readme-zh_cn.md) | [繁體中文](readme-zh_tw.md) | 日本語 | [Русский](readme-ru_ru.md) | [한국어](readme-ko_kr.md)
[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/forks)
[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues)
[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls)
@@ -16,315 +18,77 @@
---
モバイルデバイスにも適したレイアウト・マルチAPI(KoboldAI/CPP、Horde、NovelAI、Ooba、OpenAI、OpenRouter、Claude、Scale)、VN ライクな Waifu モード、Stable Diffusion、TTS、WorldInfo(伝承本)、カスタマイズ可能なUI、自動翻訳、大量のプロンプトオプション+サードパーティの拡張機能をインストールする機能
SillyTavernは、多くのLLM API(KoboldAI/CPP、Horde、NovelAI、Ooba、Tabby、OpenAI、OpenRouter、Claude、Mistralなど)に対応した統一インターフェース、モバイルフレンドリーなレイアウト、ビジュアルノベルモード、Automatic1111 & ComfyUI API画像生成連携、TTS、WorldInfo(伝承本)、カスタマイズ可能なUI、自動翻訳、必要以上に豊富なプロンプトオプション、そしてサードパーティ製拡張機能による無限の成長可能性を提供します。
[TavernAI](https://github.com/TavernAI/TavernAI) v.1.2.8 のフォークに基づいています。
私たちは[ドキュメントウェブサイト](https://docs.sillytavern.app/)を用意しており、ほとんどの質問に答え、入門の手助けをします。
## 重要事項
## SillyTavernとは?
1. 私たちは[ドキュメントウェブサイト](https://docs.sillytavern.app/) を作成し、ほとんどの質問にお答えしています。
SillyTavern(略してST)は、テキスト生成LLM、画像生成エンジン、TTS音声モデルと対話するための、ローカルにインストールされるユーザーインターフェースです。
2. アップデートしたら使っていた拡張機能を見失いましたか?リリースバージョン 1.10.6 以降、これまで内蔵されていた拡張機能のほとんどがダウンロード可能なアドオンに変更されました。ダウンロードは、拡張機能パネル(トップバーのスタックドブロックアイコン)にある内蔵の "Download Extensions and Assets" メニューから行えます。
2023年2月にTavernAI 1.2.8のフォークとして始まり、SillyTavernは現在200人以上の貢献者と2年間の独立した開発を経て、知識豊富なAI愛好家のための主要なソフトウェアとして機能し続けています。
### Cohee、RossAscends、SillyTavern コミュニティがお届けします
## 私たちのビジョン
### SillyTavern または TavernAI とは何ですか?
1. 私たちは、ユーザーにできるだけ多くの実用性とLLMプロンプトの制御権限を与えることを目指しています。急な学習曲線も楽しみの一部です!
2. 私たちはオンラインサービスやホストされたサービスを提供せず、プログラム的にユーザーデータを追跡することもありません。
3. SillyTavernは、熱心なLLM愛好家のコミュニティによってもたらされた情熱的なプロジェクトであり、常に無料でオープンソースです。
SillyTavern は、あなたのコンピュータ(および Android スマホ)にインストールできるユーザーインターフェイスで、テキスト生成 AI と対話したり、あなたやコミュニティが作成したキャラクターとチャットやロールプレイをすることができます。
## SillyTavernを実行するには強力なPCが必要ですか?
SillyTavern は TavernAI 1.2.8 のフォークで、より活発な開発が行われており、多くの主要な機能が追加されています。現時点では、これらは完全に独立したプログラムと考えることができます。
ハードウェア要件は最小限です。NodeJS 18以上を実行できるものであれば何でも動作します。ローカルマシンでLLM推論を行う場合は、少なくとも6GBのVRAMを搭載した3000シリーズのNVIDIAグラフィックスカードを推奨しますが、実際の要件は使用するモデルやバックエンドによって異なる場合があります。
### ブランチ
## 質問や提案はありますか?
SillyTavern は、すべてのユーザーにスムーズな体験を保証するために、2 つのブランチシステムを使用して開発されています。
### Discordサーバー
* release -🌟 **ほとんどのユーザーにお勧め。** これは最も安定した推奨ブランチで、メジャーリリースがプッシュされた時のみ更新されます。大半のユーザーに適しています。
* staging - ⚠️ **カジュアルな使用にはお勧めしない。** このブランチには最新の機能がありますが、いつ壊れるかわからないので注意してください。パワーユーザーとマニア向けです。
| [![][discord-shield-badge]][discord-link] | [私たちのDiscordコミュニティに参加してください!](https://discord.gg/sillytavern) サポートを受けたり、お気に入りのキャラクターやプロンプトを共有したりできます。 |
| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------- |
git CLI の使い方に慣れていなかったり、ブランチが何なのかわからなかったりしても、心配はいりません!releaseブランチが良い選択肢となります。
または、開発者に直接連絡してください:
### Tavern 以外に何が必要ですか?
* Discord: cohee, rossascends, wolfsblvt
* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/), [/u/sillylossy](https://www.reddit.com/user/sillylossy/), [u/Wolfsblvt](https://www.reddit.com/user/Wolfsblvt/)
* [GitHub issueを投稿](https://github.com/SillyTavern/SillyTavern/issues)
Tavern は単なるユーザーインターフェイスなので、それだけでは何もできません。ロールプレイキャラクターとして機能する AI システムのバックエンドにアクセスする必要があります。様々なバックエンドがサポートされています。リストはこちらです: OpenAPI API (GPT)、KoboldAI (ローカルまたは Google Colab 上で動作)、その他。詳しくは [FAQ](https://docs.sillytavern.app/usage/faq/) をご覧ください。
### このプロジェクトが気に入りました!どうすれば貢献できますか?
### Tavern を実行するには、ハイスペックなPCが必要ですか?
Tavern は単なるフロントエンドのUIであり、必要なハードウェアはごくわずかです。パワフルである必要があるのは、AI システムのバックエンドです。
## モバイルサポート
> **注**
> **このフォークは Termux を使って Android スマホで実行できます。ArroganceComplex#2659 のガイドを参照してください:**
<https://rentry.org/STAI-Termux>
## ご質問やご提案
### コミュニティ Discord サーバーを開設しました
サポートを受けたり、作成したキャラを共有したり、コミュニティの作ったキャラと遊びたいですか?:
### [参加](https://discord.gg/RZdyAEUPvj)
***
開発者と直接連絡:
* Discord: cohee または rossascends
* Reddit: /u/RossAscends または /u/sillylossy
* [GitHub issue を投稿](https://github.com/SillyTavern/SillyTavern/issues)
## このバージョンには以下のコードが含まれます
* 大幅に修正された TavernAI 1.2.8 (コードの 50% 以上が書き換えまたは最適化されています)
* スワイプ
* グループチャット: キャラクター同士が会話できるマルチボットルーム
* チャットチェックポイント / ブランチ
* 高度なKoboldAI / TextGen生成設定と、コミュニティが作成した多くのプリセット
* ワールド情報サポート: 豊富な伝承を作成したり、キャラクターカードにトークンを保存したりできます
* [OpenRouter](https://openrouter.ai) 各種 API(Claude、GPT-4/3.5 など)の接続
* [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui) API 接続
* [AI Horde](https://aihorde.net/) 接続
* プロンプト生成フォーマットの調整
## 拡張機能
SillyTavern は拡張できるようになっており。
* キャラクターの感情表現(スプライト)
* チャット履歴の自動サマリー
* チャットに画像を送り、AI が内容を解釈する
* Stable Diffusion 画像生成 (5 つのチャット関連プリセットと 'free mode')
* AI 応答メッセージの音声合成(ElevenLabs、Silero、または OS のシステム TTS 経由)
含まれている拡張機能の完全なリストとその使い方のチュートリアルは [Docs](https://docs.sillytavern.app/) にあります。
## RossAscends による UI/CSS/クオリティオブライフの調整
* iOS 用に最適化されたモバイル UI で、ホーム画面へのショートカット保存とフルスクリーンモードでの起動をサポート。
* ホットキー
* Up = チャットの最後のメッセージを編集する
* Ctrl+Up = チャットで最後のユーザーメッセージを編集する
* Left = 左スワイプ
* Right = 右スワイプ (注: チャットバーに何か入力されている場合、スワイプホットキーが無効になります)
* Ctrl+Left = ローカルに保存された変数を見る(ブラウザのコンソールウィンドウにて)
* Enter (チャットバー選択時) = AI にメッセージを送る
* Ctrl+Enter = 最後の AIのレスポンスを再生成する
* ユーザー名の変更と文字の削除でページが更新されなくなりました。
* ページロード時に API に自動的に接続するかどうかを切り替えます。
* ページの読み込み時に、最近見た文字を自動的に読み込むかどうかを切り替えます。
* より良いトークンカウンター - 保存されていないキャラクターに対して機能し、永続的なトークンと一時的なトークンの両方を表示する。
* より良い過去のチャット
* 新しいチャットのファイル名は、"(文字) - (作成日)" という読みやすい形式で保存されます
* チャットのプレビューが 40 文字から 300 文字に増加。
* 文字リストの並べ替えに複数のオプション(名前順、作成日順、チャットサイズ順)があります。
* デフォルトでは、左右の設定パネルはクリックすると閉じます。
* ナビパネルのロックをクリックすると、パネルが開いたままになり、この設定はセッションをまたいで記憶されます。
* ナビパネルの開閉状態もセッションをまたいで保存されます。
* カスタマイズ可能なチャット UI:
* 新しいメッセージが届いたときにサウンドを再生する
* 丸型、長方形のアバタースタイルの切り替え
* デスクトップのチャットウィンドウを広くする
* オプションの半透明ガラス風パネル
* 'メインテキスト'、'引用テキスト'、'斜体テキスト'のページカラーをカスタマイズ可能。
* カスタマイズ可能な UI 背景色とぼかし量
## インストール
*注: このソフトウェアはローカルにインストールすることを目的としており、colab や他のクラウドノートブックサービス上では十分にテストされていません。*
> **警告**
> WINDOWS が管理しているフォルダ(Program Files、System32 など)にはインストールしないでください
> START.BAT を管理者権限で実行しないでください
### Windows
Git 経由でのインストール(更新を容易にするため推奨)
写真付きのわかりやすいガイドはこちらです:
<https://docs.sillytavern.app/installation/windows/>
1. [NodeJS](https://nodejs.org/en) をインストール(最新の LTS 版を推奨)
2. [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32) をインストールする
3. Windows エクスプローラーを開く (`Win+E`)
4. Windows によって制御または監視されていないフォルダを参照または作成する。(例: C:\MySpecialFolder\)
5. 上部のアドレスバーをクリックし、`cmd` と入力して Enter キーを押し、そのフォルダーの中にコマンドプロンプトを開きます。
6. 黒いボックス(コマンドプロンプト)がポップアップしたら、そこに以下のいずれかを入力し、Enter を押します:
* Release ブランチの場合: `git clone https://github.com/SillyTavern/SillyTavern -b release`
* Staging ブランチの場合: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
7. すべてをクローンしたら、`Start.bat` をダブルクリックして、NodeJS に要件をインストールさせる。
8. サーバーが起動し、SillyTavern がブラウザにポップアップ表示されます。
ZIP ダウンロードによるインストール(推奨しない)
1. [NodeJS](https://nodejs.org/en) をインストールする(最新の LTS 版を推奨)
2. GitHub のリポジトリから zip をダウンロードする。(`ソースコード(zip)` は [Releases](https://github.com/SillyTavern/SillyTavern/releases/latest) から入手)
3. お好きなフォルダに解凍してください
4. `Start.bat` をダブルクリックまたはコマンドラインで実行する。
5. サーバーが準備できれば、ブラウザのタブを開きます。
### Linux
1. `node -v` を実行して、Node.js v18 以上(最新の [LTS バージョン](https://nodejs.org/en/download/) を推奨)がインストールされていることを確認してください。
または、[Node Version Manager](https://github.com/nvm-sh/nvm#installing-and-updating) スクリプトを使用して、迅速かつ簡単に Node のインストールを管理します。
2. `start.sh` スクリプトを実行する。
3. お楽しみください。
## API キー管理
SillyTavern は API キーをサーバーディレクトリの `secrets.json` ファイルに保存します。
デフォルトでは、入力後にページをリロードしても、フロントエンドには表示されません。
API ブロックのボタンをクリックして、キーを閲覧できるようにする:
1. ファイル `config.yaml` で `allowKeysExposure` の値を `true` に設定する。
2. SillyTavern サーバを再起動します。
## リモート接続
SillyTavern をスマホで使用しながら、同じ Wifi ネットワーク上で ST サーバーを PC で実行したい場合に使用します。
しかし、これはどこからでもリモート接続を許可するために使用することができます。
**重要: SillyTavern はシングルユーザーのプログラムなので、ログインすれば誰でもすべてのキャラクターとチャットを見ることができ、UI 内で設定を変更することができます。**
### 1. ホワイトリスト IP の管理
* SillyTavern のベースインストールフォルダ内に `whitelist.txt` という新しいテキストファイルを作成します。
* テキストエディタでこのファイルを開き、接続を許可したい IP のリストを追加します。
*個々の IP とワイルドカード IP 範囲の両方が受け入れられる。例:*
```txt
192.168.0.1
192.168.0.20
```
または
```txt
192.168.0.*
```
(上記のワイルドカード IP 範囲は、ローカルネットワーク上のどのデバイスでも)
CIDR マスクも受け付ける(例:10.0.0.0/24)。
* `whitelist.txt` ファイルを保存する。
* TAI サーバーを再起動する。
これでファイルに指定された IP を持つデバイスが接続できるようになります。
*注: `config.yaml` にも `whitelist` 配列があり、同じように使うことができるが、`whitelist.txt` が存在する場合、この配列は無視される。*
### 2. ST ホストマシンの IP の取得
ホワイトリストの設定後、ST ホストデバイスの IP が必要になります。
ST ホストデバイスが同じ無線 LAN ネットワーク上にある場合、ST ホストの内部無線 LAN IP を使用します:
* Windows の場合: ウィンドウズボタン > 検索バーに `cmd.exe` と入力 > コンソールに `ipconfig` と入力して Enter > `IPv4` のリストを探す。
同じネットワーク上にいない状態で、ホストしているSTに接続したい場合は、STホスト機器のパブリックIPが必要です。
* ST ホストデバイスを使用中に、[このページ](https://whatismyipaddress.com/)にアクセスし、`IPv4` を探してください。これはリモートデバイスからの接続に使用するものです。
### 3. リモートデバイスを ST ホストマシンに接続します。
最終的に使用する IP が何であれ、その IP アドレスとポート番号をリモートデバイスのウェブブラウザに入力します。
同じ無線 LAN ネットワーク上の ST ホストの典型的なアドレスは以下のようになります:
`http://192.168.0.5:8000`
http:// を使用し、https:// は使用しないでください
### ST をすべての IP に開放する
これはお勧めしませんが、`config.yaml` を開き、`whitelistMode` を `false` に変更してください。
SillyTavern のベースインストールフォルダにある `whitelist.txt` が存在する場合は削除(または名前の変更)する必要があります。
これは通常安全ではないので、これを行う際にはユーザー名とパスワードを設定する必要があります。
ユーザー名とパスワードは `config.yaml` で設定します。
ST サーバを再起動すると、ユーザ名とパスワードさえ知っていれば、IP に関係なくどのデバイスでも ST サーバに接続できるようになる。
### まだ接続できませんか?
* `config.yaml` で見つかったポートに対して、インバウンド/アウトバウンドのファイアウォールルールを作成します。これをルーターのポートフォワーディングと間違えないでください。そうしないと、誰かがあなたのチャットログを見つける可能性があり、それはマジで止めましょう。
* 設定 > ネットワークとインターネット > イーサネットで、プライベートネットワークのプロファイルタイプを有効にします。そうしないと、前述のファイアウォールルールを使っても接続できません。
## パフォーマンスに問題がありますか?
ユーザー設定パネルでブラー効果なし(高速 UI)モードを有効にしてみてください。
## このプロジェクトが気に入りました!どうすれば貢献できますか?
### やるべきこと
1. プルリクエストを送る
2. 確立されたテンプレートを使って機能提案と課題レポートを送る
3. 何か質問する前に、readme ファイルや組み込みのドキュメントを読んでください
### やるべきではないこと
1. 金銭の寄付を申し出る
2. 何の脈絡もなくバグ報告を送る
3. すでに何度も回答されている質問をする
## 古い背景画像はどこにありますか?
100% オリジナルコンテンツのみのポリシーに移行しているため、古い背景画像はこのリポジトリから削除されました。
アーカイブはこちら:
<https://files.catbox.moe/1xevnc.zip>
1. プルリクエストを送ってください。貢献する方法については、[CONTRIBUTING.md](../CONTRIBUTING.md)をご覧ください。
2. 提供されたテンプレートを使用して、機能の提案や問題の報告を送ってください。
3. 重複した問題を避けるために、まずこのreadmeファイル全体とドキュメントウェブサイトを確認してください。
## スクリーンショット
<img width="500" alt="image" src="https://github.com/user-attachments/assets/9b5f32f0-c3b3-4102-b3f5-0e9213c0f50f">
<img width="500" alt="image" src="https://github.com/user-attachments/assets/913fdbaa-7d33-42f1-ae2c-89dca41c53d1">
## インストール
詳細なインストール手順については、私たちのドキュメントをご覧ください:
* **[Windowsインストールガイド](https://docs.sillytavern.app/installation/windows/)**
* **[MacOS/Linuxインストールガイド](https://docs.sillytavern.app/installation/linuxmacos/)**
* **[Android (Termux)インストールガイド](https://docs.sillytavern.app/installation/android-(termux)/)**
* **[Dockerインストールガイド](https://docs.sillytavern.app/installation/docker/)**
## ライセンスとクレジット
**このプログラムは有用であることを願って配布されていますが、いかなる保証もありません;
また、商品性または特定目的への適合性についての黙示の保証もありません。
詳細は GNU Affero General Public License をご覧ください。**
**このプログラムは有用であることを期待して配布されていますが、いかなる保証もありません。商品性または特定目的への適合性の黙示の保証さえもありません。詳細はGNU Affero General Public Licenseをご覧ください。**
* Humi によるTAI Base: 不明ライセンス
* Cohee の修正と派生コード: AGPL v3
* RossAscends の追加: AGPL v3
* CncAnon の TavernAITurbo 改造の一部: 不明ライセンス
* kingbri のさまざまなコミットと提案 (<https://github.com/bdashore3>)
* city_unit の拡張機能と様々な QoL 機能 (<https://github.com/city-unit>)
* StefanDanielSchwarz のさまざまなコミットとバグ報告 (<https://github.com/StefanDanielSchwarz>)
* PepperTaco の作品にインスパイアされた Waifu モード (<https:/fugithub.com/peppertaco/Tavern/>)
* ピグマリオン大学の皆さん、素晴らしいテスターとしてクールな機能を提案してくれてありがとう!
* TextGen のプリセットをコンパイルしてくれた obabooga に感謝
* KAI Lite の KoboldAI プリセット: <https://lite.koboldai.net/>
* Google による Noto Sans フォント(OFLライセンス)
* Font Awesome によるアイコンテーマ <https://fontawesome.com> (アイコン: CC BY 4.0、フォント: SIL OFL 1.1、コード: MIT License)
* ZeldaFan0225 による AI Horde クライアントライブラリ: <https://github.com/ZeldaFan0225/ai_horde>
* AlpinDale による Linux 起動スクリプト
* FAQ を提供してくれた paniphons に感謝
* 10K ディスコード・ユーザー記念背景 by @kallmeflocc
* デフォルトコンテンツ(キャラクターと伝承書)の提供: @OtisAlejandro、@RossAscends、@kallmeflocc
* @doloroushyeonse による韓国語翻訳
* k_euler_a による Horde のサポート <https://github.com/Teashrock>
* [@XXpE3](https://github.com/XXpE3) による中国語翻訳、中国語 ISSUES の連絡先は @XXpE3
* [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 by Humi: MITライセンス
* CncAnonのTavernAITurbo modの一部を許可を得て使用
* PepperTacoの作品に触発されたビジュアルノベルモード (<https://github.com/peppertaco/Tavern/>)
* GoogleによるNoto Sansフォント (OFLライセンス)
* Font Awesomeによるアイコンテーマ <https://fontawesome.com> (アイコン: CC BY 4.0, フォント: SIL OFL 1.1, コード: MITライセンス)
* @OtisAlejandroによるデフォルトコンテンツ(Seraphinaキャラクターと伝承本)と@kallmefloccによる10K Discordユーザー記念背景
* [@mrguymiah](https://github.com/mrguymiah)と[@Bronya-Rand](https://github.com/Bronya-Rand)によるDockerガイド
* [@hexgrad](https://github.com/hexgrad)によるkokoro-jsライブラリ (Apache-2.0ライセンス)
## トップコントリビューター
[![Contributors](https://contrib.rocks/image?repo=SillyTavern/SillyTavern)](https://github.com/SillyTavern/SillyTavern/graphs/contributors)
<!-- LINK GROUP -->
[cover]: https://github.com/user-attachments/assets/01a6ae9a-16aa-45f2-8bff-32b5dc587e44
[discord-link]: https://discord.gg/sillytavern
[discord-shield-badge]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge
+11 -311
View File
@@ -10,7 +10,7 @@
[English](readme.md) | [German](readme-de_de.md) | [中文](readme-zh_cn.md) | [繁體中文](readme-zh_tw.md) | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md) | 한국어
[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/forks)
[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues)
[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls)
@@ -26,8 +26,7 @@ SillyTavern은 많은 LLM API(KoboldAI/CPP, Horde, NovelAI, Ooba, Tabby, OpenAI,
SillyTavern(짧게는 ST)은 텍스트 생성 LLM, 이미지 생성 엔진, TTS 음성 모델 등과 상호작할 수 있는 로컬 설치형 UI 입니다.
2023년 2월, TavernAI 1.2.8의 포크로 시작한 SillyTavern은 현재 100명이 넘는 기여자를 보유하고 있으며, 2년간의 독자적인 개발을 거쳐 숙련된 AI 애호가들을 위한 선도적인 소프트웨어로 자리매김하고 있습니다.
2023년 2월, TavernAI 1.2.8의 포크로 시작한 SillyTavern은 현재 200명이 넘는 기여자를 보유하고 있으며, 2년간의 독자적인 개발을 거쳐 숙련된 AI 애호가들을 위한 선도적인 소프트웨어로 자리매김하고 있습니다.
## 우리의 비전
@@ -35,30 +34,9 @@ SillyTavern(짧게는 ST)은 텍스트 생성 LLM, 이미지 생성 엔진, TTS
2. 저희는 어떠한 온라인 및 호스팅 서브시도 제공하지 않으며, 프로그래밍으로 사용자의 데이터를 추적하지 않습니다.
3. SillyTavern은 헌신적인 LLM 커뮤니티가 여러분에게 제공하는 열정적인 프로젝트이며, 언제나 무료이며 오픈소스로 제공될 것입니다.
## 브랜치
## SillyTavern을 위해서 좋은 성능의 PC가 필요한가요?
SillyTavern은 모든 사용자가 원활한 경험을 할 수 있도록 두 개의 브랜치를 활용하여 개발되고 있습니다.
* `release` -🌟 **대부분의 사용자에게 추천됨.** 가장 안정적이고 권장되는 브랜치이며, 주요 릴리스가 배포될 때만 업데이트됩니다. 대부분의 사용자에게 적합합니다. 일반적으로 한달에 한번 업데이트됩니다.
* `staging` - ⚠️ **일반적인 사용에 추천되지 않음.** 최신 기능을 가지고 있지만, 언제든지 문제가 발생할 수 있습니다. 고급 사용자 및 숙련자 전용입니다. 하루에 여러번 업데이트됩니다.
만약 git CLI 사용에 익숙하지 않거나 브랜치가 무엇인지 모르겠다면 release 브랜치가 더 나은 선택입니다.
## SillyTavern 외에 무엇이 필요한가요?
SillyTavern은 인터페이스 역할만 하기 때문에, 실제로 채팅하려면 LLM 백엔드에 대한 액세스 권한이 필요합니다. 즉시 사용 가능한 채팅을 위해 AI Horde를 사용할 수 있습니다. 그 외에도 OpenAI 호환 API, KoboldAI, Tabby 등 많은 로컬 및 클라우드 기반 LLM 백엔드를 지원합니다. 지원되는 API에 대한 자세한 내용은 [FAQ](https://docs.sillytavern.app/usage/api-connections/)에서 확인할 수 있습니다.
### SillyTavern을 위해서 좋은 성능의 PC가 필요한가요?
하드웨어 요구 사항은 거의 없습니다: NodeJS 18 이상을 실행할 수 있는 모든 환경에서 작동합니다. 다만 로컬 LLM 모델을 사용할 경우, 최소 6GB VRAM 이상의 3000번대 NVIDIA 그래픽 카드를 권장합니다. 자세한 내용은 백엔드 문서를 참고하세요.
### 추천되는 백엔드 (제휴 없음)
* [AI Horde](https://aihorde.net/) - 자원 봉사자들이 호스팅하는 모델을 사용합니다. 추가 설정이 필요하지 않습니다.
* [KoboldCpp](https://github.com/LostRuins/koboldcpp) - 로컬에서 GGUF 모델을 실행하기 위한 커뮤니티에서 선호하는 옵션입니다.
* [tabbyAPI](https://github.com/theroyallab/tabbyAPI) - 인기 있는 경량 로컬 exl2 추론 API입니다.
* [OpenRouter](https://openrouter.ai) - OpenAI, Claude, Meta Llama 등 다양한 클라우드 제공업체와 인기 있는 커뮤니티 모델을 위한 단일 API입니다.
하드웨어 요구 사항은 거의 없습니다: NodeJS 18 이상을 실행할 수 있는 모든 환경에서 작동합니다. 다만 로컬 LLM 모델을 사용할 경우, 최소 6GB VRAM 이상의 3000번대 NVIDIA 그래픽 카드를 권장하지만, 실제 요구 사항은 사용하는 모델과 백엔드에 따라 달라질 수 있습니다.
## 질문이나 제안이 있으신가요?
@@ -84,293 +62,14 @@ SillyTavern은 인터페이스 역할만 하기 때문에, 실제로 채팅하
<img width="500" alt="image" src="https://github.com/user-attachments/assets/9b5f32f0-c3b3-4102-b3f5-0e9213c0f50f">
<img width="500" alt="image" src="https://github.com/user-attachments/assets/913fdbaa-7d33-42f1-ae2c-89dca41c53d1">
## 설치
## 캐릭터 카드
자세한 설치 방법은 저희의 문서를 확인하세요:
SillyTavern은 "캐릭터 카드"라는 개념을 중심으로 구축되었습니다. 캐릭터 카드는 LLM의 동작을 설정하는 프롬프트 모음이며, SillyTavern에서 지속적인 대화를 하려면 필수적입니다. 이는 ChatGPT의 GPT 또는 Poe의 봇과 유사하게 작동합니다. 캐릭터 카드의 내용은 추상적인 시나리오, 특정 작업에 맞춰진 도우미, 유명 인사 또는 가상 인물 등 무엇이든 될 수 있습니다.
이름 필드는 유일한 필수 캐릭터 카드 입력 항목입니다. 언어 모델과 중립적인 대화를 시작하려면 "도우미"라고 간단히 이름 지은 새 카드를 만들고 나머지 상자는 비워 두세요. 더 주제가 있는 채팅을 원한다면 언어 모델에 다양한 배경 정보, 행동 및 작문 패턴, 그리고 채팅을 바로 시작할 시나리오를 제공할 수 있습니다.
캐릭터 카드를 선택하지 않고 빠른 대화를 하거나 LLM 연결을 테스트하려면 SillyTavern을 연 후 시작 화면의 입력 창에 프롬프트 입력을 입력하기만 하면 됩니다. 이러한 채팅은 임시적이며 저장되지 않습니다.
캐릭터 카드를 정의하는 방법에 대한 일반적인 아이디어를 얻으려면 기본 캐릭터(Seraphina)를 보거나 "확장 프로그램 및 에셋 다운로드" 메뉴에서 선택된 커뮤니티 제작 카드를 다운로드하세요.
## 핵심 기능
* 고급 텍스트 생성 설정과 다양한 커뮤니티 제작 프리셋
* 월드 인포 지원: 풍부한 설정을 만들거나 캐릭터 카드에 토큰 저장
* 그룹 채팅: 캐릭터가 사용자 혹은 다른 캐릭터와 대화할 수 있는 방
* 다양한 UI 커스텀 옵션: 테마 색, 뱌경 이미지, 커스텀 CSS 등
* 유저 페르소나: AI에게 사용자에 대한 정보를 주어 더욱 몰입감을 높임
* 내장 RAG 지원: AI가 참조할 수 있도록 채팅에 문서를 추가
* 광범위한 채팅 명령어 시스템 및 자체 [스크립트](https://docs.sillytavern.app/usage/st-script/)
## 확장
SillyTavern은 확장(익스텐션)을 지원합니다.
* 캐릭터 감정 표현 (스프라이트)
* 채팅 기록 자동 요약
* 자동 UI 및 채팅 번역
* Stable Diffusion/FLUX/DALL-E 이미지 생성
* AI 응답 메시지 텍스트 음성 변환 (ElevenLabs, Silero 또는 OS 시스템 TTS 사용)
* 프롬프트에 추가적인 현실 세계 맥락을 추가하기 위한 웹 검색 기능
* "확장 프로그램 및 에셋 다운로드" 메뉴에서 더 많은 기능을 다운로드할 수 있습니다.
사용 방법에 대한 튜토리얼은 [Docs](https://docs.sillytavern.app/)에서 확인할 수 있습니다.
# ⌛ Installation
> \[!WARNING]
>
> * **윈도우 제어 폴더에는 설치하지 마십시오 (Program Files, System32 등).**
> * **권리자 권한으로 START.BAT을 실행하지 마십시오.**
> * **Windows 7에서는 NodeJS 18.16을 실행할 수 없으므로 설치가 불가능합니다.**
## 🪟 Windows
### Git을 통해 설치하기
1. [NodeJS](https://nodejs.org/ko) 설치 (최신 LTS 버전 권장)
2. [Git for Windows](https://gitforwindows.org/) 설치
3. 파일 탐색기 열기 (`Win+E`)
4. Windows에서 제어하거나 모니터하지 않는 폴더를 찾거나 만드세요. (ex: C:\MySpecialFolder\)
5. 상단의 주소 표시줄을 클릭하고 `cmd`를 입력한 후 Enter 키를 눌러 해당 폴더 내에서 명령 프롬프트를 여세요.
6. 검은색 창(명령 프롬프트)이 나타나면 다음 중 하나를 입력하고 Enter 키를 누르세요.
* Release 브랜치: `git clone https://github.com/SillyTavern/SillyTavern -b release`
* Staging 브랜치: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
7. clone이 완료되면, `Start.bat`을 더블 클릭하여 NodeJS가 필요한 구성요소를 설치하도록 하세요.
8. 그러면 서버가 시작하고, SillyTavern이 브라우저에 나타납니다.
### GitHub Desktop을 통해 설치하기
(이 방법은 **오직** GitHub Desktop에서만 git 사용이 가능합니다. 명령 프롬프트에서 git을 사용하려면 [Git for Windows](https://gitforwindows.org/)를 설치해야 합니다.)
1. [NodeJS](https://nodejs.org/ko) 설치 (최신 LTS 버전 권장)
2. [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32) 설치
3. GitHub Desktop을 설치했으면, `Clone a repository from the internet....`를 클릭하세요. (참고: 이 과정에서는 Github 계정이 **필요하지 않습니다**.)
4. 메뉴에서 URL 탭을 클릭하고, 다음 URL을 입력한 후 복제를 클릭합니다: `https://github.com/SillyTavern/SillyTavern` 리포지토리가 다운로드될 위치를 변경하려면 로컬 경로를 변경할 수 있습니다.
5. SillyTavern을 열려면 파일 탐색기를 사용하여 리포지토리를 복제한 폴더로 이동합니다. 기본적으로 리포지토리는 다음 위치에 복제됩니다: `C:\Users\[사용자 Windows 사용자 이름]\Documents\GitHub\SillyTavern`
6. `start.bat` 파일을 더블 클릭 하세요. (참고: `.bat` 확장자 명은 OS 설정에 따라 보이지 않을 수 있습니다, 그럴 때는 파일 이름이 "`Start`" 처럼 보일 수 있습니다. 이 파일을 더블 클릭해 SillyTavern을 실행하세요.)
7. 더블 클릭하면, 검고 큰 명령 프롬프트 창이 열리고 SillyTavern이 작동하는데 필요한 항목을 설치하기 시작합니다.
8. 설치 과정이 끝나고 모든 것이 잘 작동한다면, 브라우저에 SillyTavern 탭이 열려 있어야 하고, 명령 프롬프트 창에 다음과 같이 표시되어야 합니다:
9. Connect to any of the [supported APIs](https://docs.sillytavern.app/usage/api-connections/) and start chatting!
## 🐧 Linux & 🍎 MacOS
MacOS / Linux 에서는 이 모든 작업이 터미널에서 수행됩니다.
1. git과 nodeJS 설치 (이 작업은 OS에 따라 달라집니다.)
2. 리포지토리 clone하기
* Release 브랜치: `git clone https://github.com/SillyTavern/SillyTavern -b release`
* Staging 브랜치: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
3. `cd SillyTavern` 를 입력해 설치 폴더로 이동하기
4. `start.sh` 스크립트를 아래의 명령어 중 하나로 실행하기:
* `./start.sh`
* `bash start.sh`
## ⚡ SillyTavern Launcher를 통해 설치하기
SillyTavern 런처는 로컬 LLM 사용을 위한 백엔드 설치를 포함하여 다양한 설정을 도와주는 설치 마법사입니다.
### Windows 사용자
1. 키보드에서 **`WINDOWS + R`** 키를 눌러 실행 창을 여세요. 그리고 아래의 명령어를 입력해 git을 설치하세요.
```shell
cmd /c winget install -e --id Git.Git
```
2. 키보드에서 **`WINDOWS + E`** 키를 눌러 파일 탐색기를 열고 런처를 설치할 폴더로 이동합니다. 원하는 폴더에 도착하면 주소 표시줄에 `cmd`를 입력하고 Enter 키를 누릅니다. 그 후 아래의 명령어를 입력합니다.
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher && start installer.bat
```
### Linux 사용자
1. 선호하는 터미널을 열고 git을 설치하세요.
2. SillyTavern-Launcher를 clone 하세요:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
3. installer.sh를 실행하세요:
```shell
chmod +x install.sh && ./install.sh
```
4. 설치가 끝나면 launcher.sh를 실행하세요:
```shell
chmod +x launcher.sh && ./launcher.sh
```
### Mac 사용자
1. 터미널을 열고 Brew를 설치하세요:
```shell
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
```
2. git을 설치하세요:
```shell
brew install git
```
3. SillyTavern-Launcher를 clone 하세요:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
4. installer.sh를 실행하세요:
```shell
chmod +x install.sh && ./install.sh
```
5. 설치가 끝나면 launcher.sh를 실행하세요:
```shell
chmod +x launcher.sh && ./launcher.sh
```
## 🐋 Docker를 통해 설치하기
이 방법은 Docker가 설치되어 있고, Docker 설치를 위해 커맨드 라인에 접근할 수 있으며, Docker의 일반적인 작동 방식에 익숙하다고 가정합니다.
### 이미지 직접 빌드하기
SillyTavern을 Docker에서 사용하는 방법에 대한 포괄적인 가이드는 [여기서](http://docs.sillytavern.app/installation/docker/) 확인할 수 있습니다. 이 가이드는 Windows, macOS 및 Linux에서의 설치를 다룹니다! 직접 이미지를 빌드하려면 이 가이드를 읽어보세요.
### GitHub Container Registry 사용하기 (가장 쉬움)
SillyTavern이 작동하려면 두 개의 필수 디렉터리 매핑과 하나의 포트 매핑이 필요합니다. 명령에서 다음 위치의 선택 항목을 바꿔주세요.
#### Container Variables
##### Volume Mappings
* [config] - SillyTavern 구성 파일이 호스트 컴퓨터에 저장될 디렉터리
* [data] - 캐릭터를 포함한 SillyTavern 사용자 데이터가 호스트 컴퓨터에 저장될 디렉터리
* [plugins] - (선택 사항) SillyTavern 서버 플러그인이 호스트 컴퓨터에 저장될 디렉터리
##### Port Mappings
* [PublicPort] - 트래픽을 노출할 포트입니다. 가상 머신 컨테이너 외부에서 인스턴스에 접근하므로 필수 사항입니다. 보안을 위한 별도의 서비스를 구현하지 않고는 인터넷에 노출하지 마십시오.
##### Additional Settings
* [DockerNet] - 컨테이너가 연결되어 생성되어야 하는 Docker 네트워크입니다. 해당 내용을 모르는 경우 [공식 Docker 문서](https://docs.docker.com/reference/cli/docker/network/)를 참조하세요.
* [version] - 이 GitHub 페이지의 오른쪽에서 "Packages"를 선택하면 "sillytavern" 패키지를 볼 수 있습니다. "latest" 이미지 태그는 현재 릴리스와 함께 최신 상태를 유지합니다. 각 브랜치의 야간 이미지를 가리키는 "staging" 및 "release" 태그를 사용할 수도 있지만, 업데이트에 시간이 걸릴 수 있고 중단될 수 있는 확장 프로그램을 사용하는 경우에는 적합하지 않을 수 있습니다.
#### 설치 명령어
1. 커맨드 라인 열기
2. 아래의 명령어 실행
`docker create --name='sillytavern' --net='[DockerNet]' -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
> 8000은 기본 리스닝 포트입니다. 구성에서 포트를 변경한 경우 적절한 포트를 사용하는 것을 잊지 마세요.
## 📱 Termux를 통해 Android OS에 설치하기
> \[!NOTE]
> **SillyTavern은 Termux를 사용하여 Android 기기에서 기본적으로 실행할 수 있지만, 이러한 사용 사례에 대한 공식적인 지원은 제공하지 않습니다.**
>
> **ArroganceComplex#2659의 가이드를 참조하세요:**
>
> * <https://rentry.org/STAI-Termux>
**지원되지 않는 플랫폼: android arm LEtime-web.** 32비트 Android는 npm으로 설치할 수 없는 외부 종속성이 필요합니다. 다음 명령어를 사용하여 설치하세요: pkg install esbuild. 그런 다음 일반적인 설치 단계를 진행하세요.
## API 키 관리
SillyTavern은 API 키를 사용자 데이터 디렉터리의 `secrets.json` 파일에 저장합니다 (`/data/default-user/secrets.json`이 기본 경로입니다).
기본적으로 API 키는 저장하고 페이지를 새로 고침한 후에는 인터페이스에서 보이지 않습니다.
키 보기 기능을 활성화하려면 다음 단계를 따르세요:
1. `config.yaml` 파일에서 `allowKeysExposure` 값을 `true로` 설정합니다.
2. SillyTavern 서버를 다시 시작합니다.
3. API 연결 패널 오른쪽 하단에 있는 '숨겨진 API 키 보기' 링크를 클릭합니다.
## 커맨드 라인 인수
`config.yaml`의 일부 설정을 덮어쓰기 위해 SillyTavern 서버 시작 시 커맨드 라인 인수를 전달할 수 있습니다.
### 예시
```shell
node server.js --port 8000 --listen false
# 혹은
npm run start -- --port 8000 --listen false
# 혹은 (Windows 전용)
Start.bat --port 8000 --listen false
```
### 지원되는 인수
| 옵션 | 설명 | 타입 |
|-----------------------------------|--------------------------------------------------------------------------------------|----------|
| `--version` | 버전 표시 | boolean |
| `--enableIPv6` | IPv6 활성화 | boolean |
| `--enableIPv4` | IPv4 활성화 | boolean |
| `--port` | SillyTavern이 실행될 포트를 설정합니다. | number |
| `--dnsPreferIPv6` | DNS에 IPv6를 우선으로 할당합니다. | boolean |
| `--browserLaunchEnabled` | 브라우저에서 SillyTavern을 자동으로 실행합니다. | boolean |
| `--browserLaunchHostname` | 자동 실행 호스트 이름, 'auto'가 최적의 설정일 것입니다. | string |
| `--browserLaunchPort` | 자동 실행 포트 덮어쓰기 | string |
| `--browserLaunchAvoidLocalhost` | 자동 모드에서 자동 실행 시 'localhost' 사용 방지 | boolean |
| `--listen` | SillyTavern이 모든 네트워크 인터페이스에서 수신 대기합니다. | boolean |
| `--corsProxy` | CORS 프록시 활성화. | boolean |
| `--disableCsrf` | CSRF 보호 비활성화 | boolean |
| `--ssl` | SSL 활성화 | boolean |
| `--certPath` | 인증서 파일 경로 | string |
| `--keyPath` | 프라이빗 키 파일 경로 | string |
| `--whitelist` | 화이트리스트 모드 활성화 | boolean |
| `--dataRoot` | 데이터 스토리지의 루트 디렉토리 | string |
| `--basicAuthMode` | 기본 인증 활성화 | boolean |
| `--requestProxyEnabled` | 외부 리퀘스트 프록시 활성화 | boolean |
| `--requestProxyUrl` | 프록시 URL 리퀘스트 (HTTP 혹은 SOCKS 프로토콜) | string |
| `--requestProxyBypass` | 프록시 바이패스 리스트 리퀘스트 (공백으로 구분된 호스트 목록) | array |
## 원격 연결
대부분의 경우 이는 PC에서 ST 서버를 실행하는 동안 모바일 장치에서 SillyTavern을 사용하려는 사람들을 위한 것입니다. 그러나 원격 연결을 다른 곳에서도 허용하도록 사용할 수 있습니다.
원격 연결 설정 방법에 대한 자세한 가이드는 [Docs](https://docs.sillytavern.app/usage/remoteconnections/)에서 확인할 수 있습니다.
또한 암호 보호 기능이 포함된 SillyTavern 사용자 프로필을 구성할 수 있습니다 (선택 사항): [Users](https://docs.sillytavern.app/installation/st-1.12.0-migration-guide/#users).
## 성능 이슈가 발생하나요?
1. 사용자 설정 패널(UI 테마 전환 카테고리)에서 흐림 효과를 비활성화하고 동작 줄이기를 활성화합니다.
2. 응답 스트리밍을 사용하는 경우 스트리밍 FPS를 더 낮은 값(10-15 FPS 권장)으로 설정합니다.
3. 브라우저에서 렌더링에 GPU 가속을 사용하도록 설정되어 있는지 확인합니다.
* **[Windows 설치 가이드](https://docs.sillytavern.app/installation/windows/)**
* **[MacOS/Linux 설치 가이드](https://docs.sillytavern.app/installation/linuxmacos/)**
* **[Android (Termux) 설치 가이드](https://docs.sillytavern.app/installation/android-(termux)/)**
* **[Docker 설치 가이드](https://docs.sillytavern.app/installation/docker/)**
## 라이센스 및 크레딧
@@ -383,6 +82,7 @@ Start.bat --port 8000 --listen false
* Font Awesome의 아이콘 테마 <https://fontawesome.com> (아이콘: CC BY 4.0, 폰트: SIL OFL 1.1, 코드: MIT 라이선스)
* 기본 콘텐츠는 @OtisAlejandro (Seraphina 캐릭터 및 로어북)와 @kallmeflocc (10K 디스코드 사용자 축전 배경화면)가 제공함
* [@mrguymiah](https://github.com/mrguymiah)와 [@Bronya-Rand](https://github.com/Bronya-Rand)의 Docker 가이드
* [@hexgrad](https://github.com/hexgrad)의 kokoro-js 라이브러리 (Apache-2.0 라이선스)
## 상위 기여자
+48 -404
View File
@@ -10,7 +10,7 @@
[English](readme.md) | [German](readme-de_de.md) | [中文](readme-zh_cn.md) | [繁體中文](readme-zh_tw.md) | [日本語](readme-ja_jp.md) | Русский | [한국어](readme-ko_kr.md)
[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network)
[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/forks)
[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues)
[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls)
@@ -18,433 +18,77 @@
---
Мобайл-френдли интерфейс, поддержка множества API (KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale), ВН-образный режим Вайфу, Stable Diffusion, TTS, поддержка миров (лорбуков), кастомизируемый UI, автоперевод, тончайшая настройка промптов + возможность устанавливать расширения.
SillyTavern предоставляет единый интерфейс для многих LLM API (KoboldAI/CPP, Horde, NovelAI, Ooba, Tabby, OpenAI, OpenRouter, Claude, Mistral и других), мобайл-френдли макет, режим визуальной новеллы, интеграцию с генерацией изображений через API Automatic1111 и ComfyUI, TTS, WorldInfo (лорбуки), кастомизируемый UI, автоперевод, тончайшую настройку промптов, и возможность устанавливать расширения.
Основано на форке [TavernAI](https://github.com/TavernAI/TavernAI) версии 1.2.8
Чтобы помочь вам быстрее разобраться в SillyTavern, мы создали [сайт с документацией](https://docs.sillytavern.app/). Ответы на большинство вопросов можно найти там.
## Важные новости!
## Что такое SillyTavern?
1. Чтобы помочь вам быстрее разобраться в SillyTavern, мы создали [сайт с документацией](https://docs.sillytavern.app/). Ответы на большинство вопросов можно найти там.
SillyTavern (или сокращенно ST) - это локально устанавливаемый пользовательский интерфейс, который позволяет вам взаимодействовать с LLM для генерации текста, движками для генерации изображений и моделями голоса TTS.
2. Почему пропали расширения после апдейта? Начиная с версии 1.10.6, большинство встроенных расширений были конвертированы в формат загружаемых аддонов. Их можно установить обратно через меню "Download Extensions and Assets" на панели расширений (значок с тремя кубиками сверху).
Начавшись в феврале 2023 года как форк TavernAI 1.2.8, SillyTavern теперь насчитывает более 200 контрибьюторов и 2 года независимой разработки, и продолжает служить ведущим программным обеспечением для опытных энтузиастов ИИ.
3. Не поддерживается следующая платформа: android arm LEtime-web. 32-битный Android требует внешнюю зависимость, которую нельзя установить посредством npm. Для её установки потребуется следующая команда: `pkg install esbuild`. После этого продолжайте установку по общей инструкции.
## Наше видение
### Разрабатывается Cohee, RossAscends и всем сообществом SillyTavern
1. Мы стремимся предоставить пользователям как можно больше полезности и контроля над их промптами LLM. Крутая кривая обучения - это часть веселья!
2. Мы не предоставляем никаких онлайн или хостинговых услуг, а также программно не отслеживаем данные пользователей.
3. SillyTavern - это проект, созданный преданным сообществом энтузиастов LLM, и он всегда будет бесплатным и с открытым исходным кодом.
### Что такое SillyTavern и TavernAI?
## Нужен ли мне мощный компьютер для запуска SillyTavern?
SillyTavern — это интерфейс, который устанавливается на ПК (и на Android), который даёт возможность общаться с генеративным ИИ и чатиться/ролеплеить с вашими собственными персонажами или персонажами других пользователей.
Требования к оборудованию минимальны: он будет работать на всем, что может запустить NodeJS 18 или выше. Если вы собираетесь выполнять инференс LLM на своем локальном компьютере, мы рекомендуем видеокарту NVIDIA 3000-й серии с не менее чем 6 ГБ видеопамяти, но фактические требования могут варьироваться в зависимости от модели и используемого вами бэкенда.
SillyTavern — это форк версии TavernAI 1.2.8, который разрабатывается более активно и имеет множество новых функций. Сейчас уже можно сказать, что это две отдельные и абсолютно самостоятельные программы.
## Вопросы или предложения?
### Сервер в Discord
| [![][discord-shield-badge]][discord-link] | [Вступайте в наше Discord-сообщество!](https://discord.gg/sillytavern) Получайте поддержку, делитесь любимыми персонажами и промптами. |
| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------- |
Или свяжитесь с разработчиками напрямую:
* Discord: cohee, rossascends, wolfsblvt
* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/), [/u/sillylossy](https://www.reddit.com/user/sillylossy/), [u/Wolfsblvt](https://www.reddit.com/user/Wolfsblvt/)
* [Опубликовать issue на GitHub](https://github.com/SillyTavern/SillyTavern/issues)
### Мне нравится ваш проект! Как я могу внести свой вклад?
1. Отправляйте пулл-реквесты. Узнайте, как внести свой вклад: [CONTRIBUTING.md](../CONTRIBUTING.md)
2. Отправляйте предложения по функциям и отчеты о проблемах, используя предоставленные шаблоны.
3. Прочтите весь этот файл readme и сайт документации, чтобы избежать отправки дублирующихся проблем.
## Скриншоты
<img width="500" alt="image" src="https://github.com/user-attachments/assets/9b5f32f0-c3b3-4102-b3f5-0e9213c0f50f">
<img width="500" alt="image" src="https://github.com/user-attachments/assets/913fdbaa-7d33-42f1-ae2c-89dca41c53d1">
### Ветки
## Установка
SillyTavern разрабатывается в двух ветках, чтобы всем категориям пользователей было удобно.
Для получения подробных инструкций по установке, пожалуйста, посетите нашу документацию:
* release -🌟 **Рекомендовано для большинства пользователей.** Самая стабильная ветка, рекомендуем именно её. Обновляется только в момент крупных релизов. Подходит для большей части пользователей.
* staging - ⚠️ **Не рекомендуется для повседневного использования.** В этой ветке весь самый свежий и новый функционал, но будьте аккуратны, поскольку сломаться может в любом месте и в любое время. Только для продвинутых пользователей и энтузиастов.
* **[Руководство по установке для Windows](https://docs.sillytavern.app/installation/windows/)**
* **[Руководство по установке для MacOS/Linux](https://docs.sillytavern.app/installation/linuxmacos/)**
* **[Руководство по установке для Android (Termux)](https://docs.sillytavern.app/installation/android-(termux)/)**
* **[Руководство по установке Docker](https://docs.sillytavern.app/installation/docker/)**
Если вы не умеете обращаться с git через командную строку, или не знаете, что такое ветка, то не переживайте! Наилучшим вариантом всегда остаётся ветка release.
## Лицензия и благодарности
### Что ещё нужно, кроме SillyTavern?
**Эта программа распространяется в надежде, что она будет полезна, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; даже без подразумеваемой гарантии ТОВАРНОЙ ПРИГОДНОСТИ или ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ. Смотрите GNU Affero General Public License для получения более подробной информации.**
Сама по себе SillyTavern бесполезна, ведь это просто интерфейс. Вам потребуется доступ к бэкенду с ИИ, который и будет отыгрывать выбранного вами персонажа. Поддерживаются разные виды бэкендов: OpenAPI API (GPT), KoboldAI (локально или на Google Colab), и многое другое. Больше информации в [FAQ](https://docs.sillytavern.app/usage/faq/).
* [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 от Humi: лицензия MIT
* Части мода CncAnon TavernAITurbo используются с разрешения
* Режим визуальной новеллы вдохновлен работой PepperTaco (<https://github.com/peppertaco/Tavern/>)
* Шрифт Noto Sans от Google (лицензия OFL)
* Тема иконок от Font Awesome <https://fontawesome.com> (Иконки: CC BY 4.0, Шрифты: SIL OFL 1.1, Код: лицензия MIT)
* Стандартный контент от @OtisAlejandro (персонаж Seraphina и лорбук) и @kallmeflocc (фон в честь 10 тысяч пользователей Discord)
* Руководство по Docker от [@mrguymiah](https://github.com/mrguymiah) и [@Bronya-Rand](https://github.com/Bronya-Rand)
* Библиотека kokoro-js от [@hexgrad](https://github.com/hexgrad) (лицензия Apache-2.0)
### Требуется ли для SillyTavern мощный ПК?
## Ведущие контрибьюторы
SillyTavern — это просто интерфейс, поэтому запустить его можно на любой картошке. Мощным должен быть бэкенд с ИИ.
## Есть вопросы или предложения?
### У нас появился сервер в Discord
| [![][discord-shield-badge]][discord-link] | [Вступайте в наше Discord-сообщество!](https://discord.gg/sillytavern) Задавайте вопросы, делитесь любимыми персонажами и промптами. |
| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------- |
Также можно написать разработчикам напрямую:
* Discord: cohee или rossascends
* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/) или [/u/sillylossy](https://www.reddit.com/user/sillylossy/)
* [Запостить issue на GitHub](https://github.com/SillyTavern/SillyTavern/issues)
## Эта версия включает
* Глубоко переработанную TavernAI 1.2.8 (переписано и оптимизировано более 50% кода)
* Свайпы
* Групповые чаты: комнаты для нескольких ботов, где персонажи могут говорить друг с другом и с вами
* Чекпоинты и ветки для чатов
* Продвинутые настройки для KoboldAI / TextGen со множеством созданных сообществом пресетов
* Поддержка миров (функция "Информация о мире" / WorldInfo): создавайте свой богатый лор, или экономьте токены для карточек персонажей
* Соединение через [OpenRouter](https://openrouter.ai) для разных API (Claude, GPT-4/3.5 и других)
* Соединение с API [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui)
* Соединение с [AI Horde](https://aihorde.net/)
* Настройку форматирования промптов
## Расширения
SillyTavern поддерживает расширения.
* Эмоции для персонажей (спрайты)
* Автоматический саммарайз (краткий пересказ) истории чата
* Возможность отправить в чат картинку, которую ИИ сможет рассмотреть и понять
* Генерация картинок в Stable Diffusion (5 пресетов для чата, плюс свободный режим)
* Text-to-speech для сообщений ИИ (с помощью ElevenLabs, Silero, или родной TTS вашей ОС)
Полный список расширений и инструкций к ним можно найти в [документации](https://docs.sillytavern.app/).
## Улучшения от RossAscends для UI/CSS/общего удобства
* Мобильный интерфейс адаптирован для iOS, добавлена возможность сохранить ярлык на главный экран и открыть приложение в полноэкранном режиме.
* Горячие клавиши
* Up = Редактировать последнее сообщение в чате
* Ctrl+Up = Редактировать ВАШЕ последнее сообщение в чате
* Left = свайп влево
* Right = свайп вправо (ОБРАТИТЕ ВНИМАНИЕ: когда в окне ввода что-то напечатано, клавиши для свайпа не работают)
* Ctrl+Left = посмотреть локальные переменные (в консоли браузера)
* Enter (при нахождении внутри окна ввода) = отправить ваше сообщение ИИ
* Ctrl+Enter = Повторная генерация последнего ответа ИИ
* Страница больше не перезагружается при смене имени пользователя или удалении персонажа
* Отключаемая возможность автоматически соединяться с API при загрузке страницы.
* Отключаемая возможность автоматически загружать последнего открытого персонажа при загрузке страницы.
* Улучшенный счётчик токенов - работает с несохранёнными персонажами, отображает и перманентные, и временные токены
* Улучшенный менеджер чатов
* Файлы с новыми чатами получают читабельные названия вида "(персонаж) - (когда создано)"
* Увеличен размер превью чата с 40 символов до 300.
* Несколько вариантов сортировки списка персонажей (по имени, дате создания, размеру чата).
* Панели настроек слева и справа автоматически скрываются, если щёлкнуть за их пределы.
* При нажатии на значок замка навигационная панель будет закреплена на экране, и эта настройка сохранится между сессиями
* Сам статус панели (открыта или закрыта) также сохраняется между сессиями
* Кастомизируемый интерфейс чата:
* Настройте звук при получении нового ответа
* Переключайтесь между круглыми и прямоугольными аватарками
* Увеличенное вширь окно чата для стационарных ПК
* Возможность включать полупрозрачные панели, стилизованные под стекло
* Настраиваемые цвета для обычного текста, курсива, цитат
* Настраиваемый цвет фона и интенсивность размытия
# ⌛ Установка
> **Внимание!**
> * НЕ УСТАНАВЛИВАЙТЕ В ПАПКИ, КОТОРЫЕ КОНТРОЛИРУЕТ WINDOWS (Program Files, System32 и т.п.).
> * НЕ ЗАПУСКАЙТЕ START.BAT С ПРАВАМИ АДМИНИСТРАТОРА
> * УСТАНОВКА НА WINDOWS 7 НЕВОЗМОЖНА ИЗ-ЗА ОТСУТСТВИЯ NODEJS 18.16
## 🪟 Windows
## Установка через Git
1. Установите [NodeJS](https://nodejs.org/en) (рекомендуется последняя LTS-версия)
2. Установите [Git for Windows](https://gitforwindows.org/)
3. Откройте Проводник (`Win+E`)
4. Перейдите в папку, которую не контролирует Windows, или создайте её. (пример: C:\MySpecialFolder\)
5. Откройте командную строку. Для этого нажмите на адресную строку (сверху), введите `cmd` и нажмите Enter.
6. Когда появится чёрное окошко (командная строка), введите ОДНУ из перечисленных ниже команд:
- для ветки release: `git clone https://github.com/SillyTavern/SillyTavern -b release`
- для ветки staging: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
7. Когда клонирование закончится, дважды щёлкните по `Start.bat`, чтобы установить зависимости для NodeJS.
8. После этого сервер запустится, и SillyTavern откроется в вашем браузере.
## Установка с помощью SillyTavern Launcher
1. Установите [Git for Windows](https://gitforwindows.org/)
2. Откройте Проводник (`Win+E`) и создайте или выберите папку, в которую будет установлен лаунчер
3. Откройте командную строку. Для этого нажмите на адресную строку (сверху), введите `cmd` и нажмите Enter.
4. Когда появится чёрное окошко, введите следующую команду: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git`
5. Дважды щёлкните по `installer.bat` и выберите, что именно хотите установить
6. После завершения установки дважды щёлкните по `launcher.bat`
## Установка с помощью GitHub Desktop
(Тут речь про git **только** в рамках GitHub Desktop, если хотите использовать `git` в командной строке, вам также понадобится [Git for Windows](https://gitforwindows.org/))
1. Установите [NodeJS](https://nodejs.org/en) (latest LTS version is recommended)
2. Установите [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32)
3. После завершения установки GitHub Desktop, нажмите `Clone a repository from the internet....` (обратите внимание: для этого шага **НЕ требуется** аккаунт на GitHub)
4. В меню перейдите на вкладку URL, введите адрес `https://github.com/SillyTavern/SillyTavern`, и нажмите Clone. В поле Local path можно изменить директорию, в которую будет загружена SillyTavern.
6. Чтобы запустить SillyTavern, откройте Проводник и перейдите в выбранную на предыдущем шаге папку. По умолчанию репозиторий будет склонирован сюда: `C:\Users\[Имя пользователя]\Documents\GitHub\SillyTavern`
7. Дважды щёлкните по файлу `start.bat`. (обратите внимание: окончание `.bat` может быть скрыто настройками вашей ОС. Таким образом, имя файла будет выглядеть как "`Start`". Дважды щёлкните по нему, чтобы запустить SillyTavern)
8. После того, как вы дважды щёлкнули по файлу, должно открыться чёрное окошко, и SillyTavern начнёт устанавливать свои зависимости.
9. Если установка прошла успешно, то в командной строке будет вот такое, а в браузере откроется вкладка с SillyTavern:
10. Подключайтесь к любому из [поддерживаемых API](https://docs.sillytavern.app/usage/api-connections/) и начинайте переписку!
## 🐧 Linux и 🍎 MacOS
В MacOS и Linux всё это делается через Терминал.
1. Установите git и nodeJS (как именно - зависит от вашей ОС)
2. Клонируйте репозиторий
- для ветки release: `git clone https://github.com/SillyTavern/SillyTavern -b release`
- для ветки staging: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
3. Перейдите в папку установки с помощью `cd SillyTavern`.
4. Запустите скрипт `start.sh` с помощью одной из команд:
- `./start.sh`
- `bash start.sh`
## Установка с помощью SillyTavern Launcher
### Для пользователей Linux
1. Откройте любимый терминал и установите git
2. Загрузите Sillytavern Launcher с помощью команды: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git`
3. Перейдите в SillyTavern-Launcher: `cd SillyTavern-Launcher`
4. Запустите лаунчер установки: `chmod +x install.sh && ./install.sh`, затем выберите, что конкретно хотите установить
5. После завершения установки, запустите лаунчер следующей командой: `chmod +x launcher.sh && ./launcher.sh`
### Для пользователей Mac
1. Откройте терминал и установите brew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
2. Затем установите git: `brew install git`
3. Загрузите Sillytavern Launcher: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git`
4. Перейдите в SillyTavern-Launcher: `cd SillyTavern-Launcher`
5. Запустите лаунчер установки: `chmod +x install.sh && ./install.sh` and choose what you wanna install
6. После завершения установки, запустите лаунчер следующей командой: `chmod +x launcher.sh && ./launcher.sh`
## 🐋 Установка с помощью Docker
Предполагается, что вы уже установили Docker, имеете доступ к командной строке для установки контейнеров и знакомы с их базовым управлением.
### Сборка образа самостоятельно
У нас есть подробное руководство по использованию SillyTavern в Docker [здесь](http://docs.sillytavern.app/installation/docker/), которое охватывает установку на Windows, macOS и Linux! Ознакомьтесь с ним, если хотите создать образ самостоятельно.
### Использование реестра контейнеров GitHub (самый простой способ)
Для работы SillyTavern вам понадобятся две обязательные настройки каталогов и одна настройка порта. В команде замените указанные значения на свои:
#### Переменные контейнера
##### Маппинг томов
* [config] - директория, где на вашем хосте будут храниться файлы конфигурации SillyTavern.
* [data] - директория, где на вашем хосте будут храниться пользовательские данные SillyTavern (включая персонажей).
* [plugins] - (необязательно) директория, где на вашем хосте будут храниться плагины сервера SillyTavern.
##### Маппинг портов
* [PublicPort] - Порт, через который будет передаваться трафик. Это обязательно, так как вы будете обращаться к контейнеру извне его виртуальной машины. НЕ ОТКРЫВАЙТЕ этот порт в интернет без реализации дополнительного уровня безопасности.
##### Дополнительные настройки
* [DockerNet] - Docker сеть, к которой контейнер должен быть подключен. Если вы не знаете, что это, обратитесь к [официальной документации Docker](https://docs.docker.com/reference/cli/docker/network/).
* [version] - на правой части этой страницы GitHub вы найдете раздел "Packages". Выберите пакет "sillytavern", чтобы увидеть версии образов. Тег "latest" позволит вам обновляться до текущего релиза. Также доступны теги "staging" и "release", которые соответствуют ночным сборкам соответствующих веток. Однако это может быть нецелесообразно, если вы используете расширения, которые могут ломаться и требуют времени для обновления.
#### Команда установки
1. Откройте командную строку
2. Выполните следующую команду
`docker create --name='sillytavern' --net='[DockerNet]' -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
> Заметьте, что 8000 является портом по умолчанию. Не забудьте использовать соответствующий порт, если вы измените его в конфиге.
## 📱 Мобильные устройства - Установка при помощи termux
> **ОБРАТИТЕ ВНИМАНИЕ!**
>
> **На Android-телефонах SillyTavern можно запускать нативно посредством Termux. Обратитесь к гайду, написанному ArroganceComplex#2659:**
>
> * <https://rentry.org/STAI-Termux>
## Управление ключами от API
SillyTavern сохраняет ключи от ваших API в файле `secrets.json` в папке на сервере.
По умолчанию, ключи не будут отображаться на фронте после их ввода и перезагрузки страницы.
Чтобы включить возможность отображения ключей путём нажатия кнопки в блоке API:
1. Зайдите в файл `config.yaml` и установите `allowKeysExposure` в положение `true`.
2. Перезапустите сервер SillyTavern.
## Аргументы командной строки
Вы можете передавать аргументы командной строки при запуске сервера SillyTavern, чтобы переопределять настройки из `config.yaml`.
### Примеры
```shell
node server.js --port 8000 --listen false
# или
npm run start -- --port 8000 --listen false
# или (только на Windows)
Start.bat --port 8000 --listen false
```
### Поддерживаемые аргументы
| Аргумент | Описание | Тип |
|------------------------------|-----------------------------------------------------------------------------------------------------------|---------|
| `--version` | Показывает номер версии. | boolean |
| `--enableIPv6` | Включает IPv6. | boolean |
| `--enableIPv4` | Включает IPv4. | boolean |
| `--port` | Устанавливает порт, который будет использовать SillyTavern. | number |
| `--dnsPreferIPv6` | Отдает предпочтение IPv6 для dns. | boolean |
| `--browserLaunchEnabled` | Автоматический запуск SillyTavern в браузере. | boolean |
| `--browserLaunchHostname` | Имя хоста автозапуска, лучше оставить на 'auto'. | string |
| `--browserLaunchPort` | Переопределяет порт для автозапуска. | string |
| `--browserLaunchAvoidLocalhost`| Избегает использования 'localhost' для автозапуска в режиме 'auto'. | boolean |
| `--listen` | SillyTavern будет прослушивать все сетевые интерфейсы. | boolean |
| `--corsProxy` | Включает CORS-прокси. | boolean |
| `--disableCsrf` | Отключает защиту от CSRF. | boolean |
| `--ssl` | Включает SSL. | boolean |
| `--certPath` | Путь к файлу c сертификатом. | string |
| `--keyPath` | Путь к файлу с закрытым ключом. | string |
| `--whitelist` | Включает режим белого списка. | boolean |
| `--dataRoot` | Корневой каталог для хранения данных. | string |
| `--basicAuthMode` | Включает простую аутентификацию. | boolean |
| `--requestProxyEnabled` | Разрешает использование прокси для исходящих запросов. | boolean |
| `--requestProxyUrl` | URL-адрес прокси (протоколы HTTP или SOCKS). | string |
| `--requestProxyBypass` | Bypass список прокси (список хостов, разделенных пробелами). | array |
## Удалённое подключение
В основном этим пользуются тогда, когда хотят использовать SillyTavern с телефона, запустив сервер SillyTavern на стационарном ПК в той же Wi-Fi-сети.
Однако это позволит подключаться откуда угодно, а не только вам.
**ВАЖНО: в SillyTavern не предусмотрена возможность использования программы несколькими людьми. Поэтому любой, кто подключится к вашему серверу, получит доступ ко всем вашим персонажам и чатам, а также сможет менять настройки через UI.**
### 1. Заведение "белого списка" IP-адресов
* Создайте в корневой папке SillyTavern файл с названием `whitelist.txt`.
* Откройте файл в текстовом редакторе и внесите список IP-адресов, с которых хотите разрешить подключение.
*Принимаются как обычные IP-адреса, так и целые диапазоны, размеченные с помощью астериска. Примеры:*
```txt
192.168.0.1
192.168.0.20
```
или
```txt
192.168.0.*
```
(диапазон из примера сверху позволит подключаться всем устройствам в локальной сети)
Также принимаются маски CIDR (вида 10.0.0.0/24).
* Сохраните файл `whitelist.txt`.
* Перезапустите сервер ST.
После этого устройства из белого списка смогут подключаться к вашему серверу.
*Обратите внимание: в файле `config.yaml` также имеется массив `whitelist`, который работает по тому же принципу. Однако если существует файл `whitelist.txt`, то этот массив игнорируется.*
### 2. Получение IP хост-машины с ST
После настройки белого списка адресов, следующим шагом будет получение IP-адреса хост-машины, на которой запущена SillyTavern.
Если хост-машина находится в той же Wi-Fi-сети, то можно воспользоваться её внутренним Wi-Fi-IP-адресом:
* На Windows: нажмите Пуск > введите `cmd.exe` в поиске > в консоли введите команду `ipconfig` и нажмите Enter > найдите пункт `IPv4-адрес`.
Если вы (или кто-то другой) хотите подключаться к хост-машине из другой сети, то вам понадобится ваш публичный IP-адрес.
* Откройте [эту страницу](https://whatismyipaddress.com/) с вашей хост-машины и найдите пункт `IPv4`. На этот адрес и будет подключаться удалённое устройство.
### 3. Соединить удалённое устройство с хост-машиной ST
Какой бы IP-адрес вы ни выбрали, вам нужно будет вводить его в адресной строке браузера вашего удалённого устройства.
Обычный адрес хост-машины, находящейся в той же Wi-Fi-сети, выглядит примерно так:
`http://192.168.0.5:8000`
НЕ используйте https://
Только http://
### Открытие доступа до ST для всех IP-адресов
Мы не рекомендуем так делать, но вы можете открыть файл `config.yaml` и изменить `whitelistMode` на `false`.
Обязательно нужно удалить (или переименовать) файл `whitelist.txt`, если такой файл есть в корневой директории SillyTavern.
Эта практика считается небезопасной, поэтому, если вы решите так сделать, мы попросим вас установить логин и пароль.
Оба этих параметра настраиваются в `config.yaml` (username и password).
Останется только перезапустить сервер ST, и после этого к вам сможет подключиться любой пользователь вне зависимости от IP-адреса его устройства. Главное, чтобы он знал логин и пароль.
### Не получается соединиться?
* Создайте входящее/исходящее правило в вашем фаерволле для порта, указанного в `config.yaml`. НЕ ПУТАЙТЕ этот процесс с пробросом портов на роутере. Если по ошибке перепутаете, то на ваш сервер сможет забраться посторонний человек и украсть ваши логи, этого следует избегать.
* Переключите Сетевой профиль на значение "Частные". Для этого зайдите в Параметры > Сеть и Интернет > Ethernet. КРАЙНЕ важно для Windows 11, без этого не получится подключиться даже с правилом фаервола.
## Проблемы с производительностью?
Попробуйте включить опцию "Отключить эффект размытия" в меню "Пользовательские настройки".
## Нравится ваш проект! Как помочь?
### ЧТО ДЕЛАТЬ
1. Присылайте пулл реквесты
2. Присылайте идеи и баг-репорты, оформленные по установленным шаблонам
3. Прежде чем задавать вопросы, прочтите readme и документацию
### ЧЕГО НЕ ДЕЛАТЬ
1. Предлагать донаты
2. Присылать баг-репорты безо всякого контекста
3. Задавать вопросы, на которые уже отвечали
## Где найти старые фоны?
Мы двигаемся в сторону 100% уникальности всего используемого контента, поэтому старые фоны были убраны из репозитория.
Они отправлены в архив, скачать их можно здесь:
<https://files.catbox.moe/1xevnc.zip>
## Авторы и лицензии
**Мы надеемся, что эта программа принесёт людям пользу,
но мы не даём НИКАКИХ ГАРАНТИЙ; мы ни в коем случае не гарантируем того,
что программа СООТВЕТСТВУЕТ КАКИМ-ЛИБО КРИТЕРИЯМ или ПРИГОДНА ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ.
Подробнее можно узнать в GNU Affero General Public License.**
* Базовая TAI от Humi: Лицензия неизвестна
* Модификации от Cohee и производная кодовая база: AGPL v3
* Дополнения RossAscends: AGPL v3
* Кусочки TavernAITurbo мода от CncAnon: Лицензия неизвестна
* Различные коммиты и предложения от kingbri (<https://github.com/bdashore3>)
* Расширения и внедрение разного рода удобств - city_unit (<https://github.com/city-unit>)
* Различные коммиты и баг-репорты от StefanDanielSchwarz (<https://github.com/StefanDanielSchwarz>)
* Режим Вайфу вдохновлён работой PepperTaco (<https://github.com/peppertaco/Tavern/>)
* Благодарность Pygmalion University за прекрасную работу по тестированию и за все предлагаемые крутые фичи!
* Благодарность oobabooga за компиляцию пресетов для TextGen
* Пресеты для KoboldAI из KAI Lite: <https://lite.koboldai.net/>
* Шрифт Noto Sans от Google (OFL license)
* Тема Font Awesome <https://fontawesome.com> (Иконки: CC BY 4.0, Шрифты: SIL OFL 1.1, Код: MIT License)
* Клиентская библиотека для AI Horde от ZeldaFan0225: <https://github.com/ZeldaFan0225/ai_horde>
* Пусковой скрипт для Linux от AlpinDale
* Благодарность paniphons за оформление документа с FAQ
* Фон в честь 10 тысяч пользователей в Discord от @kallmeflocc
* Стандартный контент (персонажи и лорбуки) предоставлен пользователями @OtisAlejandro, @RossAscends и @kallmeflocc
* Корейский перевод от @doloroushyeonse
* Поддержка k_euler_a для Horde от <https://github.com/Teashrock>
* Китайский перевод от [@XXpE3](https://github.com/XXpE3), 中文 ISSUES 可以联系 @XXpE3
[![Contributors](https://contrib.rocks/image?repo=SillyTavern/SillyTavern)](https://github.com/SillyTavern/SillyTavern/graphs/contributors)
<!-- LINK GROUP -->
[back-to-top]: https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square
[cover]: https://github.com/user-attachments/assets/01a6ae9a-16aa-45f2-8bff-32b5dc587e44
[discord-link]: https://discord.gg/sillytavern
[discord-shield]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square
[discord-shield-badge]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge
+19 -321
View File
@@ -34,29 +34,9 @@ SillyTavern 于 2023 年 2 月作为 TavernAI 1.2.8 的一个分支开始,如
2. 我们不提供任何在线或托管服务,也不会以编程方式跟踪任何用户数据。
3. SillyTavern 是一个由专注的 LLM 爱好者社区为您带来的充满激情的项目,并且将永远是免费和开源的。
## 分支
## 我需要一台性能强大的电脑来运行 SillyTavern 吗?
SillyTavern 采用双分支进行开发,以确保所有用户都能获得流畅的使用体验。
- `release` -🌟 **推荐给大多数用户。** 这是最稳定、最推荐的分支,只有在重大版本推送时才会更新。适合大多数用户使用。通常每月更新一次。
- `staging` - ⚠️ **不建议随意使用。** 该分支拥有最新功能,但要谨慎,因为它随时可能崩溃。仅适用于高级用户和爱好者。每天更新数次。
如果你不熟悉使用 git 命令行,或者不了解什么是分支,别担心!`release` 分支始终是您的首选。
## 除了 SillyTavern,我还需要什么?
由于 SillyTavern 只是一个界面,您需要接入一个 LLM 后端来进行推理。您可以使用 AI Horde 进行开箱即用的聊天。除此之外,我们还支持许多其他本地和基于云的 LLM 后端:OpenAI 兼容 API、KoboldAI、Tabby 等等。您可以在[文档](https://docs.sillytavern.app/usage/api-connections/)中阅读更多关于我们支持的 API 的信息。
### 我需要一台性能强大的电脑来运行 SillyTavern 吗?
硬件要求很低:任何可以运行 NodeJS 18 或更高版本的设备都可以运行它。如果您打算在本地计算机上进行 LLM 推理,我们建议使用至少具有 6GB VRAM 的 3000 系列 NVIDIA 显卡。有关更多详细信息,请查看您后端的文档。
### 建议的后端(非附属)
- [AI Horde](https://aihorde.net/) - 使用志愿者托管的模型。无需进一步设置。
- [KoboldCpp](https://github.com/LostRuins/koboldcpp) - 社区最喜欢的在本地运行 GGUF 模型的工具。
- [tabbyAPI](https://github.com/theroyallab/tabbyAPI) - 一款流行的、轻量级的、本地托管的 exl2 推理 API。
- [OpenRouter](https://openrouter.ai) - 一个适用于许多云提供商(OpenAI、Claude、Meta Llama 等)以及流行社区模型的单一 API。
硬件要求很低:任何可以运行 NodeJS 18 或更高版本的设备都可以运行它。如果您打算在本地计算机上进行 LLM 推理,我们建议使用至少具有 6GB VRAM 的 3000 系列 NVIDIA 显卡,但实际要求可能会根据模型和您使用的后端而有所不同。
## 有问题或建议?
@@ -67,9 +47,9 @@ SillyTavern 采用双分支进行开发,以确保所有用户都能获得流
或者直接与开发人员联系:
- Discord: cohee, rossascends, wolfsblvt
- Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/), [/u/sillylossy](https://www.reddit.com/user/sillylossy/), [u/Wolfsblvt](https://www.reddit.com/user/Wolfsblvt/)
- [提交 GitHub 问题](https://github.com/SillyTavern/SillyTavern/issues)
* Discord: cohee, rossascends, wolfsblvt
* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/), [/u/sillylossy](https://www.reddit.com/user/sillylossy/), [u/Wolfsblvt](https://www.reddit.com/user/Wolfsblvt/)
* [提交 GitHub 问题](https://github.com/SillyTavern/SillyTavern/issues)
### 我喜欢你的项目!我该如何贡献自己的力量?
@@ -82,315 +62,33 @@ SillyTavern 采用双分支进行开发,以确保所有用户都能获得流
<img width="500" alt="image" src="https://github.com/user-attachments/assets/9b5f32f0-c3b3-4102-b3f5-0e9213c0f50f">
<img width="500" alt="image" src="https://github.com/user-attachments/assets/913fdbaa-7d33-42f1-ae2c-89dca41c53d1">
## 角色卡
## 安装
SillyTavern 围绕“角色卡”的概念构建。角色卡是设定 LLM 行为的 Prompt 集合,是在 SillyTavern 中进行持久对话所必需的。它们的功能类似于 ChatGPT 的 GPTs 或 Poe 的 bots。角色卡的内容可以是任何东西:一个抽象的场景、一个为特定任务量身定制的助手、一个著名人物或一个虚构角色。
有关详细的安装说明,请访问我们的文档:
要在不选择角色卡的情况下进行快速对话或仅测试 LLM 连接,只需在打开 SillyTavern 后在欢迎屏幕的输入栏中键入您的 Prompt 输入。这将创建一个空的“助手”角色卡,您可以稍后自定义。
要大致了解如何定义角色卡,请参阅默认角色(Seraphina)或从“下载扩展和资源”菜单中下载选定的社区制作卡片。
## 主要功能
- 高级文本生成设置,包含许多社区制作的预设
- 世界书支持:创建丰富的传说或节省角色卡上的 Token
- 群聊:多机器人房间,供角色与您或彼此交谈
- 丰富的 UI 自定义选项:主题颜色、背景图片、自定义 CSS 等
- 用户角色:让 AI 了解一些关于您的信息,以获得更强的沉浸感
- 内置 RAG 支持:将文档添加到您的聊天中供 AI 参考
- 广泛的聊天命令子系统和自己的[脚本引擎](https://docs.sillytavern.app/usage/st-script/)
## 扩展
SillyTavern 支持扩展。
- 角色情绪表达
- 聊天记录自动摘要
- 自动 UI 和聊天翻译
- Stable Diffusion/FLUX/DALL-E 图像生成
- AI 回复消息的文本转语音(通过 ElevenLabs、Silero 或操作系统的 TTS)
- 网络搜索功能,为您的 Prompt 添加额外的现实世界背景信息
- 更多扩展可从“下载扩展和资源”菜单中下载。
有关如何使用它们的使用教程,请参阅[文档](https://docs.sillytavern.app/)。
## ⌛ 安装
### 🪟 Windows
> \[!WARNING]
>
> - 请勿安装到任何受 Windows 控制的文件夹(Program Files、System32 等)中。
> - 请勿以管理员权限运行 Start.bat
> - 无法在 Windows 7 上安装,因为它无法运行 NodeJS 18.16
#### 通过 Git 安装(推荐)
1. 安装 [NodeJS](https://nodejs.org/en)(建议使用最新的 LTS 版本)
2. 安装 [Git for Windows](https://gitforwindows.org/)
3. 打开 Windows 资源管理器 (`Win+E`)
4. 浏览或创建一个不受 Windows 控制或监控的文件夹(例如:C:\MySpecialFolder\)
5. 通过点击顶部的“地址栏”,输入 `cmd`,然后按 Enter,在该文件夹内打开命令提示符。
6. 弹出黑框(命令提示符)后,键入以下其中一项并按 Enter:
- Release 分支:`git clone https://github.com/SillyTavern/SillyTavern -b release`
- Staging 分支: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
7. 等待所有内容克隆完成后,双击 `Start.bat` 以使 NodeJS 安装其依赖项。
8. 然后服务器将启动,SillyTavern 将在您的浏览器中弹出。
#### 通过 GitHub Desktop 安装
(这**仅**允许在 GitHub Desktop 中使用 git,如果您也想在命令行上使用 `git`,则还需要安装 [Git for Windows](https://gitforwindows.org/))
1. 安装 [NodeJS](https://nodejs.org/en)(建议使用最新的 LTS 版本)
2. 安装 [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32)
3. 安装 GitHub Desktop 后,点击 `Clone a repository from the internet....`(注意:此步骤**无需**创建 GitHub 帐户)
4. 在菜单中,点击 URL 选项卡,输入此 URL `https://github.com/SillyTavern/SillyTavern`,然后点击 Clone。您可以更改本地路径以更改 SillyTavern 的下载位置。
5. 要打开 SillyTavern,请使用 Windows 资源管理器浏览到克隆存储库的文件夹。默认情况下,存储库将克隆到此处:`C:\Users\[您的 Windows 用户名]\Documents\GitHub\SillyTavern`
6. 双击 `start.bat` 文件。(注意:文件名的 `.bat` 部分可能被您的操作系统隐藏,在这种情况下,它将显示为一个名为“`Start`”的文件。双击此文件以运行 SillyTavern)
7. 双击后,应打开一个大的黑色命令控制台窗口,SillyTavern 将开始安装其运行所需的组件。
8. 安装过程完成后,如果一切正常,命令控制台窗口应如下所示,并且您的浏览器中应打开一个 SillyTavern 选项卡:
9. 连接到任何[支持的 API](https://docs.sillytavern.app/usage/api-connections/) 并开始聊天!
### 🐧 Linux & 🍎 MacOS
对于 MacOS / Linux,所有这些都将在终端中完成。
1. 安装 git 和 nodeJS(具体方法取决于您的操作系统)
2. 克隆仓库
- Release 分支:`git clone https://github.com/SillyTavern/SillyTavern -b release`
- Staging 分支: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
3. `cd SillyTavern` 导航到安装文件夹。
4. 使用以下命令之一运行 `start.sh` 脚本:
- `./start.sh`
- `bash start.sh`
## 🐋 通过 Docker 安装
这些说明假定您已安装 Docker,能够访问命令行以安装容器,并熟悉其常规操作。
### 使用 GitHub Container Registry
#### Docker Compose (最简单)
从 [GitHub 仓库](https://github.com/SillyTavern/SillyTavern/blob/release/docker/docker-compose.yml) 获取 `docker-compose.yml` 文件,并在文件所在目录中运行以下命令。这将从 GitHub Container Registry 中拉取最新的 release 镜像并启动容器,自动创建必要的卷。
```shell
docker-compose up
```
根据您的需求自定义 `docker-compose.yml` 文件。默认端口为 8000。如果您想使用环境变量调整服务器配置,请在此处阅读文档:[链接](https://docs.sillytavern.app/administration/config-yaml/#environment-variables)。
#### Docker CLI (高级)
您将需要两个强制性的目录映射和一个端口映射才能使 SillyTavern 正常运行。在命令中,替换以下位置中的选项:
#### 容器变量
##### 卷映射
- `CONFIG_PATH` - SillyTavern 配置文件将存储在主机上的目录
- `DATA_PATH` - SillyTavern 用户数据(包括角色)将存储在主机上的目录
- `PLUGINS_PATH` - (可选) SillyTavern 服务器插件将存储在主机上的目录
- `EXTENSIONS_PATH` - (可选) 全局 UI 扩展将存储在主机上的目录
##### 端口映射
- `PUBLIC_PORT` - 暴露流量的端口。这是强制性的,因为您将从其虚拟机容器外部访问实例。**在未实现单独的安全服务的情况下,请勿将其暴露给互联网。**
##### 附加设置
- `SILLYTAVERN_VERSION` - 在此 GitHub 页面的右侧,您会看到“Packages”。选择“sillytavern”包,您将看到镜像版本。镜像标签“latest”将使您与当前 release 保持同步。您还可以使用指向相应分支的每日镜像的“staging”标签。
#### 运行容器
1. 打开您的命令行
2. 在您要存储配置和数据文件的文件夹中运行以下命令:
```bash
SILLYTAVERN_VERSION="latest"
PUBLIC_PORT="8000"
CONFIG_PATH="./config"
DATA_PATH="./data"
PLUGINS_PATH="./plugins"
EXTENSIONS_PATH="./extensions"
docker run \
--name="sillytavern" \
-p "$PUBLIC_PORT:8000/tcp" \
-v "$CONFIG_PATH:/home/node/app/config:rw" \
-v "$DATA_PATH:/home/node/app/data:rw" \
-v "$EXTENSIONS_PATH:/home/node/app/public/scripts/extensions/third-party:rw" \
-v "$PLUGINS_PATH:/home/node/app/plugins:rw" \
ghcr.io/sillytavern/sillytavern:"$SILLYTAVERN_VERSION"
```
> 默认情况下,容器将在前台运行。如果要在后台运行它,请将 `-d` 标志添加到 `docker run` 命令中。
### 自己构建镜像
我们有一个关于在 Docker 中使用 SillyTavern 的综合指南[在此处](http://docs.sillytavern.app/installation/docker/),涵盖了 Windows、macOS 和 Linux 上的安装!如果您希望自己构建镜像,请阅读它。
## ⚡ 通过 SillyTavern Launcher 安装
SillyTavern Launcher 是一个安装向导,可帮助您进行多种选项的设置,包括为本地推理安装后端。
### 对于 Windows 用户
1. 在键盘上:按 **`WINDOWS + R`** 打开“运行”对话框。然后,运行以下命令安装 git:
```shell
cmd /c winget install -e --id Git.Git
```
2. 在键盘上:按 **`WINDOWS + E`** 打开文件资源管理器,然后导航到要安装启动器的文件夹。进入所需文件夹后,在地址栏中键入 `cmd` 并按 Enter。然后,运行以下命令:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher && start installer.bat
```
### 对于 Linux 用户
1. 打开您喜欢的终端并安装 git
2. 使用以下命令克隆 SillyTavern-Launcher:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
3. 使用以下命令启动 installer.sh:
```shell
chmod +x install.sh && ./install.sh
```
4. 安装后使用以下命令启动 launcher.sh:
```shell
chmod +x launcher.sh && ./launcher.sh
```
### 对于 Mac 用户
1. 打开终端并使用以下命令安装 brew:
```shell
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
```
2. 使用以下命令安装 git:
```shell
brew install git
```
3. 使用以下命令克隆 SillyTavern-Launcher:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
4. 使用以下命令启动 installer.sh:
```shell
chmod +x install.sh && ./install.sh
```
5. 安装后使用以下命令启动 launcher.sh:
```shell
chmod +x launcher.sh && ./launcher.sh
```
## 📱 通过 Termux 在 Android OS 上安装
> \[!NOTE]
> **SillyTavern 可以在 Android 设备上使用 Termux 原生运行,但我们不为此用例提供官方支持。**
>
> **请参阅 ArroganceComplex#2659 编写的本指南:**
>
> - <https://rentry.org/STAI-Termux>
**不支持的平台:android arm LEtime-web。** 32 位 Android 需要一个无法通过 npm 安装的外部依赖项。使用以下命令安装它:`pkg install esbuild`。然后运行常规安装步骤。
## 命令行参数
您可以将命令行参数传递给 SillyTavern 服务器启动脚本,以覆盖 `config.yaml` 中的某些设置。
### 示例
```shell
node server.js --port 8000 --listen false
# 或
npm run start -- --port 8000 --listen false
# 或 (仅限 Windows)
Start.bat --port 8000 --listen false
```
### 支持的参数
> \[!TIP]
> 所有参数都不是必需的。如果您不提供它们,SillyTavern 将使用 `config.yaml` 中的设置。
| 选项 | 描述 | 类型 |
| -------------------------------- | ---------------------------------------------- | ------- |
| `--version` | 显示版本号 | boolean |
| `--configPath` | 覆盖 config.yaml 文件的路径 | string |
| `--dataRoot` | 数据存储的根目录 | string |
| `--port` | 设置 SillyTavern 将在其下运行的端口 | number |
| `--listen` | SillyTavern 将侦听所有网络接口 | boolean |
| `--whitelist` | 启用白名单模式 | boolean |
| `--basicAuthMode` | 启用基本身份验证 | boolean |
| `--enableIPv4` | 启用 IPv4 协议 | boolean |
| `--enableIPv6` | 启用 IPv6 协议 | boolean |
| `--listenAddressIPv4` | 要侦听的特定 IPv4 地址 | string |
| `--listenAddressIPv6` | 要侦听的特定 IPv6 地址 | string |
| `--dnsPreferIPv6` | DNS 首选 IPv6 | boolean |
| `--ssl` | 启用 SSL | boolean |
| `--certPath` | 您的证书文件路径 | string |
| `--keyPath` | 您的私钥文件路径 | string |
| `--browserLaunchEnabled` | 自动在浏览器中启动 SillyTavern | boolean |
| `--browserLaunchHostname` | 自动运行主机名 | string |
| `--browserLaunchPort` | 覆盖自动运行的端口 | string |
| `--browserLaunchAvoidLocalhost` | 在自动模式下避免使用 'localhost' 进行自动运行 | boolean |
| `--corsProxy` | 启用 CORS 代理 | boolean |
| `--requestProxyEnabled` | 为传出请求启用代理 | boolean |
| `--requestProxyUrl` | 请求代理 URL(HTTP 或 SOCKS 协议) | string |
| `--requestProxyBypass` | 请求代理绕过列表(以空格分隔的主机列表) | array |
| `--disableCsrf` | 禁用 CSRF 保护(不推荐) | boolean |
## 远程连接
这通常适用于那些想在手机上使用 SillyTavern,而他们的电脑在同一 Wi-Fi 网络上运行 ST 服务器的人。但是,它也可以用于允许从任何地方进行远程连接。
请在[文档](https://docs.sillytavern.app/usage/remoteconnections/)中阅读有关如何设置远程连接的详细指南。
您可能还需要配置 SillyTavern 用户配置文件(可选密码保护):[用户](https://docs.sillytavern.app/administration/multi-user/)。
* **[Windows 安装指南](https://docs.sillytavern.app/installation/windows/)**
* **[MacOS/Linux 安装指南](https://docs.sillytavern.app/installation/linuxmacos/)**
* **[Android (Termux) 安装指南](https://docs.sillytavern.app/installation/android-(termux)/)**
* **[Docker 安装指南](https://docs.sillytavern.app/installation/docker/)**
## 许可证和致谢
**本程序的分发是希望它能有用,但不提供任何保证;甚至没有对适销性或特定用途适用性的默示保证。有关更多详细信息,请参阅 GNU Affero 通用公共许可证。**
- [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 by Humi: MIT 许可证
- CncAnon 的 TavernAITurbo mod 的部分内容经许可使用
- 视觉小说模式的灵感来自 PepperTaco 的工作 (<https://github.com/peppertaco/Tavern/>)
- Noto Sans 字体 by Google (OFL 许可证)
- 图标主题 by Font Awesome <https://fontawesome.com> (图标: CC BY 4.0, 字体: SIL OFL 1.1, 代码: MIT 许可证)
- 默认内容由 @OtisAlejandro (Seraphina 角色和世界书) 和 @kallmeflocc (10K Discord 用户庆祝背景) 提供
- Docker 指南由 [@mrguymiah](https://github.com/mrguymiah) 和 [@Bronya-Rand](https://github.com/Bronya-Rand) 提供
- kokoro-js 库由 [@hexgrad](https://github.com/hexgrad) 提供 (Apache-2.0 许可证)
- 中文翻译由 [@XXpE3](https://github.com/XXpE3) 完成,中文 ISSUES 可以联系 @XXpE3
* [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 by Humi: MIT 许可证
* CncAnon 的 TavernAITurbo mod 的部分内容经许可使用
* 视觉小说模式的灵感来自 PepperTaco 的工作 (<https://github.com/peppertaco/Tavern/>)
* Noto Sans 字体 by Google (OFL 许可证)
* 图标主题 by Font Awesome <https://fontawesome.com> (图标: CC BY 4.0, 字体: SIL OFL 1.1, 代码: MIT 许可证)
* 默认内容由 @OtisAlejandro (Seraphina 角色和世界书) 和 @kallmeflocc (10K Discord 用户庆祝背景) 提供
* Docker 指南由 [@mrguymiah](https://github.com/mrguymiah) 和 [@Bronya-Rand](https://github.com/Bronya-Rand) 提供
* kokoro-js 库由 [@hexgrad](https://github.com/hexgrad) 提供 (Apache-2.0 许可证)
## 主要贡献者
[![Contributors](https://contrib.rocks/image?repo=SillyTavern/SillyTavern)](https://github.com/SillyTavern/SillyTavern/graphs/contributors)
<!-- LINK GROUP -->
[cover]: https://github.com/user-attachments/assets/01a6ae9a-16aa-45f2-8bff-32b5dc587e44
[discord-link]: https://discord.gg/sillytavern
[discord-shield-badge]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge
+11 -298
View File
@@ -10,7 +10,7 @@
[English](readme.md) | [German](readme-de_de.md) | [中文](readme-zh_cn.md) | 繁體中文 | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md) | [한국어](readme-ko_kr.md)
[![GitHub 星標](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers)
[![GitHub 分支](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network)
[![GitHub 分支](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/forks)
[![GitHub 問題](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues)
[![GitHub 拉取請求](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls)
@@ -26,7 +26,7 @@ SillyTavern 提供一個統一的前端介面,整合多種大型語言模型
SillyTavern(簡稱 ST)是一款本地安裝的使用者介面,讓您能與大型語言模型(LLM)、影像生成引擎以及語音合成模型互動的前端。
SillyTavern 起源於 2023 年 2 月,作為 TavernAI 1.2.8 的分支版本發展至今。目前已有超過 100 位貢獻者,並擁有超過兩年的獨立開發歷史。如今,它已成為 AI 愛好者中備受推崇的軟體之一。
SillyTavern 起源於 2023 年 2 月,作為 TavernAI 1.2.8 的分支版本發展至今。目前已有超過 200 位貢獻者,並擁有超過兩年的獨立開發歷史。如今,它已成為 AI 愛好者中備受推崇的軟體之一。
## 我們的願景
@@ -34,29 +34,9 @@ SillyTavern 起源於 2023 年 2 月,作為 TavernAI 1.2.8 的分支版本發
2. 我們不提供任何線上或託管服務,也不會程式化追蹤任何使用者數據。
3. SillyTavern 是由一群熱衷於 LLM 的開發者社群所打造的專案,並將永遠保持免費與開源。
## 分支介紹
## 我需要高效能電腦才能運行 SillyTavern 嗎?
SillyTavern 採用雙分支開發模式,確保為所有使用者提供流暢的體驗。
* `release`(穩定版):🌟 **推薦給大部分的使用者使用。** 此分支最為穩定,僅在主要版本發布時更新。適合大多數人,通常每月更新一次。
* `staging`(開發版):⚠️ **不建議普通使用者使用。** 此分支包含最新功能,但可能隨時出現問題。適合進階使用者與愛好者,每日多次更新。
如果您不熟悉 git CLI 或對分支概念不清楚,請放心,對您來說,`release`(穩定版)分支永遠是首選。
## 使用 SillyTavern 需要什麼?
由於 SillyTavern 僅是一個介面,您需要一個 LLM 後端來提供推理能力。您可以使用 AI Horde 以立即開始聊天。此外,我們支持許多其他本地和雲端 LLM 後端,例如 OpenAI 兼容 API、KoboldAI、Tabby 等。更多支持的 API 資訊,請參閱 [常見問題](https://docs.sillytavern.app/usage/api-connections/)。
### 我需要高效能電腦才能運行 SillyTavern 嗎?
SillyTavern 的硬體需求相當低。任何能夠運行 NodeJS 18 或更高版本的設備都可以執行。若您打算在本地機器上進行 LLM 推理,我們建議使用擁有至少 6GB VRAM 的 3000 系列 NVIDIA 顯示卡。更多詳細資訊,請參考您使用的後端文檔。
### 推薦後端(僅為推薦,非官方合作和隸屬關係)
* [AI Horde](https://aihorde.net/):使用志願者託管的模型,無需進一步設定
* [KoboldCpp](https://github.com/LostRuins/koboldcpp):社群推崇的選擇,可在本地運行 GGUF 模型
* [tabbyAPI](https://github.com/theroyallab/tabbyAPI):一個流行且輕量的本地託管 exl2 推理 API
* [OpenRouter](https://openrouter.ai):提供多個雲端 LLM 提供商(如 OpenAI、Claude、Meta Llama 等)及熱門社群模型的單一 API
SillyTavern 的硬體需求相當低。任何能夠運行 NodeJS 18 或更高版本的設備都可以執行。若您打算在本地機器上進行 LLM 推理,我們建議使用擁有至少 6GB VRAM 的 3000 系列 NVIDIA 顯示卡,但實際需求可能因模型和您使用的後端而異。
## 有任何問題或建議?
@@ -82,287 +62,19 @@ SillyTavern 的硬體需求相當低。任何能夠運行 NodeJS 18 或更高版
<img width="500" alt="image" src="https://github.com/user-attachments/assets/9b5f32f0-c3b3-4102-b3f5-0e9213c0f50f">
<img width="500" alt="image" src="https://github.com/user-attachments/assets/913fdbaa-7d33-42f1-ae2c-89dca41c53d1">
## 角色卡
## 安裝指南
SillyTavern 的核心概念是「角色卡」(Character Cards)。角色卡是一組設定 LLM 行為的提示詞,用於 SillyTavern 中進行持續性對話。功能類似於 ChatGPT 的 GPT 或 Poe 的聊天機器人。角色卡的內容可以是任何形式:抽象場景、針對特定任務設計的助手、知名人物,或者虛構角色。
有關詳細的安裝說明,請訪問我們的文檔:
角色卡中唯一必填的項目是名稱欄位。若想與語言模型開始一般對話,您只需創建一個名稱為「Assistant」的新卡片,其餘欄位皆可保持空白。若希望進行更具主題性的對話,則可以提供語言模型背景資訊、行為模式、寫作風格以及特定情境來啟動聊天。
如果僅想進行快速對話而不選擇角色卡片,或想測試 LLM 的連線,則可在開啟 SillyTavern 後,於歡迎頁面的輸入欄位中直接輸入您的提示內容。請注意,這類對話是暫時的,不會被永久保存。
若想了解如何設定角色卡,可參考預設角色(如 Seraphina)或從「下載擴充功能 & 資源」(Download Extensions & Assets)選單中下載社群製作的角色卡。
## 核心功能
* 進階文本生成設定:內含許多社群製作的預設設定
* 支援世界資訊(World Info):創建豐富的背景故事,或節省角色卡中的 Token(符元)使用
* 群組聊天:多角色聊天室,可讓角色與您或彼此對話
* 豐富的 UI 自定義選項:主題顏色、背景圖片、自定義 CSS 等
* 使用者設定:讓 AI 更了解您並提升沉浸感
* 內建 RAG 支持:可將文檔加入對話,供 AI 參考
* 強大的聊天指令子系統:內含 [腳本引擎(Scripting Engine)](https://docs.sillytavern.app/usage/st-script/)
## 擴充功能
SillyTavern 支持多種擴充功能。
* 角色情感表達:使用視覺圖片(立繪)呈現情緒表達
* 聊天記錄自動摘要
* 自動化介面與聊天翻譯
* 穩定擴散(Stable Diffusion)、FLUX 和 DALL-E 的影像生成整合
* 語音合成:AI 回應的訊息可使用 ElevenLabs、Silero 或系統 TTS 語音合成
* 網頁搜尋功能:為提示詞添加真實世界的上下文資訊
* 更多擴展:可從「下載擴充功能 & 資源」(Download Extensions & Assets)選單中下載
想了解如何使用這些擴充功能,請參考:[官方說明文件](https://docs.sillytavern.app/)
# ⌛ 安裝指南
> \[!WARNING]
>
> * 請勿將程式安裝到 Windows 的系統控制資料夾(如 Program Files、System32 等)
> * 請勿以管理員權限執行 Start.bat
> * 無法在 Windows 7 系統上安裝,因為它無法執行 NodeJS 18.16
## 🪟 Windows
### 使用 Git 安裝
1. 安裝 [NodeJS](https://nodejs.org/en)(建議使用最新的 LTS 版本)
2. 安裝 [Git for Windows](https://gitforwindows.org/)
3. 打開 Windows 檔案總管(`Win+E`)
4. 創建/使用一個不受 Windows 系統控制或監控的資料夾(例如:C:\MySpecialFolder\)
5. 在該資料夾內開啟命令提示字元(Command Prompt):點擊地址欄,輸入 `cmd` 並按下 Enter
6. 當命令提示字元黑框彈出時,輸入以下其中一條指令後,按下 Enter:
* 安裝 Release(穩定版)分支:`git clone https://github.com/SillyTavern/SillyTavern -b release`
* 安裝 Staging(開發板)分支:`git clone https://github.com/SillyTavern/SillyTavern -b staging`
7. 當程式碼下載完成後,雙擊 `Start.bat`,NodeJS 將自動安裝所需的依賴項
8. 本地伺服器啟動後,SillyTavern 將自動在您的瀏覽器中打開
### 使用 GitHub Desktop 安裝
(此方式僅允許通過 GitHub Desktop 使用 git。如果您也希望在命令列中使用 `git`,則需額外安裝 [Git for Windows](https://gitforwindows.org/))
1. 安裝 [NodeJS](https://nodejs.org/en)(建議使用最新的 LTS 版本)
2. 安裝 [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32)
3. 安裝完成後,打開 GitHub Desktop,點擊 `Clone a repository from the internet....` (注意:此步驟 **無需創建 GitHub 帳號**。)
4. 在彈出選單中,點擊「URL」選項,輸入此網址:`https://github.com/SillyTavern/SillyTavern`,然後點擊「Clone」。您可以更改「Local path」來選擇 SillyTavern 的下載位置
6. 若想開啟 SillyTavern,需使用 Windows 檔案總管以進入您複製儲存庫的資料夾。預設位置為:`C:\Users\[您的 Windows 使用者名稱]\Documents\GitHub\SillyTavern`
7. 雙擊 `start.bat` 文件。(請注意:若您的作業系統隱藏了 `.bat` 副檔名,該文件可能顯示為「`Start`」。這就是您需要雙擊運行的文件。)
8. 雙擊後,將會彈出一個大型黑色的命令提示字元視窗,SillyTavern 會開始安裝其運行所需的文件與依賴
9. 安裝完成後,若一切正常,命令提示字元視窗應顯示運行中的訊息,且您的瀏覽器會自動打開 SillyTavern 頁籤
10. 連接到任何 SillyTavern [支援的 APIs](https://docs.sillytavern.app/usage/api-connections/) 並開始聊天吧!
## 🐧 Linux & 🍎 MacOS
對於 MacOS 和 Linux 系統,所有操作都將在終端機(Terminal)中完成。
1. 安裝 git 和 NodeJS(具體方法因操作系統而異)
2. 複製儲存庫(Clone the repo):
* 安裝 Release(穩定版)分支:`git clone https://github.com/SillyTavern/SillyTavern -b release`
* 安裝 Staging(開發板)分支:`git clone https://github.com/SillyTavern/SillyTavern -b staging`
3. 使用命令 `cd SillyTavern` 以進入安裝資料夾
4. 使用以下其中一條命令,以執行 `start.sh` 腳本:
* `./start.sh`
* `bash start.sh`
## ⚡ 使用 SillyTavern Launcher 安裝
SillyTavern Launcher 是一個安裝嚮導,協助您設定多種選項,包括安裝本地推理(inference)的後端。
### 對於 Windows 使用者
1. 在鍵盤上按下 **`WINDOWS + R`** 打開「執行」對話框,然後輸入以下指令以安裝 git:
```shell
cmd /c winget install -e --id Git.Git
```
2. 在鍵盤上按下 **`WINDOWS + E`** 打開檔案總管,導航至您想要安裝 Launcher 的資料夾。在目標資料夾的地址欄輸入 `cmd` 並按下 Enter。接著執行以下命令:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher && start installer.bat
```
### 對於 Linux 使用者
1. 打開您喜歡的終端機(Terminal),安裝 git
2. 使用以下指令以複製 Sillytavern-Launcher:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
3. 執行安裝腳本(installer.sh):
```shell
chmod +x install.sh && ./install.sh
```
4. 安裝完成後,執行啟動腳本(launcher.sh):
```shell
chmod +x launcher.sh && ./launcher.sh
```
### 對於 Mac 使用者
1. 打開終端機(Terminal),並使用以下指令安裝 Homebrew:
```shell
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
```
2. 使用 Homebrew 以安裝 git:
```shell
brew install git
```
3. 使用以下指令以複製 Sillytavern-Launcher:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
4. 執行安裝腳本(installer.sh):
```shell
chmod +x install.sh && ./install.sh
```
5. 安裝完成後,執行啟動腳本(launcher.sh):
```shell
chmod +x launcher.sh && ./launcher.sh
```
## 🐋 使用 Docker 安裝
以下指南已假設您安裝 Docker,能夠訪問命令列進行容器安裝,並熟悉 Docker 的基本使用。
### 自行構建映像
我們提供了一份完整的 [SillyTavern Docker 使用指南](http://docs.sillytavern.app/installation/docker/)。該指南涵蓋了 Windows、macOS 和 Linux 的安裝過程。若您希望自行構建映像,建議先閱讀該文檔。
### 使用 GitHub 容器註冊表(最簡易的方式)
您需要設定兩個必要的目錄映射(directory mappings)和一個端口映射(port mapping)來使 SillyTavern 正常運行。在執行指令時,請將以下佔位符替換為您的實際配置:
#### 容器變數
##### 目錄映射(Volume Mappings)
* [config]:用於存放 SillyTavern 設定文件的本地資料夾
* [data]:用於存放 SillyTavern 使用者數據(包括角色)的本地資料夾
* [plugins](可選):用於存放 SillyTavern 擴充功能的本地資料夾
##### 端口映射(Port Mappings)
* [PublicPort]:對外流量的訪問端口。這是必需的,因為您將從虛擬機容器外部訪問實例。除非實施了額外的安全服務,否則請勿將此端口暴露於網路
##### 其他設定(Additional Settings)
* [DockerNet]:容器應連接的 Docker 網路。如果您不熟悉此概念,請參閱 [Docker 官方說明文件](https://docs.docker.com/reference/cli/docker/network/)
* [version]:在 GitHub 頁面的右側,您可以找到「Packages」。選擇「sillytavern」包,然後查看映像版本。「latest」標籤會使您保持與當前版本同步。您也可以選擇「staging」或「release」標籤,但這可能不適用於依賴擴充功能的使用者,因為擴充功能可能需要時間進行更新
#### 安裝命令
1. 打開命令列(Command Line)
2. 執行以下指令:
`docker create --name='sillytavern' --net='[DockerNet]' -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
> 請注意:默認的監聽端口為 8000。如果您在設定文件中更改了此端口,請務必使用適當的端口號
## 📱 於 Android 系統中使用 Termux 安裝
> \[!NOTE]
> **雖然您可以在 Android 設備上使用 Termux 直接運行 SillyTavern,但這不在我們的官方支持範圍內。**
>
> **請參閱 ArroganceComplex#2659 所提供的指南:**
>
> * <https://rentry.org/STAI-Termux>
**不支援:Android ARM LEtime-web。** 32 位 Android 系統需要額外的依賴項,這無法通過 npm 安裝。請使用以下命令安裝:`pkg install esbuild`。完成後,請按照普通的安裝步驟進行操作
## API 金鑰管理
SillyTavern 將您的 API 金鑰(Keys)保存在使用者數據目錄中的 `secrets.json` 文件內(默認路徑為`/data/default-user/secrets.json`)
默認情況下,API 金鑰在您保存並重新載入頁面後,將不會自介面中顯示
如需啟用查看金鑰功能:
1. 在 `config.yaml` 文件中,將 `allowKeysExposure` 的「值」設為 `true`
2. 重新啟動 SillyTavern 伺服器
3. 點擊 API 連線頁面右下角的「查看隱藏的 API 金鑰(View hidden API keys)」超連結
## 命令列參數(Command-line Arguments)
您可以在啟動 SillyTavern 伺服器時傳遞命令列參數,以覆蓋 `config.yaml` 文件中的某些設定。
### 範例
```shell
node server.js --port 8000 --listen false
# or
npm run start -- --port 8000 --listen false
# or(僅適用於 Windows)
Start.bat --port 8000 --listen false
```
### Supported arguments
| Option | Description | Type |
|----------------------------------|---------------------------------------------|---------|
| `--version` | 顯示版本序號 | boolean |
| `--enableIPv6` | 啟用 IPv6 | boolean |
| `--enableIPv4` | 啟用 IPv4 | boolean |
| `--port` | 設定 SillyTavern 運行的端口。 | number |
| `--dnsPreferIPv6` | 偏好使用 IPv6 解析 DNS。 | boolean |
| `--browserLaunchEnabled` | 自動在瀏覽器中啟動 SillyTavern。 | boolean |
| `--browserLaunchHostname` | 自動啟動時的主機名稱,通常建議保持為 'auto' | string |
| `--browserLaunchPort` | 覆蓋自動啟動的端口設定 | string |
| `--browserLaunchAvoidLocalhost` | 在自動模式下避免使用 'localhost' | boolean |
| `--listen` | SillyTavern 是否可監聽所有網路接口。 | boolean |
| `--corsProxy` | 啟用 CORS 代理。 | boolean |
| `--disableCsrf` | 停用 CSRF 保護 | boolean |
| `--ssl` | 啟用 SSL | boolean |
| `--certPath` | 設定您證書文件的路徑 | string |
| `--keyPath` | 設定您私人金鑰文件的路徑 | string |
| `--whitelist` | 啟用白名單模式 | boolean |
| `--dataRoot` | 設定數據儲存的根目錄 | string |
| `--basicAuthMode` | 啟用基本身份驗證模式 | boolean |
| `--requestProxyEnabled` | 啟用代理以處理外部請求 | boolean |
| `--requestProxyUrl` | 設定請求代理的 URL(支持 HTTP 或 SOCKS 協議)| string |
| `--requestProxyBypass` | 請求代理的例外主機清單(主機列表需以空格分隔)| array |
## 遠端連線
遠端連線功能最常用於希望在手機上使用 SillyTavern 的使用者。此時伺服器將由同一 Wi-Fi 網路上的 PC 運行。不過,您也可以設定來自其他網路的遠端連線。
詳細設定指南請參閱 [官方說明文件](https://docs.sillytavern.app/usage/remoteconnections/)。
您還可以選擇設定 SillyTavern 的使用者檔案,並開啟密碼保護(可選):[使用者設定指南](https://docs.sillytavern.app/installation/st-1.12.0-migration-guide/#users)。
## 遇到任何效能問題?
1. 在「使用者設定」選單(設定介面主題)中,禁用模糊效果(Blur Effect),並開啟「減少動畫效果」(Reduced Motion)
2. 若使用響應串流傳輸,請將串流的 FPS 設定為較低的值(建議設定為 10-15 FPS)
3. 確保瀏覽器已啟用 GPU 加速以進行渲染
* **[Windows 安裝指南](https://docs.sillytavern.app/installation/windows/)**
* **[MacOS/Linux 安裝指南](https://docs.sillytavern.app/installation/linuxmacos/)**
* **[Android (Termux) 安裝指南](https://docs.sillytavern.app/installation/android-(termux)/)**
* **[Docker 安裝指南](https://docs.sillytavern.app/installation/docker/)**
## 授權與致謝
**本程式(SillyTavern)的發布是基於其可能對使用者有所幫助的期許,但不提供任何形式的保證;包括但不限於對可銷售性(marketability)或特定用途適用性的隱含保證。如需更多詳情,請參閱 GNU Affero 通用公共許可證。**
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
* [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 由 Humi 提供:MIT 許可
* 經授權使用部分來自 CncAnon 的 TavernAITurbo 模組
* 視覺小說模式(Visual Novel Mode)的靈感,來源於 PepperTaco 的貢獻(<https://github.com/peppertaco/Tavern/>)
@@ -370,6 +82,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
* 主題圖示由 Font Awesome <https://fontawesome.com> 提供(圖示:CC BY 4.0,字體:SIL OFL 1.1,程式碼:MIT 許可)
* 預設資源來源於 @OtisAlejandro(包含角色 Seraphina 與知識書)與 @kallmeflocc(SillyTavern 官方 Discord 伺服器成員突破 10K 的慶祝背景)
* Docker 安裝指南由 [@mrguymiah](https://github.com/mrguymiah) 和 [@Bronya-Rand](https://github.com/Bronya-Rand) 編寫
* kokoro-js 函式庫由 [@hexgrad](https://github.com/hexgrad) 提供 (Apache-2.0 許可)
## 主要貢獻者
+8 -330
View File
@@ -31,29 +31,9 @@ Beginning in February 2023 as a fork of TavernAI 1.2.8, SillyTavern now has over
2. We do not provide any online or hosted services, nor programmatically track any user data.
3. SillyTavern is a passion project brought to you by a dedicated community of LLM enthusiasts, and will always be free and open sourced.
## Branches
## Do I need a powerful PC to run SillyTavern?
SillyTavern is being developed using a two-branch system to ensure a smooth experience for all users.
* `release` -🌟 **Recommended for most users.** This is the most stable and recommended branch, updated only when major releases are pushed. It's suitable for the majority of users. Typically updated once a month.
* `staging` - ⚠️ **Not recommended for casual use.** This branch has the latest features, but be cautious as it may break at any time. Only for power users and enthusiasts. Updates several times daily.
If you're not familiar with using the git CLI or don't understand what a branch is, don't worry! The release branch is always the preferable option for you.
## What do I need other than SillyTavern?
Since SillyTavern is only an interface, you will need access to an LLM backend to provide inference. You can use AI Horde for instant out-of-the-box chatting. Aside from that, we support many other local and cloud-based LLM backends: OpenAI-compatible API, KoboldAI, Tabby, and many more. You can read more about our supported APIs in [the Docs](https://docs.sillytavern.app/usage/api-connections/).
### Do I need a powerful PC to run SillyTavern?
The hardware requirements are minimal: it will run on anything that can run NodeJS 18 or higher. If you intend to do LLM inference on your local machine, we recommend a 3000-series NVIDIA graphics card with at least 6GB of VRAM. Check your backend's documentation for more details.
### Suggested Backends (not affiliated)
* [AI Horde](https://aihorde.net/) - use models hosted by volunteers. Requires no further setup
* [KoboldCpp](https://github.com/LostRuins/koboldcpp) - a community's favorite for running GGUF models locally
* [tabbyAPI](https://github.com/theroyallab/tabbyAPI) - a popular, lightweight, locally-hosted exl2 inference API
* [OpenRouter](https://openrouter.ai) - a single API for many cloud providers (OpenAI, Claude, Meta Llama, etc.) as well as popular community models.
The hardware requirements are minimal: it will run on anything that can run NodeJS 18 or higher. If you intend to do LLM inference on your local machine, we recommend a 3000-series NVIDIA graphics card with at least 6GB of VRAM, but actual requirements may vary depending on the model and backend you choose to use.
## Questions or suggestions?
@@ -79,316 +59,14 @@ Or get in touch with the developers directly:
<img width="500" alt="image" src="https://github.com/user-attachments/assets/9b5f32f0-c3b3-4102-b3f5-0e9213c0f50f">
<img width="500" alt="image" src="https://github.com/user-attachments/assets/913fdbaa-7d33-42f1-ae2c-89dca41c53d1">
## Character Cards
## Installation
SillyTavern is built around the concept of "character cards". A character card is a collection of prompts that set the behavior of the LLM and is required to have persistent conversations in SillyTavern. They function similarly to ChatGPT's GPTs or Poe's bots. The content of a character card can be anything: an abstract scenario, an assistant tailored for a specific task, a famous personality or a fictional character.
For detailed installation instructions, please visit our documentation:
To have a quick conversation without selecting a character card or to just test the LLM connection, simply type your prompt input into the input bar on the Welcome Screen after opening SillyTavern. This will create an empty "Assistant" character card that you can customize later.
To get a general idea on how to define character cards, see the default character (Seraphina) or download selected community-made cards from the "Download Extensions & Assets" menu.
## Key Features
* Advanced text generation settings with many community-made presets
* World Info support: create rich lore or save tokens on your character card
* Group chats: multi-bot rooms for characters to talk to you and/or each other
* Rich UI customization options: theme colors, background images, custom CSS, and more
* User personas: let the AI know a bit about you for greater immersion
* Built-in RAG support: add documents to your chats for the AI to reference
* Extensive chat commands subsystem and own [scripting engine](https://docs.sillytavern.app/usage/st-script/)
## Extensions
SillyTavern has extensibility support.
* Character emotional expressions (sprites)
* Auto-Summary of the chat history
* Automatic UI and chat translation
* Stable Diffusion/FLUX/DALL-E image generation
* Text-to-speech for AI response messages (via ElevenLabs, Silero, or the OS's System TTS)
* Web Search capabilities for adding additional real world context to your prompts
* Many more are available to download from the "Download Extensions & Assets" menu.
Tutorials on how to use them can be found in the [Docs](https://docs.sillytavern.app/).
## ⌛ Installation
### 🪟 Windows
> \[!WARNING]
>
> * DO NOT INSTALL INTO ANY WINDOWS CONTROLLED FOLDER (Program Files, System32, etc).
> * DO NOT RUN START.BAT WITH ADMIN PERMISSIONS
> * INSTALLATION ON WINDOWS 7 IS IMPOSSIBLE AS IT CAN NOT RUN NODEJS 18.16
#### Installing via Git (recommended)
1. Install [NodeJS](https://nodejs.org/en) (latest LTS version is recommended)
2. Install [Git for Windows](https://gitforwindows.org/)
3. Open Windows Explorer (`Win+E`)
4. Browse to or Create a folder that is not controlled or monitored by Windows. (ex: C:\MySpecialFolder\)
5. Open a Command Prompt inside that folder by clicking in the 'Address Bar' at the top, typing `cmd`, and pressing Enter.
6. Once the black box (Command Prompt) pops up, type ONE of the following into it and press Enter:
* for Release Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release`
* for Staging Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
7. Once everything is cloned, double-click `Start.bat` to make NodeJS install its requirements.
8. The server will then start, and SillyTavern will pop up in your browser.
#### Installing via GitHub Desktop
(This allows git usage **only** in GitHub Desktop, if you want to use `git` on the command line too, you also need to install [Git for Windows](https://gitforwindows.org/))
1. Install [NodeJS](https://nodejs.org/en) (latest LTS version is recommended)
2. Install [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32)
3. After installing GitHub Desktop, click on `Clone a repository from the internet....` (Note: You **do NOT need** to create a GitHub account for this step)
4. On the menu, click the URL tab, enter this URL `https://github.com/SillyTavern/SillyTavern`, and click Clone. You can change the Local path to change where SillyTavern is going to be downloaded.
6. To open SillyTavern, use Windows Explorer to browse into the folder where you cloned the repository. By default, the repository will be cloned here: `C:\Users\[Your Windows Username]\Documents\GitHub\SillyTavern`
7. Double-click on the `start.bat` file. (Note: the `.bat` part of the file name might be hidden by your OS, in that case, it will look like a file called "`Start`". This is what you double-click to run SillyTavern)
8. After double-clicking, a large black command console window should open and SillyTavern will begin to install what it needs to operate.
9. After the installation process, if everything is working, the command console window should look like this and a SillyTavern tab should be open in your browser:
10. Connect to any of the [supported APIs](https://docs.sillytavern.app/usage/api-connections/) and start chatting!
### 🐧 Linux & 🍎 MacOS
For MacOS / Linux all of these will be done in a Terminal.
1. Install git and nodeJS (the method for doing this will vary depending on your OS)
2. Clone the repo
* for Release Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release`
* for Staging Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging`
3. `cd SillyTavern` to navigate into the install folder.
4. Run the `start.sh` script with one of these commands:
* `./start.sh`
* `bash start.sh`
## 🐋 Installing via Docker
These instructions assume you have installed Docker, are able to access your command line for the installation of containers, and familiar with their general operation.
### Using the GitHub Container Registry
#### Docker Compose (easiest)
Grab the `docker-compose.yml` file from the [GitHub Repository](https://github.com/SillyTavern/SillyTavern/blob/release/docker/docker-compose.yml) and run the following command in the directory where the file is located. This will pull the latest release image from the GitHub Container Registry and start the container, automatically creating the necessary volumes.
```shell
docker-compose up
```
Customize the `docker-compose.yml` file to your needs. The default port is 8000. If you want to adjust the server configuration using environment variables, read the documentation [here](https://docs.sillytavern.app/administration/config-yaml/#environment-variables).
#### Docker CLI (advanced)
You will need two mandatory directory mappings and a port mapping to allow SillyTavern to function. In the command, replace your selections in the following places:
#### Container Variables
##### Volume Mappings
* `CONFIG_PATH` - The directory where SillyTavern configuration files will be stored on your host machine
* `DATA_PATH` - The directory where SillyTavern user data (including characters) will be stored on your host machine
* `PLUGINS_PATH` - (optional) The directory where SillyTavern server plugins will be stored on your host machine
* `EXTENSIONS_PATH` - (optional) The directory where global UI extensions will be stored on your host machine
##### Port Mappings
* `PUBLIC_PORT` - The port to expose the traffic on. This is mandatory, as you will be accessing the instance from outside of its virtual machine container. DO NOT expose this to the internet without implementing a separate service for security.
##### Additional Settings
* `SILLYTAVERN_VERSION` - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" that points to the nightly image of the respective branch.
#### Running the container
1. Open your Command Line
2. Run the following command in a folder where you want to store the configuration and data files:
```bash
SILLYTAVERN_VERSION="latest"
PUBLIC_PORT="8000"
CONFIG_PATH="./config"
DATA_PATH="./data"
PLUGINS_PATH="./plugins"
EXTENSIONS_PATH="./extensions"
docker run \
--name="sillytavern" \
-p "$PUBLIC_PORT:8000/tcp" \
-v "$CONFIG_PATH:/home/node/app/config:rw" \
-v "$DATA_PATH:/home/node/app/data:rw" \
-v "$EXTENSIONS_PATH:/home/node/app/public/scripts/extensions/third-party:rw" \
-v "$PLUGINS_PATH:/home/node/app/plugins:rw" \
ghcr.io/sillytavern/sillytavern:"$SILLYTAVERN_VERSION"
```
> By default the container will run in the foreground. If you want to run it in the background, add the `-d` flag to the `docker run` command.
### Building the image yourself
We have a comprehensive guide on using SillyTavern in Docker [here](http://docs.sillytavern.app/installation/docker/) which covers installations on Windows, macOS and Linux! Give it a read if you wish to build the image yourself.
### Common issues with Docker
#### SELinux Permission Issues with Mounted Volumes
Linux distributions with SELinux enabled (such as RHEL, CentOS, Fedora, etc.) may prevent Docker containers from accessing mounted volumes due to security policies. This can result in permission denied errors when the container tries to read or write to the mounted directories.
Two suffixes `:z` or `:Z` can be added to the volume mount. These suffixes tell Docker to relabel file objects on the shared volumes.
* The `z` option is used when the volume content will be shared between containers.
* The `Z` option is used when the volume content should only be used by the current container.
Example:
```yaml
# docker-compose.yml
volumes:
## Shared volume
- ./config:/home/node/app/config:z
## Private volume
- ./data:/home/node/app/data:Z
```
## ⚡ Installing via SillyTavern Launcher
SillyTavern Launcher is an installation wizard that will help you get setup with many options, including installing a backend for local inference.
### For Windows users
1. On your keyboard: press **`WINDOWS + R`** to open Run dialog box. Then, run the following command to install git:
```shell
cmd /c winget install -e --id Git.Git
```
2. On your keyboard: press **`WINDOWS + E`** to open File Explorer, then navigate to the folder where you want to install the launcher. Once in the desired folder, type `cmd` into the address bar and press enter. Then, run the following command:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher && start installer.bat
```
### For Linux users
1. Open your favorite terminal and install git
2. Git clone the Sillytavern-Launcher with:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
3. Start the installer.sh with:
```shell
chmod +x install.sh && ./install.sh
```
4. After installation start the launcher.sh with:
```shell
chmod +x launcher.sh && ./launcher.sh
```
### For Mac users
1. Open a terminal and install brew with:
```shell
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
```
2. Install git with:
```shell
brew install git
```
3. Git clone the Sillytavern-Launcher with:
```shell
git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher
```
4. Start the installer.sh with:
```shell
chmod +x install.sh && ./install.sh
```
5. After installation start the launcher.sh with:
```shell
chmod +x launcher.sh && ./launcher.sh
```
## 📱 Installing via Termux on Android OS
> \[!NOTE]
> **SillyTavern can be run natively on Android devices using Termux, but we do not provide official support for this use case.**
>
> **Please refer to this guide by ArroganceComplex#2659:**
>
> * <https://rentry.org/STAI-Termux>
**Unsupported platform: android arm LEtime-web.** 32-bit Android requires an external dependency that can't be installed with npm. Use the following command to install it: `pkg install esbuild`. Then run the usual installation steps.
## Command-line arguments
You can pass command-line arguments to SillyTavern server startup to override some settings in `config.yaml`.
### Examples
```shell
node server.js --port 8000 --listen false
# or
npm run start -- --port 8000 --listen false
# or (Windows only)
Start.bat --port 8000 --listen false
```
### Supported arguments
> \[!TIP]
> None of the arguments are required. If you don't provide them, SillyTavern will use the settings in `config.yaml`.
| Option | Description | Type |
|---------------------------------|----------------------------------------------------------------------|----------|
| `--version` | Show version number | boolean |
| `--configPath` | Override the path to the config.yaml file | string |
| `--dataRoot` | Root directory for data storage | string |
| `--port` | Sets the port under which SillyTavern will run | number |
| `--listen` | SillyTavern will listen on all network interfaces | boolean |
| `--whitelist` | Enables whitelist mode | boolean |
| `--basicAuthMode` | Enables basic authentication | boolean |
| `--enableIPv4` | Enables IPv4 protocol | boolean |
| `--enableIPv6` | Enables IPv6 protocol | boolean |
| `--listenAddressIPv4` | Specific IPv4 address to listen to | string |
| `--listenAddressIPv6` | Specific IPv6 address to listen to | string |
| `--dnsPreferIPv6` | Prefers IPv6 for DNS | boolean |
| `--ssl` | Enables SSL | boolean |
| `--certPath` | Path to your certificate file | string |
| `--keyPath` | Path to your private key file | string |
| `--browserLaunchEnabled` | Automatically launch SillyTavern in the browser | boolean |
| `--browserLaunchHostname` | Browser launch hostname | string |
| `--browserLaunchPort` | Overrides the port for browser launch | string |
| `--browserLaunchAvoidLocalhost` | Avoids using 'localhost' for browser launch in auto mode | boolean |
| `--corsProxy` | Enables CORS proxy | boolean |
| `--requestProxyEnabled` | Enables a use of proxy for outgoing requests | boolean |
| `--requestProxyUrl` | Request proxy URL (HTTP or SOCKS protocols) | string |
| `--requestProxyBypass` | Request proxy bypass list (space separated list of hosts) | array |
| `--disableCsrf` | Disables CSRF protection (NOT RECOMMENDED) | boolean |
## Remote connections
Most often this is for people who want to use SillyTavern on their mobile phones while their PC runs the ST server on the same Wi-Fi network. However, it can be used to allow remote connections from anywhere as well.
Read the detailed guide on how to set up remote connections in the [Docs](https://docs.sillytavern.app/usage/remoteconnections/).
You may also want to configure SillyTavern user profiles with (optional) password protection: [Users](https://docs.sillytavern.app/administration/multi-user/).
* **[Windows Installation Guide](https://docs.sillytavern.app/installation/windows/)**
* **[MacOS/Linux Installation Guide](https://docs.sillytavern.app/installation/linuxmacos/)**
* **[Android (Termux) Installation Guide](https://docs.sillytavern.app/installation/android-(termux)/)**
* **[Docker Installation Guide](https://docs.sillytavern.app/installation/docker/)**
## License and credits
+1
View File
@@ -13,3 +13,4 @@ access.log
.git
/public/scripts/extensions/third-party
/colab
.gemini
+11 -2
View File
@@ -100,7 +100,7 @@ disableCsrfProtection: false
securityOverride: false
# -- LOGGING CONFIGURATION --
logging:
# Enable access logging to access.log file
# Enable access logging to access.log file and console output
# Records new connections with timestamp, IP address and user agent
enableAccessLog: true
# Minimum log level to display in the terminal (DEBUG = 0, INFO = 1, WARN = 2, ERROR = 3)
@@ -139,7 +139,7 @@ thumbnails:
# JPG thumbnail quality (0-100)
quality: 95
# Maximum thumbnail dimensions per type [width, height]
dimensions: { 'bg': [160, 90], 'avatar': [96, 144] }
dimensions: { 'bg': [160, 90], 'avatar': [96, 144], 'persona': [96, 144] }
# PERFORMANCE-RELATED CONFIGURATION
performance:
@@ -151,6 +151,15 @@ performance:
# Enables disk caching for character cards. Improves performances with large card libraries.
useDiskCache: true
# CACHE BUSTER CONFIGURATION
# IMPORTANT: Requires localhost or a domain with HTTPS, otherwise will not work!
cacheBuster:
# Clear browser cache on first load or after uploading image files
enabled: false
# Only clear cache for the specified user agent regex pattern
# Example: 'firefox|safari' (case-insensitive)
userAgentPattern: ''
# Allow secret keys exposure via API
allowKeysExposure: false
# Skip new default content checks
+20
View File
@@ -687,6 +687,10 @@
"filename": "presets/instruct/ChatML-Names.json",
"type": "instruct"
},
{
"filename": "presets/instruct/KoboldAI.json",
"type": "instruct"
},
{
"filename": "presets/context/Llama-3-Instruct-Names.json",
"type": "context"
@@ -818,5 +822,21 @@
{
"filename": "presets/context/Dots1.json",
"type": "context"
},
{
"filename": "presets/context/Mistral V7-Tekken.json",
"type": "context"
},
{
"filename": "presets/instruct/Mistral V7-Tekken.json",
"type": "instruct"
},
{
"filename": "presets/instruct/Moonshot AI.json",
"type": "instruct"
},
{
"filename": "presets/context/Moonshot AI.json",
"type": "context"
}
]
@@ -0,0 +1,10 @@
{
"story_string": "[SYSTEM_PROMPT]{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{personality}}\n{{/if}}{{#if scenario}}{{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}{{trim}}[/SYSTEM_PROMPT]",
"example_separator": "",
"chat_start": "",
"use_stop_strings": false,
"always_force_name2": true,
"trim_sentences": false,
"single_line": false,
"name": "Mistral V7-Tekken"
}
@@ -0,0 +1,11 @@
{
"story_string": "<|im_system|>system<|im_middle|>{{#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}}<|im_end|>",
"example_separator": "",
"chat_start": "",
"use_stop_strings": false,
"names_as_stop_strings": true,
"always_force_name2": true,
"trim_sentences": false,
"single_line": false,
"name": "Moonshot AI"
}
@@ -0,0 +1,22 @@
{
"input_sequence": "{{[INPUT]}}",
"output_sequence": "{{[OUPUT]}}",
"last_output_sequence": "",
"system_sequence": "{{[SYSTEM]}}",
"stop_sequence": "",
"wrap": true,
"macro": true,
"names_behavior": "force",
"activation_regex": "",
"system_sequence_prefix": "",
"system_sequence_suffix": "",
"first_output_sequence": "",
"skip_examples": false,
"output_suffix": "{{[OUTPUT_END]}}",
"input_suffix": "{{[INPUT_END]}}",
"system_suffix": "{{[SYSTEM_END]}}",
"user_alignment_message": "",
"system_same_as_user": false,
"last_system_sequence": "",
"name": "KoboldAI"
}
@@ -0,0 +1,22 @@
{
"input_sequence": "[INST]",
"output_sequence": " ",
"last_output_sequence": "",
"system_sequence": "[SYSTEM_PROMPT]",
"stop_sequence": "</s>",
"wrap": false,
"macro": true,
"names_behavior": "force",
"activation_regex": "",
"system_sequence_prefix": "",
"system_sequence_suffix": "",
"first_output_sequence": "",
"skip_examples": false,
"output_suffix": "</s>",
"input_suffix": "[/INST]",
"system_suffix": "[/SYSTEM_PROMPT]",
"user_alignment_message": "",
"system_same_as_user": false,
"last_system_sequence": "",
"name": "Mistral V7-Tekken"
}
@@ -0,0 +1,24 @@
{
"input_sequence": "<|im_user|>user<|im_middle|>",
"output_sequence": "<|im_assistant|>assistant<|im_middle|>",
"last_output_sequence": "",
"system_sequence": "<|im_system|>system<|im_middle|>",
"stop_sequence": "<|im_end|>",
"wrap": false,
"macro": true,
"activation_regex": "",
"system_sequence_prefix": "",
"system_sequence_suffix": "",
"first_output_sequence": "",
"skip_examples": false,
"output_suffix": "<|im_end|>",
"input_suffix": "<|im_end|>",
"system_suffix": "<|im_end|>",
"user_alignment_message": "",
"system_same_as_user": false,
"last_system_sequence": "",
"first_input_sequence": "",
"last_input_sequence": "",
"names_behavior": "force",
"name": "Moonshot AI"
}
+1 -4
View File
@@ -2,12 +2,11 @@
"chat_completion_source": "openai",
"openai_model": "gpt-4-turbo",
"claude_model": "claude-3-5-sonnet-20240620",
"windowai_model": "",
"openrouter_model": "OR_Website",
"openrouter_use_fallback": false,
"openrouter_group_models": false,
"openrouter_sort_models": "alphabetically",
"ai21_model": "jamba-1.5-large",
"ai21_model": "jamba-large",
"mistralai_model": "mistral-large-latest",
"custom_model": "",
"custom_url": "",
@@ -226,12 +225,10 @@
]
}
],
"api_url_scale": "",
"show_external_models": false,
"assistant_prefill": "",
"assistant_impersonation": "",
"claude_use_sysprompt": false,
"use_alt_scale": false,
"squash_system_messages": false,
"image_inlining": false,
"bypass_status_check": false,
+1 -2
View File
@@ -623,8 +623,7 @@
"wi_format": "{0}",
"openai_model": "gpt-4-turbo",
"claude_model": "claude-3-5-sonnet-20240620",
"ai21_model": "jamba-1.5-large",
"windowai_model": "",
"ai21_model": "jamba-large",
"openrouter_model": "OR_Website",
"reverse_proxy": "",
"chat_completion_source": "openai",
Vendored
+5
View File
@@ -66,4 +66,9 @@ declare global {
* Parsed command line arguments.
*/
var COMMAND_LINE_ARGS: CommandLineArguments;
/**
* Forces a global mode if set to `true` before parsing the CLI arguments.
*/
var FORCE_GLOBAL_MODE: boolean;
}
+84 -56
View File
@@ -1,12 +1,12 @@
{
"name": "sillytavern",
"version": "1.13.1",
"version": "1.13.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "sillytavern",
"version": "1.13.1",
"version": "1.13.2",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
@@ -40,23 +40,24 @@
"@popperjs/core": "^2.11.8",
"@zeldafan0225/ai_horde": "^5.2.0",
"archiver": "^7.0.1",
"bing-translate-api": "^4.0.2",
"bing-translate-api": "^4.1.0",
"body-parser": "^1.20.2",
"bowser": "^2.11.0",
"bytes": "^3.1.2",
"chalk": "^5.4.1",
"command-exists": "^1.2.9",
"compression": "^1.8.0",
"compression": "^1.8.1",
"cookie-parser": "^1.4.6",
"cookie-session": "^2.1.0",
"cookie-session": "^2.1.1",
"cors": "^2.8.5",
"crc": "^4.3.2",
"csrf-sync": "^4.2.1",
"diff-match-patch": "^1.0.5",
"dompurify": "^3.2.6",
"droll": "^0.2.1",
"env-paths": "^3.0.0",
"express": "^4.21.0",
"form-data": "^4.0.3",
"form-data": "^4.0.4",
"fuse.js": "^7.1.0",
"google-translate-api-browser": "^3.0.1",
"google-translate-api-x": "^10.7.2",
@@ -74,15 +75,15 @@
"mime-types": "^3.0.1",
"moment": "^2.30.1",
"morphdom": "^2.7.5",
"multer": "^2.0.1",
"multer": "^2.0.2",
"node-fetch": "^3.3.2",
"node-persist": "^4.0.4",
"open": "^10.1.2",
"open": "^10.2.0",
"png-chunk-text": "^1.0.0",
"png-chunks-extract": "^1.0.0",
"proxy-agent": "^6.5.0",
"rate-limiter-flexible": "^5.0.5",
"response-time": "^2.3.3",
"response-time": "^2.3.4",
"sanitize-filename": "^1.6.3",
"seedrandom": "^3.0.5",
"showdown": "^2.1.0",
@@ -93,15 +94,15 @@
"url-join": "^5.0.0",
"vectra": "^0.2.2",
"wavefile": "^11.0.0",
"webpack": "^5.99.9",
"webpack": "^5.98.0",
"write-file-atomic": "^5.0.1",
"ws": "^8.18.2",
"ws": "^8.18.3",
"yaml": "^2.8.0",
"yargs": "^17.7.1",
"yauzl": "^3.2.0"
},
"bin": {
"sillytavern": "server.js"
"sillytavern": "src/server-global.js"
},
"devDependencies": {
"@types/archiver": "^6.0.3",
@@ -117,9 +118,9 @@
"@types/jquery-cropper": "^1.0.4",
"@types/jquery.transit": "^0.9.33",
"@types/jqueryui": "^1.12.24",
"@types/lodash": "^4.17.17",
"@types/lodash": "^4.17.20",
"@types/mime-types": "^3.0.1",
"@types/multer": "^1.4.13",
"@types/multer": "^2.0.0",
"@types/node": "^18.19.84",
"@types/node-persist": "^3.1.8",
"@types/png-chunk-text": "^1.0.3",
@@ -1972,9 +1973,9 @@
}
},
"node_modules/@types/lodash": {
"version": "4.17.17",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.17.tgz",
"integrity": "sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==",
"version": "4.17.20",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
"dev": true,
"license": "MIT"
},
@@ -1999,9 +2000,9 @@
"license": "MIT"
},
"node_modules/@types/multer": {
"version": "1.4.13",
"resolved": "https://registry.npmjs.org/@types/multer/-/multer-1.4.13.tgz",
"integrity": "sha512-bhhdtPw7JqCiEfC9Jimx5LqX9BDIPJEh2q/fQ4bqbBPtyEZYr3cvF22NwG0DmPZNYA0CAf2CnqDB4KIGGpJcaw==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@types/multer/-/multer-2.0.0.tgz",
"integrity": "sha512-C3Z9v9Evij2yST3RSBktxP9STm6OdMc5uR1xF1SGr98uv8dUlAL2hqwrZ3GVB3uyMyiegnscEK6PGtYvNrjTjw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2832,9 +2833,9 @@
}
},
"node_modules/bing-translate-api": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.0.2.tgz",
"integrity": "sha512-JJ8XUehnxzOhHU91oy86xEtp8OOMjVEjCZJX042fKxoO19NNvxJ5omeCcxQNFoPbDqVpBJwqiGVquL0oPdQm1Q==",
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-4.1.0.tgz",
"integrity": "sha512-oP2663Yd5MXX4kbB/3LdS9YgPiE+ls9+2iFZH2ZXigWhWyHT3R4m6aCup4TNJd3/U4gqHHnQoxTaIW7uOf4+vA==",
"license": "MIT",
"dependencies": {
"got": "^11.8.6"
@@ -3360,16 +3361,16 @@
}
},
"node_modules/compression": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
"integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
"integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
"license": "MIT",
"dependencies": {
"bytes": "3.1.2",
"compressible": "~2.0.18",
"debug": "2.6.9",
"negotiator": "~0.6.4",
"on-headers": "~1.0.2",
"on-headers": "~1.1.0",
"safe-buffer": "5.2.1",
"vary": "~1.1.2"
},
@@ -3506,13 +3507,14 @@
}
},
"node_modules/cookie-session": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.0.tgz",
"integrity": "sha512-u73BDmR8QLGcs+Lprs0cfbcAPKl2HnPcjpwRXT41sEV4DRJ2+W0vJEEZkG31ofkx+HZflA70siRIjiTdIodmOQ==",
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.1.tgz",
"integrity": "sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==",
"license": "MIT",
"dependencies": {
"cookies": "0.9.1",
"debug": "3.2.7",
"on-headers": "~1.0.2",
"on-headers": "~1.1.0",
"safe-buffer": "5.2.1"
},
"engines": {
@@ -4086,6 +4088,18 @@
"url": "https://github.com/fb55/entities?sponsor=1"
}
},
"node_modules/env-paths": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
"integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
"license": "MIT",
"engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/es-define-property": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -4785,9 +4799,9 @@
}
},
"node_modules/form-data": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
"integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
"integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
"license": "MIT",
"dependencies": {
"asynckit": "^0.4.0",
@@ -6176,9 +6190,9 @@
"license": "MIT"
},
"node_modules/multer": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
"integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
"integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
"license": "MIT",
"dependencies": {
"append-field": "^1.0.0",
@@ -6372,9 +6386,9 @@
}
},
"node_modules/on-headers": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
"integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
"license": "MIT",
"engines": {
"node": ">= 0.8"
@@ -6419,15 +6433,15 @@
}
},
"node_modules/open": {
"version": "10.1.2",
"resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
"integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
"version": "10.2.0",
"resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
"integrity": "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==",
"license": "MIT",
"dependencies": {
"default-browser": "^5.2.1",
"define-lazy-prop": "^3.0.0",
"is-inside-container": "^1.0.0",
"is-wsl": "^3.1.0"
"wsl-utils": "^0.1.0"
},
"engines": {
"node": ">=18"
@@ -7206,13 +7220,13 @@
}
},
"node_modules/response-time": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.3.tgz",
"integrity": "sha512-SsjjOPHl/FfrTQNgmc5oen8Hr1Jxpn6LlHNXxCIFdYMHuK1kMeYMobb9XN3mvxaGQm3dbegqYFMX4+GDORfbWg==",
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.4.tgz",
"integrity": "sha512-fiyq1RvW5/Br6iAtT8jN1XrNY8WPu2+yEypLbaijWry8WDZmn12azG9p/+c+qpEebURLlQmqCB8BNSu7ji+xQQ==",
"license": "MIT",
"dependencies": {
"depd": "~2.0.0",
"on-headers": "~1.0.1"
"on-headers": "~1.1.0"
},
"engines": {
"node": ">= 0.8.0"
@@ -8319,14 +8333,13 @@
}
},
"node_modules/webpack": {
"version": "5.99.9",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
"integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
"version": "5.98.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
"integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
"license": "MIT",
"dependencies": {
"@types/eslint-scope": "^3.7.7",
"@types/estree": "^1.0.6",
"@types/json-schema": "^7.0.15",
"@webassemblyjs/ast": "^1.14.1",
"@webassemblyjs/wasm-edit": "^1.14.1",
"@webassemblyjs/wasm-parser": "^1.14.1",
@@ -8343,7 +8356,7 @@
"loader-runner": "^4.2.0",
"mime-types": "^2.1.27",
"neo-async": "^2.6.2",
"schema-utils": "^4.3.2",
"schema-utils": "^4.3.0",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.3.11",
"watchpack": "^2.4.1",
@@ -8503,9 +8516,9 @@
}
},
"node_modules/ws": {
"version": "8.18.2",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
"integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
"version": "8.18.3",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
"license": "MIT",
"engines": {
"node": ">=10.0.0"
@@ -8523,6 +8536,21 @@
}
}
},
"node_modules/wsl-utils": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
"integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
"license": "MIT",
"dependencies": {
"is-wsl": "^3.1.0"
},
"engines": {
"node": ">=18"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/xhr": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz",
+15 -13
View File
@@ -30,23 +30,24 @@
"@popperjs/core": "^2.11.8",
"@zeldafan0225/ai_horde": "^5.2.0",
"archiver": "^7.0.1",
"bing-translate-api": "^4.0.2",
"bing-translate-api": "^4.1.0",
"body-parser": "^1.20.2",
"bowser": "^2.11.0",
"bytes": "^3.1.2",
"chalk": "^5.4.1",
"command-exists": "^1.2.9",
"compression": "^1.8.0",
"compression": "^1.8.1",
"cookie-parser": "^1.4.6",
"cookie-session": "^2.1.0",
"cookie-session": "^2.1.1",
"cors": "^2.8.5",
"crc": "^4.3.2",
"csrf-sync": "^4.2.1",
"diff-match-patch": "^1.0.5",
"dompurify": "^3.2.6",
"droll": "^0.2.1",
"env-paths": "^3.0.0",
"express": "^4.21.0",
"form-data": "^4.0.3",
"form-data": "^4.0.4",
"fuse.js": "^7.1.0",
"google-translate-api-browser": "^3.0.1",
"google-translate-api-x": "^10.7.2",
@@ -64,15 +65,15 @@
"mime-types": "^3.0.1",
"moment": "^2.30.1",
"morphdom": "^2.7.5",
"multer": "^2.0.1",
"multer": "^2.0.2",
"node-fetch": "^3.3.2",
"node-persist": "^4.0.4",
"open": "^10.1.2",
"open": "^10.2.0",
"png-chunk-text": "^1.0.0",
"png-chunks-extract": "^1.0.0",
"proxy-agent": "^6.5.0",
"rate-limiter-flexible": "^5.0.5",
"response-time": "^2.3.3",
"response-time": "^2.3.4",
"sanitize-filename": "^1.6.3",
"seedrandom": "^3.0.5",
"showdown": "^2.1.0",
@@ -83,9 +84,9 @@
"url-join": "^5.0.0",
"vectra": "^0.2.2",
"wavefile": "^11.0.0",
"webpack": "^5.99.9",
"webpack": "^5.98.0",
"write-file-atomic": "^5.0.1",
"ws": "^8.18.2",
"ws": "^8.18.3",
"yaml": "^2.8.0",
"yargs": "^17.7.1",
"yauzl": "^3.2.0"
@@ -111,10 +112,11 @@
"type": "git",
"url": "https://github.com/SillyTavern/SillyTavern.git"
},
"version": "1.13.1",
"version": "1.13.2",
"scripts": {
"start": "node server.js",
"debug": "node --inspect server.js",
"start:global": "node server.js --global",
"start:electron": "cd ./src/electron && npm run start",
"start:deno": "deno run --allow-run --allow-net --allow-read --allow-write --allow-sys --allow-env server.js",
"start:bun": "bun server.js",
@@ -126,7 +128,7 @@
"plugins:install": "node plugins install"
},
"bin": {
"sillytavern": "./server.js"
"sillytavern": "./src/server-global.js"
},
"rules": {
"no-path-concat": "off",
@@ -147,9 +149,9 @@
"@types/jquery-cropper": "^1.0.4",
"@types/jquery.transit": "^0.9.33",
"@types/jqueryui": "^1.12.24",
"@types/lodash": "^4.17.17",
"@types/lodash": "^4.17.20",
"@types/mime-types": "^3.0.1",
"@types/multer": "^1.4.13",
"@types/multer": "^2.0.0",
"@types/node": "^18.19.84",
"@types/node-persist": "^3.1.8",
"@types/png-chunk-text": "^1.0.3",
+4
View File
@@ -112,6 +112,10 @@
flex-direction: column;
}
.completion_prompt_manager_popup_entry_form .select2-container {
margin: 5px 0;
}
#completion_prompt_manager_popup .completion_prompt_manager_popup_entry_form_control:has(#completion_prompt_manager_popup_entry_form_prompt) {
flex: 1;
display: flex;
+12 -59
View File
@@ -19,14 +19,15 @@
.select2-container .select2-selection .select2-selection__clear {
color: var(--SmartThemeBodyColor);
font-size: 20px;
padding: 0;
position: absolute;
right: 5px;
top: 0;
margin-top: 0; /* compensate for the increased font size */
margin-right: 0;
}
.select2-container .select2-search__field {
.select2-container .select2-search--inline textarea.select2-search__field {
opacity: 0.8;
margin-top: 7px; /* get placeholder text to the center */
}
.select2-selection--single .select2-selection__placeholder {
@@ -39,8 +40,8 @@
.select2-container .select2-selection--single .select2-selection__rendered {
color: var(--SmartThemeBodyColor);
line-height: revert;
padding-left: unset;
line-height: unset;
padding: 3px 5px;
}
.select2-container .select2-results>.select2-results__options {
@@ -63,9 +64,10 @@
background-color: var(--black30a);
color: var(--SmartThemeBodyColor);
border: 1px solid var(--SmartThemeBorderColor);
border-radius: 7px;
font-family: var(--mainFontFamily);
padding: 3px 5px;
display: unset; /* override the ST textarea display style */
border-radius: 0; /* border radius was interfering with cursor */
}
/* Customize the selected option */
@@ -93,7 +95,10 @@
border: 1px solid var(--SmartThemeBorderColor);
border-radius: 7px;
font-family: var(--mainFontFamily);
padding: 3px 5px;
}
.select2-container .select2-selection--multiple.select2-selection--clearable {
padding-right: 20px;
}
.select2-container.select2-container--focus .select2-selection--multiple,
@@ -230,55 +235,3 @@ span.select2.select2-container .select2-selection__choice__remove:hover {
.select2_choice_clickable_buttonstyle+span.select2-container .select2-selection__choice__display:hover {
background-color: var(--white30a);
}
/* Custom class to support same line multi inputs of select2 controls */
.select2_multi_sameline+span.select2-container .select2-selection--multiple {
display: flex;
flex-wrap: wrap;
}
.select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-search--inline {
/* Allow search placeholder to take up all space if needed */
flex-grow: 1;
}
.select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-selection__rendered {
/* Fix weird styling choice or huge margin around selected options */
margin-block-start: 2px;
margin-block-end: 2px;
display: flex;
align-items: center;
flex-wrap: wrap;
row-gap: 5px;
}
.select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-selection__choice {
margin-top: 0px;
}
.select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-search__field {
/* Min height to reserve spacing */
min-height: calc(var(--mainFontSize) + 13px);
/* Min width to be clickable */
min-width: 4em;
align-content: center;
/* Fix search textarea alignment issue with UL elements */
margin-top: 0px;
height: unset;
/* Prevent height from jumping around when input is focused */
line-height: 1;
}
.select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-selection__rendered {
/* Min height to reserve spacing */
min-height: calc(var(--mainFontSize) + 13px);
}
/* Make search bar invisible unless the select2 is active, to save space */
.select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-search--inline {
height: 1px;
}
.select2_multi_sameline+span.select2-container.select2-container--focus .select2-selection--multiple .select2-search--inline {
height: unset;
}
-8
View File
@@ -470,14 +470,6 @@
margin-left: 20px;
}
/*used to fix smallness of certain FontAwesome glyph which break button squareness*/
/*currently used on: CharList Import*/
.faSmallFontSquareFix {
font-size: calc(var(--mainFontSize) *1.25);
width: calc(var(--mainFontSize) *1.95);
}
.textarea_compact {
font-size: calc(var(--mainFontSize) * 0.95);
line-height: 1.2;
+3 -1
View File
@@ -157,7 +157,9 @@
flex-direction: row;
flex-wrap: wrap;
align-items: flex-start;
margin: 5px;
margin-top: 5px;
max-height: 40dvh;
overflow-y: auto;
}
.rm_tag_filter .tag {
+2 -1
View File
@@ -93,7 +93,8 @@ body.charListGrid #rm_print_characters_block .group_select .ch_name,
body.charListGrid #rm_print_characters_block .group_select .group_select_counter,
#user_avatar_block.gridView .avatar-container .ch_name,
#user_avatar_block.gridView .avatar-container .bogus_folder_counter,
#user_avatar_block.gridView .avatar-container .group_select_counter {
#user_avatar_block.gridView .avatar-container .group_select_counter,
#user_avatar_block.gridView .avatar-container .ch_additional_info {
width: 100%;
max-width: 100px;
text-align: center;
+14 -1
View File
@@ -107,7 +107,6 @@
height: auto;
margin-top: 0;
margin-bottom: 0;
min-height: calc(var(--mainFontSize) + 14px);
}
.delete_entry_button {
@@ -286,3 +285,17 @@ select.keyselect+span.select2-container .select2-selection--multiple {
.world_entry:has(input[name="delay_until_recursion"]:not(:checked)) .world_entry_form_control:has(input[name="delayUntilRecursionLevel"]) {
display: none;
}
.world_entry label[for="__invisible"] {
visibility: hidden;
pointer-events: none;
opacity: 0;
width: 0;
overflow: hidden;
}
#WIMultiSelector .select2-container .select2-selection--multiple {
max-height: 25vh;
overflow-y: auto;
overflow-x: hidden;
}
+6
View File
@@ -73,4 +73,10 @@ declare global {
* @param args - The arguments for the conversion function.
*/
function convertVideoToAnimatedWebp(args: ConvertVideoArgs): Promise<Uint8Array>;
interface ColorPickerEvent extends JQuery.ChangeEvent<HTMLElement> {
detail: {
rgba: string;
};
}
}
+1 -43
View File
@@ -1,43 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="190.91216mm"
height="201.47243mm"
viewBox="0 0 190.91216 201.47243"
version="1.1"
id="svg1"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1" />
<g
id="layer1"
transform="translate(-2.2086436)">
<g
id="g8"
transform="matrix(0.99583856,0,0,1.0472862,2.2086437,-7.9847956)">
<path
style="font-weight:bold;font-size:89.3125px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:-8.37308px;stroke-width:1.73283"
d="m 161.17775,117.85719 v 23.36554 q 0,20.76935 -10.30578,39.77331 -10.21695,19.00395 -29.31819,19.00395 -11.01653,0 -18.65701,-5.60771 -7.551611,-5.71157 -14.392485,-20.8732 -6.752041,-15.26549 -6.752041,-32.29635 v -23.36554 q 0,-20.665499 10.216893,-39.669461 10.216893,-19.107806 29.318113,-19.107806 10.92769,0 18.47935,5.607725 7.64049,5.607727 14.48139,20.873203 6.92976,15.161629 6.92976,32.296339 z m -18.30165,0 q 0,-17.3424 -8.26241,-30.32325 -4.70867,-7.165428 -13.2376,-7.165428 -8.26239,0 -13.50413,7.892355 -7.906998,11.942383 -7.906998,29.596323 v 23.36554 q 0,17.44626 8.351218,30.32326 4.61983,7.16543 13.2376,7.16543 8.17356,0 13.4153,-7.89237 7.90702,-11.94237 7.90702,-29.59632 z"
id="path8" />
<path
style="font-weight:bold;font-size:89.3125px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:-8.37308px;stroke-width:1.67461"
d="M 54.800839,58.349248 V 166.67311 H 73.27526 q 6.604382,0 9.371083,2.79982 2.855949,2.70327 2.855949,7.14436 0,4.34453 -2.855949,7.14435 -2.766701,2.70327 -9.371083,2.70327 H 18.030494 q -6.604382,0 -9.4603308,-2.70327 -2.7667007,-2.79982 -2.7667007,-7.2409 0,-4.34454 2.7667007,-7.04781 2.8559488,-2.79982 9.4603308,-2.79982 H 36.504915 V 84.126852 l -16.332459,4.634176 q -3.926929,1.158544 -5.890395,1.158544 -3.480687,0 -6.0688915,-2.992905 -2.4989554,-2.992906 -2.4989554,-7.337446 0,-3.958358 1.8742165,-6.178902 1.8742167,-2.317087 7.8538604,-4.054903 z"
transform="matrix(0.99545738,0,0,1.0756271,-5.6882567,-3.6821097)"
id="path7" />
</g>
<g
id="g1"
transform="matrix(0.84984007,0,0,0.87855774,28.999003,5.2337341e-7)">
<path
style="font-weight:bold;font-size:89.3125px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:-8.37308px;stroke-width:1.73283"
d="m 184.13459,37.01017 q -3.34269,3.095908 -6.12102,4.409323 -2.77834,1.266508 -5.86056,1.266508 -7.1629,0 -12.54593,-6.191815 -5.33961,-6.191816 -5.33961,-15.385722 0,-7.176877 3.68997,-13.0403372 Q 162.99318,4.3096483e-6 172.15301,4.3096483e-6 q 6.55514,0 11.46064,4.2685995903517 4.90551,4.2216915 7.20632,12.2429061 2.30081,7.974308 2.30081,16.65223 0,14.729014 -10.549,23.641474 -8.16137,6.848524 -17.88555,6.848524 -5.38303,0 -8.33501,-2.345385 -1.99693,-1.547954 -1.99693,-4.080969 0,-2.063938 1.25893,-3.424261 1.30235,-1.407231 3.16905,-1.407231 1.04187,0 2.34422,0.703615 1.69304,0.938154 3.55974,0.938154 6.72879,0 12.4157,-4.925307 5.68691,-4.972215 7.03266,-12.102184 z m -1.25893,-15.151183 q -1.43258,-6.660892 -4.25433,-9.428446 -2.77834,-2.814461 -6.38149,-2.814461 -3.77681,0 -6.42491,3.142816 -2.6481,3.095907 -2.6481,8.255753 0,5.394384 2.6481,8.72483 2.69151,3.330446 6.12102,3.330446 6.03421,0 10.93971,-11.210938 z"
id="path6" />
<path
style="font-weight:bold;font-size:89.3125px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:-8.37308px;stroke-width:1.51638"
d="m 142.10195,39.730816 h -22.30654 q -3.49058,0 -4.15545,-0.234538 -0.99731,-0.375262 -1.69543,-1.641769 -0.69812,-1.313415 -0.69812,-2.955185 0,-1.594861 0.69812,-2.908276 0.69812,-1.313416 1.72867,-1.641769 0.66488,-0.234539 4.12221,-0.234539 h 22.30654 q 3.49059,0 4.15545,0.234539 0.99732,0.375261 1.69543,1.688676 0.69812,1.266508 0.69812,2.861369 0,1.64177 -0.69812,2.955185 -0.69811,1.266507 -1.72867,1.641769 -0.66487,0.234538 -4.12221,0.234538 z"
id="text2" />
</g>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="734.222" height="756.943" viewBox="0 0 734.222 756.943"><path d="M357.038 52.288l-73.383 52.313-55.764 142.923-54.617 143.196c1.171.279 425.288-132.081 426.226-133.018C600.225 256.976 432.641.031 431.422 0c-.55-.014-34.023 23.515-74.384 52.288m181.711 32.471l-10.329 8.35c-.665.67 99.325 156.949 102.358 159.98 1.875 1.874 79.763 35.16 81.138 34.675 1.14-.403-160.629-210.253-162.275-210.505-.67-.103-5.572 3.272-10.892 7.5M57.422 239.973L.14 314.826c-1.188 1.714 3.842 4.638 68.856 40.032l71.106 37.861c1.12-.373 72.985-183.777 72.538-185.118-.294-.884-96.296-40.583-98.218-40.615-.55-.01-26.2 32.835-57 72.987m568.524 51.223l-91.43 199.175-88.086 193.416c.271.271.657.305.859.076s65.024-80.248 144.049-177.819l142.882-178.1c-.886-.775-103.789-42.998-104.792-42.998-.347 0-1.914 2.813-3.482 6.25m-243.024 63.521l-211.816 65.765c-.466.388 206.21 336.458 206.917 336.461.728.004 217.289-466.962 216.767-467.41-.202-.174-95.543 29.159-211.868 65.184m-343 16.73c0 .732 221.624 257.149 222.982 257.988.56.346 1.018.38 1.018.076 0-.611-122.164-199.524-125.049-203.612-1.152-1.632-18.448-11.562-48.125-27.63l-50.826-26.822"/></svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

+134 -125
View File
@@ -300,7 +300,7 @@
</label>
</div>
</div>
<small data-tg-type="openrouter">
<small id="prompt_cost_block" data-tg-type="openrouter">
<span data-i18n="Max prompt cost:">Max prompt cost:</span> <span id="or_prompt_cost">&ndash;</span>
</small>
</div>
@@ -691,7 +691,7 @@
</span>
</div>
</div>
<div class="range-block" data-source="openai,claude,windowai,aimlapi,openrouter,ai21,scale,makersuite,vertexai,mistralai,custom,cohere,perplexity,groq,01ai,nanogpt,deepseek,xai,pollinations">
<div class="range-block" data-source="openai,claude,aimlapi,openrouter,ai21,makersuite,vertexai,mistralai,custom,cohere,perplexity,groq,01ai,nanogpt,deepseek,xai,pollinations">
<div class="range-block-title" data-i18n="Temperature">
Temperature
</div>
@@ -743,7 +743,7 @@
</div>
</div>
</div>
<div class="range-block" data-source="openai,claude,aimlapi,openrouter,ai21,scale,makersuite,vertexai,mistralai,custom,cohere,perplexity,groq,01ai,nanogpt,deepseek,xai,pollinations">
<div class="range-block" data-source="openai,claude,aimlapi,openrouter,ai21,makersuite,vertexai,mistralai,custom,cohere,perplexity,groq,01ai,nanogpt,deepseek,xai,pollinations">
<div class="range-block-title" data-i18n="Top P">
Top P
</div>
@@ -1314,7 +1314,7 @@
<input class="neo-range-slider" type="range" id="epsilon_cutoff_textgenerationwebui" name="volume" min="0" max="9" step="0.01">
<input class="neo-range-input" type="number" min="0" max="9" step="0.01" data-for="epsilon_cutoff_textgenerationwebui" id="epsilon_cutoff_counter_textgenerationwebui">
</div>
<div data-tg-type="aphrodite,koboldcpp,llamacpp" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
<div data-tg-type="ooba,aphrodite,koboldcpp,llamacpp" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
<small>
<span data-i18n="Top nsigma">Top nsigma</span>
<div class="fa-solid fa-circle-info opacity50p" title="A sampling method that filters logits based on their statistical properties. It keeps tokens within n standard deviations of the maximum logit value, providing a simpler alternative to top-p/top-k sampling while maintaining sampling stability across different temperatures."></div>
@@ -1499,7 +1499,7 @@
</div>
</div>
</div>
<div data-tg-type="ooba,infermaticai,koboldcpp,llamacpp,ollama,tabby" id="mirostat_block_ooba" class="wide100p">
<div data-tg-type="ooba,infermaticai,koboldcpp,llamacpp,tabby" id="mirostat_block_ooba" class="wide100p">
<h4 class="wide100p textAlignCenter">
<label data-i18n="Mirostat (mode=1 is only for llama.cpp)">Mirostat</label>
<div class=" fa-solid fa-circle-info opacity50p " data-i18n="[title]Mirostat_desc" title="Mirostat is a thermostat for output perplexity.&#13;Mirostat matches the output perplexity to that of the input, thus avoiding the repetition trap&#13;(where, as the autoregressive inference produces text, the perplexity of the output tends toward zero)&#13;and the confusion trap (where the perplexity diverges).&#13;For details, see the paper Mirostat: A Neural Text Decoding Algorithm that Directly Controls Perplexity by Basu et al. (2020).&#13;Mode chooses the Mirostat version. 0=disable, 1=Mirostat 1.0 (llama.cpp only), 2=Mirostat 2.0."></div>
@@ -1811,6 +1811,7 @@
<div data-name="temperature" draggable="true"><span>Temperature</span><small></small></div>
<div data-name="dynamic_temperature" draggable="true"><span>Dynamic Temperature</span><small></small></div>
<div data-name="quadratic_sampling" draggable="true"><span>Quadratic / Smooth Sampling</span><small></small></div>
<div data-name="top_n_sigma" draggable="true"><span>Top Nsigma</span><small></small></div>
<div data-name="top_k" draggable="true"><span>Top K</span><small></small></div>
<div data-name="top_p" draggable="true"><span>Top P</span><small></small></div>
<div data-name="typical_p" draggable="true"><span>Typical P</span><small></small></div>
@@ -1969,7 +1970,7 @@
</span>
</div>
</div>
<div class="range-block" data-source="makersuite,vertexai,aimlapi,openrouter,claude,xai">
<div class="range-block" data-source="makersuite,vertexai,aimlapi,openrouter,claude,xai,nanogpt">
<label for="openai_enable_web_search" class="checkbox_label flexWrap widthFreeExpand">
<input id="openai_enable_web_search" type="checkbox" />
<span data-i18n="Enable web search">Enable web search</span>
@@ -2078,7 +2079,7 @@
</span>
</div>
</div>
<div class="flex-container flexFlowColumn wide100p textAlignCenter marginTop10" data-source="openai,custom,claude,xai,makersuite,vertexai,aimlapi,openrouter,pollinations">
<div class="flex-container flexFlowColumn wide100p textAlignCenter marginTop10" data-source="openai,custom,claude,xai,makersuite,vertexai,aimlapi,openrouter,pollinations,perplexity">
<div class="flex-container oneline-dropdown" title="Constrains effort on reasoning for reasoning models.&#10;Reducing reasoning effort can result in faster responses and fewer tokens used on reasoning in a response." data-i18n="[title]Constrains effort on reasoning for reasoning models.">
<label for="openai_reasoning_effort">
<span data-i18n="Reasoning Effort">Reasoning Effort</span>
@@ -2092,7 +2093,7 @@
<option data-i18n="openai_reasoning_effort_high" value="high">High</option>
<option data-i18n="openai_reasoning_effort_maximum" value="max">Maximum</option>
</select>
<div class="toggle-description justifyLeft marginBot5" data-source="openai,custom,xai,aimlapi,openrouter" data-i18n="OpenAI-style options: low, medium, high. Minimum and maximum are aliased to low and high. Auto does not send an effort level.">
<div class="toggle-description justifyLeft marginBot5" data-source="openai,custom,xai,aimlapi,openrouter,perplexity" data-i18n="OpenAI-style options: low, medium, high. Minimum and maximum are aliased to low and high. Auto does not send an effort level.">
OpenAI-style options: low, medium, high. Minimum and maximum are aliased to low and high. Auto does not send an effort level.
</div>
<div class="toggle-description justifyLeft marginBot5" data-source="claude" data-i18n="Allocates a portion of the response length for thinking (min: 1024 tokens, low: 10%, medium: 25%, high: 50%, max: 95%), but minimum 1024 tokens. Auto does not request thinking.">
@@ -2131,7 +2132,7 @@
</div>
</div>
</div>
<div class="range-block m-t-1" data-source="openai,aimlapi,openrouter,scale,custom">
<div class="range-block m-t-1" data-source="openai,aimlapi,openrouter,custom">
<div id="logit_bias_openai" class="range-block-title openai_restorable" data-i18n="Logit Bias">
Logit Bias
</div>
@@ -2801,8 +2802,6 @@
<option value="openrouter">OpenRouter</option>
<option value="perplexity">Perplexity</option>
<option value="pollinations">Pollinations</option>
<option value="scale">Scale</option>
<option value="windowai">Window AI</option>
<option value="xai">xAI (Grok)</option>
</optgroup>
</select>
@@ -3022,34 +3021,11 @@
<option value="claude-3-5-haiku-latest">claude-3-5-haiku-latest</option>
<option value="claude-3-5-haiku-20241022">claude-3-5-haiku-20241022</option>
<option value="claude-3-opus-20240229">claude-3-opus-20240229</option>
<option value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
<option value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
<option value="claude-2.1">claude-2.1</option>
<option value="claude-2.0">claude-2.0</option>
</optgroup>
</select>
</div>
</form>
<form id="windowai_form" data-source="windowai" action="javascript:void(null);" method="post" enctype="multipart/form-data">
<div>
<h4 data-i18n="Window AI Model">Window AI Model</h4>
<select id="model_windowai_select">
<option data-i18n="Use extension settings" value="">Use extension settings</option>
<option value="openai/gpt-3.5-turbo">openai/gpt-3.5-turbo</option>
<option value="openai/gpt-3.5-turbo-16k">openai/gpt-3.5-turbo-16k</option>
<option value="openai/gpt-4">openai/gpt-4</option>
<option value="openai/gpt-4-32k">openai/gpt-4-32k</option>
<option value="anthropic/claude-instant-v1">anthropic/claude-instant-v1</option>
<option value="anthropic/claude-instant-v1-100k">anthropic/claude-instant-v1-100k</option>
<option value="anthropic/claude-v1">anthropic/claude-v1</option>
<option value="anthropic/claude-v1-100k">anthropic/claude-v1-100k</option>
<option value="google/palm-2-chat-bison">google/palm-2-chat-bison</option>
<option value="google/palm-2-codechat-bison">google/palm-2-codechat-bison</option>
<option value="togethercomputer/GPT-NeoXT-Chat-Base-20B">togethercomputer/GPT-NeoXT-Chat-Base-20B</option>
<option value="cohere/command-nightly">cohere/command-nightly</option>
</select>
</div>
</form>
<form id="openrouter_form" data-source="openrouter" action="javascript:void(null);" method="post" enctype="multipart/form-data">
<h4 data-i18n="OpenRouter API Key">OpenRouter API Key</h4>
<div>
@@ -3119,36 +3095,6 @@
<span data-i18n="To use instruct formatting, switch to OpenRouter under Text Completion API.">To use instruct formatting, switch to OpenRouter under Text Completion API.</span>
</small>
</form>
<form id="scale_form" data-source="scale" action="javascript:void(null);" method="post" enctype="multipart/form-data">
<div id="normal_scale_form">
<h4 data-i18n="Scale API Key">Scale API Key</h4>
<div class="flex-container">
<input id="api_key_scale" name="api_key_scale" class="text_pole flex1" value="" autocomplete="off">
<div title="Manage API keys" data-i18n="[title]Manage API keys" class="menu_button fa-solid fa-key fa-fw manage-api-keys" data-key="api_key_scale"></div>
</div>
<div data-for="api_key_scale" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you click 'Connect'.">
For privacy reasons, your API key will be hidden after you click 'Connect'.
</div>
<h4>Scale API URL</h4>
<input id="api_url_scale" name="api_url_scale" class="text_pole" value="" autocomplete="off" placeholder="https://dashboard.scale.com/spellbook/api/v2/deploy/xxxxxxx">
</div>
<div id="alt_scale_form">
<h4>Scale Cookie (_jwt)</h4>
<div class="flex-container">
<input id="scale_cookie" name="scale_cookie" class="text_pole flex1" value="" autocomplete="off">
<div title="Clear your cookie" data-i18n="[title]Clear your cookie" class="menu_button fa-solid fa-key fa-fw manage-api-keys" data-key="scale_cookie"></div>
</div>
<div data-for="scale_cookie" class="neutral_warning">
For privacy reasons, your cookie will be hidden after you click 'Connect'.
</div>
</div>
<!-- Its only purpose is to trigger max context size check -->
<select id="model_scale_select" class="displayNone"></select>
<label for="scale-alt" class="checkbox_label">
<input id="scale-alt" type="checkbox" checked>
<span data-i18n="Alt Method">Alt Method</span>
</label>
</form>
<form id="ai21_form" data-source="ai21" action="javascript:void(null);" method="post" enctype="multipart/form-data">
<h4 data-i18n="AI21 API Key">AI21 API Key</h4>
<div class="flex-container">
@@ -3165,7 +3111,11 @@
<option value="jamba-mini">jamba-mini</option>
<option value="jamba-large">jamba-large</option>
</optgroup>
<optgroup label="Jamba 1.6">
<optgroup label="Jamba 1.7">
<option value="jamba-1.7-mini">jamba-1.7-mini</option>
<option value="jamba-1.7-large">jamba-1.7-large</option>
</optgroup>
<optgroup label="Jamba 1.6 (Deprecated)">
<option value="jamba-1.6-mini">jamba-1.6-mini</option>
<option value="jamba-1.6-large">jamba-1.6-large</option>
</optgroup>
@@ -3415,6 +3365,7 @@
<option value="pixtral-12b-latest">pixtral-12b-latest</option>
<option value="pixtral-large-latest">pixtral-large-latest</option>
<option value="devstral-small-latest">devstral-small-latest</option>
<option value="devstral-medium-latest">devstral-medium-latest</option>
<option value="magistral-small-latest">magistral-small-latest</option>
<option value="magistral-medium-latest">magistral-medium-latest</option>
</optgroup>
@@ -3430,6 +3381,7 @@
<option value="mistral-small-2409">mistral-small-2409</option>
<option value="mistral-small-2501">mistral-small-2501</option>
<option value="mistral-small-2503">mistral-small-2503</option>
<option value="mistral-small-2506">mistral-small-2506</option>
<option value="mistral-medium-2312">mistral-medium-2312</option>
<option value="mistral-medium-2505">mistral-medium-2505</option>
<option value="mistral-large-2402">mistral-large-2402</option>
@@ -3446,8 +3398,12 @@
<option value="pixtral-12b-2409">pixtral-12b-2409</option>
<option value="pixtral-large-2411">pixtral-large-2411</option>
<option value="devstral-small-2505">devstral-small-2505</option>
<option value="devstral-small-2507">devstral-small-2507</option>
<option value="devstral-medium-2507">devstral-medium-2507</option>
<option value="magistral-small-2506">magistral-small-2506</option>
<option value="magistral-medium-2506">magistral-medium-2506</option>
<option value="magistral-small-2507">magistral-small-2507</option>
<option value="magistral-medium-2507">magistral-medium-2507</option>
</optgroup>
<optgroup id="mistralai_other_models" label="Other"></optgroup>
</select>
@@ -3464,35 +3420,17 @@
</div>
<h4 data-i18n="Groq Model">Groq Model</h4>
<select id="model_groq_select">
<optgroup label="Alibaba Cloud">
<option value="qwen-2.5-32b">qwen-2.5-32b</option>
<option value="qwen-2.5-coder-32b">qwen-2.5-coder-32b</option>
</optgroup>
<optgroup label="DeepSeek">
<option value="deepseek-r1-distill-qwen-32b">deepseek-r1-distill-qwen-32b</option>
<option value="deepseek-r1-distill-llama-70b">deepseek-r1-distill-llama-70b</option>
</optgroup>
<optgroup label="Google">
<option value="gemma2-9b-it">gemma2-9b-it</option>
</optgroup>
<optgroup label="Meta">
<option value="meta-llama/llama-4-scout-17b-16e-instruct">meta-llama/llama-4-scout-17b-16e-instruct</option>
<option value="meta-llama/llama-4-maverick-17b-128e-instruct">meta-llama/llama-4-maverick-17b-128e-instruct</option>
<option value="llama-3.1-8b-instant">llama-3.1-8b-instant</option>
<option value="llama-3.2-11b-vision-preview">llama-3.2-11b-vision-preview </option>
<option value="llama-3.2-1b-preview">llama-3.2-1b-preview </option>
<option value="llama-3.2-3b-preview">llama-3.2-3b-preview </option>
<option value="llama-3.2-90b-vision-preview">llama-3.2-90b-vision-preview </option>
<option value="llama-3.3-70b-specdec">llama-3.3-70b-specdec</option>
<option value="llama-3.3-70b-versatile">llama-3.3-70b-versatile </option>
<option value="llama-guard-3-8b">llama-guard-3-8b</option>
<option value="llama3-70b-8192">llama3-70b-8192</option>
<option value="llama3-8b-8192">llama3-8b-8192</option>
</optgroup>
<optgroup label="Mistral AI">
<option value="mistral-saba-24b">mistral-saba-24b</option>
<option value="mixtral-8x7b-32768">mixtral-8x7b-32768</option>
</optgroup>
<option value="qwen/qwen3-32b">qwen/qwen3-32b</option>
<option value="deepseek-r1-distill-llama-70b">deepseek-r1-distill-llama-70b</option>
<option value="gemma2-9b-it">gemma2-9b-it</option>
<option value="meta-llama/llama-4-scout-17b-16e-instruct">meta-llama/llama-4-scout-17b-16e-instruct</option>
<option value="meta-llama/llama-4-maverick-17b-128e-instruct">meta-llama/llama-4-maverick-17b-128e-instruct</option>
<option value="llama-3.1-8b-instant">llama-3.1-8b-instant</option>
<option value="llama-3.3-70b-versatile">llama-3.3-70b-versatile </option>
<option value="llama-guard-3-8b">llama-guard-3-8b</option>
<option value="llama3-70b-8192">llama3-70b-8192</option>
<option value="llama3-8b-8192">llama3-8b-8192</option>
<option value="mistral-saba-24b">mistral-saba-24b</option>
</select>
</div>
<div id="nanogpt_form" data-source="nanogpt">
@@ -3545,6 +3483,7 @@
<option value="sonar-pro">sonar-pro</option>
<option value="sonar-reasoning">sonar-reasoning</option>
<option value="sonar-reasoning-pro">sonar-reasoning-pro</option>
<option value="sonar-deep-research">sonar-deep-research</option>
</optgroup>
<optgroup label="Offline Models">
<option value="r1-1776">r1-1776</option>
@@ -3659,6 +3598,7 @@
</div>
<h4 data-i18n="xAI Model">xAI Model</h4>
<select id="model_xai_select">
<option value="grok-4-0709">grok-4-0709</option>
<option value="grok-3-beta">grok-3-beta</option>
<option value="grok-3-fast-beta">grok-3-fast-beta</option>
<option value="grok-3-mini-beta">grok-3-mini-beta</option>
@@ -3728,7 +3668,7 @@
<div class="api_loading menu_button menu_button_icon" data-i18n="Cancel">Cancel</div>
<div data-source="custom" id="customize_additional_parameters" class="menu_button menu_button_icon" data-i18n="Additional Parameters">Additional Parameters</div>
<div data-source="openrouter" class="menu_button menu_button_icon openrouter_authorize" title="Get your OpenRouter API token using OAuth flow. You will be redirected to openrouter.ai" data-i18n="Authorize;[title]Get your OpenRouter API token using OAuth flow. You will be redirected to openrouter.ai">Authorize</div>
<div id="test_api_button" class="menu_button menu_button_icon" title="Verifies your API connection by sending a short test message. Be aware that you'll be credited for it!" data-i18n="[title]Verifies your API connection by sending a short test message. Be aware that you'll be credited for it!"><span data-i18n="Test Message">Test Message</span></div>
<div id="test_api_button" class="menu_button menu_button_icon" title="Verifies your API connection by sending a short test message. Be aware that you'll be credited for it!" data-i18n="Test Message;[title]Verifies your API connection by sending a short test message. Be aware that you'll be credited for it!">Test Message</div>
</div>
<div class="online_status">
<div class="online_status_indicator"></div>
@@ -4241,6 +4181,13 @@
</div>
<div>
<h4 class="standoutHeader" data-i18n="Miscellaneous">Miscellaneous</h4>
<div name="bindModelPresetBlock">
<label for="bind_model_templates" class="checkbox_label">
<input id="bind_model_templates" type="checkbox" />
<small data-i18n="Bind Model to Templates">Bind Model to Templates</small>
<span class="fa-solid fa-circle-question" data-i18n="[title]bind_model_templates_desc" title="When connecting to an API or choosing a model, automatically activate the current Instruct and Context templates if the model name or its chat template matches the currently loaded model."></span>
</label>
</div>
<div>
<small>
<span data-i18n="Non-markdown strings">
@@ -4307,7 +4254,7 @@
</span>
</div>
<div class="range-block-range">
<select id="world_info" class="select2_multi_sameline" multiple>
<select id="world_info" multiple>
<option value="" data-i18n="-- World Info not found --">-- World Info not found -- </option>
</select>
</div>
@@ -4800,10 +4747,10 @@
<input id="never_resize_avatars" type="checkbox" />
<small data-i18n="Never resize avatars">Never resize avatars</small>
</label>
<label data-i18n="[title]Allow animations for WEBP backgrounds. This is only a change for the selection menu." for="background_thumbnails_animation" class="checkbox_label" title="Allow animations for WEBP backgrounds. This is only a change for the selection menu.">
<input id="background_thumbnails_animation" type="checkbox" />
<small data-i18n="Animated background thumbnails">Animated background thumbnails</small>
</label>
<label data-i18n="[title]Allow animations for WEBP backgrounds. This is only a change for the selection menu." for="background_thumbnails_animation" class="checkbox_label" title="Allow animations for WEBP backgrounds. This is only a change for the selection menu.">
<input id="background_thumbnails_animation" type="checkbox" />
<small data-i18n="Animated background thumbnails">Animated background thumbnails</small>
</label>
<label class="checkbox_label" for="show_card_avatar_urls" title="Show actual file names on the disk, in the characters list display only." data-i18n="[title]Show actual file names on the disk, in the characters list display only">
<input id="show_card_avatar_urls" type="checkbox" />
<small data-i18n="Show avatar filenames">Show avatar filenames</small>
@@ -5522,7 +5469,6 @@
<div id="HotSwapWrapper" class="alignitemscenter flex-container margin0auto wide100p">
<div class="hotswap avatars_inline scroll-reset-container expander" data-i18n="[no_favs]Favorite characters to add them to HotSwaps" no_favs="Favorite characters to add them to HotSwaps">
</div>
<hr class="wide100p">
</div>
</div>
@@ -5638,19 +5584,26 @@
</div>
</div>
</div>
<hr>
<div id="spoiler_free_desc" class="flex-container flexFlowColumn flex1 flexNoGap">
<div id="creators_notes_div" class="title_restorable flexGap5">
<span class="flex1" data-i18n="Creator's Notes">Creator's Notes</span>
<small id="creators_note_desc_hidden" data-i18n="Character details are hidden.">Character details are hidden.</small>
<div id="creators_note_styles_button" class="margin0 menu_button fa-solid fa-palette fa-fw" title="Allow / Forbid the use of global styles for this character." data-i18n="[title]Allow / Forbid the use of global styles for this character."></div>
<div id="spoiler_free_desc_button" class="margin0 menu_button fa-solid fa-eye fa-fw" title="Show / Hide Description and First Message" data-i18n="[title]Show / Hide Description and First Message"></div>
<div id="spoiler_free_desc" class="inline-drawer flex-container flexFlowColumn flexNoGap">
<div class="inline-drawer-toggle inline-drawer-header padding0 gap5px standoutHeader">
<div id="creators_notes_div" class="title_restorable flexGap5 wide100p ">
<span class="flex1" data-i18n="Creator's Notes">Creator's Notes</span>
<div id="creators_note_styles_button" class="margin0 menu_button fa-solid fa-palette fa-fw" title="Allow / Forbid the use of global styles for this character." data-i18n="[title]Allow / Forbid the use of global styles for this character."></div>
<div id="spoiler_free_desc_button" class="margin0 menu_button fa-solid fa-eye fa-fw" title="Show / Hide Description and First Message" data-i18n="[title]Show / Hide Description and First Message"></div>
</div>
<div class="flex-container widthFitContent">
<div class="inline-drawer-icon fa-solid fa-circle-chevron-down down interactable"></div>
</div>
</div>
<div class="inline-drawer-content">
<div id="creator_notes_spoiler"></div>
<div id="creator_notes_empty" data-i18n="No Creator's Notes provided.">
No Creator's Notes provided.
</div>
</div>
<div id="creator_notes_spoiler" class="flex1"></div>
<!-- A button to show / hide description_div and description_textarea and first_message_div and firstmessage_textarea-->
</div>
<small id="creators_note_desc_hidden" data-i18n="Character details are hidden.">Character details are hidden.</small>
<div id="descriptionWrapper" class="flex-container flexFlowColumn flex1">
<hr>
<div id="description_div" class="title_restorable">
<div class="flex-container alignitemscenter">
<span data-i18n="Character Description" class="mdhotkey_location">Description</span>
@@ -5843,20 +5796,22 @@
</div>
<div id="rm_character_import" class="right_menu" style="display: none;">
<form id="form_import" action="javascript:void(null);" method="post" enctype="multipart/form-data">
<input multiple type="file" id="character_import_file" accept=".json, image/png, .yaml, .yml, .charx" name="avatar">
<input multiple type="file" id="character_import_file" accept=".json, image/png, .yaml, .yml, .charx, .byaf" name="avatar">
<input id="character_import_file_type" name="file_type" class="text_pole" value="" autocomplete="off">
</form>
<input type="file" id="character_replace_file" accept=".json, image/png, .yaml, .yml, .charx" name="replace_avatar" hidden>
<input type="file" id="character_replace_file" accept=".json, image/png, .yaml, .yml, .charx, .byaf" name="replace_avatar" hidden>
</div>
<div name="Character List Panel" id="rm_characters_block" class="right_menu">
<div id="charListFixedTop">
<form id="form_character_search_form" action="javascript:void(null);">
<div id="rm_button_create" title="Create New Character" data-i18n="[title]Create New Character" class="menu_button fa-solid fa-user-plus "></div>
<div id="character_import_button" title="Import Character from File" data-i18n="[title]Import Character from File" class="menu_button fa-solid fa-file-import faSmallFontSquareFix"></div>
<div id="external_import_button" title="Import content from external URL" data-i18n="[title]Import content from external URL" class="menu_button fa-solid fa-cloud-arrow-down faSmallFontSquareFix"></div>
<div id="rm_button_group_chats" title="Create New Chat Group" data-i18n="[title]Create New Chat Group" class="menu_button fa-solid fa-users-gear "></div>
<input id="character_search_bar" class="text_pole width100p" type="search" data-i18n="[placeholder]Search..." placeholder="Search..." />
<select id="character_sort_order" title="Characters sorting order" data-i18n="[title]Characters sorting order">
<div id="rm_button_bar">
<div id="rm_button_create" title="Create New Character" data-i18n="[title]Create New Character" class="menu_button fa-solid fa-user-plus"></div>
<div id="character_import_button" title="Import Character from File" data-i18n="[title]Import Character from File" class="menu_button fa-solid fa-file-import"></div>
<div id="external_import_button" title="Import content from external URL" data-i18n="[title]Import content from external URL" class="menu_button fa-solid fa-cloud-arrow-down"></div>
<div id="rm_button_group_chats" title="Create New Chat Group" data-i18n="[title]Create New Chat Group" class="menu_button fa-solid fa-users-gear"></div>
<div id="rm_buttons_container">
<!-- Container for additional buttons added by extensions -->
</div>
<select id="character_sort_order" class="flex1 text_pole textarea_compact" title="Characters sorting order" data-i18n="[title]Characters sorting order">
<option data-field="search" data-order="desc" data-i18n="Search" hidden>Search</option>
<option data-field="name" data-order="asc" data-i18n="A-Z">A-Z</option>
<option data-field="name" data-order="desc" data-i18n="Z-A">Z-A</option>
@@ -5870,12 +5825,15 @@
<option data-field="data_size" data-order="asc" data-i18n="Least tokens">Least tokens</option>
<option data-field="name" data-order="random" data-i18n="Random">Random</option>
</select>
</form>
<div id="rm_button_search" class="right_menu_button fa-fw fa-solid fa-search" title="Toggle search bar" data-i18n="[title]Toggle search bar"></div>
</div>
<div id="form_character_search_form">
<input id="character_search_bar" class="text_pole textarea_compact width100p" type="search" data-i18n="[placeholder]Search..." placeholder="Search..." />
</div>
<div class="rm_tag_controls">
<div class="tags rm_tag_filter"></div>
<div class="tags rm_tag_bogus_drilldown"></div>
</div>
<hr>
</div>
<div id="rm_print_characters_pagination">
@@ -5927,6 +5885,7 @@
<div class="flex-container wide100pLess70px character_select_container">
<div class="wide100p character_name_block">
<span class="ch_name flex1"></span>
<small class="ch_additional_info"></small>
</div>
<div class="ch_description"></div>
<div class="avatar_container_states buttons_block">
@@ -6273,7 +6232,7 @@
</span>
</small>
<small class="textAlignCenter" data-i18n="Primary Keywords">Primary Keywords</small>
<select class="keyprimaryselect keyselect select2_multi_sameline" name="key" data-i18n="[placeholder]Keywords or Regexes" placeholder="Keywords or Regexes" multiple="multiple"></select>
<select class="keyprimaryselect keyselect" name="key" data-i18n="[placeholder]Keywords or Regexes" placeholder="Keywords or Regexes" multiple="multiple"></select>
<textarea class="text_pole keyprimarytextpole mobile" name="key" rows="1" data-i18n="[placeholder]Comma separated list" placeholder="Comma separated list" style="display: none;"></textarea>
<button type="button" class="switch_input_type_icon" tabindex="-1" title="Switch to plaintext mode" data-i18n="[title]Switch to plaintext mode" data-icon-on="✨" data-icon-off="⌨️" data-tooltip-on="Switch to fancy mode" data-tooltip-off="Switch to plaintext mode">
⌨️
@@ -6295,7 +6254,7 @@
</span>
</small>
<small class="textAlignCenter" data-i18n="Optional Filter">Optional Filter</small>
<select class="keysecondaryselect keyselect select2_multi_sameline" name="keysecondary" data-i18n="[placeholder]Keywords or Regexes (ignored if empty)" placeholder="Keywords or Regexes (ignored if empty)" multiple="multiple"></select>
<select class="keysecondaryselect keyselect" name="keysecondary" data-i18n="[placeholder]Keywords or Regexes (ignored if empty)" placeholder="Keywords or Regexes (ignored if empty)" multiple="multiple"></select>
<textarea class="text_pole keysecondarytextpole mobile" name="keysecondary" rows="1" data-i18n="[placeholder]Comma separated list (ignored if empty)" placeholder="Comma separated list (ignored if empty)" style="display: none;"></textarea>
<button type="button" class="switch_input_type_icon" tabindex="-1" title="Switch to plaintext mode" data-i18n="[title]Switch to plaintext mode" data-icon-on="✨" data-icon-off="⌨️" data-tooltip-on="Switch to fancy mode" data-tooltip-off="Switch to plaintext mode">
⌨️
@@ -6482,13 +6441,37 @@
</label>
</div>
<div class="range-block-range">
<select name="characterFilter" class="select2_multi_sameline" multiple>
<select name="characterFilter" multiple>
<option value="" data-i18n="-- Characters not found --">
-- Characters not found --
</option>
</select>
</div>
</div>
<div class="flex4">
<div class="flex-container justifySpaceBetween">
<small>
<span data-i18n="Filter to Generation Triggers">
Filter to Generation Triggers
</span>
</small>
<!-- Not a real control. Used to make label heights even. -->
<label class="checkbox_label" for="__invisible">
<input type="checkbox" name="__invisible">
<span><small>&nbsp;</small></span>
</label>
</div>
<div class="range-block-range">
<select name="triggers" multiple>
<option data-i18n="Normal" value="normal">Normal</option>
<option data-i18n="Continue" value="continue">Continue</option>
<option data-i18n="Impersonate" value="impersonate">Impersonate</option>
<option data-i18n="Swipe" value="swipe">Swipe</option>
<option data-i18n="Regenerate" value="regenerate">Regenerate</option>
<option data-i18n="Quiet" value="quiet">Quiet</option>
</select>
</div>
</div>
</div>
<div name="WIEntryBottomControls" class="flex-container flex1 justifySpaceBetween world_entry_form_horizontal">
<div class="flex-container flexFlowColumn flexNoGap wi-enter-footer-text">
@@ -6719,6 +6702,22 @@
</select>
<div class="text_muted" data-i18n="To whom this message will be attributed.">To whom this message will be attributed.</div>
</div>
<div class="completion_prompt_manager_popup_entry_form_control flex1">
<label for="completion_prompt_manager_popup_entry_form_injection_trigger">
<span data-i18n="Triggers">Triggers</span>
</label>
<select id="completion_prompt_manager_popup_entry_form_injection_trigger" class="text_pole" name="injection_trigger" multiple>
<option data-i18n="Normal" value="normal">Normal</option>
<option data-i18n="Continue" value="continue">Continue</option>
<option data-i18n="Impersonate" value="impersonate">Impersonate</option>
<option data-i18n="Swipe" value="swipe">Swipe</option>
<option data-i18n="Regenerate" value="regenerate">Regenerate</option>
<option data-i18n="Quiet" value="quiet">Quiet</option>
</select>
<div class="text_muted" data-i18n="Filter to specific generation types.">
Filter to specific generation types.
</div>
</div>
</div>
<div class="flex-container gap10px">
<div class="completion_prompt_manager_popup_entry_form_control flex1">
@@ -7066,6 +7065,16 @@
<div class="right_menu_button mes_file_delete fa-solid fa-trash-can" title="Remove the file" data-i18n="[title]Remove the file"></div>
</div>
</div>
<div id="message_video_template" class="template_element">
<div class="mes_video_container">
<div class="mes_video_controls">
<div><!-- Placeholder --></div>
<div title="Delete" class="right_menu_button fa-lg fa-solid fa-trash-can mes_video_delete" data-i18n="[title]Delete"></div>
</div>
<video class="mes_video" controls preload="metadata"></video>
</div>
</div>
</div>
<div id="movingDivs">
<div id="floatingPrompt" class="drawer-content flexGap5">
+3
View File
@@ -21,6 +21,7 @@ import droll from 'droll';
import morphdom from 'morphdom';
import { toggle as slideToggle } from 'slidetoggle';
import chalk from 'chalk';
import yaml from 'yaml';
/**
* Expose the libraries to the 'window' object.
@@ -98,6 +99,7 @@ export default {
morphdom,
slideToggle,
chalk,
yaml,
};
export {
@@ -121,4 +123,5 @@ export {
morphdom,
slideToggle,
chalk,
yaml,
};
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "ضع نماذج OpenAI في مجموعة واحدة، والنماذج الإنسانية في مجموعة أخرى، وما إلى ذلك. ويمكن دمجها مع الفرز.",
"Allow fallback routes": "السماح بمسارات الاحتياط",
"Allow fallback routes Description": "يختار النموذج البديل تلقائيًا إذا كان النموذج المحدد غير قادر على تلبية طلبك.",
"Scale API Key": "مفتاح API لـ Scale",
"Clear your cookie": "امسح ملف تعريف الارتباط الخاص بك",
"Alt Method": "طريقة بديلة",
"AI21 API Key": "مفتاح API لـ AI21",
"AI21 Model": "نموذج AI21",
"Google AI Studio API Key": "مفتاح واجهة برمجة تطبيقات Google AI Studio",
@@ -1380,6 +1377,7 @@
"char_import_7": "للمضيفين المسموح بهم)",
"char_import_8": "شخصية RisuRealm (رابط مباشر)",
"char_import_9": "شخصية Soulkyn (رابط مباشر)",
"char_import_10": "شخصية Perchance (رابط مباشر أو UUID + .gz)",
"Supports importing multiple characters.": "يدعم استيراد أحرف متعددة.",
"Write each URL or ID into a new line.": "اكتب كل عنوان URL أو معرف في سطر جديد.",
"Export for character": "تصدير للشخصية",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Platzieren Sie OpenAI-Modelle in einer Gruppe, anthropogene Modelle in einer anderen Gruppe usw. Kann mit Sortierung kombiniert werden.",
"Allow fallback routes": "Fallback-Routen zulassen",
"Allow fallback routes Description": "Das alternative Modell wird automatisch ausgewählt, wenn das ausgewählte Modell Ihre Anfrage nicht erfüllen kann.",
"Scale API Key": "Scale API-Schlüssel",
"Clear your cookie": "Löschen Sie Ihre Cookies",
"Alt Method": "Alternative Methode",
"AI21 API Key": "AI21 API-Schlüssel",
"AI21 Model": "AI21-Modell",
"Google AI Studio API Key": "Google AI Studio API-Schlüssel",
@@ -1380,6 +1377,7 @@
"char_import_7": "für erlaubte Hosts)",
"char_import_8": "RisuRealm-Charakter (Direktlink)",
"char_import_9": "Soulkyn-Charakter (Direktlink)",
"char_import_10": "Perchance-Charakter (Direktlink oder UUID + .gz)",
"Supports importing multiple characters.": "Unterstützt den Import mehrerer Zeichen.",
"Write each URL or ID into a new line.": "Schreiben Sie jede URL oder ID in eine neue Zeile.",
"Export for character": "Export für Zeichen",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Coloque los modelos OpenAI en un grupo, los modelos antrópicos en otro grupo, etc. Se puede combinar con la clasificación.",
"Allow fallback routes": "Permitir rutas de respaldo",
"Allow fallback routes Description": "El modelo alternativo se elige automáticamente si el modelo seleccionado no puede cumplir con tu solicitud.",
"Scale API Key": "Clave API de Scale",
"Clear your cookie": "Limpia tu cookie",
"Alt Method": "Método alternativo",
"AI21 API Key": "Clave API de AI21",
"AI21 Model": "Modelo de AI21",
"Google AI Studio API Key": "Clave API de Google AI Studio",
@@ -1380,6 +1377,7 @@
"char_import_7": "para hosts permitidos)",
"char_import_8": "Personaje RisuRealm (Enlace directo)",
"char_import_9": "Personaje Soulkyn (Enlace directo)",
"char_import_10": "Personaje Perchance (enlace directo o UUID + .gz)",
"Supports importing multiple characters.": "Admite la importación de múltiples caracteres.",
"Write each URL or ID into a new line.": "Escriba cada URL o ID en una nueva línea.",
"Export for character": "Exportar para personaje",
+1 -3
View File
@@ -355,9 +355,6 @@
"Group by vendors": "Regrouper par fournisseurs",
"Group by vendors Description": "Placez les modèles OpenAI dans un groupe, les modèles Anthropic dans un autre groupe, etc. Peut être combiné avec le tri.",
"Allow fallback routes Description": "Le modèle alternatif est automatiquement sélectionné si le modèle choisi ne peut pas répondre à votre demande.",
"Scale API Key": "Clé API Scale",
"Clear your cookie": "Effacer vos cookies",
"Alt Method": "Méthode alternative",
"AI21 API Key": "Clé API AI21",
"AI21 Model": "Modèle AI21",
"Google AI Studio API Key": "Clé API Google AI Studio",
@@ -1302,6 +1299,7 @@
"char_import_7": "pour les hôtes autorisés)",
"char_import_8": "Personnage de RisuRealm (lien direct)",
"char_import_9": "Personnage de Soulkyn (lien direct)",
"char_import_10": "Personnage de Perchance (lien direct ou UUID + .gz)",
"Supports importing multiple characters.": "Prend en charge l'importation de plusieurs caractères.",
"Write each URL or ID into a new line.": "Écrivez chaque URL ou identifiant dans une nouvelle ligne.",
"Export for character": "Exportation pour le personnage",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Setjið OpenAI módel í einn hóp, Anthropic módel í annan hóp osfrv. Hægt að sameina við flokkun.",
"Allow fallback routes": "Leyfa bakfallssvæði",
"Allow fallback routes Description": "Veldur hlutleysa vélbúnaðarinn við val þinn ef valið módel getur ekki uppfyllt beiðni þína.",
"Scale API Key": "Lykill API fyrir Scale",
"Clear your cookie": "Hreinsaðu kökuna þína",
"Alt Method": "Aðferð Bakmenn",
"AI21 API Key": "Lykill API fyrir AI21",
"AI21 Model": "AI21 Módel",
"Google AI Studio API Key": "Google AI Studio API lykill",
@@ -1380,6 +1377,7 @@
"char_import_7": "fyrir leyfilega gestgjafa)",
"char_import_8": "RisuRealm karakter (beinn hlekkur)",
"char_import_9": "Soulkyn karakter (beinn hlekkur)",
"char_import_10": "Perchance karakter (beinn hlekkur eða UUID + .gz)",
"Supports importing multiple characters.": "Styður innflutning á mörgum stöfum.",
"Write each URL or ID into a new line.": "Skrifaðu hverja vefslóð eða auðkenni í nýja línu.",
"Export for character": "Flytja út fyrir persónu",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Metti i modelli OpenAI in un gruppo, i modelli antropici in un altro gruppo, ecc. Può essere combinato con l'ordinamento.",
"Allow fallback routes": "Consenti percorsi alternativi",
"Allow fallback routes Description": "Il modello alternativo viene automaticamente scelto se il modello selezionato non può soddisfare la tua richiesta.",
"Scale API Key": "Chiave API di Scale",
"Clear your cookie": "Cancella il tuo cookie",
"Alt Method": "Metodo alternativo",
"AI21 API Key": "Chiave API di AI21",
"AI21 Model": "Modello AI21",
"Google AI Studio API Key": "Chiave API Google AI Studio",
@@ -1380,6 +1377,7 @@
"char_import_7": "per gli host consentiti)",
"char_import_8": "Personaggio RisuRealm (collegamento diretto)",
"char_import_9": "Personaggio Soulkyn (collegamento diretto)",
"char_import_10": "Perchance Personaggio (collegamento diretto o UUID + .gz)",
"Supports importing multiple characters.": "Supporta l'importazione di più caratteri.",
"Write each URL or ID into a new line.": "Scrivi ogni URL o ID in una nuova riga.",
"Export for character": "Esporta per carattere",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "OpenAI モデルを 1 つのグループに、Anthropic モデルを別のグループに配置するなどします。ソートと組み合わせることができます。",
"Allow fallback routes": "フォールバックルートを許可",
"Allow fallback routes Description": "選択したモデルが要求を満たせない場合、代替モデルが自動的に選択されます。",
"Scale API Key": "ScaleのAPIキー",
"Clear your cookie": "クッキーを消去する",
"Alt Method": "代替手法",
"AI21 API Key": "AI21のAPIキー",
"AI21 Model": "AI21モデル",
"Google AI Studio API Key": "Google AI Studio APIキー",
@@ -1382,6 +1379,7 @@
"char_import_7": "許可されたホストの場合)",
"char_import_8": "RisuRealm キャラクター (直接リンク)",
"char_import_9": "Soulkyn キャラクター (直接リンク)",
"char_import_10": "Perchance キャラクター (直接リンクまたは UUID + .gz)",
"Supports importing multiple characters.": "複数のキャラクターのインポートをサポートします。",
"Write each URL or ID into a new line.": "各 URL または ID を新しい行に入力します。",
"Export for character": "キャラクターのエクスポート",
+1 -3
View File
@@ -384,9 +384,6 @@
"LEGACY": "유산",
"Force Instruct Mode formatting": "강제 지시 모드 형식",
"Force_Instruct_Mode_formatting_Description": "Instruct Mode와 이 모드가 모두 활성화된 경우 프롬프트는 SillyTavern에 의해 현재 형식을 사용하여 형식화됩니다.\n 고급 형식 설정(시스템 프롬프트 지시 제외) 비활성화된 경우 프롬프트는 OpenRouter에 의해 형식화됩니다.",
"Scale API Key": "Scale API 키",
"Clear your cookie": "쿠키 지우기",
"Alt Method": "대체 방법",
"AI21 API Key": "AI21 API 키",
"AI21 Model": "AI21 모델",
"Google AI Studio API Key": "Google AI Studio API 키",
@@ -1399,6 +1396,7 @@
"char_import_7": "허용된 호스트의 경우)",
"char_import_8": "RisuRealm 캐릭터 (직접링크)",
"char_import_9": "Soulkyn 캐릭터 (직접링크)",
"char_import_10": "Perchance 캐릭터 (직접 링크 또는 UUID + .gz)",
"Supports importing multiple characters.": "여러 문자 가져오기를 지원합니다.",
"Write each URL or ID into a new line.": "각 URL 또는 ID를 새 줄에 작성합니다.",
"Export for character": "캐릭터 내보내기",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Plaats OpenAI-modellen in één groep, antropische modellen in een andere groep, enz. Kan worden gecombineerd met sorteren.",
"Allow fallback routes": "Fallback-routes toestaan",
"Allow fallback routes Description": "Het alternatieve model wordt automatisch gekozen als het geselecteerde model niet aan uw verzoek kan voldoen.",
"Scale API Key": "Scale API-sleutel",
"Clear your cookie": "Wis uw cookie",
"Alt Method": "Alternatieve methode",
"AI21 API Key": "AI21 API-sleutel",
"AI21 Model": "AI21-model",
"MakerSuite API Key": "MakerSuite API-sleutel",
@@ -1380,6 +1377,7 @@
"char_import_7": "voor toegestane hosts)",
"char_import_8": "RisuRealm-personage (directe link)",
"char_import_9": "Soulkyn-personage (directe link)",
"char_import_10": "Perchance-personage (directe link of UUID + .gz)",
"Supports importing multiple characters.": "Ondersteunt het importeren van meerdere tekens.",
"Write each URL or ID into a new line.": "Schrijf elke URL of ID op een nieuwe regel.",
"Export for character": "Exporteren voor karakter",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Coloque os modelos OpenAI em um grupo, os modelos antrópicos em outro grupo, etc.",
"Allow fallback routes": "Permitir rotas de fallback",
"Allow fallback routes Description": "O modelo alternativo será escolhido automaticamente se o modelo selecionado não puder atender à sua solicitação.",
"Scale API Key": "Chave da API Scale",
"Clear your cookie": "Limpe seu cookie",
"Alt Method": "Método Alternativo",
"AI21 API Key": "Chave da API AI21",
"AI21 Model": "Modelo AI21",
"Google AI Studio API Key": "Chave API Google AI Studio",
@@ -1380,6 +1377,7 @@
"char_import_7": "para hosts permitidos)",
"char_import_8": "Personagem RisuRealm (link direto)",
"char_import_9": "Personagem Soulkyn (link direto)",
"char_import_10": "Personagem Perchance (Link Direto ou UUID + .gz)",
"Supports importing multiple characters.": "Suporta importação de vários caracteres.",
"Write each URL or ID into a new line.": "Escreva cada URL ou ID em uma nova linha.",
"Export for character": "Exportar para personagem",
+1 -5
View File
@@ -142,8 +142,6 @@
"Get your key from": "Получите ключ в",
"Anthropic's developer console": "консоли разработчика Anthropic",
"Claude Model": "Модель Claude",
"Scale API Key": "Ключ от Scale API",
"Alt Method": "Альтернативный метод",
"AI21 API Key": "Ключ от API AI21",
"AI21 Model": "Модель AI21",
"View API Usage Metrics": "Посмотреть статистику использования API",
@@ -966,6 +964,7 @@
"char_import_6": "Прямая ссылка на PNG-файл (список разрешённых хостов находится в",
"char_import_7": ")",
"char_import_9": "Персонаж с Soulkyn (прямая ссылка)",
"char_import_10": "Персонаж с Perchance (прямая ссылка или UUID + .gz)",
"Grammar String": "Грамматика",
"GBNF or EBNF, depends on the backend in use. If you're using this you should know which.": "GBNF или EBNF, зависит от бэкенда. Если вы это используете, то, скорее всего, сами знаете, какой именно.",
"Account": "Аккаунт",
@@ -1254,7 +1253,6 @@
"vLLM Model": "Модель vLLM",
"Aphrodite Model": "Модель Aphrodite",
"Peek a password": "Посмотреть пароль",
"Clear your cookie": "Clear your cookie",
"Add Chat Start and Example Separator to a list of stopping strings.": "Использовать Начало чата и Разделитель примеров сообщений в качестве стоп-строк.",
"Context Order": "Context Order",
"Summary": "Summary",
@@ -1748,8 +1746,6 @@
"dot quota_error": "имеется достаточно кредитов.",
"If you have sufficient credits, please try again later.": "Если кредитов достаточно, то повторите попытку позднее.",
"Proxy preset '${0}' not found": "Пресет '${0}' не найден",
"Window.ai returned an error": "Window.ai ответил ошибкой",
"Extension is not installed": "Расширение не установлено",
"Update or remove your reverse proxy settings.": "Измените или удалите ваши настройки прокси.",
"An error occurred while importing prompts. More info available in console.": "В процессе импорта произошла ошибка. Подробную информацию см. в консоли.",
"Could not import prompts. Export failed validation.": "Не удалось импортировать промпты. Не пройдена валидация при экспорте.",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Помістіть моделі OpenAI в одну групу, моделі Anthropic в іншу групу тощо. Можна поєднати з сортуванням.",
"Allow fallback routes": "Дозволити резервні маршрути",
"Allow fallback routes Description": "Автоматично вибирає альтернативну модель, якщо вибрана модель не може задовольнити ваш запит.",
"Scale API Key": "Ключ API для Scale",
"Clear your cookie": "Очистіть файл cookie",
"Alt Method": "Альтернативний метод",
"AI21 API Key": "Ключ API для AI21",
"AI21 Model": "Модель AI21",
"Google AI Studio API Key": "Ключ API Google AI Studio",
@@ -1380,6 +1377,7 @@
"char_import_7": "для дозволених хостів)",
"char_import_8": "Персонаж RisuRealm (пряме посилання)",
"char_import_9": "Персонаж Soulkyn (пряме посилання)",
"char_import_10": "Персонаж Perchance (пряме посилання або UUID + .gz)",
"Supports importing multiple characters.": "Підтримується імпорт кількох символів.",
"Write each URL or ID into a new line.": "Напишіть кожну URL-адресу або ідентифікатор у новому рядку.",
"Export for character": "Експорт для персонажа",
+1 -3
View File
@@ -375,9 +375,6 @@
"Group by vendors Description": "Xếp các mô hình OpenAI vào một nhóm, các mô hình Anthropic vào một nhóm khác, v.v. Có thể kết hợp với việc sắp xếp.",
"Allow fallback routes": "Cho phép các tuyến đường phụ",
"Allow fallback routes Description": "Bot thay thế tự động nếu mô hình được chọn không thể đáp ứng yêu cầu của bạn.",
"Scale API Key": "Scale API Key",
"Clear your cookie": "Xóa cookie",
"Alt Method": "Phương pháp thay thế",
"AI21 API Key": "AI21 API Key",
"AI21 Model": "Model của AI21",
"Google AI Studio API Key": "Google AI Studio API Key",
@@ -1380,6 +1377,7 @@
"char_import_7": "đối với các máy chủ được phép)",
"char_import_8": "RisuRealm (URL trực tiếp)",
"char_import_9": "Soulkyn (URL trực tiếp)",
"char_import_10": "Perchance (Nhập URL trực tiếp hoặc UUID + .gz)",
"Supports importing multiple characters.": "Hỗ trợ nhập nhiều ký tự.",
"Write each URL or ID into a new line.": "Viết mỗi URL hoặc ID vào một dòng mới.",
"Export for character": "Xuất cho nhân vật",
+1 -3
View File
@@ -429,9 +429,6 @@
"Group by vendors": "按厂商分组",
"Group by vendors Description": "将 OpenAI 模型放在一组,将 Anthropic 模型放在另一组,等等。可以与排序结合。",
"To use instruct formatting, switch to OpenRouter under Text Completion API.": "To use instruct formatting, switch to OpenRouter under Text Completion API.",
"Scale API Key": "Scale API密钥",
"Clear your cookie": "清除你的 Cookie",
"Alt Method": "备用方法",
"AI21 API Key": "AI21 API 密钥",
"AI21 Model": "AI21 模型",
"Google AI Studio API Key": "Google AI Studio API 密钥",
@@ -1894,6 +1891,7 @@
"char_import_7": ")",
"char_import_8": "RisuRealm 角色(直链)",
"char_import_9": "Soulkyn 角色(直链)",
"char_import_10": "Perchance 角色(直链或UUID + .gz)",
"Supports importing multiple characters.": "支持导入多个角色。",
"Write each URL or ID into a new line.": "将每个 URL 或 ID 写入新行。",
"Enter the Git URL of the extension to install": "输入扩展程序的 Git URL 以安装",
+1 -103
View File
@@ -376,9 +376,6 @@
"Group by vendors Description": "將 OpenAI、Anthropic 等模型放各自供應商的群組中。可以與排序功能結合使用。",
"Allow fallback routes": "允許備援路徑",
"Allow fallback routes Description": "如果選擇的模型無法滿足要求,會自動選擇替代模型。",
"Scale API Key": "Scale API 金鑰",
"Clear your cookie": "清除您的 Cookie",
"Alt Method": "替代方法",
"AI21 API Key": "AI21 API 金鑰",
"AI21 Model": "AI21 模型",
"Google AI Studio API Key": "Google AI Studio API 金鑰",
@@ -1385,6 +1382,7 @@
"char_import_7": "對於允許的主機)",
"char_import_8": "RisuRealm 角色(直接連結)",
"char_import_9": "Soulkyn 角色(直接連結)",
"char_import_10": "Perchance 角色(直接連結或 ID + .gz)",
"Supports importing multiple characters.": "支援匯入多個字元。",
"Write each URL or ID into a new line.": "將每個 URL 或 ID 寫入新行。",
"Export for character": "匯出字元",
@@ -2515,106 +2513,6 @@
"Note: Themes can be made/applied by going to the ": "注意:主題可通過前往以下位置進行創建/應用",
"Theme Name": "主題名稱",
"An unknown error occurred while counting tokens. Further information may be available in console.": "計算符元時發生未知錯誤。更多資訊可能可在主控台(console)中查看。",
"Qvink Memory": "Qvink Memory(進階聊天記憶)",
"Toggle whether memory is enabled for this chat specifically (overrides all settings).": "切換是否為此聊天啟用記憶功能(將覆蓋所有設定)。",
"Toggle Chat Memory": "切換聊天記憶",
"Preview current memory state (the exact text that will be injected into your context).": "預覽目前記憶狀態(包含將嵌入上下文的具體內容)。",
"Copy ALL memories to clipboard (all memories in the entire chat, not just those injected).": "將所有記憶複製到剪貼簿(包含整個聊天的所有記憶,而非僅限於注入的部分)。",
"Just refreshes which memories are included and re-renders the memories under each message, doesn't change summaries. This is done automatically all the time, the button is here just in case.": "不影響摘要,僅更新已包含的聊天記憶,並重新顯示在每則訊息下方。此過程通常會自動執行,按鈕只是備用選項。",
"Active Settings Profile ": "目前設定檔",
"Create, edit, and save configuration profiles for this extension.": "建立、編輯及儲存此擴充功能的設定檔。",
"The currently selected profile": "目前選取的設定檔",
"Save current profile": "儲存此設定檔",
"Rename current profile": "重新命名此設定檔",
"Create new profile": "建立新設定檔",
"Restore current profile": "還原此設定檔",
"Delete current profile": "刪除此設定檔",
"Set as default profile for current character": "設為目前角色的預設設定檔",
"Summarization": "摘要",
"Customize the prompt used to summarize a given message": "自訂用於摘要指定訊息的提示詞",
"Edit the summary prompt": "編輯摘要提示",
"Preview the filled-in summary prompt, using the last message as an example.": "以最後一則訊息為例,預覽填充完成的摘要提示",
"Mass re-summarization. Brings up dialog to choose subsets of messages to summarize or re-summarize.": "批量重新摘要:開啟對話框以選擇訊息子集進行摘要或重新摘要。",
"Stop all summarization immediately.": "立即停止所有摘要。",
"New messages will be automatically summarized if they will be included in short-term memory.": "如果新訊息將被納入短期記憶,將自動進行摘要。",
"Auto Summarize": "自動摘要",
"Auto-summarization will be triggered before a new message is sent instead of after.": "自動摘要將在發送新訊息之前觸發。",
"Auto Summarize Before Generation": "在生成內容前自動摘要",
"Show the progress bar when auto-summarizing more than 1 message.": "在自動摘要多於 1 則訊息時顯示進度條。",
"Auto Summarize Progress Bar": "自動摘要進度條",
"Number of messages to delay summarization (0 = summarize up to the most recent message, 1 = lag behind by one message, etc.)": "延遲摘要的訊息數量(0 = 摘要至最新訊息,1 = 延遲摘要 1 則訊息,以此類推)。",
"Auto Summarize Message Lag": "自動摘要訊息延遲",
"Wait until this many messages before auto-summarizing them all in sequence (1 = summarize every message immediately, 2 = summarize when you have two ready, etc). Still summarizes one at a time.": "在訊息數量達到此設定值後,依序自動摘要(1 = 即時摘要每則訊息,2 = 等待 2 則訊息後再摘要,以此類推)。摘要將逐條執行。",
"Auto Summarize Batch Size": "自動摘要批次大小",
"The maximum number of messages back that auto-summarization will apply (-1 to disable).": "自動摘要可回溯的訊息最大數量(-1 表示禁用此功能)。",
"Auto Summarize Message Limit": "自動摘要訊息上限",
"Time in seconds to wait between summarizations. May be needed if you are using a external API with a rate limit.": "每次摘要的間隔時間(秒)。此設定適用於使用具有請求速率限制的外部 API。",
"Summarization Time Delay": "摘要時間延遲",
"The maximum token length a summary is allowed to be before cutting it off. Use the {{words}} macro in the summarization prompt to get this value.": "摘要在被截斷前允許的最大符元(token)長度。可在摘要提示中使用 {{words}} 巨集以取得此數值。",
"Summary Max Token Length": "摘要允許的最大符元長度",
"Editing a message will automatically trigger a re-summarization if it has already been summarized.": "編輯訊息時,若該訊息已被摘要,將自動觸發重新摘要。",
"Re-summarize on Edit": "編輯後重新摘要",
"Swiping a message will automatically trigger a re-summarization if it has already been summarized.": "滑動訊息後若已進行摘要,將自動觸發重新摘要。",
"Re-summarize on Swipe": "滑動後重新摘要",
"Block chat input while summarizing.": "在摘要進行時暫時禁用聊天訊息輸入。",
"Block Chat": "鎖定訊息輸入",
"Whether to use messages and/or summaries as context for summarization. You must use {{history}} in the summary prompt.": "決定是否在摘要中使用訊息及/或過往摘要作為背景資訊。需於摘要提示詞中,使用 {{history}}。",
"Message History": "訊息歷史",
"Messages": "僅訊息",
"Summaries": "僅摘要",
"Both": "訊息與摘要",
"Preview what the message history will look like": "預覽訊息歷史的顯示效果",
"How many previous messages to include in the summarization prompt as context.": "摘要提示中要包含多少先前訊息作為上下文。",
"Number of Previous Messages": "先前訊息數量",
"When including previous messages, also include user messages.": "包含先前訊息時,也包含使用者訊息。",
"Include Previous User Messages": "包含先前使用者訊息",
"The message to summarize will be inside the system instruct template itself. In unchecked (default), the message will instead be added separately after the prompt. Some models benefit from this, but it is not recommended.": "系統指令模板內將直接包含需要摘要的訊息。若未啟用此選項(預設設定),訊息會在提示後分開添加。儘管某些模型可能更適合此設定,但一般不建議使用。",
"Nest Message in Summary Prompt": "在摘要提示中內嵌訊息",
"WARNING: doesn't work great. Attempts to preserve context-shifting by including all the content that is sent in regular prompts (world info, description, personas, example messages, message history, etc). If your regular prompts are static, this can allow Context Shifting to work between summarizations, but it decreases the accuracy of summarization due to all the extra stuff in the prompt. It also can't be previewed as this injection is handled by ST, not the extension.": "警告:效果不佳。此功能嘗試透過在摘要時包含所有常規提示內容(如世界資訊、描述、角色設定、示範訊息、聊天歷史等)來保留上下文轉換。若您的常規提示為靜態內容,則可在摘要之間維持上下文轉換,但由於提示中包含大量額外資訊,將降低摘要的準確性。此外,此內容注入由 ST 處理,而非此擴充功能,因此無法進行預覽。",
"Include All Context Content": "包含所有上下文內容",
"Short-term Memory Injection": "短期記憶注入",
"Determines which messages are included in the short-term memory injection and where. If you change this and include messages that weren't summarized previously, you can either manually trigger a re-summarization or just wait until automatic summarization triggers.": "設定短期記憶注入中所包含的訊息及其插入位置。若更改此設定並包含先前未摘要的訊息,您可手動觸發重新摘要,或等待自動摘要啟動。",
"Edit the short-term memory prompt": "編輯短期記憶提示",
"Include User Messages": "包含使用者訊息",
"Include System Messages": "包含系統訊息",
"Include Thought Message": "包含思考訊息",
"Message Length Threshold": "訊息長度閾值",
"The minimum token length a message has to be in order to get summarized.": "可被摘要的訊息最小符元長度。",
"The max percent of the context that short-term memory can take up.": "短期記憶可佔用上下文的最大百分比。",
"Short-Term Context %": "短期記憶上下文%",
"Include short-term memory in the World Info Scan": "在世界資訊掃描中包含短期記憶",
"Do not inject": "不注入",
"Before main prompt": "主提示之前",
"After main prompt": "主提示之後",
"In chat at depth": "在對話中位於深度",
"Long-Term Memory Injection": "長期記憶注入",
"Determines where long-term messages are injected.": "決定長期訊息注入的位置。",
"Edit the long-term memory prompt": "編輯長期記憶提示",
"The max percent of the context that long-term memory can take up.": "長期記憶可佔用上下文的最大百分比。",
"Long-Term Context %": "長期記憶上下文%",
"Include long-term memory in the World Info Scan": "在世界資訊掃描中包含長期記憶",
"Misc.": "其他",
"Fill your console with debug messages": "將偵錯訊息填入主控台",
"Debug Mode": "偵錯模式",
"Display summarizations below each message": "在每則訊息下顯示摘要",
"Display Memories": "顯示記憶",
"Enable Memory in New Chats": "在新對話中啟用記憶",
"Limit Message History": "限制訊息歷史",
"Revert Settings": "還原設定",
"Auto-summarize user messages and include summaries in memory.": "自動摘要使用者訊息,並將該摘要納入記憶。",
"Auto-summarize system messages and include summaries in memory.": "自動摘要系統訊息,並將該摘要納入記憶。",
"Auto-summarize thought messages and include summaries in memory (from the Stepped Thinking extension).": "自動摘要思考訊息並將摘要納入記憶(來自 Stepped Thinking 擴充功能)。",
"Revert all settings to default (not the default profile, just the default that comes with the extension). Your other profiles won't be affected.": "將所有設定恢復為預設值(並非恢復至「預設設定檔」,而是擴充功能隨附的原始預設值)。其他設定檔將不受影響。",
"Limit the number of messages to send in regular prompts to this number (-1 for no limit). Message memories will still be sent.": "限制常規提示中傳送的訊息數量至此數值(-1 表示無限制)。訊息記憶仍將一併傳送。",
"Whether memory is enabled by default for new chats.": "是否在新對話中預設啟用記憶。",
"Summarize Chat": "聊天摘要",
"Choose settings for the chat summarization. All message inclusion/exclusion settings from the main config profile are used, in addition to the following options.": "選擇聊天摘要的設定。摘要時將使用主要設定檔中的所有訊息包含/排除規則,並可額外設定以下選項。",
"Currently preparing to summarize:": "目前正在準備摘要:",
"Summarize messages with no existing summary": "摘要尚無摘要的訊息",
"Re-summarize messages with existing short-term memories": "重新摘要具有現有短期記憶的訊息",
"Re-summarize messages with existing long-term memories": "重新摘要具有現有長期記憶的訊息",
"Re-summarize messages with existing memories, but which are currently excluded from short-term and long-term memory": "重新摘要具有現有記憶,但目前被排除在短期和長期記憶之外的訊息",
"Re-summarize messages with existing memories that have been manually edited.": "重新摘要已手動編輯的訊息記憶",
"Type the folder name of the theme you want to apply.": "輸入您想套用的主題資料夾名稱。",
"Place your theme data in a folder.": "請將主題資料存於該資料夾內。",
"Unsure where to start? Type ": "不確定如何開始?輸入:",
+599 -2002
View File
File diff suppressed because it is too large Load Diff
+259 -96
View File
@@ -6,7 +6,7 @@ import { event_types, eventSource, is_send_press, main_api, substituteParams } f
import { is_group_generating } from './group-chats.js';
import { Message, MessageCollection, TokenHandler } from './openai.js';
import { power_user } from './power-user.js';
import { debounce, waitUntilCondition, escapeHtml } from './utils.js';
import { debounce, waitUntilCondition, escapeHtml, uuidv4 } from './utils.js';
import { debounce_timeout } from './constants.js';
import { renderTemplateAsync } from './templates.js';
import { Popup } from './popup.js';
@@ -29,6 +29,7 @@ function debouncePromise(func, delay) {
}
const DEFAULT_DEPTH = 4;
const DEFAULT_ORDER = 100;
/**
* @enum {number}
@@ -77,25 +78,108 @@ const registerPromptManagerMigration = () => {
* Represents a prompt.
*/
class Prompt {
identifier; role; content; name; system_prompt; position; injection_position; injection_depth; injection_order; forbid_overrides; extension;
/**
* Indicates if the prompt is enabled.
* @type {boolean}
*/
enabled;
/**
* Unique identifier for the prompt.
* @type {string}
*/
identifier;
/**
* Role of the prompt, e.g., 'system', 'user', etc.
* @type {string}
*/
role;
/**
* Content of the prompt.
* @type {string}
*/
content;
/**
* Display name of the prompt.
* @type {string}
*/
name;
/**
* Indicates if the prompt is a system prompt.
* @type {boolean}
*/
system_prompt;
/**
* Position of the prompt in the prompt list.
* @type {string|number}
*/
position;
/**
* Inject position of the prompt (relative = 0 or in-chat = 1)
* @type {number}
*/
injection_position;
/**
* Depth of the prompt in the chat.
* @type {number}
*/
injection_depth;
/**
* Order of the prompt in the chat.
* @type {number}
*/
injection_order;
/**
* Indicates if the prompt should not be overridden.
* @type {boolean}
*/
forbid_overrides;
/**
* Prompt is added by an extension.
* @type {boolean}
*/
extension;
/**
* A list of generation type triggers for the prompt injection.
* @type {string[]}
*/
injection_trigger;
/**
* Indicates if the prompt is a marker prompt.
* @type {boolean}
*/
marker;
/**
* Create a new Prompt instance.
*
* @param {Object} param0 - Object containing the properties of the prompt.
* @param {string} param0.identifier - The unique identifier of the prompt.
* @param {string} param0.role - The role associated with the prompt.
* @param {string} param0.content - The content of the prompt.
* @param {Object} [param0] - Object containing the properties of the prompt.
* @param {string} [param0.identifier] - The unique identifier of the prompt.
* @param {string} [param0.role] - The role associated with the prompt.
* @param {string} [param0.content] - The content of the prompt.
* @param {string} [param0.name] - The name of the prompt.
* @param {boolean} [param0.system_prompt] - Indicates if the prompt is a system prompt.
* @param {string} [param0.position] - The position of the prompt in the prompt list.
* @param {string|number} [param0.position] - The position of the prompt in the prompt list.
* @param {number} [param0.injection_position] - The insert position of the prompt.
* @param {number} [param0.injection_depth] - The depth of the prompt in the chat.
* @param {number} [param0.injection_order] - The order of the prompt in the chat.
* @param {string[]} [param0.injection_trigger] - The generation type trigger for the prompt injection.
* @param {boolean} [param0.forbid_overrides] - Indicates if the prompt should not be overridden.
* @param {boolean} [param0.extension] - Prompt is added by an extension.
*/
constructor({ identifier, role, content, name, system_prompt, position, injection_depth, injection_position, forbid_overrides, extension, injection_order } = {}) {
constructor({ identifier, role, content, name, system_prompt, position, injection_depth, injection_position, forbid_overrides, extension, injection_order, injection_trigger } = {}) {
this.identifier = identifier;
this.role = role;
this.content = content;
@@ -106,7 +190,8 @@ class Prompt {
this.injection_position = injection_position;
this.forbid_overrides = forbid_overrides;
this.extension = extension ?? false;
this.injection_order = injection_order ?? 100;
this.injection_order = injection_order ?? DEFAULT_ORDER;
this.injection_trigger = injection_trigger ?? [];
}
}
@@ -114,7 +199,16 @@ class Prompt {
* Representing a collection of prompts.
*/
export class PromptCollection {
/**
* List of Prompts in the collection.
* @type {Prompt[]}
*/
collection = [];
/**
* List of identifiers of prompts that have been overridden.
* @type {string[]}
*/
overriddenPrompts = [];
/**
@@ -129,7 +223,7 @@ export class PromptCollection {
/**
* Checks if the provided instances are of the Prompt class.
*
* @param {...any} prompts - Instances to check.
* @param {...Prompt} prompts - Instances to check.
* @throws Will throw an error if one or more instances are not of the Prompt class.
*/
checkPromptInstance(...prompts) {
@@ -191,6 +285,12 @@ export class PromptCollection {
return this.index(identifier) !== -1;
}
/**
* Overrides a prompt at a specific position in the collection.
*
* @param {Prompt} prompt - The Prompt instance to override.
* @param {number} position - The position in the collection to override the Prompt instance.
*/
override(prompt, position) {
this.set(prompt, position);
this.overriddenPrompts.push(prompt.identifier);
@@ -274,7 +374,7 @@ class PromptManager {
this.tryGenerate = async () => { };
/** Called to persist the configuration, must return a promise */
this.saveServiceSettings = () => { };
this.saveServiceSettings = () => { return Promise.resolve(); };
/** Toggle prompt button click */
this.handleToggle = () => { };
@@ -444,32 +544,51 @@ class PromptManager {
break;
}
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name').value = prompt.name;
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role').value = 'system';
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt').value = prompt.content ?? '';
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position').value = prompt.injection_position ?? 0;
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth').value = prompt.injection_depth ?? DEFAULT_DEPTH;
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order').value = prompt.injection_order ?? 100;
document.getElementById(this.configuration.prefix + 'prompt_manager_depth_block').style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
document.getElementById(this.configuration.prefix + 'prompt_manager_order_block').style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides').checked = prompt.forbid_overrides ?? false;
document.getElementById(this.configuration.prefix + 'prompt_manager_forbid_overrides_block').style.visibility = this.overridablePrompts.includes(prompt.identifier) ? 'visible' : 'hidden';
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt').disabled = prompt.marker ?? false;
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source_block').style.display = isPulledPrompt ? '' : 'none';
const nameField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name'));
const roleField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role'));
const promptField = /** @type {HTMLTextAreaElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt'));
const injectionPositionField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position'));
const injectionDepthField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth'));
const injectionOrderField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order'));
const injectionTriggerField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_trigger'));
const depthBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_depth_block'));
const orderBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_order_block'));
const forbidOverridesField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides'));
const forbidOverridesBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_forbid_overrides_block'));
const entrySourceBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source_block'));
const entrySource = /** @type {HTMLSpanElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source'));
nameField.value = prompt.name;
roleField.value = 'system';
promptField.value = prompt.content ?? '';
injectionPositionField.value = (prompt.injection_position ?? 0).toString();
injectionDepthField.value = (prompt.injection_depth ?? DEFAULT_DEPTH).toString();
injectionOrderField.value = (prompt.injection_order ?? DEFAULT_ORDER).toString();
Array.from(injectionTriggerField.options).forEach(option => {
option.selected = false;
});
injectionTriggerField.dispatchEvent(new Event('change', { bubbles: true }));
depthBlock.style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
orderBlock.style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
forbidOverridesField.checked = prompt.forbid_overrides ?? false;
forbidOverridesBlock.style.visibility = this.overridablePrompts.includes(prompt.identifier) ? 'visible' : 'hidden';
promptField.disabled = prompt.marker ?? false;
entrySourceBlock.style.display = isPulledPrompt ? '' : 'none';
if (isPulledPrompt) {
const sourceName = this.promptSources[promptId];
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source').textContent = sourceName;
entrySource.textContent = sourceName;
}
if (!this.systemPrompts.includes(promptId)) {
document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position').removeAttribute('disabled');
injectionPositionField.removeAttribute('disabled');
}
};
// Append prompt to selected character
this.handleAppendPrompt = (event) => {
const promptID = document.getElementById(this.configuration.prefix + 'prompt_manager_footer_append_prompt').value;
const appendPromptFooter = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_footer_append_prompt'));
const promptID = appendPromptFooter.value;
const prompt = this.getPromptById(promptID);
if (prompt) {
@@ -483,7 +602,8 @@ class PromptManager {
this.handleDeletePrompt = async (event) => {
Popup.show.confirm(t`Are you sure you want to delete this prompt?`, null).then((userChoice) => {
if (!userChoice) return;
const promptID = document.getElementById(this.configuration.prefix + 'prompt_manager_footer_append_prompt').value;
const appendPromptFooter = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_footer_append_prompt'));
const promptID = appendPromptFooter.value;
const prompt = this.getPromptById(promptID);
if (prompt && true === this.isPromptDeletionAllowed(prompt)) {
@@ -566,6 +686,7 @@ class PromptManager {
fileOpener.accept = '.json';
fileOpener.addEventListener('change', (event) => {
if (!(event.target instanceof HTMLInputElement)) return;
const file = event.target.files[0];
if (!file) return;
@@ -575,7 +696,7 @@ class PromptManager {
const fileContent = event.target.result;
try {
const data = JSON.parse(fileContent);
const data = JSON.parse(fileContent.toString());
this.import(data);
} catch (err) {
toastr.error(t`An error occurred while importing prompts. More info available in console.`);
@@ -615,7 +736,7 @@ class PromptManager {
// Update edit form if present
// @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/offsetParent
const popupEditFormPrompt = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt');
const popupEditFormPrompt = /** @type {HTMLTextAreaElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt'));
if (popupEditFormPrompt.offsetParent) {
popupEditFormPrompt.value = prompt.content;
}
@@ -673,6 +794,7 @@ class PromptManager {
// Trigger re-render when token settings are changed
document.getElementById('openai_max_context').addEventListener('change', (event) => {
if (!(event.target instanceof HTMLInputElement)) return;
this.serviceSettings.openai_max_context = event.target.value;
if (this.activeCharacter) this.renderDebounced();
});
@@ -778,23 +900,33 @@ class PromptManager {
/**
* Update a prompt with the values from the HTML form.
* @param {object} prompt - The prompt to be updated.
* @param {Partial<Prompt>} prompt - The prompt to be updated.
* @returns {void}
*/
updatePromptWithPromptEditForm(prompt) {
prompt.name = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name').value;
prompt.role = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role').value;
prompt.content = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt').value;
prompt.injection_position = Number(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position').value);
prompt.injection_depth = Number(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth').value);
prompt.injection_order = Number(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order').value);
prompt.forbid_overrides = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides').checked;
const nameField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name'));
const roleField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role'));
const promptField = /** @type {HTMLTextAreaElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt'));
const injectionPositionField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position'));
const injectionDepthField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth'));
const injectionOrderField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order'));
const injectionTriggerField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_trigger'));
const forbidOverridesField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides'));
prompt.name = nameField.value;
prompt.role = roleField.value;
prompt.content = promptField.value;
prompt.injection_position = Number(injectionPositionField.value);
prompt.injection_depth = Number(injectionDepthField.value);
prompt.injection_order = Number(injectionOrderField.value);
prompt.injection_trigger = Array.from(injectionTriggerField.selectedOptions).map(option => option.value);
prompt.forbid_overrides = forbidOverridesField.checked;
}
/**
* Find a prompt by its identifier and update it with the provided object.
* @param {string} identifier - The identifier of the prompt.
* @param {object} updatePrompt - An object with properties to be updated in the prompt.
* @param {Prompt} updatePrompt - An object with properties to be updated in the prompt.
* @returns {void}
*/
updatePromptByIdentifier(identifier, updatePrompt) {
@@ -804,7 +936,7 @@ class PromptManager {
/**
* Iterate over an array of prompts, find each one by its identifier, and update them with the provided data.
* @param {object[]} prompts - An array of prompt updates.
* @param {Prompt[]} prompts - An array of prompt updates.
* @returns {void}
*/
updatePrompts(prompts) {
@@ -826,7 +958,7 @@ class PromptManager {
/**
* Add a prompt to the current character's prompt list.
* @param {object} prompt - The prompt to be added.
* @param {Prompt} prompt - The prompt to be added.
* @param {object} character - The character whose prompt list will be updated.
* @returns {void}
*/
@@ -839,7 +971,7 @@ class PromptManager {
/**
* Remove a prompt from the current character's prompt list.
* @param {object} prompt - The prompt to be removed.
* @param {Prompt} prompt - The prompt to be removed.
* @param {object} character - The character whose prompt list will be updated.
* @returns {void}
*/
@@ -853,7 +985,7 @@ class PromptManager {
/**
* Create a new prompt and add it to the list of prompts.
* @param {object} prompt - The prompt to be added.
* @param {Partial<Prompt>} prompt - The prompt to be added.
* @param {string} identifier - The identifier for the new prompt.
* @returns {void}
*/
@@ -931,7 +1063,7 @@ class PromptManager {
/**
* Check whether a prompt can be inspected.
* @param {object} prompt - The prompt to check.
* @param {Prompt} prompt - The prompt to check.
* @returns {boolean} True if the prompt is a marker, false otherwise.
*/
isPromptInspectionAllowed(prompt) {
@@ -940,7 +1072,7 @@ class PromptManager {
/**
* Check whether a prompt can be deleted. System prompts cannot be deleted.
* @param {object} prompt - The prompt to check.
* @param {Prompt} prompt - The prompt to check.
* @returns {boolean} True if the prompt can be deleted, false otherwise.
*/
isPromptDeletionAllowed(prompt) {
@@ -949,7 +1081,7 @@ class PromptManager {
/**
* Check whether a prompt can be edited.
* @param {object} prompt - The prompt to check.
* @param {Prompt} prompt - The prompt to check.
* @returns {boolean} True if the prompt can be edited, false otherwise.
*/
isPromptEditAllowed(prompt) {
@@ -966,7 +1098,7 @@ class PromptManager {
/**
* Check whether a prompt can be toggled on or off.
* @param {object} prompt - The prompt to check.
* @param {Prompt} prompt - The prompt to check.
* @returns {boolean} True if the prompt can be deleted, false otherwise.
*/
isPromptToggleAllowed(prompt) {
@@ -1062,7 +1194,7 @@ class PromptManager {
/**
* Get the prompts for a specific character. Can be filtered to only include enabled prompts.
* @returns {object[]} The prompts for the character.
* @returns {Prompt[]} The prompts for the character.
* @param character
* @param onlyEnabled
*/
@@ -1075,7 +1207,7 @@ class PromptManager {
/**
* Get the order of prompts for a specific character. If no character is specified or the character doesn't have a prompt list, an empty array is returned.
* @param {object|null} character - The character to get the prompt list for.
* @returns {object[]} The prompt list for the character, or an empty array.
* @returns {Partial<Prompt>[]} The prompt list for the character, or an empty array.
*/
getPromptOrderForCharacter(character) {
return !character ? [] : (this.serviceSettings.prompt_order.find(list => String(list.character_id) === String(character.id))?.order ?? []);
@@ -1083,7 +1215,7 @@ class PromptManager {
/**
* Set the prompts for the manager.
* @param {object[]} prompts - The prompts to be set.
* @param {Partial<Prompt>[]} prompts - The prompts to be set.
* @returns {void}
*/
setPrompts(prompts) {
@@ -1125,7 +1257,7 @@ class PromptManager {
/**
* Finds and returns a prompt by its identifier.
* @param {string} identifier - Identifier of the prompt
* @returns {Object|null} The prompt object, or null if not found
* @returns {Prompt|null} The prompt object, or null if not found
*/
getPromptById(identifier) {
return this.serviceSettings.prompts.find(item => item && item.identifier === identifier) ?? null;
@@ -1143,9 +1275,9 @@ class PromptManager {
/**
* Enriches a generic object, creating a new prompt object in the process
*
* @param {Object} prompt - Prompt object
* @param {Partial<Prompt>} prompt - Prompt object
* @param original
* @returns {Object} An object with "role" and "content" properties
* @returns {Prompt} An object with "role" and "content" properties
*/
preparePrompt(prompt, original = null) {
const groupMembers = this.getActiveGroupCharacters();
@@ -1184,7 +1316,7 @@ class PromptManager {
const debouncedSaveServiceSettings = debouncePromise(() => this.saveServiceSettings(), 300);
const textarea = document.getElementById(textareaIdentifier);
const textarea = /** @type {HTMLTextAreaElement} */(document.getElementById(textareaIdentifier));
textarea.addEventListener('blur', () => {
prompt.content = textarea.value;
this.updatePromptByIdentifier(identifier, prompt);
@@ -1193,9 +1325,15 @@ class PromptManager {
}
/**
* Updates the quick edit textarea for a specific prompt.
* @param {string} identifier - The identifier of the prompt.
* @param {Prompt} prompt - The updated prompt object.
* @returns {string} The ID of the updated textarea element.
*/
updateQuickEdit(identifier, prompt) {
const elementId = `${identifier}_prompt_quick_edit_textarea`;
const textarea = document.getElementById(elementId);
const textarea = /** @type {HTMLTextAreaElement} */(document.getElementById(elementId));
textarea.value = prompt.content;
return elementId;
@@ -1220,30 +1358,35 @@ class PromptManager {
/**
* Loads a given prompt into the edit form fields.
* @param {Object} prompt - Prompt object with properties 'name', 'role', 'content', and 'system_prompt'
* @param {Partial<Prompt>} prompt - Prompt object with properties 'name', 'role', 'content', and 'system_prompt'
*/
loadPromptIntoEditForm(prompt) {
const nameField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name');
const roleField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role');
const promptField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt');
const injectionPositionField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position');
const injectionDepthField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth');
const injectionOrderField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order');
const injectionDepthBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_depth_block');
const injectionOrderBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_order_block');
const forbidOverridesField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides');
const forbidOverridesBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_forbid_overrides_block');
const entrySourceBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source_block');
const entrySource = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source');
const nameField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name'));
const roleField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role'));
const promptField = /** @type {HTMLTextAreaElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt'));
const injectionPositionField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position'));
const injectionDepthField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth'));
const injectionOrderField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order'));
const injectionTriggerField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_trigger'));
const injectionDepthBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_depth_block'));
const injectionOrderBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_order_block'));
const forbidOverridesField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides'));
const forbidOverridesBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_forbid_overrides_block'));
const entrySourceBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source_block'));
const entrySource = /** @type {HTMLSpanElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source'));
const isPulledPrompt = Object.keys(this.promptSources).includes(prompt.identifier);
nameField.value = prompt.name ?? '';
roleField.value = prompt.role || 'system';
promptField.value = prompt.content ?? '';
promptField.disabled = prompt.marker ?? false;
injectionPositionField.value = prompt.injection_position ?? INJECTION_POSITION.RELATIVE;
injectionDepthField.value = prompt.injection_depth ?? DEFAULT_DEPTH;
injectionOrderField.value = prompt.injection_order ?? 100;
injectionPositionField.value = (prompt.injection_position ?? INJECTION_POSITION.RELATIVE).toString();
injectionDepthField.value = (prompt.injection_depth ?? DEFAULT_DEPTH).toString();
injectionOrderField.value = (prompt.injection_order ?? DEFAULT_ORDER).toString();
Array.from(injectionTriggerField.options).forEach(option => {
option.selected = Array.isArray(prompt.injection_trigger) && prompt.injection_trigger.includes(option.value);
});
injectionTriggerField.dispatchEvent(new Event('change', { bubbles: true }));
injectionDepthBlock.style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
injectionOrderBlock.style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
injectionPositionField.removeAttribute('disabled');
@@ -1335,17 +1478,19 @@ class PromptManager {
const editArea = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_edit');
editArea.style.display = 'none';
const nameField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name');
const roleField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role');
const promptField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt');
const injectionPositionField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position');
const injectionDepthField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth');
const injectionDepthBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_depth_block');
const injectionOrderBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_order_block');
const forbidOverridesField = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides');
const forbidOverridesBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_forbid_overrides_block');
const entrySourceBlock = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source_block');
const entrySource = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source');
const nameField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_name'));
const roleField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_role'));
const promptField = /** @type {HTMLTextAreaElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt'));
const injectionPositionField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position'));
const injectionDepthField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth'));
const injectionDepthBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_depth_block'));
const injectionOrderBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_order_block'));
const injectionOrderField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order'));
const injectionTriggerField = /** @type {HTMLSelectElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_trigger'));
const forbidOverridesField = /** @type {HTMLInputElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides'));
const forbidOverridesBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_forbid_overrides_block'));
const entrySourceBlock = /** @type {HTMLDivElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source_block'));
const entrySource = /** @type {HTMLSpanElement} */(document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_source'));
nameField.value = '';
roleField.selectedIndex = 0;
@@ -1353,7 +1498,9 @@ class PromptManager {
promptField.disabled = false;
injectionPositionField.selectedIndex = 0;
injectionPositionField.removeAttribute('disabled');
injectionDepthField.value = DEFAULT_DEPTH;
injectionDepthField.value = DEFAULT_DEPTH.toString();
injectionOrderField.value = DEFAULT_ORDER.toString();
injectionTriggerField.value = '';
injectionDepthBlock.style.visibility = 'unset';
injectionOrderBlock.style.visibility = 'unset';
forbidOverridesBlock.style.visibility = 'unset';
@@ -1373,28 +1520,48 @@ class PromptManager {
/**
* Returns a full list of prompts whose content markers have been substituted.
* @param {string} generationType - The type of generation, e.g., 'continue' or 'quiet'.
* @returns {PromptCollection} A PromptCollection object
*/
getPromptCollection() {
getPromptCollection(generationType) {
generationType = String(generationType || 'normal').toLowerCase().trim();
const promptCollection = new PromptCollection();
const promptOrder = this.getPromptOrderForCharacter(this.activeCharacter);
const promptCollection = new PromptCollection();
promptOrder.forEach(entry => {
if (true === entry.enabled) {
const prompt = this.getPromptById(entry.identifier);
if (prompt) promptCollection.add(this.preparePrompt(prompt));
} else if (!entry.enabled && entry.identifier === 'main') {
const prompt = this.getPromptById(entry.identifier);
const allowedTrigger = entry.enabled && this.shouldTrigger(prompt, generationType);
if (!prompt) {
return;
}
if (allowedTrigger) {
promptCollection.add(this.preparePrompt(prompt));
} else if (entry.identifier === 'main') {
// Some extensions require main prompt to be present for relative inserts.
// So we make a GMO-free vegan replacement.
const prompt = structuredClone(this.getPromptById(entry.identifier));
prompt.content = '';
if (prompt) promptCollection.add(this.preparePrompt(prompt));
const replacementPrompt = structuredClone(prompt);
replacementPrompt.content = '';
promptCollection.add(this.preparePrompt(replacementPrompt));
}
});
return promptCollection;
}
/**
* Checks if a prompt should be triggered based on its injection triggers.
* @param {Prompt} prompt - The prompt to check.
* @param {string} generationType - The type of generation to check against.
* @returns {boolean} True if the prompt should be triggered, false otherwise.
*/
shouldTrigger(prompt, generationType) {
if (!Array.isArray(prompt?.injection_trigger)) return true;
if (!prompt.injection_trigger.length) return true;
return prompt.injection_trigger.includes(generationType);
}
/**
* Setter for messages property
*
@@ -1807,11 +1974,7 @@ class PromptManager {
* @returns {string} A string representation of an uuid4
*/
getUuidv4() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
let r = Math.random() * 16 | 0,
v = c === 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16);
});
return uuidv4();
}
/**
+13 -15
View File
@@ -4,7 +4,6 @@ import {
characters,
online_status,
main_api,
api_server,
is_send_press,
max_context,
saveSettingsDebounced,
@@ -42,6 +41,7 @@ import { debounce_timeout } from './constants.js';
import { Popup } from './popup.js';
import { accountStorage } from './util/AccountStorage.js';
import { getCurrentUserHandle } from './user.js';
import { kai_settings } from './kai-settings.js';
var RPanelPin = document.getElementById('rm_button_panel_pin');
var LPanelPin = document.getElementById('lm_button_panel_pin');
@@ -371,7 +371,7 @@ function RA_autoconnect(PrevApi) {
if (online_status === 'no_connection' && power_user.auto_connect) {
switch (main_api) {
case 'kobold':
if (api_server && isValidUrl(api_server)) {
if (kai_settings.api_server && isValidUrl(kai_settings.api_server)) {
$('#api_button').trigger('click');
}
break;
@@ -397,8 +397,6 @@ function RA_autoconnect(PrevApi) {
case 'openai':
if (((secret_state[SECRET_KEYS.OPENAI] || oai_settings.reverse_proxy) && oai_settings.chat_completion_source == chat_completion_sources.OPENAI)
|| ((secret_state[SECRET_KEYS.CLAUDE] || oai_settings.reverse_proxy) && oai_settings.chat_completion_source == chat_completion_sources.CLAUDE)
|| ((secret_state[SECRET_KEYS.SCALE] || secret_state[SECRET_KEYS.SCALE_COOKIE]) && oai_settings.chat_completion_source == chat_completion_sources.SCALE)
|| (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI)
|| (secret_state[SECRET_KEYS.OPENROUTER] && oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER)
|| (secret_state[SECRET_KEYS.AI21] && oai_settings.chat_completion_source == chat_completion_sources.AI21)
|| (secret_state[SECRET_KEYS.MAKERSUITE] && oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE)
@@ -434,19 +432,19 @@ function OpenNavPanels() {
//auto-open R nav if locked and previously open
if (accountStorage.getItem('NavLockOn') == 'true' && accountStorage.getItem('NavOpened') == 'true') {
//console.log("RA -- clicking right nav to open");
$('#rightNavDrawerIcon').click();
$('#rightNavDrawerIcon').trigger('click');
}
//auto-open L nav if locked and previously open
if (accountStorage.getItem('LNavLockOn') == 'true' && accountStorage.getItem('LNavOpened') == 'true') {
console.debug('RA -- clicking left nav to open');
$('#leftNavDrawerIcon').click();
$('#leftNavDrawerIcon').trigger('click');
}
//auto-open WI if locked and previously open
if (accountStorage.getItem('WINavLockOn') == 'true' && accountStorage.getItem('WINavOpened') == 'true') {
console.debug('RA -- clicking WI to open');
$('#WIDrawerIcon').click();
$('#WIDrawerIcon').trigger('click');
}
}
}
@@ -711,7 +709,7 @@ export function initRossMods() {
RA_autoconnect();
}
$('#main_api').change(function () {
$('#main_api').on('change', function () {
var PrevAPI = main_api;
setTimeout(() => RA_autoconnect(PrevAPI), 100);
});
@@ -834,11 +832,11 @@ export function initRossMods() {
});
var chatbarInFocus = false;
$('#send_textarea').focus(function () {
$('#send_textarea').on('focus', function () {
chatbarInFocus = true;
});
$('#send_textarea').blur(function () {
$('#send_textarea').on('blur', function () {
chatbarInFocus = false;
});
@@ -846,8 +844,8 @@ export function initRossMods() {
OpenNavPanels();
}, 300);
$(SelectedCharacterTab).click(function () { accountStorage.setItem('SelectedNavTab', 'rm_button_selected_ch'); });
$('#rm_button_characters').click(function () { accountStorage.setItem('SelectedNavTab', 'rm_button_characters'); });
$(SelectedCharacterTab).on('click', function () { accountStorage.setItem('SelectedNavTab', 'rm_button_selected_ch'); });
$('#rm_button_characters').on('click', function () { accountStorage.setItem('SelectedNavTab', 'rm_button_characters'); });
// when a char is selected from the list, save them as the auto-load character for next page load
@@ -932,7 +930,7 @@ export function initRossMods() {
var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');
if (SwipeTargetMesClassParent !== null) {
if (SwipeButR.css('display') === 'flex') {
SwipeButR.click();
SwipeButR.trigger('click');
}
}
});
@@ -956,7 +954,7 @@ export function initRossMods() {
var SwipeTargetMesClassParent = $(e.target).closest('.last_mes');
if (SwipeTargetMesClassParent !== null) {
if (SwipeButL.css('display') === 'flex') {
SwipeButL.click();
SwipeButL.trigger('click');
}
}
});
@@ -1159,7 +1157,7 @@ export function initRossMods() {
const lastMes = document.querySelector('.last_mes');
const editMes = lastMes.querySelector('.mes_block .mes_edit');
if (editMes !== null) {
$(editMes).click();
$(editMes).trigger('click');
return;
}
}
+3 -6
View File
@@ -421,7 +421,7 @@ async function autoBackgroundCommand() {
const list = options.map(option => `- ${option.text}`).join('\n');
const prompt = stringFormat(autoBgPrompt, list);
const reply = await generateQuietPrompt(prompt, false, false);
const reply = await generateQuietPrompt({ quietPrompt: prompt });
const fuse = new Fuse(options, { keys: ['text'] });
const bestMatch = fuse.search(reply, { limit: 1 });
@@ -524,7 +524,7 @@ async function resolveImageUrl(bg, isCustom) {
? bg
: getThumbnailUrl('bg', bg);
return `url('${thumbnailUrl}')`;
return `url("${thumbnailUrl}")`;
}
/**
@@ -636,12 +636,9 @@ async function uploadBackground(formData) {
return;
}
const headers = getRequestHeaders();
delete headers['Content-Type'];
const response = await fetch('/api/backgrounds/upload', {
method: 'POST',
headers: headers,
headers: getRequestHeaders({ omitContentType: true }),
body: formData,
cache: 'no-cache',
});
+6 -2
View File
@@ -1,6 +1,6 @@
import { characterGroupOverlay } from '../script.js';
import { BulkEditOverlay, BulkEditOverlayState } from './BulkEditOverlay.js';
import { BulkEditOverlay, BulkEditOverlayState, CharacterContextMenu } from './BulkEditOverlay.js';
import { event_types, eventSource } from './events.js';
let is_bulk_edit = false;
@@ -121,4 +121,8 @@ export function initBulkEdit() {
$('#bulkEditButton').on('click', onEditButtonClick);
$('#bulkSelectAllButton').on('click', onSelectAllButtonClick);
$('#bulkDeleteButton').on('click', onDeleteButtonClick);
const characterContextMenu = new CharacterContextMenu(characterGroupOverlay);
eventSource.on(event_types.CHARACTER_PAGE_LOADED, characterGroupOverlay.onPageLoad);
console.debug('Character context menu initialized', characterContextMenu);
}
+1 -1
View File
@@ -135,7 +135,7 @@ function onCfgMenuItemClick() {
.siblings('.inline-drawer-content')
.css('display') !== 'block') {
$('#floatingPrompt').addClass('resizing');
$('#CFGBlockToggle').click();
$('#CFGBlockToggle').trigger('click');
}
} else {
//hide AN if it's already displayed
+78 -7
View File
@@ -1,3 +1,5 @@
import { t } from './i18n.js';
// the hash can be obtained from command line e.g. via: MODEL=path_to_model; python -c "import json, hashlib, sys; print(hashlib.sha256(json.load(open('"$MODEL"/tokenizer_config.json'))['chat_template'].encode()).hexdigest())"
// note that chat templates must be trimmed to match the llama.cpp metadata value
const hash_derivations = {
@@ -83,21 +85,31 @@ const hash_derivations = {
'854b703e44ca06bdb196cc471c728d15dbab61e744fe6cdce980086b61646ed1':
'GLM-4'
,
// Kimi K2, ...
'aab20feb9bc6881f941ea649356130ffbc4943b3c2577c0991e1fba90de5a0fc':
'Moonshot AI'
,
};
const substr_derivations = {
'<|im_start|>': 'ChatML', // qwen2.5, ...
};
const substr_derivations = [
['Moonshot AI', ['<|im_user|>user<|im_middle|>', '<|im_assistant|>assistant<|im_middle|>', '<|im_end|>']],
// Generic cases
['ChatML', ['<|im_start|>user', '<|im_start|>assistant', '<|im_end|>']],
];
const parse_derivation = derivation => (typeof derivation === 'string') ? {
'context': derivation,
'instruct': derivation,
} : derivation;
const not_found = { context: null, instruct: null };
export async function deriveTemplatesFromChatTemplate(chat_template, hash) {
if (chat_template.trim() === '') {
console.log('Missing chat template.');
return null;
return not_found;
}
if (hash in hash_derivations) {
@@ -105,12 +117,71 @@ export async function deriveTemplatesFromChatTemplate(chat_template, hash) {
}
// heuristics
for (const [substr, derivation] of Object.entries(substr_derivations) ) {
if (chat_template.includes(substr)) {
for (const [derivation, substr] of substr_derivations) {
if ([substr].flat().every(str => chat_template.includes(str))) {
return parse_derivation(derivation);
}
}
console.warn(`Unknown chat template hash: ${hash} for [${chat_template}]`);
return null;
return not_found;
}
export async function bindModelTemplates(power_user, online_status) {
if (online_status === 'no_connection') {
return false;
}
const chatTemplateHash = power_user.chat_template_hash;
const bindModelTemplates = power_user.model_templates_mappings[online_status]
?? power_user.model_templates_mappings[chatTemplateHash]
?? {};
const bindingsMatch = bindModelTemplates
&& power_user.context.preset == bindModelTemplates['context']
&& (!power_user.instruct.enabled || power_user.instruct.preset === bindModelTemplates['instruct']);
const bound = [];
if (bindingsMatch) {
// unmap current preset
delete power_user.model_templates_mappings[chatTemplateHash];
delete power_user.model_templates_mappings[online_status];
toastr.info(t`Context preset for ${online_status} will use defaults when loaded the next time.`);
} else {
if (power_user.context_derived) {
if (power_user.context.preset !== bindModelTemplates['context']) {
bound.push(`${power_user.context.preset} context preset`);
// toastr.info(`Bound ${power_user.context.preset} preset to currently loaded model and all models that share its chat template.`);
// map current preset to current chat template hash
bindModelTemplates['context'] = power_user.context.preset;
}
} else {
toastr.warning(t`Note: Context derivation is disabled. Not including context preset.`);
}
if (power_user.instruct.enabled) {
if (power_user.instruct_derived) {
if (power_user.instruct.preset !== bindModelTemplates['instruct']) {
bound.push(`${power_user.instruct.preset} instruct preset`);
bindModelTemplates['instruct'] = power_user.instruct.preset;
}
} else {
toastr.warning(t`Note: Instruct derivation is disabled. Not including instruct preset.`);
}
}
if (bound.length == 0) {
toastr.warning(t`No applicable presets available.`);
return false;
}
toastr.info(t`Bound ${online_status} to ${bound.join(', ')}.`);
if (!online_status.startsWith('koboldcpp/ggml-model-')) {
power_user.model_templates_mappings[online_status] = bindModelTemplates;
}
if (chatTemplateHash !== '') {
power_user.model_templates_mappings[chatTemplateHash] = bindModelTemplates;
}
}
return true;
}
+191 -17
View File
@@ -43,6 +43,8 @@ import {
extractTextFromOffice,
download,
getFileText,
getFileExtension,
convertTextToBase64,
} from './utils.js';
import { extension_settings, renderExtensionTemplateAsync, saveMetadataDebounced } from './extensions.js';
import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
@@ -68,7 +70,7 @@ import { accountStorage } from './util/AccountStorage.js';
* @returns {Promise<string>} Converted file text
*/
const fileSizeLimit = 1024 * 1024 * 100; // 100 MB
const fileSizeLimit = 1024 * 1024 * 350; // 350 MB
const ATTACHMENT_SOURCE = {
GLOBAL: 'global',
CHARACTER: 'character',
@@ -204,17 +206,16 @@ export async function populateFileAttachment(message, inputId = 'file_form_input
const fileNamePrefix = `${Date.now()}_${slug}`;
const fileBase64 = await getBase64Async(file);
let base64Data = fileBase64.split(',')[1];
const extension = getFileExtension(file);
// If file is image
if (file.type.startsWith('image/')) {
const extension = file.type.split('/')[1];
const imageUrl = await saveBase64AsFile(base64Data, name2, fileNamePrefix, extension);
message.extra.image = imageUrl;
message.extra.inline_image = true;
}
// If file is video
else if (file.type.startsWith('video/')) {
const extension = file.type.split('/')[1];
const videoUrl = await saveBase64AsFile(base64Data, name2, fileNamePrefix, extension);
message.extra.video = videoUrl;
} else {
@@ -224,7 +225,7 @@ export async function populateFileAttachment(message, inputId = 'file_form_input
try {
const converter = getConverter(file.type);
const fileText = await converter(file);
base64Data = window.btoa(unescape(encodeURIComponent(fileText)));
base64Data = convertTextToBase64(fileText);
} catch (error) {
toastr.error(String(error), t`Could not convert file`);
console.error('Could not convert file', error);
@@ -247,6 +248,7 @@ export async function populateFileAttachment(message, inputId = 'file_form_input
} catch (error) {
console.error('Could not upload file', error);
toastr.error(t`Either the file is corrupted or its format is not supported.`, t`Could not upload the file`);
} finally {
$('#file_form').trigger('reset');
}
@@ -476,7 +478,7 @@ export async function appendFileContent(message, messageText) {
export function encodeStyleTags(text) {
const styleRegex = /<style>(.+?)<\/style>/gims;
return text.replaceAll(styleRegex, (_, match) => {
return `<custom-style>${escape(match)}</custom-style>`;
return `<custom-style>${encodeURIComponent(match)}</custom-style>`;
});
}
@@ -497,14 +499,7 @@ export function decodeStyleTags(text, { prefix } = { prefix: '.mes_text ' }) {
for (let i = 0; i < rule.selectors.length; i++) {
const selector = rule.selectors[i];
if (selector) {
const selectors = (selector.split(' ') ?? []).map((v) => {
if (v.startsWith('.')) {
return '.custom-' + v.substring(1);
}
return v;
}).join(' ');
rule.selectors[i] = prefix + selectors;
rule.selectors[i] = prefix + sanitizeSelector(selector);
}
}
}
@@ -513,6 +508,36 @@ export function decodeStyleTags(text, { prefix } = { prefix: '.mes_text ' }) {
}
}
function sanitizeSelector(selector) {
// Handle pseudo-classes that can contain nested selectors
const pseudoClasses = ['has', 'not', 'where', 'is', 'matches', 'any'];
const pseudoRegex = new RegExp(`:(${pseudoClasses.join('|')})\\(([^)]+)\\)`, 'g');
// First, sanitize any nested selectors within pseudo-classes
selector = selector.replace(pseudoRegex, (match, pseudoClass, content) => {
// Recursively sanitize the content within the pseudo-class
const sanitizedContent = sanitizeSimpleSelector(content);
return `:${pseudoClass}(${sanitizedContent})`;
});
// Then sanitize the main selector parts
return sanitizeSimpleSelector(selector);
}
function sanitizeSimpleSelector(selector) {
// Split by spaces but preserve complex selectors
return selector.split(/\s+/).map((part) => {
// Handle class selectors, but preserve pseudo-classes and other complex parts
return part.replace(/\.([\w-]+)/g, (match, className) => {
// Don't modify if it's already prefixed with 'custom-'
if (className.startsWith('custom-')) {
return match;
}
return `.custom-${className}`;
});
}).join(' ');
}
function sanitizeRuleSet(ruleSet) {
if (Array.isArray(ruleSet.selectors) || Array.isArray(ruleSet.declarations)) {
sanitizeRule(ruleSet);
@@ -529,7 +554,7 @@ export function decodeStyleTags(text, { prefix } = { prefix: '.mes_text ' }) {
return text.replaceAll(styleDecodeRegex, (_, style) => {
try {
let styleCleaned = unescape(style).replaceAll(/<br\/>/g, '');
let styleCleaned = decodeURIComponent(style).replaceAll(/<br\/>/g, '');
const ast = css.parse(styleCleaned);
const sheet = ast?.stylesheet;
if (sheet) {
@@ -893,6 +918,27 @@ async function deleteMessageImage() {
await saveChatConditional();
}
async function deleteMessageVideo() {
const confirm = await Popup.show.confirm(t`Delete video from message?`, t`This action can't be undone.`);
if (!confirm) {
return;
}
const mesBlock = $(this).closest('.mes');
const mesId = mesBlock.attr('mesid');
const message = chat[mesId];
if (!message?.extra?.video) {
console.warn('Message has no video or it is empty');
return;
}
delete message.extra.video;
mesBlock.find('.mes_video_container').remove();
await saveChatConditional();
}
/**
* Deletes file from the server.
* @param {string} url Path to the file on the server
@@ -1475,14 +1521,14 @@ export async function uploadFileAttachmentToServer(file, target) {
try {
const converter = getConverter(file.type);
const fileText = await converter(file);
base64Data = window.btoa(unescape(encodeURIComponent(fileText)));
base64Data = convertTextToBase64(fileText);
} catch (error) {
toastr.error(String(error), t`Could not convert file`);
console.error('Could not convert file', error);
}
} else {
const fileText = await file.text();
base64Data = window.btoa(unescape(encodeURIComponent(fileText)));
base64Data = convertTextToBase64(fileText);
}
const fileUrl = await uploadFileAttachment(uniqueFileName, base64Data);
@@ -1670,6 +1716,132 @@ export function registerFileConverter(mimeType, converter) {
converters[mimeType] = converter;
}
export function addDOMPurifyHooks() {
// Allow target="_blank" in links
DOMPurify.addHook('afterSanitizeAttributes', function (node) {
if ('target' in node) {
node.setAttribute('target', '_blank');
node.setAttribute('rel', 'noopener');
}
});
DOMPurify.addHook('uponSanitizeAttribute', (node, data, config) => {
if (!config['MESSAGE_SANITIZE']) {
return;
}
/* Retain the classes on UI elements of messages that interact with the main UI */
const permittedNodeTypes = ['BUTTON', 'DIV'];
if (config['MESSAGE_ALLOW_SYSTEM_UI'] && node.classList.contains('menu_button') && permittedNodeTypes.includes(node.nodeName)) {
return;
}
switch (data.attrName) {
case 'class': {
if (data.attrValue) {
data.attrValue = data.attrValue.split(' ').map((v) => {
if (v.startsWith('fa-') || v.startsWith('note-') || v === 'monospace') {
return v;
}
return 'custom-' + v;
}).join(' ');
}
break;
}
}
});
DOMPurify.addHook('uponSanitizeElement', (node, _, config) => {
if (!config['MESSAGE_SANITIZE']) {
return;
}
// Replace line breaks with <br> in unknown elements
if (node instanceof HTMLUnknownElement) {
node.innerHTML = node.innerHTML.trim().replaceAll('\n', '<br>');
}
const isMediaAllowed = isExternalMediaAllowed();
if (isMediaAllowed) {
return;
}
if (!(node instanceof Element)) {
return;
}
let mediaBlocked = false;
switch (node.tagName) {
case 'AUDIO':
case 'VIDEO':
case 'SOURCE':
case 'TRACK':
case 'EMBED':
case 'OBJECT':
case 'IMG': {
const isExternalUrl = (url) => (url.indexOf('://') > 0 || url.indexOf('//') === 0) && !url.startsWith(window.location.origin);
const src = node.getAttribute('src');
const data = node.getAttribute('data');
const srcset = node.getAttribute('srcset');
if (srcset) {
const srcsetUrls = srcset.split(',');
for (const srcsetUrl of srcsetUrls) {
const [url] = srcsetUrl.trim().split(' ');
if (isExternalUrl(url)) {
console.warn('External media blocked', url);
node.remove();
mediaBlocked = true;
break;
}
}
}
if (src && isExternalUrl(src)) {
console.warn('External media blocked', src);
mediaBlocked = true;
node.remove();
}
if (data && isExternalUrl(data)) {
console.warn('External media blocked', data);
mediaBlocked = true;
node.remove();
}
if (mediaBlocked && (node instanceof HTMLMediaElement)) {
node.autoplay = false;
node.pause();
}
}
break;
}
if (mediaBlocked) {
const entityId = getCurrentEntityId();
const warningShownKey = `mediaWarningShown:${entityId}`;
if (accountStorage.getItem(warningShownKey) === null) {
const warningToast = toastr.warning(
t`Use the 'Ext. Media' button to allow it. Click on this message to dismiss.`,
t`External media has been blocked`,
{
timeOut: 0,
preventDuplicates: true,
onclick: () => toastr.clear(warningToast),
},
);
accountStorage.setItem(warningShownKey, 'true');
}
}
});
}
export function initChatUtilities() {
$(document).on('click', '.mes_hide', async function () {
const messageBlock = $(this).closest('.mes');
@@ -1849,13 +2021,15 @@ export function initChatUtilities() {
reloadCurrentChat();
});
$('#creators_note_styles_button').on('click', function () {
$('#creators_note_styles_button').on('click', function (e) {
e.stopPropagation();
openGlobalStylesPreferenceDialog();
});
$(document).on('click', '.mes_img', expandMessageImage);
$(document).on('click', '.mes_img_enlarge', expandAndZoomMessageImage);
$(document).on('click', '.mes_img_delete', deleteMessageImage);
$(document).on('click', '.mes_video_delete', deleteMessageVideo);
$('#file_form_input').on('change', async () => {
const fileInput = document.getElementById('file_form_input');
+18
View File
@@ -22,3 +22,21 @@ export const debounce_timeout = {
* which is needed to preserve world info timed effects.
*/
export const IGNORE_SYMBOL = Symbol.for('ignore');
/**
* Common video file extensions. Should be the same as supported by Gemini.
* https://ai.google.dev/gemini-api/docs/video-understanding#supported-formats
*/
export const VIDEO_EXTENSIONS = ['mp4', 'avi', 'mov', 'wmv', 'flv', 'webm', '3gp', 'mkv', 'mpg'];
/**
* Known generation triggers that can be passed to Generate function.
*/
export const GENERATION_TYPE_TRIGGERS = [
'normal',
'continue',
'impersonate',
'swipe',
'regenerate',
'quiet',
];
+7 -2
View File
@@ -1,5 +1,5 @@
import { getPresetManager } from './preset-manager.js';
import { extractMessageFromData, getGenerateUrl, getRequestHeaders } from '../script.js';
import { extractJsonFromData, extractMessageFromData, getGenerateUrl, getRequestHeaders } from '../script.js';
import { getTextGenServer } from './textgen-settings.js';
import { extractReasoningFromData } from './reasoning.js';
import { formatInstructModeChat, formatInstructModePrompt, getInstructStoppingSequences, names_behavior_types } from './instruct-mode.js';
@@ -467,7 +467,7 @@ export class ChatCompletionService {
return json;
}
return {
const result = {
content: extractMessageFromData(json, this.TYPE),
reasoning: extractReasoningFromData(json, {
mainApi: this.TYPE,
@@ -475,6 +475,11 @@ export class ChatCompletionService {
ignoreShowThoughts: true,
}),
};
// Try parse JSON
if (data.json_schema) {
result.content = JSON.parse(extractJsonFromData(json, { mainApi: this.TYPE, chatCompletionSource: data.chat_completion_source }));
}
return result;
}
if (!response.ok) {
+21 -9
View File
@@ -1,4 +1,5 @@
import { getRequestHeaders } from '../script.js';
import { VIDEO_EXTENSIONS } from './constants.js';
import { t } from './i18n.js';
import { callGenericPopup, Popup, POPUP_TYPE } from './popup.js';
import { renderTemplateAsync } from './templates.js';
@@ -44,6 +45,10 @@ class DataMaidDialog {
name: t`Background Thumbnails`,
description: t`Thumbnails for missing or deleted backgrounds.`,
},
personaThumbnails: {
name: t`Persona Thumbnails`,
description: t`Thumbnails for missing or deleted personas.`,
},
chatBackups: {
name: t`Chat Backups`,
description: t`Automatically generated chat backups.`,
@@ -217,8 +222,9 @@ class DataMaidDialog {
button.addEventListener('click', async () => {
const item = button.closest('.dataMaidItem');
const hash = item?.getAttribute('data-hash');
const itemName = items.find(i => i.hash === hash)?.name;
if (hash) {
await this.view(prop, hash);
await this.view(prop, hash, itemName);
}
});
});
@@ -304,13 +310,14 @@ class DataMaidDialog {
* Opens the item view for a specific hash.
* @param {string} prop Property name for the category
* @param {string} hash Item hash to view
* @param {string} name Name of the item to view
* @private
*/
async view(prop, hash) {
async view(prop, hash, name) {
const url = this.getViewUrl(hash);
const isImage = ['images', 'avatarThumbnails', 'backgroundThumbnails'].includes(prop);
const element = isImage
? await this.getViewElement(url)
? await this.getViewElement(url, name)
: await this.getTextViewElement(url);
await callGenericPopup(element, POPUP_TYPE.DISPLAY, '', { large: true, wide: true });
}
@@ -341,16 +348,21 @@ class DataMaidDialog {
}
/**
* Gets an image element for viewing images.
* Gets a media element for viewing images or videos.
* @param {string} url View URL
* @param {string} name Name of the file
* @returns {Promise<HTMLElement>} Image element
* @private
*/
async getViewElement(url) {
const img = document.createElement('img');
img.src = url;
img.classList.add('dataMaidImageView');
return img;
async getViewElement(url, name) {
const isVideo = VIDEO_EXTENSIONS.includes(name.split('.').pop());
const mediaElement = document.createElement(isVideo ? 'video' : 'img');
if (mediaElement instanceof HTMLVideoElement) {
mediaElement.controls = true;
}
mediaElement.src = url;
mediaElement.classList.add('dataMaidImageView');
return mediaElement;
}
/**
+92
View File
@@ -0,0 +1,92 @@
import { EventEmitter } from '../lib/eventemitter.js';
export const event_types = {
APP_READY: 'app_ready',
EXTRAS_CONNECTED: 'extras_connected',
MESSAGE_SWIPED: 'message_swiped',
MESSAGE_SENT: 'message_sent',
MESSAGE_RECEIVED: 'message_received',
MESSAGE_EDITED: 'message_edited',
MESSAGE_DELETED: 'message_deleted',
MESSAGE_UPDATED: 'message_updated',
MESSAGE_FILE_EMBEDDED: 'message_file_embedded',
MESSAGE_REASONING_EDITED: 'message_reasoning_edited',
MESSAGE_REASONING_DELETED: 'message_reasoning_deleted',
MORE_MESSAGES_LOADED: 'more_messages_loaded',
IMPERSONATE_READY: 'impersonate_ready',
CHAT_CHANGED: 'chat_id_changed',
GENERATION_AFTER_COMMANDS: 'GENERATION_AFTER_COMMANDS',
GENERATION_STARTED: 'generation_started',
GENERATION_STOPPED: 'generation_stopped',
GENERATION_ENDED: 'generation_ended',
SD_PROMPT_PROCESSING: 'sd_prompt_processing',
EXTENSIONS_FIRST_LOAD: 'extensions_first_load',
EXTENSION_SETTINGS_LOADED: 'extension_settings_loaded',
SETTINGS_LOADED: 'settings_loaded',
SETTINGS_UPDATED: 'settings_updated',
GROUP_UPDATED: 'group_updated',
MOVABLE_PANELS_RESET: 'movable_panels_reset',
SETTINGS_LOADED_BEFORE: 'settings_loaded_before',
SETTINGS_LOADED_AFTER: 'settings_loaded_after',
CHATCOMPLETION_SOURCE_CHANGED: 'chatcompletion_source_changed',
CHATCOMPLETION_MODEL_CHANGED: 'chatcompletion_model_changed',
OAI_PRESET_CHANGED_BEFORE: 'oai_preset_changed_before',
OAI_PRESET_CHANGED_AFTER: 'oai_preset_changed_after',
OAI_PRESET_EXPORT_READY: 'oai_preset_export_ready',
OAI_PRESET_IMPORT_READY: 'oai_preset_import_ready',
WORLDINFO_SETTINGS_UPDATED: 'worldinfo_settings_updated',
WORLDINFO_UPDATED: 'worldinfo_updated',
CHARACTER_EDITED: 'character_edited',
CHARACTER_PAGE_LOADED: 'character_page_loaded',
CHARACTER_GROUP_OVERLAY_STATE_CHANGE_BEFORE: 'character_group_overlay_state_change_before',
CHARACTER_GROUP_OVERLAY_STATE_CHANGE_AFTER: 'character_group_overlay_state_change_after',
USER_MESSAGE_RENDERED: 'user_message_rendered',
CHARACTER_MESSAGE_RENDERED: 'character_message_rendered',
FORCE_SET_BACKGROUND: 'force_set_background',
CHAT_DELETED: 'chat_deleted',
CHAT_CREATED: 'chat_created',
GROUP_CHAT_DELETED: 'group_chat_deleted',
GROUP_CHAT_CREATED: 'group_chat_created',
GENERATE_BEFORE_COMBINE_PROMPTS: 'generate_before_combine_prompts',
GENERATE_AFTER_COMBINE_PROMPTS: 'generate_after_combine_prompts',
GENERATE_AFTER_DATA: 'generate_after_data',
GROUP_MEMBER_DRAFTED: 'group_member_drafted',
GROUP_WRAPPER_STARTED: 'group_wrapper_started',
GROUP_WRAPPER_FINISHED: 'group_wrapper_finished',
WORLD_INFO_ACTIVATED: 'world_info_activated',
TEXT_COMPLETION_SETTINGS_READY: 'text_completion_settings_ready',
CHAT_COMPLETION_SETTINGS_READY: 'chat_completion_settings_ready',
CHAT_COMPLETION_PROMPT_READY: 'chat_completion_prompt_ready',
CHARACTER_FIRST_MESSAGE_SELECTED: 'character_first_message_selected',
// TODO: Naming convention is inconsistent with other events
CHARACTER_DELETED: 'characterDeleted',
CHARACTER_DUPLICATED: 'character_duplicated',
CHARACTER_RENAMED: 'character_renamed',
CHARACTER_RENAMED_IN_PAST_CHAT: 'character_renamed_in_past_chat',
/** @deprecated The event is aliased to STREAM_TOKEN_RECEIVED. */
SMOOTH_STREAM_TOKEN_RECEIVED: 'stream_token_received',
STREAM_TOKEN_RECEIVED: 'stream_token_received',
STREAM_REASONING_DONE: 'stream_reasoning_done',
FILE_ATTACHMENT_DELETED: 'file_attachment_deleted',
WORLDINFO_FORCE_ACTIVATE: 'worldinfo_force_activate',
OPEN_CHARACTER_LIBRARY: 'open_character_library',
ONLINE_STATUS_CHANGED: 'online_status_changed',
IMAGE_SWIPED: 'image_swiped',
CONNECTION_PROFILE_LOADED: 'connection_profile_loaded',
CONNECTION_PROFILE_CREATED: 'connection_profile_created',
CONNECTION_PROFILE_DELETED: 'connection_profile_deleted',
CONNECTION_PROFILE_UPDATED: 'connection_profile_updated',
TOOL_CALLS_PERFORMED: 'tool_calls_performed',
TOOL_CALLS_RENDERED: 'tool_calls_rendered',
CHARACTER_MANAGEMENT_DROPDOWN: 'charManagementDropdown',
SECRET_WRITTEN: 'secret_written',
SECRET_DELETED: 'secret_deleted',
SECRET_ROTATED: 'secret_rotated',
SECRET_EDITED: 'secret_edited',
PRESET_CHANGED: 'preset_changed',
PRESET_DELETED: 'preset_deleted',
MAIN_API_CHANGED: 'main_api_changed',
WORLDINFO_ENTRIES_LOADED: 'worldinfo_entries_loaded',
};
export const eventSource = new EventEmitter([event_types.APP_READY]);
+2 -2
View File
@@ -7,7 +7,7 @@ import { DOMPurify } from '../../../lib.js';
import { getRequestHeaders, processDroppedFiles, eventSource, event_types } from '../../../script.js';
import { deleteExtension, extensionNames, getContext, installExtension, renderExtensionTemplateAsync } from '../../extensions.js';
import { POPUP_TYPE, Popup, callGenericPopup } from '../../popup.js';
import { executeSlashCommands } from '../../slash-commands.js';
import { executeSlashCommandsWithOptions } from '../../slash-commands.js';
import { accountStorage } from '../../util/AccountStorage.js';
import { flashHighlight, getStringHash, isValidUrl } from '../../utils.js';
import { t } from '../../i18n.js';
@@ -142,7 +142,7 @@ async function downloadAssetsList(url) {
const assetDelete = async function () {
if (assetType === 'character') {
toastr.error('Go to the characters menu to delete a character.', 'Character deletion not supported');
await executeSlashCommands(`/go ${asset['id']}`);
await executeSlashCommandsWithOptions(`/go ${asset['id']}`);
return;
}
element.off('click');
+12 -3
View File
@@ -1,4 +1,4 @@
import { ensureImageFormatSupported, getBase64Async, isTrueBoolean, saveBase64AsFile } from '../../utils.js';
import { ensureImageFormatSupported, getBase64Async, getFileExtension, isTrueBoolean, saveBase64AsFile } from '../../utils.js';
import { getContext, getApiUrl, doExtrasFetch, extension_settings, modules, renderExtensionTemplateAsync } from '../../extensions.js';
import { appendMediaToMessage, eventSource, event_types, getRequestHeaders, saveChatConditional, saveSettingsDebounced, substituteParamsExtended } from '../../../script.js';
import { getMessageTimeStamp } from '../../RossAscends-mods.js';
@@ -53,6 +53,10 @@ function migrateSettings() {
if (!extension_settings.caption.template) {
extension_settings.caption.template = TEMPLATE_DEFAULT;
}
if (!extension_settings.caption.show_in_chat) {
extension_settings.caption.show_in_chat = false;
}
}
/**
@@ -167,6 +171,7 @@ async function sendCaptionedMessage(caption, image) {
extra: {
image: image,
title: messageText,
inline_image: !!extension_settings.caption.show_in_chat,
},
};
context.chat.push(message);
@@ -327,11 +332,11 @@ async function getCaptionForFile(file, prompt, quiet) {
setSpinnerIcon();
const context = getContext();
const fileData = await getBase64Async(await ensureImageFormatSupported(file));
const base64Format = fileData.split(',')[0].split(';')[0].split('/')[1];
const extension = getFileExtension(file);
const base64Data = fileData.split(',')[1];
const { caption } = await doCaptionRequest(base64Data, fileData, prompt);
if (!quiet) {
const imagePath = await saveBase64AsFile(base64Data, context.name2, '', base64Format);
const imagePath = await saveBase64AsFile(base64Data, context.name2, '', extension);
await sendCaptionedMessage(caption, imagePath);
}
return caption;
@@ -596,6 +601,10 @@ jQuery(async function () {
extension_settings.caption.alt_endpoint_enabled = !!$('#caption_altEndpoint_enabled').prop('checked');
saveSettingsDebounced();
});
$('#caption_show_in_chat').prop('checked', !!(extension_settings.caption.show_in_chat)).on('input', () => {
extension_settings.caption.show_in_chat = !!$('#caption_show_in_chat').prop('checked');
saveSettingsDebounced();
});
const onMessageEvent = async (index) => {
if (!extension_settings.caption.auto_mode) {
@@ -48,6 +48,7 @@
<option data-type="mistral" value="pixtral-large-2411">pixtral-large-2411</option>
<option data-type="mistral" value="mistral-large-pixtral-2411">mistral-large-pixtral-2411</option>
<option data-type="mistral" value="mistral-small-2503">mistral-small-2503</option>
<option data-type="mistral" value="mistral-small-2506">mistral-small-2506</option>
<option data-type="mistral" value="mistral-small-latest">mistral-small-latest</option>
<option data-type="mistral" value="mistral-medium-latest">mistral-medium-latest</option>
<option data-type="mistral" value="mistral-medium-2505">mistral-medium-2505</option>
@@ -84,7 +85,6 @@
<option data-type="anthropic" value="claude-3-5-haiku-latest">claude-3-5-haiku-latest</option>
<option data-type="anthropic" value="claude-3-5-haiku-20241022">claude-3-5-haiku-20241022</option>
<option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
<option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
<option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
<option data-type="google" value="gemini-2.5-pro">gemini-2.5-pro</option>
<option data-type="google" value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
@@ -189,6 +189,7 @@
<option data-type="koboldcpp" value="koboldcpp_current" data-i18n="currently_loaded">[Currently loaded]</option>
<option data-type="vllm" value="vllm_current" data-i18n="currently_selected">[Currently selected]</option>
<option data-type="custom" value="custom_current" data-i18n="currently_selected">[Currently selected]</option>
<option data-type="xai" value="grok-4-0709">grok-4-0709</option>
<option data-type="xai" value="grok-2-vision-1212">grok-2-vision-1212</option>
<option data-type="xai" value="grok-vision-beta">grok-vision-beta</option>
<option data-type="pollinations" value="openai">openai</option>
@@ -228,23 +229,28 @@
</div>
<div id="caption_prompt_block">
<label for="caption_prompt" data-i18n="Caption Prompt">Caption Prompt</label>
<textarea id="caption_prompt" class="text_pole" rows="1" placeholder="&lt; Use default &gt;">{{PROMPT_DEFAULT}}</textarea>
<textarea id="caption_prompt" class="text_pole textarea_compact autoSetHeight" rows="1" placeholder="&lt; Use default &gt;">{{PROMPT_DEFAULT}}</textarea>
<label class="checkbox_label margin-bot-10px" for="caption_prompt_ask" title="Ask for a custom prompt every time an image is captioned.">
<input id="caption_prompt_ask" type="checkbox" class="checkbox">
<span data-i18n="Ask every time">Ask every time</span>
</label>
</div>
<label for="caption_template"><span data-i18n="Message Template">Message Template</span> <small><span data-i18n="(use _space">(use </span> <code>&lcub;&lcub;caption&rcub;&rcub;</code> <span data-i18n="macro)">macro)</span></small></label>
<textarea id="caption_template" class="text_pole" rows="2" placeholder="&lt; Use default &gt;">{{TEMPLATE_DEFAULT}}</textarea>
<textarea id="caption_template" class="text_pole textarea_compact autoSetHeight" rows="2" placeholder="&lt; Use default &gt;">{{TEMPLATE_DEFAULT}}</textarea>
<label class="checkbox_label" for="caption_auto_mode">
<input id="caption_auto_mode" type="checkbox" class="checkbox">
<span data-i18n="Automatically caption images">Automatically caption images</span>
<i class="fa-solid fa-info-circle" title="Automatically caption images when they are pasted into the chat or attached to messages."></i>
</label>
<label class="checkbox_label margin-bot-10px" for="caption_refine_mode">
<label class="checkbox_label" for="caption_refine_mode">
<input id="caption_refine_mode" type="checkbox" class="checkbox">
<span data-i18n="Edit captions before saving">Edit captions before saving</span>
</label>
<label class="checkbox_label" for="caption_show_in_chat">
<input id="caption_show_in_chat" type="checkbox" class="checkbox">
<span data-i18n="Show captions in chat">Show captions in chat</span>
</label>
<div class="margin-bot-10px"></div>
</div>
</div>
</div>
+31 -16
View File
@@ -1,6 +1,6 @@
import { Fuse } from '../../../lib.js';
import { characters, eventSource, event_types, generateQuietPrompt, generateRaw, getRequestHeaders, main_api, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types, this_chid } from '../../../script.js';
import { characters, eventSource, event_types, generateQuietPrompt, generateRaw, getRequestHeaders, online_status, saveSettingsDebounced, substituteParams, substituteParamsExtended, system_message_types, this_chid } from '../../../script.js';
import { dragElement, isMobile } from '../../RossAscends-mods.js';
import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js';
import { loadMovingUIState, performFuzzySearch, power_user } from '../../power-user.js';
@@ -1056,10 +1056,10 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin
inApiCall = true;
switch (extension_settings.expressions.promptType) {
case PROMPT_TYPE.raw:
emotionResponse = await generateRaw(text, main_api, false, false, prompt);
emotionResponse = await generateRaw({ prompt: text, systemPrompt: prompt });
break;
case PROMPT_TYPE.full:
emotionResponse = await generateQuietPrompt(prompt, false, false);
emotionResponse = await generateQuietPrompt({ quietPrompt: prompt });
break;
}
} finally {
@@ -1331,7 +1331,7 @@ async function renderFallbackExpressionPicker() {
defaultPicker.empty();
addOption(OPTION_NO_FALLBACK, '[ No fallback ]', !extension_settings.expressions.fallback_expression);
addOption(OPTION_NO_FALLBACK, '[ No fallback ]', !extension_settings.expressions.fallback_expression && !extension_settings.expressions.showDefault);
addOption(OPTION_EMOJI_FALLBACK, '[ Default emojis ]', !!extension_settings.expressions.showDefault);
for (const expression of expressions) {
@@ -1758,27 +1758,38 @@ async function onExpressionFallbackChanged() {
saveSettingsDebounced();
}
/**
* Handles the file upload process for a sprite image.
* @param {string} url URL to upload the file to
* @param {FormData} formData FormData object containing the file and other data to upload
* @returns {Promise<any>} - The response data from the server
*/
async function handleFileUpload(url, formData) {
try {
const data = await jQuery.ajax({
type: 'POST',
url: url,
data: formData,
beforeSend: function () { },
cache: false,
contentType: false,
processData: false,
const result = await fetch(url, {
method: 'POST',
headers: getRequestHeaders({ omitContentType: true }),
body: formData,
cache: 'no-cache',
});
if (!result.ok) {
throw new Error(`Upload failed with status ${result.status}`);
}
const data = await result.json();
// Refresh sprites list
const name = formData.get('name');
const name = formData.get('name').toString();
delete spriteCache[name];
await fetchImagesNoCache();
await validateImages(name);
return data;
return data ?? {};
} catch (error) {
console.error('Error uploading image:', error);
toastr.error('Failed to upload image');
return {};
}
}
@@ -1996,7 +2007,11 @@ async function onClickExpressionUploadPackButton() {
const uploadToast = toastr.info('Please wait...', 'Upload is processing', { timeOut: 0, extendedTimeOut: 0 });
const { count } = await handleFileUpload('/api/sprites/upload-zip', formData);
toastr.clear(uploadToast);
toastr.success(`Uploaded ${count} image(s) for ${name}`);
// Only show success message if at least one image was uploaded
if (count) {
toastr.success(`Uploaded ${count} image(s) for ${name}`);
}
// Reset the input
e.target.form.reset();
@@ -2116,7 +2131,7 @@ function migrateSettings() {
saveSettingsDebounced();
}
if (extension_settings.expressions.showDefault && extension_settings.expressions.fallback_expression !== undefined) {
if (extension_settings.expressions.showDefault && extension_settings.expressions.fallback_expression) {
extension_settings.expressions.showDefault = false;
saveSettingsDebounced();
}
+9 -23
View File
@@ -8,7 +8,7 @@ import {
animation_easing,
} from '../../../script.js';
import { groups, selected_group } from '../../group-chats.js';
import { loadFileToDocument, delay, getBase64Async, getSanitizedFilename } from '../../utils.js';
import { loadFileToDocument, delay, getBase64Async, getSanitizedFilename, saveBase64AsFile, getFileExtension } from '../../utils.js';
import { loadMovingUIState } from '../../power-user.js';
import { dragElement } from '../../RossAscends-mods.js';
import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
@@ -324,7 +324,6 @@ async function showCharGallery(deleteModeState = false) {
await delay(100);
await initGallery(items, url);
} catch (err) {
console.trace();
console.error(err);
}
}
@@ -341,27 +340,12 @@ async function showCharGallery(deleteModeState = false) {
async function uploadFile(file, url) {
try {
// Convert the file to a base64 string
const base64Data = await getBase64Async(file);
const fileBase64 = await getBase64Async(file);
const base64Data = fileBase64.split(',')[1];
const extension = getFileExtension(file);
const path = await saveBase64AsFile(base64Data, url, '', extension);
// Create the payload
const payload = {
image: base64Data,
ch_name: url,
};
const response = await fetch('/api/images/upload', {
method: 'POST',
headers: getRequestHeaders(),
body: JSON.stringify(payload),
});
if (!response.ok) {
throw new Error(`HTTP error! Status: ${response.status}`);
}
const result = await response.json();
toastr.success(t`File uploaded successfully. Saved at: ${result.path}`);
toastr.success(t`File uploaded successfully. Saved at: ${path}`);
} catch (error) {
console.error('There was an issue uploading the file:', error);
@@ -620,6 +604,9 @@ function makeDragImg(id, url) {
}
draggableElem.id = uniqueId;
// Add the galleryImageDraggable to have unique class
draggableElem.classList.add('galleryImageDraggable');
// Ensure that the newly added element is displayed as block
draggableElem.style.display = 'block';
//and has no padding unlike other non-zoomed-avatar draggables
@@ -749,7 +736,6 @@ async function listGalleryCommand(args) {
return JSON.stringify(items.map(it => it.src));
} catch (err) {
console.trace();
console.error(err);
}
return JSON.stringify([]);
+15 -3
View File
@@ -506,7 +506,7 @@ async function summarizeCallback(args, text) {
case summary_sources.extras:
return await callExtrasSummarizeAPI(text);
case summary_sources.main:
return removeReasoningFromString(await generateRaw(text, '', false, false, prompt, extension_settings.memory.overrideResponseLength));
return removeReasoningFromString(await generateRaw({ prompt: text, systemPrompt: prompt, responseLength: extension_settings.memory.overrideResponseLength }));
case summary_sources.webllm: {
const messages = [{ role: 'system', content: prompt }, { role: 'user', content: text }].filter(m => m.content);
const params = extension_settings.memory.overrideResponseLength > 0 ? { max_tokens: extension_settings.memory.overrideResponseLength } : {};
@@ -677,7 +677,13 @@ async function summarizeChatMain(context, force, skipWIAN) {
if (prompt_builders.DEFAULT === extension_settings.memory.prompt_builder) {
try {
inApiCall = true;
summary = await generateQuietPrompt(prompt, false, skipWIAN, '', '', extension_settings.memory.overrideResponseLength);
/** @type {import('../../../script.js').GenerateQuietPromptParams} */
const params = {
quietPrompt: prompt,
skipWIAN: skipWIAN,
responseLength: extension_settings.memory.overrideResponseLength,
};
summary = await generateQuietPrompt(params);
} finally {
inApiCall = false;
}
@@ -701,7 +707,13 @@ async function summarizeChatMain(context, force, skipWIAN) {
return null;
}
const rawSummary = await generateRaw(rawPrompt, '', false, false, prompt, extension_settings.memory.overrideResponseLength);
/** @type {import('../../../script.js').GenerateRawParams} */
const params = {
prompt: rawPrompt,
systemPrompt: prompt,
responseLength: extension_settings.memory.overrideResponseLength,
};
const rawSummary = await generateRaw(params);
summary = removeReasoningFromString(rawSummary);
index = lastUsedIndex;
} finally {
@@ -1,5 +1,5 @@
import { chat_metadata, saveChatDebounced, saveSettingsDebounced } from '../../../../script.js';
import { extension_settings } from '../../../extensions.js';
import { chat_metadata, saveSettingsDebounced } from '../../../../script.js';
import { extension_settings, saveMetadataDebounced } from '../../../extensions.js';
import { QuickReplyConfig } from './QuickReplyConfig.js';
export class QuickReplySettings {
@@ -62,7 +62,7 @@ export class QuickReplySettings {
saveSettingsDebounced();
if (this.chatConfig) {
chat_metadata.quickReply = this.chatConfig.toJSON();
saveChatDebounced();
saveMetadataDebounced();
}
if (this.onSave) {
this.onSave();
+5
View File
@@ -375,6 +375,11 @@ function migrateSettings() {
performSave = true;
}
if (!Array.isArray(script.placement)) {
script.placement = [];
performSave = true;
}
if (script.placement.includes(regex_placement.MD_DISPLAY)) {
script.placement = script.placement.length === 1 ?
Object.values(regex_placement).filter((e) => e !== regex_placement.MD_DISPLAY) :
+7 -3
View File
@@ -38,10 +38,14 @@ export async function getMultimodalCaption(base64Img, prompt) {
const isVllm = extension_settings.caption.multimodal_api === 'vllm';
const base64Bytes = base64Img.length * 0.75;
const compressionLimit = 2 * 1024 * 1024;
const safeMimeTypes = ['image/jpeg', 'image/png', 'image/webp'];
const mimeType = base64Img?.split(';')?.[0]?.split(':')?.[1];
const thumbnailNeeded = ['google', 'openrouter', 'mistral', 'groq', 'vertexai'].includes(extension_settings.caption.multimodal_api);
if ((thumbnailNeeded && base64Bytes > compressionLimit) || isOoba || isKoboldCpp) {
const maxSide = 1024;
base64Img = await createThumbnail(base64Img, maxSide, maxSide, 'image/jpeg');
const maxSide = 2048;
base64Img = await createThumbnail(base64Img, maxSide, maxSide);
} else if (!safeMimeTypes.includes(mimeType)) {
base64Img = await createThumbnail(base64Img, null, null);
}
const proxyUrl = useReverseProxy ? oai_settings.reverse_proxy : '';
@@ -467,7 +471,7 @@ export class ConnectionManagerRequestService {
/**
* @param {import('./connection-manager/index.js').ConnectionProfile?} [profile]
* @return {import('../../script.js').ConnectAPIMap}
* @return {import('../slash-commands.js').ConnectAPIMap}
* @throws {Error}
*/
static validateProfile(profile) {
@@ -51,7 +51,7 @@ import {
SlashCommandArgument,
SlashCommandNamedArgument,
} from '../../slash-commands/SlashCommandArgument.js';
import { debounce_timeout } from '../../constants.js';
import { debounce_timeout, VIDEO_EXTENSIONS } from '../../constants.js';
import { SlashCommandEnumValue } from '../../slash-commands/SlashCommandEnumValue.js';
import { callGenericPopup, Popup, POPUP_TYPE } from '../../popup.js';
import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
@@ -339,6 +339,7 @@ const defaultSettings = {
};
const writePromptFieldsDebounced = debounce(writePromptFields, debounce_timeout.relaxed);
const isVideo = (/** @type {string} */ format) => VIDEO_EXTENSIONS.includes(String(format || '').trim().toLowerCase());
/**
* Generate interceptor for interactive mode triggers.
@@ -2476,14 +2477,14 @@ async function generatePicture(initiator, args, trigger, message, callback) {
if (generationType === generationMode.BACKGROUND) {
const callbackOriginal = callback;
callback = async function (prompt, imagePath, generationType, _negativePromptPrefix, _initiator, prefixedPrompt) {
callback = async function (prompt, imagePath, generationType, _negativePromptPrefix, _initiator, prefixedPrompt, format) {
const imgUrl = `url("${encodeURI(imagePath)}")`;
await eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath });
if (typeof callbackOriginal === 'function') {
await callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator, prefixedPrompt);
await callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator, prefixedPrompt, format);
} else {
await sendMessage(prompt, imagePath, generationType, negativePromptPrefix, initiator, prefixedPrompt);
await sendMessage(prompt, imagePath, generationType, negativePromptPrefix, initiator, prefixedPrompt, format);
}
};
}
@@ -2725,7 +2726,7 @@ function getUserAvatarUrl() {
* @returns {Promise<string>} - A promise that resolves when the prompt generation completes.
*/
async function generatePrompt(quietPrompt) {
const reply = await generateQuietPrompt(quietPrompt, false, false);
const reply = await generateQuietPrompt({ quietPrompt });
const processedReply = processReply(reply);
if (!processedReply) {
@@ -2838,8 +2839,8 @@ async function sendGenerationRequest(generationType, prompt, additionalNegativeP
const filename = `${characterName}_${humanizedDateTime()}`;
const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format);
callback
? await callback(prompt, base64Image, generationType, additionalNegativePrefix, initiator, prefixedPrompt)
: await sendMessage(prompt, base64Image, generationType, additionalNegativePrefix, initiator, prefixedPrompt);
? await callback(prompt, base64Image, generationType, additionalNegativePrefix, initiator, prefixedPrompt, result.format)
: await sendMessage(prompt, base64Image, generationType, additionalNegativePrefix, initiator, prefixedPrompt, result.format);
return base64Image;
}
@@ -3524,7 +3525,8 @@ async function generateComfyImage(prompt, negativePrompt, signal) {
const text = await promptResult.text();
throw new Error(text);
}
return { format: 'png', data: await promptResult.text() };
const { format, data } = await promptResult.json();
return { format, data };
}
@@ -3864,8 +3866,9 @@ async function onComfyDeleteWorkflowClick() {
* @param {string} additionalNegativePrefix Additional negative prompt used for the image generation
* @param {string} initiator The initiator of the image generation
* @param {string} prefixedPrompt Prompt with an attached specific prefix
* @param {string} format Format of the image (e.g., 'png', 'jpg')
*/
async function sendMessage(prompt, image, generationType, additionalNegativePrefix, initiator, prefixedPrompt) {
async function sendMessage(prompt, image, generationType, additionalNegativePrefix, initiator, prefixedPrompt, format) {
const context = getContext();
const name = context.groupId ? systemUserName : context.name2;
const template = extension_settings.sd.prompts[generationMode.MESSAGE] || '{{prompt}}';
@@ -3885,6 +3888,12 @@ async function sendMessage(prompt, image, generationType, additionalNegativePref
image_swipes: [image],
},
};
if (isVideo(format)) {
message.extra.video = image;
delete message.extra.image;
delete message.extra.image_swipes;
delete message.extra.inline_image;
}
context.chat.push(message);
const messageId = context.chat.length - 1;
await eventSource.emit(event_types.MESSAGE_RECEIVED, messageId, 'extension');
@@ -4068,7 +4077,7 @@ async function sdMessageButton(e) {
}
}
function saveGeneratedImage(prompt, image, generationType, negative) {
function saveGeneratedImage(prompt, image, generationType, negative, _initiator, _prefixedPrompt, format) {
// Some message sources may not create the extra object
if (typeof message.extra !== 'object' || message.extra === null) {
message.extra = {};
@@ -4085,17 +4094,24 @@ async function sdMessageButton(e) {
swipes.push(message.extra.image);
}
swipes.push(image);
const isVideoFormat = isVideo(format);
if (isVideoFormat) {
message.extra.video = image;
} else {
swipes.push(image);
// If already contains an image and it's not inline - leave it as is
message.extra.inline_image = !(message.extra.image && !message.extra.inline_image);
message.extra.image = image;
}
// If already contains an image and it's not inline - leave it as is
message.extra.inline_image = !(message.extra.image && !message.extra.inline_image);
message.extra.image = image;
message.extra.title = prompt;
message.extra.generationType = generationType;
message.extra.negative = negative;
appendMediaToMessage(message, $mes);
context.saveChat();
return context.saveChat();
}
}
@@ -9,19 +9,6 @@ import { POPUP_TYPE, callGenericPopup } from '../../popup.js';
import { renderExtensionTemplateAsync } from '../../extensions.js';
import { t } from '../../i18n.js';
function rgb2hex(rgb) {
rgb = rgb.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);
return (rgb && rgb.length === 4) ? '#' +
('0' + parseInt(rgb[1], 10).toString(16)).slice(-2) +
('0' + parseInt(rgb[2], 10).toString(16)).slice(-2) +
('0' + parseInt(rgb[3], 10).toString(16)).slice(-2) : '';
}
$('button').click(function () {
var hex = rgb2hex($('input').val());
$('.result').html(hex);
});
async function doTokenCounter() {
const { tokenizerName, tokenizerId } = getFriendlyTokenizerName(main_api);
const html = await renderExtensionTemplateAsync('token-counter', 'window', { tokenizerName });
@@ -28,8 +28,14 @@
<option value="free">Free</option>
<option value="pro">Pro</option>
</select>
<div id="translate_key_button" class="menu_button fa-solid fa-key margin0"></div>
<div id="translate_url_button" class="menu_button fa-solid fa-link margin0"></div>
<div id="translate_key_button" class="menu_button menu_button_icon margin0 manage-api-keys">
<i class="fa-solid fa-key"></i>
<span>Key</span>
</div>
<div id="translate_url_button" class="menu_button menu_button_icon margin0 manage-api-keys">
<i class="fa-solid fa-link"></i>
<span>URL</span>
</div>
</div>
<label data-i18n="ext_translate_target_lang" for="translation_target_language">Target Language</label>
<select id="translation_target_language" name="target_language"></select>
+13 -60
View File
@@ -10,9 +10,9 @@ import {
updateMessageBlock,
} from '../../../script.js';
import { extension_settings, getContext, renderExtensionTemplateAsync } from '../../extensions.js';
import { POPUP_RESULT, POPUP_TYPE, callGenericPopup } from '../../popup.js';
import { POPUP_TYPE, callGenericPopup } from '../../popup.js';
import { updateReasoningUI } from '../../reasoning.js';
import { findSecret, secret_state, writeSecret } from '../../secrets.js';
import { secret_state } from '../../secrets.js';
import { SlashCommand } from '../../slash-commands/SlashCommand.js';
import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
import { enumIcons } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
@@ -152,9 +152,9 @@ const LOCAL_URL = ['libre', 'oneringtranslator', 'deeplx', 'lingva'];
function showKeysButton() {
const providerRequiresKey = KEY_REQUIRED.includes(extension_settings.translate.provider);
const providerOptionalUrl = LOCAL_URL.includes(extension_settings.translate.provider);
$('#translate_key_button').toggle(providerRequiresKey);
$('#translate_key_button').toggle(providerRequiresKey).data('key', extension_settings.translate.provider);
$('#translate_key_button').toggleClass('success', Boolean(secret_state[extension_settings.translate.provider]));
$('#translate_url_button').toggle(providerOptionalUrl);
$('#translate_url_button').toggle(providerOptionalUrl).data('key', extension_settings.translate.provider + '_url');
$('#translate_url_button').toggleClass('success', Boolean(secret_state[extension_settings.translate.provider + '_url']));
$('#deepl_api_endpoint').toggle(extension_settings.translate.provider === 'deepl');
}
@@ -749,63 +749,16 @@ jQuery(async () => {
saveSettingsDebounced();
});
$(document).on('click', '.mes_translate', onMessageTranslateClick);
$('#translate_key_button').on('click', async () => {
const optionText = $('#translation_provider option:selected').text();
const key = await callGenericPopup(`<h3>${optionText} API Key</h3>`, POPUP_TYPE.INPUT, '', {
customButtons: [{
text: 'Remove Key',
appendAtEnd: true,
result: POPUP_RESULT.NEGATIVE,
action: async () => {
await writeSecret(extension_settings.translate.provider, '');
toastr.success('API Key removed');
$('#translate_key_button').toggleClass('success', !!secret_state[extension_settings.translate.provider]);
},
}],
[event_types.SECRET_WRITTEN, event_types.SECRET_DELETED, event_types.SECRET_ROTATED].forEach((eventType) => {
eventSource.on(eventType, (/** @type {string} */ key) => {
if (key === extension_settings.translate.provider) {
$('#translate_key_button').toggleClass('success', !!secret_state[extension_settings.translate.provider]);
}
if (key === `${extension_settings.translate.provider}_url`) {
$('#translate_url_button').toggleClass('success', !!secret_state[`${extension_settings.translate.provider}_url`]);
}
});
if (!key) {
return;
}
await writeSecret(extension_settings.translate.provider, key);
toastr.success('API Key saved');
$('#translate_key_button').addClass('success');
});
$('#translate_url_button').on('click', async () => {
const optionText = $('#translation_provider option:selected').text();
const exampleURLs = {
'libre': 'http://127.0.0.1:5000/translate',
'lingva': 'https://lingva.ml/api/v1',
'oneringtranslator': 'http://127.0.0.1:4990/translate',
'deeplx': 'http://127.0.0.1:1188/translate',
};
const popupText = `<h3>${optionText} API URL</h3><i>Example: <tt>${String(exampleURLs[extension_settings.translate.provider])}</tt></i>`;
const secretKey = extension_settings.translate.provider + '_url';
const savedUrl = secret_state[secretKey] ? await findSecret(secretKey) : '';
const url = await callGenericPopup(popupText, POPUP_TYPE.INPUT, savedUrl, {
customButtons: [{
text: 'Remove URL',
appendAtEnd: true,
result: POPUP_RESULT.NEGATIVE,
action: async () => {
await writeSecret(secretKey, '');
toastr.success('API URL removed');
$('#translate_url_button').toggleClass('success', !!secret_state[secretKey]);
},
}],
});
if (!url) {
return;
}
await writeSecret(secretKey, url);
toastr.success('API URL saved');
$('#translate_url_button').addClass('success');
});
loadSettings();
+9 -9
View File
@@ -296,20 +296,20 @@ class AllTalkTtsProvider {
const ttsNarrateDialoguesCheckbox = document.getElementById('tts_narrate_dialogues');
if (this.settings.narrator_enabled) {
ttsPassAsterisksCheckbox.checked = false;
$('#tts_pass_asterisks').click();
$('#tts_pass_asterisks').trigger('click');
$('#tts_pass_asterisks').trigger('change');
}
if (!this.settings.narrator_enabled) {
ttsPassAsterisksCheckbox.checked = true;
$('#tts_pass_asterisks').click();
$('#tts_pass_asterisks').trigger('click');
$('#tts_pass_asterisks').trigger('change');
}
if (this.settings.narrator_enabled) {
ttsNarrateQuotedCheckbox.checked = true;
ttsNarrateDialoguesCheckbox.checked = true;
$('#tts_narrate_quoted').click();
$('#tts_narrate_quoted').trigger('click');
$('#tts_narrate_quoted').trigger('change');
$('#tts_narrate_dialogues').click();
$('#tts_narrate_dialogues').trigger('click');
$('#tts_narrate_dialogues').trigger('change');
}
atNarratorSelect.value = this.settings.narrator_enabled.toString();
@@ -783,21 +783,21 @@ class AllTalkTtsProvider {
if (narratorOption === 'true') {
ttsPassAsterisksCheckbox.checked = false;
$('#tts_pass_asterisks').click();
$('#tts_pass_asterisks').trigger('click');
$('#tts_pass_asterisks').trigger('change');
ttsNarrateQuotedCheckbox.checked = true;
ttsNarrateDialoguesCheckbox.checked = true;
$('#tts_narrate_quoted').click();
$('#tts_narrate_quoted').trigger('click');
$('#tts_narrate_quoted').trigger('change');
$('#tts_narrate_dialogues').click();
$('#tts_narrate_dialogues').trigger('click');
$('#tts_narrate_dialogues').trigger('change');
} else if (narratorOption === 'silent') {
ttsPassAsterisksCheckbox.checked = false;
$('#tts_pass_asterisks').click();
$('#tts_pass_asterisks').trigger('click');
$('#tts_pass_asterisks').trigger('change');
} else {
ttsPassAsterisksCheckbox.checked = true;
$('#tts_pass_asterisks').click();
$('#tts_pass_asterisks').trigger('click');
$('#tts_pass_asterisks').trigger('change');
}
+20 -32
View File
@@ -1,6 +1,5 @@
import { getRequestHeaders } from '../../../script.js';
import { POPUP_RESULT, POPUP_TYPE, callGenericPopup } from '../../popup.js';
import { SECRET_KEYS, findSecret, secret_state, writeSecret } from '../../secrets.js';
import { event_types, eventSource, getRequestHeaders } from '../../../script.js';
import { SECRET_KEYS, secret_state } from '../../secrets.js';
import { getPreviewString, saveTtsProviderSettings } from './index.js';
export { AzureTtsProvider };
@@ -26,7 +25,7 @@ class AzureTtsProvider {
<h4 for="azure_tts_key" class="flex1 margin0">
<a href="https://portal.azure.com/" target="_blank">Azure TTS Key</a>
</h4>
<div id="azure_tts_key" class="menu_button menu_button_icon">
<div id="azure_tts_key" class="menu_button menu_button_icon manage-api-keys" data-key="api_key_azure_tts">
<i class="fa-solid fa-key"></i>
<span>Click to set</span>
</div>
@@ -39,6 +38,20 @@ class AzureTtsProvider {
return html;
}
constructor() {
this.handler = async function (/** @type {string} */ key) {
if (key !== SECRET_KEYS.AZURE_TTS) return;
$('#azure_tts_key').toggleClass('success', !!secret_state[SECRET_KEYS.AZURE_TTS]);
await this.onRefreshClick();
}.bind(this);
}
dispose() {
[event_types.SECRET_WRITTEN, event_types.SECRET_DELETED, event_types.SECRET_ROTATED].forEach(event => {
eventSource.removeListener(event, this.handler);
});
}
onSettingsChange() {
// Update dynamically
this.settings.region = String($('#azure_tts_region').val());
@@ -65,34 +78,9 @@ class AzureTtsProvider {
}
$('#azure_tts_region').val(this.settings.region).on('input', () => this.onSettingsChange());
$('#azure_tts_key').toggleClass('success', secret_state[SECRET_KEYS.AZURE_TTS]);
$('#azure_tts_key').on('click', async () => {
const popupText = 'Azure TTS API Key';
const savedKey = secret_state[SECRET_KEYS.AZURE_TTS] ? await findSecret(SECRET_KEYS.AZURE_TTS) : '';
const key = await callGenericPopup(popupText, POPUP_TYPE.INPUT, savedKey, {
customButtons: [{
text: 'Remove Key',
appendAtEnd: true,
result: POPUP_RESULT.NEGATIVE,
action: async () => {
await writeSecret(SECRET_KEYS.AZURE_TTS, '');
$('#azure_tts_key').toggleClass('success', !!secret_state[SECRET_KEYS.AZURE_TTS]);
toastr.success('API Key removed');
await this.onRefreshClick();
},
}],
});
if (!key) {
return;
}
await writeSecret(SECRET_KEYS.AZURE_TTS, String(key));
toastr.success('API Key saved');
$('#azure_tts_key').addClass('success');
await this.onRefreshClick();
$('#azure_tts_key').toggleClass('success', !!secret_state[SECRET_KEYS.AZURE_TTS]);
[event_types.SECRET_WRITTEN, event_types.SECRET_DELETED, event_types.SECRET_ROTATED].forEach(event => {
eventSource.on(event, this.handler);
});
try {
+26 -5
View File
@@ -16,8 +16,9 @@ class ElevenLabsTtsProvider {
similarity_boost: 0.75,
style_exaggeration: 0.00,
speaker_boost: true,
speed: 1.0,
apiKey: '',
model: 'eleven_monolingual_v1',
model: 'eleven_turbo_v2_5',
voiceMap: {},
};
@@ -28,16 +29,23 @@ class ElevenLabsTtsProvider {
<input id="elevenlabs_tts_api_key" type="text" class="text_pole" placeholder="<API Key>"/>
<label for="elevenlabs_tts_model">Model</label>
<select id="elevenlabs_tts_model" class="text_pole">
<option value="eleven_monolingual_v1">English v1</option>
<option value="eleven_multilingual_v1">Multilingual v1</option>
<option value="eleven_v3">Eleven v3</option>
<option value="eleven_ttv_v3">Eleven ttv v3</option>
<option value="eleven_multilingual_v2">Multilingual v2</option>
<option value="eleven_turbo_v2">Turbo v2</option>
<option value="eleven_flash_v2_5">Eleven Flash v2.5</option>
<option value="eleven_turbo_v2_5">Turbo v2.5</option>
<option value="eleven_multilingual_ttv_v2">Multilingual ttv v2</option>
<option value="eleven_monolingual_v1">English v1 (Old)</option>
<option value="eleven_multilingual_v1">Multilingual v1 (Old)</option>
<option value="eleven_turbo_v2">Turbo v2 (Old)</option>
</select>
<input id="eleven_labs_connect" class="menu_button" type="button" value="Connect" />
<label for="elevenlabs_tts_stability">Stability: <span id="elevenlabs_tts_stability_output"></span></label>
<input id="elevenlabs_tts_stability" type="range" value="${this.defaultSettings.stability}" min="0" max="1" step="0.01" />
<label for="elevenlabs_tts_similarity_boost">Similarity Boost: <span id="elevenlabs_tts_similarity_boost_output"></span></label>
<input id="elevenlabs_tts_similarity_boost" type="range" value="${this.defaultSettings.similarity_boost}" min="0" max="1" step="0.01" />
<label for="elevenlabs_tts_speed">Speed: <span id="elevenlabs_tts_speed_output"></span></label>
<input id="elevenlabs_tts_speed" type="range" value="${this.defaultSettings.speed}" min="0.7" max="1.2" step="0.01" />
<div id="elevenlabs_tts_v2_options" style="display: none;">
<label for="elevenlabs_tts_style_exaggeration">Style Exaggeration: <span id="elevenlabs_tts_style_exaggeration_output"></span></label>
<input id="elevenlabs_tts_style_exaggeration" type="range" value="${this.defaultSettings.style_exaggeration}" min="0" max="1" step="0.01" />
@@ -65,7 +73,14 @@ class ElevenLabsTtsProvider {
}
shouldInvolveExtendedSettings() {
return this.settings.model === 'eleven_multilingual_v2';
// Models that support extended settings (style_exaggeration, speaker_boost)
const modelsWithExtendedSettings = [
'eleven_v3',
'eleven_ttv_v3',
'eleven_multilingual_v2',
'eleven_multilingual_ttv_v2',
];
return modelsWithExtendedSettings.includes(this.settings.model);
}
onSettingsChange() {
@@ -74,10 +89,12 @@ class ElevenLabsTtsProvider {
this.settings.similarity_boost = $('#elevenlabs_tts_similarity_boost').val();
this.settings.style_exaggeration = $('#elevenlabs_tts_style_exaggeration').val();
this.settings.speaker_boost = $('#elevenlabs_tts_speaker_boost').is(':checked');
this.settings.speed = $('#elevenlabs_tts_speed').val();
this.settings.model = $('#elevenlabs_tts_model').find(':selected').val();
$('#elevenlabs_tts_stability_output').text(Math.round(this.settings.stability * 100) + '%');
$('#elevenlabs_tts_similarity_boost_output').text(Math.round(this.settings.similarity_boost * 100) + '%');
$('#elevenlabs_tts_style_exaggeration_output').text(Math.round(this.settings.style_exaggeration * 100) + '%');
$('#elevenlabs_tts_speed_output').text(this.settings.speed + 'x');
$('#elevenlabs_tts_v2_options').toggle(this.shouldInvolveExtendedSettings());
saveTtsProviderSettings();
}
@@ -109,6 +126,7 @@ class ElevenLabsTtsProvider {
$('#elevenlabs_tts_similarity_boost').val(this.settings.similarity_boost);
$('#elevenlabs_tts_style_exaggeration').val(this.settings.style_exaggeration);
$('#elevenlabs_tts_speaker_boost').prop('checked', this.settings.speaker_boost);
$('#elevenlabs_tts_speed').val(this.settings.speed);
$('#elevenlabs_tts_api_key').val(this.settings.apiKey);
$('#elevenlabs_tts_model').val(this.settings.model);
$('#eleven_labs_connect').on('click', () => { this.onConnectClick(); });
@@ -116,10 +134,12 @@ class ElevenLabsTtsProvider {
$('#elevenlabs_tts_stability').on('input', this.onSettingsChange.bind(this));
$('#elevenlabs_tts_style_exaggeration').on('input', this.onSettingsChange.bind(this));
$('#elevenlabs_tts_speaker_boost').on('change', this.onSettingsChange.bind(this));
$('#elevenlabs_tts_speed').on('input', this.onSettingsChange.bind(this));
$('#elevenlabs_tts_model').on('change', this.onSettingsChange.bind(this));
$('#elevenlabs_tts_stability_output').text(Math.round(this.settings.stability * 100) + '%');
$('#elevenlabs_tts_similarity_boost_output').text(Math.round(this.settings.similarity_boost * 100) + '%');
$('#elevenlabs_tts_style_exaggeration_output').text(Math.round(this.settings.style_exaggeration * 100) + '%');
$('#elevenlabs_tts_speed_output').text(this.settings.speed + 'x');
$('#elevenlabs_tts_v2_options').toggle(this.shouldInvolveExtendedSettings());
try {
await this.checkReady();
@@ -308,6 +328,7 @@ class ElevenLabsTtsProvider {
voice_settings: {
stability: Number(this.settings.stability),
similarity_boost: Number(this.settings.similarity_boost),
speed: Number(this.settings.speed),
},
};
if (this.shouldInvolveExtendedSettings()) {
+3 -1
View File
@@ -31,6 +31,7 @@ import { GoogleNativeTtsProvider } from './google-native.js';
import { ChatterboxTtsProvider } from './chatterbox.js';
import { KokoroTtsProvider } from './kokoro.js';
import { TtsWebuiProvider } from './tts-webui.js';
import { PollinationsTtsProvider } from './pollinations.js';
const UPDATE_INTERVAL = 1000;
const wrapper = new ModuleWorkerWrapper(moduleWorker);
@@ -129,6 +130,7 @@ const ttsProviders = {
Novel: NovelTtsProvider,
OpenAI: OpenAITtsProvider,
'OpenAI Compatible': OpenAICompatibleTtsProvider,
Pollinations: PollinationsTtsProvider,
SBVits2: SBVits2TtsProvider,
Silero: SileroTtsProvider,
SpeechT5: SpeechT5TtsProvider,
@@ -866,7 +868,7 @@ async function onMessageEvent(messageId, lastCharIndex) {
console.debug(`Adding message from ${message.name} for TTS processing: "${message.mes}"`);
if (extension_settings.tts.periodic_auto_generation) {
if (extension_settings.tts.periodic_auto_generation && isStreamingEnabled()) {
ttsJobQueue.push(message);
} else {
processAndQueueTtsMessage(message);
+18 -12
View File
@@ -132,9 +132,14 @@ class NovelTtsProvider {
return { name: voiceName, voice_id: voiceName, lang: 'en-US', preview_url: false };
}
async generateTts(text, voiceId) {
const response = await this.fetchTtsGeneration(text, voiceId);
return response;
/**
* Generate TTS audio for the given text using the specified voice.
* @param {string} text Text to generate
* @param {string} voiceId Voice ID
* @returns {AsyncGenerator<Response>} Audio response generator
*/
generateTts(text, voiceId) {
return this.fetchTtsGeneration(text, voiceId);
}
//###########//
@@ -172,16 +177,17 @@ class NovelTtsProvider {
this.audioElement.currentTime = 0;
const text = getPreviewString('en-US');
const response = await this.fetchTtsGeneration(text, id);
if (!response.ok) {
throw new Error(`HTTP ${response.status}`);
for await (const response of this.generateTts(text, id)) {
const audio = await response.blob();
const url = URL.createObjectURL(audio);
await new Promise(resolve => {
const audioElement = new Audio();
audioElement.src = url;
audioElement.play();
audioElement.onended = () => resolve();
});
URL.revokeObjectURL(url);
}
const audio = await response.blob();
const url = URL.createObjectURL(audio);
this.audioElement.src = url;
this.audioElement.play();
this.audioElement.onended = () => URL.revokeObjectURL(url);
}
async* fetchTtsGeneration(inputText, voiceId) {
@@ -1,6 +1,5 @@
import { getRequestHeaders } from '../../../script.js';
import { callGenericPopup, POPUP_RESULT, POPUP_TYPE } from '../../popup.js';
import { findSecret, SECRET_KEYS, secret_state, writeSecret } from '../../secrets.js';
import { event_types, eventSource, getRequestHeaders } from '../../../script.js';
import { SECRET_KEYS, secret_state } from '../../secrets.js';
import { getPreviewString, saveTtsProviderSettings } from './index.js';
export { OpenAICompatibleTtsProvider };
@@ -27,7 +26,7 @@ class OpenAICompatibleTtsProvider {
<div class="flex1">
<input id="openai_compatible_tts_endpoint" type="text" class="text_pole" maxlength="500" value="${this.defaultSettings.provider_endpoint}"/>
</div>
<div id="openai_compatible_tts_key" class="menu_button menu_button_icon">
<div id="openai_compatible_tts_key" class="menu_button menu_button_icon manage-api-keys" data-key="api_key_custom_openai_tts">
<i class="fa-solid fa-key"></i>
<span>API Key</span>
</div>
@@ -41,6 +40,20 @@ class OpenAICompatibleTtsProvider {
return html;
}
constructor() {
this.handler = async function (/** @type {string} */ key) {
if (key !== SECRET_KEYS.CUSTOM_OPENAI_TTS) return;
$('#openai_compatible_tts_key').toggleClass('success', !!secret_state[SECRET_KEYS.CUSTOM_OPENAI_TTS]);
await this.onRefreshClick();
}.bind(this);
}
dispose() {
[event_types.SECRET_WRITTEN, event_types.SECRET_DELETED, event_types.SECRET_ROTATED].forEach(event => {
eventSource.removeListener(event, this.handler);
});
}
async loadSettings(settings) {
// Populate Provider UI given input settings
if (Object.keys(settings).length == 0) {
@@ -74,34 +87,9 @@ class OpenAICompatibleTtsProvider {
$('#openai_compatible_tts_speed_output').text(this.settings.speed);
$('#openai_compatible_tts_key').toggleClass('success', secret_state[SECRET_KEYS.CUSTOM_OPENAI_TTS]);
$('#openai_compatible_tts_key').on('click', async () => {
const popupText = 'OpenAI-compatible TTS API Key';
const savedKey = secret_state[SECRET_KEYS.CUSTOM_OPENAI_TTS] ? await findSecret(SECRET_KEYS.CUSTOM_OPENAI_TTS) : '';
const key = await callGenericPopup(popupText, POPUP_TYPE.INPUT, savedKey, {
customButtons: [{
text: 'Remove Key',
appendAtEnd: true,
result: POPUP_RESULT.NEGATIVE,
action: async () => {
await writeSecret(SECRET_KEYS.CUSTOM_OPENAI_TTS, '');
$('#openai_compatible_tts_key').toggleClass('success', !!secret_state[SECRET_KEYS.CUSTOM_OPENAI_TTS]);
toastr.success('API Key removed');
await this.onRefreshClick();
},
}],
});
if (!key) {
return;
}
await writeSecret(SECRET_KEYS.CUSTOM_OPENAI_TTS, String(key));
toastr.success('API Key saved');
$('#openai_compatible_tts_key').toggleClass('success', secret_state[SECRET_KEYS.CUSTOM_OPENAI_TTS]);
await this.onRefreshClick();
$('#openai_compatible_tts_key').toggleClass('success', !!secret_state[SECRET_KEYS.CUSTOM_OPENAI_TTS]);
[event_types.SECRET_WRITTEN, event_types.SECRET_DELETED, event_types.SECRET_ROTATED].forEach(event => {
eventSource.on(event, this.handler);
});
await this.checkReady();
@@ -0,0 +1,151 @@
import { getRequestHeaders } from '../../../script.js';
import { splitRecursive } from '../../utils.js';
import { getPreviewString, saveTtsProviderSettings } from './index.js';
export class PollinationsTtsProvider {
settings;
voices = [];
separator = ' . ';
audioElement = document.createElement('audio');
defaultSettings = {
// TODO: Make this configurable
model: 'openai-audio',
voiceMap: {},
};
get settingsHtml() {
return '';
}
onSettingsChange() {
this.voices = [];
saveTtsProviderSettings();
}
async loadSettings(settings) {
// Populate Provider UI given input settings
if (Object.keys(settings).length == 0) {
console.info('Using default TTS Provider settings');
}
// Only accept keys defined in defaultSettings
this.settings = this.defaultSettings;
for (const key in settings) {
if (key in this.settings) {
this.settings[key] = settings[key];
} else {
throw `Invalid setting passed to TTS Provider: ${key}`;
}
}
try {
await this.checkReady();
console.debug('Pollinations TTS: Settings loaded');
} catch {
console.debug('Pollinations TTS: Settings loaded, but not ready');
}
}
// Perform a simple readiness check by trying to fetch voiceIds
async checkReady() {
await this.fetchTtsVoiceObjects();
}
async onRefreshClick() {
await this.checkReady();
}
//#################//
// TTS Interfaces //
//#################//
async getVoice(voiceName) {
if (this.voices.length == 0) {
this.voices = await this.fetchTtsVoiceObjects();
}
const match = this.voices.filter(
voice => voice.name == voiceName || voice.voice_id == voiceName,
)[0];
if (!match) {
throw `TTS Voice name ${voiceName} not found`;
}
return match;
}
/**
* Generate TTS audio for the given text using the specified voice.
* @param {string} text Text to generate
* @param {string} voiceId Voice ID
* @returns {AsyncGenerator<Response>} Audio response generator
*/
generateTts(text, voiceId) {
return this.fetchTtsGeneration(text, voiceId);
}
//###########//
// API CALLS //
//###########//
async fetchTtsVoiceObjects() {
const response = await fetch('/api/speech/pollinations/voices', {
method: 'POST',
headers: getRequestHeaders(),
body: JSON.stringify({ model: this.settings.model }),
});
if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${await response.text()}`);
}
const responseJson = await response.json();
return responseJson
.sort()
.map(x => ({ name: x, voice_id: x, preview_url: false, lang: 'en-US' }));
}
/**
* Preview TTS for a given voice ID.
* @param {string} id Voice ID
*/
async previewTtsVoice(id) {
this.audioElement.pause();
this.audioElement.currentTime = 0;
const voice = await this.getVoice(id);
const text = getPreviewString(voice.lang);
for await (const response of this.generateTts(text, id)) {
const audio = await response.blob();
const url = URL.createObjectURL(audio);
await new Promise(resolve => {
const audioElement = new Audio();
audioElement.src = url;
audioElement.play();
audioElement.onended = () => resolve();
});
URL.revokeObjectURL(url);
}
}
async* fetchTtsGeneration(text, voiceId) {
const MAX_LENGTH = 1000;
console.info(`Generating new TTS for voice_id ${voiceId}`);
const chunks = splitRecursive(text, MAX_LENGTH);
for (const chunk of chunks) {
const response = await fetch('/api/speech/pollinations/generate', {
method: 'POST',
headers: getRequestHeaders(),
body: JSON.stringify({
model: this.settings.model,
text: 'Say exactly this and nothing else:' + '\n' + chunk,
voice: voiceId,
}),
});
if (!response.ok) {
toastr.error(response.statusText, 'TTS Generation Failed');
throw new Error(`HTTP ${response.status}: ${await response.text()}`);
}
yield response;
}
}
}
+22 -33
View File
@@ -22,7 +22,7 @@ import {
openThirdPartyExtensionMenu,
} from '../../extensions.js';
import { collapseNewlines, registerDebugFunction } from '../../power-user.js';
import { SECRET_KEYS, secret_state, writeSecret } from '../../secrets.js';
import { SECRET_KEYS, secret_state } from '../../secrets.js';
import { getDataBankAttachments, getDataBankAttachmentsForSource, getFileAttachment } from '../../chats.js';
import { debounce, getStringHash as calculateHash, waitUntilCondition, onlyUnique, splitRecursive, trimToStartSentence, trimToEndSentence, escapeHtml } from '../../utils.js';
import { debounce_timeout } from '../../constants.js';
@@ -33,10 +33,10 @@ import { SlashCommand } from '../../slash-commands/SlashCommand.js';
import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '../../slash-commands/SlashCommandArgument.js';
import { SlashCommandEnumValue, enumTypes } from '../../slash-commands/SlashCommandEnumValue.js';
import { slashCommandReturnHelper } from '../../slash-commands/SlashCommandReturnHelper.js';
import { callGenericPopup, POPUP_RESULT, POPUP_TYPE } from '../../popup.js';
import { generateWebLlmChatPrompt, isWebLlmSupported } from '../shared.js';
import { WebLlmVectorProvider } from './webllm.js';
import { removeReasoningFromString } from '../../reasoning.js';
import { oai_settings } from '../../openai.js';
/**
* @typedef {object} HashedMessage
@@ -51,7 +51,7 @@ export const EXTENSION_PROMPT_TAG = '3_vectors';
export const EXTENSION_PROMPT_TAG_DB = '4_vectors_data_bank';
// Force solo chunks for sources that don't support batching.
const getBatchSize = () => ['transformers', 'palm', 'ollama'].includes(settings.source) ? 1 : 5;
const getBatchSize = () => ['transformers', 'ollama'].includes(settings.source) ? 1 : 5;
const settings = {
// For both
@@ -258,17 +258,17 @@ async function summarizeExtra(element) {
/**
* Summarizes messages using the main API method.
* @param {HashedMessage} element hashed message
* @returns {Promise<boolean>} Sucess
* @returns {Promise<boolean>} Success
*/
async function summarizeMain(element) {
element.text = removeReasoningFromString(await generateRaw(element.text, '', false, false, settings.summary_prompt));
element.text = removeReasoningFromString(await generateRaw({ prompt: element.text, systemPrompt: settings.summary_prompt }));
return true;
}
/**
* Summarizes messages using WebLLM.
* @param {HashedMessage} element hashed message
* @returns {Promise<boolean>} Sucess
* @returns {Promise<boolean>} Success
*/
async function summarizeWebLLM(element) {
if (!isWebLlmSupported()) {
@@ -797,6 +797,14 @@ function getVectorsRequestBody(args = {}) {
break;
case 'palm':
body.model = extension_settings.vectors.google_model;
body.api = 'makersuite';
break;
case 'vertexai':
body.model = extension_settings.vectors.google_model;
body.api = 'vertexai';
body.vertexai_auth_mode = oai_settings.vertexai_auth_mode;
body.vertexai_region = oai_settings.vertexai_region;
body.vertexai_express_project_id = oai_settings.vertexai_express_project_id;
break;
default:
break;
@@ -882,6 +890,7 @@ async function insertVectorItems(collectionId, items) {
function throwIfSourceInvalid() {
if (settings.source === 'openai' && !secret_state[SECRET_KEYS.OPENAI] ||
settings.source === 'palm' && !secret_state[SECRET_KEYS.MAKERSUITE] ||
settings.source === 'vertexai' && !secret_state[SECRET_KEYS.VERTEXAI] && !secret_state[SECRET_KEYS.VERTEXAI_SERVICE_ACCOUNT] ||
settings.source === 'mistral' && !secret_state[SECRET_KEYS.MISTRALAI] ||
settings.source === 'togetherai' && !secret_state[SECRET_KEYS.TOGETHERAI] ||
settings.source === 'nomicai' && !secret_state[SECRET_KEYS.NOMICAI] ||
@@ -1099,7 +1108,7 @@ function toggleSettings() {
$('#nomicai_apiKey').toggle(settings.source === 'nomicai');
$('#webllm_vectorsModel').toggle(settings.source === 'webllm');
$('#koboldcpp_vectorsModel').toggle(settings.source === 'koboldcpp');
$('#google_vectorsModel').toggle(settings.source === 'palm');
$('#google_vectorsModel').toggle(settings.source === 'palm' || settings.source === 'vertexai');
$('#vector_altEndpointUrl').toggle(vectorApiRequiresUrl.includes(settings.source));
if (settings.source === 'webllm') {
loadWebLlmModels();
@@ -1494,32 +1503,6 @@ jQuery(async () => {
Object.assign(extension_settings.vectors, settings);
saveSettingsDebounced();
});
$('#api_key_nomicai').on('click', async () => {
const popupText = 'NomicAI API Key:';
const key = await callGenericPopup(popupText, POPUP_TYPE.INPUT, '', {
customButtons: [{
text: 'Remove Key',
appendAtEnd: true,
result: POPUP_RESULT.NEGATIVE,
action: async () => {
await writeSecret(SECRET_KEYS.NOMICAI, '');
toastr.success('API Key removed');
$('#api_key_nomicai').toggleClass('success', !!secret_state[SECRET_KEYS.NOMICAI]);
saveSettingsDebounced();
},
}],
});
if (!key) {
return;
}
await writeSecret(SECRET_KEYS.NOMICAI, String(key));
$('#api_key_nomicai').toggleClass('success', !!secret_state[SECRET_KEYS.NOMICAI]);
toastr.success('API Key saved');
saveSettingsDebounced();
});
$('#vectors_togetherai_model').val(settings.togetherai_model).on('change', () => {
settings.togetherai_model = String($('#vectors_togetherai_model').val());
Object.assign(extension_settings.vectors, settings);
@@ -1777,6 +1760,12 @@ jQuery(async () => {
});
$('#api_key_nomicai').toggleClass('success', !!secret_state[SECRET_KEYS.NOMICAI]);
[event_types.SECRET_WRITTEN, event_types.SECRET_DELETED, event_types.SECRET_ROTATED].forEach(event => {
eventSource.on(event, (/** @type {string} */ key) => {
if (key !== SECRET_KEYS.NOMICAI) return;
$('#api_key_nomicai').toggleClass('success', !!secret_state[SECRET_KEYS.NOMICAI]);
});
});
toggleSettings();
eventSource.on(event_types.MESSAGE_DELETED, onChatEvent);
@@ -13,6 +13,7 @@
<option value="cohere">Cohere</option>
<option value="extras">Extras (deprecated)</option>
<option value="palm">Google AI Studio</option>
<option value="vertexai">Google Vertex AI</option>
<option value="koboldcpp">KoboldCpp</option>
<option value="llamacpp">llama.cpp</option>
<option value="transformers" data-i18n="Local (Transformers)">Local (Transformers)</option>
@@ -136,6 +137,7 @@
Vectorization Model
</label>
<select id="vectors_google_model" class="text_pole">
<option value="gemini-embedding-001">gemini-embedding-001</option>
<option value="gemini-embedding-exp-03-07">gemini-embedding-exp-03-07</option>
<option value="text-embedding-004">text-embedding-004</option>
<option value="embedding-001">embedding-001</option>
@@ -145,7 +147,7 @@
<label for="api_key_nomicai" class="flex1">
<span data-i18n="NomicAI API Key">NomicAI API Key</span>
</label>
<div id="api_key_nomicai" class="menu_button menu_button_icon">
<div id="api_key_nomicai" class="menu_button menu_button_icon manage-api-keys" data-key="api_key_nomicai">
<i class="fa-solid fa-key"></i>
<span data-i18n="Click to set">Click to set</span>
</div>
+5 -7
View File
@@ -311,7 +311,7 @@ export function getGroupNames() {
* @returns {number|Object} 0-based character ID or key-value object if full is true
*/
export function findGroupMemberId(arg, full = false) {
arg = arg?.trim();
arg = arg?.toString()?.trim();
if (!arg) {
console.warn('WARN: No argument provided for findGroupMemberId');
@@ -921,7 +921,6 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
for (const chId of activatedMembers) {
throwIfAborted();
deactivateSendButtons();
const generateType = type == 'swipe' || type == 'impersonate' || type == 'quiet' || type == 'continue' ? type : 'group_chat';
setCharacterId(chId);
setCharacterName(characters[chId].name);
if (power_user.show_group_chat_queue) {
@@ -930,6 +929,7 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
await eventSource.emit(event_types.GROUP_MEMBER_DRAFTED, chId);
// Wait for generation to finish
const generateType = ['swipe', 'impersonate', 'quiet', 'continue'].includes(type) ? type : 'normal';
textResult = await Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
let messageChunk = textResult?.messageChunk;
@@ -1358,7 +1358,7 @@ function isGroupMember(group, avatarId) {
}
}
function getGroupCharacters({ doFilter, onlyMembers } = {}) {
function getGroupCharacters({ doFilter = false, onlyMembers = false } = {}) {
function sortMembersFn(a, b) {
const membersArray = thisGroup?.members ?? newGroupMembers;
const aIndex = membersArray.indexOf(a.item.avatar);
@@ -1757,7 +1757,7 @@ async function onGroupActionClick(event) {
function updateFavButtonState(state) {
fav_grp_checked = state;
$('#rm_group_fav').val(fav_grp_checked);
$('#rm_group_fav').val(String(fav_grp_checked));
$('#group_favorite_button').toggleClass('fav_on', fav_grp_checked);
$('#group_favorite_button').toggleClass('fav_off', !fav_grp_checked);
}
@@ -2047,11 +2047,9 @@ export async function deleteGroupChat(groupId, chatId) {
* @param {EventTarget} eventTarget Element that triggered the import
*/
export async function importGroupChat(formData, eventTarget) {
const headers = getRequestHeaders();
delete headers['Content-Type'];
const fetchResult = await fetch('/api/chats/group/import', {
method: 'POST',
headers: headers,
headers: getRequestHeaders({ omitContentType: true }),
body: formData,
cache: 'no-cache',
});
+31 -12
View File
@@ -1,9 +1,12 @@
import {
amount_gen,
getRequestHeaders,
main_api,
max_context,
resultCheckStatus,
saveSettingsDebounced,
setGenerationProgress,
setOnlineStatus,
} from '../script.js';
import { SECRET_KEYS, writeSecret } from './secrets.js';
import { delay } from './utils.js';
@@ -11,20 +14,15 @@ import { isMobile } from './RossAscends-mods.js';
import { autoSelectInstructPreset } from './instruct-mode.js';
import { t } from './i18n.js';
import { callGenericPopup, POPUP_TYPE } from './popup.js';
import { kai_settings } from './kai-settings.js';
export {
horde_settings,
generateHorde,
checkHordeStatus,
loadHordeSettings,
adjustHordeGenerationParams,
getHordeModels,
MIN_LENGTH,
};
let models = [];
let horde_settings = {
export let horde_settings = {
models: [],
auto_adjust_response_length: true,
auto_adjust_context_length: false,
@@ -105,7 +103,7 @@ async function cancelTask(taskId) {
* Checks if Horde is online.
* @returns {Promise<boolean>} True if Horde is online, false otherwise
*/
async function checkHordeStatus() {
export async function checkHordeStatus() {
try {
const response = await fetch('/api/horde/status', {
method: 'POST',
@@ -124,6 +122,18 @@ async function checkHordeStatus() {
}
}
export async function getStatusHorde() {
try {
const hordeStatus = await checkHordeStatus();
setOnlineStatus(hordeStatus ? t`Connected` : 'no_connection');
}
catch {
setOnlineStatus('no_connection');
}
return resultCheckStatus();
}
function validateHordeModel() {
let selectedModels = models.filter(m => horde_settings.models.includes(m.name));
@@ -135,7 +145,7 @@ function validateHordeModel() {
return selectedModels;
}
async function adjustHordeGenerationParams(max_context_length, max_length) {
export async function adjustHordeGenerationParams(max_context_length, max_length) {
console.log(max_context_length, max_length);
const workers = await getWorkers(false);
let maxContextLength = max_context_length;
@@ -190,7 +200,7 @@ function setContextSizePreview() {
* @returns {Promise<{text: *, workerName: string}>}
* @throws {Error}
*/
async function generateHorde(prompt, params, signal, reportProgress) {
export async function generateHorde(prompt, params, signal, reportProgress) {
validateHordeModel();
delete params.prompt;
@@ -280,7 +290,7 @@ async function generateHorde(prompt, params, signal, reportProgress) {
* Displays the available models in the Horde model selection dropdown.
* @param {boolean} force Force refresh of the models
*/
async function getHordeModels(force) {
export async function getHordeModels(force) {
const sortByPerformance = (a, b) => b.performance - a.performance;
const sortByWhitelisted = (a, b) => b.is_whitelisted - a.is_whitelisted;
const sortByPopular = (a, b) => b.tags?.includes('popular') - a.tags?.includes('popular');
@@ -305,7 +315,7 @@ async function getHordeModels(force) {
setContextSizePreview();
}
function loadHordeSettings(settings) {
export function loadHordeSettings(settings) {
if (settings.horde_settings) {
Object.assign(horde_settings, settings.horde_settings);
}
@@ -346,6 +356,15 @@ function hordeModelQueueStateString(model) {
return `ETA: ${model.eta}s, Speed: ${model.performance}, Queue: ${model.queued}, Workers: ${model.count}`;
}
export function isHordeGenerationNotAllowed() {
if (main_api == 'koboldhorde' && kai_settings.preset_settings == 'gui') {
toastr.error(t`GUI Settings preset is not supported for Horde. Please select another preset.`);
return true;
}
return false;
}
function getHordeModelTemplate(option) {
const model = models.find(x => x.name === option?.element?.value);
+38 -4
View File
@@ -1,6 +1,6 @@
'use strict';
import { name1, name2, saveSettingsDebounced, substituteParams } from '../script.js';
import { name1, name2, online_status, saveSettingsDebounced, substituteParams } from '../script.js';
import { selected_group } from './group-chats.js';
import { parseExampleIntoIndividual } from './openai.js';
import {
@@ -40,7 +40,6 @@ const controls = [
{ id: 'instruct_first_input_sequence', property: 'first_input_sequence', isCheckbox: false },
{ id: 'instruct_last_input_sequence', property: 'last_input_sequence', isCheckbox: false },
{ id: 'instruct_activation_regex', property: 'activation_regex', isCheckbox: false },
{ id: 'instruct_derived', property: 'derived', isCheckbox: true },
{ id: 'instruct_bind_to_context', property: 'bind_to_context', isCheckbox: true },
{ id: 'instruct_skip_examples', property: 'skip_examples', isCheckbox: true },
{ id: 'instruct_names_behavior', property: 'names_behavior', isCheckbox: false },
@@ -102,7 +101,7 @@ export async function loadInstructMode(data) {
$('#instruct_enabled').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.enabled);
$('#instructSettingsBlock, #InstructSequencesColumn').toggleClass('disabled', !power_user.instruct.enabled);
$('#instruct_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.derived);
$('#instruct_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct_derived);
$('#instruct_bind_to_context').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.bind_to_context);
controls.forEach(control => {
@@ -141,6 +140,20 @@ export async function loadInstructMode(data) {
});
}
/**
* Updates the bind model template state based on the current model, instruct and context preset.
*/
export function updateBindModelTemplatesState() {
const bindModelTemplates = power_user.model_templates_mappings[online_status] ?? power_user.model_templates_mappings[power_user.chat_template_hash];
const bindingsMatch = (bindModelTemplates && power_user.context.preset === bindModelTemplates['context'] && (!power_user.instruct.enabled || power_user.instruct.preset === bindModelTemplates['instruct'])) ?? false;
const currentState = $('#bind_model_templates').prop('checked');
if (bindingsMatch === currentState) {
// No change needed
return;
}
$('#bind_model_templates').prop('checked', bindingsMatch);
}
/**
* Select context template if not already selected.
* @param {string} preset Preset name.
@@ -161,6 +174,8 @@ export function selectContextPreset(preset, { quiet = false, isAuto = false } =
!quiet && toastr.info(`Context Template: "${preset}" ${isAuto ? 'auto-' : ''}selected`);
}
updateBindModelTemplatesState();
saveSettingsDebounced();
}
@@ -191,6 +206,8 @@ export function selectInstructPreset(preset, { quiet = false, isAuto = false } =
!quiet && toastr.info('Instruct Mode enabled');
}
updateBindModelTemplatesState();
saveSettingsDebounced();
}
@@ -201,6 +218,21 @@ export function selectInstructPreset(preset, { quiet = false, isAuto = false } =
* @returns {boolean} True if instruct preset was activated by model id, false otherwise.
*/
export function autoSelectInstructPreset(modelId) {
const modelTemplatesMap = power_user.model_templates_mappings[modelId];
if (modelTemplatesMap) {
const { instruct, context } = modelTemplatesMap;
if (instruct) {
selectInstructPreset(instruct, { isAuto: true });
}
if (context) {
selectContextPreset(context, { isAuto: true });
}
return true;
} else {
updateBindModelTemplatesState();
}
// If instruct mode is disabled, don't do anything
if (!power_user.instruct.enabled) {
return false;
@@ -747,7 +779,7 @@ jQuery(() => {
});
$('#instruct_derived').on('change', function () {
$('#instruct_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct.derived);
$('#instruct_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct_derived);
});
$('#instruct_bind_to_context').on('change', function () {
@@ -787,6 +819,8 @@ jQuery(() => {
// Select matching context template
selectMatchingContextTemplate(name);
}
updateBindModelTemplatesState();
});
if (!CSS.supports('field-sizing', 'content')) {
+352
View File
@@ -0,0 +1,352 @@
import { DiffMatchPatch, DOMPurify, localforage } from '../lib.js';
import { chat, event_types, eventSource, getCurrentChatId, reloadCurrentChat } from '../script.js';
import { t } from './i18n.js';
import { oai_settings } from './openai.js';
import { Popup, POPUP_TYPE } from './popup.js';
import { power_user, registerDebugFunction } from './power-user.js';
import { isMobile } from './RossAscends-mods.js';
import { renderTemplateAsync } from './templates.js';
import { getFriendlyTokenizerName, getTokenCountAsync } from './tokenizers.js';
import { copyText } from './utils.js';
let PromptArrayItemForRawPromptDisplay;
let priorPromptArrayItemForRawPromptDisplay;
const promptStorage = localforage.createInstance({ name: 'SillyTavern_Prompts' });
export let itemizedPrompts = [];
/**
* Gets the itemized prompts for a chat.
* @param {string} chatId Chat ID to load
*/
export async function loadItemizedPrompts(chatId) {
try {
if (!chatId) {
itemizedPrompts = [];
return;
}
itemizedPrompts = await promptStorage.getItem(chatId);
if (!itemizedPrompts) {
itemizedPrompts = [];
}
} catch {
console.log('Error loading itemized prompts for chat', chatId);
itemizedPrompts = [];
}
}
/**
* Saves the itemized prompts for a chat.
* @param {string} chatId Chat ID to save itemized prompts for
*/
export async function saveItemizedPrompts(chatId) {
try {
if (!chatId) {
return;
}
await promptStorage.setItem(chatId, itemizedPrompts);
} catch {
console.log('Error saving itemized prompts for chat', chatId);
}
}
/**
* Replaces the itemized prompt text for a message.
* @param {number} mesId Message ID to get itemized prompt for
* @param {string} promptText New raw prompt text
* @returns
*/
export async function replaceItemizedPromptText(mesId, promptText) {
if (!Array.isArray(itemizedPrompts)) {
itemizedPrompts = [];
}
const itemizedPrompt = itemizedPrompts.find(x => x.mesId === mesId);
if (!itemizedPrompt) {
return;
}
itemizedPrompt.rawPrompt = promptText;
}
/**
* Deletes the itemized prompts for a chat.
* @param {string} chatId Chat ID to delete itemized prompts for
*/
export async function deleteItemizedPrompts(chatId) {
try {
if (!chatId) {
return;
}
await promptStorage.removeItem(chatId);
} catch {
console.log('Error deleting itemized prompts for chat', chatId);
}
}
/**
* Empties the itemized prompts array and caches.
*/
export async function clearItemizedPrompts() {
try {
await promptStorage.clear();
itemizedPrompts = [];
} catch {
console.log('Error clearing itemized prompts');
}
}
export async function itemizedParams(itemizedPrompts, thisPromptSet, incomingMesId) {
const params = {
charDescriptionTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].charDescription),
charPersonalityTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].charPersonality),
scenarioTextTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].scenarioText),
userPersonaStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].userPersona),
worldInfoStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].worldInfoString),
allAnchorsTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].allAnchors),
summarizeStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].summarizeString),
authorsNoteStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].authorsNoteString),
smartContextStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].smartContextString),
beforeScenarioAnchorTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].beforeScenarioAnchor),
afterScenarioAnchorTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].afterScenarioAnchor),
zeroDepthAnchorTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].zeroDepthAnchor), // TODO: unused
thisPrompt_padding: itemizedPrompts[thisPromptSet].padding,
this_main_api: itemizedPrompts[thisPromptSet].main_api,
chatInjects: await getTokenCountAsync(itemizedPrompts[thisPromptSet].chatInjects),
chatVectorsStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].chatVectorsString),
dataBankVectorsStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].dataBankVectorsString),
modelUsed: chat[incomingMesId]?.extra?.model,
apiUsed: chat[incomingMesId]?.extra?.api,
presetName: itemizedPrompts[thisPromptSet].presetName || t`(Unknown)`,
messagesCount: String(itemizedPrompts[thisPromptSet].messagesCount ?? ''),
examplesCount: String(itemizedPrompts[thisPromptSet].examplesCount ?? ''),
};
const getFriendlyName = (value) => $(`#rm_api_block select option[value="${value}"]`).first().text() || value;
if (params.apiUsed) {
params.apiUsed = getFriendlyName(params.apiUsed);
}
if (params.this_main_api) {
params.mainApiFriendlyName = getFriendlyName(params.this_main_api);
}
if (params.chatInjects) {
params.ActualChatHistoryTokens = params.ActualChatHistoryTokens - params.chatInjects;
}
if (params.this_main_api == 'openai') {
//for OAI API
//console.log('-- Counting OAI Tokens');
//params.finalPromptTokens = itemizedPrompts[thisPromptSet].oaiTotalTokens;
params.oaiMainTokens = itemizedPrompts[thisPromptSet].oaiMainTokens;
params.oaiStartTokens = itemizedPrompts[thisPromptSet].oaiStartTokens;
params.ActualChatHistoryTokens = itemizedPrompts[thisPromptSet].oaiConversationTokens;
params.examplesStringTokens = itemizedPrompts[thisPromptSet].oaiExamplesTokens;
params.oaiPromptTokens = itemizedPrompts[thisPromptSet].oaiPromptTokens - (params.afterScenarioAnchorTokens + params.beforeScenarioAnchorTokens) + params.examplesStringTokens;
params.oaiBiasTokens = itemizedPrompts[thisPromptSet].oaiBiasTokens;
params.oaiJailbreakTokens = itemizedPrompts[thisPromptSet].oaiJailbreakTokens;
params.oaiNudgeTokens = itemizedPrompts[thisPromptSet].oaiNudgeTokens;
params.oaiImpersonateTokens = itemizedPrompts[thisPromptSet].oaiImpersonateTokens;
params.oaiNsfwTokens = itemizedPrompts[thisPromptSet].oaiNsfwTokens;
params.finalPromptTokens =
params.oaiStartTokens +
params.oaiPromptTokens +
params.oaiMainTokens +
params.oaiNsfwTokens +
params.oaiBiasTokens +
params.oaiImpersonateTokens +
params.oaiJailbreakTokens +
params.oaiNudgeTokens +
params.ActualChatHistoryTokens +
//charDescriptionTokens +
//charPersonalityTokens +
//allAnchorsTokens +
params.worldInfoStringTokens +
params.beforeScenarioAnchorTokens +
params.afterScenarioAnchorTokens;
// Max context size - max completion tokens
params.thisPrompt_max_context = (oai_settings.openai_max_context - oai_settings.openai_max_tokens);
//console.log('-- applying % on OAI tokens');
params.oaiStartTokensPercentage = ((params.oaiStartTokens / (params.finalPromptTokens)) * 100).toFixed(2);
params.storyStringTokensPercentage = (((params.afterScenarioAnchorTokens + params.beforeScenarioAnchorTokens + params.oaiPromptTokens) / (params.finalPromptTokens)) * 100).toFixed(2);
params.ActualChatHistoryTokensPercentage = ((params.ActualChatHistoryTokens / (params.finalPromptTokens)) * 100).toFixed(2);
params.promptBiasTokensPercentage = ((params.oaiBiasTokens / (params.finalPromptTokens)) * 100).toFixed(2);
params.worldInfoStringTokensPercentage = ((params.worldInfoStringTokens / (params.finalPromptTokens)) * 100).toFixed(2);
params.allAnchorsTokensPercentage = ((params.allAnchorsTokens / (params.finalPromptTokens)) * 100).toFixed(2);
params.selectedTokenizer = getFriendlyTokenizerName(params.this_main_api).tokenizerName;
params.oaiSystemTokens = params.oaiImpersonateTokens + params.oaiJailbreakTokens + params.oaiNudgeTokens + params.oaiStartTokens + params.oaiNsfwTokens + params.oaiMainTokens;
params.oaiSystemTokensPercentage = ((params.oaiSystemTokens / (params.finalPromptTokens)) * 100).toFixed(2);
} else {
//for non-OAI APIs
//console.log('-- Counting non-OAI Tokens');
params.finalPromptTokens = await getTokenCountAsync(itemizedPrompts[thisPromptSet].finalPrompt);
params.storyStringTokens = await getTokenCountAsync(itemizedPrompts[thisPromptSet].storyString) - params.worldInfoStringTokens;
params.examplesStringTokens = await getTokenCountAsync(itemizedPrompts[thisPromptSet].examplesString);
params.mesSendStringTokens = await getTokenCountAsync(itemizedPrompts[thisPromptSet].mesSendString);
params.ActualChatHistoryTokens = params.mesSendStringTokens - (params.allAnchorsTokens - (params.beforeScenarioAnchorTokens + params.afterScenarioAnchorTokens)) + power_user.token_padding;
params.instructionTokens = await getTokenCountAsync(itemizedPrompts[thisPromptSet].instruction);
params.promptBiasTokens = await getTokenCountAsync(itemizedPrompts[thisPromptSet].promptBias);
params.totalTokensInPrompt =
params.storyStringTokens + //chardefs total
params.worldInfoStringTokens +
params.examplesStringTokens + // example messages
params.ActualChatHistoryTokens + //chat history
params.allAnchorsTokens + // AN and/or legacy anchors
//afterScenarioAnchorTokens + //only counts if AN is set to 'after scenario'
//zeroDepthAnchorTokens + //same as above, even if AN not on 0 depth
params.promptBiasTokens; //{{}}
//- thisPrompt_padding; //not sure this way of calculating is correct, but the math results in same value as 'finalPrompt'
params.thisPrompt_max_context = itemizedPrompts[thisPromptSet].this_max_context;
params.thisPrompt_actual = params.thisPrompt_max_context - params.thisPrompt_padding;
//console.log('-- applying % on non-OAI tokens');
params.storyStringTokensPercentage = ((params.storyStringTokens / (params.totalTokensInPrompt)) * 100).toFixed(2);
params.ActualChatHistoryTokensPercentage = ((params.ActualChatHistoryTokens / (params.totalTokensInPrompt)) * 100).toFixed(2);
params.promptBiasTokensPercentage = ((params.promptBiasTokens / (params.totalTokensInPrompt)) * 100).toFixed(2);
params.worldInfoStringTokensPercentage = ((params.worldInfoStringTokens / (params.totalTokensInPrompt)) * 100).toFixed(2);
params.allAnchorsTokensPercentage = ((params.allAnchorsTokens / (params.totalTokensInPrompt)) * 100).toFixed(2);
params.selectedTokenizer = itemizedPrompts[thisPromptSet]?.tokenizer || getFriendlyTokenizerName(params.this_main_api).tokenizerName;
}
return params;
}
export function findItemizedPromptSet(itemizedPrompts, incomingMesId) {
let thisPromptSet = undefined;
for (let i = 0; i < itemizedPrompts.length; i++) {
console.log(`looking for ${incomingMesId} vs ${itemizedPrompts[i].mesId}`);
if (itemizedPrompts[i].mesId === incomingMesId) {
console.log(`found matching mesID ${i}`);
thisPromptSet = i;
PromptArrayItemForRawPromptDisplay = i;
console.log(`wanting to raw display of ArrayItem: ${PromptArrayItemForRawPromptDisplay} which is mesID ${incomingMesId}`);
console.log(itemizedPrompts[thisPromptSet]);
break;
} else if (itemizedPrompts[i].rawPrompt) {
priorPromptArrayItemForRawPromptDisplay = i;
}
}
return thisPromptSet;
}
export async function promptItemize(itemizedPrompts, requestedMesId) {
console.log('PROMPT ITEMIZE ENTERED');
var incomingMesId = Number(requestedMesId);
console.debug(`looking for MesId ${incomingMesId}`);
var thisPromptSet = findItemizedPromptSet(itemizedPrompts, incomingMesId);
if (thisPromptSet === undefined) {
console.log(`couldnt find the right mesId. looked for ${incomingMesId}`);
console.log(itemizedPrompts);
return null;
}
const params = await itemizedParams(itemizedPrompts, thisPromptSet, incomingMesId);
const flatten = (rawPrompt) => Array.isArray(rawPrompt) ? rawPrompt.map(x => x.content).join('\n') : rawPrompt;
const template = params.this_main_api == 'openai'
? await renderTemplateAsync('itemizationChat', params)
: await renderTemplateAsync('itemizationText', params);
const popup = new Popup(template, POPUP_TYPE.TEXT);
/** @type {HTMLElement} */
const diffPrevPrompt = popup.dlg.querySelector('#diffPrevPrompt');
if (priorPromptArrayItemForRawPromptDisplay) {
diffPrevPrompt.style.display = '';
diffPrevPrompt.addEventListener('click', function () {
const dmp = new DiffMatchPatch();
const text1 = flatten(itemizedPrompts[priorPromptArrayItemForRawPromptDisplay].rawPrompt);
const text2 = flatten(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
dmp.Diff_Timeout = 2.0;
const d = dmp.diff_main(text1, text2);
let ds = dmp.diff_prettyHtml(d);
// make it readable
ds = ds.replaceAll('background:#e6ffe6;', 'background:#b9f3b9; color:black;');
ds = ds.replaceAll('background:#ffe6e6;', 'background:#f5b4b4; color:black;');
ds = ds.replaceAll('&para;', '');
const container = document.createElement('div');
container.innerHTML = DOMPurify.sanitize(ds);
const rawPromptWrapper = document.getElementById('rawPromptWrapper');
rawPromptWrapper.replaceChildren(container);
$('#rawPromptPopup').slideToggle();
});
} else {
diffPrevPrompt.style.display = 'none';
}
popup.dlg.querySelector('#copyPromptToClipboard').addEventListener('pointerup', async function () {
let rawPrompt = itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt;
let rawPromptValues = rawPrompt;
if (Array.isArray(rawPrompt)) {
rawPromptValues = rawPrompt.map(x => x.content).join('\n');
}
await copyText(rawPromptValues);
toastr.info(t`Copied!`);
});
popup.dlg.querySelector('#showRawPrompt').addEventListener('click', async function () {
//console.log(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
console.log(PromptArrayItemForRawPromptDisplay);
console.log(itemizedPrompts);
console.log(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
const rawPrompt = flatten(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
// Mobile needs special handholding. The side-view on the popup wouldn't work,
// so we just show an additional popup for this.
if (isMobile()) {
const content = document.createElement('div');
content.classList.add('tokenItemizingMaintext');
content.innerText = rawPrompt;
const popup = new Popup(content, POPUP_TYPE.TEXT, null, { allowVerticalScrolling: true, leftAlign: true });
await popup.show();
return;
}
//let DisplayStringifiedPrompt = JSON.stringify(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt).replace(/\n+/g, '<br>');
const rawPromptWrapper = document.getElementById('rawPromptWrapper');
rawPromptWrapper.innerText = rawPrompt;
$('#rawPromptPopup').slideToggle();
});
await popup.show();
}
export function initItemizedPrompts() {
registerDebugFunction('clearPrompts', 'Delete itemized prompts', 'Deletes all itemized prompts from the local storage.', async () => {
await clearItemizedPrompts();
toastr.info('Itemized prompts deleted.');
if (getCurrentChatId()) {
await reloadCurrentChat();
}
});
$(document).on('pointerup', '.mes_prompt', async function () {
let mesIdForItemization = $(this).closest('.mes').attr('mesId');
console.log(`looking for mesID: ${mesIdForItemization}`);
if (itemizedPrompts.length !== undefined && itemizedPrompts.length !== 0) {
await promptItemize(itemizedPrompts, mesIdForItemization);
}
});
eventSource.on(event_types.CHAT_DELETED, async (name) => {
await deleteItemizedPrompts(name);
});
eventSource.on(event_types.GROUP_CHAT_DELETED, async (name) => {
await deleteItemizedPrompts(name);
});
}
+157 -6
View File
@@ -3,8 +3,18 @@ import {
saveSettingsDebounced,
getStoppingStrings,
substituteParams,
api_server,
setOnlineStatus,
resultCheckStatus,
main_api,
online_status,
abortStatusCheck,
startStatusLoading,
setGenerationParamsFromPreset,
eventSource,
event_types,
} from '../script.js';
import { t } from './i18n.js';
import { autoSelectInstructPreset } from './instruct-mode.js';
import {
power_user,
@@ -12,6 +22,9 @@ import {
import { getEventSourceStream } from './sse-stream.js';
import { getSortableDelay } from './utils.js';
export let koboldai_settings;
export let koboldai_setting_names;
export const kai_settings = {
temp: 1,
rep_pen: 1,
@@ -31,6 +44,9 @@ export const kai_settings = {
use_default_badwordsids: false,
grammar: '',
seed: -1,
api_server: '',
preset_settings: 'gui',
extensions: {},
};
/**
@@ -72,8 +88,56 @@ export function formatKoboldUrl(value) {
return null;
}
export function loadKoboldSettings(preset) {
function selectKoboldGuiPreset() {
$('#settings_preset option[value=gui]')
.attr('selected', 'true')
.trigger('change');
}
export function loadKoboldSettings(data, preset, settings) {
koboldai_setting_names = data.koboldai_setting_names;
koboldai_settings = data.koboldai_settings;
koboldai_settings.forEach(function (item, i, arr) {
koboldai_settings[i] = JSON.parse(item);
});
$('#settings_preset').empty();
$('#settings_preset').append('<option value="gui">GUI KoboldAI Settings</option>');
const names = {};
koboldai_setting_names.forEach(function (item, i, arr) {
names[item] = i;
$('#settings_preset').append(`<option value=${i}>${item}</option>`);
});
koboldai_setting_names = names;
kai_settings.preset_settings = preset.preset_settings ?? settings.preset_settings;
kai_settings.api_server = preset.api_server ?? settings.api_server;
if (kai_settings.preset_settings == 'gui') {
selectKoboldGuiPreset();
} else {
if (typeof koboldai_setting_names[kai_settings.preset_settings] !== 'undefined') {
$(`#settings_preset option[value=${koboldai_setting_names[kai_settings.preset_settings]}]`)
.attr('selected', 'true');
} else {
kai_settings.preset_settings = 'gui';
selectKoboldGuiPreset();
}
}
loadKoboldSettingsFromPreset(preset);
//Load the API server URL from settings
$('#api_url_text').val(kai_settings.api_server);
}
function loadKoboldSettingsFromPreset(preset) {
for (const name of Object.keys(kai_settings)) {
if (name === 'extensions') {
kai_settings.extensions = preset.extensions || {};
continue;
}
const value = preset[name] ?? defaultValues[name];
const slider = sliders.find(x => x.name === name);
@@ -139,8 +203,7 @@ export function getKoboldGenerationData(finalPrompt, settings, maxLength, maxCon
use_default_badwordsids: (kai_flags.can_use_default_badwordsids || isHorde) ? kai_settings.use_default_badwordsids : undefined,
grammar: (kai_flags.can_use_grammar || isHorde) ? substituteParams(kai_settings.grammar) : undefined,
sampler_seed: kai_settings.seed >= 0 ? kai_settings.seed : undefined,
api_server,
api_server: kai_settings.api_server,
};
return generate_data;
}
@@ -350,7 +413,53 @@ function sortItemsByOrder(orderArray) {
}
}
jQuery(function () {
export async function getStatusKobold() {
let endpoint = kai_settings.api_server;
if (!endpoint) {
console.warn('No endpoint for status check');
setOnlineStatus('no_connection');
return resultCheckStatus();
}
try {
const response = await fetch('/api/backends/kobold/status', {
method: 'POST',
headers: getRequestHeaders(),
body: JSON.stringify({
main_api,
api_server: endpoint,
}),
signal: abortStatusCheck.signal,
});
const data = await response.json();
setOnlineStatus(data?.model ?? 'no_connection');
if (!data.koboldUnitedVersion) {
throw new Error(`Missing mandatory Kobold version in data: ${JSON.stringify(data)}`);
}
// Determine instruct mode preset
autoSelectInstructPreset(online_status);
// determine if we can use stop sequence and streaming
setKoboldFlags(data.koboldUnitedVersion, data.koboldCppVersion);
// We didn't get a 200 status code, but the endpoint has an explanation. Which means it DID connect, but I digress.
if (online_status === 'no_connection' && data.response) {
toastr.error(data.response, t`API Error`, { timeOut: 5000, preventDuplicates: true });
}
} catch (err) {
console.error('Error getting status', err);
setOnlineStatus('no_connection');
}
return resultCheckStatus();
}
export function initKoboldSettings() {
sliders.forEach(slider => {
$(document).on('input', slider.sliderId, function () {
const value = $(this).val();
@@ -361,6 +470,23 @@ jQuery(function () {
});
});
$('#api_button').on('click', function (e) {
if ($('#api_url_text').val() != '') {
const value = formatKoboldUrl(String($('#api_url_text').val()).trim());
if (!value) {
toastr.error('Please enter a valid URL.');
return;
}
$('#api_url_text').val(value);
kai_settings.api_server = value;
startStatusLoading();
saveSettingsDebounced();
getStatusKobold();
}
});
$('#streaming_kobold').on('input', function () {
const value = !!$(this).prop('checked');
kai_settings.streaming_kobold = value;
@@ -391,4 +517,29 @@ jQuery(function () {
sortItemsByOrder(kai_settings.sampler_order);
saveSettingsDebounced();
});
});
$('#settings_preset').on('change', async function () {
if ($('#settings_preset').find(':selected').val() != 'gui') {
kai_settings.preset_settings = $('#settings_preset').find(':selected').text();
const preset = koboldai_settings[koboldai_setting_names[kai_settings.preset_settings]];
loadKoboldSettingsFromPreset(preset);
setGenerationParamsFromPreset(preset);
$('#kobold_api-settings').find('input').prop('disabled', false);
$('#kobold_api-settings').css('opacity', 1.0);
$('#kobold_order')
.css('opacity', 1)
.sortable('enable');
} else {
kai_settings.preset_settings = 'gui';
$('#kobold_api-settings').find('input').prop('disabled', true);
$('#kobold_api-settings').css('opacity', 0.5);
$('#kobold_order')
.css('opacity', 0.5)
.sortable('disable');
}
saveSettingsDebounced();
await eventSource.emit(event_types.PRESET_CHANGED, { apiId: 'kobold', name: kai_settings.preset_settings });
});
}
+89 -20
View File
@@ -1,10 +1,14 @@
import {
abortStatusCheck,
event_types,
eventSource,
getRequestHeaders,
getStoppingStrings,
novelai_setting_names,
resultCheckStatus,
saveSettingsDebounced,
setGenerationParamsFromPreset,
setOnlineStatus,
startStatusLoading,
} from '../script.js';
import { MAX_CONTEXT_DEFAULT, MAX_RESPONSE_DEFAULT, power_user } from './power-user.js';
import { getTextTokens, tokenizers } from './tokenizers.js';
@@ -15,6 +19,7 @@ import {
onlyUnique,
} from './utils.js';
import { BIAS_CACHE, createNewLogitBiasEntry, displayLogitBias, getLogitBiasListResult } from './logit-bias.js';
import { SECRET_KEYS, secret_state, writeSecret } from './secrets.js';
const default_preamble = '[ Style: chat, complex, sensory, visceral ]';
const default_order = [1, 5, 0, 2, 3, 4];
@@ -25,6 +30,9 @@ const default_presets = {
'llama-3-erato-v1': 'Erato-Dragonfruit',
};
export let novelai_settings;
export let novelai_setting_names;
export const nai_settings = {
temperature: 1.5,
repetition_penalty: 2.25,
@@ -50,6 +58,7 @@ export const nai_settings = {
banned_tokens: '',
order: default_order,
logit_bias: [],
extensions: {},
};
const nai_tiers = {
@@ -134,6 +143,7 @@ export function convertNovelPreset(data) {
math1_quad_entropy_scale: data.parameters.math1_quad_entropy_scale,
min_p: data.parameters.min_p,
order: Array.isArray(data.parameters.order) ? data.parameters.order.filter(s => s.enabled && Object.keys(samplers).includes(s.id)).map(s => samplers[s.id]) : default_order,
extensions: {},
};
}
@@ -199,10 +209,25 @@ export function loadNovelPreset(preset) {
nai_settings.math1_temp = preset.math1_temp || 1;
nai_settings.math1_quad = preset.math1_quad || 0;
nai_settings.math1_quad_entropy_scale = preset.math1_quad_entropy_scale || 0;
nai_settings.extensions = preset.extensions || {};
loadNovelSettingsUi(nai_settings);
}
export function loadNovelSettings(settings) {
export function loadNovelSettings(data, settings) {
novelai_setting_names = data.novelai_setting_names;
novelai_settings = data.novelai_settings;
novelai_settings.forEach(function (item, i, arr) {
novelai_settings[i] = JSON.parse(item);
});
$('#settings_preset_novel').empty();
const presetNames = {};
novelai_setting_names.forEach(function (item, i, arr) {
presetNames[item] = i;
$('#settings_preset_novel').append(`<option value=${i}>${item}</option>`);
});
novelai_setting_names = presetNames;
//load the rest of the Novel settings without any checks
nai_settings.model_novel = settings.model_novel;
$('#model_novel_select').val(nai_settings.model_novel);
@@ -238,6 +263,7 @@ export function loadNovelSettings(settings) {
nai_settings.math1_temp = settings.math1_temp || 1;
nai_settings.math1_quad = settings.math1_quad || 0;
nai_settings.math1_quad_entropy_scale = settings.math1_quad_entropy_scale || 0;
nai_settings.extensions = settings.extensions || {};
loadNovelSettingsUi(nai_settings);
}
@@ -282,6 +308,7 @@ function loadNovelSettingsUi(ui_settings) {
$('#math1_quad_counter_novel').val(Number(ui_settings.math1_quad).toFixed(2));
$('#math1_quad_entropy_scale_novel').val(ui_settings.math1_quad_entropy_scale);
$('#math1_quad_entropy_scale_counter_novel').val(Number(ui_settings.math1_quad_entropy_scale).toFixed(2));
$(`#settings_preset_novel option[value=${novelai_setting_names[nai_settings.preset_settings_novel]}]`).prop('selected', true);
$('#streaming_novel').prop('checked', ui_settings.streaming_novel);
sortItemsByOrder(ui_settings.order);
@@ -293,85 +320,85 @@ const sliders = [
sliderId: '#temp_novel',
counterId: '#temp_counter_novel',
format: (val) => Number(val).toFixed(2),
setValue: (val) => { nai_settings.temperature = Number(val).toFixed(2); },
setValue: (val) => { nai_settings.temperature = Number(val); },
},
{
sliderId: '#rep_pen_novel',
counterId: '#rep_pen_counter_novel',
format: (val) => Number(val).toFixed(3),
setValue: (val) => { nai_settings.repetition_penalty = Number(val).toFixed(3); },
setValue: (val) => { nai_settings.repetition_penalty = Number(val); },
},
{
sliderId: '#rep_pen_size_novel',
counterId: '#rep_pen_size_counter_novel',
format: (val) => `${val}`,
setValue: (val) => { nai_settings.repetition_penalty_range = Number(val).toFixed(0); },
setValue: (val) => { nai_settings.repetition_penalty_range = Number(val); },
},
{
sliderId: '#rep_pen_slope_novel',
counterId: '#rep_pen_slope_counter_novel',
format: (val) => `${val}`,
setValue: (val) => { nai_settings.repetition_penalty_slope = Number(val).toFixed(2); },
setValue: (val) => { nai_settings.repetition_penalty_slope = Number(val); },
},
{
sliderId: '#rep_pen_freq_novel',
counterId: '#rep_pen_freq_counter_novel',
format: (val) => Number(val).toFixed(2),
setValue: (val) => { nai_settings.repetition_penalty_frequency = Number(val).toFixed(3); },
setValue: (val) => { nai_settings.repetition_penalty_frequency = Number(val); },
},
{
sliderId: '#rep_pen_presence_novel',
counterId: '#rep_pen_presence_counter_novel',
format: (val) => `${val}`,
setValue: (val) => { nai_settings.repetition_penalty_presence = Number(val).toFixed(3); },
setValue: (val) => { nai_settings.repetition_penalty_presence = Number(val); },
},
{
sliderId: '#tail_free_sampling_novel',
counterId: '#tail_free_sampling_counter_novel',
format: (val) => `${val}`,
setValue: (val) => { nai_settings.tail_free_sampling = Number(val).toFixed(3); },
setValue: (val) => { nai_settings.tail_free_sampling = Number(val); },
},
{
sliderId: '#top_k_novel',
counterId: '#top_k_counter_novel',
format: (val) => `${val}`,
setValue: (val) => { nai_settings.top_k = Number(val).toFixed(0); },
setValue: (val) => { nai_settings.top_k = Number(val); },
},
{
sliderId: '#top_p_novel',
counterId: '#top_p_counter_novel',
format: (val) => Number(val).toFixed(3),
setValue: (val) => { nai_settings.top_p = Number(val).toFixed(3); },
setValue: (val) => { nai_settings.top_p = Number(val); },
},
{
sliderId: '#top_a_novel',
counterId: '#top_a_counter_novel',
format: (val) => Number(val).toFixed(2),
setValue: (val) => { nai_settings.top_a = Number(val).toFixed(3); },
setValue: (val) => { nai_settings.top_a = Number(val); },
},
{
sliderId: '#typical_p_novel',
counterId: '#typical_p_counter_novel',
format: (val) => Number(val).toFixed(3),
setValue: (val) => { nai_settings.typical_p = Number(val).toFixed(3); },
setValue: (val) => { nai_settings.typical_p = Number(val); },
},
{
sliderId: '#mirostat_tau_novel',
counterId: '#mirostat_tau_counter_novel',
format: (val) => Number(val).toFixed(2),
setValue: (val) => { nai_settings.mirostat_tau = Number(val).toFixed(2); },
setValue: (val) => { nai_settings.mirostat_tau = Number(val); },
},
{
sliderId: '#mirostat_lr_novel',
counterId: '#mirostat_lr_counter_novel',
format: (val) => Number(val).toFixed(2),
setValue: (val) => { nai_settings.mirostat_lr = Number(val).toFixed(2); },
setValue: (val) => { nai_settings.mirostat_lr = Number(val); },
},
{
sliderId: '#min_length_novel',
counterId: '#min_length_counter_novel',
format: (val) => `${val}`,
setValue: (val) => { nai_settings.min_length = Number(val).toFixed(0); },
setValue: (val) => { nai_settings.min_length = Number(val); },
},
{
sliderId: '#nai_banned_tokens',
@@ -777,7 +804,7 @@ export async function generateNovelWithStreaming(generate_data, signal) {
* for a single token into a TokenLogprobs object used by the Token Probabilities
* feature.
* @param {NAITokenLogprobs} data - NAI logprobs object for one token
* @returns {import('logprobs.js').TokenLogprobs | null} converted logprobs
* @returns {import('./logprobs.js').TokenLogprobs | null} converted logprobs
*/
export function parseNovelAILogprobs(data) {
if (!data) {
@@ -806,6 +833,7 @@ export function parseNovelAILogprobs(data) {
// text so we will use the IDs instead and bulk decode them in
// StreamingProcessor. JSDoc typechecking may complain about this, but it's
// intentional.
// @ts-ignore
return { token: chosenId, topLogprobs: merged };
}
@@ -820,7 +848,23 @@ $('#nai_preamble_restore').on('click', function () {
saveSettingsDebounced();
});
jQuery(function () {
export async function getStatusNovel() {
try {
const result = await loadNovelSubscriptionData();
if (!result) {
throw new Error('Could not load subscription data');
}
setOnlineStatus(getNovelTier());
} catch {
setOnlineStatus('no_connection');
}
return resultCheckStatus();
}
export function initNovelAISettings() {
sliders.forEach(slider => {
$(document).on('input', slider.sliderId, function () {
const value = $(this).val();
@@ -831,13 +875,38 @@ jQuery(function () {
});
});
$('#api_button_novel').on('click', async function (e) {
e.stopPropagation();
const api_key_novel = String($('#api_key_novel').val()).trim();
if (api_key_novel.length) {
await writeSecret(SECRET_KEYS.NOVEL, api_key_novel);
}
if (!secret_state[SECRET_KEYS.NOVEL]) {
console.log('No secret key saved for NovelAI');
return;
}
startStatusLoading();
await getStatusNovel();
});
$('#settings_preset_novel').on('change', async function () {
nai_settings.preset_settings_novel = $('#settings_preset_novel').find(':selected').text();
const preset = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]];
loadNovelPreset(preset);
saveSettingsDebounced();
await eventSource.emit(event_types.PRESET_CHANGED, { apiId: 'novel', name: nai_settings.preset_settings_novel });
});
$('#streaming_novel').on('input', function () {
const value = !!$(this).prop('checked');
nai_settings.streaming_novel = value;
saveSettingsDebounced();
});
$('#model_novel_select').change(function () {
$('#model_novel_select').on('change', function () {
nai_settings.model_novel = String($('#model_novel_select').find(':selected').val());
saveSettingsDebounced();
@@ -872,4 +941,4 @@ jQuery(function () {
});
$('#novelai_logit_bias_new_entry').on('click', () => createNewLogitBiasEntry(nai_settings.logit_bias, BIAS_KEY));
});
}
+115 -412
View File
File diff suppressed because it is too large Load Diff
+80 -24
View File
@@ -26,7 +26,7 @@ import { PAGINATION_TEMPLATE, clearInfoBlock, debounce, delay, download, ensureI
import { debounce_timeout } from './constants.js';
import { FILTER_TYPES, FilterHelper } from './filters.js';
import { groups, selected_group } from './group-chats.js';
import { POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
import { t } from './i18n.js';
import { openWorldInfoEditor, world_names } from './world-info.js';
import { renderTemplateAsync } from './templates.js';
@@ -37,6 +37,7 @@ import { SlashCommandNamedArgument, ARGUMENT_TYPE, SlashCommandArgument } from '
import { commonEnumProviders } from './slash-commands/SlashCommandCommonEnumsProvider.js';
import { SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
import { isFirefox } from './browser-fixes.js';
/**
* @typedef {object} PersonaConnection A connection between a character and a character or group entity
@@ -124,7 +125,7 @@ function reloadUserAvatar(force = false) {
}
if ($(this).attr('is_user') == 'true' && $(this).attr('force_avatar') == 'false') {
avatarImg.attr('src', getUserAvatar(user_avatar));
avatarImg.attr('src', getThumbnailUrl('persona', user_avatar));
}
});
}
@@ -179,20 +180,18 @@ function verifyPersonaSearchSortRule() {
* @returns {JQuery<HTMLElement>} Avatar block
*/
function getUserAvatarBlock(avatarId) {
const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
const template = $('#user_avatar_template .avatar-container').clone();
const personaName = power_user.personas[avatarId];
const personaDescription = power_user.persona_descriptions[avatarId]?.description;
const personaTitle = power_user.persona_descriptions[avatarId]?.title;
template.find('.ch_name').text(personaName || '[Unnamed Persona]');
template.find('.ch_description').text(personaDescription || $('#user_avatar_block').attr('no_desc_text')).toggleClass('text_muted', !personaDescription);
template.find('.ch_additional_info').text(personaTitle || '');
template.attr('data-avatar-id', avatarId);
template.find('.avatar').attr('data-avatar-id', avatarId).attr('title', avatarId);
template.toggleClass('default_persona', avatarId === power_user.default_persona);
let avatarUrl = getUserAvatar(avatarId);
if (isFirefox) {
avatarUrl += '?t=' + Date.now();
}
const avatarUrl = getThumbnailUrl('persona', avatarId, isFirefox());
template.find('img').attr('src', avatarUrl);
// Make sure description block has at least three rows. Otherwise height looks inconsistent. I don't have a better idea for this.
@@ -212,7 +211,7 @@ function getUserAvatarBlock(avatarId) {
function addMissingPersonas(avatarsList) {
for (const persona of avatarsList) {
if (!power_user.personas[persona]) {
initPersona(persona, '[Unnamed Persona]', '');
initPersona(persona, '[Unnamed Persona]', '', '');
}
}
}
@@ -318,12 +317,9 @@ async function uploadUserAvatar(url, name) {
formData.append('overwrite_name', name);
}
const headers = getRequestHeaders();
delete headers['Content-Type'];
await fetch('/api/avatars/upload', {
method: 'POST',
headers: headers,
headers: getRequestHeaders({ omitContentType: true }),
cache: 'no-cache',
body: formData,
});
@@ -369,12 +365,9 @@ async function changeUserAvatar(e) {
formData.set('avatar', convertedFile);
}
const headers = getRequestHeaders();
delete headers['Content-Type'];
const response = await fetch(url, {
method: 'POST',
headers: headers,
headers: getRequestHeaders({ omitContentType:true }),
cache: 'no-cache',
body: formData,
});
@@ -386,6 +379,7 @@ async function changeUserAvatar(e) {
const name = formData.get('overwrite_name');
if (name) {
await fetch(getUserAvatar(String(name)), { cache: 'no-cache' });
await fetch(getThumbnailUrl('persona', String(name)), { cache: 'no-cache' });
reloadUserAvatar(true);
}
@@ -417,23 +411,32 @@ export async function createPersona(avatarId) {
const personaDescription = await Popup.show.input(t`Enter a description for this persona:`, t`You can always add or change it later.`, '', { rows: 4 });
initPersona(avatarId, personaName, personaDescription);
initPersona(avatarId, personaName, personaDescription, '');
if (power_user.persona_show_notifications) {
toastr.success(t`You can now pick ${personaName} as a persona in the Persona Management menu.`, t`Persona Created`);
}
}
async function createDummyPersona() {
const personaName = await Popup.show.input(t`Enter a name for this persona:`, null);
const popup = new Popup(t`Enter a name for this persona:`, POPUP_TYPE.INPUT, '', {
customInputs: [{
id: 'persona_title',
type: 'text',
label: t`Persona Title (optional, display only)`,
}],
});
if (!personaName) {
const personaName = await popup.show();
const personaTitle = String(popup.inputResults.get('persona_title') || '').trim();
if (!personaName || typeof personaName !== 'string') {
console.debug('User cancelled creating dummy persona');
return;
}
// Date + name (only ASCII) to make it unique
const avatarId = `${Date.now()}-${personaName.replace(/[^a-zA-Z0-9]/g, '')}.png`;
initPersona(avatarId, personaName, '');
initPersona(avatarId, personaName, '', personaTitle);
await uploadUserAvatar(default_user_avatar, avatarId);
}
@@ -442,9 +445,10 @@ async function createDummyPersona() {
* @param {string} avatarId User avatar id
* @param {string} personaName Name for the persona
* @param {string} personaDescription Optional description for the persona
* @param {string} personaTitle Optional title for the persona
* @returns {void}
*/
export function initPersona(avatarId, personaName, personaDescription) {
export function initPersona(avatarId, personaName, personaDescription, personaTitle) {
power_user.personas[avatarId] = personaName;
power_user.persona_descriptions[avatarId] = {
description: personaDescription || '',
@@ -452,6 +456,7 @@ export function initPersona(avatarId, personaName, personaDescription) {
depth: DEFAULT_DEPTH,
role: DEFAULT_ROLE,
lorebook: '',
title: personaTitle || '',
};
saveSettingsDebounced();
@@ -508,6 +513,7 @@ export async function convertCharacterToPersona(characterId = null) {
depth: DEFAULT_DEPTH,
role: DEFAULT_ROLE,
lorebook: '',
title: '',
};
// If the user is currently using this persona, update the description
@@ -731,6 +737,41 @@ export function autoSelectPersona(name) {
return false;
}
/**
* Edits the title of a persona based on the input from a popup.
* @param {Popup} popup Popup instance
* @param {string} avatarId Avatar ID of the persona to edit
* @param {string} currentTitle Current title of the persona
*/
async function editPersonaTitle(popup, avatarId, currentTitle) {
if (popup.result !== POPUP_RESULT.AFFIRMATIVE) {
return;
}
if (!power_user.persona_descriptions[avatarId]) {
console.warn('Uninitialized persona descriptor for avatar:', avatarId);
return;
}
const newTitle = String(popup.inputResults.get('persona_title') || '').trim();
if (!newTitle && currentTitle) {
console.log(`Removed persona title for ${avatarId}`);
delete power_user.persona_descriptions[avatarId].title;
await getUserAvatars(true, avatarId);
saveSettingsDebounced();
return;
}
if (newTitle !== currentTitle) {
power_user.persona_descriptions[avatarId].title = newTitle;
console.log(`Updated persona title for ${avatarId} to ${newTitle}`);
await getUserAvatars(true, avatarId);
saveSettingsDebounced();
return;
}
}
/**
* Renames the persona with the given avatar ID by showing a popup to enter a new name.
* @param {string} avatarId - ID of the avatar to rename
@@ -738,7 +779,17 @@ export function autoSelectPersona(name) {
*/
async function renamePersona(avatarId) {
const currentName = power_user.personas[avatarId];
const newName = await Popup.show.input(t`Rename Persona`, t`Enter a new name for this persona:`, currentName);
const currentTitle = power_user.persona_descriptions[avatarId]?.title || '';
const newName = await Popup.show.input(t`Rename Persona`, t`Enter a new name for this persona:`, currentName, {
customInputs: [{
id: 'persona_title',
type: 'text',
label: t`Persona Title (optional, display only)`,
defaultState: currentTitle,
}],
onClose: (popup) => editPersonaTitle(popup, avatarId, currentTitle),
});
if (!newName || newName === currentName) {
console.debug('User cancelled renaming persona or name is unchanged');
return false;
@@ -795,6 +846,7 @@ async function selectCurrentPersona({ toastPersonaNameChange = true } = {}) {
role: DEFAULT_ROLE,
lorebook: '',
connections: [],
title: '',
};
}
@@ -941,6 +993,7 @@ async function lockPersona(type = 'chat') {
role: DEFAULT_ROLE,
lorebook: '',
connections: [],
title: '',
};
}
@@ -1062,6 +1115,7 @@ function onPersonaDescriptionInput() {
depth: Number($('#persona_depth_value').val()),
role: Number($('#persona_depth_role').find(':selected').val()),
lorebook: '',
title: '',
};
power_user.persona_descriptions[user_avatar] = object;
}
@@ -1168,6 +1222,7 @@ function getOrCreatePersonaDescriptor() {
role: power_user.persona_description_role,
lorebook: power_user.persona_description_lorebook,
connections: [],
title: '',
};
power_user.persona_descriptions[user_avatar] = object;
}
@@ -1657,7 +1712,7 @@ async function syncUserNameToPersona() {
for (const mes of chat) {
if (mes.is_user) {
mes.name = name1;
mes.force_avatar = getUserAvatar(user_avatar);
mes.force_avatar = getThumbnailUrl('persona', user_avatar);
}
}
@@ -1706,6 +1761,7 @@ async function duplicatePersona(avatarId) {
depth: descriptor?.depth ?? DEFAULT_DEPTH,
role: descriptor?.role ?? DEFAULT_ROLE,
lorebook: descriptor?.lorebook ?? '',
title: descriptor?.title ?? '',
};
await uploadUserAvatar(getUserAvatar(avatarId), newAvatarId);
@@ -1721,7 +1777,7 @@ async function migrateNonPersonaUser() {
return;
}
initPersona(user_avatar, name1, '');
initPersona(user_avatar, name1, '', '');
setPersonaDescription();
await getUserAvatars(true, user_avatar);
}
+1 -1
View File
@@ -293,7 +293,7 @@ export class Popup {
label.setAttribute('for', input.id);
const inputElement = document.createElement('input');
inputElement.classList.add('text_pole');
inputElement.classList.add('text_pole', 'result-control');
inputElement.type = 'text';
inputElement.id = input.id;
inputElement.value = String(input.defaultState ?? '');
+99 -75
View File
@@ -25,6 +25,7 @@ import {
setActiveCharacter,
entitiesFilter,
doNewChat,
online_status,
messageFormatting,
} from '../script.js';
import { isMobile, initMovingUI, favsToHotswap } from './RossAscends-mods.js';
@@ -37,6 +38,7 @@ import {
loadInstructMode,
names_behavior_types,
selectInstructPreset,
updateBindModelTemplatesState,
} from './instruct-mode.js';
import { getTagsList, tag_import_setting, tag_map, tags } from './tags.js';
@@ -44,7 +46,7 @@ import { tokenizers } from './tokenizers.js';
import { BIAS_CACHE } from './logit-bias.js';
import { renderTemplateAsync } from './templates.js';
import { countOccurrences, debounce, delay, download, getFileText, getStringHash, isOdd, isTrueBoolean, onlyUnique, resetScrollHeight, shuffle, sortMoments, stringToRange, timestampToMoment } from './utils.js';
import { countOccurrences, debounce, delay, download, getFileText, getSanitizedFilename, getStringHash, isOdd, isTrueBoolean, onlyUnique, resetScrollHeight, shuffle, sortMoments, stringToRange, timestampToMoment } from './utils.js';
import { FILTER_TYPES } from './filters.js';
import { PARSER_FLAG, SlashCommandParser } from './slash-commands/SlashCommandParser.js';
import { SlashCommand } from './slash-commands/SlashCommand.js';
@@ -57,18 +59,7 @@ import { loadSystemPrompts } from './sysprompt.js';
import { fuzzySearchCategories } from './filters.js';
import { accountStorage } from './util/AccountStorage.js';
import { DEFAULT_REASONING_TEMPLATE, loadReasoningTemplates } from './reasoning.js';
export {
loadPowerUserSettings,
loadMovingUIState,
collapseNewlines,
playMessageSound,
fixMarkdown,
power_user,
send_on_enter_options,
getContextSettings,
applyPowerUserSettings,
};
import { bindModelTemplates } from './chat-templates.js';
export const toastPositionClasses = [
'toast-top-left',
@@ -105,7 +96,7 @@ export const chat_styles = {
DOCUMENT: 2,
};
const send_on_enter_options = {
export const send_on_enter_options = {
DISABLED: -1,
AUTO: 0,
ENABLED: 1,
@@ -123,7 +114,7 @@ export const persona_description_positions = {
NONE: 9,
};
let power_user = {
export const power_user = {
charListGrid: false,
tokenizer: tokenizers.BEST_MATCH,
token_padding: 64,
@@ -243,7 +234,6 @@ let power_user = {
macro: true,
names_behavior: names_behavior_types.FORCE,
activation_regex: '',
derived: false,
bind_to_context: false,
user_alignment_message: '',
system_same_as_user: false,
@@ -260,8 +250,13 @@ let power_user = {
names_as_stop_strings: true,
},
instruct_derived: false,
context_derived: false,
context_size_derived: false,
/** User-defined model identifier / chat template hash to instruct/context template mappings */
model_templates_mappings: {},
/** The chat template hash of the currently loaded model, if any; used when deriving mappings */
chat_template_hash: '',
sysprompt: {
enabled: true,
@@ -363,7 +358,7 @@ const debug_functions = [];
const setHotswapsDebounced = debounce(favsToHotswap);
function playMessageSound() {
export function playMessageSound() {
if (!power_user.play_message_sound) {
return;
}
@@ -388,7 +383,7 @@ function playMessageSound() {
* @example
* collapseNewlines("\n\n\n"); // "\n"
*/
function collapseNewlines(x) {
export function collapseNewlines(x) {
return x.replaceAll(/\n+/g, '\n');
}
@@ -409,7 +404,7 @@ function collapseNewlines(x) {
* // and you HAVE to handle the cases where multiple pairs of asterisks exist in the same line
* "^example * text* * harder problem *\n" // "^example *text* *harder problem*\n"
*/
function fixMarkdown(text, forDisplay) {
export function fixMarkdown(text, forDisplay) {
// Find pairs of formatting characters and capture the text in between them
const format = /([*_]{1,2})([\s\S]*?)\1/gm;
let matches = [];
@@ -855,13 +850,13 @@ async function CreateZenSliders(elmnt) {
})
//trigger slider changes when user clicks away
.on('mouseup blur', function () {
let manualInput = parseFloat(handle.text()).toFixed(decimals);
let manualInput = parseFloat(parseFloat(handle.text()).toFixed(decimals));
if (isManualInput) {
//disallow manual inputs outside acceptable range
if (manualInput >= sliderMin && manualInput <= sliderMax) {
//if value is ok, assign to slider and update handle text and position
newSlider.val(manualInput);
handleSlideEvent.call(newSlider, null, { value: parseFloat(manualInput) }, 'manual');
handleSlideEvent.call(newSlider, null, { value: manualInput }, 'manual');
valueBeforeManualInput = manualInput;
} else {
//if value not ok, warn and reset to last known valid value
@@ -883,13 +878,13 @@ async function CreateZenSliders(elmnt) {
function handleSlideEvent(event, ui, type) {
var handle = $(this).find('.ui-slider-handle');
var numVal = Number(ui.value).toFixed(decimals);
offVal = Number(offVal).toFixed(decimals);
allVal = Number(allVal).toFixed(decimals);
var numVal = parseFloat(Number(ui.value).toFixed(decimals));
offVal = parseFloat(Number(offVal).toFixed(decimals));
allVal = parseFloat(Number(allVal).toFixed(decimals));
console.log(numVal, sliderMin, sliderMax, numVal > sliderMax, numVal < sliderMin);
if (numVal > sliderMax) { numVal = sliderMax; }
if (numVal < sliderMin) { numVal = sliderMin; }
var stepNumber = ((ui.value - sliderMin) / stepScale).toFixed(0);
var stepNumber = parseFloat(((ui.value - sliderMin) / stepScale).toFixed(0));
var handleText = (ui.value);
var leftMargin = (stepNumber / numSteps) * 50 * -1;
var perStepPercent = 1 / numSteps; //how far in % each step should be on the slider
@@ -970,24 +965,23 @@ function switchSpoilerMode() {
$('#descriptionWrapper').hide();
$('#firstMessageWrapper').hide();
$('#spoiler_free_desc').addClass('flex1');
$('#creator_notes_spoiler').show();
$('#creators_note_desc_hidden').show();
}
else {
$('#descriptionWrapper').show();
$('#firstMessageWrapper').show();
$('#spoiler_free_desc').removeClass('flex1');
$('#creator_notes_spoiler').hide();
$('#creators_note_desc_hidden').hide();
}
}
function peekSpoilerMode() {
$('#descriptionWrapper').toggle();
$('#firstMessageWrapper').toggle();
$('#creator_notes_spoiler').toggle();
$('#spoiler_free_desc').toggleClass('flex1');
$('#creators_note_desc_hidden').toggle();
}
function switchMovingUI() {
$('.drawer-content.maximized').each(function () {
$(this).find('.inline-drawer-maximize').trigger('click');
@@ -1028,10 +1022,9 @@ function applyAvatarStyle() {
}
function applyChatDisplay() {
if (!power_user.chat_display === (null || undefined)) {
if ([null, undefined].includes(power_user.chat_display)) {
console.debug('applyChatDisplay: saw no chat display type defined');
return;
power_user.chat_display = chat_styles.DEFAULT;
}
console.debug(`poweruser.chat_display ${power_user.chat_display}`);
$('#chat_display').val(power_user.chat_display).prop('selected', true);
@@ -1410,7 +1403,7 @@ async function showDebugMenu() {
callGenericPopup(template, POPUP_TYPE.TEXT, '', { wide: true, large: true, allowVerticalScrolling: true });
}
function applyPowerUserSettings() {
export function applyPowerUserSettings() {
switchUiMode();
applyFontScale('forced');
applyThemeColor();
@@ -1489,7 +1482,7 @@ function getExampleMessagesBehavior() {
}
//MARK: loadPowerUser
async function loadPowerUserSettings(settings, data) {
export async function loadPowerUserSettings(settings, data) {
const defaultStscript = JSON.parse(JSON.stringify(power_user.stscript));
// Load from settings.json
if (settings.power_user !== undefined) {
@@ -1545,15 +1538,15 @@ async function loadPowerUserSettings(settings, data) {
context_presets = data.context;
}
if (power_user.chat_display === '') {
if (typeof power_user.chat_display !== 'number') {
power_user.chat_display = chat_styles.DEFAULT;
}
if (power_user.waifuMode === '') {
if (typeof power_user.waifuMode !== 'boolean') {
power_user.waifuMode = false;
}
if (power_user.chat_width === '') {
if (typeof power_user.chat_width !== 'number') {
power_user.chat_width = 50;
}
@@ -1567,6 +1560,14 @@ async function loadPowerUserSettings(settings, data) {
delete power_user.import_card_tags;
}
if (power_user?.instruct?.derived === true) {
power_user.instruct_derived = true;
delete power_user.instruct.derived;
}
// Reset the saved chat template hash
power_user.chat_template_hash = '';
$('#single_line').prop('checked', power_user.single_line);
$('#relaxed_api_urls').prop('checked', power_user.relaxed_api_urls);
$('#world_import_dialog').prop('checked', power_user.world_import_dialog);
@@ -1592,6 +1593,7 @@ async function loadPowerUserSettings(settings, data) {
$('#encode_tags').prop('checked', power_user.encode_tags);
$('#example_messages_behavior').val(getExampleMessagesBehavior());
$(`#example_messages_behavior option[value="${getExampleMessagesBehavior()}"]`).prop('selected', true);
$('#instruct_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct_derived);
$('#context_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.context_derived);
$('#context_size_derived').prop('checked', !!power_user.context_size_derived);
@@ -1602,8 +1604,8 @@ async function loadPowerUserSettings(settings, data) {
$('#auto_scroll_chat_to_bottom').prop('checked', power_user.auto_scroll_chat_to_bottom);
$('#bogus_folders').prop('checked', power_user.bogus_folders);
$('#zoomed_avatar_magnification').prop('checked', power_user.zoomed_avatar_magnification);
$(`#tokenizer option[value="${power_user.tokenizer}"]`).attr('selected', true);
$(`#send_on_enter option[value=${power_user.send_on_enter}]`).attr('selected', true);
$(`#tokenizer option[value="${power_user.tokenizer}"]`).prop('selected', true);
$(`#send_on_enter option[value=${power_user.send_on_enter}]`).prop('selected', true);
$('#confirm_message_delete').prop('checked', power_user.confirm_message_delete !== undefined ? !!power_user.confirm_message_delete : true);
$('#spoiler_free_mode').prop('checked', power_user.spoiler_free_mode);
$('#collapse-newlines-checkbox').prop('checked', power_user.collapse_newlines);
@@ -1639,8 +1641,8 @@ async function loadPowerUserSettings(settings, data) {
$('#enableZenSliders').prop('checked', power_user.enableZenSliders).trigger('input');
$('#enableLabMode').prop('checked', power_user.enableLabMode).trigger('input', { fromInit: true });
$(`input[name="avatar_style"][value="${power_user.avatar_style}"]`).prop('checked', true);
$(`#chat_display option[value=${power_user.chat_display}]`).attr('selected', true).trigger('change');
$(`#toastr_position option[value=${power_user.toastr_position}]`).attr('selected', true).trigger('change');
$(`#chat_display option[value=${power_user.chat_display}]`).prop('selected', true).trigger('change');
$(`#toastr_position option[value=${power_user.toastr_position}]`).prop('selected', true).trigger('change');
$('#chat_width_slider').val(power_user.chat_width);
$('#token_padding').val(power_user.token_padding);
$('#aux_field').val(power_user.aux_field);
@@ -1747,7 +1749,7 @@ function loadCharListState() {
document.body.classList.toggle('charListGrid', power_user.charListGrid);
}
function loadMovingUIState() {
export function loadMovingUIState() {
if (!isMobile()
&& power_user.movingUIState
&& power_user.movingUI === true) {
@@ -1837,7 +1839,7 @@ function switchMaxContextSize() {
}
// Fetch a compiled object of all preset settings
function getContextSettings() {
export function getContextSettings() {
let compiledSettings = {};
contextControls.forEach((control) => {
@@ -1910,6 +1912,7 @@ async function loadContextSettings() {
}
power_user.context.preset = name;
contextControls.forEach(control => {
const presetValue = preset[control.property] ?? control.defaultValue;
@@ -1944,6 +1947,8 @@ async function loadContextSettings() {
}
}
updateBindModelTemplatesState();
saveSettingsDebounced();
});
}
@@ -2347,7 +2352,7 @@ async function saveTheme(name = undefined, theme = undefined) {
return;
}
name = String(newName);
name = await getSanitizedFilename(String(newName));
}
if (typeof theme !== 'object') {
@@ -2378,7 +2383,7 @@ async function saveTheme(name = undefined, theme = undefined) {
}
else {
themes[themeIndex] = theme;
$(`#themes option[value="${name}"]`).attr('selected', true);
$(`#themes option[value="${name}"]`).prop('selected', true);
}
power_user.theme = name;
@@ -2458,7 +2463,7 @@ async function saveMovingUI() {
return;
}
const name = String(popupResult);
const name = await getSanitizedFilename(String(popupResult));
const movingUIPreset = {
name,
@@ -2485,7 +2490,7 @@ async function saveMovingUI() {
}
else {
movingUIPresets[movingUIPresetIndex] = movingUIPreset;
$(`#movingUIPresets option[value="${name}"]`).attr('selected', true);
$(`#movingUIPresets option[value="${name}"]`).prop('selected', true);
}
power_user.movingUIPreset = name;
@@ -3132,7 +3137,7 @@ export function forceCharacterEditorTokenize() {
$('#character_popup').trigger('input');
}
$(document).ready(() => {
jQuery(() => {
const adjustAutocompleteDebounced = debounce(() => {
$('.ui-autocomplete-input').each(function () {
const isOpen = $(this).autocomplete('widget')[0].style.display !== 'none';
@@ -3143,7 +3148,7 @@ $(document).ready(() => {
});
const reportZoomLevelDebounced = debounce(() => {
const zoomLevel = Number(window.devicePixelRatio).toFixed(2) || 1;
const zoomLevel = parseFloat(Number(window.devicePixelRatio).toFixed(2)) || 1;
const winWidth = window.innerWidth;
const winHeight = window.innerHeight;
const originalWidth = winWidth * zoomLevel;
@@ -3168,8 +3173,8 @@ $(document).ready(() => {
//attempt to scale movingUI elements naturally across window resizing/zooms
//this will still break if the zoom level causes mobile styles to come into play.
const scaleY = Number(window.innerHeight / coreTruthWinHeight).toFixed(4);
const scaleX = Number(window.innerWidth / coreTruthWinWidth).toFixed(4);
const scaleY = parseFloat(Number(window.innerHeight / coreTruthWinHeight).toFixed(4));
const scaleX = parseFloat(Number(window.innerWidth / coreTruthWinWidth).toFixed(4));
if (Object.keys(power_user.movingUIState).length > 0) {
for (var elmntName of Object.keys(power_user.movingUIState)) {
@@ -3217,7 +3222,7 @@ $(document).ready(() => {
});
// Settings that go to settings.json
$('#collapse-newlines-checkbox').change(function () {
$('#collapse-newlines-checkbox').on('change', function () {
power_user.collapse_newlines = !!$(this).prop('checked');
saveSettingsDebounced();
});
@@ -3225,7 +3230,7 @@ $(document).ready(() => {
// include newline is the child of trim sentences
// if include newline is checked, trim sentences must be checked
// if trim sentences is unchecked, include newline must be unchecked
$('#trim_sentences_checkbox').change(function () {
$('#trim_sentences_checkbox').on('change', function () {
power_user.trim_sentences = !!$(this).prop('checked');
saveSettingsDebounced();
});
@@ -3246,6 +3251,16 @@ $(document).ready(() => {
$('#context_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.context_derived);
});
$('#instruct_derived').on('input', function () {
const value = !!$(this).prop('checked');
power_user.instruct_derived = value;
saveSettingsDebounced();
});
$('#instruct_derived').on('change', function () {
$('#instruct_derived').parent().find('i').toggleClass('toggleEnabled', !!power_user.instruct_derived);
});
$('#context_size_derived').on('input', function () {
const value = !!$(this).prop('checked');
power_user.context_size_derived = value;
@@ -3256,7 +3271,15 @@ $(document).ready(() => {
$('#context_size_derived').prop('checked', !!power_user.context_size_derived);
});
$('#always-force-name2-checkbox').change(function () {
$('#bind_model_templates').on('input', function () {
if (bindModelTemplates(power_user, online_status)) {
saveSettingsDebounced();
}
});
$('#bind_model_templates').on('change', updateBindModelTemplatesState);
$('#always-force-name2-checkbox').on('change', function () {
power_user.always_force_name2 = !!$(this).prop('checked');
saveSettingsDebounced();
});
@@ -3272,7 +3295,7 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$('#chat-show-reply-prefix-checkbox').change(function () {
$('#chat-show-reply-prefix-checkbox').on('change', function () {
power_user.show_user_prompt_bias = !!$(this).prop('checked');
reloadCurrentChat();
saveSettingsDebounced();
@@ -3318,14 +3341,14 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$('#fast_ui_mode').change(function () {
$('#fast_ui_mode').on('change', function () {
power_user.fast_ui_mode = $(this).prop('checked');
switchUiMode();
saveSettingsDebounced();
});
$('#waifuMode').on('change', () => {
power_user.waifuMode = $('#waifuMode').prop('checked');
power_user.waifuMode = !!$('#waifuMode').prop('checked');
switchWaifuMode();
saveSettingsDebounced();
});
@@ -3336,13 +3359,13 @@ $(document).ready(() => {
applyCustomCSS();
});
$('#movingUImode').change(function () {
$('#movingUImode').on('change', function () {
power_user.movingUI = $(this).prop('checked');
switchMovingUI();
saveSettingsDebounced();
});
$('#noShadowsmode').change(function () {
$('#noShadowsmode').on('change', function () {
power_user.noShadows = $(this).prop('checked');
applyNoShadows();
saveSettingsDebounced();
@@ -3373,7 +3396,7 @@ $(document).ready(() => {
$('#chat_width_slider').on('input', function (e, data) {
const applyMode = data?.forced ? 'forced' : 'normal';
power_user.chat_width = Number(e.target.value);
power_user.chat_width = Number($(this).val());
applyChatWidth(applyMode);
saveSettingsDebounced();
setHotswapsDebounced();
@@ -3403,81 +3426,81 @@ $(document).ready(() => {
$('input[name="font_scale"]').on('input', async function (e, data) {
const applyMode = data?.forced ? 'forced' : 'normal';
power_user.font_scale = Number(e.target.value);
power_user.font_scale = Number($(this).val());
$('#font_scale_counter').val(power_user.font_scale);
applyFontScale(applyMode);
saveSettingsDebounced();
});
$('input[name="blur_strength"]').on('input', async function (e) {
power_user.blur_strength = Number(e.target.value);
power_user.blur_strength = Number($(this).val());
$('#blur_strength_counter').val(power_user.blur_strength);
applyBlurStrength();
saveSettingsDebounced();
});
$('input[name="shadow_width"]').on('input', async function (e) {
power_user.shadow_width = Number(e.target.value);
power_user.shadow_width = Number($(this).val());
$('#shadow_width_counter').val(power_user.shadow_width);
applyShadowWidth();
saveSettingsDebounced();
});
$('#main-text-color-picker').on('change', (evt) => {
$('#main-text-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.main_text_color = evt.detail.rgba;
applyThemeColor('main');
saveSettingsDebounced();
});
$('#italics-color-picker').on('change', (evt) => {
$('#italics-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.italics_text_color = evt.detail.rgba;
applyThemeColor('italics');
saveSettingsDebounced();
});
$('#underline-color-picker').on('change', (evt) => {
$('#underline-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.underline_text_color = evt.detail.rgba;
applyThemeColor('underline');
saveSettingsDebounced();
});
$('#quote-color-picker').on('change', (evt) => {
$('#quote-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.quote_text_color = evt.detail.rgba;
applyThemeColor('quote');
saveSettingsDebounced();
});
$('#blur-tint-color-picker').on('change', (evt) => {
$('#blur-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.blur_tint_color = evt.detail.rgba;
applyThemeColor('blurTint');
saveSettingsDebounced();
});
$('#chat-tint-color-picker').on('change', (evt) => {
$('#chat-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.chat_tint_color = evt.detail.rgba;
applyThemeColor('chatTint');
saveSettingsDebounced();
});
$('#user-mes-blur-tint-color-picker').on('change', (evt) => {
$('#user-mes-blur-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.user_mes_blur_tint_color = evt.detail.rgba;
applyThemeColor('userMesBlurTint');
saveSettingsDebounced();
});
$('#bot-mes-blur-tint-color-picker').on('change', (evt) => {
$('#bot-mes-blur-tint-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.bot_mes_blur_tint_color = evt.detail.rgba;
applyThemeColor('botMesBlurTint');
saveSettingsDebounced();
});
$('#shadow-color-picker').on('change', (evt) => {
$('#shadow-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.shadow_color = evt.detail.rgba;
applyThemeColor('shadow');
saveSettingsDebounced();
});
$('#border-color-picker').on('change', (evt) => {
$('#border-color-picker').on('change', (/** @type {ColorPickerEvent} */ evt) => {
power_user.border_color = evt.detail.rgba;
applyThemeColor('border');
saveSettingsDebounced();
@@ -3801,7 +3824,8 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$('#spoiler_free_desc_button').on('click', function () {
$('#spoiler_free_desc_button').on('click', function (e) {
e.stopPropagation();
peekSpoilerMode();
$(this).toggleClass('fa-eye fa-eye-slash');
});
@@ -3811,7 +3835,7 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$('#custom_stopping_strings_macro').change(function () {
$('#custom_stopping_strings_macro').on('change', function () {
power_user.custom_stopping_strings_macro = !!$(this).prop('checked');
saveSettingsDebounced();
});
+145 -8
View File
@@ -1,4 +1,4 @@
import { Fuse } from '../lib.js';
import { Fuse, lodash } from '../lib.js';
import {
amount_gen,
@@ -14,6 +14,7 @@ import {
novelai_setting_names,
novelai_settings,
online_status,
saveSettings,
saveSettingsDebounced,
this_chid,
} from '../script.js';
@@ -21,7 +22,7 @@ import { groups, selected_group } from './group-chats.js';
import { instruct_presets } from './instruct-mode.js';
import { kai_settings } from './kai-settings.js';
import { convertNovelPreset } from './nai-settings.js';
import { openai_settings, openai_setting_names } from './openai.js';
import { openai_settings, openai_setting_names, oai_settings } from './openai.js';
import { Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js';
import { context_presets, getContextSettings, power_user } from './power-user.js';
import { SlashCommand } from './slash-commands/SlashCommand.js';
@@ -36,7 +37,7 @@ import {
textgenerationwebui_presets,
textgenerationwebui_settings as textgen_settings,
} from './textgen-settings.js';
import { download, equalsIgnoreCaseAndAccents, getSanitizedFilename, parseJsonFile, waitUntilCondition } from './utils.js';
import { download, ensurePlainObject, equalsIgnoreCaseAndAccents, getSanitizedFilename, parseJsonFile, waitUntilCondition } from './utils.js';
import { t } from './i18n.js';
import { reasoning_templates } from './reasoning.js';
@@ -391,6 +392,9 @@ class PresetManager {
$(this.select).val(value).trigger('change');
}
/**
* Updates the preset select element with the current API presets.
*/
async updatePreset() {
const selected = $(this.select).find('option:selected');
console.log(selected);
@@ -407,6 +411,9 @@ class PresetManager {
toastr.success(successToast);
}
/**
* Saves the currently selected preset with a new name.
*/
async savePresetAs() {
const inputValue = this.getSelectedPresetName();
const popupText = !this.isAdvancedFormatting() ? '<h4>' + t`Hint: Use a character/group name to bind preset to a specific chat.` + '</h4>' : '';
@@ -423,7 +430,14 @@ class PresetManager {
toastr.success(successToast);
}
async savePreset(name, settings) {
/**
* Saves a preset with the given name and settings.
* @param {string} name Name of the preset to save
* @param {object} [settings] Settings to save as the preset. If not provided, uses the current preset settings.
* @param {object} [options] Options for saving the preset
* @param {boolean} [options.skipUpdate=false] If true, skips updating the preset list after saving.
*/
async savePreset(name, settings, { skipUpdate = false } = {}) {
if (this.apiId === 'instruct' && settings) {
await checkForSystemPromptInInstructTemplate(name, settings);
}
@@ -449,9 +463,18 @@ class PresetManager {
const data = await response.json();
name = data.name;
if (skipUpdate) {
console.debug(`Preset ${name} saved, but not updating the list`);
return;
}
this.updateList(name, preset);
}
/**
* Renames the currently selected preset.
* @param {string} newName New name for the preset
*/
async renamePreset(newName) {
const oldName = this.getSelectedPresetName();
if (equalsIgnoreCaseAndAccents(oldName, newName)) {
@@ -468,9 +491,15 @@ class PresetManager {
}
/**
* Gets a list of presets for the API.
* @param {string} [api] API ID. If not specified, uses the current API ID.
* @returns {{presets: any[], preset_names: object, settings: object}}
*/
getPresetList(api) {
let presets = [];
let preset_names = {};
let settings = {};
// If no API specified, use the current API
if (api === undefined) {
@@ -482,50 +511,69 @@ class PresetManager {
case 'kobold':
presets = koboldai_settings;
preset_names = koboldai_setting_names;
settings = kai_settings;
break;
case 'novel':
presets = novelai_settings;
preset_names = novelai_setting_names;
settings = nai_settings;
break;
case 'textgenerationwebui':
presets = textgenerationwebui_presets;
preset_names = textgenerationwebui_preset_names;
settings = textgen_settings;
break;
case 'openai':
presets = openai_settings;
preset_names = openai_setting_names;
settings = oai_settings;
break;
case 'context':
presets = context_presets;
preset_names = context_presets.map(x => x.name);
settings = power_user.context;
break;
case 'instruct':
presets = instruct_presets;
preset_names = instruct_presets.map(x => x.name);
settings = power_user.instruct;
break;
case 'sysprompt':
presets = system_prompts;
preset_names = system_prompts.map(x => x.name);
settings = power_user.sysprompt;
break;
case 'reasoning':
presets = reasoning_templates;
preset_names = reasoning_templates.map(x => x.name);
settings = power_user.reasoning;
break;
default:
console.warn(`Unknown API ID ${api}`);
}
return { presets, preset_names };
return { presets, preset_names, settings };
}
/**
* Returns true if the API is keyed, meaning it uses a name to identify presets.
*/
isKeyedApi() {
return this.apiId == 'textgenerationwebui' || this.isAdvancedFormatting();
}
/**
* Returns true if the API is from Advanced Formatting group.
*/
isAdvancedFormatting() {
return ['context', 'instruct', 'sysprompt', 'reasoning'].includes(this.apiId);
return ['context', 'instruct', 'sysprompt', 'reasoning'].includes(this.apiId);
}
/**
* Updates the preset list with a new or existing preset.
* @param {string} name Name of the preset
* @param {object} preset Preset object
*/
updateList(name, preset) {
const { presets, preset_names } = this.getPresetList();
const presetExists = this.isKeyedApi() ? preset_names.includes(name) : Object.keys(preset_names).includes(name);
@@ -561,6 +609,11 @@ class PresetManager {
}
}
/**
* Gets the preset settings for the given name.
* @param {string} name Name of the preset
* @returns {object} Preset settings object for the given name
*/
getPresetSettings(name) {
function getSettingsByApiId(apiId) {
switch (apiId) {
@@ -598,6 +651,7 @@ class PresetManager {
}
const filteredKeys = [
'api_server',
'preset',
'streaming',
'truncation_length',
@@ -607,6 +661,7 @@ class PresetManager {
'can_use_tokenization',
'can_use_streaming',
'preset_settings_novel',
'preset_settings',
'streaming_novel',
'nai_preamble',
'model_novel',
@@ -653,7 +708,7 @@ class PresetManager {
}
}
if (!this.isAdvancedFormatting()) {
if (!this.isAdvancedFormatting() && this.apiId !== 'openai') {
settings['genamt'] = amount_gen;
settings['max_length'] = max_context;
}
@@ -661,6 +716,11 @@ class PresetManager {
return settings;
}
/**
* Retrieves a completion preset by name.
* @param {string} name Name of the preset to retrieve
* @returns {any} Preset object if found, otherwise undefined
*/
getCompletionPresetByName(name) {
// Retrieve a completion preset by name. Return undefined if not found.
let { presets, preset_names } = this.getPresetList();
@@ -685,7 +745,10 @@ class PresetManager {
return preset;
}
// pass no arguments to delete current preset
/**
* Deletes a preset by name. If not provided, deletes the currently selected preset.
* @param {string} [name] Name of the preset to delete.
*/
async deletePreset(name) {
const { preset_names, presets } = this.getPresetList();
const value = name ? (this.isKeyedApi() ? this.findPreset(name) : name) : this.getSelectedPreset();
@@ -726,6 +789,11 @@ class PresetManager {
return response.ok;
}
/**
* Retrieves the default preset for the API from the server.
* @param {string} name Name of the preset to restore
* @returns {Promise<any>} Default preset object, or undefined if the request fails
*/
async getDefaultPreset(name) {
const response = await fetch('/api/presets/restore', {
method: 'POST',
@@ -741,6 +809,70 @@ class PresetManager {
return await response.json();
}
/**
* Reads a preset extension field from the preset.
* @param {object} options
* @param {string} [options.name] Name of the preset. If not provided, uses the currently selected preset name.
* @param {string} options.path Path to the preset extension field, e.g. 'myextension.data'.
* @return {any} The value of the preset extension field, or null if not found.
*/
readPresetExtensionField({ name, path }) {
const { settings } = this.getPresetList();
const selectedName = this.getSelectedPresetName();
const presetName = name || selectedName;
// Read from settings if the selected preset is the same as the provided name
if (settings && selectedName === presetName) {
const settingsExtensions = ensurePlainObject(settings.extensions || {});
return lodash.get(settingsExtensions, path, null);
}
// Otherwise, read from the preset by name
const preset = this.getCompletionPresetByName(presetName);
if (!preset) {
return null;
}
const presetExtensions = ensurePlainObject(preset.extensions || {});
const value = lodash.get(presetExtensions, path, null);
return value;
}
/**
* Writes a value to a preset extension field.
* @param {object} options
* @param {string} [options.name] Name of the preset. If not provided, uses the currently selected preset name.
* @param {string} options.path Path to the preset extension field, e.g. 'myextension.data'.
* @param {any} options.value Value to write to the preset extension field.
* @return {Promise<void>} Resolves when the preset is saved.
*/
async writePresetExtensionField({ name, path, value }) {
const { settings } = this.getPresetList();
const selectedName = this.getSelectedPresetName();
const presetName = name || selectedName;
// Write to settings if the selected preset is the same as the provided name
if (settings && selectedName === presetName) {
// Set the value at the specified path
settings.extensions = ensurePlainObject(settings.extensions || {});
lodash.set(settings.extensions, path, value);
await saveSettings();
}
// Also update the preset by name
const preset = this.getCompletionPresetByName(presetName);
if (!preset) {
return;
}
// Set the value at the specified path
preset.extensions = ensurePlainObject(preset.extensions || {});
lodash.set(preset.extensions, path, value);
// Save the updated preset
await this.savePreset(presetName, preset, { skipUpdate: true });
}
}
/**
@@ -903,6 +1035,9 @@ export async function initPresetManager() {
await presetManager.renamePreset(newName);
await eventSource.emit(event_types.PRESET_DELETED, { apiId: apiId, name: oldName });
await eventSource.emit(event_types.PRESET_CHANGED, { apiId: apiId, name: newName });
if (apiId === 'openai') {
// This is a horrible mess, but prevents the renamed preset from being corrupted.
$('#update_oai_preset').trigger('click');
@@ -975,6 +1110,7 @@ export async function initPresetManager() {
return;
}
const name = presetManager.getSelectedPresetName();
const result = await presetManager.deletePreset();
if (result) {
@@ -986,6 +1122,7 @@ export async function initPresetManager() {
}
saveSettingsDebounced();
await eventSource.emit(event_types.PRESET_DELETED, { apiId: apiId, name: name });
});
$(document).on('click', '[data-preset-manager-restore]', async function () {
+12 -13
View File
@@ -23,10 +23,14 @@ export const SECRET_KEYS = {
OPENAI: 'api_key_openai',
NOVEL: 'api_key_novel',
CLAUDE: 'api_key_claude',
DEEPL: 'deepl',
LIBRE: 'libre',
LIBRE_URL: 'libre_url',
LINGVA_URL: 'lingva_url',
OPENROUTER: 'api_key_openrouter',
SCALE: 'api_key_scale',
AI21: 'api_key_ai21',
SCALE_COOKIE: 'scale_cookie',
ONERING_URL: 'oneringtranslator_url',
DEEPLX_URL: 'deeplx_url',
MAKERSUITE: 'api_key_makersuite',
VERTEXAI: 'api_key_vertexai',
SERPAPI: 'api_key_serpapi',
@@ -67,9 +71,7 @@ const FRIENDLY_NAMES = {
[SECRET_KEYS.NOVEL]: 'NovelAI',
[SECRET_KEYS.CLAUDE]: 'Claude',
[SECRET_KEYS.OPENROUTER]: 'OpenRouter',
[SECRET_KEYS.SCALE]: 'Scale',
[SECRET_KEYS.AI21]: 'AI21',
[SECRET_KEYS.SCALE_COOKIE]: 'Scale (Cookie)',
[SECRET_KEYS.MAKERSUITE]: 'Google AI Studio',
[SECRET_KEYS.VERTEXAI]: 'Google Vertex AI (Express Mode)',
[SECRET_KEYS.VLLM]: 'vLLM',
@@ -104,6 +106,12 @@ const FRIENDLY_NAMES = {
[SECRET_KEYS.FALAI]: 'FAL.AI',
[SECRET_KEYS.AZURE_TTS]: 'Azure TTS',
[SECRET_KEYS.AIMLAPI]: 'AI/ML API',
[SECRET_KEYS.DEEPL]: 'DeepL',
[SECRET_KEYS.LIBRE]: 'LibreTranslate',
[SECRET_KEYS.LIBRE_URL]: 'LibreTranslate Endpoint (e.g. http://127.0.0.1:5000/translate)',
[SECRET_KEYS.LINGVA_URL]: 'Lingva Endpoint (e.g. https://lingva.ml/api/v1)',
[SECRET_KEYS.ONERING_URL]: 'OneRingTranslator Endpoint (e.g. http://127.0.0.1:4990/translate)',
[SECRET_KEYS.DEEPLX_URL]: 'DeepLX Endpoint (e.g. http://127.0.0.1:1188/translate)',
};
const INPUT_MAP = {
@@ -113,9 +121,7 @@ const INPUT_MAP = {
[SECRET_KEYS.NOVEL]: '#api_key_novel',
[SECRET_KEYS.CLAUDE]: '#api_key_claude',
[SECRET_KEYS.OPENROUTER]: '.api_key_openrouter',
[SECRET_KEYS.SCALE]: '#api_key_scale',
[SECRET_KEYS.AI21]: '#api_key_ai21',
[SECRET_KEYS.SCALE_COOKIE]: '#scale_cookie',
[SECRET_KEYS.MAKERSUITE]: '#api_key_makersuite',
[SECRET_KEYS.VERTEXAI]: '#api_key_vertexai',
[SECRET_KEYS.VLLM]: '#api_key_vllm',
@@ -127,7 +133,6 @@ const INPUT_MAP = {
[SECRET_KEYS.OOBA]: '#api_key_ooba',
[SECRET_KEYS.INFERMATICAI]: '#api_key_infermaticai',
[SECRET_KEYS.DREAMGEN]: '#api_key_dreamgen',
[SECRET_KEYS.NOMICAI]: '#api_key_nomicai',
[SECRET_KEYS.KOBOLDCPP]: '#api_key_koboldcpp',
[SECRET_KEYS.LLAMACPP]: '#api_key_llamacpp',
[SECRET_KEYS.COHERE]: '#api_key_cohere',
@@ -180,12 +185,6 @@ export function resolveSecretKey() {
}
}
if (chatCompletionSource === chat_completion_sources.SCALE) {
return chatCompletionSettings.use_alt_scale
? SECRET_KEYS.SCALE_COOKIE
: SECRET_KEYS.SCALE;
}
const [key] = Object.entries(chat_completion_sources).find(([, value]) => value === chatCompletionSource) ?? [null];
if (key && SECRET_KEYS[key]) {
return SECRET_KEYS[key];
+1 -1
View File
@@ -46,7 +46,7 @@ function createServerAutocomplete() {
select: (e, u) => selectServer(e, u, serverLabel),
minLength: 0,
})
.focus(onInputFocus); // <== show tag list on click
.on('focus', onInputFocus); // <== show tag list on click
}
function onInputFocus() {
+607 -44
View File
@@ -3,10 +3,8 @@ import { copyText, flashHighlight } from './utils.js';
import {
Generate,
UNIQUE_APIS,
activateSendButtons,
addOneMessage,
api_server,
characters,
chat,
chat_metadata,
@@ -14,6 +12,8 @@ import {
deactivateSendButtons,
default_avatar,
deleteSwipe,
displayPastChats,
duplicateCharacter,
eventSource,
event_types,
extension_prompt_roles,
@@ -21,6 +21,8 @@ import {
extractMessageBias,
generateQuietPrompt,
generateRaw,
getCurrentChatDetails,
getCurrentChatId,
getFirstDisplayedMessageId,
getThumbnailUrl,
is_send_press,
@@ -28,10 +30,14 @@ import {
name1,
name2,
neutralCharacterName,
newAssistantChat,
online_status,
reloadCurrentChat,
removeMacros,
renameCharacter,
renameChat,
saveChatConditional,
saveSettings,
saveSettingsDebounced,
sendMessageAsUser,
sendSystemMessage,
@@ -57,7 +63,7 @@ import { getRegexedString, regex_placement } from './extensions/regex/engine.js'
import { findGroupMemberId, groups, is_group_generating, openGroupById, resetSelectedGroup, saveGroupChat, selected_group, getGroupMembers } from './group-chats.js';
import { chat_completion_sources, oai_settings, promptManager } from './openai.js';
import { user_avatar } from './personas.js';
import { addEphemeralStoppingString, chat_styles, flushEphemeralStoppingStrings, power_user } from './power-user.js';
import { addEphemeralStoppingString, chat_styles, context_presets, flushEphemeralStoppingStrings, power_user } from './power-user.js';
import { SERVER_INPUTS, textgen_types, textgenerationwebui_settings } from './textgen-settings.js';
import { decodeTextTokens, getAvailableTokenizers, getFriendlyTokenizerName, getTextTokens, getTokenCountAsync, selectTokenizer } from './tokenizers.js';
import { debounce, delay, equalsIgnoreCaseAndAccents, findChar, getCharIndex, isFalseBoolean, isTrueBoolean, onlyUnique, regexFromString, showFontAwesomePicker, stringToRange, trimToEndSentence, trimToStartSentence, waitUntilCondition } from './utils.js';
@@ -80,6 +86,9 @@ import { accountStorage } from './util/AccountStorage.js';
import { SlashCommandDebugController } from './slash-commands/SlashCommandDebugController.js';
import { SlashCommandScope } from './slash-commands/SlashCommandScope.js';
import { t } from './i18n.js';
import { kai_settings } from './kai-settings.js';
import { instruct_presets, selectContextPreset, selectInstructPreset } from './instruct-mode.js';
import { debounce_timeout } from './constants.js';
export {
executeSlashCommands, executeSlashCommandsWithOptions, getSlashCommandsHelp, registerSlashCommand,
};
@@ -110,7 +119,537 @@ function closureToFilter(closure) {
};
}
/**
* @typedef {object} ConnectAPIMap
* @property {string} selected - API name (e.g. "textgenerationwebui", "openai")
* @property {string?} [button] - CSS selector for the API button
* @property {string?} [type] - API type, mostly used by text completion. (e.g. "openrouter")
* @property {string?} [source] - API source, mostly used by chat completion. (e.g. "openai")
*/
/** @type {Record<string, ConnectAPIMap>} */
export const CONNECT_API_MAP = {};
/** @type {string[]} */
export const UNIQUE_APIS = [];
function setupConnectAPIMap() {
/** @type {Record<string, ConnectAPIMap>} */
const result = {
// Default APIs not contained inside text gen / chat gen
'kobold': {
selected: 'kobold',
button: '#api_button',
},
'horde': {
selected: 'koboldhorde',
},
'novel': {
selected: 'novel',
button: '#api_button_novel',
},
'koboldcpp': {
selected: 'textgenerationwebui',
button: '#api_button_textgenerationwebui',
type: textgen_types.KOBOLDCPP,
},
// KoboldCpp alias
'kcpp': {
selected: 'textgenerationwebui',
button: '#api_button_textgenerationwebui',
type: textgen_types.KOBOLDCPP,
},
'openai': {
selected: 'openai',
button: '#api_button_openai',
source: chat_completion_sources.OPENAI,
},
// OpenAI alias
'oai': {
selected: 'openai',
button: '#api_button_openai',
source: chat_completion_sources.OPENAI,
},
// Google alias
'google': {
selected: 'openai',
button: '#api_button_openai',
source: chat_completion_sources.MAKERSUITE,
},
// OpenRouter special naming, to differentiate between chat comp and text comp
'openrouter': {
selected: 'openai',
button: '#api_button_openai',
source: chat_completion_sources.OPENROUTER,
},
'openrouter-text': {
selected: 'textgenerationwebui',
button: '#api_button_textgenerationwebui',
type: textgen_types.OPENROUTER,
},
};
// Fill connections map from textgen_types and chat_completion_sources
for (const textGenType of Object.values(textgen_types)) {
if (result[textGenType]) continue;
result[textGenType] = {
selected: 'textgenerationwebui',
button: '#api_button_textgenerationwebui',
type: textGenType,
};
}
for (const chatCompletionSource of Object.values(chat_completion_sources)) {
if (result[chatCompletionSource]) continue;
result[chatCompletionSource] = {
selected: 'openai',
button: '#api_button_openai',
source: chatCompletionSource,
};
}
Object.assign(CONNECT_API_MAP, result);
UNIQUE_APIS.push(...new Set(Object.values(CONNECT_API_MAP).map(x => x.selected)));
}
export function initDefaultSlashCommands() {
eventSource.on(event_types.CHAT_CHANGED, processChatSlashCommands);
setupConnectAPIMap();
async function enableInstructCallback() {
$('#instruct_enabled').prop('checked', true).trigger('input').trigger('change');
return '';
}
async function disableInstructCallback() {
$('#instruct_enabled').prop('checked', false).trigger('input').trigger('change');
return '';
}
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'dupe',
callback: duplicateCharacter,
helpString: 'Duplicates the currently selected character.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'api',
callback: async function (args, text) {
if (!text?.toString()?.trim()) {
for (const [key, config] of Object.entries(CONNECT_API_MAP)) {
if (config.selected !== main_api) continue;
if (config.source) {
if (oai_settings.chat_completion_source === config.source) {
return key;
} else {
continue;
}
}
if (config.type) {
if (textgenerationwebui_settings.type === config.type) {
return key;
} else {
continue;
}
}
return key;
}
console.error('FIXME: The current API is not in the API map');
return '';
}
const apiConfig = CONNECT_API_MAP[text?.toString()?.toLowerCase() ?? ''];
if (!apiConfig) {
toastr.error(t`Error: ${text} is not a valid API`);
return '';
}
let connectionRequired = false;
if (main_api !== apiConfig.selected) {
$(`#main_api option[value='${apiConfig.selected || text}']`).prop('selected', true);
$('#main_api').trigger('change');
connectionRequired = true;
}
if (apiConfig.source && oai_settings.chat_completion_source !== apiConfig.source) {
$(`#chat_completion_source option[value='${apiConfig.source}']`).prop('selected', true);
$('#chat_completion_source').trigger('change');
connectionRequired = true;
}
if (apiConfig.type && textgenerationwebui_settings.type !== apiConfig.type) {
$(`#textgen_type option[value='${apiConfig.type}']`).prop('selected', true);
$('#textgen_type').trigger('change');
connectionRequired = true;
}
if (connectionRequired && apiConfig.button) {
$(apiConfig.button).trigger('click');
}
const quiet = isTrueBoolean(args?.quiet?.toString());
const toast = quiet ? jQuery() : toastr.info(t`API set to ${text}, trying to connect..`);
try {
if (connectionRequired) {
await waitUntilCondition(() => online_status !== 'no_connection', 5000, 100);
}
console.log('Connection successful');
} catch {
console.log('Could not connect after 5 seconds, skipping.');
}
toastr.clear(toast);
return text?.toString()?.trim() ?? '';
},
returns: 'the current API',
namedArgumentList: [
SlashCommandNamedArgument.fromProps({
name: 'quiet',
description: 'Suppress the toast message on connection',
typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'false',
enumList: commonEnumProviders.boolean('trueFalse')(),
}),
],
unnamedArgumentList: [
SlashCommandArgument.fromProps({
description: 'API to connect to',
typeList: [ARGUMENT_TYPE.STRING],
enumList: Object.entries(CONNECT_API_MAP).map(([api, { selected }]) =>
new SlashCommandEnumValue(api, selected, enumTypes.getBasedOnIndex(UNIQUE_APIS.findIndex(x => x === selected)),
selected[0].toUpperCase() ?? enumIcons.default)),
}),
],
helpString: `
<div>
Connect to an API. If no argument is provided, it will return the currently connected API.
</div>
<div>
<strong>Available APIs:</strong>
<pre><code>${Object.keys(CONNECT_API_MAP).sort((a, b) => a.localeCompare(b)).join(', ')}</code></pre>
</div>
`,
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'impersonate',
callback: async function (args, prompt) {
const options = prompt?.toString()?.trim() ? { quiet_prompt: prompt.toString().trim(), quietToLoud: true } : {};
const shouldAwait = isTrueBoolean(args?.await?.toString());
const outerPromise = new Promise((outerResolve) => setTimeout(async () => {
try {
await waitUntilCondition(() => !is_send_press && !is_group_generating, 10000, 100);
} catch {
console.warn('Timeout waiting for generation unlock');
toastr.warning(t`Cannot run /impersonate command while the reply is being generated.`);
return '';
}
// Prevent generate recursion
$('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
outerResolve(new Promise(innerResolve => setTimeout(() => innerResolve(Generate('impersonate', options)), 1)));
}, 1));
if (shouldAwait) {
const innerPromise = await outerPromise;
await innerPromise;
}
return '';
}
,
aliases: ['imp'],
namedArgumentList: [
new SlashCommandNamedArgument(
'await',
'Whether to await for the triggered generation before continuing',
[ARGUMENT_TYPE.BOOLEAN],
false,
false,
'false',
),
],
unnamedArgumentList: [
new SlashCommandArgument(
'prompt', [ARGUMENT_TYPE.STRING], false,
),
],
helpString: `
<div>
Calls an impersonation response, with an optional additional prompt.
</div>
<div>
If <code>await=true</code> named argument is passed, the command will wait for the impersonation to end before continuing.
</div>
<div>
<strong>Example:</strong>
<ul>
<li>
<pre><code class="language-stscript">/impersonate What is the meaning of life?</code></pre>
</li>
</ul>
</div>
`,
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'delchat',
callback: async function () {
return displayPastChats().then(() => new Promise((resolve) => {
let resolved = false;
const timeOutId = setTimeout(() => {
toastr.error(t`Chat deletion timed out. Please try again.`);
setResolved();
}, 5000);
const setResolved = () => {
if (resolved) {
return;
}
resolved = true;
[event_types.CHAT_DELETED, event_types.GROUP_CHAT_DELETED].forEach((eventType) => {
eventSource.removeListener(eventType, setResolved);
});
clearTimeout(timeOutId);
resolve('');
};
[event_types.CHAT_DELETED, event_types.GROUP_CHAT_DELETED].forEach((eventType) => {
eventSource.on(eventType, setResolved);
});
const currentChatDeleteButton = $('.select_chat_block[highlight=\'true\']').parent().find('.PastChat_cross');
$(currentChatDeleteButton).trigger('click', { fromSlashCommand: true });
}));
},
helpString: 'Deletes the current chat.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'renamechat',
callback: async function doRenameChat(_, chatName) {
if (!chatName) {
toastr.warning(t`Name must be provided as an argument to rename this chat.`);
return '';
}
const currentChatName = getCurrentChatId();
if (!currentChatName) {
toastr.warning(t`No chat selected that can be renamed.`);
return '';
}
await renameChat(currentChatName, chatName.toString());
toastr.success(t`Successfully renamed chat to: ${chatName}`);
return '';
},
unnamedArgumentList: [
new SlashCommandArgument(
'new chat name', [ARGUMENT_TYPE.STRING], true,
),
],
helpString: 'Renames the current chat.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'getchatname',
callback: async function doGetChatName() {
return getCurrentChatDetails().sessionName;
},
returns: 'chat file name',
helpString: 'Returns the name of the current chat file into the pipe.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'closechat',
callback: function () {
$('#option_close_chat').trigger('click');
return '';
},
helpString: 'Closes the current chat.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'tempchat',
callback: () => {
return new Promise((resolve, reject) => {
const eventCallback = async (chatId) => {
if (chatId) {
return reject('Not in a temporary chat');
}
await newAssistantChat({ temporary: true });
return resolve('');
};
eventSource.once(event_types.CHAT_CHANGED, eventCallback);
$('#option_close_chat').trigger('click');
setTimeout(() => {
reject('Failed to open temporary chat');
eventSource.removeListener(event_types.CHAT_CHANGED, eventCallback);
}, debounce_timeout.relaxed);
});
},
helpString: 'Opens a temporary chat with Assistant.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'panels',
callback: function () {
$('#option_settings').trigger('click');
return '';
},
aliases: ['togglepanels'],
helpString: 'Toggle UI panels on/off',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'forcesave',
callback: async function () {
await saveSettings();
await saveChatConditional();
toastr.success('Chat and settings saved.');
return '';
},
helpString: 'Forces a save of the current chat and settings',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'instruct',
callback: async function (args, name) {
if (!name) {
return power_user.instruct.enabled || isTrueBoolean(args?.forceGet?.toString()) ? power_user.instruct.preset : '';
}
const quiet = isTrueBoolean(args?.quiet?.toString());
const instructNames = instruct_presets.map(preset => preset.name);
const fuse = new Fuse(instructNames);
const result = fuse.search(name?.toString() ?? '');
if (result.length === 0) {
!quiet && toastr.warning(t`Instruct template '${name}' not found`);
return '';
}
const foundName = result[0].item;
selectInstructPreset(foundName, { quiet: quiet });
return foundName;
},
returns: 'current template',
namedArgumentList: [
SlashCommandNamedArgument.fromProps({
name: 'quiet',
description: 'Suppress the toast message on template change',
typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'false',
enumList: commonEnumProviders.boolean('trueFalse')(),
}),
SlashCommandNamedArgument.fromProps({
name: 'forceGet',
description: 'Force getting a name even if instruct mode is disabled',
typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'false',
enumList: commonEnumProviders.boolean('trueFalse')(),
}),
],
unnamedArgumentList: [
SlashCommandArgument.fromProps({
description: 'instruct template name',
typeList: [ARGUMENT_TYPE.STRING],
enumProvider: () => instruct_presets.map(preset => new SlashCommandEnumValue(preset.name, null, enumTypes.enum, enumIcons.preset)),
}),
],
helpString: `
<div>
Selects instruct mode template by name. Enables instruct mode if not already enabled.
Gets the current instruct template if no name is provided and instruct mode is enabled or <code>forceGet=true</code> is passed.
</div>
<div>
<strong>Example:</strong>
<ul>
<li>
<pre><code class="language-stscript">/instruct creative</code></pre>
</li>
</ul>
</div>
`,
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'instruct-on',
callback: enableInstructCallback,
helpString: 'Enables instruct mode.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'instruct-off',
callback: disableInstructCallback,
helpString: 'Disables instruct mode',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'instruct-state',
aliases: ['instruct-toggle'],
helpString: 'Gets the current instruct mode state. If an argument is provided, it will set the instruct mode state.',
unnamedArgumentList: [
SlashCommandArgument.fromProps({
description: 'instruct mode state',
typeList: [ARGUMENT_TYPE.BOOLEAN],
enumList: commonEnumProviders.boolean('trueFalse')(),
}),
],
callback: async (_args, state) => {
if (!state || typeof state !== 'string') {
return String(power_user.instruct.enabled);
}
const newState = isTrueBoolean(state);
newState ? enableInstructCallback() : disableInstructCallback();
return String(power_user.instruct.enabled);
},
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'context',
callback: async function (args, name) {
if (!name) {
return power_user.context.preset;
}
const quiet = isTrueBoolean(args?.quiet?.toString());
const contextNames = context_presets.map(preset => preset.name);
const fuse = new Fuse(contextNames);
const result = fuse.search(name?.toString() ?? '');
if (result.length === 0) {
!quiet && toastr.warning(t`Context template '${name}' not found`);
return '';
}
const foundName = result[0].item;
selectContextPreset(foundName, { quiet: quiet });
return foundName;
},
returns: 'template name',
namedArgumentList: [
SlashCommandNamedArgument.fromProps({
name: 'quiet',
description: 'Suppress the toast message on template change',
typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'false',
enumList: commonEnumProviders.boolean('trueFalse')(),
}),
],
unnamedArgumentList: [
SlashCommandArgument.fromProps({
description: 'context template name',
typeList: [ARGUMENT_TYPE.STRING],
enumProvider: () => context_presets.map(preset => new SlashCommandEnumValue(preset.name, null, enumTypes.enum, enumIcons.preset)),
}),
],
helpString: 'Selects context template by name. Gets the current template if no name is provided',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'chat-manager',
callback: () => {
$('#option_select_chat').trigger('click');
return '';
},
aliases: ['chat-history', 'manage-chats'],
helpString: 'Opens the chat manager for the current character/group.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: '?',
callback: helpCommandCallback,
@@ -1133,17 +1672,18 @@ export function initDefaultSlashCommands() {
returns: 'generated text',
namedArgumentList: [
new SlashCommandNamedArgument(
'lock', 'lock user input during generation', [ARGUMENT_TYPE.BOOLEAN], false, false, null, commonEnumProviders.boolean('onOff')(),
'lock', 'lock user input during generation', [ARGUMENT_TYPE.BOOLEAN], false, false, 'off', commonEnumProviders.boolean('onOff')(),
),
new SlashCommandNamedArgument(
'instruct', 'use instruct mode', [ARGUMENT_TYPE.BOOLEAN], false, false, 'on', commonEnumProviders.boolean('onOff')(),
),
new SlashCommandNamedArgument(
'stop', 'one-time custom stop strings', [ARGUMENT_TYPE.LIST], false,
'stop', 'one-time custom stop strings', [ARGUMENT_TYPE.LIST], false, false, '[]',
),
SlashCommandNamedArgument.fromProps({
name: 'as',
description: 'role of the output prompt',
defaultValue: 'system',
typeList: [ARGUMENT_TYPE.STRING],
enumList: [
new SlashCommandEnumValue('system', null, enumTypes.enum, enumIcons.assistant),
@@ -1151,10 +1691,16 @@ export function initDefaultSlashCommands() {
],
}),
new SlashCommandNamedArgument(
'system', 'system prompt at the start', [ARGUMENT_TYPE.STRING], false,
'system', 'system prompt at the start', [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], false,
),
new SlashCommandNamedArgument(
'length', 'API response length in tokens', [ARGUMENT_TYPE.NUMBER], false,
'prefill', 'prefill prompt at the end', [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], false,
),
new SlashCommandNamedArgument(
'length', 'API response length in tokens', [ARGUMENT_TYPE.NUMBER, ARGUMENT_TYPE.VARIABLE_NAME], false,
),
new SlashCommandNamedArgument(
'trim', 'trim {{user}} and {{char}} prefixes from the output', [ARGUMENT_TYPE.BOOLEAN], false, false, 'on', commonEnumProviders.boolean('onOff')(),
),
],
unnamedArgumentList: [
@@ -1727,13 +2273,14 @@ export function initDefaultSlashCommands() {
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'inject',
returns: 'injection ID',
callback: injectCallback,
namedArgumentList: [
SlashCommandNamedArgument.fromProps({
name: 'id',
description: 'injection ID or variable name pointing to ID',
description: 'injection ID',
typeList: [ARGUMENT_TYPE.STRING],
isRequired: true,
isRequired: false,
enumProvider: commonEnumProviders.injects,
}),
new SlashCommandNamedArgument(
@@ -1772,7 +2319,7 @@ export function initDefaultSlashCommands() {
'text', [ARGUMENT_TYPE.STRING], false,
),
],
helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries.',
helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID (will be auto-generated if not provided). Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries. Returns the injection ID.',
}));
SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'listinjects',
@@ -2448,23 +2995,17 @@ function injectCallback(args, value) {
'assistant': extension_prompt_roles.ASSISTANT,
};
const id = String(args?.id ?? '');
const id = String(args?.id ?? '') || Math.random().toString(36).substring(2);
const ephemeral = isTrueBoolean(String(args?.ephemeral ?? ''));
if (!id) {
console.warn('WARN: No ID provided for /inject command');
toastr.warning('No ID provided for /inject command');
return '';
}
const defaultPosition = 'after';
const defaultDepth = 4;
const positionValue = args?.position ?? defaultPosition;
const position = positions[positionValue] ?? positions[defaultPosition];
const depthValue = Number(args?.depth) ?? defaultDepth;
const depthValue = Number(args?.depth ?? defaultDepth);
const depth = isNaN(depthValue) ? defaultDepth : depthValue;
const roleValue = typeof args?.role === 'string' ? args.role.toLowerCase().trim() : Number(args?.role ?? extension_prompt_roles.SYSTEM);
const role = roles[roleValue] ?? roles[extension_prompt_roles.SYSTEM];
const role = roles[roleValue] ?? extension_prompt_roles.SYSTEM;
const scan = isTrueBoolean(String(args?.scan));
const filter = args?.filter instanceof SlashCommandClosure ? args.filter.rawText : null;
const filterFunction = args?.filter instanceof SlashCommandClosure ? closureToFilter(args.filter) : null;
@@ -2506,7 +3047,7 @@ function injectCallback(args, value) {
eventSource.once(event_types.GENERATION_STOPPED, unsetInject);
}
return '';
return id;
}
async function listInjectsCallback(args) {
@@ -3094,7 +3635,9 @@ async function generateRawCallback(args, value) {
const as = args?.as || 'system';
const quietToLoud = as === 'char';
const systemPrompt = resolveVariable(args?.system) || '';
const prefillPrompt = resolveVariable(args?.prefill) || '';
const length = Number(resolveVariable(args?.length) ?? 0) || 0;
const trimNames = !isFalseBoolean(args?.trim);
try {
if (lock) {
@@ -3102,7 +3645,17 @@ async function generateRawCallback(args, value) {
}
setEphemeralStopStrings(resolveVariable(args?.stop));
const result = await generateRaw(value, '', isFalseBoolean(args?.instruct), quietToLoud, systemPrompt, length);
/** @type {import('../script.js').GenerateRawParams} */
const params = {
prompt: value,
instructOverride: isFalseBoolean(args?.instruct),
quietToLoud: quietToLoud,
systemPrompt: systemPrompt,
responseLength: length,
trimNames: trimNames,
prefill: prefillPrompt,
};
const result = await generateRaw(params);
return result;
} catch (err) {
console.error('Error on /genraw generation', err);
@@ -3138,7 +3691,14 @@ async function generateCallback(args, value) {
setEphemeralStopStrings(resolveVariable(args?.stop));
const name = args?.name;
const char = findChar({ name: name });
const result = await generateQuietPrompt(value, quietToLoud, false, '', char?.name ?? name, length);
/** @type {import('../script.js').GenerateQuietPromptParams} */
const params = {
quietPrompt: value,
quietToLoud: quietToLoud,
quietName: char?.name ?? name,
responseLength: length,
};
const result = await generateQuietPrompt(params);
return result;
} catch (err) {
console.error('Error on /gen generation', err);
@@ -3387,7 +3947,7 @@ async function askCharacter(args, text) {
try {
eventSource.once(event_types.MESSAGE_RECEIVED, restoreCharacter);
toastr.info(`Asking ${name} something...`);
askResult = await Generate('ask_command');
askResult = await Generate('normal');
} catch (error) {
restoreCharacter();
console.error('Error running /ask command', error);
@@ -3558,7 +4118,7 @@ async function countGroupMemberCallback() {
return '';
}
return getGroupMembers(selected_group).length;
return String(getGroupMembers(selected_group).length);
}
async function removeGroupMemberCallback(_, arg) {
@@ -3809,7 +4369,7 @@ export async function generateSystemMessage(_, prompt) {
// Generate and regex the output if applicable
toastr.info('Please wait', 'Generating...');
let message = await generateQuietPrompt(prompt, false, false);
let message = await generateQuietPrompt({ quietPrompt: prompt });
message = getRegexedString(message, regex_placement.SLASH_COMMAND);
sendNarratorMessage(_, message);
@@ -4066,7 +4626,7 @@ export async function promptQuietForLoudResponse(who, text) {
//text = `${text}${power_user.instruct.enabled ? '' : '\n'}${(power_user.always_force_name2 && who != 'raw') ? characters[character_id].name + ":" : ""}`
let reply = await generateQuietPrompt(text, true, false);
let reply = await generateQuietPrompt({ quietPrompt: text, quietToLoud: true });
text = await getRegexedString(reply, regex_placement.SLASH_COMMAND);
const message = {
@@ -4231,7 +4791,6 @@ function getModelOptions(quiet) {
{ id: 'featherless_model', api: 'textgenerationwebui', type: textgen_types.FEATHERLESS },
{ id: 'model_openai_select', api: 'openai', type: chat_completion_sources.OPENAI },
{ id: 'model_claude_select', api: 'openai', type: chat_completion_sources.CLAUDE },
{ id: 'model_windowai_select', api: 'openai', type: chat_completion_sources.WINDOWAI },
{ id: 'model_openrouter_select', api: 'openai', type: chat_completion_sources.OPENROUTER },
{ id: 'model_ai21_select', api: 'openai', type: chat_completion_sources.AI21 },
{ id: 'model_google_select', api: 'openai', type: chat_completion_sources.MAKERSUITE },
@@ -4555,7 +5114,7 @@ async function setApiUrlCallback({ api = null, connect = 'true', quiet = 'false'
const isCurrentlyKoboldClassic = main_api === 'kobold';
if (api === 'kobold' || (!api && isCurrentlyKoboldClassic)) {
if (!url) {
return api_server ?? '';
return kai_settings.api_server ?? '';
}
if (!isCurrentlyKoboldClassic && autoConnect) {
@@ -4571,7 +5130,7 @@ async function setApiUrlCallback({ api = null, connect = 'true', quiet = 'false'
$('#api_button').trigger('click');
}
return api_server ?? '';
return kai_settings.api_server ?? '';
}
// Do some checks and get the api type we are targeting with this command
@@ -4684,18 +5243,21 @@ export function stopScriptExecution() {
*/
async function clearCommandProgress() {
if (isExecutingCommandsFromChatInput) return;
document.querySelector('#send_textarea').style.setProperty('--progDone', '1');
const ta = document.getElementById('send_textarea');
const fs = document.getElementById('form_sheld');
if (!ta || !fs) return;
ta.style.setProperty('--progDone', '1');
await delay(250);
if (isExecutingCommandsFromChatInput) return;
document.querySelector('#send_textarea').style.transition = 'none';
ta.style.transition = 'none';
await delay(1);
document.querySelector('#send_textarea').style.setProperty('--prog', '0%');
document.querySelector('#send_textarea').style.setProperty('--progDone', '0');
document.querySelector('#form_sheld').classList.remove('script_success');
document.querySelector('#form_sheld').classList.remove('script_error');
document.querySelector('#form_sheld').classList.remove('script_aborted');
ta.style.setProperty('--prog', '0%');
ta.style.setProperty('--progDone', '0');
fs.classList.remove('script_success');
fs.classList.remove('script_error');
fs.classList.remove('script_aborted');
await delay(1);
document.querySelector('#send_textarea').style.transition = null;
ta.style.transition = null;
}
/**
* Debounced version of clearCommandProgress.
@@ -4742,19 +5304,20 @@ export async function executeSlashCommandsOnChatInput(text, options = {}) {
commandsFromChatInputAbortController?.abort('processCommands was called');
activateScriptButtons();
/**@type {HTMLTextAreaElement}*/
/** @type {HTMLTextAreaElement} */
const ta = document.querySelector('#send_textarea');
const fs = document.querySelector('#form_sheld');
if (options.clearChatInput) {
ta.value = '';
ta.dispatchEvent(new Event('input', { bubbles: true }));
}
document.querySelector('#send_textarea').style.setProperty('--prog', '0%');
document.querySelector('#send_textarea').style.setProperty('--progDone', '0');
document.querySelector('#form_sheld').classList.remove('script_success');
document.querySelector('#form_sheld').classList.remove('script_error');
document.querySelector('#form_sheld').classList.remove('script_aborted');
ta.style.setProperty('--prog', '0%');
ta.style.setProperty('--progDone', '0');
fs.classList.remove('script_success');
fs.classList.remove('script_error');
fs.classList.remove('script_aborted');
/**@type {SlashCommandClosureResult} */
let result = null;
@@ -4905,7 +5468,7 @@ async function executeSlashCommandsWithOptions(text, options = {}) {
* @param {boolean} handleParserErrors Whether to handle parser errors (show toast on error) or throw
* @param {SlashCommandScope} scope The scope to be used when executing the commands.
* @param {boolean} handleExecutionErrors Whether to handle execution errors (show toast on error) or throw
* @param {{[id:PARSER_FLAG]:boolean}} parserFlags Parser flags to apply
* @param {{[id:import('./slash-commands/SlashCommandParser.js').PARSER_FLAG]:boolean}} parserFlags Parser flags to apply
* @param {SlashCommandAbortController} abortController Controller used to abort or pause command execution
* @param {(done:number, total:number)=>void} onProgress Callback to handle progress events
* @returns {Promise<SlashCommandClosureResult>}
@@ -637,6 +637,7 @@ export class SlashCommandParser {
replaceGetvar(value) {
return value.replace(/{{(get(?:global)?var)::([^}]+)}}/gi, (match, cmd, name, idx) => {
name = name.trim();
cmd = cmd.toLowerCase();
const startIdx = this.index - value.length + idx;
const endIdx = this.index - value.length + idx + match.length;
// store pipe
+2
View File
@@ -52,6 +52,7 @@ import {
getCharacterCardFields,
swipe_right,
swipe_left,
generateRaw,
} from '../script.js';
import {
extension_settings,
@@ -170,6 +171,7 @@ export function getContext() {
ModuleWorkerWrapper,
getTokenizerModel,
generateQuietPrompt,
generateRaw,
writeExtensionField,
getThumbnailUrl,
selectCharacterById,
+181
View File
@@ -0,0 +1,181 @@
import { addOneMessage, chat, displayVersion, setSendButtonState, system_avatar, systemUserName } from '../script.js';
import { t } from './i18n.js';
import { getMessageTimeStamp } from './RossAscends-mods.js';
import { getSlashCommandsHelp } from './slash-commands.js';
import { SlashCommandBrowser } from './slash-commands/SlashCommandBrowser.js';
import { renderTemplateAsync } from './templates.js';
// Initialized in getSystemMessages()
export const system_messages = {};
export const SAFETY_CHAT = [];
/**
* @enum {string} System message types
*/
export const system_message_types = {
HELP: 'help',
WELCOME: 'welcome',
EMPTY: 'empty',
GENERIC: 'generic',
NARRATOR: 'narrator',
COMMENT: 'comment',
SLASH_COMMANDS: 'slash_commands',
FORMATTING: 'formatting',
HOTKEYS: 'hotkeys',
MACROS: 'macros',
WELCOME_PROMPT: 'welcome_prompt',
ASSISTANT_NOTE: 'assistant_note',
ASSISTANT_MESSAGE: 'assistant_message',
};
export async function initSystemMessages() {
const result = {
help: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: await renderTemplateAsync('help'),
},
slash_commands: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: '',
},
hotkeys: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: await renderTemplateAsync('hotkeys'),
},
formatting: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: await renderTemplateAsync('formatting'),
},
macros: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: await renderTemplateAsync('macros'),
},
welcome:
{
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
uses_system_ui: true,
mes: await renderTemplateAsync('welcome', { displayVersion }),
},
empty: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: 'No one hears you. <b>Hint&#58;</b> add more members to the group!',
},
generic: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: 'Generic system message. User `text` parameter to override the contents',
},
welcome_prompt: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
uses_system_ui: true,
mes: await renderTemplateAsync('welcomePrompt'),
extra: {
isSmallSys: true,
},
},
assistant_note: {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
mes: await renderTemplateAsync('assistantNote'),
uses_system_ui: true,
extra: {
isSmallSys: true,
},
},
};
Object.assign(system_messages, result);
const safetyMessage = {
name: systemUserName,
force_avatar: system_avatar,
is_system: true,
is_user: false,
create_date: 0,
mes: t`You deleted a character/chat and arrived back here for safety reasons! Pick another character!`,
};
SAFETY_CHAT.splice(0, SAFETY_CHAT.length, safetyMessage);
}
/**
* Gets a system message by type.
* @param {string} type Type of system message
* @param {string} [text] Text to be sent
* @param {object} [extra] Additional data to be added to the message
* @returns {object} System message object
*/
export function getSystemMessageByType(type, text, extra = {}) {
const systemMessage = system_messages[type];
if (!systemMessage) {
return;
}
const newMessage = { ...systemMessage, send_date: getMessageTimeStamp() };
if (text) {
newMessage.mes = text;
}
if (type === system_message_types.SLASH_COMMANDS) {
newMessage.mes = getSlashCommandsHelp();
}
if (!newMessage.extra) {
newMessage.extra = {};
}
newMessage.extra = Object.assign(newMessage.extra, extra);
newMessage.extra.type = type;
return newMessage;
}
/**
* Sends a system message to the chat.
* @param {string} type Type of system message
* @param {string} [text] Text to be sent
* @param {object} [extra] Additional data to be added to the message
*/
export function sendSystemMessage(type, text, extra = {}) {
const newMessage = getSystemMessageByType(type, text, extra);
chat.push(newMessage);
addOneMessage(newMessage);
setSendButtonState(false);
if (type === system_message_types.SLASH_COMMANDS) {
const browser = new SlashCommandBrowser();
const spinner = document.querySelector('#chat .last_mes .custom-slashHelp');
const parent = spinner.parentElement;
spinner.remove();
browser.renderInto(parent);
browser.search.focus();
}
}
+187 -8
View File
@@ -136,7 +136,7 @@ const TAG_FOLDER_DEFAULT_TYPE = 'NONE';
* @property {string} [color] - The background color of the tag
* @property {string} [color2] - The foreground color of the tag
* @property {number} [create_date] - A number representing the date when this tag was created
* @property {boolean} is_hidden_on_character_card - Whether this tag is hidden on the character card
* @property {boolean} [is_hidden_on_character_card] - Whether this tag is hidden on the character card
*
* @property {function} [action] - An optional function that gets executed when this tag is an actionable tag and is clicked on.
* @property {string} [class] - An optional css class added to the control representing this tag when printed. Used for custom tags in the filters.
@@ -686,6 +686,8 @@ function selectTag(event, ui, listSelector, { tagListOptions = {} } = {}) {
addTagsToEntity(tag, characterIds, { tagListSelector: listSelector, tagListOptions: tagListOptions });
applyCharacterTagsToMessageDivs();
// need to return false to keep the input clear
return false;
}
@@ -1237,6 +1239,8 @@ function onTagRemoveClick(event) {
const characterIds = characterData ? JSON.parse(characterData).characterIds : null;
removeTagFromEntity(tag, characterIds, { tagElement: tagElement });
applyCharacterTagsToMessageDivs();
}
// @ts-ignore
@@ -1301,7 +1305,7 @@ export function createTagInput(inputSelector, listSelector, tagListOptions = {})
select: (e, u) => selectTag(e, u, listSelector, { tagListOptions: tagListOptions }),
minLength: 0,
})
.focus(onTagInputFocus); // <== show tag list on click
.on('focus', onTagInputFocus); // <== show tag list on click
}
async function onViewTagsListClick() {
@@ -1718,6 +1722,8 @@ async function onTagDeleteClick() {
printCharactersDebounced();
saveSettingsDebounced();
applyCharacterTagsToMessageDivs();
}
function onTagRenameInput() {
@@ -1728,6 +1734,8 @@ function onTagRenameInput() {
$(this).attr('dirty', '');
$(`.tag[id="${id}"] .tag_name`).text(newName);
saveSettingsDebounced();
applyCharacterTagsToMessageDivs();
}
/**
@@ -1738,7 +1746,6 @@ function onTagRenameInput() {
* @param {string} cssProperty - The CSS property to apply the color to
*/
function onTagColorize(evt, setColor, cssProperty) {
console.debug(evt);
const isDefaultColor = $(evt.target).data('default-color') === evt.detail.rgba;
$(evt.target).closest('.tag_view_color_picker').find('.link_icon').toggle(!isDefaultColor);
@@ -1749,7 +1756,6 @@ function onTagColorize(evt, setColor, cssProperty) {
$(evt.target).closest('.tag_view_item').find('.tag_view_name').css(cssProperty, newColor);
const tag = tags.find(x => x.id === id);
setColor(tag, newColor);
console.debug(tag);
saveSettingsDebounced();
// Debounce redrawing color of the tag in other elements
@@ -1855,7 +1861,8 @@ function registerTagsSlashCommands() {
}),
],
unnamedArgumentList: [
SlashCommandArgument.fromProps({ description: 'tag name',
SlashCommandArgument.fromProps({
description: 'tag name',
typeList: [ARGUMENT_TYPE.STRING],
isRequired: true,
enumProvider: commonEnumProviders.tagsForChar('not-existing'),
@@ -1892,7 +1899,8 @@ function registerTagsSlashCommands() {
return String(result);
},
namedArgumentList: [
SlashCommandNamedArgument.fromProps({ name: 'name',
SlashCommandNamedArgument.fromProps({
name: 'name',
description: 'Character name - or unique character identifier (avatar key)',
typeList: [ARGUMENT_TYPE.STRING],
defaultValue: '{{char}}',
@@ -1900,7 +1908,8 @@ function registerTagsSlashCommands() {
}),
],
unnamedArgumentList: [
SlashCommandArgument.fromProps({ description: 'tag name',
SlashCommandArgument.fromProps({
description: 'tag name',
typeList: [ARGUMENT_TYPE.STRING],
isRequired: true,
/**@param {SlashCommandExecutor} executor */
@@ -2004,6 +2013,171 @@ function registerTagsSlashCommands() {
}));
}
/**
* Function to apply character tags to message divs when rendering the chat
* @param {object} options Options for applying character tags
* @param {number|number[]} [options.mesIds=[]] An id or array of message IDs to filter by.
* If empty, all messages will be processed.
* @returns {void}
* @description This function iterates through the chat messages and applies character tags
*/
export function applyCharacterTagsToMessageDivs({ mesIds = [] } = {}) {
try {
const messagesFilter = buildMessagesFilter(mesIds);
const messages = $('#chat').children(messagesFilter);
// Clear existing tags
messages.each(function () {
const element = this; // Get the raw DOM element
for (const attr of [...element.attributes]) {
if (attr.name.startsWith('data-char-tag-') || attr.name === 'data-char-tags') {
element.removeAttribute(attr.name);
}
}
});
const tagsList = tags, characterTagData = tag_map;
if (!tagsList?.length || !characterTagData) {
return;
}
const tagNamesById = tagsList.reduce((acc, tag) => {
acc[tag.id] = tag.name;
return acc;
}, {});
const characterTagsCache = new Map();
// Iterate each message div
messages.each(function () {
const $this = $(this); // Store the jQuery object
const avatarFileName = extractCharacterAvatar($this.find('.avatar img').attr('src'));
if (!avatarFileName) {
return;
}
let tagsForCharacter = characterTagsCache.get(avatarFileName);
// If tags are NOT in the cache, compute and store them
if (!tagsForCharacter) {
const tagIds = characterTagData[avatarFileName];
if (tagIds?.length) {
const tagNames = tagIds
.map(id => tagNamesById[id])
.filter(Boolean);
if (tagNames.length) {
tagsForCharacter = {
tagNames,
joinedTagNames: tagNames
.map(name => name?.replace(/,/g, ' ')) // replace commas with spaces to avoid issues with tag names containing commas
.join(','),
};
// Add the newly computed tags to the cache
characterTagsCache.set(avatarFileName, tagsForCharacter);
}
}
}
// If we have tags (either from cache or newly computed), apply them
if (tagsForCharacter) {
applyTags($this, tagsForCharacter);
}
});
} catch (error) {
console.error('Error applying character tags to message divs:', error);
}
}
/**
* Builds a jQuery selector string to filter messages by their IDs.
* @param {number|number[]} mesIds - An id or array of message IDs to filter by.
* @returns {string} A jQuery selector string that matches messages with the specified IDs.
* If mesIds is empty, it returns '.mes' to select all messages.
* @example
* buildMessagesFilter([1, 5]); // Returns '.mes[mesid="1"],.mes[mesid="5"]'
* buildMessagesFilter([]); // Returns '.mes'
*/
function buildMessagesFilter(mesIds) {
const allMessages = '.mes';
if (!mesIds) {
return allMessages; // If no mesIds provided, select all messages
}
const mesIdsArray = Array.isArray(mesIds) ? mesIds : [mesIds];
if (mesIdsArray?.length) {
// Create a valid jQuery selector for multiple attribute values.
// Example output: '.mes[mesid="1"],.mes[mesid="5"]'
return mesIdsArray.map(id => `.mes[mesid="${id}"]`).join(',');
}
// If mesIds is empty, select all messages.
return allMessages;
}
/**
* Helper function to apply all necessary data attributes to a DOM element.
* @param {JQuery<HTMLElement>} $element - The jQuery object for the message div.
* @param {object} tagData - An object containing tag information.
* @param {string[]} tagData.tagNames - An array of tag names.
* @param {string} tagData.joinedTagNames - A comma-separated string of tag names.
*/
function applyTags($element, tagData) {
$element.attr('data-char-tags', tagData.joinedTagNames);
tagData.tagNames.forEach(tagName => {
const normalizedTagName = normalizeTagName(tagName);
if (!normalizedTagName) {
return; // Skip empty tag names
}
$element.attr(`data-char-tag-${normalizedTagName}`, '');
});
}
/**
* Normalizes a tag name by trimming, converting spaces to hyphens, replacing accented characters,
* removing special characters, and converting to lowercase.
* @param {string} name The tag name to normalize.
* @returns {string} The normalized tag name.
*/
function normalizeTagName(name) {
if (!name?.trim()) {
return '';
}
// Normalize the tag name by trimming, converting spaces to hyphens, replacing accented characters, removing special characters, and converting to lowercase
return name.trim()
.normalize('NFD') // Normalize accented characters
.replace(/[\u0300-\u036f]/g, '') // Remove diacritical marks
.replace(/[^a-zA-Z0-9\s_-]/g, '') // Remove special characters except spaces, underscores, and hyphens
.replace(/[\s_]+/g, '-') // Replace spaces and underscores with hyphens
.toLowerCase();
}
/** Extracts the character avatar file name from the avatar source URL.
* @param {string} avatarSrc The source URL of the character avatar.
* @returns {string|null} The normalized avatar file name, or null if the input is falsy or doesn't contain a valid file name.
*/
function extractCharacterAvatar(avatarSrc) {
if (!avatarSrc) {
return null;
}
try {
const url = new URL(avatarSrc, window.location.origin);
return url?.searchParams.get('file');
} catch (error) {
console.error('Unable to parse character avatar using avatarSrc', avatarSrc, error);
return null;
}
}
export function initTags() {
createTagInput('#tagInput', '#tagList', { tagOptions: { removable: true } });
createTagInput('#groupTagInput', '#groupTagList', { tagOptions: { removable: true } });
@@ -2012,7 +2186,12 @@ export function initTags() {
$(document).on('click', '#rm_button_group_chats', onGroupCreateClick);
$(document).on('click', '.tag_remove', onTagRemoveClick);
$(document).on('input', '.tag_input', onTagInput);
$(document).on('click', '.tags_view', onViewTagsListClick);
$(document).on('click', '.tags_view', function (event) {
// 1. Prevent the label from toggling the checkbox
event.preventDefault();
// 2. Open the tag view list dialog
onViewTagsListClick();
});
$(document).on('click', '.tag_delete', onTagDeleteClick);
$(document).on('click', '.tag_as_folder', onTagAsFolderClick);
$(document).on('input', '.tag_view_name', onTagRenameInput);
@@ -11,6 +11,7 @@
<li><span data-i18n="char_import_6">Direct PNG Link (refer to</span> <code>config.yaml</code><span data-i18n="char_import_7"> for allowed hosts)</span><br><span data-i18n="char_import_example">Example:</span> <tt>https://files.catbox.moe/notarealfile.png</tt></li>
<li><span data-i18n="char_import_8">RisuRealm Character (Direct Link)</span><br><span data-i18n="char_import_example">Example:</span> <tt>https://realm.risuai.net/character/3ca54c71-6efe-46a2-b9d0-4f62df23d712</tt></li>
<li><span data-i18n="char_import_9">Soulkyn Character (Direct Link)</span><br><span data-i18n="char_import_example">Example:</span> <tt>https://soulkyn.com/l/en-US/@haruka-509al</tt></li>
<li><span data-i18n="char_import_10">Perchance Character (Direct Link or UUID + .gz)</span><br><span data-i18n="char_import_example">Example:</span> <tt>https://perchance.org/ai-character-chat?data=Loreena~cb3a1b531477378db7cad0148ba62d71.gz</tt><br><span data-i18n="char_import_example">Example:</span> <tt>Loreena~cb3a1b531477378db7cad0148ba62d71.gz</tt></li>
</ul>
</div>
<small>

Some files were not shown because too many files have changed in this diff Show More