Commit Graph

2592 Commits

Author SHA1 Message Date
Cohee 306bff0a92 #2085 Switch to async token counters 2024-04-13 21:33:19 +03:00
Cohee 1c4bad35b2 #2085 Implement async token counting 2024-04-13 21:05:31 +03:00
Cohee ba397dd2a8 #2062 Extend unlock for MakerSuite models 2024-04-13 20:09:51 +03:00
Cohee de8339f77b Fix ESLint 2024-04-13 15:24:49 +03:00
Cohee f79f335491
Merge pull request #2078 from LenAnderson/fix-popup
Fix popup
2024-04-13 15:23:39 +03:00
kingbri 913085ba74 Expressions: Let the user know if classification failed
Send a message if the classifer fails and fallback to the default
expression.

Signed-off-by: kingbri <bdashore3@proton.me>
2024-04-13 01:29:54 -04:00
LenAnderson 278ec029f5 add missing cancelButton setting to callGenericPopup 2024-04-12 20:50:14 -04:00
LenAnderson 91558ad9ea add enter to submit on input type 2024-04-12 20:49:55 -04:00
kingbri 8c4dd6ce1e Expressions: Ignore stopping strings
Don't use stopping strings when triggering a classify generation.

Signed-off-by: kingbri <bdashore3@proton.me>
2024-04-12 09:57:09 -04:00
Cohee 9c218455c4 [chore] Run ESLint 2024-04-12 14:22:12 +03:00
Cohee d9baff45bb Fix return types. Async functions must return a Promise. 2024-04-12 14:18:59 +03:00
ThisIsPIRI 6603e33fd8 Add hideChatMessage back 2024-04-12 20:05:58 +09:00
ThisIsPIRI 208e089761 Replace hideChatMessage with hideChatMessageRange 2024-04-12 16:03:50 +09:00
kingbri bea63a2efe Expressions: Remove TalkingHead from choices
This is a sub-choice under extras.

Signed-off-by: kingbri <bdashore3@proton.me>
2024-04-12 01:59:44 -04:00
kingbri 6b656bf380 Expressions: Classify using LLM
Rather than using a separate BERT model to classify the last message,
use the LLM itself to get the classified expression label as a JSON
and set that as the current sprite. Doing this should take more information
into consideration and cut down on extra processing.

This is made possible by the use of constrained generation with JSON
schemas. Only available to TabbyAPI since it's the only backend that
supports the use of JSON schemas, but there can hopefully be a way
to use this with other backends as well.

Intercepts the generation and sets top_k = 1 (for greedy sampling)
and the json_schema to an emotion enum. Doing this also prevents
reingestion of the entire context every time a message is sent and
then asked to be classified, which doesn't compromise the chat
experience.

