rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
RossAscends
2023-04-14 04:22:32 +09:00
parent 85bb8b79d1 0cb78685a9
commit dab7a07254
5 changed files with 52 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/script.js
View File

@ -1246,8 +1246,8 @@ class StreamingProcessor {
}
try {
this.result = this.prefix + text;
this.onProgressStreaming(this.messageId, this.result);
this.result = text;
this.onProgressStreaming(this.messageId, message_already_generated + text);
}
catch (err) {
console.error(err);
@ -1889,7 +1889,7 @@ async function Generate(type, automatic_trigger, force_name2) {
}
}
else if (main_api == 'textgenerationwebui' && textgenerationwebui_settings.streaming) {
streamingProcessor.generator = await generateTextGenWithStreaming(generate_data, finalPromt);
streamingProcessor.generator = await generateTextGenWithStreaming(generate_data);
}
else {
jQuery.ajax({
@ -1921,6 +1921,8 @@ async function Generate(type, automatic_trigger, force_name2) {
console.log('returning to make generate again');
return;
}
getMessage = message_already_generated;
}
if (streamingProcessor.isFinished) {