rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SillyTavern:staging' into staging

This commit is contained in:
Tony Ribeiro 2023-08-25 00:45:34 +02:00 committed by GitHub
parent 74a6e79df6 3c0d7d8feb
commit a622810c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 139 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/mobile-styles.css
View File

@ -205,7 +205,7 @@
width: 100%;
border-radius: 0 0 20px 20px;
margin-top: 0px;
height: calc(100% - 40px);
height: calc(100% - var(--topBarBlockSize));
}
.drawer25pWidth {

23
public/css/promptmanager.css
View File

@ -94,7 +94,7 @@
#completion_prompt_manager_popup .completion_prompt_manager_popup_entry {
padding: 1em;
margin-top:2em;
margin-top: 2em;
}
#completion_prompt_manager_popup #completion_prompt_manager_popup_inspect .completion_prompt_manager_popup_entry {
@ -123,7 +123,7 @@
}
.completion_prompt_manager_popup_entry_form_control {
margin-top:1em;
margin-top: 1em;
}
#prompt-manager-reset-character,
@ -236,13 +236,13 @@
font-size: 16px;
}
#prompt-manager-export-format-popup {
#prompt-manager-export-format-popup {
padding: 0.25em;
display:none;
display: none;
}
#prompt-manager-export-format-popup[data-show] {
display:block;
#prompt-manager-export-format-popup[data-show] {
display: block;
}
#completion_prompt_manager_popup {
@ -251,24 +251,24 @@
#completion_prompt_manager_popup {
overflow-y: auto;
height: calc(100% - 40px);
height: calc(100% - var(--topBarBlockSize));
position: absolute;
margin-left: auto;
margin-right: auto;
left: 0;
right: 0;
top: 40px;
top: var(--topBarBlockSize);
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
padding: 1em;
border: 1px solid #333333;
flex-direction: column;
z-index: 3010 !important;
border-radius: 0 0 20px 20px;
background-color: var(--SmartThemeBlurTintColor);
background-color: var(--SmartThemeBlurTintColor);
}
#prompt-manager-export-format-popup {
display:none;
display: none;
}
.prompt-manager-export-format-popup-flex {
@ -296,7 +296,8 @@
#completion_prompt_manager_popup {
max-width: 100%;
}
#completion_prompt_manager #completion_prompt_manager_list li.completion_prompt_manager_prompt span span span {
margin-left: 0.5em;
}
}
}

2
public/index.html
View File

@ -2592,7 +2592,7 @@
</div>
<div class="range-block-range-and-counter">
<div class="range-block-range">
<input type="range" id="font_scale" name="font_scale" min="0.75" max="1.25" step="0.01">
<input type="range" id="font_scale" name="font_scale" min="0.8" max="1.2" step="0.02">
</div>
<div class="range-block-counter">
<div contenteditable="true" data-for="font_scale" id="font_scale_counter">

6
public/instruct/Llama2.json → public/instruct/Llama 2 Chat.json
View File

