Commit Graph

2746 Commits

Author SHA1 Message Date
Cohee 223325e8bb
Merge pull request #1623 from SillyTavern/xtts-stream
Add support for XTTS streaming
2024-01-02 13:12:33 +02:00
Cohee c69724e1da Fix GUI Kobold 2024-01-02 10:28:34 +02:00
Cohee 99244a0c11 Add support for XTTS streaming 2024-01-02 07:04:32 +02:00
Juha Jeronen 059f61fee8 add "/emote xxx" support for talkinghead (when VN mode off) 2024-01-02 02:18:54 +02:00
LenAnderson 70d6e6d37f prevent inject on auto-execute 2024-01-01 23:08:18 +00:00
LenAnderson 473326b3fb remove unused import 2024-01-01 22:40:12 +00:00
LenAnderson 67f1127f8d Merge branch 'qr-rewrite' of https://github.com/LenAnderson/SillyTavern into qr-rewrite 2024-01-01 22:35:00 +00:00
LenAnderson 95d5cf509d fix auto exec on chat changed 2024-01-01 22:34:57 +00:00
Cohee 9b24e7dc67
Merge pull request #1596 from DonMoralez/staging
added exclude prefixes, modified sequence checker
2024-01-01 23:33:58 +02:00
Cohee e5968e2682 Fix description 2024-01-01 23:33:32 +02:00
Cohee b108a1fae9 Simplify UI hints 2024-01-01 23:26:51 +02:00
Cohee 9a1103cf43 Merge branch 'staging' into qr-rewrite 2024-01-01 22:36:53 +02:00
Cohee a69f92444b Add AND ALL logic for WI secondary keys 2024-01-01 21:49:54 +02:00
Cohee b315778e32 Chunkify NovelAI TTS 2024-01-01 21:31:08 +02:00
Cohee 58462d96d2 Fix RVC after converting to group 2024-01-01 20:22:48 +02:00
LenAnderson 65131ee095 fix settings migration 2024-01-01 18:12:28 +00:00
LenAnderson 30757dc92e fix for loading old QRs 2024-01-01 17:14:44 +00:00
Cohee de5452c48d Merge branch 'staging' into qr-rewrite 2024-01-01 18:48:59 +02:00
Cohee 52637ccd39
Merge pull request #1619 from LenAnderson/worldinfo_updated-event
Add event when world info is updated
2024-01-01 18:35:23 +02:00
Cohee f53d937782 Fix mistral undefined name 2024-01-01 18:31:17 +02:00
Cohee 9106696f2f Render prompt manager when switching APIs 2024-01-01 17:06:10 +02:00
Cohee 908bf7a61d Merge branch 'staging' into generate-cleanups-3 2024-01-01 16:49:35 +02:00
LenAnderson 8cd75cf03d add event when world info is updated 2024-01-01 14:34:09 +00:00
Cohee 30732ada32 Lint fix 2024-01-01 16:08:24 +02:00
Cohee 213ff4b89a
Merge pull request #1613 from LenAnderson/expressions-get-last
Add export and slash command for last set expressions
2024-01-01 16:06:57 +02:00
Cohee a2e4dc2950 Add chunking of vector storage messages 2023-12-31 04:00:04 +02:00
LenAnderson a2aa8ba6a0 add export and slash command for last set expressions 2023-12-30 11:37:13 +00:00
LenAnderson 57a6190cd0 Merge branch 'staging' into qr-rewrite 2023-12-29 15:33:21 +00:00
Paniphon 9fb631b2f1
Add Alpaca-Single-Turn instruct template 2023-12-29 01:23:31 +07:00
Paniphon 3a4c5f6a05
Add Alpaca-Single-Turn context template 2023-12-29 01:22:03 +07:00
maver ee70593a7e Add world info to generate_before_combine_prompts event data 2023-12-28 17:03:36 +01:00
LenAnderson 43d37b58db Merge branch 'staging' into qr-rewrite 2023-12-28 11:24:44 +00:00
LenAnderson 0590b36838 only reload ST after extension popup closed 2023-12-28 10:46:25 +00:00
Cohee 8dd4543e93 Remove macro from user messages when using bias 2023-12-28 11:19:56 +02:00
LenAnderson 8a3124e296 add executeQuickReply to QR API 2023-12-28 01:29:56 +00:00
LenAnderson 03b80900d6 add optional named arguments to /run command 2023-12-27 12:28:15 +00:00
valadaptive 77b02a8d4b Extract data.error check 2023-12-26 12:41:35 -05:00
LenAnderson 678a702d6e adjust popout trigger position 2023-12-26 12:24:11 +00:00
LenAnderson d51098a90b fix deleting QR set that's in chat config 2023-12-26 12:16:45 +00:00
LenAnderson 89e94edc57 add option to prevent recursive auto-execute 2023-12-26 12:06:23 +00:00
LenAnderson ef33c6dc61 don't stop auto-execute on /abort 2023-12-26 11:37:23 +00:00
LenAnderson c67317c2a1 Merge branch 'staging' into qr-rewrite 2023-12-25 13:10:58 +00:00
LenAnderson 29476e7c03 add import and export of QR sets 2023-12-25 13:08:03 +00:00
DonMoralez 7eefae2d6e Merge remote-tracking branch 'upstream/staging' into staging 2023-12-25 13:35:10 +02:00
valadaptive 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
valadaptive 3c0207f6cb Move "continue on send" logic out of Generate() 2023-12-25 03:48:49 -05:00
valadaptive 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
valadaptive 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
valadaptive 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
valadaptive 0d3505c44b Remove OAI_BEFORE_CHATCOMPLETION
Not used in any internal code or extensions I can find.
2023-12-25 03:48:49 -05:00
valadaptive d2f8632368 Remove populateLegacyTokenCounts
Unused and the documentation says it should probably be removed
2023-12-25 03:48:49 -05:00
valadaptive 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
Cohee 47cb017a45 #1589 Add 'cache_prompt' for l.cpp 2023-12-25 02:42:03 +02:00
DonMoralez a8e5285ff7 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-25 01:19:30 +02:00
Cohee 352b00caca Merge branches 'staging' and 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-12-24 23:11:11 +02:00
RigbyB b6570e775d ComfyUI request/prompt fix 2023-12-24 21:02:04 +00:00
Cohee 4b254a75bc Add scale icon 2023-12-24 20:02:11 +02:00
Cohee f8dece9d88 Always remove logit bias and stop from vision 2023-12-24 20:01:59 +02:00
LenAnderson e147b2bd23 Merge branch 'staging' into qr-rewrite 2023-12-24 15:10:05 +00:00
LenAnderson 881a8e570f add execute button to QR editor 2023-12-24 15:07:12 +00:00
DonMoralez 3ac971b145 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-24 13:31:21 +02:00
Cohee a9e074dae1 Don't recreate first message if generation was run at least once 2023-12-24 02:47:00 +02:00
LenAnderson de8dc7310f fix for settings dom undefined 2023-12-24 00:29:44 +00:00
LenAnderson e01b51e6bd Merge branch 'staging' into qr-rewrite 2023-12-24 00:25:27 +00:00
LenAnderson aed38e32bd add ctrl-click to edit QR 2023-12-24 00:20:47 +00:00
LenAnderson 5cd911db6b put large message editor into additional options dlg 2023-12-24 00:20:30 +00:00
Cohee a8fb306c12 Add multimodal captioning for ooba 2023-12-24 01:43:29 +02:00
LenAnderson 3d5dc18d0c move click listener up 2023-12-23 23:26:00 +00:00
LenAnderson 3722bd25d4 Merge branch 'staging' into qr-rewrite 2023-12-23 22:05:10 +00:00
DonMoralez b476efd723 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-23 23:34:46 +02:00
LenAnderson 71fc0436cb center add qr button 2023-12-23 19:43:42 +00:00
DonMoralez 18e6a82306 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-23 20:06:55 +02:00
LenAnderson a8f130ec5d add slash commands to get existing QRs and QR sets 2023-12-23 16:36:41 +00:00
Doa 41ac2c07b2 Adding negative character prompts for img sources that support it 2023-12-23 16:19:22 +00:00
Cohee db3bf42d63 Fix Firefox number arrows not updating the slider 2023-12-23 16:09:03 +02:00
DonMoralez 6fb69d5929 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-23 00:25:57 +02:00
DonMoralez 6f163bd09c Modified exclude prefixes 2023-12-23 00:25:48 +02:00
Cohee b7a338e130 Move all Horde requests to server 2023-12-22 22:10:09 +02:00
Cohee 89d70539b9 Alternative continue method for chat completions 2023-12-22 20:24:54 +02:00
DonMoralez e95482aea1 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-22 17:12:59 +02:00
DonMoralez ee06a488b0 Add exclude prefixes checkbox, modified sequence checker 2023-12-22 17:04:58 +02:00
LenAnderson 6e3159db3f Merge branch 'staging' into qr-rewrite 2023-12-22 13:56:04 +00:00
LenAnderson 82a4ddbe01 cleanup 2023-12-22 13:55:37 +00:00
LenAnderson cbceb7d1e8 add old settings migration 2023-12-22 13:45:37 +00:00
LenAnderson f90e60783c remove debugger 2023-12-22 13:45:37 +00:00
LenAnderson 4fc456dffa delete QR set command and API 2023-12-22 13:45:37 +00:00
LenAnderson a088fb1746 error handling 2023-12-22 13:45:37 +00:00
LenAnderson e3c2d6771c fix slash command hints 2023-12-22 13:45:37 +00:00
LenAnderson 9e7bc0b8ab update todos 2023-12-22 13:45:37 +00:00
LenAnderson 9f13ab1fe9 rename exported quick reply api var 2023-12-22 13:45:37 +00:00
LenAnderson a0918a3f5c add QR API 2023-12-22 13:45:37 +00:00
LenAnderson 5125eaf1dc implement slash commands 2023-12-22 13:45:37 +00:00
LenAnderson 8959c0d380 add QR popout 2023-12-22 13:45:37 +00:00
LenAnderson 40706e8430 fix isCombined not saved 2023-12-22 13:45:37 +00:00
LenAnderson 65e16affb7 add context menu 2023-12-22 13:45:37 +00:00
LenAnderson bab0c4b0b9 add linebreaks in confirm popups 2023-12-22 13:45:37 +00:00
LenAnderson c71a5bb82f handle overwriting QR set 2023-12-22 13:45:37 +00:00
LenAnderson 3a9b163aca add delete hack :( 2023-12-22 13:45:37 +00:00
LenAnderson ac09fa6019 handle deleting 2023-12-22 13:45:37 +00:00
LenAnderson 2648b3c801 restructuring 2023-12-22 13:45:19 +00:00
Cohee 18445f527b Fix select2 empty message background + correct before selector 2023-12-22 02:22:09 +02:00
Cohee 45f6cb0fa8 Add chunked translate for long messages 2023-12-22 00:05:23 +02:00
Cohee 09fd772a20 #1579 Add ooba character yaml import 2023-12-21 21:46:09 +02:00
Cohee 4621834c87 Short formatting path for empty messages 2023-12-21 20:50:30 +02:00
Cohee a85a6cf606 Allow displaying unreferenced macro in message texts 2023-12-21 20:49:03 +02:00
Cohee 39e0b0f5cb Remove custom Handlebars helpers for extensions. 2023-12-21 20:33:50 +02:00
valadaptive 8fb26284e2
Clean up Generate(), part 2 (#1578)
* Move StreamingProcessor constructor to the top

Typical code style is to declare the constructor at the top of the class
definition.

* Remove removePrefix

cleanupMessage does this already.

* Make message_already_generated local

We can pass it into StreamingProcessor so it doesn't have to be a global
variable.

* Consolidate setting isStopped and abort signal

Various places were doing some combination of setting isStopped, calling
abort on the streaming processor's abort controller, and calling
onStopStreaming. Let's consolidate all that functionality into
onStopStreaming/onErrorStreaming.

* More cleanly separate streaming/nonstreaming paths

* Replace promise with async function w/ handlers

By using onSuccess and onError as promise handlers, we can use normal
control flow and don't need to remember to use try/catch blocks or call
onSuccess every time.

* Remove runGenerate

Placing the rest of the code in a separate function doesn't really do
anything for its structure.

* Move StreamingProcessor() into streaming code path

* Fix return from circuit breaker

* Fix non-streaming chat completion request

* Fix Horde generation and quiet unblocking

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-12-21 20:20:28 +02:00
Cohee bddccd0356 Missed several context bind cases 2023-12-21 17:19:42 +02:00
Cohee b5e59c819c Merge branch 'staging' into claude-rework 2023-12-21 16:52:43 +02:00
Cohee e1afe41c91 Fix custom expression duplication 2023-12-21 16:50:30 +02:00
Cohee b3dfe16706 #1575 Fix clean-up WI depth injections 2023-12-21 16:33:21 +02:00
Cohee dd661cf879 Instruct "Bind to context" is now an option 2023-12-21 15:12:30 +02:00
Cohee ee75adbd2d Update persona name if it is bound by user name input 2023-12-21 14:56:32 +02:00
Cohee f3099ac270 Remove model icon fill colors 2023-12-21 14:43:36 +02:00
Cohee 747867c6f4
Merge pull request #1580 from SillyTavern/custom
Custom API endpoint type for Chat Completion
2023-12-21 14:42:18 +02:00
RossAscends afdd9d823e Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-12-21 12:43:59 +09:00
RossAscends 348cc5f2a5 placeholder API icon for tabby 2023-12-21 12:43:57 +09:00
Cohee 3001db3a47 Add additional parameters for custom endpoints 2023-12-20 23:39:10 +02:00
Cohee e42daa4098 Add caption ask prompt mode 2023-12-20 21:23:59 +02:00
Cohee ae64c99835 Add custom caption source 2023-12-20 21:05:20 +02:00
Cohee cf8d7e7d35 Merge branch 'staging' into custom 2023-12-20 18:37:47 +02:00
Cohee ebec26154c Welcome message fixed 2023-12-20 18:37:34 +02:00
Cohee 5734dbd17c Add custom endpoint type 2023-12-20 18:29:03 +02:00
Cohee 041b9d4b01 Add style sanitizer to message renderer 2023-12-20 17:03:37 +02:00
LenAnderson 34decf1c05 add creating of new QR sets 2023-12-20 14:04:28 +00:00
Cohee c212a71425 Fix ignore list of preset manager 2023-12-20 15:51:00 +02:00
Cohee b0a4341571
Merge pull request #1574 from artisticMink/feature/before-combine-event
Allow extensions to alter the context order.
2023-12-20 15:46:34 +02:00
LenAnderson 69d6b9379a implement QR basics 2023-12-20 13:40:44 +00:00
LenAnderson e19bf1afdd clean out QR extension 2023-12-20 13:39:09 +00:00
Cohee 93db2bf953 Simplify extras summary settings 2023-12-20 01:56:35 +02:00
Cohee 4b131067e4 Add local multimodal caption sources 2023-12-20 00:45:45 +02:00
Cohee 029cf598ce Fix /peek command 2023-12-19 23:12:14 +02:00
maver 8d63ce5559 Log Novel Ai prompt to console
When prompt logging is enabled.
2023-12-19 19:27:24 +01:00
maver f30f75b310 Add GENERATE_BEFORE_COMBINE_PROMPTS event
Allows for context to be ordered by extensions
2023-12-19 19:11:36 +01:00
Cohee 3b22159f53 Fix spelling 2023-12-19 19:45:28 +02:00
Cohee c7b93b690f
Merge pull request #1573 from StefanDanielSchwarz/Llama-2-Chat-separator-fix
Llama 2 Chat separator fix
2023-12-19 19:14:54 +02:00
Cohee 67dd52c21b #1309 Ollama text completion backend 2023-12-19 16:38:11 +02:00
SDS d9fc396b39
Update Llama 2 Chat.json
Official separator is a space instead of a newline. That format itself is still FUBAR, but at least we get a little closer to what it was intended to look, I guess.
2023-12-19 00:48:42 +01:00
maver 0a649a395d Add 'synchronous' event emitter 2023-12-18 21:55:33 +01:00
Cohee edd737e8bd #371 Add llama.cpp inference server support 2023-12-18 22:38:28 +02:00
DonMoralez 37807acc60 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-18 22:01:38 +02:00
Cohee 6e8104873e #1569 Add logit bias for text completions 2023-12-18 18:57:10 +02:00
Cohee 08ea2095f8 Refactor Novel logit bias 2023-12-18 17:32:10 +02:00
Cohee be5d428706
Merge pull request #1565 from SillyTavern/togetherai
Add TogetherAI as a text completion source
2023-12-18 14:52:36 +02:00
Carsten Kragelund Jørgensen c2ad90eb2a
fix: verify QR exists when deleting through /qr-delete 2023-12-18 13:29:27 +01:00
Cohee ac70a0a592 Add TogetherAI for image generation 2023-12-18 03:33:05 +02:00
Cohee 4473532151 Merge branch 'staging' into togetherai 2023-12-18 02:35:38 +02:00
Cohee f6b59d0d3a Uniform command registration 2023-12-18 02:35:02 +02:00
Cohee bdc7aaf3f1
Merge pull request #1567 from LenAnderson/more-comfyui-flexibility
More comfyui flexibility
2023-12-18 02:33:13 +02:00
DonMoralez 1df9e628bd Merge remote-tracking branch 'upstream/staging' into staging 2023-12-18 02:25:52 +02:00
DonMoralez 50ece13752 Add restore button, def hum message, claude check 2023-12-18 02:25:17 +02:00
Cohee f249ff8b20 Fix slash commands for offscreen group members 2023-12-18 01:39:37 +02:00
LenAnderson 796ab7eff8 validate /icw 2023-12-17 22:57:10 +00:00
LenAnderson 56b9398353 add slash command to change comfy workflows 2023-12-17 22:24:22 +00:00
LenAnderson 55b9ebad3f add custom placeholders for comfy workflows 2023-12-17 22:17:08 +00:00
Cohee b0d9f14534 Re-add Together as a text completion source 2023-12-17 23:38:03 +02:00
Cohee 180061337e Merge branch 'staging' into anachronous/release 2023-12-17 21:35:49 +02:00
Cohee 61e87d562f Add confirmation for regen with keystroke 2023-12-17 21:27:33 +02:00
Cohee 960c91c147 Add confirmation for convert to group 2023-12-17 21:14:16 +02:00
Cohee a91f0f7ee5 Fix saving presets after deletion of the same name 2023-12-17 21:02:32 +02:00
DonMoralez 7835a1360f Merge remote-tracking branch 'upstream/staging' into staging 2023-12-17 19:46:47 +02:00
LenAnderson fb25a90532 add GENERATION_STARTED event 2023-12-17 17:45:23 +00:00
Cohee c7c1513e91 Add proxy support for multimodal captions. Add caption pre-prompt 2023-12-17 19:41:20 +02:00
RossAscends a88cf1552a add check for uparrow hotkey to see if last_mes edit buttons are visible 2023-12-17 23:19:20 +09:00
DonMoralez 27a25e1298 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-17 13:52:49 +02:00
RossAscends b0907d23cc Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-12-17 20:18:53 +09:00
RossAscends 3d1bbd94e1 allow msg edit hotkey when user is last 2023-12-17 20:18:51 +09:00
anachronos 1e88c8922a
Merge branch 'staging' into release 2023-12-17 10:38:04 +01:00
Cohee a62122a7d7 Merge branch 'staging' into mistral 2023-12-17 02:41:29 +02:00
Cohee e0531f85dc
Merge pull request #1557 from SillyTavern/Deathspike/release
Allow comma after "char" prefix
2023-12-17 02:38:39 +02:00
Cohee 6e8a217482
Merge pull request #1548 from Deathspike/release
Add SD character-specific prompt prefix options to free-mode
2023-12-17 02:38:14 +02:00
Cohee 7fb9d9bfc1 Allow comma after "char" prefix 2023-12-17 02:34:42 +02:00
Cohee 26e822046e Hide "Summarize now" for extras source 2023-12-16 22:33:09 +02:00
Fayiron eb2a85cfe0 Add TogetherAI API key to secrets.js 2023-12-16 15:11:04 +01:00
Fayiron 2e1660e895 Add TogetherAI model and settings 2023-12-16 15:08:03 +01:00
Fayiron ccb6ba8cb3 Add TogetherAI integration form 2023-12-16 14:48:49 +01:00
Fayiron 9f2d32524c Add TogetherAI as a chat completion source, basic 2023-12-16 14:39:30 +01:00
DonMoralez d19cc7ee36 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-16 14:06:25 +02:00
Deathspike 14400b05f9 Rework character-prefixed free-mode to support macro 2023-12-16 11:29:34 +01:00
based ed96ec5c3e reverse proxy condition fix 2023-12-16 12:02:34 +10:00
Cohee b569d74552 Configurable auto-mode delay 2023-12-16 02:52:48 +02:00
Cohee e609789f8d Adjust step for OAI TTS speed 2023-12-16 01:58:52 +02:00
based f16ac8686e just incase 2023-12-16 09:50:10 +10:00
Cohee 6774ec3eb9 Add a separate button to update current UI theme 2023-12-16 01:45:48 +02:00
based af059a6af6 more last prompt fixes + added an svg 2023-12-16 09:44:47 +10:00
Cohee 9b9026b12e Add toggle for compact input area (mobile) 2023-12-16 01:35:28 +02:00
based e8ca2e8c22 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into mistral 2023-12-16 08:48:37 +10:00
based 7acb61ab68 use appropriate tokenizer with mistral completion source 2023-12-16 08:47:51 +10:00
Cohee 0678a385d7
Merge pull request #1551 from alicat22/dev
ZenSlider - Default 10 steps to 20
2023-12-16 00:41:55 +02:00
based 5dd2e8cd88 added mistral vector support (off the back of oai's) 2023-12-16 08:37:39 +10:00
DonMoralez 6b59014892 (Fix) "squash sys. messages" processed empty messages, adding \n 2023-12-16 00:24:48 +02:00
DonMoralez 1f36a3eaae Merge remote-tracking branch 'upstream/staging' into staging 2023-12-16 00:15:16 +02:00
AliCat 3aa950bb45
ZenSlider - Default 10 steps to 20 2023-12-15 15:01:05 -07:00
Cohee 2b448233e9
Merge pull request #1545 from LenAnderson/times-slash-command
add /times slash command
2023-12-15 23:39:29 +02:00
Cohee 5bda74b886
Too many lines 2023-12-15 23:39:02 +02:00
based 583f786d74 finish mistral frontend integration + apikey status check 2023-12-16 07:15:57 +10:00
based 041957975a add mistral completion source to UI 2023-12-16 06:08:41 +10:00
LenAnderson 279b731f64 use isFalseBoolean in while and times 2023-12-15 19:48:25 +00:00
LenAnderson 74d0ef5572 make MAX_LOOPS module wide 2023-12-15 19:47:40 +00:00
Cohee 9d68a8b7ae #1408 Force summary source-specific controls on load 2023-12-15 21:35:25 +02:00