Commit Graph

679 Commits

Author SHA1 Message Date
Cohee c695f73586 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-11-01 22:59:07 +02:00
Cohee e8f4653a25 Add interactive mode for SD plugin 2023-11-01 22:58:59 +02:00
RossAscends 230ef417b6 Ooba sampler panel overhaul 2023-11-02 02:53:50 +09:00
Cohee a0706fcfc8 Add loader UI component 2023-10-31 22:16:33 +02:00
RossAscends a27e7a139a Chat History Panel Overhaul, shorter filenames 2023-10-30 14:16:20 +09:00
Cohee 91862bff43 Fix double-emit of CHAT_CHANGED on /go command 2023-10-29 23:23:42 +02:00
Cohee 7b6603614f Add API icons for aphrodite and mancer 2023-10-29 23:02:56 +02:00
Cohee 483ae22bc3 Add ability to abort generation by extension interceptors 2023-10-29 18:29:10 +02:00
Cohee e0be4dde31 Move extensions update check to after init 2023-10-27 21:23:58 +03:00
Cohee 52ecad1cdf Rework single-line mode, add section for Context Formatting settings 2023-10-27 21:02:03 +03:00
Cohee 11cc27d9c9 Increase debounce duration for type-in controls to 2sec 2023-10-26 22:02:56 +03:00
Cohee edbde2be37 Make comment macro multiline 2023-10-26 18:41:35 +03:00
RossAscends e9107870c0 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-10-26 13:20:49 +09:00
RossAscends d50124e937 appwide slider overhaul 2023-10-26 13:20:47 +09:00
Cohee 339dcaf506 Fix message trigger on disabled character in amalgamate group mode 2023-10-26 02:10:14 +03:00
Cohee 5cdc3d1d18 Smudge groups depth prompts in Join mode. 2023-10-26 00:39:11 +03:00
Cohee 8dcfe57888 #1268 Add group card amalgamation mode 2023-10-26 00:09:22 +03:00
Cohee f2d5196890 Change scenario override setup method 2023-10-25 19:44:46 +03:00
Cohee c2ba3a773a Delayed tokenizers initialization 2023-10-25 00:32:49 +03:00
Cohee 3edc456fe7 Extend extensions interop API 2023-10-25 00:28:58 +03:00
Cohee 52537904f7 Add stopping strings to Horde 2023-10-24 16:23:32 +03:00
Cohee 8f118f140f Save settings after selecting persona 2023-10-23 23:22:25 +03:00
Cohee f0b20b67de Rearrange ext.panel. Add ext.update notifications. Improve performance on large number of extensions 2023-10-23 16:53:31 +03:00
Cohee a662677f06 Add prompt copy button 2023-10-22 00:51:35 +03:00
Cohee c49f898886 Display prompts for enlarged images 2023-10-22 00:39:11 +03:00
Cohee a4ab898933 Move CFG scale to built-in functionality 2023-10-21 22:19:49 +03:00
Cohee 0b535e98b8 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-10-21 20:32:39 +03:00
Cohee 4ecf2b9f2d Fix stats init error 2023-10-21 20:32:36 +03:00
Cohee 5012237eb3 Display generated bg in the bg block. Add ability to copy chat bg to system list. 2023-10-21 17:43:25 +03:00
Cohee b4e29bf157 #1272 Optimize performance of context buttons visibility switch 2023-10-21 15:41:27 +03:00
Cohee 97d75aef73 #1272 Fix control buttons when expand actions is used 2023-10-21 15:17:18 +03:00
Cohee 703965aec8 Substitute macro in character editor token counter 2023-10-21 14:39:01 +03:00
IkariDevGIT 6fe4232f75
Add {{// (note)}} macro (#1265)
* add {{# (note)}} macro

* change from # to // for future updates

* fix docs
2023-10-21 14:28:02 +03:00
RossAscends b41bf7cf4e
Merge pull request #1267 from city-unit/feature/ui
Minor Fix: Hide extra buttons when you click away
2023-10-21 11:36:40 +09:00
city-unit 95a3021e53 Smooth transition 2023-10-20 22:31:57 -04:00
city-unit b8939b8ccb Hide extra buttons when you click away 2023-10-20 22:14:36 -04:00
Cohee f285110773 Merge chat backgrounds plugin with main backgrounds menu 2023-10-21 01:40:58 +03:00
Cohee 7f8df9533b Auto-complete code blocks during streaming 2023-10-20 23:52:23 +03:00
Cohee 31242e23eb
Merge pull request #1249 from bdashore3/staging
Add ask command
2023-10-18 21:28:20 +03:00
Cohee 6a1b230c7e #1226 Add chat-bound lorebooks 2023-10-16 23:03:42 +03:00
Cohee 59af85ce1c #1250 Fix multiple card import tags 2023-10-16 11:37:04 +03:00
kingbri dfa25a1796 Commands: Add ask command
The ask command aims to ask another character about a question or
topic from the current chat. Essentially, the current chat is taken
out and prompted to another character.

This command also requires a few fixes to sprites and prompt creation.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-10-16 02:12:12 -04:00
kingbri 2c1a6ca67c World Info: Add scanning with AN
Add support for adding extension prompts into WI scanning. Doing this
required adding a method to get extension prompts by name. Now, AN
and depth prompts can be added to world info scanning.

However, since scanning just looks for keys in the chatlog, append
the extension prompts on the top of scanned text.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-10-11 23:50:58 -04:00
Cohee e2f0162e5a Fix injection order 2023-10-11 22:42:25 +03:00
Cohee c4fbc8373d Add raw generate function 2023-10-11 17:56:52 +03:00
RossAscends 6b5aa9d06e toggle to skip WI&AN insertion in Summary's prompt 2023-10-11 19:44:22 +09:00
Cohee 7be3718a36 Fix first.mes continue for Chat Comps 2023-10-10 20:54:09 +03:00
kingbri dbf964e430 Script: Fix greeting message with continue
Add author's note when continuing the first message of a conversation.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-10-10 14:26:41 +03:00
Cohee 1239026a8f Auto-update extensions on version change 2023-10-09 23:45:09 +03:00
Cohee d81151efa2 Fix first message duplication 2023-10-09 18:22:50 +03:00
Tony Ribeiro df4ca46c02 Save chat id between received and rendered event for safety (blip extension allow multiple message received before one is rendered). Added export in translate extension for usage in blip extension. 2023-10-09 01:26:57 +02:00
Cohee 54d52a2986 Manage extensions via the assets plugin 2023-10-08 23:20:01 +03:00
SDS 5848ec498b
Assorted fixes and improvements (#1208)
* Kobold Presets fixed

* Help texts fixed

* Scale API for connectAPISlash

* Quick Reply checkboxes fixed

* New Instruct Mode Presets

* More date/time macros

* ChatML context template and instruct prompt format

* Mistral context template and instruct prompt format

* Removed use_default_badwordsids from kobold presets

* Renamed ChatML to Mistral-OpenOrca (ChatML)

* Renamed Mistral-OpenOrca (removed ChatML)

* Removed single_line from kobold presets

* Removed obsolete use_stop_sequence setting

* Ban EOS Token off by default

* Split AI Resp. Conf. in global and preset-specific settings

* Resolve conflicts

* Fix title

* Add translations for new help texts

* Fix i18n.json whitespace

* Make Mistral-OpenOrca system prompt more generic

* Renamed "Mistral-OpenOrca" to "ChatML" again

* More (UI) fixes and improvements

* Sendas hint fixed

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-10-07 19:25:36 +03:00
Cohee 85a63b3bb3 Add WI entry sorting. Add new entry flash 2023-10-05 23:30:18 +03:00
valden80 788bbe969f
Feature, ability to add banned words sequences from anywhere through {{banned "..."}} macro. (#1202)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Fix constant assignment, reformat code

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-10-05 13:10:41 +03:00
Cohee f8b5fe8b1e Add Character note to char.card embeds 2023-10-04 22:13:56 +03:00
Cohee 584d7961eb Close message editor before regenerating. #1195 2023-09-28 21:47:55 +03:00
Cohee 191c180946 Fix streaming url validation 2023-09-28 20:47:33 +03:00
Cohee bb47712696 Split oobabooga/mancer sources. Add aphrodite support 2023-09-28 19:10:00 +03:00
Brian Dashore bfda5a5492
Extra fixes (#1185) 2023-09-26 09:53:04 +03:00
Cohee edb79d8c53 Synchronize max depths for plugins 2023-09-25 19:29:24 +03:00
Cohee 423f88a458 Skill issue 2023-09-24 15:04:02 +03:00
Cohee 1838ca1994 Replace magic numbers with named constants 2023-09-24 14:45:04 +03:00
Brian Dashore 2411006fdb
World Info: Add insertion order at depth (#1174)
Depth previously injected entries randomly. This is not ideal for
world info architectures that rely on insertion order to function
properly.

Redo depth injection to have its own parameter and redo how it's
handled in generate.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-09-24 14:41:56 +03:00
Cohee a081f78bd8 (WIP) PaLM API 2023-09-23 20:48:56 +03:00
Cohee 3d1312c13a Restyle chat width slider 2023-09-22 16:56:01 +03:00
Cohee ae4a9a7b14 Remove legacy chat lazy load 2023-09-21 22:07:56 +03:00
Cohee 6ae1b7a72b Filter out "undefined" stopping strings 2023-09-21 22:02:51 +03:00
Cohee 902acc44a2 Support "before main prompt" extension position in prompt manager 2023-09-21 20:46:08 +03:00
RossAscends 86c7a7a058 @Depth insertion for WI Entries 2023-09-21 16:04:34 +09:00
city-unit e0b5df97c4 Add branching as distinct from bookmarking 2023-09-20 22:48:05 -04:00
kingbri b52f71dcce Vectors: Add before story string/prompt option
This makes the most sense for placement of memories. Add the functionality
for other extension prompt placements as well.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-09-20 00:06:43 -04:00
Cohee 3a8383ab79 Append continue message timer instead of rewriting 2023-09-18 02:12:06 +03:00
city-unit 0033090a93
Idle Response / Continuous Generation (#1132)
* Initial idle stuff

* Much closer, can now quietly send as user to get a char response.

* Tweaks

* Better, reset the count of getting a message back, don't send while prompt is waiting.

* Allow selecting who is being prompted

* Comments and cleaup

* Remove char name for the moment (needs something here probably)

* Add random time period and "Always add character's name to prompt" respect

* Tooltips

* Load/unload listeners

* Reduce log spam

* Add inline prompt inclusion

* Add full loud prompting

* Comments

* Fix instruct newline (I think)

* Don't reset count on continue

* add quietToLoud for script.js

* add quietToLoud for slashcommands.js

* Keep instruct directives

* Removed some logging, don't do the Novel formatting if Q2L

* Logspam begone.

* Removed a bit more logging

* Add alignment style

* Reformat files. Add comments

* Reorder extensions

* Fix repeat logic to prompt once then only repeat the number specified

* Make repeat count more clear

---------

Co-authored-by: RossAscends <124905043+RossAscends@users.noreply.github.com>
Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-09-17 22:00:10 +03:00
Cohee d861c59f27 Merge branch 'release' into staging 2023-09-17 16:11:27 +03:00
Xrystal 23b08173ff Asynchronously fetch chats 2023-09-17 13:41:36 +08:00
RossAscends 9f15e67856 make zoomed avatars detectable by Escape hotkey 2023-09-17 05:17:02 +09:00
Cohee 38b63b07f5 Extract sprite and custom content endpoints to a separate files. Update constants references 2023-09-16 17:28:28 +03:00
Cohee 6e562bd1ff Extract server endpoints for thumbnails and extensions into separate files 2023-09-16 16:16:48 +03:00
RossAscends 57de6229f9 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-09-16 12:50:11 +09:00
RossAscends e162df67fa partially fix quietPrompts (/sysgen) for Instruct 2023-09-16 12:48:14 +09:00
Cohee dae09d58d7 Fix scroll top offset for new import flashing 2023-09-16 00:46:27 +03:00
Cohee 6dd09858d4 Don't remove names from the past chat. Fix non-streaming auto-continue.
We took fair criticism from the NovelAI dev.
2023-09-15 23:32:01 +03:00
Cohee fc7a4538e9 Cancel auto-continue if user input is not empty 2023-09-15 22:26:53 +03:00
Cohee 77c8bc8eb5 Don't trigger auto-continue after quiet gens 2023-09-15 21:49:52 +03:00
Cohee d34f7d3e1a Replace multigen with auto-continue 2023-09-15 21:34:41 +03:00
Cohee 599904d589 Move NovelAI endpoints to separate file 2023-09-15 17:54:13 +03:00
Cohee 0f1a0963fd Merge branch 'release' into staging 2023-09-15 15:06:13 +03:00
Cohee 2b3055a84a Webp cards format is no longer supported 2023-09-15 14:56:15 +03:00
Cohee 52891898d2 Pass max length to Kobold GUI settings 2023-09-14 18:20:12 +03:00
Cohee 17a5d629ea Auto-set hotswap slot number based on the screen width. 2023-09-14 15:56:01 +03:00
Cohee d62cdffcc0 Unblock amount_gen in Kobold GUI preset 2023-09-13 15:19:44 +03:00
Cohee bf0cf10403 Update hotswap state on fav 2023-09-13 13:12:19 +03:00
mweldon e74090139c
Add copy to clipboard button on prompt itemization popup (#1124)
* Add copy to clipboard button on prompt itemization popup

* Minor fix for NovelAI Summarize and new bad words
2023-09-13 11:52:37 +03:00
Cohee 09fc42a787 Lock extensions display order in top and context menus 2023-09-13 01:40:01 +03:00
Cohee c0e5d7efae Save chat scroll position when user input overflows the line 2023-09-13 00:51:21 +03:00
Cohee 6c29879f12 Filter out undefined messages for past chats search 2023-09-12 18:05:37 +03:00
Cohee 5cc6a2dca6 (WIP) Lazier chat loading 2023-09-11 01:07:45 +03:00
Cohee 98cc969d18 Merge branch 'staging' into vectors 2023-09-10 16:06:15 +03:00
Cohee dc5deaf47c Mobile doesn't like select2 2023-09-10 14:39:49 +03:00
Cohee 0480acebcd #1059 Mancer model selector 2023-09-10 04:08:32 +03:00
Cohee f8d90c1933 Merge branch 'staging' into vectors 2023-09-10 02:42:42 +03:00
Cohee 3dbdd1258e Don't close the panels when dismissing toasts 2023-09-10 02:30:23 +03:00
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
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