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' into feature/chromadb

Browse Source
This commit is contained in:
Mark Ceter
2023-05-21 18:04:35 +03:00
committed by GitHub
parent f62c26a9ba ef394f7f03
commit a7d462bbb3
4 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/scripts/openai.js
View File

@@ -502,9 +502,10 @@ function tryParseStreamingError(str) {
}
function checkQuotaError(data) {
const errorText = `<h3>You have no credits left to use with this API key.<br>
Check your billing details on the
<a href="https://platform.openai.com/account/usage" target="_blank">OpenAI website.</a></h3>`;
const errorText = `<h3>Encountered an error while processing your request.<br>
Check you have credits available on your
<a href="https://platform.openai.com/account/usage" target="_blank">OpenAI account</a>.<br>
If you have sufficient credits, please try again later.</h3>`;
if (!data) {
return;

12
public/scripts/power-user.js
View File

@@ -8,6 +8,7 @@ import {
reloadCurrentChat,
getRequestHeaders,
substituteParams,
setCharListVisible,
} from "../script.js";
import { favsToHotswap } from "./RossAscends-mods.js";
import {
@@ -643,8 +644,8 @@ function loadInstructMode() {
export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvatar) {
const includeNames = isNarrator ? false : (power_user.instruct.names || !!selected_group || !!forceAvatar);
const sequence = (isUser || isNarrator) ? power_user.instruct.input_sequence : power_user.instruct.output_sequence;
const separator = power_user.instruct.wrap ? '\n' : '';
const separatorSequence = power_user.instruct.separator_sequence && !isUser
const separator = power_user.instruct.wrap ? '\n' : '';
const separatorSequence = power_user.instruct.separator_sequence && !isUser
? power_user.instruct.separator_sequence
: (power_user.instruct.wrap ? '\n' : '');
const textArray = includeNames ? [sequence, `${name}: ${mes}`, separatorSequence] : [sequence, mes, separatorSequence];
@@ -668,7 +669,7 @@ export function formatInstructModePrompt(name, isImpersonate, promptBias) {
let text = includeNames ? (separator + sequence + separator + `${name}:`) : (separator + sequence);
if (!isImpersonate && promptBias) {
text += (includeNames ? promptBias : (separator + promptBias));
text += (includeNames ? promptBias : (separator + promptBias));
}
return text.trimEnd();
@@ -718,6 +719,7 @@ function sortCharactersList() {
for (const item of array) {
$(`${item.selector}[${item.attribute}="${item.id}"]`).css({ 'order': orderedList.indexOf(item) });
}
setCharListVisible();
}
function sortGroupMembers(selector) {
@@ -882,7 +884,7 @@ $(document).ready(() => {
// include newline is the child of trim sentences
// if include newline is checked, trim sentences must be checked
// if trim sentences is unchecked, include newline must be unchecked
$("#trim_sentences_checkbox").change(function() {
$("#trim_sentences_checkbox").change(function () {
power_user.trim_sentences = !!$(this).prop("checked");
if (!$(this).prop("checked")) {
$("#include_newline_checkbox").prop("checked", false);
@@ -891,7 +893,7 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$("#include_newline_checkbox").change(function() {
$("#include_newline_checkbox").change(function () {
power_user.include_newline = !!$(this).prop("checked");
if ($(this).prop("checked")) {
$("#trim_sentences_checkbox").prop("checked", true);

29
public/scripts/utils.js
View File

@@ -80,6 +80,19 @@ export function debounce(func, timeout = 300) {
};
}
export function isElementInViewport(el) {
if (typeof jQuery === "function" && el instanceof jQuery) {
el = el[0];
}
var rect = el.getBoundingClientRect();
return (
rect.top >= 0 &&
rect.left >= 0 &&
rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /* or $(window).height() */
rect.right <= (window.innerWidth || document.documentElement.clientWidth) /* or $(window).width() */
);
}
export function getUniqueName(name, exists) {
let i = 1;
let baseName = name;
@@ -218,15 +231,15 @@ export function end_trim_to_sentence(input, include_newline = false) {
}
export function countOccurrences(string, character) {
let count = 0;
for (let i = 0; i < string.length; i++) {
if (string[i] === character) {
count++;
let count = 0;
for (let i = 0; i < string.length; i++) {
if (string[i] === character) {
count++;
}
}
}
return count;
return count;
}
export function isOdd(number) {