rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,630 Commits 11 Branches 89 Tags 303 MiB
Commit Graph

941 Commits

Author SHA1 Message Date
Cohee 45302e4972
Merge pull request #997 from SillyTavern/static-quick-edit 
Static quick edit
 2023-08-22 22:47:48 +03:00
Cohee fd95b79ae9 Fix auto-translate plugin. Add new event types for post-rendering 2023-08-22 22:45:12 +03:00
maver 1ea7ad2572 Update quick edit when oai preset changes 2023-08-22 20:49:54 +02:00
maver 48992d4f53 Prevent context profiler from dangling on error 2023-08-22 20:39:46 +02:00
maver 0e378d93b2 Make quick edit fields static 2023-08-22 20:37:37 +02:00
Cohee 6599717bc5 Don't be negative. Be positive 2023-08-22 20:39:14 +03:00
Cohee 16406f2698 Fix Chat Completions itemization 2023-08-22 20:34:20 +03:00
Cohee 6923044a34 Allow CFG on impersonation 2023-08-22 19:35:56 +03:00
Cohee 38a08cd887
Merge pull request #968 from bdashore3/staging 
CFG: Improvements
 2023-08-22 19:00:39 +03:00
Cohee 042c0b84a1 Add a token counter for persona descriptions 2023-08-22 18:32:18 +03:00
Cohee ea4d4a8fd6 Fix system messages using incorrect timezone 2023-08-22 18:13:03 +03:00
Cohee 7f4a47c1b0 Don't allow setting undefined variables 2023-08-22 17:52:45 +03:00
Cohee 41cc86af9f Add example extension for chat variables. Allow registering custom text processing functions for extensions 2023-08-22 17:46:37 +03:00
kingbri 25c7686462 CFG: Pass entire guidance object 
If an API doesn't use the negative prompt from generate, allow
the negative prompt to be refetched in the specific API. This
requires the full guidance scale object instead of just the number.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-22 10:17:20 -04:00
Cohee 0ffb3a8dda
Merge pull request #996 from kingbased/scale 
Alternative method for scale generations
 2023-08-22 16:41:07 +03:00
ouoertheo 56fcf1cbb8 add ready flag 2023-08-22 08:30:33 -05:00
ouoertheo 24b6261f46 add ready flag, add custom voice feature 2023-08-22 08:30:17 -05:00
based 32f9908a97 Unrelated Optimization: one slipped through. 2023-08-22 23:11:07 +10:00
based 3716fd51ef add example names to initial system prompt 2023-08-22 22:29:57 +10:00
Cohee c7ce6a4953 Move prompt itemization to HTML templates 2023-08-22 14:50:43 +03:00
Cohee 9deaec5877 More typechecks and comments 2023-08-22 14:30:49 +03:00
based ba925f388c added more options to the scale request 2023-08-22 21:29:18 +10:00
based 06902279a9 merge 2023-08-22 21:17:18 +10:00
Cohee e2bac7ec5f Add type checking and JSDoc comments to some utils 2023-08-22 13:07:24 +03:00
Cohee 2615eb8532 Extract system message templates to template files 2023-08-22 10:37:18 +03:00
Tony Ribeiro b8c051694c Handle background image with space in name. 2023-08-22 05:05:50 +02:00
Tony Ribeiro 589631c154 prototype of assets list/download extension 2023-08-22 04:51:00 +02:00
Tony Ribeiro 4cf2b73eb1 Reorganised to handle different kind of assets, starting with audio bgm/ambient. 2023-08-22 01:49:45 +02:00
Tony Ribeiro e4e0733565 Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-22 01:00:29 +02:00
Tony Ribeiro 29adb575da cleanup debug logs 2023-08-22 01:00:07 +02:00
Tony Ribeiro 9dfb70b9fc
Merge branch 'SillyTavern:staging' into staging 2023-08-22 00:55:32 +02:00
Cohee 92686d4ba8 Optimize WI editor header. Add entries search 2023-08-22 01:51:31 +03:00
Tony Ribeiro b176a1ed12 Adapted audio extension to empty bgm/ambient folder 2023-08-22 00:46:49 +02:00
Tony Ribeiro 3680e3365b
Merge branch 'SillyTavern:staging' into staging 2023-08-21 23:42:00 +02:00
Cohee 57b126bfbf Save chat completions settings to an object. Update numeric setting types 2023-08-22 00:35:46 +03:00
Tony Ribeiro 8af4d69d6b Cleanup audio module debug messages 2023-08-21 23:33:32 +02:00
Tony Ribeiro 87b9c2aebd Updated default audio extension parameters 2023-08-21 23:33:31 +02:00
Tony Ribeiro 2ecc0eb7c7 updated default ST bgm 2023-08-21 23:33:31 +02:00
Tony Ribeiro f492da671e cleaning up audio module 2023-08-21 23:33:31 +02:00
Tony Ribeiro ca9e6583c6 Moved path of defaulf bgm/ambient sounds 2023-08-21 23:33:31 +02:00
Tony Ribeiro 84e397c429 - Audio 
- refactored dynamic bgm to handle solo and group chat
        - added bgm cooldown variable, user can custom in the ui
 2023-08-21 23:33:31 +02:00
Tony Ribeiro 61827d6cf8 - RVC 
- Added user to character list for mapping
    - Audio
        - Corrected initialization of extension settings
        - reduce debug logs
    - Coqui:
        - Added user to character list for mapping
 2023-08-21 23:33:31 +02:00
