Commit Graph

3203 Commits

Author SHA1 Message Date
Cohee bd3933bcbf
Merge pull request #905 from bdashore3/cfg-window
Add CFG side panel
2023-08-13 14:55:03 +03:00
Cohee 9615495878
Merge pull request #768 from SillyTavern/prompt-manager-cherrypicked
Feature: Prompt manager (cherrypicked onto stage)
2023-08-13 14:44:28 +03:00
Cohee 478bb9c59b Enable nsfw prompt by default 2023-08-13 14:41:29 +03:00
kingbri 43e91b150a CFG: Add groupchat support
Groupchats have their CFG defined a little differently. Chat and
global CFGs are publicly accessible within the window. As a compromise,
individual character CFGs can be injected as part of each character's
prompt. However, these CFG settings need to be adjusted in the character's
individual chats which will carry over to the group.

In addition, make this character logic gated under a checkbox to
always prefer chat unless explicitly specified. Negative cascading
is still open, so individual character negatives can be included
at any time.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-12 22:52:34 -04:00
Tony Ribeiro e81f67504f
Merge branch 'SillyTavern:staging' into staging 2023-08-13 04:16:00 +02:00
Tony Ribeiro e60f91ce42 Finished unefficient full coqui pipeline, UI generated through request to extras. Need to be pruned 2023-08-13 02:18:46 +02:00
kingbri 4a21ee0337 CFG: Add ability to combine negative prompts
This allows for flexibility with global, character, and chat negative
prompts. Combining prompts is very useful for users who want to maintain
a set of global negatives and then add extra layers on top of that. The
ordering is chat -> character -> global tags due to the specificity of
each.

The guidance scale follows the cascade of chat -> character -> global
due to being one number that is set when CFG is fired. If the guidance
scale is 1, nothing happens.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-12 16:25:35 -04:00
Cohee dd21091807 Selectable NovelAI module 2023-08-12 21:26:51 +03:00
maver 0f897158b9 Create a deep clone of the preset before applying
Prevents non-primitives from causing overlapping references
2023-08-12 19:40:01 +02:00
maver f5aa7f7970 Remove obsolete prompt manager settings object 2023-08-12 18:52:52 +02:00
RossAscends f434a96ad6 fix double import on char card drop 2023-08-13 01:47:33 +09:00
maver b0860b18b8 Show tokens when inspecting a prompt 2023-08-12 18:40:39 +02:00
maver 03b8bb64fa Prevent new example chat message being added for no reason 2023-08-12 18:40:39 +02:00
maver a9fa42524d Fix prompts object reference being shared
By deepcloning a copy
2023-08-12 18:40:39 +02:00
maver f2c4645207 Use chatcompletion log function for token budget 2023-08-12 18:40:39 +02:00
maver 19e5502555 Remove obsolete assignment 2023-08-12 18:40:39 +02:00
maver b1254fa2ab Copy migrated preset into loaded presets
Since this only is populated once during page load
2023-08-12 18:40:39 +02:00
maver 7fb896ce2a Prevent preset migration from running multiple times. 2023-08-12 18:40:39 +02:00
maver a999d6e171 Fix preset migration 2023-08-12 18:40:39 +02:00
maver 5a92f72703 Add flag to preset saving, allowing to prevent triggering the UI 2023-08-12 18:40:39 +02:00
maver cd736ec682 Add message role to inspect 2023-08-12 18:40:39 +02:00
maver 280397c30b Allow inspection for all prompts
Because, really, why not.
2023-08-12 18:40:39 +02:00
maver 46c7e63fad Remove obsolete debugging output 2023-08-12 18:40:39 +02:00
maver cdfe3a6841 Fix user messages not being added when populating example dialogue 2023-08-12 18:40:39 +02:00
maver 35eb2dfd74 Change icon for global prompts 2023-08-12 18:40:39 +02:00
Cohee 166ab4dbab Move assistant prefill to quick edit 2023-08-12 18:40:39 +02:00
Cohee 13dc35bc98 Enable JB prompt by default 2023-08-12 18:40:39 +02:00
Cohee 09d7c3350d Minor spelling mistake 2023-08-12 18:40:39 +02:00
maver 5694fb0852 Swap detach and edit icons 2023-08-12 18:40:39 +02:00
maver a8ee723853 Always add impersonate prompt last 2023-08-12 18:40:39 +02:00
Cohee dd89009ecd Use tokenizer-specific token cache 2023-08-12 18:40:39 +02:00
maver 55cc559fd0 Render promptmanager when chatcompletion model or source change 2023-08-12 18:40:39 +02:00
maver 2805a684a8 Emit events on changing chatcompletion source or model 2023-08-12 18:40:39 +02:00
maver 1281417a97 Render prompt manager when chat history is altered
Recounts tokens
2023-08-12 18:40:39 +02:00
maver d9e7eba617 Emit event when a single chat message is deleted 2023-08-12 18:40:39 +02:00
maver d82ea66664 Refactor addItem method of MessageCollection 2023-08-12 18:40:39 +02:00
maver 4100ae9e0b Do not insert authors note into main
Since it is already present in the chat history
2023-08-12 18:40:39 +02:00
maver d2ee6e9a12 Append quietPrompt last 2023-08-12 18:40:39 +02:00
Cohee 463f01d2a6 #870 Fix Claude in prompt manager 2023-08-12 18:40:39 +02:00
Cohee 29552ecfcf Sanitize completion names. Only send names in msg texts if names in completion is disabled 2023-08-12 18:40:39 +02:00
Cohee 5f43121e15 Expand quick edits rows 2023-08-12 18:40:39 +02:00
maver e7b29babe9 Remove obsolete characterSelected event 2023-08-12 18:40:39 +02:00
maver fd10eaf037 Close and clear popup on preset change 2023-08-12 18:40:39 +02:00
maver db8624cefe Move quick edits on top of prompt manager 2023-08-12 18:40:39 +02:00
maver 992af2b4fa Reduce font size on mobile 2023-08-12 18:40:39 +02:00
maver 1b7a1cbc4a Add quick edit drawer and fields for main and jailbreak 2023-08-12 18:40:39 +02:00
maver bd3136e114 Improve wording for prompt insertion 2023-08-12 18:40:39 +02:00
maver 6e4689ba39 Add theme tint and blur to prompt manager popup drawer 2023-08-12 18:40:39 +02:00
maver f5aa891962 Fix prompt manager not being draggable on mobile
Updates jquery ui touch punch with a maintained version, fixes other instances of jquery ui sortable as well (kobold, ...)
2023-08-12 18:40:39 +02:00
maver 38bfcf5324 Remove advanced options toggle 2023-08-12 18:40:39 +02:00