Commit Graph

376 Commits

Author SHA1 Message Date
Cohee af38971a01 Delete vectors on deleting chats 2023-09-09 22:15:47 +03:00
Cohee 31beb05aa1 Substitute macro in Novel preamble 2023-09-09 18:19:01 +03:00
Cohee 4cf6a1f7da Cache and sample classification results 2023-09-09 17:31:27 +03:00
Cohee da34517943 Merge branch 'staging' into vectors 2023-09-09 01:21:03 +03:00
Cohee ea01247bcf #1090 Save Kobold/ooba servers history 2023-09-08 22:44:06 +03:00
Cohee 6f3947226f
Merge pull request #1116 from ThisIsPIRI/macro
Replace macros in example separator and chat start
2023-09-08 21:10:20 +03:00
Cohee 42fd317188 Merge branch 'staging' into vectors 2023-09-08 16:41:26 +03:00
Cohee 2411b17279 Merge branch 'release' into staging 2023-09-08 16:40:45 +03:00
Cohee ab460199ab #1117 Fix typing indicator and auto-scroll breaking mobile layout 2023-09-08 16:36:00 +03:00
ThisIsPIRI 2688d980c1 Replace macros in example separator and chat start 2023-09-08 19:25:17 +09:00
Cohee 02bdd56e20 Make printMessages async 2023-09-08 12:10:41 +03:00
Cohee 96df705409 Change insertion strategy to an extension block 2023-09-08 01:26:26 +03:00
anmelus f2cae64b0d
Added loop-around for swipe-left when multiple swipes exist (#1104)
* Added loop-around for swipe-left when multiple swipes exist

* Added loop around for alternate greetings in swipe_right(),
Disabled toast for add more alternate greetings

* Debounce saving swipes

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-09-07 16:45:19 +03:00
Cohee 853736fa93 Remove legacy NovelAI models 2023-09-06 14:32:06 +03:00
Cohee 322511caa9 Remove legacy Pygmalion formatting, part 2 2023-09-06 14:19:29 +03:00
Cohee 29124df66b Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-09-06 14:07:04 +03:00
Cohee 9c26e324ac Remove legacy Pygmalion formatting 2023-09-06 14:07:00 +03:00
anmelus 889a1b5323
Fixed multiple zoomed avatars from appearing. Excluding moving UI (#1098)
* Fixed multiple zoomed avatars from appearing

* Added check for moving UI elements
2023-09-05 21:40:22 +03:00
Cohee bbed147ce5 Clean up browser logs 2023-09-05 18:23:24 +03:00
Cohee 7b3f242454
Merge pull request #1094 from GanstaKingofSA/staging
Improved cleanup for Instruct Mode
2023-09-05 10:57:48 +03:00
RossAscends ab8fb98f5d fix zoomed avatars when swapping personas 2023-09-05 10:09:35 +09:00
GanstaKingofSA 5d0a4fa940 add input sequence as stop sequence by default 2023-09-04 16:29:49 -05:00
Cohee 8636987d8a
Merge pull request #1091 from city-unit/feature/chub 2023-09-04 20:15:41 +03:00
city-unit 01e38be408 Expose importing dropped images for consistent import 2023-09-04 13:09:47 -04:00
Cohee ded1e3a859 Add NAI Diffusion upscaling. Add Anlas guard and view Anlas button 2023-09-04 18:00:15 +03:00
Cohee e616ab5ced Don't subtract WI tokens from ChatCompts prompt itemization 2023-09-04 14:31:00 +03:00
Cohee c110ebe02b Fix chat bg gens not saving. Remove module worker pattern and global function from chat bg plugin 2023-09-04 12:18:37 +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 1f10acdf17 Slight refactor Kobold version flags 2023-09-01 01:07:04 +03:00
Cohee 53f8667782 #1071 Initialize Ross mods only after the first load completed 2023-08-31 20:31:12 +03:00
Cohee 019c47adc6 #1068 Display token counts on generated messages 2023-08-31 17:10:01 +03:00
Cohee 05f3a5d8a1 #1041 Auto-fix displayed markdown for unbalanced quotes/asterisks 2023-08-31 14:39:31 +03:00
Cohee c6bbbf1c25 Fix continue token count overflow 2023-08-31 00:16:58 +03:00
Cohee 10148167ba Option to disable group impersonation ban. Hide CFG for simple UI 2023-08-30 16:31:53 +03:00
Cohee 7eebbca3dd Fixed extension prompt insertion at depth 1 2023-08-30 02:09:30 +03:00
Cohee 44f88c61ff Add simplified UI switch 2023-08-29 18:04:10 +03:00
Cohee f60ddd6465 Fix group member reply trimming 2023-08-29 14:53:39 +03:00
Cohee 030424d034 Add char to persona converter. Move persona functions to a separate script file 2023-08-29 01:54:11 +03:00
Cohee 1bb2778f46 Fix macros replacement in custom stop strings for OAI 2023-08-29 00:47:35 +03:00
Cohee 9ce8aa661f Deprecate "After Char" position for persona description 2023-08-29 00:10:18 +03:00
Cohee 3b4e6f0b78 Add debug functions menu 2023-08-27 23:20:43 +03:00
Cohee 8bf679cba2 #1033 Promt => prompt 2023-08-27 19:24:28 +03:00
Cohee 8ec9b64be4 Fix regeneration calls on empty chat 2023-08-27 13:34:29 +03:00
Stefan Daniel Schwarz 813a640334 Add model info to model icon as title 2023-08-27 12:13:55 +02:00
Cohee 0d8a83e6b6 Fix imported char flashing with pagination 2023-08-27 04:01:13 +03:00
Cohee 2685bf95fe #1016 Pagination improvements 2023-08-27 02:13:46 +03:00
Stefan Daniel Schwarz b9a95d94a0 Force isSystem = false on comment messages so they get formatted properly 2023-08-26 19:26:23 +02:00
Cohee 11c7c81d1b Add template caching 2023-08-26 14:07:41 +03:00
Cohee bca44ba682 Conserve ending newlines in story string template 2023-08-26 01:32:39 +03:00
Cohee 44661d0e2b Merge branch 'staging' into generate-array 2023-08-26 01:07:19 +03:00
Cohee fabba9370b
Merge pull request #1017 from StefanDanielSchwarz/improved-instruct-mode-sequences
improved instruct mode sequences and UI
2023-08-26 01:03:38 +03:00
SDS 45046aa211
Merge branch 'staging' into improved-instruct-mode-sequences 2023-08-25 23:06:44 +02:00
Stefan Daniel Schwarz ddaa4fe409 force output sequence (first or last) 2023-08-25 22:02:11 +02:00
Stefan Daniel Schwarz 3ce3a7e6f1 Resolve conflicts 2023-08-25 21:07:10 +02:00
Stefan Daniel Schwarz ca37ac679e Improved Advanced Formatting UI 2023-08-25 21:04:06 +02:00
Cohee cb669cbcab Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-25 20:34:33 +03:00
Cohee b32a085e41 Add template renderer for extensions 2023-08-25 20:34:26 +03:00
Cohee 12f1cdb3fd #1020 Fix summarize + prompt manager. Clarify naming for insertion position. 2023-08-25 20:03:31 +03:00
Cohee 794abfcd6f Disable swipe left when reply is still being generated. 2023-08-25 19:23:05 +03:00
Cohee 94d2b737e2 Fix OpenAI prompt injections + add type casts and typings on setting the extension prompt. 2023-08-25 17:05:51 +03:00
Cohee d68151f7e2 Init author's note via function call instead of onready 2023-08-25 16:46:54 +03:00
Stefan Daniel Schwarz be3ebcda0d improved instruct mode sequences (WIP) 2023-08-25 14:01:25 +02:00
Cohee c566af7695 #1014 Adjust group clean-up routine 2023-08-25 13:46:30 +03:00
Cohee 2cce6e83fa Don't lose continued swipes 2023-08-25 01:27:27 +03:00
RossAscends 1a1878f095 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-25 07:06:54 +09:00
RossAscends ce5e706fac topbar resize, font scaling fix, mobile slider fix 2023-08-25 07:06:52 +09:00
kingbri 1dd1607b94 Generate: Migrate to array-based message concatenation
String addition is very limited in how flexible it can be. Using
an array will instead allow for various ways to shift around extension
prompts and insertion depths.

To preserve message order, each mesSend object contains both a message
and an array of extension prompts which are later added on top of
the message itself.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-24 18:02:17 -04:00
Cohee 1900ab9726 #1005 Replace mobile detection method in get sortable delay. Make deviceInfo loading sync. Init Ross mods via function call. 2023-08-24 23:52:03 +03:00
Cohee c91ab3b5e0 Add Kobold tokenization to best match logic. Fix not being able to stop group chat regeneration 2023-08-24 21:23:35 +03:00
Cohee f5fd15ffd2 #976 Return "Continue on send". Allow continuing the first chat message. Add debug function for i18n. 2023-08-24 15:13:04 +03:00
Cohee 3e25c3f51c
Merge pull request #1008 from mweldon/novel-generate-until-sentence
Novel generate until sentence
2023-08-24 11:25:56 +03:00
Cohee d147bc40dc Fix alternate greetings 2023-08-24 11:04:46 +03:00
Mike Weldon 8202fab376 Remove commented lines I added by mistake 2023-08-23 18:08:55 -07:00
Mike Weldon 1d1109e43b Set generate_until_sentence for NovelAI
* Set generate_until_sentence true for NovelAI
* Add a Story String file for NovelAI with persona before character
  which works better
* Remove hardcoded dinkus for chat_start since it is in the Story String
2023-08-23 18:04:56 -07:00
Cohee ffc8150eef Add missing space on continue 2023-08-24 02:38:02 +03:00
Cohee 4038e7f9e3 #999 Instruct mode fixes 2023-08-24 02:22:37 +03:00
Cohee e2507e8840 #976 Add "quick continue" button. Remove "send to continue" option. 2023-08-24 01:37:44 +03:00
Cohee d64c5880c8 Fix new chat reference not getting saved when starting a new chat 2023-08-24 00:54:36 +03:00
Cohee de0dbfb394 Merge branch 'roleplay-context' into staging 2023-08-24 00:30:04 +03:00
Cohee 1ce848c1c3 Move before / after char WI to story strings 2023-08-24 00:26:47 +03:00
Cohee 9aa03402fa
Merge pull request #1004 from SillyTavern/prompt-manager-persona-description
Prompt manager persona description
2023-08-23 22:11:47 +03:00
maver 5a02250a1f Add persona description to prompt manager order 2023-08-23 20:40:26 +02:00
RossAscends 632d03228f Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-24 03:34:25 +09:00
RossAscends 6c56fb0a6d 500ms delay for sliders on touch devices 2023-08-24 03:34:20 +09:00
Cohee 1d6b7c9947 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-23 21:32:46 +03:00
Cohee 031a6cb2a4 Performance and data integrity improvements 2023-08-23 21:32:38 +03:00
Cohee 2c58f9d903
Merge pull request #1001 from bdashore3/staging
More CFG fixes
2023-08-23 18:49:36 +03:00
kingbri 0460375647 CFG: Don't inject anything when guidance scale doesn't exist
If the guidance scale is 1, completely disable sending CFG and creating
a negative prompt.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-23 11:27:58 -04:00
Cohee f48cc0db31 Unify cfgValues parsing between ooba/Novel 2023-08-23 18:26:56 +03:00
Cohee 2c2a68ef76 Fix instruct system sequence missing + {{original}} 2023-08-23 18:04:22 +03:00
Cohee b751643364 Save pagination state on return to list from card 2023-08-23 16:48:44 +03: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 bc5fc67906 Put tokenizer functions to a separate file. Cache local models token counts 2023-08-23 02:38:43 +03:00
Cohee fd95b79ae9 Fix auto-translate plugin. Add new event types for post-rendering 2023-08-22 22:45:12 +03:00
Cohee 16406f2698 Fix Chat Completions itemization 2023-08-22 20:34:20 +03:00
Cohee 38a08cd887
Merge pull request #968 from bdashore3/staging
CFG: Improvements
2023-08-22 19:00:39 +03:00
Cohee 042c0b84a1 Add a token counter for persona descriptions 2023-08-22 18:32:18 +03:00
Cohee ea4d4a8fd6 Fix system messages using incorrect timezone 2023-08-22 18:13:03 +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
kingbri 25c7686462 CFG: Pass entire guidance object
If an API doesn't use the negative prompt from generate, allow
the negative prompt to be refetched in the specific API. This
requires the full guidance scale object instead of just the number.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-22 10:17:20 -04:00
Cohee 1abb739a8c Replace one-time bias regex parser with Handlebars helper 2023-08-22 16:14:21 +03:00
Cohee c7ce6a4953 Move prompt itemization to HTML templates 2023-08-22 14:50:43 +03:00
Cohee 9deaec5877 More typechecks and comments 2023-08-22 14:30:49 +03:00
Cohee e2bac7ec5f Add type checking and JSDoc comments to some utils 2023-08-22 13:07:24 +03:00
Cohee 2615eb8532 Extract system message templates to template files 2023-08-22 10:37:18 +03:00
kingbri ecfe8a722f Generate: Fix prompt bias addition
If the bias is empty, don't add it.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-21 23:54:53 -04:00
Cohee d974866ed7 Fix missing space in ST version string 2023-08-22 00:40:39 +03:00
Cohee 57b126bfbf Save chat completions settings to an object. Update numeric setting types 2023-08-22 00:35:46 +03:00
Cohee 07d7eb733d Fix raw prompts display in prompt itemizer 2023-08-21 23:50:38 +03:00
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