Tony Ribeiro 58b33240a2 Add initialization of audio module key in extension settings. 2023-08-21 23:33:31 +02:00
Tony Ribeiro 25daa61e83 Audio module proper extension code. Dedicated Audio extension scripts. Simple UI to adjust bgm/ambient. Load bgm per character from character folder and switch audio dynamically w.r.t. expression. Ambient sound updated when background change. 2023-08-21 23:33:30 +02:00
Tony Ribeiro 8590de7229 Redesigned RVC UI for easier use and intelligibility 2023-08-21 23:33:30 +02:00
Tony Ribeiro 51fdff5ea3 Prototype of dynamic background music using expression extension 2023-08-21 23:33:30 +02:00
Tony Ribeiro c39e4ce274 Prototype of RVC+classification pipeline 2023-08-21 23:33:30 +02:00
Cohee f5624d4392 Add ability to disable auto-summarization 2023-08-21 23:56:22 +03:00
Cohee e199d3e5b5 #991 Increase Horde waiting timeout 2023-08-21 21:13:22 +03:00
Cohee 069a07a139 Add pagination for WI entries #964 2023-08-21 21:10:11 +03:00
city-unit 189895bd01 Just added uploading via drag/drop 2023-08-21 12:16:10 -04:00
city-unit c7d9eb39f5 Remove img filter, move file loader to utils 2023-08-21 11:21:32 -04:00
Cohee 4a30875030 #964 Move WI token counting func into module scope 2023-08-21 18:16:40 +03:00
Cohee 05d719107f Move total token counter. Tighten the UI 2023-08-21 17:00:28 +03:00
Cohee c735bf546a Add token counters for individual fields. Optimize total counter display 2023-08-21 15:32:27 +03:00
Cohee 1da5ea5280 #988 Experimental fix for 11labs 2023-08-21 14:40:38 +03:00
city-unit 7177fec50c Refactor 2023-08-21 00:55:28 -04:00
city-unit 3f04a5bfa0 Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/exorcism 2023-08-21 00:47:35 -04:00
city-unit 82adc4c780 Merge branch 'feature/exorcism' of https://github.com/city-unit/SillyTavern into feature/exorcism 2023-08-21 00:46:47 -04:00
city-unit 18e6d3ad17 A gallery viewer, powered by nanogallery2. 2023-08-21 00:46:25 -04:00
city-unit 0d7d68d9dc Err the actual lib 2023-08-21 00:44:55 -04:00
city-unit bbc476b839 Add gallery libs (can move to libs) 2023-08-21 00:44:18 -04:00
kingbri 60faaf1831 CFG: NAI fixes 
NAI does CFG differently, so add special cases for them. Also gate
CFG access to only work on textgenwebui since that's where it's
implemented.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-20 19:58:17 -04:00
Cohee 4ea9e481a8
Merge branch 'staging' into staging 2023-08-21 01:51:12 +03:00
Cohee 724e789509 Don't auto-enable instruct mode on regex match 2023-08-21 01:28:58 +03:00
Cohee 897ad28477 Apply preset manager for instruct presets 2023-08-21 00:56:53 +03:00
kingbri ad2be21531 Generate: Fix appends on continue 
Continue was in a semi-working state. However, the generated prompt
by continue was a mess and didn't remove essential parts such as
character name and prompt bias. This caused duplication and bad
generations.

Now, append the prompt bias after the CFG has been appended and then
clean up the continued cache before adding it to the final prompt.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-20 17:36:35 -04:00
Cohee 8bb59a9e22 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-20 23:33:26 +03:00
Cohee 6738ffe2a4 Add auto-select for instruct presets. Re-organize instruct mode code. Prepare for preset manager integration 2023-08-20 23:29:43 +03:00
Cohee 013a0a56b4
Merge pull request #983 from StefanDanielSchwarz/simple-proxy-for-tavern-replacement-enhanced 
Simple proxy for tavern replacement enhanced
 2023-08-20 23:27:33 +03:00
Stefan Daniel Schwarz f5d5b2f749 Format instruct mode examples 2023-08-20 22:03:45 +02:00
Cohee 01cdcfa198 Remove substitutions in extensions where not necessary 2023-08-20 21:37:17 +03:00
maver cb5b410daf Fix group nudge causing error 2023-08-20 20:18:10 +02:00
maver c3c99c534e Do not populate tokenHandlers legacy entries. 2023-08-20 19:58:04 +02:00
maver ea72584f39 Add elvis to getTokens when populating legacy context. 2023-08-20 19:46:46 +02:00
Cohee 065dffa8a4 Use CSS for fav group candidate coloring 2023-08-20 19:47:14 +03:00
Cohee be6fedd626 Simplify Claude prefill code 2023-08-20 19:26:49 +03:00
Cohee 6e6eb8f61e Use CSS class for coloring 2023-08-20 19:09:19 +03:00
Cohee a27bef8b12 Merge branch 'staging' into qolfeatures 2023-08-20 18:47:43 +03:00
Cohee c2c0007ad1
Merge pull request #982 from SillyTavern/prompt-manager-hotfix 
Prompt manager hotfix
 2023-08-20 18:41:09 +03:00
Cohee cf6a76929d WI skill issue 2023-08-20 18:32:02 +03:00
maver a99c543b9f Fix render function when no character is selected 2023-08-20 16:37:39 +02:00
maver 07c24f363f Render prompt manager before a character is selected 
When prompt order strategy is global
 2023-08-20 16:28:42 +02:00
maver 59179f6c70 Use strict mode for prompt manager 
Should already be the case since it's a module but let's me specific
 2023-08-20 16:28:22 +02:00
