Commit Graph

367 Commits

Author SHA1 Message Date
Cohee 069a07a139 Add pagination for WI entries #964 2023-08-21 21:10:11 +03:00
Cohee 05d719107f Move total token counter. Tighten the UI 2023-08-21 17:00:28 +03:00
Cohee c735bf546a Add token counters for individual fields. Optimize total counter display 2023-08-21 15:32:27 +03:00
kingbri 60faaf1831 CFG: NAI fixes
NAI does CFG differently, so add special cases for them. Also gate
CFG access to only work on textgenwebui since that's where it's
implemented.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-20 19:58:17 -04:00
Cohee 4ea9e481a8
Merge branch 'staging' into staging 2023-08-21 01:51:12 +03:00
kingbri ad2be21531 Generate: Fix appends on continue
Continue was in a semi-working state. However, the generated prompt
by continue was a mess and didn't remove essential parts such as
character name and prompt bias. This caused duplication and bad
generations.

Now, append the prompt bias after the CFG has been appended and then
clean up the continued cache before adding it to the final prompt.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-20 17:36:35 -04:00
Cohee 8bb59a9e22 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-20 23:33:26 +03:00
Cohee 6738ffe2a4 Add auto-select for instruct presets. Re-organize instruct mode code. Prepare for preset manager integration 2023-08-20 23:29:43 +03:00
Cohee 013a0a56b4
Merge pull request #983 from StefanDanielSchwarz/simple-proxy-for-tavern-replacement-enhanced
Simple proxy for tavern replacement enhanced
2023-08-20 23:27:33 +03:00
Stefan Daniel Schwarz f5d5b2f749 Format instruct mode examples 2023-08-20 22:03:45 +02:00
Cohee d02fa88d3a Comment-out bookmark validation 2023-08-20 19:43:58 +03:00
Cohee 6e6eb8f61e Use CSS class for coloring 2023-08-20 19:09:19 +03:00
Cohee a27bef8b12 Merge branch 'staging' into qolfeatures 2023-08-20 18:47:43 +03:00
Stefan Daniel Schwarz 2ff2973d2b Instruct system prompt for instruct mode only 2023-08-20 17:30:19 +02:00
Stefan Daniel Schwarz 2fb86c8ebd Added Persona Description and System Prompt to Story String 2023-08-20 16:08:54 +02:00
Cohee 6fb278266b
Merge pull request #977 from city-unit/feature/exorcism
Feature/exorcism
2023-08-20 12:37:56 +03:00
Cohee 94754af013 Reformat code 2023-08-20 12:37:38 +03:00
Cohee 84e5a63c34 Fix SD group gen bugs 2023-08-20 12:29:20 +03:00
kingbri ac319dbd30 CFG: Add positive prompt support and fixes
Positive prompts are the opposite of negative prompts. This helps
make the mixing process more accurate by keeping the negative differences
as close as possible to the positive ones by including this prompt.

