rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,076 Commits 10 Branches 90 Tags 324 MiB
Commit Graph

354 Commits

Author SHA1 Message Date
Cohee a5acc7872d Add OpenAI vector source. 2023-09-08 13:57:27 +03:00
Cohee 96df705409 Change insertion strategy to an extension block 2023-09-08 01:26:26 +03:00
Cohee 5ef79bd64d Remove NSFW avoidance prompt from Prompt Manager 2023-09-05 18:14:56 +03:00
Cohee 67c8476cdf Set 0 tokens for prompts with no content 2023-09-04 02:40:16 +03:00
Cohee 80e286fed2 Fix double insertion of persona description to prompt manager if position set to A/N 2023-09-04 02:26:15 +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 636c06ffdd Autosize prompt manager boxes 2023-08-27 21:28:13 +03:00
Cohee e74bca88f4 Disable OpenRouter fallback by default 2023-08-27 18:39:04 +03:00
Cohee 44661d0e2b Merge branch 'staging' into generate-array 2023-08-26 01:07:19 +03:00
Cohee 42e6da4a36 Add support of stop strings to OpenAI / Claude 2023-08-26 00:12:11 +03:00
Cohee 12f1cdb3fd #1020 Fix summarize + prompt manager. Clarify naming for insertion position. 2023-08-25 20:03:31 +03:00
Cohee 685e9b7e79 Stabilize extension injections order for prompt manager 2023-08-25 17:15:55 +03:00
Cohee aceb32cfe9 Fix freq pen overwrite by pres pen 2023-08-25 02:52:38 +03:00
Cohee 4aa31fcba9 Add fallback option for OpenRouter 2023-08-24 03:21:17 +03:00
Cohee 52c2fcd407 Fix OpenRouter model not persisting on page reload 2023-08-24 00:59:57 +03:00
maver 65e595ad48 Increase prompt oder dummy user id by 1 2023-08-23 20:41:13 +02:00
maver 5a02250a1f Add persona description to prompt manager order 2023-08-23 20:40:26 +02:00
Cohee e77da62b85 Add padding to cache key. Fix Safari display issues. Fix 400 on empty translate. Reset bias cache on changing model. 2023-08-23 10:32:48 +03:00
Cohee b385bd190a Less strict rules for logit bias files import 2023-08-23 03:41:58 +03:00
Cohee f633f62065 Don't save null values to OpenAI logit bias 2023-08-23 03:36:04 +03:00
Cohee bc5fc67906 Put tokenizer functions to a separate file. Cache local models token counts 2023-08-23 02:38:43 +03:00
Cohee 7250770c5d Don't reduce Claude token counts by 2 2023-08-22 23:20:53 +03:00
Cohee 41cc86af9f Add example extension for chat variables. Allow registering custom text processing functions for extensions 2023-08-22 17:46:37 +03:00
based 3716fd51ef add example names to initial system prompt 2023-08-22 22:29:57 +10:00
based ba925f388c added more options to the scale request 2023-08-22 21:29:18 +10:00
based 06902279a9 merge 2023-08-22 21:17:18 +10:00
Cohee 57b126bfbf Save chat completions settings to an object. Update numeric setting types 2023-08-22 00:35:46 +03:00
maver cb5b410daf Fix group nudge causing error 2023-08-20 20:18:10 +02:00
Cohee be6fedd626 Simplify Claude prefill code 2023-08-20 19:26:49 +03:00
Cohee a27bef8b12 Merge branch 'staging' into qolfeatures 2023-08-20 18:47:43 +03:00
Cohee c2c0007ad1
Merge pull request #982 from SillyTavern/prompt-manager-hotfix 
Prompt manager hotfix
 2023-08-20 18:41:09 +03: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 58ab266365 Make sure new example chat is not added without messages 2023-08-20 15:53:42 +02:00
maver 5fee1f6f96 Add group nudge to prompts array 2023-08-20 15:35:15 +02:00
maver 58a018deae Check if newExample can be afforded before adding it 2023-08-20 15:35:01 +02:00
Cohee efa0f12349 Fix prompt manager issues 2023-08-20 16:25:16 +03:00
Cohee 9d495d6b47
Merge pull request #981 from SillyTavern/hotfix-prompt-manager 
Hotfix prompt manager
 2023-08-20 15:38:54 +03:00