Stefan Daniel Schwarz 2fb86c8ebd Added Persona Description and System Prompt to Story String 2023-08-20 16:08:54 +02:00
maver 58ab266365 Make sure new example chat is not added without messages 2023-08-20 15:53:42 +02:00
maver 5fee1f6f96 Add group nudge to prompts array 2023-08-20 15:35:15 +02:00
maver 58a018deae Check if newExample can be afforded before adding it 2023-08-20 15:35:01 +02:00
Cohee efa0f12349 Fix prompt manager issues 2023-08-20 16:25:16 +03:00
Cohee 9d495d6b47
Merge pull request #981 from SillyTavern/hotfix-prompt-manager 
Hotfix prompt manager
 2023-08-20 15:38:54 +03:00
based 7ecc0295dc scale cookie method 2023-08-20 20:55:37 +10:00
Cohee 106f7afdcb Slight performance increase for opening large World Infos 2023-08-20 13:15:02 +03:00
Cohee b44c72c639
Merge pull request #979 from Halsey1006/staging 
NAI instruct prompt handling
 2023-08-20 12:44:33 +03:00
Cohee 94754af013 Reformat code 2023-08-20 12:37:38 +03:00
Cohee 84e5a63c34 Fix SD group gen bugs 2023-08-20 12:29:20 +03:00
Cohee 692c1a5e60 Fix background SD gens 2023-08-20 12:16:29 +03:00
kingbri ac319dbd30 CFG: Add positive prompt support and fixes 
Positive prompts are the opposite of negative prompts. This helps
make the mixing process more accurate by keeping the negative differences
as close as possible to the positive ones by including this prompt.

In addition, fix prompt insertion order at a depth of 0 by hijacking
the same function used for Author's Note as a zero depth anchor.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-20 02:22:23 -04:00
Halsey1006 25b337f124
Update nai-settings.js 
Does not add curly braces if Novel AI instruct format is already present in the supplied prompt.
 2023-08-19 23:11:53 -07:00
city-unit e8c996ff61 Move to char+timestamp for img naming. 2023-08-20 01:41:58 -04:00
kingbri 92e6c6a998 CFG: Use ST prompt builder for negatives 
Make the generate function build a negative prompt in addition to the
normal one. This allows for nonconflicting insertion with other extension
prompts and World Info.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-20 00:44:39 -04:00
city-unit f70baff95e Comment tweaks 2023-08-20 00:33:37 -04:00
city-unit 3ce8343016 Add comments and stuff 2023-08-20 00:15:57 -04:00
city-unit e76001a600 Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/exorcism 2023-08-19 23:58:11 -04:00
city-unit c1d43c9e68 Remove base64 from groups too 2023-08-19 23:53:34 -04:00
city-unit 2f09efcd7f Exorcised base64 image stuff 2023-08-19 23:01:09 -04:00
Cohee bab368e3d2 Fix auto-load not triggering from hotswaps 2023-08-19 22:22:24 +03:00
Cohee 5d1e27c820 Merge branch 'staging' of https://github.com/SillyLossy/TavernAI into staging 2023-08-19 22:03:13 +03:00
Cohee 01cb95fba8 Save and restore quick edit heights 2023-08-19 22:03:10 +03:00
RossAscends d163066a5d Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-20 03:54:32 +09:00
RossAscends 4fe74f0041 unify import/export icons on prompt manager 2023-08-20 03:54:30 +09:00
Cohee 941c67139a Fix opening groups after conversion 2023-08-19 21:44:15 +03:00
Cohee 674228a5f5 Fix character JB / prompt + Original 2023-08-19 21:36:22 +03:00
based b3377726c4 Removed unnecessary token reserve 2023-08-20 04:23:12 +10:00
Cohee 0d7c1992f3 Deep clone presets before export 2023-08-19 21:17:58 +03:00
Cohee 5cecc9fbff Scrub proxy from exported presets 
Speed-up animations.
 2023-08-19 21:13:37 +03:00
Cohee aef78c6d99 Fix group candidates search. Fix tag exclusion filter display 2023-08-19 21:08:35 +03:00
based c2a4e2e52a fix example dialogue nudge 2023-08-20 04:06:43 +10:00
based 6f12ab29f0 fixed {{group}} macro 2023-08-20 04:03:56 +10:00
based 6dc8f01ca7 readded group nudge to end of prompt (needs proper integration into prompt manager) 2023-08-20 03:50:51 +10:00
based 3df439a224 merge 2023-08-20 03:44:06 +10:00
based e0de442523 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into qolfeatures 2023-08-20 03:22:54 +10:00
based b3751efe58 Minor AI21 bug fixes 2023-08-20 03:22:38 +10:00
Cohee1207 06c7b8d7d6 [WIP] Add UI for auto-select instruct 2023-08-19 20:18:39 +03:00
based ce40780ed1 Added option to exclude assistant prefix to Claude prompt (for jailbreaks already appending Assistant:) 2023-08-20 03:09:50 +10:00
based dba685bffb Added detection for broken/deleted bookmark links, can expand on this to automatically delete broken links, but for now it just hides the icon. 2023-08-20 02:45:20 +10:00
based b56fe3e01b Made favorite characters/groups more apparent 2023-08-20 02:30:57 +10:00
based 0d694dcc32 Added power user option to remove examples 2023-08-20 02:25:07 +10:00
Cohee1207 143ebec4c6 Remove console log 2023-08-19 19:08:35 +03:00
Cohee1207 e77cded357 Code clean-up 2023-08-19 18:51:20 +03:00
Cohee 438c78574f
Merge pull request #971 from kingbased/jurassic 
AI21 Adapter
 2023-08-19 18:48:15 +03:00
based 0f21eabb6e AI21 Adapter + Tokenization implementation 2023-08-20 01:20:42 +10:00
Cohee 37fffa9930
Merge pull request #951 from SillyTavern/hotfix-prompt-manager 
Hotfix prompt manager
 2023-08-19 18:05:26 +03:00
