Commit Graph

941 Commits

Author SHA1 Message Date
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