mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-03-07 21:28:01 +01:00
Add "Best match" tokenizer option
This commit is contained in:
parent
14827d6135
commit
84283bc2b4
@ -59,7 +59,7 @@
|
|||||||
"trusted_workers_only": false
|
"trusted_workers_only": false
|
||||||
},
|
},
|
||||||
"power_user": {
|
"power_user": {
|
||||||
"tokenizer": 3,
|
"tokenizer": 99,
|
||||||
"token_padding": 64,
|
"token_padding": 64,
|
||||||
"collapse_newlines": false,
|
"collapse_newlines": false,
|
||||||
"pygmalion_formatting": 0,
|
"pygmalion_formatting": 0,
|
||||||
|
@ -1556,11 +1556,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="textgenerationwebui_api" style="display: none;position: relative;">
|
<div id="textgenerationwebui_api" style="display: none;position: relative;">
|
||||||
<form action="javascript:void(null);" method="post" enctype="multipart/form-data">
|
<form action="javascript:void(null);" method="post" enctype="multipart/form-data">
|
||||||
If you are using:
|
If you are using:
|
||||||
<div class="flex-container indent20p">
|
<div class="flex-container indent20p">
|
||||||
<a href="https://github.com/oobabooga/text-generation-webui" target="_blank">
|
<a href="https://github.com/oobabooga/text-generation-webui" target="_blank">
|
||||||
oobabooga/text-generation-webui
|
oobabooga/text-generation-webui
|
||||||
</a>,
|
</a>
|
||||||
<span data-i18n="Make sure you run it with">
|
<span data-i18n="Make sure you run it with">
|
||||||
Make sure you run it with <tt>--api</tt> flag
|
Make sure you run it with <tt>--api</tt> flag
|
||||||
</span>
|
</span>
|
||||||
@ -1568,7 +1568,7 @@
|
|||||||
<div class="flex-container indent20p">
|
<div class="flex-container indent20p">
|
||||||
<a href="https://mancer.tech/" target="_blank">
|
<a href="https://mancer.tech/" target="_blank">
|
||||||
Mancer AI
|
Mancer AI
|
||||||
</a>,
|
</a>
|
||||||
<label class="checkbox_label" for="use-mancer-api-checkbox">
|
<label class="checkbox_label" for="use-mancer-api-checkbox">
|
||||||
<span data-i18n="Use API key (Only required for Mancer)">
|
<span data-i18n="Use API key (Only required for Mancer)">
|
||||||
Click this box (and add your API key!):
|
Click this box (and add your API key!):
|
||||||
@ -1961,6 +1961,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</h4>
|
</h4>
|
||||||
<select id="tokenizer">
|
<select id="tokenizer">
|
||||||
|
<option value="99">Best match (recommended)</option>
|
||||||
<option value="0">None / Estimated</option>
|
<option value="0">None / Estimated</option>
|
||||||
<option value="1">GPT-3 (OpenAI)</option>
|
<option value="1">GPT-3 (OpenAI)</option>
|
||||||
<option value="2">GPT-3 (Alternative / Classic)</option>
|
<option value="2">GPT-3 (Alternative / Classic)</option>
|
||||||
|
@ -546,6 +546,25 @@ async function getClientVersion() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getTokenizerBestMatch() {
|
||||||
|
if (main_api === 'novel') {
|
||||||
|
if (nai_settings.model_novel.includes('krake') || nai_settings.model_novel.includes('euterpe')) {
|
||||||
|
return tokenizers.CLASSIC;
|
||||||
|
}
|
||||||
|
if (nai_settings.model_novel.includes('clio')) {
|
||||||
|
return tokenizers.NERD;
|
||||||
|
}
|
||||||
|
if (nai_settings.model_novel.includes('kayra')) {
|
||||||
|
return tokenizers.NERD2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (main_api === 'kobold' || main_api === 'textgenerationwebui' || main_api === 'koboldhorde') {
|
||||||
|
return tokenizers.LLAMA;
|
||||||
|
}
|
||||||
|
|
||||||
|
return power_user.NONE;
|
||||||
|
}
|
||||||
|
|
||||||
function getTokenCount(str, padding = undefined) {
|
function getTokenCount(str, padding = undefined) {
|
||||||
if (typeof str !== 'string') {
|
if (typeof str !== 'string') {
|
||||||
return 0;
|
return 0;
|
||||||
@ -563,6 +582,10 @@ function getTokenCount(str, padding = undefined) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tokenizerType === tokenizers.BEST_MATCH) {
|
||||||
|
tokenizerType = getTokenizerBestMatch();
|
||||||
|
}
|
||||||
|
|
||||||
if (padding === undefined) {
|
if (padding === undefined) {
|
||||||
padding = 0;
|
padding = 0;
|
||||||
}
|
}
|
||||||
@ -7729,7 +7752,7 @@ $(document).ready(function () {
|
|||||||
const enabled = $("#use-mancer-api-checkbox").prop("checked");
|
const enabled = $("#use-mancer-api-checkbox").prop("checked");
|
||||||
$("#mancer-api-ui").toggle(enabled);
|
$("#mancer-api-ui").toggle(enabled);
|
||||||
api_use_mancer_webui = enabled;
|
api_use_mancer_webui = enabled;
|
||||||
saveSettingsDebounced();
|
saveSettingsDebounced();
|
||||||
getStatus();
|
getStatus();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -71,6 +71,7 @@ const tokenizers = {
|
|||||||
NERD: 4,
|
NERD: 4,
|
||||||
NERD2: 5,
|
NERD2: 5,
|
||||||
API: 6,
|
API: 6,
|
||||||
|
BEST_MATCH: 99,
|
||||||
}
|
}
|
||||||
|
|
||||||
const send_on_enter_options = {
|
const send_on_enter_options = {
|
||||||
@ -87,7 +88,7 @@ export const persona_description_positions = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let power_user = {
|
let power_user = {
|
||||||
tokenizer: tokenizers.CLASSIC,
|
tokenizer: tokenizers.BEST_MATCH,
|
||||||
token_padding: 64,
|
token_padding: 64,
|
||||||
collapse_newlines: false,
|
collapse_newlines: false,
|
||||||
pygmalion_formatting: pygmalion_options.AUTO,
|
pygmalion_formatting: pygmalion_options.AUTO,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user