Cohee 53dab00abe
Merge pull request #969 from StefanDanielSchwarz/end-prompt-with-newline 
End Prompt with Newline
 2023-08-19 18:04:01 +03:00
Cohee1207 6471ce2074 Clean-up uploads folder when possible 2023-08-19 17:43:56 +03:00
Cohee1207 336e27a92d Move 3rd-party scripts into /lib 2023-08-19 16:29:46 +03:00
Cohee1207 5ebd096c88 Fix auto load char 2023-08-19 16:14:25 +03:00
Cohee1207 2d61c9954b Pagination tweaks 2023-08-19 16:11:09 +03:00
maver 0084ea2461 Move sortable delay into configuration 2023-08-19 14:59:48 +02:00
Cohee1207 991ff98eaa Performance optimizations for character edit / chat opening 2023-08-19 15:58:17 +03:00
maver b0158bd72d Implement configurable prompt order strategy for prompt manager 
global and character
 2023-08-19 14:50:39 +02:00
maver cc01ee6c1c Print stack to console on chatcompletion error 2023-08-19 14:50:39 +02:00
SDS 49c6676f72
End Prompt with Newline 
This change adds a trailing newline to the instruct mode prompt when "Wrap Sequences with Newline" is on and "Include Names" is off. (When "Include Names" is on, "Wrap Sequences with Newline" is already applied before.)
 2023-08-19 13:54:09 +02:00
Cohee 3acd0a590e
Merge pull request #966 from StefanDanielSchwarz/simple-proxy-for-tavern-replacement 
Simple proxy for tavern replacement
 2023-08-19 14:35:43 +03:00
Stefan Daniel Schwarz 5e9980ea08 no space after name 2023-08-19 12:35:52 +02:00
kingbri 7191f7a8ad CFG: Add insertion depth and custom separator 
Insertion depth allows for CFG to variably inject itself into the
negative prompt. This is similar to how Author's note works.

However, this method of insertion depth conflicts with AN and
world info where negatives can be meshed between two lines
of those specific insertions.

A custom separator must be wrapped in quotes, otherwise the default
separator is a newline for negative cascading.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-19 01:29:59 -04:00
kingbri cdbca6d9fd CFG: Include the entire prompt with negative prompt 
CFG with LLMs works differently than stable diffusion. The main principle
is prompt mixing and utilizing the differences between the two prompts
rather than a full "negative prompt" of what the user doesn't want.

SillyTavern its own way of formatting a prompt sent to an LLM backend.
Therefore, take that prompt and add negatives to it.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-18 22:18:09 -04:00
Cohee 3019b889cd Filter group candidates before mapping 2023-08-19 03:22:10 +03:00
Cohee 1305f9dc4c Fix prompt manager sometimes erroring in groups with null members 2023-08-19 03:19:12 +03:00
Cohee 059647b286 Dynamically update group avatars 2023-08-19 03:13:40 +03:00
Cohee f27107e0ef Refactor and optimize group members display 2023-08-19 02:53:05 +03:00
Cohee 602c5cd791 Add pagination for characters list view 2023-08-18 23:13:15 +03:00
Stefan Daniel Schwarz 26e2b0c8fa Fix whitespace issues 2023-08-18 21:18:54 +02:00
Cohee 0f162c1803 Save Novel preamble to presets 2023-08-18 17:43:50 +03:00
Cohee b645746a99
Merge pull request #963 from deffcolony/staging 
removes width: 100% from img.expression
 2023-08-18 16:20:11 +03:00
deffcolony 33a5a026d5 removes width: 100% from img.expression 
this will fix the image resolution on mobile
 2023-08-18 15:13:41 +02:00
Cohee 08a0709186 Escape "Match whole words" regex 2023-08-18 14:54:38 +03:00
Cohee 9bd9ddb9e1 Fix expressions display 2023-08-18 14:47:59 +03:00
Cohee 02cac8db8c Disable escaping of HTML/tags in templates 2023-08-18 13:53:54 +03:00
Cohee c4d8d70103 Improve phone usability of sortable drags 2023-08-18 13:41:46 +03:00
Cohee 1e0e5225ca Fix quiet prompt generations for Novel with streaming enabled. 2023-08-18 12:56:20 +03:00
Cohee 75378eff4e #937 Add dynamic chat backgrounds generation 2023-08-18 00:41:21 +03:00
Cohee c24f636a10 Add Last output sequence setting for instruct mode 2023-08-17 23:33:27 +03:00
Cohee e147ad1e18
Merge pull request #958 from Tony-sama/staging 
Coqui api full model available (Experimental)
 2023-08-17 22:55:00 +03:00
Cohee 80092b3170 #790 Simplify local prompt formatting. Use handlebars to render story string. 2023-08-17 22:47:34 +03:00
Tony Ribeiro 16f3949e0b merging with myself :p 2023-08-17 21:39:19 +02:00
Tony Ribeiro a5c95c7151 Added full coqui-api model list available via new origin in Coqui UI: Coqui API (Experimental). Some model might not work, need to be tested. 2023-08-17 21:33:06 +02:00
Cohee 86a486be8f Adjust Novel instruction prompts for quiet generation 2023-08-17 17:40:38 +03:00
Cohee 928c8e544f Better random Ids for tags 2023-08-17 14:19:20 +03:00
Cohee 728ffd1628
Merge pull request #957 from SillyTavern/kayrabias 
Kayrabias
 2023-08-17 13:14:05 +03:00
