mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'main' into dev
This commit is contained in:
@@ -1463,6 +1463,7 @@ async function Generate(type, automatic_trigger) {
|
|||||||
textgenerationwebui_settings.top_p, // top_p
|
textgenerationwebui_settings.top_p, // top_p
|
||||||
textgenerationwebui_settings.typical_p, // typical_p
|
textgenerationwebui_settings.typical_p, // typical_p
|
||||||
textgenerationwebui_settings.rep_pen, // repetition_penalty
|
textgenerationwebui_settings.rep_pen, // repetition_penalty
|
||||||
|
1.0, // encoder rep pen
|
||||||
textgenerationwebui_settings.top_k, // top_k
|
textgenerationwebui_settings.top_k, // top_k
|
||||||
0, // min_length
|
0, // min_length
|
||||||
textgenerationwebui_settings.rep_pen_size, // no_repeat_ngram_size
|
textgenerationwebui_settings.rep_pen_size, // no_repeat_ngram_size
|
||||||
@@ -1540,7 +1541,7 @@ async function Generate(type, automatic_trigger) {
|
|||||||
} else if (main_api == "textgenerationwebui") {
|
} else if (main_api == "textgenerationwebui") {
|
||||||
getMessage = data.data[0];
|
getMessage = data.data[0];
|
||||||
if (getMessage == null || data.error) {
|
if (getMessage == null || data.error) {
|
||||||
popup_type = "default";
|
popup_type = "text";
|
||||||
callPopup(
|
callPopup(
|
||||||
"<h3>Got empty response from Text generation web UI. Try restarting the API with recommended options.</h3>"
|
"<h3>Got empty response from Text generation web UI. Try restarting the API with recommended options.</h3>"
|
||||||
);
|
);
|
||||||
|
@@ -62,7 +62,7 @@ function setWorldInfoSettings(settings, data) {
|
|||||||
// World Info Editor
|
// World Info Editor
|
||||||
async function showWorldEditor() {
|
async function showWorldEditor() {
|
||||||
if (!world_info) {
|
if (!world_info) {
|
||||||
callPopup("<h3>Select a world info first!</h3>", "default");
|
callPopup("<h3>Select a world info first!</h3>", "text");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user