based 7ecc0295dc scale cookie method 2023-08-20 20:55:37 +10:00
Cohee 674228a5f5 Fix character JB / prompt + Original 2023-08-19 21:36:22 +03:00
based b3377726c4 Removed unnecessary token reserve 2023-08-20 04:23:12 +10:00
Cohee 0d7c1992f3 Deep clone presets before export 2023-08-19 21:17:58 +03:00
Cohee 5cecc9fbff Scrub proxy from exported presets 
Speed-up animations.
 2023-08-19 21:13:37 +03:00
based c2a4e2e52a fix example dialogue nudge 2023-08-20 04:06:43 +10:00
based 6f12ab29f0 fixed {{group}} macro 2023-08-20 04:03:56 +10:00
based 6dc8f01ca7 readded group nudge to end of prompt (needs proper integration into prompt manager) 2023-08-20 03:50:51 +10:00
based 3df439a224 merge 2023-08-20 03:44:06 +10:00
based e0de442523 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into qolfeatures 2023-08-20 03:22:54 +10:00
based b3751efe58 Minor AI21 bug fixes 2023-08-20 03:22:38 +10:00
based ce40780ed1 Added option to exclude assistant prefix to Claude prompt (for jailbreaks already appending Assistant:) 2023-08-20 03:09:50 +10:00
Cohee1207 143ebec4c6 Remove console log 2023-08-19 19:08:35 +03:00
Cohee1207 e77cded357 Code clean-up 2023-08-19 18:51:20 +03:00
Cohee 438c78574f
Merge pull request #971 from kingbased/jurassic 
AI21 Adapter
 2023-08-19 18:48:15 +03:00
based 0f21eabb6e AI21 Adapter + Tokenization implementation 2023-08-20 01:20:42 +10:00
Cohee 37fffa9930
Merge pull request #951 from SillyTavern/hotfix-prompt-manager 
Hotfix prompt manager
 2023-08-19 18:05:26 +03:00
maver 0084ea2461 Move sortable delay into configuration 2023-08-19 14:59:48 +02:00
Cohee1207 991ff98eaa Performance optimizations for character edit / chat opening 2023-08-19 15:58:17 +03:00
maver b0158bd72d Implement configurable prompt order strategy for prompt manager 
global and character
 2023-08-19 14:50:39 +02:00
maver cc01ee6c1c Print stack to console on chatcompletion error 2023-08-19 14:50:39 +02:00
maver 947289dffc Lock up configuration during prompt manager render 2023-08-16 19:01:09 +02:00
maver 07be5588f4 Implement configurable prompt order strategy for prompt manager 
global and character
 2023-08-15 19:41:34 +02:00
maver e09a7d1e7a Print stack to console on chatcompletion error 2023-08-15 19:40:22 +02:00
Cohee 2afac5aeb1 Filter null messages in array and context line appearing unprompted 2023-08-15 15:08:42 +03:00
Cohee 706be4390d Add new Claude instant model 2023-08-15 14:57:11 +03:00
maver 2bb8fa5ea1 Update quick edit textareas when prompt manager re-renders 2023-08-15 01:20:42 +02:00
Cohee 238b667262 Merge branch 'staging' of https://github.com/SillyLossy/TavernAI into staging 2023-08-14 22:19:17 +03:00
Cohee 3850e6b50a Replace object stores for Chroma and token cache 2023-08-14 22:19:14 +03:00
maver 033dc45ab9 Move quick edit ui identifiers into configuration 2023-08-14 20:29:01 +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 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 e6bf870c55 Persist token cache to indexedDb 2023-08-13 22:45:27 +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
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 5a92f72703 Add flag to preset saving, allowing to prevent triggering the UI 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 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 2805a684a8 Emit events on changing chatcompletion source or model 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
maver 1b7a1cbc4a Add quick edit drawer and fields for main and jailbreak 2023-08-12 18:40:39 +02:00
maver 38bfcf5324 Remove advanced options toggle 2023-08-12 18:40:39 +02:00
maver 222fd3429d Center globe icon 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 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 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 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 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 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 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 9784950c54 Add documentation for chat completion 
And dependant classes
 2023-08-12 18:40:38 +02:00
