From 8bba794e7b728169a0c3ca5483093f630bdb56fa Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Sat, 27 May 2023 23:41:38 +0900 Subject: [PATCH] Add Creator Comment box, fix HR styles --- public/index.html | 45 +++++++++++++++++++++++---------------------- public/script.js | 30 ++++++++++++++++++------------ public/style.css | 41 +++++++++++------------------------------ server.js | 17 ++++++++++++++++- 4 files changed, 68 insertions(+), 65 deletions(-) diff --git a/public/index.html b/public/index.html index 311b20547..47dfc8c7a 100644 --- a/public/index.html +++ b/public/index.html @@ -2136,35 +2136,36 @@ -
+
-
- -
- -
-

- Advanced Definitions -
- +

- Advanced Definitions
+
+
+ Creator's Comment +
This is not sent to the AI Prompt. + +
+
-
-

Personality summary

-
A brief description of the personality ?
- +

+ Personality summary + ? +

+
-

Scenario

-
Circumstances and context of the dialogue +

+ Scenario ? -

- + +
@@ -2178,13 +2179,13 @@ Chatty
- -
+
+
-

Examples of dialogue

-
Forms a personality more clearly ?
+

Example Dialogue

+
Important to set the character's writing style. ?
- +
diff --git a/public/script.js b/public/script.js index 324cc9be6..f3b0a59ba 100644 --- a/public/script.js +++ b/public/script.js @@ -336,20 +336,20 @@ const system_messages = {

Want to Update to the latest version?

Read the instructions here. Also located in your installation's base folder -
+

In order to begin chatting:

  1. Connect to one of the supported generation APIs (the plug icon)
  2. Create or pick a character from the list (the top-right namecard icon)
-
+

Where to download more characters?

(Not endorsed, your discretion is advised)
  1. Pygmalion AI Discord
  2. CharacterHub (NSFW)
-
+

Where can I get help?

Before going any further, check out the following resources:
    @@ -360,7 +360,7 @@ const system_messages = {
  1. Pygmalion AI Docs
Type /? in any chat to get help on message formatting commands. -
+

Still have questions or suggestions left?

SillyTavern Community Discord
@@ -532,6 +532,7 @@ var selected_button = ""; //which button pressed var create_save_name = ""; var create_fav_chara = ""; var create_save_description = ""; +var create_save_creatorcomment = ""; var create_save_personality = ""; var create_save_first_message = ""; var create_save_avatar = ""; @@ -2757,7 +2758,7 @@ function promptItemize(itemizedPrompts, requestedMesId) { Grey color items may not have been included in the context due to certain prompt format settings. -
+
@@ -2845,7 +2846,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
-
+
Total Tokens in Prompt:
${finalPromptTokens}
@@ -2855,7 +2856,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
-
+
`, 'text' ); @@ -2871,7 +2872,7 @@ function promptItemize(itemizedPrompts, requestedMesId) { Grey color items may not have been included in the context due to certain prompt format settings. -
+
@@ -2932,7 +2933,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
-
+
Total Tokens in Prompt:
${totalTokensInPrompt}
@@ -2949,7 +2950,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
-
+
`, 'text' ); } @@ -4340,6 +4341,7 @@ export function select_selected_character(chid) { $("#character_popup_text_h3").text(characters[chid].name); $("#character_name_pole").val(characters[chid].name); $("#description_textarea").val(characters[chid].description); + $("#creatorcomment_textarea").val(characters[chid].creatorcomment); $("#personality_textarea").val(characters[chid].personality); $("#firstmessage_textarea").val(characters[chid].first_mes); $("#scenario_pole").val(characters[chid].scenario); @@ -4393,6 +4395,7 @@ function select_rm_create() { $("#character_popup_text_h3").text("Create character"); $("#character_name_pole").val(create_save_name); $("#description_textarea").val(create_save_description); + $("#creatorcomment_textarea").val(create_save_creatorcomment); $("#personality_textarea").val(create_save_personality); $("#firstmessage_textarea").val(create_save_first_message); $("#talkativeness_slider").val(create_save_talkativeness); @@ -5342,7 +5345,7 @@ $(document).ready(function () { $("#advanced_div").click(function () { if (!is_advanced_char_open) { is_advanced_char_open = true; - $("#character_popup").css("display", "grid"); + $("#character_popup").css("display", "flex"); $("#character_popup").css("opacity", 0.0); $("#character_popup").transition({ opacity: 1.0, @@ -5566,6 +5569,8 @@ $(document).ready(function () { create_save_name = ""; $("#description_textarea").val(""); create_save_description = ""; + $("#creatorcomment_textarea").val(""); + create_save_creatorcomment = ""; $("#personality_textarea").val(""); create_save_personality = ""; $("#firstmessage_textarea").val(""); @@ -5700,10 +5705,11 @@ $(document).ready(function () { } }); - $("#description_textarea, #personality_textarea, #scenario_pole, #mes_example_textarea, #firstmessage_textarea") + $("#description_textarea, #creatorcomment_textarea, #personality_textarea, #scenario_pole, #mes_example_textarea, #firstmessage_textarea") .on("input", function () { if (menu_type == "create") { create_save_description = $("#description_textarea").val(); + create_save_creatorcomment = $("#creatorcomment_textarea").val(); create_save_personality = $("#personality_textarea").val(); create_save_scenario = $("#scenario_pole").val(); create_save_mes_example = $("#mes_example_textarea").val(); diff --git a/public/style.css b/public/style.css index 99d74fe40..100d2245c 100644 --- a/public/style.css +++ b/public/style.css @@ -130,10 +130,6 @@ table.responsiveTable { padding: 5px; } -.sysHR { - border-top: 2px solid grey; -} - .hiddenByCharListScroll { visibility: hidden !important; } @@ -563,11 +559,11 @@ code { width: 20px; } -#right-nav-panel hr, -#personality_div hr, -#top-settings-holder hr { +hr { background-image: linear-gradient(90deg, var(--transparent), var(--white30a), var(--transparent)); - min-height: 1px; + margin: 5px 0; + height: 1px; + border: 0; } .options-content a, @@ -2424,9 +2420,7 @@ input[type="range"]::-webkit-slider-thumb { background-color: var(--black30a); backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); -webkit-backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); - grid-template-rows: 50px 1fr 1fr 1fr 5fr; - grid-gap: 10px; - min-height: 100px; + min-height: calc(100svh - 100px); min-width: 100px; max-width: var(--sheldWidth); max-height: calc(100svh - 100px); @@ -2438,12 +2432,9 @@ input[type="range"]::-webkit-slider-thumb { right: 0; top: 40px; box-shadow: 0 0 20px var(--black70a); - padding-left: 30px; - padding-right: 30px; - padding-top: 20px; - padding-bottom: 30px; + padding: 10px; border: 1px solid var(--black30a); - border-radius: 0 0 20px 20px; + border-radius: 0 0 10px 10px; overflow-y: auto; } @@ -2468,11 +2459,7 @@ h5 { #character_popup_text { - display: grid; - grid-template-columns: 50px auto; - grid-gap: 20px; align-items: center; - width: 100%; } #personality_textarea { @@ -2481,8 +2468,8 @@ h5 { #mes_example_div { height: 100%; - display: grid; - grid-template-rows: min-content auto; + display: flex; + flex-grow: 1; } #scenario_pole { @@ -2492,7 +2479,7 @@ h5 { #mes_example_textarea { width: 100%; - max-height: 100%; + height: 100%; margin-left: 0; } @@ -3273,12 +3260,6 @@ p { margin-top: 0; } -hr { - margin: 5px 0; - height: 1px; - border: 0; -} - h1 { font-size: calc(var(--mainFontSize) + 1rem); line-height: 32px; @@ -4485,4 +4466,4 @@ body.waifuMode #avatar_zoom_popup { overflow-y: auto; overflow-x: hidden; } -} +} \ No newline at end of file diff --git a/server.js b/server.js index d2de68153..667af6558 100644 --- a/server.js +++ b/server.js @@ -673,7 +673,19 @@ function tryParse(str) { //***************** Main functions function charaFormatData(data) { - var char = { "name": data.ch_name, "description": data.description, "personality": data.personality, "first_mes": data.first_mes, "avatar": 'none', "chat": data.ch_name + ' - ' + humanizedISO8601DateTime(), "mes_example": data.mes_example, "scenario": data.scenario, "create_date": humanizedISO8601DateTime(), "talkativeness": data.talkativeness, "fav": data.fav }; + var char = { + "name": data.ch_name, + "description": data.description, + "creatorcomment": data.creatorcomment, + "personality": data.personality, + "first_mes": data.first_mes, + "avatar": 'none', "chat": data.ch_name + ' - ' + humanizedISO8601DateTime(), + "mes_example": data.mes_example, + "scenario": data.scenario, + "create_date": humanizedISO8601DateTime(), + "talkativeness": data.talkativeness, + "fav": data.fav + }; return char; } @@ -1468,6 +1480,7 @@ app.post("/importcharacter", urlencodedParser, async function (request, response let char = { "name": jsonData.name, "description": jsonData.description ?? '', + "creatorcomment": jsonData.creatorcomment ?? '', "personality": jsonData.personality ?? '', "first_mes": jsonData.first_mes ?? '', "avatar": 'none', "chat": jsonData.name + " - " + humanizedISO8601DateTime(), @@ -1485,6 +1498,7 @@ app.post("/importcharacter", urlencodedParser, async function (request, response let char = { "name": jsonData.char_name, "description": jsonData.char_persona ?? '', + "creatorcomment": '', "personality": '', "first_mes": jsonData.char_greeting ?? '', "avatar": 'none', @@ -1525,6 +1539,7 @@ app.post("/importcharacter", urlencodedParser, async function (request, response let char = { "name": jsonData.name, "description": jsonData.description ?? '', + "creatorcomment": jsonData.creatorcomment ?? '', "personality": jsonData.personality ?? '', "first_mes": jsonData.first_mes ?? '', "avatar": 'none',