In addition, fix prompt insertion order at a depth of 0 by hijacking
the same function used for Author's Note as a zero depth anchor.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-20 02:22:23 -04:00
kingbri 92e6c6a998 CFG: Use ST prompt builder for negatives
Make the generate function build a negative prompt in addition to the
normal one. This allows for nonconflicting insertion with other extension
prompts and World Info.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-20 00:44:39 -04:00
50h100a 8dca75f6c3 single-URL ui for mancer.
automatically produce streaming URL from blocking URL.
2023-08-20 00:33:00 -04:00
city-unit e76001a600 Merge branch 'staging' of https://github.com/city-unit/SillyTavern into feature/exorcism 2023-08-19 23:58:11 -04:00
city-unit 2f09efcd7f Exorcised base64 image stuff 2023-08-19 23:01:09 -04:00
Cohee 674228a5f5 Fix character JB / prompt + Original 2023-08-19 21:36:22 +03:00
Cohee 5cecc9fbff Scrub proxy from exported presets
Speed-up animations.
2023-08-19 21:13:37 +03:00
based e0de442523 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into qolfeatures 2023-08-20 03:22:54 +10:00
Cohee1207 771c9d6165 Optimize SVG loader. Add ai21 icon 2023-08-19 19:48:33 +03:00
based dba685bffb Added detection for broken/deleted bookmark links, can expand on this to automatically delete broken links, but for now it just hides the icon. 2023-08-20 02:45:20 +10:00
based b56fe3e01b Made favorite characters/groups more apparent 2023-08-20 02:30:57 +10:00
based 0d694dcc32 Added power user option to remove examples 2023-08-20 02:25:07 +10:00
based a4f075a9b1 Added swipe deletion 2023-08-20 02:11:45 +10: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
Cohee1207 336e27a92d Move 3rd-party scripts into /lib 2023-08-19 16:29:46 +03:00
Cohee1207 2d61c9954b Pagination tweaks 2023-08-19 16:11:09 +03:00
Cohee1207 991ff98eaa Performance optimizations for character edit / chat opening 2023-08-19 15:58:17 +03:00
Cohee 3acd0a590e
Merge pull request #966 from StefanDanielSchwarz/simple-proxy-for-tavern-replacement
Simple proxy for tavern replacement
2023-08-19 14:35:43 +03:00
kingbri 7191f7a8ad CFG: Add insertion depth and custom separator
Insertion depth allows for CFG to variably inject itself into the
negative prompt. This is similar to how Author's note works.

However, this method of insertion depth conflicts with AN and
world info where negatives can be meshed between two lines
of those specific insertions.

A custom separator must be wrapped in quotes, otherwise the default
separator is a newline for negative cascading.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-19 01:29:59 -04:00
city-unit 8581ef14dd Add search filtering for past chats 2023-08-18 23:48:08 -04:00
city-unit 4488cee65d Add search filtering for past chats 2023-08-18 23:45:05 -04:00
kingbri cdbca6d9fd CFG: Include the entire prompt with negative prompt
CFG with LLMs works differently than stable diffusion. The main principle
is prompt mixing and utilizing the differences between the two prompts
rather than a full "negative prompt" of what the user doesn't want.

