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
