mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Determine if stop_sequence could be used. Closes #93
This commit is contained in:
@ -6,6 +6,7 @@ import {
|
|||||||
loadKoboldSettings,
|
loadKoboldSettings,
|
||||||
formatKoboldUrl,
|
formatKoboldUrl,
|
||||||
getKoboldGenerationData,
|
getKoboldGenerationData,
|
||||||
|
canUseKoboldStopSequence,
|
||||||
} from "./scripts/kai-settings.js";
|
} from "./scripts/kai-settings.js";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@ -518,6 +519,11 @@ async function getStatus() {
|
|||||||
is_pygmalion = false;
|
is_pygmalion = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// determine if we can use stop sequence
|
||||||
|
if (main_api == "kobold") {
|
||||||
|
kai_settings.use_stop_sequence = canUseKoboldStopSequence(data.version);
|
||||||
|
}
|
||||||
|
|
||||||
// determine if streaming is enabled for ooba
|
// determine if streaming is enabled for ooba
|
||||||
if (main_api == 'textgenerationwebui' && typeof data.gradio_config == 'string') {
|
if (main_api == 'textgenerationwebui' && typeof data.gradio_config == 'string') {
|
||||||
try {
|
try {
|
||||||
|
@ -8,6 +8,7 @@ export {
|
|||||||
loadKoboldSettings,
|
loadKoboldSettings,
|
||||||
formatKoboldUrl,
|
formatKoboldUrl,
|
||||||
getKoboldGenerationData,
|
getKoboldGenerationData,
|
||||||
|
canUseKoboldStopSequence,
|
||||||
};
|
};
|
||||||
|
|
||||||
const kai_settings = {
|
const kai_settings = {
|
||||||
@ -21,8 +22,11 @@ const kai_settings = {
|
|||||||
tfs: 1,
|
tfs: 1,
|
||||||
rep_pen_slope: 0.9,
|
rep_pen_slope: 0.9,
|
||||||
single_line: false,
|
single_line: false,
|
||||||
|
use_stop_sequence: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const MIN_STOP_SEQUENCE_VERSION = '1.2.2';
|
||||||
|
|
||||||
function formatKoboldUrl(value) {
|
function formatKoboldUrl(value) {
|
||||||
try {
|
try {
|
||||||
const url = new URL(value);
|
const url = new URL(value);
|
||||||
@ -81,7 +85,7 @@ function getKoboldGenerationData(finalPromt, this_settings, this_amount_gen, thi
|
|||||||
s7: this_settings.sampler_order[6],
|
s7: this_settings.sampler_order[6],
|
||||||
use_world_info: false,
|
use_world_info: false,
|
||||||
singleline: kai_settings.single_line,
|
singleline: kai_settings.single_line,
|
||||||
stop_sequence: [getStoppingStrings(isImpersonate, false)],
|
stop_sequence: kai_settings.use_stop_sequence ? [getStoppingStrings(isImpersonate, false)] : undefined,
|
||||||
};
|
};
|
||||||
return generate_data;
|
return generate_data;
|
||||||
}
|
}
|
||||||
@ -152,6 +156,10 @@ const sliders = [
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
function canUseKoboldStopSequence(version) {
|
||||||
|
return version.localeCompare(MIN_STOP_SEQUENCE_VERSION, undefined, { numeric: true, sensitivity: 'base' }) > -1;
|
||||||
|
}
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
sliders.forEach(slider => {
|
sliders.forEach(slider => {
|
||||||
$(document).on("input", slider.sliderId, function () {
|
$(document).on("input", slider.sliderId, function () {
|
||||||
|
17
server.js
17
server.js
@ -270,8 +270,10 @@ app.post("/generate", jsonParser, async function (request, response_generate = r
|
|||||||
typical: request.body.typical,
|
typical: request.body.typical,
|
||||||
sampler_order: sampler_order,
|
sampler_order: sampler_order,
|
||||||
singleline: !!request.body.singleline,
|
singleline: !!request.body.singleline,
|
||||||
stop_sequence: request.body.stop_sequence || [],
|
|
||||||
};
|
};
|
||||||
|
if (!!request.body.stop_sequence) {
|
||||||
|
this_settings['stop_sequence'] = request.body.stop_sequence;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(this_settings);
|
console.log(this_settings);
|
||||||
@ -536,7 +538,7 @@ app.post("/getchat", jsonParser, function (request, response) {
|
|||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
app.post("/getstatus", jsonParser, function (request, response_getstatus = response) {
|
app.post("/getstatus", jsonParser, async function (request, response_getstatus = response) {
|
||||||
if (!request.body) return response_getstatus.sendStatus(400);
|
if (!request.body) return response_getstatus.sendStatus(400);
|
||||||
api_server = request.body.api_server;
|
api_server = request.body.api_server;
|
||||||
main_api = request.body.main_api;
|
main_api = request.body.main_api;
|
||||||
@ -547,10 +549,19 @@ app.post("/getstatus", jsonParser, function (request, response_getstatus = respo
|
|||||||
headers: { "Content-Type": "application/json" }
|
headers: { "Content-Type": "application/json" }
|
||||||
};
|
};
|
||||||
var url = api_server + "/v1/model";
|
var url = api_server + "/v1/model";
|
||||||
|
let version = '';
|
||||||
if (main_api == "textgenerationwebui") {
|
if (main_api == "textgenerationwebui") {
|
||||||
url = api_server;
|
url = api_server;
|
||||||
args = {}
|
args = {}
|
||||||
}
|
}
|
||||||
|
if (main_api == "kobold") {
|
||||||
|
try {
|
||||||
|
version = (await getAsync(api_server + "/v1/info/version")).result;
|
||||||
|
}
|
||||||
|
catch {
|
||||||
|
version = '0.0.0';
|
||||||
|
}
|
||||||
|
}
|
||||||
client.get(url, args, function (data, response) {
|
client.get(url, args, function (data, response) {
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
if (main_api == "textgenerationwebui") {
|
if (main_api == "textgenerationwebui") {
|
||||||
@ -568,8 +579,8 @@ app.post("/getstatus", jsonParser, function (request, response_getstatus = respo
|
|||||||
data = { result: "no_connection" };
|
data = { result: "no_connection" };
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
data.version = version;
|
||||||
if (data.result != "ReadOnly") {
|
if (data.result != "ReadOnly") {
|
||||||
//response_getstatus.send(data.result);
|
|
||||||
} else {
|
} else {
|
||||||
data.result = "no_connection";
|
data.result = "no_connection";
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user