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
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
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
0d3505c44b
Remove OAI_BEFORE_CHATCOMPLETION
...
Not used in any internal code or extensions I can find.
2023-12-25 03:48:49 -05:00
d2f8632368
Remove populateLegacyTokenCounts
...
Unused and the documentation says it should probably be removed
2023-12-25 03:48:49 -05:00
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
47cb017a45
#1589 Add 'cache_prompt' for l.cpp
2023-12-25 02:42:03 +02:00
a8e5285ff7
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-25 01:19:30 +02:00
352b00caca
Merge branches 'staging' and 'staging' of https://github.com/SillyTavern/SillyTavern into staging
2023-12-24 23:11:11 +02:00
3b2ea4b0e7
Merge pull request #1592 from rigbyb/comfyui_fix
...
ComfyUI request/prompt fix
2023-12-24 23:10:51 +02:00
b6570e775d
ComfyUI request/prompt fix
2023-12-24 21:02:04 +00:00
4b254a75bc
Add scale icon
2023-12-24 20:02:11 +02:00
f8dece9d88
Always remove logit bias and stop from vision
2023-12-24 20:01:59 +02:00
3ac971b145
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-24 13:31:21 +02:00
a9e074dae1
Don't recreate first message if generation was run at least once
2023-12-24 02:47:00 +02:00
a8fb306c12
Add multimodal captioning for ooba
2023-12-24 01:43:29 +02:00
88993bd3e8
Add check for server plugin id clash
2023-12-24 00:00:20 +02:00
73548faa33
Bump package version
2023-12-23 23:56:09 +02:00
b476efd723
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-23 23:34:46 +02:00
736223a86a
Merge pull request #1587 from SillyTavern/staging
...
Staging
2023-12-23 20:47:48 +02:00
70b9c96c7f
Merge pull request #1586 from Doa86/negative-character-prompts
...
Negative Character Prompts
2023-12-23 20:45:18 +02:00
18e6a82306
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-23 20:06:55 +02:00
fd373fb821
Use file URL for import
2023-12-23 19:46:32 +02:00
8e1a84691b
Merge pull request #1562 from valadaptive/plugin-router
...
Server plugin API rework
2023-12-23 19:08:31 +02:00
f1453a3e8a
Await plugin cleanup
2023-12-23 19:05:21 +02:00
ea85cfcbdd
Plugin cleanup and validation fixes
2023-12-23 19:03:13 +02:00
437a6c1f40
Merge branch 'staging' into plugin-router
2023-12-23 18:39:18 +02:00
69509925c4
#1584 Chinese language codes Deepl
2023-12-23 18:37:30 +02:00
41ac2c07b2
Adding negative character prompts for img sources that support it
2023-12-23 16:19:22 +00:00
db3bf42d63
Fix Firefox number arrows not updating the slider
2023-12-23 16:09:03 +02:00
95eacacfec
Update prompt-converters.js
2023-12-23 00:37:28 +02:00
6fb69d5929
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-23 00:25:57 +02:00
6f163bd09c
Modified exclude prefixes
2023-12-23 00:25:48 +02:00
b7a338e130
Move all Horde requests to server
2023-12-22 22:10:09 +02:00
89d70539b9
Alternative continue method for chat completions
2023-12-22 20:24:54 +02:00
3bf14f0c56
Merge pull request #1582 from LenAnderson/config-avatar-thumb-png
...
Add option in config.yaml to use png for avatar thumbs
2023-12-22 18:10:59 +02:00
e95482aea1
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-22 17:12:59 +02:00
ee06a488b0
Add exclude prefixes checkbox, modified sequence checker
2023-12-22 17:04:58 +02:00
f862ffafd2
add option in config.yaml to use png for avatar thumbs
2023-12-22 14:23:50 +00:00
18445f527b
Fix select2 empty message background + correct before selector
2023-12-22 02:22:09 +02:00
45f6cb0fa8
Add chunked translate for long messages
2023-12-22 00:05:23 +02:00
9cf6cef0a4
Fix aborting generation on KoboldCpp via Text Completion
2023-12-21 23:14:28 +02:00
b782a8cc03
Add util for trim v1
2023-12-21 22:40:08 +02:00
09fd772a20
#1579 Add ooba character yaml import
2023-12-21 21:46:09 +02:00
4621834c87
Short formatting path for empty messages
2023-12-21 20:50:30 +02:00
a85a6cf606
Allow displaying unreferenced macro in message texts
2023-12-21 20:49:03 +02:00
39e0b0f5cb
Remove custom Handlebars helpers for extensions.
2023-12-21 20:33:50 +02:00
343c33e331
Stricter Horde prompt sanitation
2023-12-21 20:22:21 +02:00
8fb26284e2
Clean up Generate(), part 2 ( #1578 )
...
* 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
75eaa09cc3
Merge remote-tracking branch 'upstream/staging' into staging
2023-12-21 17:57:08 +02:00
valadaptive
Cohee
DonMoralez
RigbyB
Doa
LenAnderson
valadaptive