Cohee 0b412033ba Streamline and simply Novel logit bias. Make it a part of preset 2023-08-17 13:05:22 +03:00
Cohee 50005b5617 Reformat rvc/tts plugins 2023-08-17 12:05:17 +03:00
Mike Weldon 722801bb50 Add logit biases for NovelAI 2023-08-16 22:14:04 -07:00
Tony Ribeiro 58123f5c29 Added RVC upload functionality, allow to send rvc model archive (zip/7z format) to extras, automatically installed properly on server side. 2023-08-17 04:47:41 +02:00
Tony Ribeiro a07637aa43 Coqui TTS UI, added a button to remove choosen character from the voice map. Fixed the request spam to extras when there is no local coqui model or no rvc model in extras folder. 2023-08-17 01:16:57 +02:00
Tony Ribeiro 6dce566cb9 Coqui TTS UI, corrected hiding model div when origin select is none 2023-08-16 21:31:51 +02:00
Cohee 3ab9b44700
Merge pull request #952 from Tony-sama/staging 
Coqui TTS extension added support for custom local model
 2023-08-16 21:50:44 +03:00
Cohee 1f2394cada Apply preset manager for NovelAI 2023-08-16 21:43:38 +03:00
Tony Ribeiro cd097df42f Change RVC pitch extraction "" label to "None" 2023-08-16 20:13:29 +02:00
Cohee 81ed4d8431 Reorderable samplers for Novel 2023-08-16 20:34:47 +03:00
maver db5f815632 Introduce a state lock to prompt manager render function 2023-08-16 19:28:27 +02:00
Tony Ribeiro 05504ebbb2
Merge branch 'SillyTavern:staging' into staging 2023-08-16 19:19:29 +02:00
Tony Ribeiro 735066fe10 Added Coqui TTS extension option to use local models (no language/no speakers) 2023-08-16 19:19:13 +02:00
maver 947289dffc Lock up configuration during prompt manager render 2023-08-16 19:01:09 +02:00
Cohee 99c3a09b8e Reduce unnecessary console spam 2023-08-16 18:54:52 +03:00
Cohee 1fa281b03c
Merge pull request #946 from Tony-sama/staging 
RVC extension new UI and per character settings
 2023-08-16 17:49:24 +03:00
Cohee 3682924624 Round context messages to nearest 5 for auto-adjust 2023-08-16 17:22:42 +03:00
Tony Ribeiro 9e49ad0a77
Merge branch 'SillyTavern:staging' into staging 2023-08-16 14:58:14 +02:00
Mike Weldon feb523bd01 NovelAI Kayra 1.1 update 
* Updated some presets and added Cosmic Cube
* Change defaults for NovelAI to select Clio on cold start
* Automatically change the preset to an appropriate default whenever you change the model
* Removed deprecated Top G sampler
 2023-08-15 18:52:29 -07:00
Tony Ribeiro a64130c71c Remove toastr error for character without RVC model assigned, just show it in console info to allow group chat with/withou RVC per character. 2023-08-15 21:35:07 +02:00
Tony Ribeiro 3cb2b7a4a9
Merge branch 'SillyTavern:staging' into staging 2023-08-15 21:15:45 +02:00
Tony Ribeiro 84845ae911 Updated RVC UI to allow per characters settings without manual voice map text. 2023-08-15 21:15:31 +02:00
Cohee fa35e1185e Merge branch 'release' into staging 2023-08-15 21:51:08 +03:00
Cohee 8470acda41 Add English language option 2023-08-15 21:47:49 +03:00
Cohee ba8fa8bd0c Merge branch 'release' into staging 2023-08-15 21:38:51 +03:00
Cohee eb81c4807a Add UI locale selector 2023-08-15 21:37:56 +03:00
Cohee 869478627d Add UI locale selector 2023-08-15 21:32:17 +03:00
maver 07be5588f4 Implement configurable prompt order strategy for prompt manager 
global and character
 2023-08-15 19:41:34 +02:00
maver e09a7d1e7a Print stack to console on chatcompletion error 2023-08-15 19:40:22 +02:00
Cohee e9e9421d8a Don't try to render prompt manager if group is still generating 2023-08-15 16:47:16 +03:00
Cohee 57b9a94c17 Add banned tokens for Novel 2023-08-15 15:51:14 +03:00
Cohee 2afac5aeb1 Filter null messages in array and context line appearing unprompted 2023-08-15 15:08:42 +03:00
Cohee 706be4390d Add new Claude instant model 2023-08-15 14:57:11 +03:00
joe f0d208f929 Add speed-speech due to fast processing time 2023-08-15 19:37:15 +09:00
joe 36c6f57d96 Added stop to lip sync when user stops TTS early 2023-08-15 19:25:42 +09:00
Cohee e1ea448236
Merge pull request #939 from SillyTavern/hotfix-prompt-manager 2023-08-15 09:51:14 +03:00
Mike Weldon 41ec7e5600 Many NovelAI fixes from dev guidance 
* Remove AI Module "Autoselect" and make the auto-instruct work for all modules. This is how NAI is supposed to work.
* Log the response from the API.
* Move the AI Module setting up to the top of the settings window since it isn't part of the preset.
* Refactor phrase_rep_pen to use the actual API strings.
* Clamp the maximum token length to 150 before we call the API.
* Clamp the minimum token length in the UX from 1 to 150.
* Fix bug where the preamble was not initialized on cold start.
* Get rid of extra newline before dinkus.
* Make always_force_name2 default true.
 2023-08-14 19:35:21 -07:00
