Commit Graph

214 Commits

Author SHA1 Message Date
Cohee dbf995fd24 Add character card macros 2023-11-08 16:28:55 +02:00
Cohee abb78d1d6b Add at-depth position for custom Prompt Manager prompts 2023-10-11 16:03:36 +03:00
Cohee 5dd9a87dc9 Add position prop to prompt object 2023-09-21 20:57:28 +03:00
Cohee bbed147ce5 Clean up browser logs 2023-09-05 18:23:24 +03:00
Cohee 4a6705cea8
Prompt manager configuration fixes (#1078)
* Refactor oai preset change event into before and after

* Simplify and reinforce prompt manager render without character

* Check if main prompt exists before adding nsfwAvoidance

* Sanitize prompt manager configuration on preset loading

---------

Co-authored-by: maver <kentucky@posteo.de>
2023-09-01 23:23:03 +03:00
Cohee 56fc92daca Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-30 12:03:38 +03:00
Cohee 085e92a43e Escape prompt manager names 2023-08-30 12:03:18 +03:00
Cohee 78512b33ad Update quick edits first 2023-08-29 21:16:13 +03:00
maver 5a02250a1f Add persona description to prompt manager order 2023-08-23 20:40:26 +02:00
maver 1ea7ad2572 Update quick edit when oai preset changes 2023-08-22 20:49:54 +02:00
maver 48992d4f53 Prevent context profiler from dangling on error 2023-08-22 20:39:46 +02:00
maver 0e378d93b2 Make quick edit fields static 2023-08-22 20:37:37 +02:00
maver c3c99c534e Do not populate tokenHandlers legacy entries. 2023-08-20 19:58:04 +02:00
maver ea72584f39 Add elvis to getTokens when populating legacy context. 2023-08-20 19:46:46 +02:00
maver a99c543b9f Fix render function when no character is selected 2023-08-20 16:37:39 +02:00
maver 07c24f363f Render prompt manager before a character is selected
When prompt order strategy is global
2023-08-20 16:28:42 +02:00
maver 59179f6c70 Use strict mode for prompt manager
Should already be the case since it's a module but let's me specific
2023-08-20 16:28:22 +02:00
Cohee 5d1e27c820 Merge branch 'staging' of https://github.com/SillyLossy/TavernAI into staging 2023-08-19 22:03:13 +03:00
Cohee 01cb95fba8 Save and restore quick edit heights 2023-08-19 22:03:10 +03:00
RossAscends 4fe74f0041 unify import/export icons on prompt manager 2023-08-20 03:54:30 +09:00
maver 0084ea2461 Move sortable delay into configuration 2023-08-19 14:59:48 +02:00
maver b0158bd72d Implement configurable prompt order strategy for prompt manager
global and character
2023-08-19 14:50:39 +02:00
Cohee 1305f9dc4c Fix prompt manager sometimes erroring in groups with null members 2023-08-19 03:19:12 +03:00
Cohee c4d8d70103 Improve phone usability of sortable drags 2023-08-18 13:41:46 +03:00
Cohee e9e9421d8a Don't try to render prompt manager if group is still generating 2023-08-15 16:47:16 +03:00
maver 9fb38af838 Fix defaults getting applied when switching back to Default preset 2023-08-15 01:28:07 +02:00
maver 2bb8fa5ea1 Update quick edit textareas when prompt manager re-renders 2023-08-15 01:20:42 +02:00
maver 8f830a0928 Persist settings before applying preset 2023-08-14 23:36:06 +02:00
Cohee a92333875c Try to minimize side effects of generate dry running 2023-08-15 00:01:55 +03:00
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
Cohee 21d8ce048c Debounce more prompt manager renderings 2023-08-13 22:48:51 +03:00
Cohee 43089ee06f Don't render manager on non-chat completion APIs 2023-08-13 18:47:07 +03:00
Cohee c0bc425c8b Debounce manager changes 2023-08-13 18:43:17 +03:00
Cohee 478bb9c59b Enable nsfw prompt by default 2023-08-13 14:41:29 +03:00
maver b0860b18b8 Show tokens when inspecting a prompt 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 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 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 35eb2dfd74 Change icon for global prompts 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 55cc559fd0 Render promptmanager when chatcompletion model or source change 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
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
maver fd10eaf037 Close and clear popup on preset change 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 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 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 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 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 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 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 fa205ec72e Validate import data before prompt import 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 9669199408 Allow user to edit new chat, new group chat and new example chat prompts 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 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 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 a53e99b831 Prevent chat history warnings from showing too early 2023-08-12 18:40:38 +02:00
maver 011278c533 Re-Render prompt manager on worldinfo settings change 2023-08-12 18:40:38 +02:00
maver 632fa770be Create a deep copy of prompt defaults on char select
Along other minor fixes and optimizations
2023-08-12 18:40:38 +02:00
maver a0bd67e455 Allow markers to inspected for their content 2023-08-12 18:40:38 +02:00
maver 28217adac6 Add logging for prompt manager position changes 2023-08-12 18:40:38 +02:00
maver 5629bd8984 Fix handleSavePrompt logging throwing error 2023-08-12 18:40:38 +02:00
maver 8abff3c24f Add simple profiling for token counting and rendering 2023-08-12 18:40:38 +02:00
maver ec43295936 Add logging and minor stability enhancements 2023-08-12 18:40:38 +02:00
maver 1b7da6ecbc Remove faulty characters in default configuration 2023-08-12 18:40:38 +02:00
maver d469c80ef5 Apply minor code style and stability improvements 2023-08-12 18:40:38 +02:00
maver 550e635d93 Add migration for legacy prompts 2023-08-12 18:40:38 +02:00
maver 2054cbeb83 Simplify token threshold warnings 2023-08-12 18:40:38 +02:00