maver 74a7aa513b Reintroduce event types after rebase 2023-08-12 18:40:38 +02:00
maver d70ecbdcd9 Add support for cycle prompt 2023-08-12 18:40:38 +02:00
maver e93424b2cf Don't use debounce for prompt manager save settings function 2023-08-12 18:40:38 +02:00
maver ce8a71cf53 Add error handling to openai message counting 2023-08-12 18:40:38 +02:00
maver 4509df0fd9 Add support for empty prompt replacement 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 85c4b6fad3 Improve error messages 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 2452b37e28 Add fallback for empty dialogue example prompts 2023-08-12 18:40:38 +02:00
maver 2fc3577431 Throw a recoverable error on invalid character naming 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 e908610b99 Save prompt manager items to perset 2023-08-12 18:40:38 +02:00
maver 6cea524f2c Fix prompt-manager being rendered twice. 2023-08-12 18:40:38 +02:00
maver bf0dc07b1f Improve in-code documentation 2023-08-12 18:40:38 +02:00
maver d0aba85692 Add support for persona description positioning 2023-08-12 18:40:38 +02:00
maver 221ecbf8d6 Add reset for main,nsfw and jailbreak prompts 2023-08-12 18:40:38 +02:00
maver 9cf41a6a52 Remove doubled initialization of prompt manager 2023-08-12 18:40:38 +02:00
maver 7c1e370abe Allow the user to toggle names in chat history 2023-08-12 18:40:38 +02:00
maver 25eef5d100 Pass nsfwAvoidance message instead of prompt 
Fixing invalid argument exception being thrown
 2023-08-12 18:40:38 +02:00
maver f207e0eab3 Add basic WindowAI support 2023-08-12 18:40:38 +02:00
maver 5c18abadac Pass chat message name to chatcompletion endpoint 2023-08-12 18:40:38 +02:00
maver aaa2c48e7d Add basic claude support 2023-08-12 18:40:38 +02:00
maver 28fa2f5f57 Render prompt manager after swiping with updated tokens 
Including world info and extension prompts
 2023-08-12 18:40:38 +02:00
maver 2f4424e6c6 Declare prepareOpenAIMessages as synchronous 
As there is no need for the function o be async anymore.
 2023-08-12 18:40:38 +02:00
maver 6e37db2fb3 Declare prepareOpenAIMessages as synchronous 
As there is no need for the function o be async anymore.
 2023-08-12 18:40:38 +02:00
maver 6c25211f0a Support original-placeholder 2023-08-12 18:40:38 +02:00
maver 312b02c36e Do not count messages with empty prompts 2023-08-12 18:40:38 +02:00
maver 6617243f1b Add event system to openai script 
Lost during rebasing
 2023-08-12 18:40:38 +02:00
maver be30fef700 Disable toggling of main prompt 2023-08-12 18:40:38 +02:00
maver b8b3dd4caf Various improvements for stability and token counting. 2023-08-12 18:40:38 +02:00
maver 2c36fbdc1d Apply character specific prompt overrides 
Jailbreak and main
 2023-08-12 18:40:36 +02:00
maver 5afd60c578 Add dialogue examples first if user decides 2023-08-12 18:40:18 +02:00
maver 474571e17a Handle various error scenarios during token counting 2023-08-12 18:40:18 +02:00
maver 73e3001493 Refactor addMessageToChatCompletion 2023-08-12 18:40:18 +02:00
maver 5270d261aa Add memory and authors note to chat completion 2023-08-12 18:40:18 +02:00
maver bf5404f6ce Add enhanced definitions 2023-08-12 18:40:18 +02:00
maver 21b37950e4 Fix chat completion not recognizing 0-position 2023-08-12 18:40:18 +02:00
maver dd7f326460 Improve in-code documentation 2023-08-12 18:40:18 +02:00
maver 74a5167a0e Add nsfw avoidance prompt, quiet prompt and bias to chat completion 2023-08-12 18:40:18 +02:00
maver 37c7a82aba Respect impersonate option 2023-08-12 18:40:18 +02:00
maver edba17c96e Add dialogue examples to chat completion 2023-08-12 18:40:18 +02:00
maver 8ae2c80358 Introduction of additional helper classes, refactoring 2023-08-12 18:40:18 +02:00
maver 18641ea3d2 Add prototype for prompt manager token management 2023-08-12 18:40:18 +02:00
maver 05f7e5677d Simplify example message handling 2023-08-12 18:40:18 +02:00
maver 77e183f5dd Add support for authors note and summary extensions 2023-08-12 18:40:18 +02:00
maver a66041f503 Fix extension prompt being not parsed correctly 2023-08-12 18:40:18 +02:00
maver 64c04957c2 Enable TokenHandler to return total token count 2023-08-12 18:40:18 +02:00
maver eb315993b4 Let prompt manager handle character and scenario prompts 2023-08-12 18:40:18 +02:00
maver 4d8d4cd262 Streamline token counting 
By using TokenHandler instead of custom token handling
 2023-08-12 18:40:18 +02:00
