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

Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging

This commit is contained in:
Cohee 2023-08-25 20:34:33 +03:00
parent b32a085e41 f50db430eb
commit cb669cbcab
5 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/index.html
View File

@ -4121,7 +4121,7 @@
<div class="floating_prompt_radio_group"> <div class="floating_prompt_radio_group">
<label> <label>
<input type="radio" name="extension_floating_position" value="0" /> <input type="radio" name="extension_floating_position" value="0" />
After scenario After Main Prompt / Story String
</label> </label>
<label> <label>
<input type="radio" name="extension_floating_position" value="1" /> <input type="radio" name="extension_floating_position" value="1" />
@ -4189,7 +4189,7 @@
<div class="floating_prompt_radio_group"> <div class="floating_prompt_radio_group">
<label> <label>
<input type="radio" name="extension_default_position" value="0" /> <input type="radio" name="extension_default_position" value="0" />
After scenario After Main Prompt / Story String
</label> </label>
<label> <label>
<input type="radio" name="extension_default_position" value="1" /> <input type="radio" name="extension_default_position" value="1" />

7
public/script.js
View File

@ -373,6 +373,9 @@ const system_message_types = {
}; };
const extension_prompt_types = { const extension_prompt_types = {
/**
* @deprecated Outdated term. In reality it's "after main prompt or story string"
*/
AFTER_SCENARIO: 0, AFTER_SCENARIO: 0,
IN_CHAT: 1 IN_CHAT: 1
}; };
@ -2257,8 +2260,8 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
return; return;
} }
// Hide swipes on either multigen or real streaming // Hide swipes if not in a dry run.
if ((isStreamingEnabled() || isMultigenEnabled()) && !dryRun) { if (!dryRun) {
hideSwipeButtons(); hideSwipeButtons();
} }

2
public/scripts/extensions/memory/index.js
View File

@ -567,7 +567,7 @@ jQuery(function () {
<div class="radio_group"> <div class="radio_group">
<label> <label>
<input type="radio" name="memory_position" value="0" /> <input type="radio" name="memory_position" value="0" />
After scenario After Main Prompt / Story String
</label> </label>
<label> <label>
<input type="radio" name="memory_position" value="1" /> <input type="radio" name="memory_position" value="1" />

4
public/scripts/openai.js
View File

@ -683,9 +683,9 @@ function preparePromptsForChatCompletion({Scenario, charPersonality, name2, worl
// Tavern Extras - Summary // Tavern Extras - Summary
const summary = extensionPrompts['1_memory']; const summary = extensionPrompts['1_memory'];
if (summary && summary.content) systemPrompts.push({ if (summary && summary.value) systemPrompts.push({
role: 'system', role: 'system',
content: summary.content, content: summary.value,
identifier: 'summary' identifier: 'summary'
}); });

20
public/style.css
View File

@ -916,12 +916,22 @@ select {
white-space: nowrap; white-space: nowrap;
} }
@media screen and (max-width: 1000px) {
#form_create textarea {
flex-grow: 1;
}
}
@media screen and (min-width: 1001px) {
#description_textarea {
height: 33vh;
height: 33svh;
}
#description_textarea,
#firstmessage_textarea { #firstmessage_textarea {
height: -webkit-fill-available; resize: none;
width: -moz-available; flex: 1;
}
} }
#character_name_pole { #character_name_pole {
@ -1550,10 +1560,6 @@ input[type=search]:focus::-webkit-search-cancel-button {
overflow-y: auto; overflow-y: auto;
} }
#form_create textarea {
flex-grow: 1;
}
.avatar_div { .avatar_div {
display: flex; display: flex;
width: 100%; width: 100%;