Signed-off-by: kingbri <bdashore3@proton.me>
2024-04-12 01:55:16 -04:00
RossAscends 626c93a1ab Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2024-04-12 08:21:18 +09:00
RossAscends 94f14340ae add background image name reporting for /bg with no args 2024-04-12 08:21:17 +09:00
Cohee 356f1f9c39 Clean-up non-character state checks 2024-04-11 23:50:01 +03:00
Cohee 123131074c Change built-in extensions template render to async 2024-04-11 23:38:44 +03:00
Cohee 16cabb38ad Fix init order in RA mods 2024-04-11 22:47:28 +03:00
Cohee 3da9fb4efe Switch to module exports 2024-04-11 22:39:42 +03:00
Cohee 369c3512c0 Add async template renderer 2024-04-11 22:36:23 +03:00
Cohee 6290dff3d9 #2065 Add option to translate text before classification 2024-04-11 22:09:05 +03:00
Cohee 210f388d7a Switch button style to use class 2024-04-11 21:33:15 +03:00
the big boss 063c81540d
IVC + support new settings and turbo model (#2067) 2024-04-11 21:29:19 +03:00
Cohee ee62f77e96
Merge pull request #2063 from kingbased/goog
Gemini system prompt support
2024-04-11 19:49:20 +03:00
Cohee d2ac782c3c Fix broken HTML and code style 2024-04-11 19:21:59 +03:00
Yokayo 0486fe0126
Bind strings to locale 2024-04-11 14:58:07 +07:00
Yokayo 40cae057a5
Bind string to locale 2024-04-11 14:55:38 +07:00
based 34bca69950 system prompt support for gemini 1.5 2024-04-11 16:38:20 +10:00
Cohee 5f6d895acf Add attribution links 2024-04-10 21:21:31 +03:00
Cohee c90105e9f6 Merge branch 'staging' into pollinations 2024-04-10 21:14:36 +03:00
Cohee 53baa7aae7 #2051 #2031 Selectable prompt converter for custom OAI type 2024-04-10 21:12:57 +03:00
Cohee 91e93958b8
Merge pull request #2055 from kingbased/turbo
new turbo model
2024-04-10 14:30:06 +03:00
based 540cddf300 new turbo model 2024-04-10 14:24:43 +10:00
kingbri b8b49f0012 TextgenSettings: Fix JSON schema fallback
Did not fall back if the provided string was empty, resulting in
errors

Signed-off-by: kingbri <bdashore3@proton.me>
2024-04-09 22:15:00 -04:00
Cohee 42e1ade148 Add a {{noop}} macro 2024-04-10 01:04:12 +03:00
Cohee 69d219cd7e Allow trimming chat start with {{trim}} macro 2024-04-10 00:32:53 +03:00
Cohee 99a7925be4 Don't force a newline for story string if instruct wrap is disabled 2024-04-10 00:04:20 +03:00
Cohee fc1896dcff #2047 (WIP) Refactor TTS worker to use event source 2024-04-09 17:50:27 +03:00
Cohee 235afb5d15 Fix asset title for non-extension types 2024-04-09 11:30:24 +03:00
Cohee 6d65d47f00 Fix macro not being subbed in example separators for instruct 2024-04-09 11:24:16 +03:00
Cohee a10cff376b
Merge pull request #2045 from LenAnderson/popups-with-own-dom
Popups with own dom
2024-04-09 11:11:56 +03:00
Cohee 7311997e7a
Merge pull request #2042 from Wolfsblvt/macro-main-system-prompt
Add a main {{systemPrompt}} macro
2024-04-09 10:21:33 +03:00
Cohee 0391ef63d6 Fix bottom text of the comment 2024-04-09 10:20:59 +03:00
Cohee 2994ffc357
Merge pull request #2032 from Wolfsblvt/fix-pick-macro-branches
Fix pick macro rerolling on branches/renames
2024-04-09 10:13:36 +03:00
Cohee 0594859fb9 #2046 Fix for undefined fields 2024-04-09 10:11:05 +03:00
LenAnderson b461c6f0bb use generic popups for QR editor 2024-04-08 18:43:21 -04:00
LenAnderson 0e2a82ce00 add generic popups with their own elements 2024-04-08 18:42:33 -04:00
Wolfsblvt 845409a239 Add a main {{systemPrompt}} macro 2024-04-08 20:05:59 +02:00
RossAscends d56722a4b6 helper text and repo link tooltip for asset list items 2024-04-09 02:48:39 +09:00
Cohee db9ade20d5
Merge pull request #2036 from Wolfsblvt/group-chat-desc-join-template
Group chat-specific join prefix/suffix for char fields
2024-04-08 15:22:24 +03:00
Cohee 6e250eafcd Fix shrunken group wrapper controls 2024-04-08 15:18:08 +03:00
Cohee 0c41ab6090 Fix chatIdHash being empty on the first evaluation 2024-04-08 15:10:15 +03:00
Cohee c55181f955 Fix control alignment funkiness 2024-04-08 14:55:31 +03:00
Wolfsblvt 40b3640fa2 Fix group join prefix/suffix controls state on render 2024-04-08 00:34:21 +02:00
LenAnderson 63cbfda9b1 add ctrl-enter to execute from editor 2024-04-07 17:01:26 -04:00
LenAnderson 21d3a7dc3e add tab size setting to QR editor 2024-04-07 17:01:02 -04:00
LenAnderson 3ed0564d73 add default value to qr editor wrap setting 2024-04-07 16:59:50 -04:00
Wolfsblvt f4fcbff17e Fix spacing on field join for empty suffix/prefix 2024-04-07 21:23:45 +02:00
Wolfsblvt 4a4296127c Group chat-specific join prefix/suffix for char fields
- Add group chat setting fields for "prefix" and "suffix"
- Settings will be visible when any "join" setting is selected
- each part will be surrounded, which optional macro replacements on the prefix/suffix
2024-04-07 21:12:41 +02:00
Wolfsblvt b027c04066 Remove chat save on pick macro 2024-04-07 20:37:05 +02:00
Cohee 63117653bb
Merge pull request #2030 from Wolfsblvt/fix-empty-lines-on-group-squash
Fix empty lines on group squashing of char fields
2024-04-07 15:37:49 +03:00
Wolfsblvt e26c7827bc Fallback expression reset if custom expression deleted 2024-04-07 06:26:48 +02:00
Wolfsblvt 2ffb44b4e1 Add extension setting for fallback expression 2024-04-07 06:12:52 +02:00
Wolfsblvt 82a30b6ba5 Fix pick macro rerolling on branches/renames 2024-04-07 04:40:15 +02:00
Wolfsblvt 9c3f9f0ee1 Fix empty lines on group squashing of char fields 2024-04-07 03:57:58 +02:00
Cohee 17537492b2
Merge pull request #2028 from Wolfsblvt/respect-swipes-on-macros
Fix currently reswiped messages being returned on macros
2024-04-07 03:18:07 +03:00
Wolfsblvt 5df454640f Fix forced persona name not being added to examples 2024-04-07 01:57:59 +02:00
Wolfsblvt d5cb4f403a Fix currently reswiped messages being returned on macros
- Build one utility function to get the last message id matching a criteria
- Fix all macros referencing last message still returning a now being reswiped message
2024-04-07 00:06:38 +02:00
Cohee fcc8051d38 Fix event propagation 2024-04-06 20:35:25 +03:00
Cohee 866f514d19 Fix undefined in tag tooltip 2024-04-06 20:17:58 +03:00
Cohee c752a54c62 Fix actionable filters 2024-04-06 20:14:55 +03:00
Cohee 7cedce01a8 Merge branch 'release' into staging 2024-04-06 15:29:22 +03:00
Cohee 30b9b13070 Use integers for max value.
This is helpful if someone has to render more than 9 quadrillion tags
2024-04-06 14:48:59 +03:00
Wolfsblvt 9805215c28 Fix expander button and group tags add
- Fix expander button to never be "removable" in any list
- Fix group tag list to actually work on adding tags
2024-04-06 07:37:30 +02:00
Wolfsblvt fe8f0a8ff2 Limit drawing of tags to 50 with expander
- No matter where we draw tags, we'll draw a maximum of 50 tags
- Filtered tags (selected, excluded) will always be drawn
- Display "expander"  icon/tag to show full tag list
- Cache the full tag list display so consecutive redraws respect it
2024-04-06 07:14:45 +02:00
johnbenac 3b6c32113f
added await to tts to properly catch the error on this async function 2024-04-05 18:57:51 -04:00
johnbenac 6cf897219e
Added toastr messages to tts index file 2024-04-05 18:41:36 -04:00
Cohee cdbd5c6130 /classify help text clarity 2024-04-06 00:45:38 +03:00
Cohee e75f5550e3 Add /classify command 2024-04-05 22:33:16 +03:00
Cohee 9e4b765db1 #2012 Replace all comfy seeds 2024-04-05 17:59:12 +03:00
Cohee acb623c6d8 Adjust automation id layout 2024-04-05 17:27:08 +03:00
Cohee b1c2617b0d Only init scroll height of WI keys when first opening the drawer 2024-04-05 13:53:39 +03:00
Cohee 3a0ceae80a Optimize scroll height resets on WI entry render, remove silly logs 2024-04-05 13:45:28 +03:00
Cohee 8f6e41428f Optimize tags template references 2024-04-05 12:43:43 +03:00
Cohee 7221549c65 #2013 Fix smooth stream event processing. 2024-04-05 01:25:48 +03:00
Cohee b948e31a89 Remove tag debug logs if state unchanged 2024-04-05 00:54:17 +03:00
Cohee 0804843805 Add per-character and per-group overrides for external media 2024-04-05 00:39:54 +03:00
Cohee 6cc73c2a0b Add instruct last system sequence 2024-04-04 22:27:08 +03:00
Cohee 274abb4749
Merge pull request #2010 from aisu-wata0/wi_min_activations_perf_fix
performance: World Info min activations skips seen buffer
2024-04-04 21:35:36 +03:00
Cohee 813476d72a Fix stream error parsing when using Smooth Streaming 2024-04-04 21:20:10 +03:00
Aisu Wata 0d57f7ea4f fix: removed `recurseReset()` 2024-04-04 15:19:39 -03:00
Cohee ecc638a76d
Merge pull request #2011 from aisu-wata0/wi_remnant_debug_logs
removed some remnant debug logs
2024-04-04 20:41:09 +03:00
Cohee 75ebdf394a Add pollinations as image generation source 2024-04-04 20:40:47 +03:00
Cohee 42138ca09b Add command-r-plus 2024-04-04 20:38:34 +03:00
Aisu Wata 5ab9d9b863 removed some remnant debug logs 2024-04-04 03:08:17 -03:00
Aisu Wata 95c910a521 fix: WI min activations skips seen buffer 2024-04-04 02:56:39 -03:00
Cohee 4d01000751 Switch default summary prompt builder to classic 2024-04-03 02:13:09 +03:00
Cohee 27698fd024 Add ability to get model name with /model 2024-04-03 00:52:30 +03:00