maver 9fb38af838 Fix defaults getting applied when switching back to Default preset 2023-08-15 01:28:07 +02:00
maver 2bb8fa5ea1 Update quick edit textareas when prompt manager re-renders 2023-08-15 01:20:42 +02:00
maver 8f830a0928 Persist settings before applying preset 2023-08-14 23:36:06 +02:00
Cohee a92333875c Try to minimize side effects of generate dry running 2023-08-15 00:01:55 +03:00
Cohee 238b667262 Merge branch 'staging' of https://github.com/SillyLossy/TavernAI into staging 2023-08-14 22:19:17 +03:00
Cohee 3850e6b50a Replace object stores for Chroma and token cache 2023-08-14 22:19:14 +03:00
maver dbf38d359d Debounce quick edit saving 2023-08-14 20:29:07 +02:00
maver 033dc45ab9 Move quick edit ui identifiers into configuration 2023-08-14 20:29:01 +02:00
maver 6caa8a4765 Add nsfw prompt to quick edit drawer 2023-08-14 20:28:57 +02:00
maver 9543f54f8c Fix user jb/main not replacing original placeholder in character main/jb 2023-08-14 20:28:54 +02:00
Cohee edcce96a6e IndexedDB open sometime hangs forever 2023-08-14 19:40:31 +03:00
Cohee 8c759e87cf Better UI control for phrase rep pen 2023-08-14 19:00:36 +03:00
Cohee 15db16ee8d Fuzzy search for groups 2023-08-14 17:35:48 +03:00
Cohee 32745609a2
Merge pull request #936 from Tony-sama/staging 
Refactoring of Coqui TTS extension
 2023-08-14 14:00:45 +03:00
Cohee 32eb877fdb Add native presetable CFG scale for ooba 2023-08-14 13:06:20 +03:00
Cohee a0bfc67632 Add hint for CFG scale 2023-08-14 12:50:00 +03:00
Cohee d395d3d8e6 Add peek proxy password btn 2023-08-14 12:01:06 +03:00
Cohee 6da3453efc Fix example dialogue syntax 2023-08-14 11:52:58 +03:00
Tony Ribeiro f97cc5694d refresh character even when module is not detected 2023-08-14 05:14:21 +02:00
Tony Ribeiro 213099dd6d removed debug messages 2023-08-14 05:05:10 +02:00
Tony Ribeiro 5816d2d6a6 Correct typo in tts index file that cause tts provider settings to be destroyed. 2023-08-14 05:03:42 +02:00
Tony Ribeiro 40d4123f08 Correct typo in tts index file that cause tts provider settings to be destroyed. 2023-08-14 04:59:11 +02:00
Tony Ribeiro e97863a0da Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-14 04:03:34 +02:00
Tony Ribeiro c414606c81 Finished new version of coqui TTS UI. 2023-08-14 04:03:28 +02:00
Tony Ribeiro fdc9349f68
Merge branch 'SillyTavern:staging' into staging 2023-08-14 04:01:32 +02:00
city-unit f528791c4f Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/ui 2023-08-13 18:46:37 -04:00
city-unit ad04344392 Api/Model icon option 2023-08-13 18:43:16 -04:00
RossAscends 3f87874afe Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-14 05:33:48 +09:00
RossAscends 2935d98788 improved Escape hotkey logic 2023-08-14 05:33:46 +09:00
Cohee 21d8ce048c Debounce more prompt manager renderings 2023-08-13 22:48:51 +03:00
Cohee e6bf870c55 Persist token cache to indexedDb 2023-08-13 22:45:27 +03:00
Cohee 23a4705d36 Use common save settings function on WI budget cap 2023-08-13 19:50:12 +03:00
Cohee 3688bd0b04 #930 Fix WI activation via slash command 2023-08-13 19:20:00 +03:00
Cohee 43089ee06f Don't render manager on non-chat completion APIs 2023-08-13 18:47:07 +03:00
Cohee 980c65b6cf Add toastr warning 2023-08-13 18:44:32 +03:00
Cohee c0bc425c8b Debounce manager changes 2023-08-13 18:43:17 +03:00
Cohee 9b8d069e3b Apply CFG extension for Novel 2023-08-13 15:38:07 +03:00
Cohee bd3933bcbf
Merge pull request #905 from bdashore3/cfg-window 
Add CFG side panel
 2023-08-13 14:55:03 +03:00
Cohee 9615495878
Merge pull request #768 from SillyTavern/prompt-manager-cherrypicked 
Feature: Prompt manager (cherrypicked onto stage)
 2023-08-13 14:44:28 +03:00
Cohee 478bb9c59b Enable nsfw prompt by default 2023-08-13 14:41:29 +03:00
kingbri 43e91b150a CFG: Add groupchat support 
Groupchats have their CFG defined a little differently. Chat and
global CFGs are publicly accessible within the window. As a compromise,
individual character CFGs can be injected as part of each character's
prompt. However, these CFG settings need to be adjusted in the character's
individual chats which will carry over to the group.

In addition, make this character logic gated under a checkbox to
always prefer chat unless explicitly specified. Negative cascading
is still open, so individual character negatives can be included
at any time.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-12 22:52:34 -04:00
Tony Ribeiro e81f67504f
Merge branch 'SillyTavern:staging' into staging 2023-08-13 04:16:00 +02:00
Tony Ribeiro e60f91ce42 Finished unefficient full coqui pipeline, UI generated through request to extras. Need to be pruned 2023-08-13 02:18:46 +02:00
kingbri 4a21ee0337 CFG: Add ability to combine negative prompts 
This allows for flexibility with global, character, and chat negative
prompts. Combining prompts is very useful for users who want to maintain
a set of global negatives and then add extra layers on top of that. The
ordering is chat -> character -> global tags due to the specificity of
each.

The guidance scale follows the cascade of chat -> character -> global
due to being one number that is set when CFG is fired. If the guidance
scale is 1, nothing happens.

Signed-off-by: kingbri <bdashore3@proton.me>
 2023-08-12 16:25:35 -04:00
Cohee dd21091807 Selectable NovelAI module 2023-08-12 21:26:51 +03:00
maver 0f897158b9 Create a deep clone of the preset before applying 
Prevents non-primitives from causing overlapping references
 2023-08-12 19:40:01 +02:00