SillyLossy 14a66ec937 Don't duplicate start chat marker if character has no example dialogues 2023-08-12 18:40:18 +02:00
maver dce91f8fad Send main prompt with group chat 2023-08-12 18:40:18 +02:00
maver 7411ca1154 Prevent duplicate messages 
By removing obsolete example message assignments
 2023-08-12 18:40:18 +02:00
maver 9a7bbd4ffb Add prompt manager support for group chats 2023-08-12 18:40:18 +02:00
maver 989f704605 Improve strength of main and impersonation prompt 2023-08-12 18:40:18 +02:00
maver 53fe7f1d94 Remove obsolete interface elements and handling 
Jailbreak etc.
 2023-08-12 18:40:18 +02:00
maver 720c9973ec Fix default prompts not being set correctly 2023-08-12 18:40:18 +02:00
maver e47f436cf7 Add support for nsfw avoidance prompt 2023-08-12 18:40:17 +02:00
maver f395c99a5d Remove obsolete default settings in prompt manager constructor 2023-08-12 18:40:17 +02:00
maver a041230a99 Let oai prompt manager handle enhanced definitions 2023-08-12 18:40:17 +02:00
maver b54bd36d65 Do not apped start new chat messages on example chat handling 
The prompt manager does this job now.
 2023-08-12 18:40:17 +02:00
maver 5a6340165c Never use token handler for openai 
For now.
 2023-08-12 18:40:17 +02:00
maver 0513d9c8c0 Simplify impersonate prompt handling 2023-08-12 18:40:17 +02:00
maver 42544e9d26 Fix quiet prompt functionality after rebasing 2023-08-12 18:40:17 +02:00
maver 6e1bb65437 Remove obsolete settings to update after change 2023-08-12 18:40:17 +02:00
maver 85d99335b9 Rework of prepareOpenAIMessages 2023-08-12 18:40:17 +02:00
maver bc041d8fb3 Use saveSettings function instead of saveSettingsDebounced 2023-08-12 18:40:17 +02:00
maver fff966fc9f Check oai settings for empty prompt manager configuration 2023-08-12 18:39:54 +02:00
maver c9bc4e3353 Remove obsolete prompt related assignments 2023-08-12 18:39:54 +02:00
maver e7cd203c19 Allow token counts to be cached when no character is selected 2023-08-12 18:39:54 +02:00
maver ded29a225d Let prompt manager control messages sent to openai 2023-08-12 18:39:54 +02:00
maver c6eee88cd4 Add prompt manager setup 2023-08-12 18:39:54 +02:00
maver 77cd51ccaa Add prompt manager configuration and default configuration 2023-08-12 18:39:54 +02:00
Cohee f3cff9cd28 #917 Don't add a prefill for summarization 2023-08-11 17:23:03 +03:00
spacegeek69 4b48861d13 [OpenRouter] Switch to token per dollar for prices 2023-08-10 21:13:24 +02:00
Cohee 92666b18d4
Merge pull request #912 from spacegeek69/sg69-api-prices-fix 
[OpenRouter] Show more API price information
 2023-08-10 20:04:15 +03:00
Cohee c6b18de4ef Currency formatting 2023-08-10 13:01:55 +03:00
Cohee aa49efe656 More precise prompt costs 2023-08-10 12:58:21 +03:00
spacegeek69 f9db8eee67 [OpenRouter] Show API prices in list/description 2023-08-10 11:21:58 +02:00
Cohee 1f8f200caf #909 Add OpenRouter prompt cost calculation 2023-08-09 21:59:34 +03:00
Cohee dddc49c235 #798 Claude assistant prefill 2023-07-30 01:51:59 +03:00
Cohee 3fb4756c03 #803 Add a separate field for proxy password 2023-07-28 21:33:29 +03:00
Cohee1207 01f1f67de3 Clean-up JB prompt of caret returns and dangling spaces 2023-07-22 16:50:34 +03:00
Cohee1207 bc6e46bac8 Code clean-up 2023-07-21 23:40:53 +03:00