Commit Graph

1041 Commits

Author SHA1 Message Date
Tony Ribeiro 9867b86c9a cleaning up audio module 2023-08-21 16:58:37 +02:00
Cohee 2a2ab00b55 Rearrange context formatting blocks 2023-08-21 17:10:42 +03:00
Cohee 05d719107f Move total token counter. Tighten the UI 2023-08-21 17:00:28 +03:00
Tony Ribeiro b545bbd8a6
Merge branch 'SillyTavern:staging' into staging 2023-08-21 15:41:34 +02:00
Tony Ribeiro 3f973d7bad Moved path of defaulf bgm/ambient sounds 2023-08-21 15:33:16 +02:00
Cohee c735bf546a Add token counters for individual fields. Optimize total counter display 2023-08-21 15:32:27 +03:00
Cohee f9573eb45d Slight increase default font size 2023-08-21 12:29:14 +03:00
Tony Ribeiro 173cb6358b
Merge branch 'SillyTavern:staging' into staging 2023-08-21 05:36:47 +02:00
Tony Ribeiro 3ccac0580f - Audio
- refactored dynamic bgm to handle solo and group chat
        - added bgm cooldown variable, user can custom in the ui
2023-08-21 05:16:56 +02: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
RossAscends 84fb5b8ffd Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-21 08:09:14 +09:00
RossAscends 2f363ef025 change main font size to 14px 2023-08-21 08:09:00 +09:00
Cohee 4ea9e481a8
Merge branch 'staging' into staging 2023-08-21 01:51:12 +03:00
Cohee 3fbc9cd100 Add instruct to gitignore 2023-08-21 01:39:53 +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 d931fc8d37 Llama 2 instruct mode preset fixed 2023-08-20 22:04:11 +02:00
Stefan Daniel Schwarz f5d5b2f749 Format instruct mode examples 2023-08-20 22:03:45 +02:00
Tony Ribeiro 5acb764caf - 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-20 20:46:53 +02:00
Cohee 01cdcfa198 Remove substitutions in extensions where not necessary 2023-08-20 21:37:17 +03:00
Cohee db9e9342fa
Merge pull request #986 from SillyTavern/prompt-manager-hotfix
Prompt manager hotfix
2023-08-20 21:27:25 +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 7676409197
Merge pull request #972 from kingbased/qolfeatures
Various QOL additions
2023-08-20 19:47:59 +03:00
Cohee 065dffa8a4 Use CSS for fav group candidate coloring 2023-08-20 19:47:14 +03:00
Cohee d02fa88d3a Comment-out bookmark validation 2023-08-20 19:43:58 +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
Stefan Daniel Schwarz 090e7c5a6a Position persona after scenario 2023-08-20 17:32:50 +02:00
Cohee cf6a76929d WI skill issue 2023-08-20 18:32:02 +03:00
Stefan Daniel Schwarz 2ff2973d2b Instruct system prompt for instruct mode only 2023-08-20 17:30:19 +02:00
Tony Ribeiro a57a3d6188 Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-20 17:18:27 +02:00
Tony Ribeiro 7cbf53e02c Add initialization of audio module key in extension settings. 2023-08-20 17:18:15 +02:00
Tony Ribeiro 2637f94240
Merge branch 'SillyTavern:staging' into staging 2023-08-20 17:07:53 +02: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 7b8d10d25e Added Include Names and Forced Names to all instruct presets 2023-08-20 16:10: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