Merge branch 'main' into dev

This commit is contained in:
SillyLossy
2023-06-01 18:57:19 +03:00
3 changed files with 11 additions and 3 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "sillytavern", "name": "sillytavern",
"version": "1.6.4", "version": "1.6.5",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "sillytavern", "name": "sillytavern",
"version": "1.6.4", "version": "1.6.5",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"@dqbd/tiktoken": "^1.0.2", "@dqbd/tiktoken": "^1.0.2",

View File

@@ -48,7 +48,7 @@
"type": "git", "type": "git",
"url": "https://github.com/Cohee1207/SillyTavern.git" "url": "https://github.com/Cohee1207/SillyTavern.git"
}, },
"version": "1.6.4", "version": "1.6.5",
"scripts": { "scripts": {
"start": "node server.js", "start": "node server.js",
"pkg": "pkg --compress Gzip --no-bytecode --public ." "pkg": "pkg --compress Gzip --no-bytecode --public ."

View File

@@ -606,6 +606,14 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
await delay(100); await delay(100);
} }
} }
else if (isStreamingEnabled()) {
if (streamingProcessor && !streamingProcessor.isFinished) {
await delay(100);
} else {
messagesBefore++;
break;
}
}
else { else {
messagesBefore++; messagesBefore++;
break; break;