SillyTavern its own way of formatting a prompt sent to an LLM backend.
Therefore, take that prompt and add negatives to it.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-18 22:18:09 -04:00
Cohee 059647b286 Dynamically update group avatars 2023-08-19 03:13:40 +03:00
Cohee f27107e0ef Refactor and optimize group members display 2023-08-19 02:53:05 +03:00
Stefan Daniel Schwarz bcc66de1df multi-line clean-up message 2023-08-18 23:28:11 +02:00
Stefan Daniel Schwarz 599a912a5a deduplicated multi-line stopping strings 2023-08-18 23:02:59 +02:00
Cohee 602c5cd791 Add pagination for characters list view 2023-08-18 23:13:15 +03:00
Stefan Daniel Schwarz 7e5d08874f Handle last_output_sequence like output_sequence 2023-08-18 21:18:27 +02:00
RossAscends 0c5c8c50ad half-fix for small boxes in mobile no spoiler view 2023-08-18 22:45:40 +09:00
Cohee 5528a493a6 Do not insert an extra newline if example separator is empty 2023-08-18 12:32:52 +03:00
Cohee 75378eff4e #937 Add dynamic chat backgrounds generation 2023-08-18 00:41:21 +03:00
Cohee 80092b3170 #790 Simplify local prompt formatting. Use handlebars to render story string. 2023-08-17 22:47:34 +03:00
Cohee 86a486be8f Adjust Novel instruction prompts for quiet generation 2023-08-17 17:40:38 +03:00
Cohee 928d897946 Fix instruct mode stop strings for whitespace sequences 2023-08-17 11:47:15 +03:00
Cohee 7a204bef05 Show chat completion source on hover 2023-08-16 13:51:38 +03:00
Cohee 4a0c93f023 Show OpenRouter icon 2023-08-15 21:36:28 +03:00
Cohee 2afac5aeb1 Filter null messages in array and context line appearing unprompted 2023-08-15 15:08:42 +03:00
Mike Weldon 41ec7e5600 Many NovelAI fixes from dev guidance
* Remove AI Module "Autoselect" and make the auto-instruct work for all modules. This is how NAI is supposed to work.
* Log the response from the API.
* Move the AI Module setting up to the top of the settings window since it isn't part of the preset.
* Refactor phrase_rep_pen to use the actual API strings.
* Clamp the maximum token length to 150 before we call the API.
* Clamp the minimum token length in the UX from 1 to 150.
* Fix bug where the preamble was not initialized on cold start.
* Get rid of extra newline before dinkus.
* Make always_force_name2 default true.
2023-08-14 19:35:21 -07:00
Cohee a92333875c Try to minimize side effects of generate dry running 2023-08-15 00:01:55 +03:00
Cohee 15db16ee8d Fuzzy search for groups 2023-08-14 17:35:48 +03:00
Cohee bd9f49d975 Don't launch generation intercepts on dry runs 2023-08-14 11:43:31 +03:00
city-unit c86512cf6b Fix swiping 2023-08-13 22:57:49 -04: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
Cohee c0bc425c8b Debounce manager changes 2023-08-13 18:43:17 +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
RossAscends f434a96ad6 fix double import on char card drop 2023-08-13 01:47:33 +09: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 2805a684a8 Emit events on changing chatcompletion source or model 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 fd10eaf037 Close and clear popup on preset change 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 63d224d8af Refactor and simplify setup method for prompt manager. 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 4dd94a4a62 Do not generate group responses on dry run 2023-08-12 18:40:39 +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 579f303fb0 Add event for modifying settings before modifications 2023-08-12 18:40:38 +02:00
maver 550e635d93 Add migration for legacy prompts 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 7c1e370abe Allow the user to toggle names in chat history 2023-08-12 18:40:38 +02:00
maver f207e0eab3 Add basic WindowAI support 2023-08-12 18:40:38 +02:00
maver aaa2c48e7d Add basic claude support 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 77e183f5dd Add support for authors note and summary extensions 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 c92de398b9 Fire event after a chat has successfully loaded 2023-08-12 18:40:18 +02:00
maver b8d08161ab Allow generate to run without sending a request 2023-08-12 18:40:18 +02:00
maver 3acd865bf8 Introduce new substitute parameters
charIfNotGroup and group
2023-08-12 18:40:18 +02:00
maver a5e2f11e61 Use EventEmitter instead of native event handling 2023-08-12 18:40:18 +02:00
maver 63985a490d Add error handling to parseTokenCounts function 2023-08-12 18:40:17 +02:00
maver c6eee88cd4 Add prompt manager setup 2023-08-12 18:39:54 +02:00
Cohee1207 092846e0bc #924 Replace Novel Kayra subtier context 2023-08-12 14:21:05 +03:00
Cohee1207 82f6d11795 Add lazy chat messages rendering 2023-08-12 13:10:50 +03:00
Cohee 9e43f5f8b7 Add flat budget cap for hybrid WI budgeting 2023-08-10 20:45:57 +03:00
Cohee 104d983449 Adjust novel max context calculation 2023-08-10 19:15:52 +03:00
Cohee f226fe99aa Showdown render tables 2023-08-10 13:18:12 +03:00
Cohee 1a07fa8365 [Feature Request] Can we please have <xml_tags> visibility back? #907 2023-08-10 11:47:17 +03:00
Cohee e39e9428b6 Allow incomplete sentences on quiet prompts 2023-08-09 16:41:12 +03:00
Cohee 0ed340bd9a
Merge pull request #901 from 50h100a/mancer-urlfix
Relax URL requirements when Mancer is enabled.
2023-08-08 23:27:05 +03:00
50h100a 53e41bdda8 Relax URL requirements when Mancer is enabled. 2023-08-08 16:12:03 -04:00
Cohee cd86999d30 Fix variable name 2023-08-08 22:39:34 +03:00
Cohee 2fea218661 Extend random and roll syntax for frontend compatibility 2023-08-08 22:36:42 +03:00
Cohee ef3a9a810e Fix avatar preview after changing it 2023-08-08 22:08:41 +03:00
RossAscends 78825352e5 more help format updates 2023-08-08 18:03:39 +09:00
RossAscends 264b52b52d update help format 2023-08-08 17:42:28 +09:00
Cohee1207 c124fc589f Fix display help links 2023-08-07 22:21:10 +03:00
Cohee f8e8929834
Merge pull request #896 from majick/tiny-cosmetic 2023-08-07 19:53:35 +03:00
majick 4167047f9b Cosmetic: The avatar crop accept button is labeled "Accept" 2023-08-07 09:49:07 -07:00
Cohee e0d6430ade Fix copy-paste issue 2023-08-07 02:20:53 +03:00
Cohee 23a57e86a7 Try to remove excess character names from generations 2023-08-07 00:31:26 +03:00
Cohee 151f4d322c #883 Add option to disable CSRF tokens 2023-08-06 16:42:15 +03:00
AeonBlack cfc4394e41 Resolve some API Spam / Fix 1 Token for 0 Token Counters 2023-08-06 05:58:26 +01:00
Cohee ef1f6b3143 Merge branch 'staging' of https://github.com/SillyLossy/TavernAI into staging 2023-08-05 15:44:18 +03:00
Cohee 58f7c77281 Reformat code 2023-08-05 15:44:15 +03:00
Cohee1207 6ddfcc7a06 Enable quote blocks and HTML comments 2023-08-05 12:29:37 +03:00
Stefan Daniel Schwarz b407fe2388 custom_stopping_strings_macro toggleable option 2023-08-04 16:53:49 +02:00
SDS 33af7ad266
Replace Macro in Custom Stopping Strings
Replaces user and char names in custom stopping strings, making them much more versatile and useful.

