Commit Graph

5633 Commits

Author SHA1 Message Date
060bc60794 Merge pull request #1614 from LenAnderson/editorconfig-markdown-fix 2023-12-30 15:39:26 +02:00
520fa99a00 don't trim trailing whitespace in markdown files 2023-12-30 11:42:27 +00:00
a2aa8ba6a0 add export and slash command for last set expressions 2023-12-30 11:37:13 +00:00
57a6190cd0 Merge branch 'staging' into qr-rewrite 2023-12-29 15:33:21 +00:00
a436a2536f Merge pull request #1608 from paniphons/staging
Add Alpaca-Single-Turn context templates
2023-12-29 16:40:08 +02:00
9fb631b2f1 Add Alpaca-Single-Turn instruct template 2023-12-29 01:23:31 +07:00
3a4c5f6a05 Add Alpaca-Single-Turn context template 2023-12-29 01:22:03 +07:00
13004eba69 Merge pull request #1607 from artisticMink/wi-for-combine-prompts-event 2023-12-28 19:09:03 +02:00
ee70593a7e Add world info to generate_before_combine_prompts event data 2023-12-28 17:03:36 +01:00
43d37b58db Merge branch 'staging' into qr-rewrite 2023-12-28 11:24:44 +00:00
05a6b64064 Merge pull request #1606 from LenAnderson/better-extension-reload
only reload ST after extension popup closed
2023-12-28 13:23:40 +02:00
0590b36838 only reload ST after extension popup closed 2023-12-28 10:46:25 +00:00
8dd4543e93 Remove macro from user messages when using bias 2023-12-28 11:19:56 +02:00
1bd8ef6054 Add Japanese README 2023-12-28 15:23:03 +09:00
8a3124e296 add executeQuickReply to QR API 2023-12-28 01:29:56 +00:00
03b80900d6 add optional named arguments to /run command 2023-12-27 12:28:15 +00:00
6508a2d924 Update readme-zh_cn.md 2023-12-27 11:04:59 +02:00
f9745091f5 Update readme.md 2023-12-27 11:04:26 +02:00
77b02a8d4b Extract data.error check 2023-12-26 12:41:35 -05:00
678a702d6e adjust popout trigger position 2023-12-26 12:24:11 +00:00
d51098a90b fix deleting QR set that's in chat config 2023-12-26 12:16:45 +00:00
89e94edc57 add option to prevent recursive auto-execute 2023-12-26 12:06:23 +00:00
e0a84b0a56 reworked name assignment a bit 2023-12-26 13:45:39 +02:00
ef33c6dc61 don't stop auto-execute on /abort 2023-12-26 11:37:23 +00:00
c67317c2a1 Merge branch 'staging' into qr-rewrite 2023-12-25 13:10:58 +00:00
29476e7c03 add import and export of QR sets 2023-12-25 13:08:03 +00:00
7eefae2d6e Merge remote-tracking branch 'upstream/staging' into staging 2023-12-25 13:35:10 +02:00
0f8a16325b Extract dryRun early return from finishGenerating
This means we only have to handle it in one place rather than two.
2023-12-25 03:48:49 -05:00
3c0207f6cb Move "continue on send" logic out of Generate() 2023-12-25 03:48:49 -05:00
7899549754 Make "send message from chat box" into a function
Right now all it does is handle returning if there's already a message
being generated, but I'll extend it with more logic that I want to move
out of Generate().
2023-12-25 03:48:49 -05:00
1029ad90a2 Extract "not in a chat" check into guard clause
This lets us remove a layer of indentation, and reveal the error
handling logic that was previously hidden below a really long block of
code.
2023-12-25 03:48:49 -05:00
4fc2f15448 Reformat up Generate() group logic
The first two conditions in the group if/else blocks are the same, so we
can combine them.
2023-12-25 03:48:49 -05:00
0d3505c44b Remove OAI_BEFORE_CHATCOMPLETION
Not used in any internal code or extensions I can find.
2023-12-25 03:48:49 -05:00
d2f8632368 Remove populateLegacyTokenCounts
Unused and the documentation says it should probably be removed
2023-12-25 03:48:49 -05:00
f53e051cbf Lift precondition check out of processCommands
Instead of passing type and dryRun into processCommands, do the check in
Generate, the only function that calls it. This makes the logic clearer.
2023-12-25 03:48:49 -05:00
47cb017a45 #1589 Add 'cache_prompt' for l.cpp 2023-12-25 02:42:03 +02:00
a8e5285ff7 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-25 01:19:30 +02:00
352b00caca Merge branches 'staging' and 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-12-24 23:11:11 +02:00
3b2ea4b0e7 Merge pull request #1592 from rigbyb/comfyui_fix
ComfyUI request/prompt fix
2023-12-24 23:10:51 +02:00
b6570e775d ComfyUI request/prompt fix 2023-12-24 21:02:04 +00:00
4b254a75bc Add scale icon 2023-12-24 20:02:11 +02:00
f8dece9d88 Always remove logit bias and stop from vision 2023-12-24 20:01:59 +02:00
e147b2bd23 Merge branch 'staging' into qr-rewrite 2023-12-24 15:10:05 +00:00
881a8e570f add execute button to QR editor 2023-12-24 15:07:12 +00:00
3ac971b145 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-24 13:31:21 +02:00
a9e074dae1 Don't recreate first message if generation was run at least once 2023-12-24 02:47:00 +02:00
de8dc7310f fix for settings dom undefined 2023-12-24 00:29:44 +00:00
e01b51e6bd Merge branch 'staging' into qr-rewrite 2023-12-24 00:25:27 +00:00
aed38e32bd add ctrl-click to edit QR 2023-12-24 00:20:47 +00:00
5cd911db6b put large message editor into additional options dlg 2023-12-24 00:20:30 +00:00