rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
820 Commits 11 Branches 89 Tags 303 MiB
Commit Graph

693 Commits

Author SHA1 Message Date
maver dbf38d359d Debounce quick edit saving 2023-08-14 20:29:07 +02:00
maver 033dc45ab9 Move quick edit ui identifiers into configuration 2023-08-14 20:29:01 +02:00
maver 6caa8a4765 Add nsfw prompt to quick edit drawer 2023-08-14 20:28:57 +02:00
maver 9543f54f8c Fix user jb/main not replacing original placeholder in character main/jb 2023-08-14 20:28:54 +02:00
Cohee edcce96a6e IndexedDB open sometime hangs forever 2023-08-14 19:40:31 +03:00
Cohee 8c759e87cf Better UI control for phrase rep pen 2023-08-14 19:00:36 +03:00
Cohee c172801b5e Fix ooba's frog 2023-08-14 18:03:29 +03:00
Cohee 15db16ee8d Fuzzy search for groups 2023-08-14 17:35:48 +03:00
Cohee 32745609a2
Merge pull request #936 from Tony-sama/staging 
Refactoring of Coqui TTS extension
 2023-08-14 14:00:45 +03:00
Cohee ce03921df4 Move CFG block for ooba higher 2023-08-14 13:10:44 +03:00
Cohee 32eb877fdb Add native presetable CFG scale for ooba 2023-08-14 13:06:20 +03:00
Cohee a0bfc67632 Add hint for CFG scale 2023-08-14 12:50:00 +03:00
Cohee 7107813b6e Move prompt manager down to ease mobile scrolling 2023-08-14 12:45:20 +03:00
Cohee d395d3d8e6 Add peek proxy password btn 2023-08-14 12:01:06 +03:00
Cohee 6da3453efc Fix example dialogue syntax 2023-08-14 11:52:58 +03:00
Cohee bd9f49d975 Don't launch generation intercepts on dry runs 2023-08-14 11:43:31 +03:00
city-unit e4c656a0b9 Kinda better svgs? 2023-08-14 00:09:49 -04:00
Tony Ribeiro f97cc5694d refresh character even when module is not detected 2023-08-14 05:14:21 +02:00
Tony Ribeiro 213099dd6d removed debug messages 2023-08-14 05:05:10 +02:00
Tony Ribeiro 5816d2d6a6 Correct typo in tts index file that cause tts provider settings to be destroyed. 2023-08-14 05:03:42 +02:00
Tony Ribeiro 40d4123f08 Correct typo in tts index file that cause tts provider settings to be destroyed. 2023-08-14 04:59:11 +02:00
city-unit db51b44780 Rename correctly 2023-08-13 22:58:10 -04:00
city-unit c86512cf6b Fix swiping 2023-08-13 22:57:49 -04:00
Tony Ribeiro e97863a0da Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-14 04:03:34 +02:00
Tony Ribeiro c414606c81 Finished new version of coqui TTS UI. 2023-08-14 04:03:28 +02:00
Tony Ribeiro fdc9349f68
Merge branch 'SillyTavern:staging' into staging 2023-08-14 04:01:32 +02:00
city-unit f528791c4f Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/ui 2023-08-13 18:46:37 -04:00
city-unit ad04344392 Api/Model icon option 2023-08-13 18:43:16 -04:00
RossAscends 3f87874afe Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-14 05:33:48 +09:00
RossAscends 2935d98788 improved Escape hotkey logic 2023-08-14 05:33:46 +09:00
Cohee d14d669838
Merge pull request #932 from StefanDanielSchwarz/fixed-presets 2023-08-13 23:25:02 +03:00
Cohee 21d8ce048c Debounce more prompt manager renderings 2023-08-13 22:48:51 +03:00
Cohee e6bf870c55 Persist token cache to indexedDb 2023-08-13 22:45:27 +03:00
SDS ef9d40428e
Update Roleplay instruct mode preset: Include Names 
After extensive testing, I've enabled "Include Names" to fix some models talking/acting as User.
 2023-08-13 20:18:22 +02:00
