Commit Graph

906 Commits

Author SHA1 Message Date
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
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
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
Cohee 9d495d6b47
Merge pull request #981 from SillyTavern/hotfix-prompt-manager
Hotfix prompt manager
2023-08-20 15:38:54 +03:00
Cohee 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
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 6fb278266b
Merge pull request #977 from city-unit/feature/exorcism
Feature/exorcism
2023-08-20 12:37:56 +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
Cohee 7528a3828a
Merge pull request #978 from 50h100a/mancer-url-ui 2023-08-20 11:33:15 +03:00
Cohee d3efc90886
Merge pull request #975 from StefanDanielSchwarz/roleplay-preset-newlines 2023-08-20 11:29:38 +03:00
RossAscends 334dcc7454 WIP splitting of style.css 5.6k --> 3.5k lines 2023-08-20 15:49:27 +09: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
city-unit f70baff95e Comment tweaks 2023-08-20 00:33:37 -04:00
50h100a 8dca75f6c3 single-URL ui for mancer.
automatically produce streaming URL from blocking URL.
2023-08-20 00:33:00 -04:00
50h100a 83eb3449f3 localhost -> 127.0.0.1.
Thank you websockets, very cool.
2023-08-20 00:30:34 -04:00
city-unit 3ce8343016 Add comments and stuff 2023-08-20 00:15:57 -04:00
city-unit 24da113670 Just don't talk about it. 2023-08-20 00:02:13 -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