Example Use Case: Now you can use a custom stopping string like "\n*{{user}} " to stop generation when the AI tries to act as the user.
2023-08-04 15:45:45 +02:00
Cohee cd8a24a712 Fix bulk edit 2023-08-04 14:41:00 +03:00
Cohee 84283bc2b4 Add "Best match" tokenizer option 2023-08-04 14:17:05 +03:00
Mike Weldon 079b1623c5 NovelAI preamble code cleanup 2023-08-03 18:27:23 -07:00
Cohee ea809023b5
Merge pull request #858 from 50h100a/mancer-api
Mancer API
2023-08-03 23:06:53 +03:00
SDS 65732f4406
del_char_checkbox unchecked by default
When you delete a character, you can always re-import them - but if you deleted the chat files, they're gone forever unless you backed them up manually. That's why I think this checkbox should be off by default, making chat file deletion a conscious effort.

With it off, worst case someone forgets to check the box and has some unnecessary files on their disk that they can then delete manually. That's much less of a problem than someone forgetting to uncheck the box (e. g. when importing a new version of the character) and then suffering data loss.
2023-08-03 15:39:15 +02:00
50h100a 9cf4056b28 Do backflips trying to get error information from endpoints.
Then present it nicely.
2023-08-03 07:32:53 -04:00
Cohee 37e653dcf4 Add toggle for persona info notifications 2023-08-03 14:24:45 +03:00
50h100a 2fc6813e66 code review adjustments part 1 2023-08-03 06:07:54 -04:00
Cohee 1b005ef47f
Merge pull request #856 from mweldon/preamble 2023-08-03 10:24:31 +03:00
RossAscends 68e5ae63d6 move closechat/togglepanels to slashcommands 2023-08-03 13:21:38 +09:00
50h100a 61c0e3b08b Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into mancer-api 2023-08-02 23:46:03 -04:00
50h100a 2fdec7eb03 Added authentication variant to WebUI API. 2023-08-02 23:25:24 -04:00
Mike Weldon 1d0f67c144 Add NAI preamble to start of chat buffer 2023-08-02 18:22:06 -07:00
gd1551 ea800d1550 Add stop sequences support to NovelAI generations 2023-08-02 22:42:11 +03:00
SDS 9d99b89c9c
Fix inconsistent newline trimming
Newlines weren't trimmed at first generation in a new chat, only on subsequent generations. By commenting out this check, it works consistently for all generations.

