Commit Graph

1658 Commits

Author SHA1 Message Date
Cohee edb79d8c53 Synchronize max depths for plugins 2023-09-25 19:29:24 +03:00
theunstableman 8f426a0184
[FIXED] Add PaLM vectorization source (#1182)
* Add PaLM vectorization source

* FIX

* Add API key check. Fix comment

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-09-25 15:29:28 +03:00
Cohee 773d42b886 Suspend ooba grammar 2023-09-25 14:07:13 +03:00
RossAscends e2d4f9dc8c streamline WI display 2023-09-25 18:03:10 +09:00
Cohee 86e9974410 Add grammar for ooba llama.cpp 2023-09-24 17:57:00 +03:00
Cohee 9bc3e4e47c #1175 Substitute macro params in KCPP grammar 2023-09-24 14:58:35 +03:00
Cohee 1838ca1994 Replace magic numbers with named constants 2023-09-24 14:45:04 +03:00
Brian Dashore 2411006fdb
World Info: Add insertion order at depth (#1174)
Depth previously injected entries randomly. This is not ideal for
world info architectures that rely on insertion order to function
properly.

Redo depth injection to have its own parameter and redo how it's
handled in generate.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-09-24 14:41:56 +03:00
Brian Dashore 5421925d6c
Add character specific locks for WI and LB (#1170)
* World Info: Add character locking for entries

With the addition of depth, world info has become more important than
ever. However, there is a conflict that can occur when using multiple
world info or lorebooks on a character. Add the ability to lock
entries to a specific character (or characters) if needed.

This allows for adequate separation especially when there are character
cards each with their separate lorebooks that build off of a core lorebook.

Signed-off-by: kingbri <bdashore3@proton.me>

* World Info: Add entry-specific character exclusions

This is the opposite of locking an entry to a specific character.
Exclusions allows the entry to get included for everyone except the
specified characters in the list.

Signed-off-by: kingbri <bdashore3@proton.me>

---------

Signed-off-by: kingbri <bdashore3@proton.me>
2023-09-23 22:35:51 +03:00
Cohee a081f78bd8 (WIP) PaLM API 2023-09-23 20:48:56 +03:00
RossAscends a25cb024fe allow blur/shadow sliders to re-enable. 2023-09-23 11:56:24 +09:00
Cohee ec6b6ab8d4 Restyle custom CSS input 2023-09-22 21:49:30 +03:00
Randall Fitzgerald 654a34f932
Added custom CSS box to UI Theme settings (#1166)
* Added custom CSS box to UI Theme settings

* Update index.html

Merged against release instead of staging. Whoops.

* Added an import stripper regex so that imports will be removed and show a toastr to inform the user.

* Moved import remove code to applyCustomCSS. Updated localStorage. Not re-running saveSettingsDebounced()
2023-09-22 21:13:58 +03:00
Cohee 3d1312c13a Restyle chat width slider 2023-09-22 16:56:01 +03:00
RossAscends 54c37e945b fix themes application, refactor user settings 2023-09-22 22:16:24 +09:00
RossAscends b1ab1451ec separate chat and menu background color selection 2023-09-22 16:54:51 +09:00
city-unit cd1a8c9224 Quick and dirty stat re-creator button 2023-09-21 17:34:09 -04:00
Cohee ae4a9a7b14 Remove legacy chat lazy load 2023-09-21 22:07:56 +03:00
Cohee 6ae1b7a72b Filter out "undefined" stopping strings 2023-09-21 22:02:51 +03:00
Cohee 5fbb232d69 Fix sprites plugin console spam 2023-09-21 21:15:05 +03:00
Cohee 25d818ecbd Reinsert summary extension prompt instantly when changing position 2023-09-21 21:13:24 +03:00
Cohee 5dd9a87dc9 Add position prop to prompt object 2023-09-21 20:57:28 +03:00
Cohee 857ce2c577 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-09-21 20:46:11 +03:00
Cohee 902acc44a2 Support "before main prompt" extension position in prompt manager 2023-09-21 20:46:08 +03:00
RossAscends 22a0bf9451 fix extension update endpoint 2023-09-22 02:42:06 +09:00
Cohee ad95be2500 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-09-21 19:30:23 +03:00
Cohee 071b901f87 Add before story position for A/N and summary 2023-09-21 19:30:20 +03:00
kalomaze ad9382a98c
Custom --grammar support [for koboldcpp] (#1161)
* Basic kobold grammar implementation

This is probably jank as all hell, I don't write js, but I think I got it to work.

* No value by default

* Visual cleanup

+ reworded it a bit

* Conditionally enable Grammar based on version flag. Fix layout

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-09-21 15:21:59 +03:00
RossAscends 49c26f3810 keep input focus while adding tags 2023-09-21 17:17:15 +09:00
RossAscends 86c7a7a058 @Depth insertion for WI Entries 2023-09-21 16:04:34 +09:00
city-unit 440ecfc991 Fix toasts 2023-09-21 00:40:38 -04:00
city-unit e0b5df97c4 Add branching as distinct from bookmarking 2023-09-20 22:48:05 -04:00
Tony Ribeiro c9783640c0
Dynamic Audio UI: more controls (#1127)
* Added control to audio ui to select bgm/ambient and lock selection to overide dynamic audio update. Load both assets and char specific audio assets

* correct ambient label and default value when no assets available.

* add padding in audio select

* Correct audio change of background ambient when locked. Updated CSS of audio ui for mobile friendly.

* add space between mixer

* Add checkbox to enable dynamic bgm/ambient switch

* correct background ambient fadout

* continue debuging ambient audio update

* finish debuging

* Fix BGM console error on first run. Reformat plugin code

* Changed audio bgm lock into loop on/off. Added random pick button for bgm. Moved ambient lock button to right.

* Add mouse wheel event handler on volume controls

* Change bgm select to only contain current chat character bgm (solo/group). When enable expression bgm is off, any of the char+asset bgm can play next if not looping.

* Corrected bgm looping at start. Force random to play another song if there is any.

* Format code

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-09-20 21:36:50 +03:00
kingbri b52f71dcce Vectors: Add before story string/prompt option
This makes the most sense for placement of memories. Add the functionality
for other extension prompt placements as well.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-09-20 00:06:43 -04:00
Maks 158aa79aed
add model gpt-3.5-turbo-instruct and 0914 variant (#1154) 2023-09-19 23:50:27 +03:00
Cohee dfbeb41afa #1152 Filter repeating message hashes when inserting vectors 2023-09-19 17:12:22 +03:00
RossAscends eb6e987f55 search bar for user settings panel 2023-09-19 14:19:22 +09:00
Cohee 10f27f41d1 Better Horde error reporting 2023-09-18 18:00:11 +03:00
Cohee 3d83d1d5b7 Add a note that idle timer is in seconds 2023-09-18 17:49:23 +03:00
city-unit e92d4a3dbf
Add idle slash command toggle 2023-09-18 00:53:23 -04:00
Cohee dc1c477d62 Uncomment page size selector in WI editor 2023-09-18 01:52:41 +03:00
Cohee e9c459690f Don't classify when no sprites/default. H-center sprite in non-waifu mode 2023-09-18 01:49:00 +03:00
Cohee 39567cf278 Slash command to summarize chat 2023-09-18 01:02:02 +03:00
city-unit 0033090a93
Idle Response / Continuous Generation (#1132)
* Initial idle stuff

* Much closer, can now quietly send as user to get a char response.

* Tweaks

* Better, reset the count of getting a message back, don't send while prompt is waiting.

* Allow selecting who is being prompted

* Comments and cleaup

* Remove char name for the moment (needs something here probably)

* Add random time period and "Always add character's name to prompt" respect

* Tooltips

* Load/unload listeners

* Reduce log spam

* Add inline prompt inclusion

* Add full loud prompting

* Comments

* Fix instruct newline (I think)

* Don't reset count on continue

* add quietToLoud for script.js

* add quietToLoud for slashcommands.js

* Keep instruct directives

* Removed some logging, don't do the Novel formatting if Q2L

* Logspam begone.

* Removed a bit more logging

* Add alignment style

* Reformat files. Add comments

* Reorder extensions

* Fix repeat logic to prompt once then only repeat the number specified

* Make repeat count more clear

---------

Co-authored-by: RossAscends <124905043+RossAscends@users.noreply.github.com>
Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-09-17 22:00:10 +03:00
RossAscends 535ec8c42d horde model selection QoL 2023-09-17 23:00:23 +09:00
Cohee 6c9cabfb57
Merge pull request #1145 from SillyTavern/release
Remove header #1144
2023-09-17 15:23:25 +03:00
Cohee 359277deb5
Remove header #1144 2023-09-17 15:21:26 +03:00
Cohee dc1121b72a Remove tensorflow vector source. 2023-09-17 14:09:24 +03:00
RossAscends 751c0723dc skill issue: dont hide draggables on every keydown 2023-09-17 19:41:17 +09:00
Cohee 2c84c93f3d Add thumbnails quality config 2023-09-16 21:53:30 +03:00
Cohee bfdd071001 Move tokenizer endpoint and functions to separate file 2023-09-16 18:48:06 +03:00
Cohee ab9aa28fe4 Move missed endpoints 2023-09-16 18:03:31 +03:00
Cohee 61995bb33f Move preset management into a separate file 2023-09-16 17:36:54 +03:00
Cohee 38b63b07f5 Extract sprite and custom content endpoints to a separate files. Update constants references 2023-09-16 17:28:28 +03:00
Cohee 4e1630c17d Extract endpoints for secrets and assets to separate files 2023-09-16 16:39:07 +03:00
Cohee 6e562bd1ff Extract server endpoints for thumbnails and extensions into separate files 2023-09-16 16:16:48 +03:00
RossAscends 2d774f32b2 custom colors for tag text 2023-09-16 18:37:19 +09:00
RossAscends 124658a006 Add Border Color Control 2023-09-16 15:42:26 +09:00
Cohee 6dd09858d4 Don't remove names from the past chat. Fix non-streaming auto-continue.
We took fair criticism from the NovelAI dev.
2023-09-15 23:32:01 +03:00
Cohee d34f7d3e1a Replace multigen with auto-continue 2023-09-15 21:34:41 +03:00
Cohee eaca6ddaf0 Don't try to resolve unknown tiktoken models 2023-09-15 19:31:17 +03:00
Cohee 599904d589 Move NovelAI endpoints to separate file 2023-09-15 17:54:13 +03:00
RossAscends 1fed8ba4f7 hotswap: instructions if no faves; no placeholders 2023-09-15 17:55:16 +09:00
Cohee 5827f9638f Fix /emote in groups 2023-09-15 01:17:24 +03:00
Cohee 6ad786f348 Add alternative local vectors source.
x5 speed boost!!
2023-09-14 23:40:13 +03:00
Cohee b24509ef43 Visual touchup of custom expressions 2023-09-14 21:41:30 +03:00
Cohee 7553efc308 Custom char expressions 2023-09-14 21:30:02 +03:00
Cohee 9fb4b3425e Costume subfolders 2023-09-14 19:12:54 +03:00
Cohee 182216e711 /costume slash command 2023-09-14 18:37:13 +03:00
Cohee f6c29c61df Adjust Horde timeout to exactly 20 minutes (Horde's own limit). 2023-09-14 18:10:01 +03:00
Cohee 17a5d629ea Auto-set hotswap slot number based on the screen width. 2023-09-14 15:56:01 +03:00
Cohee 688551ffa6 #1128 Auto-Expand Message Actions 2023-09-14 15:23:51 +03:00
Cohee d0182c47de Fix expression BGM switch 2023-09-14 01:28:44 +03:00
Cohee 0d30d8244f Fix not applying ooba streaming url from server history 2023-09-13 18:07:06 +03:00
Cohee 77a28c7131 Don't hide expressions menu if no chat open 2023-09-13 15:19:10 +03:00
Jason Wu 7a3869c476
Enable Smart Context (ChromaDB) support within OpenAI API (#1125)
* Add JetBrains IDE .idea folder to .gitignore

* Enable Smart Context (ChromaDB) support within OpenAI API
2023-09-13 13:01:56 +03:00
mweldon e74090139c
Add copy to clipboard button on prompt itemization popup (#1124)
* Add copy to clipboard button on prompt itemization popup

* Minor fix for NovelAI Summarize and new bad words
2023-09-13 11:52:37 +03:00
Cohee 09fc42a787 Lock extensions display order in top and context menus 2023-09-13 01:40:01 +03:00
Cohee c0e5d7efae Save chat scroll position when user input overflows the line 2023-09-13 00:51:21 +03:00
Cohee 66ec17620f Move Horde and SD endpoints into separate files 2023-09-12 20:45:36 +03:00
Cohee 51e2a3afcf Fix not being able to close the gallery on SD gens. 2023-09-12 19:23:33 +03:00
Cohee dc4a6e862b Add local caption pipeline to UI plugin 2023-09-12 00:15:21 +03:00
Cohee 6c8bd06308 Reserve 3 extra tokens for each chat completion 2023-09-11 17:23:37 +03:00
Cohee 65b4551864 Reserve 3 extra tokens for each chat completion 2023-09-11 17:22:31 +03:00
Cohee 7f55d108cf Don't use talkinghead with local classification model 2023-09-11 13:01:45 +03:00
Cohee c9a9dab523 Don't synchronize vectors when opening chat 2023-09-11 12:35:34 +03:00
Cohee 0bdd350b8d Don't synchronize vectors while streaming 2023-09-10 20:21:23 +03:00
Cohee 9a5e667674 Throttle classification requests during streaming 2023-09-10 20:14:57 +03:00
Cohee c9d8d7ba64 Fix vectorize all with no chat selected 2023-09-10 19:47:41 +03:00
Cohee d19c151669 Add DeepLX translation provider #1111 2023-09-10 18:53:52 +03:00
Cohee 70071312d3 Add OneRingTranslator #521 2023-09-10 17:27:50 +03:00
Cohee ec23356c99 Move translation endpoints into a separate file 2023-09-10 16:41:36 +03:00
Cohee 98cc969d18 Merge branch 'staging' into vectors 2023-09-10 16:06:15 +03:00
Cohee dc5deaf47c Mobile doesn't like select2 2023-09-10 14:39:49 +03:00
Cohee d81c94de0b Fix sort by date 2023-09-10 14:30:29 +03:00
Cohee 0480acebcd #1059 Mancer model selector 2023-09-10 04:08:32 +03:00
Cohee dbac2704f3 Rename control 2023-09-10 02:44:20 +03:00
Cohee f8d90c1933 Merge branch 'staging' into vectors 2023-09-10 02:42:42 +03:00
Cohee f92249790f The return of permanent tokens display 2023-09-10 00:58:37 +03:00
Cohee 23951b8c8a Prevent sync and generation at the same time 2023-09-10 00:15:02 +03:00
Cohee af38971a01 Delete vectors on deleting chats 2023-09-09 22:15:47 +03:00
Cohee ed6417ebcd Display vectorization error in toast 2023-09-09 21:36:04 +03:00
Cohee 2fa038f91d Add advanced vector controls 2023-09-09 21:26:04 +03:00
Cohee 4cf6a1f7da Cache and sample classification results 2023-09-09 17:31:27 +03:00
Cohee 967a084aad (WIP) Local emotion classification pipeline 2023-09-09 15:14:16 +03:00
Cohee 4d08e3e9be Decrease batch size. Add browser console log 2023-09-09 15:12:54 +03:00
Cohee da34517943 Merge branch 'staging' into vectors 2023-09-09 01:21:03 +03:00
Cohee ea01247bcf #1090 Save Kobold/ooba servers history 2023-09-08 22:44:06 +03:00
IkariDevGIT 786b87952e
Quick-reply enhancements +fix (#1118)
* Update index.js

* change manual replace to substituteParams

* Update index.js
2023-09-08 21:38:31 +03:00
Cohee 26ddfd1a08 Continue with AltGr+Enter 2023-09-08 21:27:33 +03:00
Cohee 42fd317188 Merge branch 'staging' into vectors 2023-09-08 16:41:26 +03:00
Cohee 2411b17279 Merge branch 'release' into staging 2023-09-08 16:40:45 +03:00
Cohee ab460199ab #1117 Fix typing indicator and auto-scroll breaking mobile layout 2023-09-08 16:36:00 +03:00
Cohee 3a3ff89047 Add button to vectorize all chat 2023-09-08 15:25:10 +03:00
Cohee a5acc7872d Add OpenAI vector source. 2023-09-08 13:57:27 +03:00
Cohee 02bdd56e20 Make printMessages async 2023-09-08 12:10:41 +03:00
Cohee 408a1fe846
Merge pull request #1112 from IkariDevGIT/gallerycommand
Add command for opening the gallery
2023-09-08 10:44:57 +03:00
RossAscends 44ba1cba59
Merge pull request #1113 from Hakirus/staging
Quick Reply Mod
2023-09-08 09:30:19 +09:00
Cohee 96df705409 Change insertion strategy to an extension block 2023-09-08 01:26:26 +03:00
Cohee 40f95bf842 Fix HypeBot plugin settings not saving 2023-09-08 00:30:31 +03:00
Cohee 9d45c0a018 Add UI plugin for vectors 2023-09-08 00:28:06 +03:00
EvilFear 470da71b3b
Update index.js 2023-09-07 17:08:21 -04:00
Cohee 92ab17b58b Fix HypeBot plugin settings not saving 2023-09-07 22:28:53 +03:00
Cohee 89705391d1 Fix getSpriteFolderName function call 2023-09-07 17:52:37 +03:00
Cohee bbe52886da Slash command to set sprite / emote. Also allow to do it per click even in online mode 2023-09-07 17:48:12 +03:00
IkariDevGIT ef68dd07ac Add command for opening the gallery 2023-09-07 16:02:34 +02:00
EvilFear 868778b079
Update index.js
Quick Reply Mod
2023-09-06 22:27:03 -04:00
Cohee 853736fa93 Remove legacy NovelAI models 2023-09-06 14:32:06 +03:00
Cohee 322511caa9 Remove legacy Pygmalion formatting, part 2 2023-09-06 14:19:29 +03:00
Cohee f5beae517e Case-independent tags dropdown view 2023-09-06 01:47:55 +03:00
Cohee 05215218d9
Merge pull request #1102 from SillyTavern/release
Release => staging
2023-09-05 23:57:13 +03:00
Bahamut fe64597a23 LibreTranslate URL Example 2023-09-05 23:30:58 +03:00
Cohee bbed147ce5 Clean up browser logs 2023-09-05 18:23:24 +03:00
Cohee 5ef79bd64d Remove NSFW avoidance prompt from Prompt Manager 2023-09-05 18:14:56 +03:00
Cohee 06825331d6 Confirmation for WI entry delete 2023-09-05 12:05:20 +03:00
Cohee ded1e3a859 Add NAI Diffusion upscaling. Add Anlas guard and view Anlas button 2023-09-04 18:00:15 +03:00
Cohee 0888cff254 Fix TTS speaking with disabled voice 2023-09-04 14:21:22 +03:00
Cohee 47893b9a14
Merge pull request #1081 from Jasonnor/staging
TTS: Set character default voice from `disabled` to `default` (#1077)
2023-09-04 14:12:16 +03:00
Cohee c110ebe02b Fix chat bg gens not saving. Remove module worker pattern and global function from chat bg plugin 2023-09-04 12:18:37 +03:00
Cohee f69aa07ec1 Fix background URI encoding 2023-09-04 02:51:39 +03:00
Cohee 67c8476cdf Set 0 tokens for prompts with no content 2023-09-04 02:40:16 +03:00
Cohee 80e286fed2 Fix double insertion of persona description to prompt manager if position set to A/N 2023-09-04 02:26:15 +03:00
Cohee 529c461318 Fix ban EOS token 2023-09-04 01:51:14 +03:00
Jasonnor 6d2caf94bf TTS: Avoid default voice selector display itself 2023-09-03 23:38:34 +08:00
Cohee ce2c2b0dac Add AUTO1111 upscaling controls 2023-09-03 14:56:02 +03:00
Cohee 8b13e29702 Fix Extras SD generation 2023-09-03 14:04:53 +03:00
Cohee ef69dcd502 Add auth support for AUTO1111 2023-09-03 01:19:31 +03:00
Cohee 5f0220d90e Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-09-03 00:41:31 +03:00
Cohee e3e6fa2218 Connect to AUTO111 without Extras. Add NAI Diffusion. 2023-09-03 00:41:26 +03:00
RossAscends 942f343915
Merge pull request #1086 from city-unit/feature/exorcism
Minor Gallery Fixes
2023-09-03 05:42:58 +09:00
city-unit 08e1b5bb5e Fix dropzone issue and resize issue 2023-09-02 15:40:15 -04:00
Jasonnor f91e1dfd86 TTS: Set character default voice from `disabled` to `default` (#1077)
## Features and improvements
- TTS Extension
  - Set character default voice from `disabled` to `DEFAULT_VOICE_MARKER`
  - Add `DEFAULT_VOICE_MARKER` option for all characters
  - Set default `DEFAULT_VOICE_MARKER` voice as `disabled`

## Related issues
- #1077
2023-09-03 01:27:54 +08:00
Cohee 242600a5a3 Remove group chat no members warning 2023-09-02 17:28:03 +03:00
Cohee 4a6705cea8
Prompt manager configuration fixes (#1078)
* Refactor oai preset change event into before and after

* Simplify and reinforce prompt manager render without character

* Check if main prompt exists before adding nsfwAvoidance

* Sanitize prompt manager configuration on preset loading

---------

Co-authored-by: maver <kentucky@posteo.de>
2023-09-01 23:23:03 +03:00
Cohee 428c851c9b Fix WI overflow alerting counter 2023-09-01 23:14:01 +03:00
Cohee 79dcfa6c51 #1077 Add ability to set default voice 2023-09-01 17:58:33 +03:00
Cohee 267d0eb16f Fix API tokenizers usage with kcpp 2023-09-01 02:57:35 +03:00
Cohee 6a98701e61 Fix unban EOS for Kobold
565ab8a38f
2023-09-01 01:58:32 +03:00
Cohee 1f10acdf17 Slight refactor Kobold version flags 2023-09-01 01:07:04 +03:00
Cohee d6b694cc9d Don't bounce of the top bar to prevent movable freezing 2023-08-31 23:44:36 +03:00
Cohee 4f1130260c Backend for sorting by create date field 2023-08-31 19:30:56 +03:00
Cohee 019c47adc6 #1068 Display token counts on generated messages 2023-08-31 17:10:01 +03:00
Cohee 5f5407777f New hotkey: Alt+Enter to Continue 2023-08-31 14:54:35 +03:00
Cohee 05f3a5d8a1 #1041 Auto-fix displayed markdown for unbalanced quotes/asterisks 2023-08-31 14:39:31 +03:00
city-unit 7d6ff2ee3c Toasty timeout 2023-08-30 20:38:48 -04:00
city-unit 056fef6831 Tell users how to drag and drop. 2023-08-30 20:37:03 -04:00
city-unit d5409a5fea Add close buttons and theming 2023-08-30 20:08:48 -04:00
Cohee 218cfb43d8 Fix gallery files caching, filter by mime type. Use fetch instead of Jquery Ajax 2023-08-31 00:55:17 +03:00
Cohee 194278d171 Merge branch 'staging' into feature/exorcism 2023-08-31 00:42:34 +03:00
city-unit 34c698972c I think that corrects filenaming for user folders, etc. 2023-08-30 16:36:32 -04:00
city-unit 98a2a2b989 Esc to remove drag elements 2023-08-30 15:58:14 -04:00
RossAscends 7ea426ba79 remove console logs from RAmods, cleanup code. 2023-08-31 04:46:33 +09:00
city-unit dfd6961c2a Fix dropzones 2023-08-30 15:33:30 -04:00
city-unit feb19a603c Unique img ids, comments 2023-08-30 11:12:59 -04:00
Cohee 10148167ba Option to disable group impersonation ban. Hide CFG for simple UI 2023-08-30 16:31:53 +03:00
Cohee 56fc92daca Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-30 12:03:38 +03:00
Cohee 085e92a43e Escape prompt manager names 2023-08-30 12:03:18 +03:00
city-unit 165d4b3b75 Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/exorcism 2023-08-30 00:12:00 -04:00
city-unit 1cb86034b5 Okay, it actually works 2023-08-30 00:11:20 -04:00
city-unit de5bc45060 Much closer 2023-08-29 22:44:09 -04:00
Cohee 7b51d94e1b Add check for module before offloading TH sprite 2023-08-29 21:50:26 +03:00
Cohee 2b768cc151 Simple UI mode for WI menu 2023-08-29 21:26:57 +03:00
Cohee 78512b33ad Update quick edits first 2023-08-29 21:16:13 +03:00
Cohee eb7a8f9ae4 Filter system messages from raw last SD gens 2023-08-29 18:33:30 +03:00
Cohee 44f88c61ff Add simplified UI switch 2023-08-29 18:04:10 +03:00
Cohee 78bfbb09f6 Add option to enable user message narration 2023-08-29 15:27:22 +03:00
Tony Ribeiro feb2383f64 Add option to speech-recognition streaming mode to include or not the triggers words in the message. 2023-08-29 03:28:02 +02:00
Cohee 030424d034 Add char to persona converter. Move persona functions to a separate script file 2023-08-29 01:54:11 +03:00
Cohee 1bb2778f46 Fix macros replacement in custom stop strings for OAI 2023-08-29 00:47:35 +03:00
Cohee 9ce8aa661f Deprecate "After Char" position for persona description 2023-08-29 00:10:18 +03:00
Cohee f1b91620b6
Merge pull request #1021 from ouoertheo/ouoertheo/tts-ui-voicemap
TTS Voice map UI and Coqui UI improvements
2023-08-28 23:57:22 +03:00
Cohee 5acb7402b9 Merge branch 'ouoertheo/tts-ui-voicemap' of https://github.com/ouoertheo/SillyTavern into ouoertheo/tts-ui-voicemap 2023-08-28 21:58:49 +03:00
Cohee ac78d51d59 Change all TTS providers loading to async 2023-08-28 21:58:46 +03:00
Cohee b51511b99f Fixed Novel custom voices not saving 2023-08-28 21:46:41 +03:00
city-unit 79448f5fe7 Getting there, but it's not great. 2023-08-28 00:49:20 -04:00
ouoertheo 42a8907547 Merge branch 'ouoertheo/tts-ui-voicemap' of https://github.com/ouoertheo/SillyTavern into ouoertheo/tts-ui-voicemap 2023-08-27 20:52:54 -05:00
ouoertheo d8843274b1 merge voicemap to settings rather than overwrite 2023-08-27 20:47:44 -05:00
Cohee 2481d9b29c [Feature Request] Make sortorder of tags independent of case #1034 2023-08-28 01:50:32 +03:00
Cohee 2199096191 Add error handling of NAI streaming. 2023-08-28 00:28:11 +03:00
Cohee 3b4e6f0b78 Add debug functions menu 2023-08-27 23:20:43 +03:00
Cohee 96512c178e More readable no connection color. 2023-08-27 22:38:42 +03:00
Cohee 0844374de5 Remove old GPT-2 tokenizer. Redirect to tiktoken's tokenizer 2023-08-27 22:14:39 +03:00
Cohee 8566fda1cd Preserve chat scroll when setting a hypebot text 2023-08-27 21:51:33 +03:00
Cohee 636c06ffdd Autosize prompt manager boxes 2023-08-27 21:28:13 +03:00
city-unit 39eae80f6e Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/exorcism 2023-08-27 12:47:05 -04:00
RossAscends 1a5dbf2603 fix MovingUI to respect resizing topBar 2023-08-28 01:40:40 +09:00
Cohee 8bf679cba2 #1033 Promt => prompt 2023-08-27 19:24:28 +03:00
Cohee 961b3e1a78 Fix leading space in Novel bias + add additional parsing methods 2023-08-27 18:57:07 +03:00
Cohee e74bca88f4 Disable OpenRouter fallback by default 2023-08-27 18:39:04 +03:00
Cohee 9660aaa2c2 Add NovelAI hypebot plugin 2023-08-27 18:27:34 +03:00
Cohee 109ea4008b Improve Horde request error detection 2023-08-27 13:31:14 +03:00
city-unit 91434a3ba8 Quick fix for arrowkey swipe stuff 2023-08-26 23:32:22 -04:00
city-unit 3737f58072 Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/exorcism 2023-08-26 20:56:38 -04:00
Cohee 9d166db4ee Set rep pen range unlocked for bigger max context 2023-08-26 21:27:37 +03:00
Bahamut de905875c4 LibreTranslate 2023-08-26 20:47:25 +03:00
Stefan Daniel Schwarz b9a95d94a0 Force isSystem = false on comment messages so they get formatted properly 2023-08-26 19:26:23 +02:00
ouoertheo 3ae7a6741f
Merge branch 'staging' into ouoertheo/tts-ui-voicemap 2023-08-26 11:44:58 -05:00
Stefan Daniel Schwarz dd7b89aef6 comment message formatting 2023-08-26 17:50:54 +02:00
Stefan Daniel Schwarz 3509e6b1d4 default context preset cannot be deleted 2023-08-26 14:52:23 +02:00
Stefan Daniel Schwarz 1d7165c047 context template preset manager 2023-08-26 12:09:47 +02:00
ouoertheo 765751aae0 fix voice map, name changes, add readme 2023-08-25 22:52:55 -05:00
ouoertheo b3a4787db6 name changes 2023-08-25 22:52:26 -05:00
ouoertheo d03af9b41d name updates, complete custom voices 2023-08-25 22:51:58 -05:00
Cohee bca44ba682 Conserve ending newlines in story string template 2023-08-26 01:32:39 +03:00
Cohee 44661d0e2b Merge branch 'staging' into generate-array 2023-08-26 01:07:19 +03:00
Cohee fabba9370b
Merge pull request #1017 from StefanDanielSchwarz/improved-instruct-mode-sequences
improved instruct mode sequences and UI
2023-08-26 01:03:38 +03:00
Cohee 42e6da4a36 Add support of stop strings to OpenAI / Claude 2023-08-26 00:12:11 +03:00
SDS 45046aa211
Merge branch 'staging' into improved-instruct-mode-sequences 2023-08-25 23:06:44 +02:00
Cohee 409eef6e46 Extract expressions HTML to templates 2023-08-25 23:48:59 +03:00
Stefan Daniel Schwarz 3e0ce12b23 first_output_sequence and system_sequence_prefix 2023-08-25 22:34:08 +02:00
Stefan Daniel Schwarz ddaa4fe409 force output sequence (first or last) 2023-08-25 22:02:11 +02:00
Stefan Daniel Schwarz ca37ac679e Improved Advanced Formatting UI 2023-08-25 21:04:06 +02:00
Cohee cb669cbcab Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-25 20:34:33 +03:00
Cohee b32a085e41 Add template renderer for extensions 2023-08-25 20:34:26 +03:00
Cohee 12f1cdb3fd #1020 Fix summarize + prompt manager. Clarify naming for insertion position. 2023-08-25 20:03:31 +03:00
Cohee 685e9b7e79 Stabilize extension injections order for prompt manager 2023-08-25 17:15:55 +03:00
ouoertheo 1417aa12f1 fix bug with function call context 2023-08-25 08:51:35 -05:00
Cohee d68151f7e2 Init author's note via function call instead of onready 2023-08-25 16:46:54 +03:00
ouoertheo 3ab9aee195 elevenlabs connect button 2023-08-25 08:45:37 -05:00
ouoertheo 44cd4287cb coqui voices, change how provider settings save 2023-08-25 08:27:43 -05:00
Cohee 91d13efcef #1018 Round Typical P to 3rd decimal for Novel 2023-08-25 15:38:07 +03:00
Stefan Daniel Schwarz be3ebcda0d improved instruct mode sequences (WIP) 2023-08-25 14:01:25 +02:00
Cohee b01268ee8c
Merge pull request #992 from Tony-sama/staging
Audio extension and RVC/Coqui UI updates/bugfixes
2023-08-25 14:18:42 +03:00
kingbri 990bf63d59 Tags: Fix exclusion on load
The new filter system wasn't applying when tags are loaded. Fix this
by adding an extra step in the for loop.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-25 00:33:03 -04:00
Tony Ribeiro 011834b8fc
Merge branch 'SillyTavern:staging' into staging 2023-08-25 02:55:05 +02:00
Cohee aceb32cfe9 Fix freq pen overwrite by pres pen 2023-08-25 02:52:38 +03:00
Cohee acdd6dad1b Fix sprite animation 2023-08-25 02:07:59 +03:00
Tony Ribeiro a622810c38
Merge branch 'SillyTavern:staging' into staging 2023-08-25 00:45:34 +02:00
Tony Ribeiro 74a6e79df6 Added delete asset api route, factorise asset filename sanitizer to use in both asset download/delete. Added delete function to asset UI download button. 2023-08-25 00:45:15 +02:00
Cohee 3bf7747ee5
Merge pull request #1013 from bdashore3/staging
CFG: Whitespace fix
2023-08-25 01:08:04 +03:00
RossAscends 1a1878f095 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-25 07:06:54 +09:00
RossAscends ce5e706fac topbar resize, font scaling fix, mobile slider fix 2023-08-25 07:06:52 +09:00
kingbri 0bc2ef2a33 CFG: Don't trim when getting prompt
Let the user figure it out. Whitespace in CFG is important.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-24 17:59:25 -04:00
Cohee 1900ab9726 #1005 Replace mobile detection method in get sortable delay. Make deviceInfo loading sync. Init Ross mods via function call. 2023-08-24 23:52:03 +03:00
Tony Ribeiro 1014d592f7 Added a refresh assets button to audio UI to detect audio asset again. Usefull after download an asset or putting a file manually. 2023-08-24 22:17:54 +02:00
Cohee ce67101651
Merge pull request #1012 from StefanDanielSchwarz/llama-2-chat-instruct-preset-fixes
Llama 2 chat instruct preset fixes
2023-08-24 22:51:55 +03:00
Tony Ribeiro 7e5bdb11a3 Updated audio/assets extension user feedback for muted/disconnected from assets repo. 2023-08-24 21:42:32 +02:00
Tony Ribeiro 3b6978010f
Merge branch 'SillyTavern:staging' into staging 2023-08-24 21:05:12 +02:00
Cohee cd24de3c2e Reformat code. 2023-08-24 21:59:26 +03:00
Stefan Daniel Schwarz 4b389eba61 no eol separator after replaced sys prompt 2023-08-24 20:30:24 +02:00
Cohee c91ab3b5e0 Add Kobold tokenization to best match logic. Fix not being able to stop group chat regeneration 2023-08-24 21:23:35 +03:00
Stefan Daniel Schwarz 56a6398189 system prompt in system sequence 2023-08-24 19:33:04 +02:00
Cohee 14d94d9108 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-24 20:20:03 +03:00
Cohee ab52af4fb5 Add support for Koboldcpp tokenization endpoint 2023-08-24 20:19:57 +03:00
Cohee d4bd91f6ec Merge branch 'staging' of http://github.com/cohee1207/SillyTavern into staging 2023-08-24 18:32:46 +03:00
Cohee 7010e05f8e Sync bottom form height with the font size 2023-08-24 18:32:42 +03:00
Cohee cd2faea2b2 Fix group chats with streaming 2023-08-24 17:46:44 +03:00
Tony Ribeiro 43e70c9df1
Merge branch 'SillyTavern:staging' into staging 2023-08-24 15:18:02 +02:00
Cohee f5fd15ffd2 #976 Return "Continue on send". Allow continuing the first chat message. Add debug function for i18n. 2023-08-24 15:13:04 +03:00
Tony Ribeiro 07f625c688 Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-24 02:34:14 +02:00
Tony Ribeiro 46964b1b99 Add temp folder into assets, file are download into this temp file and moved only when complete. Allow to handle fail download. 2023-08-24 02:34:06 +02:00
Cohee 4aa31fcba9 Add fallback option for OpenRouter 2023-08-24 03:21:17 +03:00
Tony Ribeiro 7437b23fa2
Merge branch 'SillyTavern:staging' into staging 2023-08-24 01:43:10 +02:00
Tony Ribeiro 017df860e5 Sanitized character bgm request. 2023-08-24 01:42:52 +02:00
Cohee 4038e7f9e3 #999 Instruct mode fixes 2023-08-24 02:22:37 +03:00
Tony Ribeiro 9da9c73279 Updated assets ui css to make it relative size 2023-08-24 01:17:08 +02:00
Tony Ribeiro c29ae21869 Redesigned assets connect button 2023-08-24 01:02:34 +02:00
Cohee e2507e8840 #976 Add "quick continue" button. Remove "send to continue" option. 2023-08-24 01:37:44 +03:00
Tony Ribeiro a5f66bda63 Added sanitization of request input for assets_download function. Changed assets download UI for button with little animation while downloading. 2023-08-24 00:17:07 +02:00
Cohee 52c2fcd407 Fix OpenRouter model not persisting on page reload 2023-08-24 00:59:57 +03:00
Cohee de0dbfb394 Merge branch 'roleplay-context' into staging 2023-08-24 00:30:04 +03:00
Cohee 17925423ae
Merge pull request #999 from StefanDanielSchwarz/roleplay-context
Return of the Roleplay Context
2023-08-24 00:29:05 +03:00
Cohee 1ce848c1c3 Move before / after char WI to story strings 2023-08-24 00:26:47 +03:00
Stefan Daniel Schwarz 7cafa5d374 improved preset selection logic 2023-08-23 22:22:52 +02:00
Cohee 9aa03402fa
Merge pull request #1004 from SillyTavern/prompt-manager-persona-description
Prompt manager persona description
2023-08-23 22:11:47 +03:00
maver 65e595ad48 Increase prompt oder dummy user id by 1 2023-08-23 20:41:13 +02:00
maver 5a02250a1f Add persona description to prompt manager order 2023-08-23 20:40:26 +02:00
Cohee b1c1ac465c Merge branch 'release' into staging 2023-08-23 21:37:52 +03:00
Cohee 1d6b7c9947 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-23 21:32:46 +03:00
Cohee 031a6cb2a4 Performance and data integrity improvements 2023-08-23 21:32:38 +03:00
Stefan Daniel Schwarz 8938ea1d72 auto select presets 2023-08-23 20:17:45 +02:00
Tony Ribeiro 0afcf5a12b Added message to Asset UI to tell about need to refresh for asset to be used. 2023-08-23 20:01:55 +02:00
Tony Ribeiro 2e2cbd2c2d Changed audio to muted by default to avoid error on autoplay without user interact. 2023-08-23 19:44:29 +02:00
Tony Ribeiro 1d0ed86d01 update audio manifest 2023-08-23 18:58:54 +02:00
Tony Ribeiro df040e6402
Merge branch 'SillyTavern:staging' into staging 2023-08-23 18:52:10 +02:00
Tony Ribeiro f23115f6b3 - Added assets folder to .gitignore
- disabled audio extension by default
        - turned get request into post
        - avoid background that are data url
        - changed UI name to Dynamic Audio
        - Changed Assets/Audio ui load to use $.get
        - added assets json url as field in ui, with connect button require confirm from popup.
2023-08-23 18:51:41 +02:00
Cohee 2c58f9d903
Merge pull request #1001 from bdashore3/staging
More CFG fixes
2023-08-23 18:49:36 +03:00
kingbri 0460375647 CFG: Don't inject anything when guidance scale doesn't exist
If the guidance scale is 1, completely disable sending CFG and creating
a negative prompt.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-23 11:27:58 -04:00
Cohee f48cc0db31 Unify cfgValues parsing between ooba/Novel 2023-08-23 18:26:56 +03:00
Cohee 2c2a68ef76 Fix instruct system sequence missing + {{original}} 2023-08-23 18:04:22 +03:00
Cohee fad6c164cb Don't set negative prompt from CFG extension to ooba at guidance scale 1.0 2023-08-23 17:44:38 +03:00
ouoertheo 5b43fe25e8 update checkReady. add voiceMap ui select 2023-08-23 08:27:53 -05:00
RossAscends a1bdaf2739 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-23 16:41:09 +09:00
RossAscends 02ce9ba563 top bar 40px to 30px 2023-08-23 16:41:07 +09:00
Cohee 723e957b3c Merge branch 'staging' of http://github.com/cohee1207/SillyTavern into staging 2023-08-23 10:32:52 +03:00
Cohee e77da62b85 Add padding to cache key. Fix Safari display issues. Fix 400 on empty translate. Reset bias cache on changing model. 2023-08-23 10:32:48 +03:00
RossAscends 5474f29f2d bottom bar 40px to 30px 2023-08-23 16:19:54 +09:00
Tony Ribeiro ecb4436f07 Audio group chat cooldown bgm fixed. 2023-08-23 05:49:24 +02:00
Tony Ribeiro d070336e9c Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-23 05:11:07 +02:00
Tony Ribeiro 13dac1f4d3 Assets extension, factorised using the received json type to organise the assets in the UI/folders. 2023-08-23 05:10:55 +02:00
Tony Ribeiro 8e38229ed4 Audio extension, handle custome background. Factorised bgm/ambient file listing into one assets listing function on server.js. 2023-08-23 03:47:13 +02:00
Cohee b385bd190a Less strict rules for logit bias files import 2023-08-23 03:41:58 +03:00
Cohee f633f62065 Don't save null values to OpenAI logit bias 2023-08-23 03:36:04 +03:00
Tony Ribeiro 5009416f94
Merge branch 'SillyTavern:staging' into staging 2023-08-23 01:44:52 +02:00
Cohee bc5fc67906 Put tokenizer functions to a separate file. Cache local models token counts 2023-08-23 02:38:43 +03:00
Cohee 7250770c5d Don't reduce Claude token counts by 2 2023-08-22 23:20:53 +03:00
Cohee 07a9e493dc Fix preset saving stacking for instruct 2023-08-22 23:03:55 +03:00
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
maver 2fc3577431 Throw a recoverable error on invalid character naming 2023-08-12 18:40:38 +02:00
maver 1b7da6ecbc Remove faulty characters in default configuration 2023-08-12 18:40:38 +02:00
maver d469c80ef5 Apply minor code style and stability improvements 2023-08-12 18:40:38 +02:00
maver 550e635d93 Add migration for legacy prompts 2023-08-12 18:40:38 +02:00
maver e908610b99 Save prompt manager items to perset 2023-08-12 18:40:38 +02:00
maver 2054cbeb83 Simplify token threshold warnings 2023-08-12 18:40:38 +02:00
maver 49cb682499 Raise warning threshold for chatHistory tokens 2023-08-12 18:40:38 +02:00
maver 6cea524f2c Fix prompt-manager being rendered twice. 2023-08-12 18:40:38 +02:00
maver bf0dc07b1f Improve in-code documentation 2023-08-12 18:40:38 +02:00
maver d0aba85692 Add support for persona description positioning 2023-08-12 18:40:38 +02:00
maver 4ed92d69b0 Fix jailbreak prompt not being overwritten by character 2023-08-12 18:40:38 +02:00
maver 221ecbf8d6 Add reset for main,nsfw and jailbreak prompts 2023-08-12 18:40:38 +02:00
maver 9cf41a6a52 Remove doubled initialization of prompt manager 2023-08-12 18:40:38 +02:00
maver 7c1e370abe Allow the user to toggle names in chat history 2023-08-12 18:40:38 +02:00
maver 0660016a10 Only add name to prompts when conforming to oai api standards 2023-08-12 18:40:38 +02:00
maver 670119e143 Fix prompt edit popup not appearing after refactoring 2023-08-12 18:40:38 +02:00
maver 25eef5d100 Pass nsfwAvoidance message instead of prompt
Fixing invalid argument exception being thrown
2023-08-12 18:40:38 +02:00
maver f207e0eab3 Add basic WindowAI support 2023-08-12 18:40:38 +02:00
maver 5c18abadac Pass chat message name to chatcompletion endpoint 2023-08-12 18:40:38 +02:00
maver aaa2c48e7d Add basic claude support 2023-08-12 18:40:38 +02:00
maver c920b6c511 Correct identifier used for jailbreak prompt override 2023-08-12 18:40:38 +02:00
maver 28fa2f5f57 Render prompt manager after swiping with updated tokens
Including world info and extension prompts
2023-08-12 18:40:38 +02:00
maver 2f4424e6c6 Declare prepareOpenAIMessages as synchronous
As there is no need for the function o be async anymore.
2023-08-12 18:40:38 +02:00
maver 6e37db2fb3 Declare prepareOpenAIMessages as synchronous
As there is no need for the function o be async anymore.
2023-08-12 18:40:38 +02:00
maver 6c25211f0a Support original-placeholder 2023-08-12 18:40:38 +02:00
maver 6674a0a974 Visual improvements for mobile 2023-08-12 18:40:38 +02:00
maver 312b02c36e Do not count messages with empty prompts 2023-08-12 18:40:38 +02:00
maver 6617243f1b Add event system to openai script
Lost during rebasing
2023-08-12 18:40:38 +02:00
maver be30fef700 Disable toggling of main prompt 2023-08-12 18:40:38 +02:00
maver 85862d8b2e Filter faulty prompt entries 2023-08-12 18:40:38 +02:00
maver e7198c6303 Fix prepared prompt not being returned 2023-08-12 18:40:38 +02:00
maver b8b3dd4caf Various improvements for stability and token counting. 2023-08-12 18:40:38 +02:00
maver 2c36fbdc1d Apply character specific prompt overrides
Jailbreak and main
2023-08-12 18:40:36 +02:00
maver 5afd60c578 Add dialogue examples first if user decides 2023-08-12 18:40:18 +02:00
maver 474571e17a Handle various error scenarios during token counting 2023-08-12 18:40:18 +02:00
maver 73e3001493 Refactor addMessageToChatCompletion 2023-08-12 18:40:18 +02:00
maver 5270d261aa Add memory and authors note to chat completion 2023-08-12 18:40:18 +02:00
maver bf5404f6ce Add enhanced definitions 2023-08-12 18:40:18 +02:00
maver 21b37950e4 Fix chat completion not recognizing 0-position 2023-08-12 18:40:18 +02:00
maver dd7f326460 Improve in-code documentation 2023-08-12 18:40:18 +02:00
maver 74a5167a0e Add nsfw avoidance prompt, quiet prompt and bias to chat completion 2023-08-12 18:40:18 +02:00
maver 37c7a82aba Respect impersonate option 2023-08-12 18:40:18 +02:00
maver edba17c96e Add dialogue examples to chat completion 2023-08-12 18:40:18 +02:00
maver 8ae2c80358 Introduction of additional helper classes, refactoring 2023-08-12 18:40:18 +02:00
maver 18641ea3d2 Add prototype for prompt manager token management 2023-08-12 18:40:18 +02:00
maver 05f7e5677d Simplify example message handling 2023-08-12 18:40:18 +02:00
maver 77e183f5dd Add support for authors note and summary extensions 2023-08-12 18:40:18 +02:00
maver a66041f503 Fix extension prompt being not parsed correctly 2023-08-12 18:40:18 +02:00
maver 64c04957c2 Enable TokenHandler to return total token count 2023-08-12 18:40:18 +02:00
maver eb315993b4 Let prompt manager handle character and scenario prompts 2023-08-12 18:40:18 +02:00
maver 29bc3c854f Update prompt manager after chat loaded 2023-08-12 18:40:18 +02:00
maver d65a03d75d Streamline token counting
By using TokenHandler instead of custom token handling
2023-08-12 18:40:18 +02:00
maver 4d8d4cd262 Streamline token counting
By using TokenHandler instead of custom token handling
2023-08-12 18:40:18 +02:00
SillyLossy e309e18e97 Reset token counters when switching characters. Put main prompt at the beginning 2023-08-12 18:40:18 +02:00
SillyLossy 14a66ec937 Don't duplicate start chat marker if character has no example dialogues 2023-08-12 18:40:18 +02:00
Cohee 0f412faabe Hotfix 2023-08-12 18:40:18 +02:00
Cohee cb60c31490 Hotfix 2023-08-12 18:40:18 +02:00
Cohee 41366b0e72 Hotfix 2023-08-12 18:40:18 +02:00
SillyLossy f5189df319 Fix sanitation again 2023-08-12 18:40:18 +02:00
Cohee 4027afb737 Fix prompt settings init 2023-08-12 18:40:18 +02:00
maver dce91f8fad Send main prompt with group chat 2023-08-12 18:40:18 +02:00
maver 121bbf19d6 Add i18n attributes to prompt manager elements 2023-08-12 18:40:18 +02:00
maver 637b99b3fe Update default jailbreak message 2023-08-12 18:40:18 +02:00
maver a5e2f11e61 Use EventEmitter instead of native event handling 2023-08-12 18:40:18 +02:00
maver 4476cbdc81 Fire event when selecting a group chat 2023-08-12 18:40:18 +02:00
maver 7411ca1154 Prevent duplicate messages
By removing obsolete example message assignments
2023-08-12 18:40:18 +02:00
maver 9a7bbd4ffb Add prompt manager support for group chats 2023-08-12 18:40:18 +02:00
maver d9d10f3b00 Show character definition in regular mode 2023-08-12 18:40:18 +02:00
maver 989f704605 Improve strength of main and impersonation prompt 2023-08-12 18:40:18 +02:00
maver ff07572fd4 Fix dropspot highlight not appearing on hover 2023-08-12 18:40:18 +02:00
maver 53fe7f1d94 Remove obsolete interface elements and handling
Jailbreak etc.
2023-08-12 18:40:18 +02:00
maver 720c9973ec Fix default prompts not being set correctly 2023-08-12 18:40:18 +02:00
maver 9022d9abd9 Update documentation and code style for prompt manager 2023-08-12 18:40:18 +02:00
maver 5a5ea2f78a Remove prompt list when character gets deleted 2023-08-12 18:40:18 +02:00
maver e2f8c876d9 Refactor render functions of prompt manager
Improve readability and extendability
2023-08-12 18:40:18 +02:00
maver 137b979302 Improve documentation for prompt manager 2023-08-12 18:40:18 +02:00
maver 0e3e57269c Simplify new character handling 2023-08-12 18:40:18 +02:00
maver beedd9952a Add missing export for missing identifier exception 2023-08-12 18:40:18 +02:00
maver 441e5c6cea Remove obsolete description of prompt manager 2023-08-12 18:40:18 +02:00
maver e47f436cf7 Add support for nsfw avoidance prompt 2023-08-12 18:40:17 +02:00
maver 1adad6105a Refactor chat completion 2023-08-12 18:40:17 +02:00
maver fe43b58cb0 Add help note for prompt manager 2023-08-12 18:40:17 +02:00
maver 796e52e537 Disable role select only when advanced mode is off 2023-08-12 18:40:17 +02:00