LenAnderson
c67317c2a1
Merge branch 'staging' into qr-rewrite
2023-12-25 13:10:58 +00:00
LenAnderson
29476e7c03
add import and export of QR sets
2023-12-25 13:08:03 +00:00
DonMoralez
7eefae2d6e
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-25 13:35:10 +02:00
valadaptive
0f8a16325b
Extract dryRun early return from finishGenerating
...
This means we only have to handle it in one place rather than two.
2023-12-25 03:48:49 -05:00
valadaptive
3c0207f6cb
Move "continue on send" logic out of Generate()
2023-12-25 03:48:49 -05:00
valadaptive
7899549754
Make "send message from chat box" into a function
...
Right now all it does is handle returning if there's already a message
being generated, but I'll extend it with more logic that I want to move
out of Generate().
2023-12-25 03:48:49 -05:00
valadaptive
1029ad90a2
Extract "not in a chat" check into guard clause
...
This lets us remove a layer of indentation, and reveal the error
handling logic that was previously hidden below a really long block of
code.
2023-12-25 03:48:49 -05:00
valadaptive
4fc2f15448
Reformat up Generate() group logic
...
The first two conditions in the group if/else blocks are the same, so we
can combine them.
2023-12-25 03:48:49 -05:00
valadaptive
0d3505c44b
Remove OAI_BEFORE_CHATCOMPLETION
...
Not used in any internal code or extensions I can find.
2023-12-25 03:48:49 -05:00
valadaptive
d2f8632368
Remove populateLegacyTokenCounts
...
Unused and the documentation says it should probably be removed
2023-12-25 03:48:49 -05:00
valadaptive
f53e051cbf
Lift precondition check out of processCommands
...
Instead of passing type and dryRun into processCommands, do the check in
Generate, the only function that calls it. This makes the logic clearer.
2023-12-25 03:48:49 -05:00
Cohee
47cb017a45
#1589 Add 'cache_prompt' for l.cpp
2023-12-25 02:42:03 +02:00
DonMoralez
a8e5285ff7
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-25 01:19:30 +02:00
Cohee
352b00caca
Merge branches 'staging' and 'staging' of https://github.com/SillyTavern/SillyTavern into staging
2023-12-24 23:11:11 +02:00
Cohee
3b2ea4b0e7
Merge pull request #1592 from rigbyb/comfyui_fix
...
ComfyUI request/prompt fix
2023-12-24 23:10:51 +02:00
RigbyB
b6570e775d
ComfyUI request/prompt fix
2023-12-24 21:02:04 +00:00
Cohee
4b254a75bc
Add scale icon
2023-12-24 20:02:11 +02:00
Cohee
f8dece9d88
Always remove logit bias and stop from vision
2023-12-24 20:01:59 +02:00
LenAnderson
e147b2bd23
Merge branch 'staging' into qr-rewrite
2023-12-24 15:10:05 +00:00
LenAnderson
881a8e570f
add execute button to QR editor
2023-12-24 15:07:12 +00:00
DonMoralez
3ac971b145
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-24 13:31:21 +02:00
Cohee
a9e074dae1
Don't recreate first message if generation was run at least once
2023-12-24 02:47:00 +02:00
LenAnderson
de8dc7310f
fix for settings dom undefined
2023-12-24 00:29:44 +00:00
LenAnderson
e01b51e6bd
Merge branch 'staging' into qr-rewrite
2023-12-24 00:25:27 +00:00
LenAnderson
aed38e32bd
add ctrl-click to edit QR
2023-12-24 00:20:47 +00:00
LenAnderson
5cd911db6b
put large message editor into additional options dlg
2023-12-24 00:20:30 +00:00
Cohee
a8fb306c12
Add multimodal captioning for ooba
2023-12-24 01:43:29 +02:00
LenAnderson
3d5dc18d0c
move click listener up
2023-12-23 23:26:00 +00:00
LenAnderson
3722bd25d4
Merge branch 'staging' into qr-rewrite
2023-12-23 22:05:10 +00:00
Cohee
88993bd3e8
Add check for server plugin id clash
2023-12-24 00:00:20 +02:00
Cohee
73548faa33
Bump package version
2023-12-23 23:56:09 +02:00
DonMoralez
b476efd723
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-23 23:34:46 +02:00
LenAnderson
71fc0436cb
center add qr button
2023-12-23 19:43:42 +00:00
Cohee
736223a86a
Merge pull request #1587 from SillyTavern/staging
...
Staging
2023-12-23 20:47:48 +02:00
Cohee
70b9c96c7f
Merge pull request #1586 from Doa86/negative-character-prompts
...
Negative Character Prompts
2023-12-23 20:45:18 +02:00
DonMoralez
18e6a82306
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-23 20:06:55 +02:00
Cohee
fd373fb821
Use file URL for import
2023-12-23 19:46:32 +02:00
Cohee
8e1a84691b
Merge pull request #1562 from valadaptive/plugin-router
...
Server plugin API rework
2023-12-23 19:08:31 +02:00
Cohee
f1453a3e8a
Await plugin cleanup
2023-12-23 19:05:21 +02:00
Cohee
ea85cfcbdd
Plugin cleanup and validation fixes
2023-12-23 19:03:13 +02:00
Cohee
437a6c1f40
Merge branch 'staging' into plugin-router
2023-12-23 18:39:18 +02:00
Cohee
69509925c4
#1584 Chinese language codes Deepl
2023-12-23 18:37:30 +02: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
DonMoralez
95eacacfec
Update prompt-converters.js
2023-12-23 00:37:28 +02:00
DonMoralez
6fb69d5929
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-23 00:25:57 +02:00
DonMoralez
6f163bd09c
Modified exclude prefixes
2023-12-23 00:25:48 +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