SDS 33a32d0380
Set TextGen temperature slider min value to 0.0 
When updating the TextGen preset, I noticed the slider not going to the true minimum, so I fixed that as well. Same as [#825](https://github.com/SillyTavern/SillyTavern/issues/825) for KoboldAI.
 2023-08-13 20:11:02 +02:00
SDS 0a4f4a6c24
Update TextGen Deterministic.settings 
This wasn't actually deterministic because despite `do_sample: false`, temperature was still taking effect, causing non-deterministic output. I fixed this and also adjusted repetition penalty to be like KoboldAI's Deterministic preset.
 2023-08-13 19:59:37 +02:00
SDS 73f9117bea
Update KoboldAI Deterministic.settings 
After extensive testing, I've adjusted repetition penalty slightly to be the same as simple-proxy-for-tavern's default preset and ooba's LLaMA-Precise settings preset. This fixed some models talking/acting as User.
 2023-08-13 19:25:56 +02:00
Cohee 23a4705d36 Use common save settings function on WI budget cap 2023-08-13 19:50:12 +03:00
Cohee 3688bd0b04 #930 Fix WI activation via slash command 2023-08-13 19:20:00 +03:00
Cohee 43089ee06f Don't render manager on non-chat completion APIs 2023-08-13 18:47:07 +03:00
Cohee 980c65b6cf Add toastr warning 2023-08-13 18:44:32 +03:00
Cohee c0bc425c8b Debounce manager changes 2023-08-13 18:43:17 +03:00
Cohee 9b8d069e3b Apply CFG extension for Novel 2023-08-13 15:38:07 +03:00
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
maver af81915ff3 Update existing prompts during migration 
Instead of adding new prompts for main, jailbreak and nsfw
 2023-08-12 18:40:39 +02:00
maver 222fd3429d Center globe icon 2023-08-12 18:40:39 +02:00
maver f0830e7bb4 Fix in-code documentation typo 2023-08-12 18:40:39 +02:00
maver 59afac08da Add missing in-code documentation 2023-08-12 18:40:39 +02:00
maver e8c7e40c54 Fix prompt name not being greyed out when prompt disabled 2023-08-12 18:40:39 +02:00
maver 05a080849c Fix edit button being shown for chat history and examples 2023-08-12 18:40:39 +02:00
maver 1e43108e5a Move inspect functionality to prompt name click 2023-08-12 18:40:39 +02:00
maver fc44a02323 Set utility prompt text area size to 3 rows 2023-08-12 18:40:39 +02:00
maver 405a680059 Add user icon for user prompts 
To be consistent with global and marker icons
 2023-08-12 18:40:39 +02:00
maver bc4befeb22 Rename prompt lists to prompt order 
Includes renaming of configuration, no functional changes
 2023-08-12 18:40:39 +02:00
maver 63d224d8af Refactor and simplify setup method for prompt manager. 2023-08-12 18:40:39 +02:00
maver ad6575887a Remove obsolete function getGroupMembers 2023-08-12 18:40:39 +02:00
maver b58ce0370d Refactor token counting after completion. Simplify code. 2023-08-12 18:40:39 +02:00
maver 57fd04b974 Refactor token counting after completion. Simplify code. 2023-08-12 18:40:39 +02:00
maver dfd49813af Refactor naming scheme for default promptmanager defaults 2023-08-12 18:40:39 +02:00
maver 4f734d12ab Use configured prefix for prompt manager classes instead of constant 2023-08-12 18:40:39 +02:00
maver 9d6cf017d2 Move main and jailbreak override from manager into openai script. 
Makes the code clearer and easier to understand
 2023-08-12 18:40:39 +02:00
maver 075c0c29f0 Refactor prepareOpenAiMessages, move prompt preparation in its own function 2023-08-12 18:40:39 +02:00
maver ec806db9f7 Initialize prompt manager on selecting openrouter, scale 2023-08-12 18:40:39 +02:00
maver fc555c1be5 When a prompt is reset, also reset name and role 2023-08-12 18:40:39 +02:00
maver a921a26af5 Do not show reset button for user prompts 2023-08-12 18:40:39 +02:00
maver 7ea6e89b05 Add reset prompt support for enhance definitions 2023-08-12 18:40:39 +02:00
maver b2acc9eb0f Refactor documentation and make code more readable 
No functional changes
 2023-08-12 18:40:39 +02:00
maver 19ee831d82 Prevent prompt manager initialization more than once 2023-08-12 18:40:39 +02:00
maver 67ef713826 Better visibility of prompt manager popup on mobile 2023-08-12 18:40:39 +02:00
maver 76154fd8ee Fix authors note position not being considered 2023-08-12 18:40:39 +02:00
maver 41aae57f05 Do not send empty scenario and personality prompts 2023-08-12 18:40:39 +02:00
maver 6a52d6febd Fix invalid character name error not being handled 2023-08-12 18:40:39 +02:00
maver 00e9987fb7 Fix character reset not available in basic mode 2023-08-12 18:40:39 +02:00
maver 05c96825ea Add reset button for character prompt list 2023-08-12 18:40:39 +02:00
maver 29a7cb4120 Replace DraggableList with jQuery UI sortable 
Similar to Kobold AIs settings. Reducing code that needs maintaining.
 2023-08-12 18:40:39 +02:00
maver 4dd94a4a62 Do not generate group responses on dry run 2023-08-12 18:40:39 +02:00
maver a706ecd48c Add charIfNotGroup placeholder to default main prompt 2023-08-12 18:40:39 +02:00
maver fa205ec72e Validate import data before prompt import 2023-08-12 18:40:39 +02:00
maver cf305c0395 Do not attempt a dryrun if no character has been selected 2023-08-12 18:40:39 +02:00
maver 82a11316bc Add continue nudge to editable utility prompts 2023-08-12 18:40:39 +02:00
maver 0e4ce734ad Fix continue functionality not working as expected 2023-08-12 18:40:39 +02:00
maver f4cfa8ba94 Remove obsolete logs and improve documentation 2023-08-12 18:40:39 +02:00
maver f2227ded9a Move utility prompts in its own, independent dropdown 
And merge with existing advanced prompt bits
 2023-08-12 18:40:38 +02:00
maver 3cc092a432 Add margin utility classes 2023-08-12 18:40:38 +02:00
maver e03dc0a3a5 Add more padding in left panel scrollable 2023-08-12 18:40:38 +02:00
maver 9669199408 Allow user to edit new chat, new group chat and new example chat prompts 2023-08-12 18:40:38 +02:00
maver 40079f7660 Improve styling of inspect popup drawer 2023-08-12 18:40:38 +02:00
maver 2ed1cee82e Fill tokenizer legacy counts where possible. 2023-08-12 18:40:38 +02:00
maver 9784950c54 Add documentation for chat completion 
And dependant classes
 2023-08-12 18:40:38 +02:00
maver 9332657e20 Do not render prompt export dialogue if not necessary 2023-08-12 18:40:38 +02:00
maver 0f3d5373bf Always allow dropping prompts 2023-08-12 18:40:38 +02:00
maver 81c32852c8 Add icon for global prompts 2023-08-12 18:40:38 +02:00
maver 15d4283cd4 Add info icons to prompt export 2023-08-12 18:40:38 +02:00
maver 023d3fade2 Do not assign openai_max_tokens on input field changes 
Fixes prompt manager falsely assigning string value to openai config
 2023-08-12 18:40:38 +02:00
maver 4974c81d4c Update prompt manager active character on character edit. 2023-08-12 18:40:38 +02:00
maver 74a7aa513b Reintroduce event types after rebase 2023-08-12 18:40:38 +02:00
maver 6ec249bb30 Add confirmation step and allow character prompt order import 2023-08-12 18:40:38 +02:00
maver bfb4e5026d Refine export function 2023-08-12 18:40:38 +02:00
maver 57ea6cb7a5 Add prompt export 2023-08-12 18:40:38 +02:00
maver 3d35caff08 Improve readability and clarity of prompt manager icons 2023-08-12 18:40:38 +02:00
maver d70ecbdcd9 Add support for cycle prompt 2023-08-12 18:40:38 +02:00