(I noticed because even with my deterministic preset, a regen/swipe would give a different output than the very first generation, so I went looking and found this if-clause as the source of the inconsistent behavior.)
2023-08-02 20:00:01 +02:00
Cohee 72974d8a54 More clear message for character import failure 2023-08-01 18:13:50 +03:00
Cohee c5d87e4808 ParseImgDimensions for Showdown 2023-08-01 16:24:54 +03:00
Cohee 7596d78322 #844 Properly handle KoboldAI errors 2023-08-01 15:22:51 +03:00
SDS 73fd306b8b Fixed persona_description linebreak
When persona description is positioned after character card, there are double linebreaks before and none behind the persona description, because storyString already brings a trailing one whereas persona_description doesn't. This fixes that by putting the linebreak where it belongs.
2023-08-01 12:54:46 +03:00
Cohee 49f7185c8c #829 Close chat option 2023-07-30 21:35:21 +03:00
RossAscends 95d43712d3 fix chat bg color when panels hidden 2023-07-31 01:08:24 +09:00
Cohee 6d9c2ec365
Merge pull request #819 from pyrater/staging
Show / Hide Top Bar
2023-07-30 16:38:44 +03:00
joe d8d5118283 removed padding 2023-07-30 11:57:21 +09:00
joe 11226ff7d6 add CSS to round corners 2023-07-30 11:56:17 +09:00
pyrater 844d9c86a4
Merge branch 'SillyTavern:staging' into staging 2023-07-30 11:50:09 +09:00
joe 0aee97ccca Added Option to toggle/Hide settings bar. 2023-07-30 11:47:17 +09:00
city-unit fa06e5ee5a Add optional alerting for WI debugging. 2023-07-29 22:15:54 -04:00
city-unit 6829f5308f Persist active chat across devices. 2023-07-29 19:48:08 -04:00
Cohee 8e06d18664 #804 Add kayra model 2023-07-28 21:45:44 +03:00
Cohee1207 707ce62017 Advanced Character Search #786 2023-07-28 00:38:43 +03:00
Cohee1207 ddf485f354 #787 Display character version in the list 2023-07-28 00:04:21 +03:00
Cohee 68819a1afc Add openrouter to /api slash command 2023-07-26 21:22:57 +03:00
Cohee e4e2ff20a2 #781 Don't add You stopping string for non-Pygmalion models 2023-07-26 21:08:25 +03:00
Cohee c3d43a7d05
Merge pull request #776 from bdashore3/staging 2023-07-25 09:34:13 +03:00
kingbri 40f7aa47ad Generate: Ignore bias addition on continue
Continue adds to an existing prompt, so the correct parts of a
message are already present.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-07-24 23:45:53 -04:00
Cohee1207 83cb3456fc Run showdown output through sanitize 2023-07-25 00:07:52 +03:00
Cohee 0df8c4b6a2
Merge pull request #774 from city-unit/feature/delete
More general/functionalized char delete methods
2023-07-24 22:45:41 +03:00
city-unit 8fdea22379 Move delete calls to functions, generalize delete endpoint. 2023-07-24 15:05:27 -04:00
Cohee 130559d499 #746 Add preset manager for ooba/kobold 2023-07-23 23:52:31 +03:00
Cohee 1b9ca4c9d9 Unhide advanced parameters for Novel 2023-07-23 02:09:03 +03:00
Cohee ea68e70ac7 Refine message for dupe confirm 2023-07-22 22:14:16 +03:00
Cohee e38a9df538 Confirm character duplication 2023-07-22 21:50:21 +03:00
Cohee eccfadb14e #763 Fix "Continue on Send" 2023-07-22 17:46:59 +03:00
Cohee1207 212e98302a Fix empty stat and original param 2023-07-22 14:10:21 +03:00
Cohee 053dbbd25c Onboarding experience and new default user avatar 2023-07-21 16:42:18 +03:00
Cohee c0d3dd54a7 Emit event after chat reloading 2023-07-21 14:15:43 +03:00
Cohee bdca4b9bad Fix empty original substitution and bg mobile usability 2023-07-21 12:02:52 +03:00
Cohee a81b0dba2f Don't remove bg uploader on backgrounds render 2023-07-20 23:12:59 +03:00
Cohee edd41989fd Initial commit 2023-07-20 20:32:15 +03:00