@ -1,10 +1,10 @@
{
"name": "Llama 2",
"system_prompt": "[INST] <<SYS>>\nWrite {{char}}'s next reply in this fictional roleplay with {{user}}.\n<</SYS>>\n",
"name": "Llama 2 Chat",
"system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.",
"input_sequence": "[INST] ",
"output_sequence": " [/INST] ",
"last_output_sequence": "",
"system_sequence": "[INST] <<SYS>>\n",
"system_sequence": "[INST] <<SYS>>\n{{sys}}\n<</SYS>>\n",
"stop_sequence": "",
"separator_sequence": "\n",
"wrap": false,

2
public/instruct/OpenOrca-OpenChat.json
View File

@ -1,5 +1,5 @@
{
"name": "OpenOrca/OpenChat",
"name": "OpenOrca-OpenChat",
"system_prompt": "You are a helpful assistant. Please answer truthfully and write out your thinking step by step to be sure you get the right answer. If you make a mistake or encounter an error in your thinking, say so out loud and attempt to correct it. If you don't know or aren't sure about something, say so clearly. You will act as a professional logician, mathematician, and physicist. You will also act as the most appropriate type of expert to answer any particular question or solve the relevant problem; state which expert type your are, if so. Also think of any particular named expert that would be ideal to answer the relevant question or solve the relevant problem; name and act as them, if appropriate.\n",
"input_sequence": "User: ",
"output_sequence": "<|end_of_turn|>\nAssistant: ",

42
public/script.js
View File

@ -1,4 +1,4 @@
import { humanizedDateTime, favsToHotswap, getMessageTimeStamp, dragElement, isMobile, } from "./scripts/RossAscends-mods.js";
import { humanizedDateTime, favsToHotswap, getMessageTimeStamp, dragElement, isMobile, initRossMods, } from "./scripts/RossAscends-mods.js";
import { userStatsHandler, statMesProcess } from './scripts/stats.js';
import {
generateKoboldWithStreaming,
@ -156,7 +156,7 @@ import {
import { EventEmitter } from './lib/eventemitter.js';
import { markdownExclusionExt } from "./scripts/showdown-exclusion.js";
import { NOTE_MODULE_NAME, metadata_keys, setFloatingPrompt, shouldWIAddPrompt } from "./scripts/authors-note.js";
import { deviceInfo } from "./scripts/RossAscends-mods.js";
import { getDeviceInfo } from "./scripts/RossAscends-mods.js";
import { registerPromptManagerMigration } from "./scripts/PromptManager.js";
import { getRegexedString, regex_placement } from "./scripts/extensions/regex/engine.js";
import { FILTER_TYPES, FilterHelper } from "./scripts/filters.js";
@ -2051,7 +2051,7 @@ class StreamingProcessor {
chat[messageId]['gen_started'] = this.timeStarted;
chat[messageId]['gen_finished'] = currentTime;
if (this.type == 'swipe' && Array.isArray(chat[messageId]['swipes'])) {
if ((this.type == 'swipe' || this.type === 'continue') && Array.isArray(chat[messageId]['swipes'])) {
chat[messageId]['swipes'][chat[messageId]['swipe_id']] = processedText;
chat[messageId]['swipe_info'][chat[messageId]['swipe_id']] = { 'send_date': chat[messageId]['send_date'], 'gen_started': chat[messageId]['gen_started'], 'gen_finished': chat[messageId]['gen_finished'], 'extra': JSON.parse(JSON.stringify(chat[messageId]['extra'])) };
}
@ -3901,8 +3901,9 @@ async function saveReply(type, getMessage, this_mes_is_name, title) {
item["swipe_info"] = [];
}
if (item["swipe_id"] !== undefined) {
item["swipes"][item["swipes"].length - 1] = item["mes"];
item["swipe_info"][item["swipes"].length - 1] = {
const swipeId = item["swipe_id"];
item["swipes"][swipeId] = item["mes"];
item["swipe_info"][swipeId] = {
send_date: item["send_date"],
gen_started: item["gen_started"],
gen_finished: item["gen_finished"],
@ -6293,6 +6294,7 @@ function openCharacterWorldPopup() {
template.find('.character_name').text(name);
// Not needed on mobile
const deviceInfo = getDeviceInfo();
if (deviceInfo && deviceInfo.device.type === 'desktop') {
$(extraSelect).select2({
width: '100%',
@ -6337,18 +6339,6 @@ function openCharacterWorldPopup() {
return;
}
/*let selectScrollTop = null;
if (deviceInfo && deviceInfo.device.type === 'desktop') {
e.preventDefault();
const option = $(e.target);
const selectElement = $(extraSelect)[0];
selectScrollTop = selectElement.scrollTop;
option.prop('selected', !option.prop('selected'));
await delay(1);
selectElement.scrollTop = selectScrollTop;
}*/
onExtraWorldInfoChanged();
});
@ -8042,28 +8032,27 @@ $(document).ready(function () {
var sliderTimer;
$("input[type='range']").on("touchstart", function () {
// Unlock the slider after 500ms
sliderTimer = setTimeout(function () {
// Unlock the slider after 300ms
setTimeout(function () {
sliderLocked = false;
}, 500);
$(this).css('background-color', 'var(--SmartThemeQuoteColor)');
}.bind(this), 300);
});
$("input[type='range']").on("touchend", function () {
clearTimeout(sliderTimer);
$(this).css('background-color', '')
sliderLocked = true
$(this).css('background-color', '');
sliderLocked = true;
});
$("input[type='range']").on("touchmove", function (event) {
if (sliderLocked) {
event.preventDefault();
}
else {
$(this).css('background-color', 'var(--SmartThemeQuoteColor)')
}
});
const sliders = [
{
sliderId: "#amount_gen",
@ -9022,4 +9011,7 @@ $(document).ready(function () {
$("#hideCharPanelAvatarButton").on('click', () => {
$('#avatar-and-name-block').slideToggle()
});
// Added here to prevent execution before script.js is loaded and get rid of quirky timeouts
initRossMods();
});

65
public/scripts/RossAscends-mods.js
View File

@ -98,28 +98,45 @@ export function humanizeGenTime(total_gen_time) {
return time_spent;
}
// Device detection
export const deviceInfo = await getDeviceInfo();
async function getDeviceInfo() {
try {
const deviceInfo = await (await fetch('/deviceinfo')).json();
console.log("Device type: " + deviceInfo?.device?.type);
return deviceInfo;
}
catch {
console.log("Couldn't load device info. Defaulting to desktop");
return { device: { type: 'desktop' } };
}
}
/**
* Checks if the device is a mobile device.
* @returns {boolean} - True if the device is a mobile device, false otherwise.
*/
export function isMobile() {
const mobileTypes = ['smartphone', 'tablet', 'phablet', 'feature phone', 'portable media player'];
const deviceInfo = getDeviceInfo();
return mobileTypes.includes(deviceInfo?.device?.type);
}
/**
* Loads device info from the server. Caches the result in sessionStorage.
* @returns {object} - The device info object.
*/
export function getDeviceInfo() {
let deviceInfo = null;
if (sessionStorage.getItem('deviceInfo')) {
deviceInfo = JSON.parse(sessionStorage.getItem('deviceInfo'));
} else {
$.ajax({
url: '/deviceinfo',
dataType: 'json',
async: false,
cache: true,
success: function (result) {
sessionStorage.setItem('deviceInfo', JSON.stringify(result));
deviceInfo = result;
},
error: function () {
console.log("Couldn't load device info. Defaulting to desktop");
deviceInfo = { device: { type: 'desktop' } };
},
});
}
return deviceInfo;
}
function shouldSendOnEnter() {
if (!power_user) {
return false;
@ -394,8 +411,8 @@ function isUrlOrAPIKey(string) {
}
function OpenNavPanels() {
if (deviceInfo.device.type === 'desktop') {
const deviceInfo = getDeviceInfo();
if (deviceInfo && deviceInfo.device.type === 'desktop') {
//auto-open R nav if locked and previously open
if (LoadLocalBool("NavLockOn") == true && LoadLocalBool("NavOpened") == true) {
//console.log("RA -- clicking right nav to open");
@ -669,13 +686,7 @@ export async function initMovingUI() {
// ---------------------------------------------------
jQuery(async function () {
try {
await waitUntilCondition(() => online_status !== undefined, 1000, 10);
} catch {
console.log('Timeout waiting for online_status');
}
export function initRossMods() {
// initial status check
setTimeout(() => {
RA_checkOnlineStatus();
@ -1070,4 +1081,4 @@ jQuery(async function () {
console.log("Ctrl +" + event.key + " pressed!");
}
}
});
}

6
public/scripts/extensions.js
View File

@ -699,10 +699,8 @@ async function runGenerationInterceptors(chat, contextSize) {
}
jQuery(function () {
setTimeout(async function () {
addExtensionsButtonAndMenu();
$("#extensionsMenuButton").css("display", "flex");
}, 100)
addExtensionsButtonAndMenu();
$("#extensionsMenuButton").css("display", "flex");
$("#extensions_connect").on('click', connectClickHandler);
$("#extensions_autoconnect").on('input', autoConnectInputHandler);

3
public/scripts/extensions/cfg/util.js
View File

@ -57,7 +57,6 @@ export function getCfgPrompt(guidanceScale, isNegative) {
substituteParams(
chat_metadata[isNegative ? metadataKeys.negative_prompt : metadataKeys.positive_prompt]
)
?.trim()
);
}
@ -67,7 +66,6 @@ export function getCfgPrompt(guidanceScale, isNegative) {
substituteParams(
isNegative ? charaCfg.negative_prompt : charaCfg.positive_prompt
)
?.trim()
);
}
@ -76,7 +74,6 @@ export function getCfgPrompt(guidanceScale, isNegative) {
substituteParams(
isNegative ? extension_settings.cfg.global.negative_prompt : extension_settings.cfg.global.positive_prompt
)
?.trim()
);
}

6
public/scripts/extensions/expressions/style.css
View File

@ -6,13 +6,13 @@
#expression-wrapper {
display: flex;
height: calc(100vh - 40px);
height: calc(100vh - var(--topBarBlockSize));
width: 100vw;
}
#visual-novel-wrapper {
display: flex;
height: calc(100vh - 40px);
height: calc(100vh - var(--topBarBlockSize));
width: 100vw;
position: relative;
overflow: hidden;
@ -180,4 +180,4 @@ img.expression.default {
div.expression {
display: none;
}
}
}

6
public/scripts/horde.js
View File

@ -7,8 +7,7 @@ import {
} from "../script.js";
import { SECRET_KEYS, writeSecret } from "./secrets.js";
import { delay } from "./utils.js";
import { deviceInfo } from "./RossAscends-mods.js";
import { power_user } from "./power-user.js";
import { getDeviceInfo } from "./RossAscends-mods.js";
import { autoSelectInstructPreset } from "./instruct-mode.js";
export {
@ -259,7 +258,8 @@ jQuery(function () {
$("#horde_kudos").on("click", showKudos);
// Not needed on mobile
if (deviceInfo.device.type === 'desktop') {
const deviceInfo = getDeviceInfo();
if (deviceInfo && deviceInfo.device.type === 'desktop') {
$('#horde_model').select2({
width: '100%',
placeholder: 'Select Horde models',

7
public/scripts/instruct-mode.js
View File

@ -256,7 +256,12 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
export function formatInstructModeSystemPrompt(systemPrompt){
if (power_user.instruct.system_sequence) {
const separator = power_user.instruct.wrap ? '\n' : '';
return power_user.instruct.system_sequence + separator + systemPrompt;
if (power_user.instruct.system_sequence.includes("{{sys}}")) {
return power_user.instruct.system_sequence.replace(/{{sys}}/gi, systemPrompt);
} else {
return power_user.instruct.system_sequence + separator + systemPrompt;
}
}
return systemPrompt;

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

@ -46,7 +46,7 @@ export {
export const MAX_CONTEXT_DEFAULT = 4096;
const MAX_CONTEXT_UNLOCKED = 65536;
const defaultStoryString = "{{#if system}}{{system}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}";
const defaultStoryString = "{{#if system}}{{system}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}";
const defaultExampleSeparator = '***';
const defaultChatStart = '***';
@ -482,9 +482,19 @@ async function applyShadowWidth() {
}
async function applyFontScale() {
async function applyFontScale(type) {
power_user.font_scale = Number(localStorage.getItem(storage_keys.font_scale) ?? 1);
document.documentElement.style.setProperty('--fontScale', power_user.font_scale);
//this is to allow forced setting on page load, theme swap, etc
if (type === 'forced') {
document.documentElement.style.setProperty('--fontScale', power_user.font_scale);
} else {
//this is to prevent the slider from updating page in real time
$("#font_scale").off('mouseup touchend').on('mouseup touchend', () => {
document.documentElement.style.setProperty('--fontScale', power_user.font_scale);
})
}
$("#font_scale_counter").text(power_user.font_scale);
$("#font_scale").val(power_user.font_scale);
}
@ -522,7 +532,7 @@ async function applyTheme(name) {
key: 'font_scale',
action: async () => {
localStorage.setItem(storage_keys.font_scale, power_user.font_scale);
await applyFontScale();
await applyFontScale('forced');
}
},
{
@ -641,7 +651,7 @@ async function applyMovingUIPreset(name) {
}
switchUiMode();
applyFontScale();
applyFontScale('forced');
applyThemeColor();
applyChatWidth();
applyAvatarStyle();

5
public/scripts/utils.js
View File

@ -1,5 +1,6 @@
import { getContext } from "./extensions.js";
import { getRequestHeaders } from "../script.js";
import { isMobile } from "./RossAscends-mods.js";
/**
* Pagination status string template.
@ -38,10 +39,10 @@ export function isDigitsOnly(str) {
/**
* Gets a drag delay for sortable elements. This is to prevent accidental drags when scrolling.
* @returns {number} The delay in milliseconds. 100ms for desktop, 750ms for mobile.
* @returns {number} The delay in milliseconds. 50ms for desktop, 750ms for mobile.
*/
export function getSortableDelay() {
return navigator.maxTouchPoints > 0 ? 750 : 100;
return isMobile() ? 750 : 50;
}
/**

5
public/scripts/world-info.js
View File

@ -3,7 +3,7 @@ import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile,
import { getContext } from "./extensions.js";
import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from "./authors-note.js";
import { registerSlashCommand } from "./slash-commands.js";
import { deviceInfo } from "./RossAscends-mods.js";
import { getDeviceInfo } from "./RossAscends-mods.js";
import { FILTER_TYPES, FilterHelper } from "./filters.js";
import { getTokenCount } from "./tokenizers.js";
@ -1621,7 +1621,8 @@ jQuery(() => {
});
// Not needed on mobile
if (deviceInfo.device.type === 'desktop') {
const deviceInfo = getDeviceInfo();
if (deviceInfo && deviceInfo.device.type === 'desktop') {
$('#world_info').select2({
width: '100%',
placeholder: 'No Worlds active. Click here to select.',

59
public/style.css
View File

@ -72,6 +72,11 @@
--bottomFormIconSize: calc(var(--mainFontSize) * 2);
--bottomFormBlockSize: calc(var(--bottomFormIconSize) + var(--bottomFormBlockPadding));
/*Top Bar Scaling Variables*/
--topBarIconSize: calc(var(--mainFontSize) * 2);
--topBarBlockSize: calc(var(--topBarIconSize) + var(--topBarBlockPadding));
--topBarBlockPadding: calc(var(--mainFontSize) / 3);
/*styles for the color picker*/
--tool-cool-color-picker-btn-bg: transparent;
--tool-cool-color-picker-btn-border-color: transparent;
@ -381,7 +386,7 @@ hr {
left: 0;
right: 0;
display: inline-block;
height: 35px;
height: var(--bottomFormBlockSize);
position: absolute;
border-bottom: 1px solid var(--grey30a);
box-shadow: 0 2px 20px 0 var(--black70a);
@ -394,14 +399,15 @@ hr {
#sheld {
display: grid;
grid-template-rows: auto min-content;
height: calc(100vh - 36px);
height: calc(100svh - 36px);
height: calc(100vh - var(--topBarBlockSize));
height: calc(100svh - var(--topBarBlockSize));
max-height: calc(100svh - var(--topBarBlockSize));
overflow-x: hidden;
/* max-width: 50vw; */
position: absolute;
left: calc((100vw - var(--sheldWidth))/2);
left: calc((100svw - var(--sheldWidth))/2);
top: 36px;
top: var(--topBarBlockSize);
margin: 0 auto;
left: 0;
right: 0;
@ -466,7 +472,7 @@ hr {
}
#chat {
max-height: calc(100vh - 42px);
max-height: calc(100vh - calc(var(--topBarBlockSize) + var(--bottomFormBlockSize)));
overflow-x: hidden;
padding-bottom: 0;
overflow-y: scroll;
@ -2444,7 +2450,7 @@ input[type="range"]::-webkit-slider-thumb {
margin-right: auto;
left: 0;
right: 0;
top: 40px;
top: var(--topBarBlockSize);
box-shadow: 0 0 20px var(--black70a);
padding: 10px;
border: 1px solid var(--black30a);
@ -2529,8 +2535,8 @@ h5 {
grid-template-rows: auto auto;
max-width: var(--sheldWidth);
height: min-content;
max-height: calc(100vh - 40px);
max-height: calc(100svh - 40px);
max-height: calc(100vh - var(--topBarBlockSize));
max-height: calc(100svh - var(--topBarBlockSize));
min-height: 100px;
position: absolute;
z-index: 2066;
@ -2891,10 +2897,10 @@ a {
#right-nav-panel {
width: calc((100vw - var(--sheldWidth) - 2px) /2);
width: calc((100svw - var(--sheldWidth) - 2px) /2);
max-height: calc(100vh - 42px);
max-height: calc(100svh - 42px);
height: calc(100vh - 42px);
height: calc(100svh - 42px);
max-height: calc(100vh - var(--topBarBlockSize));
max-height: calc(100svh - var(--topBarBlockSize));
height: calc(100vh - var(--topBarBlockSize));
height: calc(100svh - var(--topBarBlockSize));
position: fixed;
top: 0;
margin: 0;
@ -3026,31 +3032,28 @@ a {
/*------------ TOP SIDE SETTINGS ----------------*/
#top-settings-holder {
display: flex;
margin: 0 auto;
padding-top: 2px;
height: 30px;
/* max-width: var(--sheldWidth); */
height: var(--topBarBlockSize);
justify-content: center;
display: grid;
grid-template-columns: 10% 10% 10% 10% 10% 10% 10% 10% 10%;
z-index: 3000;
position: relative;
grid-gap: 1%;
width: var(--sheldWidth);
}
.drawer {
align-items: center;
justify-content: center;
display: flex;
flex-flow: column;
flex-flow: row;
width: 100%;
}
.drawer-icon {
display: inline-block;
cursor: pointer;
font-size: 25px;
font-size: var(--topBarIconSize);
}
.drawer-icon.openIcon {
@ -3123,11 +3126,11 @@ a {
min-width: 450px;
width: var(--sheldWidth);
overflow-y: auto;
max-height: calc(100vh - 70px);
max-height: calc(100svh - 70px);
max-height: calc(100vh - calc(var(--topBarBlockSize) + var(--bottomFormBlockSize)));
max-height: calc(100svh - calc(var(--topBarBlockSize) + var(--bottomFormBlockSize)));
display: none;
position: absolute;
top: 41px;
top: var(--topBarBlockSize);
left: 0;
right: 0;
margin: 0 auto;
@ -3149,10 +3152,10 @@ a {
.fillLeft {
width: calc((100vw - var(--sheldWidth) - 2px) /2);
width: calc((100svw - var(--sheldWidth) - 2px) /2);
height: calc(100vh - 42px);
height: calc(100svh - 42px);
max-height: calc(100vh - 42px);
max-height: calc(100svh - 42px);
height: calc(100vh - var(--topBarBlockSize));
height: calc(100svh - var(--topBarBlockSize));
max-height: calc(100vh - var(--topBarBlockSize));
max-height: calc(100svh - var(--topBarBlockSize));
position: fixed;
top: 0;
margin: 0;
@ -3517,4 +3520,4 @@ a {
z-index: 10;
margin-left: 10px;
/* Give some space between the button and search box */
}
}