Commit Graph

3124 Commits

Author SHA1 Message Date
8bb59a9e22 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-20 23:33:26 +03:00
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
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
d931fc8d37 Llama 2 instruct mode preset fixed 2023-08-20 22:04:11 +02:00
f5d5b2f749 Format instruct mode examples 2023-08-20 22:03:45 +02:00
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
01cdcfa198 Remove substitutions in extensions where not necessary 2023-08-20 21:37:17 +03:00
db9e9342fa Merge pull request #986 from SillyTavern/prompt-manager-hotfix
Prompt manager hotfix
2023-08-20 21:27:25 +03:00
cb5b410daf Fix group nudge causing error 2023-08-20 20:18:10 +02:00
c3c99c534e Do not populate tokenHandlers legacy entries. 2023-08-20 19:58:04 +02:00
ea72584f39 Add elvis to getTokens when populating legacy context. 2023-08-20 19:46:46 +02:00
7676409197 Merge pull request #972 from kingbased/qolfeatures
Various QOL additions
2023-08-20 19:47:59 +03:00
065dffa8a4 Use CSS for fav group candidate coloring 2023-08-20 19:47:14 +03:00
d02fa88d3a Comment-out bookmark validation 2023-08-20 19:43:58 +03:00
be6fedd626 Simplify Claude prefill code 2023-08-20 19:26:49 +03:00
6e6eb8f61e Use CSS class for coloring 2023-08-20 19:09:19 +03:00
a27bef8b12 Merge branch 'staging' into qolfeatures 2023-08-20 18:47:43 +03:00
c2c0007ad1 Merge pull request #982 from SillyTavern/prompt-manager-hotfix
Prompt manager hotfix
2023-08-20 18:41:09 +03:00
090e7c5a6a Position persona after scenario 2023-08-20 17:32:50 +02:00
cf6a76929d WI skill issue 2023-08-20 18:32:02 +03:00
2ff2973d2b Instruct system prompt for instruct mode only 2023-08-20 17:30:19 +02:00
a57a3d6188 Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-20 17:18:27 +02:00
7cbf53e02c Add initialization of audio module key in extension settings. 2023-08-20 17:18:15 +02:00
2637f94240 Merge branch 'SillyTavern:staging' into staging 2023-08-20 17:07:53 +02:00
a99c543b9f Fix render function when no character is selected 2023-08-20 16:37:39 +02:00
07c24f363f Render prompt manager before a character is selected
When prompt order strategy is global
2023-08-20 16:28:42 +02:00
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
7b8d10d25e Added Include Names and Forced Names to all instruct presets 2023-08-20 16:10:22 +02:00
2fb86c8ebd Added Persona Description and System Prompt to Story String 2023-08-20 16:08:54 +02:00
58ab266365 Make sure new example chat is not added without messages 2023-08-20 15:53:42 +02:00
5fee1f6f96 Add group nudge to prompts array 2023-08-20 15:35:15 +02:00
58a018deae Check if newExample can be afforded before adding it 2023-08-20 15:35:01 +02:00
efa0f12349 Fix prompt manager issues 2023-08-20 16:25:16 +03:00
9d495d6b47 Merge pull request #981 from SillyTavern/hotfix-prompt-manager
Hotfix prompt manager
2023-08-20 15:38:54 +03:00
c2c8d83401 Merge pull request #974 from kingbased/hotfix-prompt-manager
prompt manager hotfix for groups and example chats
2023-08-20 15:38:20 +03:00
7ecc0295dc scale cookie method 2023-08-20 20:55:37 +10:00
106f7afdcb Slight performance increase for opening large World Infos 2023-08-20 13:15:02 +03:00
b44c72c639 Merge pull request #979 from Halsey1006/staging
NAI instruct prompt handling
2023-08-20 12:44:33 +03:00
6fb278266b Merge pull request #977 from city-unit/feature/exorcism
Feature/exorcism
2023-08-20 12:37:56 +03:00
94754af013 Reformat code 2023-08-20 12:37:38 +03:00
84e5a63c34 Fix SD group gen bugs 2023-08-20 12:29:20 +03:00
692c1a5e60 Fix background SD gens 2023-08-20 12:16:29 +03:00
7528a3828a Merge pull request #978 from 50h100a/mancer-url-ui 2023-08-20 11:33:15 +03:00
d3efc90886 Merge pull request #975 from StefanDanielSchwarz/roleplay-preset-newlines 2023-08-20 11:29:38 +03:00
334dcc7454 WIP splitting of style.css 5.6k --> 3.5k lines 2023-08-20 15:49:27 +09:00
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
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
e8c996ff61 Move to char+timestamp for img naming. 2023-08-20 01:41:58 -04:00
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
f70baff95e Comment tweaks 2023-08-20 00:33:37 -04:00