1
0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2024-12-16 03:10:47 +01:00
Commit Graph

2572 Commits

Author SHA1 Message Date
LenAnderson
3722bd25d4 Merge branch 'staging' into qr-rewrite 2023-12-23 22:05:10 +00:00
LenAnderson
71fc0436cb center add qr button 2023-12-23 19:43:42 +00:00
LenAnderson
a8f130ec5d add slash commands to get existing QRs and QR sets 2023-12-23 16:36:41 +00:00
Doa
41ac2c07b2 Adding negative character prompts for img sources that support it 2023-12-23 16:19:22 +00:00
Cohee
db3bf42d63 Fix Firefox number arrows not updating the slider 2023-12-23 16:09:03 +02:00
Cohee
b7a338e130 Move all Horde requests to server 2023-12-22 22:10:09 +02:00
Cohee
89d70539b9 Alternative continue method for chat completions 2023-12-22 20:24:54 +02:00
LenAnderson
6e3159db3f Merge branch 'staging' into qr-rewrite 2023-12-22 13:56:04 +00:00
LenAnderson
82a4ddbe01 cleanup 2023-12-22 13:55:37 +00:00
LenAnderson
cbceb7d1e8 add old settings migration 2023-12-22 13:45:37 +00:00
LenAnderson
f90e60783c remove debugger 2023-12-22 13:45:37 +00:00
LenAnderson
4fc456dffa delete QR set command and API 2023-12-22 13:45:37 +00:00
LenAnderson
a088fb1746 error handling 2023-12-22 13:45:37 +00:00
LenAnderson
e3c2d6771c fix slash command hints 2023-12-22 13:45:37 +00:00
LenAnderson
9e7bc0b8ab update todos 2023-12-22 13:45:37 +00:00
LenAnderson
9f13ab1fe9 rename exported quick reply api var 2023-12-22 13:45:37 +00:00
LenAnderson
a0918a3f5c add QR API 2023-12-22 13:45:37 +00:00
LenAnderson
5125eaf1dc implement slash commands 2023-12-22 13:45:37 +00:00
LenAnderson
8959c0d380 add QR popout 2023-12-22 13:45:37 +00:00
LenAnderson
40706e8430 fix isCombined not saved 2023-12-22 13:45:37 +00:00
LenAnderson
65e16affb7 add context menu 2023-12-22 13:45:37 +00:00
LenAnderson
bab0c4b0b9 add linebreaks in confirm popups 2023-12-22 13:45:37 +00:00
LenAnderson
c71a5bb82f handle overwriting QR set 2023-12-22 13:45:37 +00:00
LenAnderson
3a9b163aca add delete hack :( 2023-12-22 13:45:37 +00:00
LenAnderson
ac09fa6019 handle deleting 2023-12-22 13:45:37 +00:00
LenAnderson
2648b3c801 restructuring 2023-12-22 13:45:19 +00:00
Cohee
18445f527b Fix select2 empty message background + correct before selector 2023-12-22 02:22:09 +02:00
Cohee
45f6cb0fa8 Add chunked translate for long messages 2023-12-22 00:05:23 +02:00
Cohee
09fd772a20 Add ooba character yaml import 2023-12-21 21:46:09 +02:00
Cohee
4621834c87 Short formatting path for empty messages 2023-12-21 20:50:30 +02:00
Cohee
a85a6cf606 Allow displaying unreferenced macro in message texts 2023-12-21 20:49:03 +02:00
Cohee
39e0b0f5cb Remove custom Handlebars helpers for extensions. 2023-12-21 20:33:50 +02:00
valadaptive
8fb26284e2
Clean up Generate(), part 2 ()
* Move StreamingProcessor constructor to the top

Typical code style is to declare the constructor at the top of the class
definition.

* Remove removePrefix

cleanupMessage does this already.

* Make message_already_generated local

We can pass it into StreamingProcessor so it doesn't have to be a global
variable.

* Consolidate setting isStopped and abort signal

Various places were doing some combination of setting isStopped, calling
abort on the streaming processor's abort controller, and calling
onStopStreaming. Let's consolidate all that functionality into
onStopStreaming/onErrorStreaming.

* More cleanly separate streaming/nonstreaming paths

* Replace promise with async function w/ handlers

By using onSuccess and onError as promise handlers, we can use normal
control flow and don't need to remember to use try/catch blocks or call
onSuccess every time.

* Remove runGenerate

Placing the rest of the code in a separate function doesn't really do
anything for its structure.

* Move StreamingProcessor() into streaming code path

* Fix return from circuit breaker

* Fix non-streaming chat completion request

* Fix Horde generation and quiet unblocking

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-12-21 20:20:28 +02:00
Cohee
bddccd0356 Missed several context bind cases 2023-12-21 17:19:42 +02:00
Cohee
b5e59c819c Merge branch 'staging' into claude-rework 2023-12-21 16:52:43 +02:00
Cohee
e1afe41c91 Fix custom expression duplication 2023-12-21 16:50:30 +02:00
Cohee
b3dfe16706 Fix clean-up WI depth injections 2023-12-21 16:33:21 +02:00
Cohee
dd661cf879 Instruct "Bind to context" is now an option 2023-12-21 15:12:30 +02:00
Cohee
ee75adbd2d Update persona name if it is bound by user name input 2023-12-21 14:56:32 +02:00
Cohee
f3099ac270 Remove model icon fill colors 2023-12-21 14:43:36 +02:00
Cohee
747867c6f4
Merge pull request from SillyTavern/custom
Custom API endpoint type for Chat Completion
2023-12-21 14:42:18 +02:00
RossAscends
afdd9d823e Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-12-21 12:43:59 +09:00
RossAscends
348cc5f2a5 placeholder API icon for tabby 2023-12-21 12:43:57 +09:00
Cohee
3001db3a47 Add additional parameters for custom endpoints 2023-12-20 23:39:10 +02:00
Cohee
e42daa4098 Add caption ask prompt mode 2023-12-20 21:23:59 +02:00
Cohee
ae64c99835 Add custom caption source 2023-12-20 21:05:20 +02:00
Cohee
cf8d7e7d35 Merge branch 'staging' into custom 2023-12-20 18:37:47 +02:00
Cohee
ebec26154c Welcome message fixed 2023-12-20 18:37:34 +02:00
Cohee
5734dbd17c Add custom endpoint type 2023-12-20 18:29:03 +02:00
Cohee
041b9d4b01 Add style sanitizer to message renderer 2023-12-20 17:03:37 +02:00
LenAnderson
34decf1c05 add creating of new QR sets 2023-12-20 14:04:28 +00:00
Cohee
c212a71425 Fix ignore list of preset manager 2023-12-20 15:51:00 +02:00
Cohee
b0a4341571
Merge pull request from artisticMink/feature/before-combine-event
Allow extensions to alter the context order.
2023-12-20 15:46:34 +02:00
LenAnderson
69d6b9379a implement QR basics 2023-12-20 13:40:44 +00:00
LenAnderson
e19bf1afdd clean out QR extension 2023-12-20 13:39:09 +00:00
Cohee
93db2bf953 Simplify extras summary settings 2023-12-20 01:56:35 +02:00
Cohee
4b131067e4 Add local multimodal caption sources 2023-12-20 00:45:45 +02:00
Cohee
029cf598ce Fix /peek command 2023-12-19 23:12:14 +02:00
maver
8d63ce5559 Log Novel Ai prompt to console
When prompt logging is enabled.
2023-12-19 19:27:24 +01:00
maver
f30f75b310 Add GENERATE_BEFORE_COMBINE_PROMPTS event
Allows for context to be ordered by extensions
2023-12-19 19:11:36 +01:00
Cohee
3b22159f53 Fix spelling 2023-12-19 19:45:28 +02:00
Cohee
c7b93b690f
Merge pull request from StefanDanielSchwarz/Llama-2-Chat-separator-fix
Llama 2 Chat separator fix
2023-12-19 19:14:54 +02:00
Cohee
67dd52c21b Ollama text completion backend 2023-12-19 16:38:11 +02:00
SDS
d9fc396b39
Update Llama 2 Chat.json
Official separator is a space instead of a newline. That format itself is still FUBAR, but at least we get a little closer to what it was intended to look, I guess.
2023-12-19 00:48:42 +01:00
maver
0a649a395d Add 'synchronous' event emitter 2023-12-18 21:55:33 +01:00
Cohee
edd737e8bd Add llama.cpp inference server support 2023-12-18 22:38:28 +02:00
DonMoralez
37807acc60 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-18 22:01:38 +02:00
Cohee
6e8104873e Add logit bias for text completions 2023-12-18 18:57:10 +02:00
Cohee
08ea2095f8 Refactor Novel logit bias 2023-12-18 17:32:10 +02:00
Cohee
be5d428706
Merge pull request from SillyTavern/togetherai
Add TogetherAI as a text completion source
2023-12-18 14:52:36 +02:00
Carsten Kragelund Jørgensen
c2ad90eb2a
fix: verify QR exists when deleting through /qr-delete 2023-12-18 13:29:27 +01:00
Cohee
ac70a0a592 Add TogetherAI for image generation 2023-12-18 03:33:05 +02:00
Cohee
4473532151 Merge branch 'staging' into togetherai 2023-12-18 02:35:38 +02:00
Cohee
f6b59d0d3a Uniform command registration 2023-12-18 02:35:02 +02:00
Cohee
bdc7aaf3f1
Merge pull request from LenAnderson/more-comfyui-flexibility
More comfyui flexibility
2023-12-18 02:33:13 +02:00
DonMoralez
1df9e628bd Merge remote-tracking branch 'upstream/staging' into staging 2023-12-18 02:25:52 +02:00
DonMoralez
50ece13752 Add restore button, def hum message, claude check 2023-12-18 02:25:17 +02:00
Cohee
f249ff8b20 Fix slash commands for offscreen group members 2023-12-18 01:39:37 +02:00
LenAnderson
796ab7eff8 validate /icw 2023-12-17 22:57:10 +00:00
LenAnderson
56b9398353 add slash command to change comfy workflows 2023-12-17 22:24:22 +00:00
LenAnderson
55b9ebad3f add custom placeholders for comfy workflows 2023-12-17 22:17:08 +00:00
Cohee
b0d9f14534 Re-add Together as a text completion source 2023-12-17 23:38:03 +02:00
Cohee
180061337e Merge branch 'staging' into anachronous/release 2023-12-17 21:35:49 +02:00
Cohee
61e87d562f Add confirmation for regen with keystroke 2023-12-17 21:27:33 +02:00
Cohee
960c91c147 Add confirmation for convert to group 2023-12-17 21:14:16 +02:00
Cohee
a91f0f7ee5 Fix saving presets after deletion of the same name 2023-12-17 21:02:32 +02:00
DonMoralez
7835a1360f Merge remote-tracking branch 'upstream/staging' into staging 2023-12-17 19:46:47 +02:00
LenAnderson
fb25a90532 add GENERATION_STARTED event 2023-12-17 17:45:23 +00:00
Cohee
c7c1513e91 Add proxy support for multimodal captions. Add caption pre-prompt 2023-12-17 19:41:20 +02:00
RossAscends
a88cf1552a add check for uparrow hotkey to see if last_mes edit buttons are visible 2023-12-17 23:19:20 +09:00
DonMoralez
27a25e1298 Merge remote-tracking branch 'upstream/staging' into staging 2023-12-17 13:52:49 +02:00
RossAscends
b0907d23cc Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-12-17 20:18:53 +09:00
RossAscends
3d1bbd94e1 allow msg edit hotkey when user is last 2023-12-17 20:18:51 +09:00
anachronos
1e88c8922a
Merge branch 'staging' into release 2023-12-17 10:38:04 +01:00
Cohee
a62122a7d7 Merge branch 'staging' into mistral 2023-12-17 02:41:29 +02:00
Cohee
e0531f85dc
Merge pull request from SillyTavern/Deathspike/release
Allow comma after "char" prefix
2023-12-17 02:38:39 +02:00
Cohee
6e8a217482
Merge pull request from Deathspike/release
Add SD character-specific prompt prefix options to free-mode
2023-12-17 02:38:14 +02:00
Cohee
7fb9d9bfc1 Allow comma after "char" prefix 2023-12-17 02:34:42 +02:00
Cohee
26e822046e Hide "Summarize now" for extras source 2023-12-16 22:33:09 +02:00
Fayiron
eb2a85cfe0 Add TogetherAI API key to secrets.js 2023-12-16 15:11:04 +01:00