maver f5aa7f7970 Remove obsolete prompt manager settings object 2023-08-12 18:52:52 +02:00
maver b0860b18b8 Show tokens when inspecting a prompt 2023-08-12 18:40:39 +02:00
maver 03b8bb64fa Prevent new example chat message being added for no reason 2023-08-12 18:40:39 +02:00
maver a9fa42524d Fix prompts object reference being shared 
By deepcloning a copy
 2023-08-12 18:40:39 +02:00
maver f2c4645207 Use chatcompletion log function for token budget 2023-08-12 18:40:39 +02:00
maver 19e5502555 Remove obsolete assignment 2023-08-12 18:40:39 +02:00
maver b1254fa2ab Copy migrated preset into loaded presets 
Since this only is populated once during page load
 2023-08-12 18:40:39 +02:00
maver 7fb896ce2a Prevent preset migration from running multiple times. 2023-08-12 18:40:39 +02:00
maver a999d6e171 Fix preset migration 2023-08-12 18:40:39 +02:00
maver 5a92f72703 Add flag to preset saving, allowing to prevent triggering the UI 2023-08-12 18:40:39 +02:00
maver cd736ec682 Add message role to inspect 2023-08-12 18:40:39 +02:00
maver 280397c30b Allow inspection for all prompts 
Because, really, why not.
 2023-08-12 18:40:39 +02:00
maver 46c7e63fad Remove obsolete debugging output 2023-08-12 18:40:39 +02:00
maver cdfe3a6841 Fix user messages not being added when populating example dialogue 2023-08-12 18:40:39 +02:00
maver 35eb2dfd74 Change icon for global prompts 2023-08-12 18:40:39 +02:00
Cohee 13dc35bc98 Enable JB prompt by default 2023-08-12 18:40:39 +02:00
Cohee 09d7c3350d Minor spelling mistake 2023-08-12 18:40:39 +02:00
maver 5694fb0852 Swap detach and edit icons 2023-08-12 18:40:39 +02:00
maver a8ee723853 Always add impersonate prompt last 2023-08-12 18:40:39 +02:00
Cohee dd89009ecd Use tokenizer-specific token cache 2023-08-12 18:40:39 +02:00
maver 55cc559fd0 Render promptmanager when chatcompletion model or source change 2023-08-12 18:40:39 +02:00
maver 2805a684a8 Emit events on changing chatcompletion source or model 2023-08-12 18:40:39 +02:00
maver 1281417a97 Render prompt manager when chat history is altered 
Recounts tokens
 2023-08-12 18:40:39 +02:00
maver d82ea66664 Refactor addItem method of MessageCollection 2023-08-12 18:40:39 +02:00
maver 4100ae9e0b Do not insert authors note into main 
Since it is already present in the chat history
 2023-08-12 18:40:39 +02:00
maver d2ee6e9a12 Append quietPrompt last 2023-08-12 18:40:39 +02:00
Cohee 463f01d2a6 #870 Fix Claude in prompt manager 2023-08-12 18:40:39 +02:00
Cohee 29552ecfcf Sanitize completion names. Only send names in msg texts if names in completion is disabled 2023-08-12 18:40:39 +02:00
maver e7b29babe9 Remove obsolete characterSelected event 2023-08-12 18:40:39 +02:00
maver fd10eaf037 Close and clear popup on preset change 2023-08-12 18:40:39 +02:00
maver 1b7a1cbc4a Add quick edit drawer and fields for main and jailbreak 2023-08-12 18:40:39 +02:00
maver bd3136e114 Improve wording for prompt insertion 2023-08-12 18:40:39 +02:00
maver f5aa891962 Fix prompt manager not being draggable on mobile 
Updates jquery ui touch punch with a maintained version, fixes other instances of jquery ui sortable as well (kobold, ...)
 2023-08-12 18:40:39 +02:00
maver 38bfcf5324 Remove advanced options toggle 2023-08-12 18:40:39 +02:00
maver af81915ff3 Update existing prompts during migration 
Instead of adding new prompts for main, jailbreak and nsfw
 2023-08-12 18:40:39 +02:00
maver 222fd3429d Center globe icon 2023-08-12 18:40:39 +02:00
maver f0830e7bb4 Fix in-code documentation typo 2023-08-12 18:40:39 +02:00
maver 59afac08da Add missing in-code documentation 2023-08-12 18:40:39 +02:00
maver 05a080849c Fix edit button being shown for chat history and examples 2023-08-12 18:40:39 +02:00
maver 1e43108e5a Move inspect functionality to prompt name click 2023-08-12 18:40:39 +02:00
maver 405a680059 Add user icon for user prompts 
To be consistent with global and marker icons
 2023-08-12 18:40:39 +02:00
maver bc4befeb22 Rename prompt lists to prompt order 
Includes renaming of configuration, no functional changes
 2023-08-12 18:40:39 +02:00
maver 63d224d8af Refactor and simplify setup method for prompt manager. 2023-08-12 18:40:39 +02:00
maver ad6575887a Remove obsolete function getGroupMembers 2023-08-12 18:40:39 +02:00
maver b58ce0370d Refactor token counting after completion. Simplify code. 2023-08-12 18:40:39 +02:00
maver 57fd04b974 Refactor token counting after completion. Simplify code. 2023-08-12 18:40:39 +02:00
maver dfd49813af Refactor naming scheme for default promptmanager defaults 2023-08-12 18:40:39 +02:00
maver 4f734d12ab Use configured prefix for prompt manager classes instead of constant 2023-08-12 18:40:39 +02:00
maver 9d6cf017d2 Move main and jailbreak override from manager into openai script. 
Makes the code clearer and easier to understand
 2023-08-12 18:40:39 +02:00
maver 075c0c29f0 Refactor prepareOpenAiMessages, move prompt preparation in its own function 2023-08-12 18:40:39 +02:00
maver fc555c1be5 When a prompt is reset, also reset name and role 2023-08-12 18:40:39 +02:00
maver a921a26af5 Do not show reset button for user prompts 2023-08-12 18:40:39 +02:00
maver 7ea6e89b05 Add reset prompt support for enhance definitions 2023-08-12 18:40:39 +02:00
maver b2acc9eb0f Refactor documentation and make code more readable 
No functional changes
 2023-08-12 18:40:39 +02:00
maver 19ee831d82 Prevent prompt manager initialization more than once 2023-08-12 18:40:39 +02:00
maver 76154fd8ee Fix authors note position not being considered 2023-08-12 18:40:39 +02:00
maver 41aae57f05 Do not send empty scenario and personality prompts 2023-08-12 18:40:39 +02:00
maver 6a52d6febd Fix invalid character name error not being handled 2023-08-12 18:40:39 +02:00
maver 00e9987fb7 Fix character reset not available in basic mode 2023-08-12 18:40:39 +02:00
maver 05c96825ea Add reset button for character prompt list 2023-08-12 18:40:39 +02:00
maver 29a7cb4120 Replace DraggableList with jQuery UI sortable 
Similar to Kobold AIs settings. Reducing code that needs maintaining.
 2023-08-12 18:40:39 +02:00
maver 4dd94a4a62 Do not generate group responses on dry run 2023-08-12 18:40:39 +02:00
maver a706ecd48c Add charIfNotGroup placeholder to default main prompt 2023-08-12 18:40:39 +02:00
maver fa205ec72e Validate import data before prompt import 2023-08-12 18:40:39 +02:00
maver cf305c0395 Do not attempt a dryrun if no character has been selected 2023-08-12 18:40:39 +02:00
maver 82a11316bc Add continue nudge to editable utility prompts 2023-08-12 18:40:39 +02:00
maver 0e4ce734ad Fix continue functionality not working as expected 2023-08-12 18:40:39 +02:00
maver f4cfa8ba94 Remove obsolete logs and improve documentation 2023-08-12 18:40:39 +02:00
maver f2227ded9a Move utility prompts in its own, independent dropdown 
And merge with existing advanced prompt bits
 2023-08-12 18:40:38 +02:00
maver 9669199408 Allow user to edit new chat, new group chat and new example chat prompts 2023-08-12 18:40:38 +02:00
maver 2ed1cee82e Fill tokenizer legacy counts where possible. 2023-08-12 18:40:38 +02:00
maver 9784950c54 Add documentation for chat completion 
And dependant classes
 2023-08-12 18:40:38 +02:00
maver 9332657e20 Do not render prompt export dialogue if not necessary 2023-08-12 18:40:38 +02:00
maver 0f3d5373bf Always allow dropping prompts 2023-08-12 18:40:38 +02:00
maver 81c32852c8 Add icon for global prompts 2023-08-12 18:40:38 +02:00
maver 15d4283cd4 Add info icons to prompt export 2023-08-12 18:40:38 +02:00
maver 023d3fade2 Do not assign openai_max_tokens on input field changes 
Fixes prompt manager falsely assigning string value to openai config
 2023-08-12 18:40:38 +02:00
maver 4974c81d4c Update prompt manager active character on character edit. 2023-08-12 18:40:38 +02:00
maver 74a7aa513b Reintroduce event types after rebase 2023-08-12 18:40:38 +02:00
maver 6ec249bb30 Add confirmation step and allow character prompt order import 2023-08-12 18:40:38 +02:00
maver bfb4e5026d Refine export function 2023-08-12 18:40:38 +02:00
maver 57ea6cb7a5 Add prompt export 2023-08-12 18:40:38 +02:00
maver 3d35caff08 Improve readability and clarity of prompt manager icons 2023-08-12 18:40:38 +02:00
maver d70ecbdcd9 Add support for cycle prompt 2023-08-12 18:40:38 +02:00
maver e93424b2cf Don't use debounce for prompt manager save settings function 2023-08-12 18:40:38 +02:00
maver a53e99b831 Prevent chat history warnings from showing too early 2023-08-12 18:40:38 +02:00
maver ce8a71cf53 Add error handling to openai message counting 2023-08-12 18:40:38 +02:00
maver 011278c533 Re-Render prompt manager on worldinfo settings change 2023-08-12 18:40:38 +02:00
maver 4509df0fd9 Add support for empty prompt replacement 2023-08-12 18:40:38 +02:00
maver 632fa770be Create a deep copy of prompt defaults on char select 
Along other minor fixes and optimizations
 2023-08-12 18:40:38 +02:00
maver 85c4b6fad3 Improve error messages 2023-08-12 18:40:38 +02:00
maver a0bd67e455 Allow markers to inspected for their content 2023-08-12 18:40:38 +02:00
maver 2452b37e28 Add fallback for empty dialogue example prompts 2023-08-12 18:40:38 +02:00
maver 28217adac6 Add logging for prompt manager position changes 2023-08-12 18:40:38 +02:00
maver 9558483669 Change draggable hover color to be more in tune with the default styling 2023-08-12 18:40:38 +02:00
maver 5629bd8984 Fix handleSavePrompt logging throwing error 2023-08-12 18:40:38 +02:00
maver 8abff3c24f Add simple profiling for token counting and rendering 2023-08-12 18:40:38 +02:00
maver ec43295936 Add logging and minor stability enhancements 2023-08-12 18:40:38 +02:00