sillytavern 1.12.1 → 1.12.3

package/.dockerignore

@@ -1,4 +1,6 @@
 .git
+.github
+.vscode
 node_modules
 npm-debug.log
 readme*
@@ -8,3 +10,5 @@ Start.bat
 cloudflared.exe
 access.log
 /data
+/cache
+.DS_Store

package/.editorconfig

@@ -5,7 +5,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{js, conf, json}]
+[*.{js, conf, json, css, less, html}]
 charset = utf-8
 indent_style = space
 indent_size = 4

package/CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# How to contribute to SillyTavern
+
+## Setting up the dev environment
+
+1. Required software: git and node.
+2. Recommended editor: Visual Studio Code.
+3. You can also use GitHub Codespaces which sets up everything for you.
+
+## Getting the code ready
+
+1. Register a GitHub account.
+2. Fork this repository under your account. 
+3. Clone the fork onto your machine.
+4. Open the cloned repository in the code editor.
+5. Create a git branch (recommended).
+6. Make your changes and test them locally.
+7. Commit the changes and push the branch to the remote repo.
+8. Go to GitHub, and open a pull request, targeting the upstream branch.
+
+## Contribution guidelines
+
+1. Our standards are pretty low, but make sure the code is not too ugly:
+  - Run VS Code's autoformat when you're done.
+  - Check with ESLint by running `npm run lint`, then fix the errors.
+  - Use common sense and follow existing naming conventions.
+2. Create pull requests for the staging branch, 99% of contributions should go there. That way people could test your code before the next stable release.
+3. You can still send a pull request for release in the following scenarios:
+  - Updating README.
+  - Updating GitHub Actions.
+  - Hotfixing a critical bug.
+4. Project maintainers will test and can change your code before merging.
+5. Mind the license. Your contributions will be licensed under the GNU Affero General Public License. If you don't know what that implies, consult your lawyer.

package/config.yaml

@@ -48,6 +48,8 @@ allowKeysExposure: false
 skipContentCheck: false
 # Disable automatic chats backup
 disableChatBackup: false
+# Number of backups to keep for each chat and settings file
+numberOfBackups: 50
 # Allowed hosts for card downloads
 whitelistImportDomains:
   - localhost

package/default/config.yaml

@@ -48,6 +48,8 @@ allowKeysExposure: false
 skipContentCheck: false
 # Disable automatic chats backup
 disableChatBackup: false
+# Number of backups to keep for each chat and settings file
+numberOfBackups: 50
 # Allowed hosts for card downloads
 whitelistImportDomains:
   - localhost

package/default/content/index.json

@@ -11,6 +11,14 @@
         "filename": "themes/Cappuccino.json",
         "type": "theme"
     },
+    {
+        "filename": "themes/Celestial Macaron.json",
+        "type": "theme"
+    },
+    {
+        "filename": "themes/Dark V 1.0.json",
+        "type": "theme"
+    },
     {
         "filename": "backgrounds/__transparent.png",
         "type": "background"
@@ -476,7 +484,11 @@
         "type": "context"
     },
     {
-        "filename": "presets/context/DreamGen Role-Play V1.json",
+        "filename": "presets/context/DreamGen Role-Play V1 ChatML.json",
+        "type": "context"
+    },
+    {
+        "filename": "presets/context/DreamGen Role-Play V1 Llama3.json",
         "type": "context"
     },
     {
@@ -556,7 +568,11 @@
         "type": "instruct"
     },
     {
-        "filename": "presets/instruct/DreamGen Role-Play V1.json",
+        "filename": "presets/instruct/DreamGen Role-Play V1 ChatML.json",
+        "type": "instruct"
+    },
+    {
+        "filename": "presets/instruct/DreamGen Role-Play V1 Llama3.json",
         "type": "instruct"
     },
     {

package/default/content/presets/context/{DreamGen Role-Play V1.json → DreamGen Role-Play V1 ChatML.json }

@@ -8,5 +8,5 @@
     "trim_sentences": true,
     "include_newline": false,
     "single_line": false,
-    "name": "DreamGen Role-Play V1"
+    "name": "DreamGen Role-Play V1 ChatML"
 }

package/default/content/presets/context/DreamGen Role-Play V1 Llama3.json

@@ -0,0 +1,12 @@
+{
+    "story_string": "<|start_header_id|>system<|end_header_id|>\n\n{{#if system}}{{system}}\n\n\n{{/if}}## Overall plot description:\n\n{{#if scenario}}{{scenario}}{{else}}Conversation between {{char}} and {{user}}.{{/if}}{{#if wiBefore}}\n\n{{wiBefore}}{{/if}}\n\n\n## Characters:\n\n### {{char}}\n\n{{#if description}}{{description}}\n\n{{/if}}{{#if personality}}{{personality}}\n\n{{/if}}### {{user}}\n\n{{#if persona}}{{persona}}{{else}}{{user}} is the protagonist of the role-play.{{/if}}{{#if wiAfter}}\n\n{{wiAfter}}{{/if}}{{#if mesExamples}}\n\n{{mesExamples}}{{/if}}",
+    "example_separator": "<|eot_id|>\n<|start_header_id|>user<|end_header_id|>\n\nWrite an example narrative / conversation that is not part of the main story.",
+    "chat_start": "<|eot_id|>\n<|start_header_id|>user<|end_header_id|>\n\nStart the role-play between {{char}} and {{user}}.",
+    "use_stop_strings": false,
+    "allow_jailbreak": false,
+    "always_force_name2": false,
+    "trim_sentences": true,
+    "include_newline": false,
+    "single_line": false,
+    "name": "DreamGen Role-Play V1 Llama3"
+}

package/default/content/presets/instruct/{DreamGen Role-Play V1.json → DreamGen Role-Play V1 ChatML.json }

@@ -20,5 +20,5 @@
     "user_alignment_message": "",
     "system_same_as_user": true,
     "last_system_sequence": "",
-    "name": "DreamGen Role-Play V1"
+    "name": "DreamGen Role-Play V1 ChatML"
 }

package/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json

@@ -0,0 +1,18 @@
+{
+    "system_prompt": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below.",
+    "input_sequence": "<|eot_id|>\n<|start_header_id|>writer character: {{user}}<|end_header_id|>\n\n",
+    "output_sequence": "<|eot_id|>\n<|start_header_id|>writer character: {{char}}<|end_header_id|>\n\n",
+    "first_output_sequence": "",
+    "last_output_sequence": "",
+    "system_sequence_prefix": "",
+    "system_sequence_suffix": "",
+    "stop_sequence": "",
+    "separator_sequence": "",
+    "wrap": false,
+    "macro": true,
+    "names": false,
+    "names_force_groups": false,
+    "activation_regex": "",
+    "skip_examples": false,
+    "name": "DreamGen Role-Play V1 Llama3"
+}

package/default/content/themes/Cappuccino.json

@@ -1,7 +1,7 @@
 {
     "name": "Cappuccino",
     "blur_strength": 3,
-    "main_text_color": "rgba(255, 255, 255, 1)",
+    "main_text_color": "rgba(235, 235, 235, 1)",
     "italics_text_color": "rgba(230, 210, 190, 1)",
     "underline_text_color": "rgba(205, 180, 160, 1)",
     "quote_text_color": "rgba(165, 140, 115, 1)",

package/default/content/themes/Celestial Macaron.json

@@ -0,0 +1,37 @@
+{
+    "name": "Celestial Macaron",
+    "blur_strength": 10,
+    "main_text_color": "rgba(229, 175, 162, 1)",
+    "italics_text_color": "rgba(146, 147, 161, 1)",
+    "underline_text_color": "rgba(157, 215, 198, 1)",
+    "quote_text_color": "rgba(197, 202, 206, 1)",
+    "blur_tint_color": "rgba(23, 36, 55, 0.9)",
+    "chat_tint_color": "rgba(18, 26, 40, 0.9)",
+    "user_mes_blur_tint_color": "rgba(51, 67, 90, 0.7)",
+    "bot_mes_blur_tint_color": "rgba(23, 36, 55, 0.75)",
+    "shadow_color": "rgba(0, 0, 0, 0.3)",
+    "shadow_width": 1,
+    "border_color": "rgba(60, 74, 110, 0.93)",
+    "font_scale": 1,
+    "fast_ui_mode": false,
+    "waifuMode": false,
+    "avatar_style": 0,
+    "chat_display": 1,
+    "noShadows": true,
+    "chat_width": 58,
+    "timer_enabled": true,
+    "timestamps_enabled": true,
+    "timestamp_model_icon": false,
+    "mesIDDisplay_enabled": true,
+    "hideChatAvatars_enabled": false,
+    "message_token_count_enabled": true,
+    "expand_message_actions": true,
+    "enableZenSliders": false,
+    "enableLabMode": false,
+    "hotswap_enabled": true,
+    "custom_css": "",
+    "bogus_folders": true,
+    "zoomed_avatar_magnification": false,
+    "reduced_motion": false,
+    "compact_input_area": true
+}

package/default/content/themes/Dark V 1.0.json

@@ -0,0 +1,37 @@
+{
+    "name": "Dark V 1.0",
+    "blur_strength": 13,
+    "main_text_color": "rgba(207, 207, 197, 1)",
+    "italics_text_color": "rgba(145, 145, 145, 1)",
+    "underline_text_color": "rgba(145, 145, 145, 1)",
+    "quote_text_color": "rgba(198, 193, 151, 1)",
+    "blur_tint_color": "rgba(29, 33, 40, 0.9)",
+    "chat_tint_color": "rgba(29, 33, 40, 0.9)",
+    "user_mes_blur_tint_color": "rgba(29, 33, 40, 0.9)",
+    "bot_mes_blur_tint_color": "rgba(29, 33, 40, 0.9)",
+    "shadow_color": "rgba(0, 0, 0, 0.9)",
+    "shadow_width": 2,
+    "border_color": "rgba(0, 0, 0, 1)",
+    "font_scale": 1,
+    "fast_ui_mode": false,
+    "waifuMode": false,
+    "avatar_style": 0,
+    "chat_display": 0,
+    "noShadows": false,
+    "chat_width": 55,
+    "timer_enabled": false,
+    "timestamps_enabled": false,
+    "timestamp_model_icon": false,
+    "mesIDDisplay_enabled": false,
+    "hideChatAvatars_enabled": false,
+    "message_token_count_enabled": false,
+    "expand_message_actions": false,
+    "enableZenSliders": false,
+    "enableLabMode": false,
+    "hotswap_enabled": true,
+    "custom_css": "",
+    "bogus_folders": true,
+    "zoomed_avatar_magnification": true,
+    "reduced_motion": true,
+    "compact_input_area": false
+}

package/jsconfig.json

@@ -15,6 +15,11 @@
         "**/node_modules/*",
         "public/lib",
         "backups/*",
-        "data/*"
+        "data/*",
+        "**/dist/*",
+        "dist/*",
+        "cache/*",
+        "src/tokenizers/*",
+        "docker/*",
     ]
 }

package/package.json

@@ -38,7 +38,7 @@
         "vectra": "^0.2.2",
         "wavefile": "^11.0.0",
         "write-file-atomic": "^5.0.1",
-        "ws": "^8.13.0",
+        "ws": "^8.17.1",
         "yaml": "^2.3.4",
         "yargs": "^17.7.1",
         "yauzl": "^2.10.0"
@@ -70,7 +70,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.12.1",
+    "version": "1.12.3",
     "scripts": {
         "start": "node server.js",
         "start:no-csrf": "node server.js --disableCsrf",

package/public/css/animations.css

@@ -0,0 +1,122 @@
+/* Fade animations with opacity */
+@keyframes fade-in {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes fade-out {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+/* Pop animations with opacity and vertical scaling */
+@keyframes pop-in {
+    0% {
+        opacity: 0;
+        transform: scaleY(0);
+    }
+
+    /* Make the scaling faster on pop-in, otherwise it looks a bit weird */
+    33% {
+        transform: scaleY(1);
+    }
+
+    100% {
+        opacity: 1;
+        transform: scaleY(1);
+    }
+}
+
+@keyframes pop-out {
+    0% {
+        opacity: 1;
+        transform: scaleY(1);
+    }
+
+    100% {
+        opacity: 0;
+        transform: scaleY(0);
+    }
+}
+
+/* Flashing for highlighting animation */
+@keyframes flash {
+
+    20%,
+    60%,
+    100% {
+        opacity: 1;
+    }
+
+    0%,
+    40%,
+    80% {
+        opacity: 0.2;
+    }
+}
+
+/* Pulsing highlight, slightly resizing the element */
+@keyframes pulse {
+    from {
+        transform: scale(1);
+        filter: brightness(1.1);
+    }
+
+    to {
+        transform: scale(1.01);
+        filter: brightness(1.3);
+    }
+}
+
+/* Ellipsis animation */
+@keyframes ellipsis {
+    0% {
+        content: ""
+    }
+
+    25% {
+        content: "."
+    }
+
+    50% {
+        content: ".."
+    }
+
+    75% {
+        content: "..."
+    }
+}
+
+/* HEINOUS */
+@keyframes infinite-spinning {
+    from {
+        transform: rotate(0deg);
+    }
+
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+/* STscript animation */
+@keyframes script_progress_pulse {
+
+    0%,
+    100% {
+        border-top-color: var(--progColor);
+    }
+
+    50% {
+        border-top-color: var(--progFlashColor);
+    }
+}

package/public/css/extensions-panel.css

@@ -36,7 +36,6 @@ label[for="extensions_autoconnect"] {
 
 .extensions_info {
     text-align: left;
-    margin: 0 1em;
 }
 
 .extensions_info h3 {
@@ -97,114 +96,11 @@ input.extension_missing[type="checkbox"] {
     flex-direction: column;
 }
 
-/** LEFT COLUMN **/
-/* Must be always on top */
-#extensions_settings>#assets_ui {
-    order: -1;
-}
-
-#extensions_settings>.expression_settings {
-    order: 2;
-}
-
-#extensions_settings>.background_settings {
-    order: 3;
-}
-
-#extensions_settings>.sd_settings {
-    order: 4;
-}
-
-#extensions_settings>#tts_settings {
-    order: 5;
-}
-
-#extensions_settings>#rvc_settings {
-    order: 6;
-}
-
-#extensions_settings>.objective-settings {
-    order: 7;
-}
-
-#extensions_settings>#speech_recognition_settings {
-    order: 8;
-}
-
-#extensions_settings>#audio_settings {
-    order: 9;
-}
-
-/** RIGHT COLUMN **/
-#extensions_settings2>.translation_settings {
-    order: 1;
-}
-
-#extensions_settings2>.caption_settings {
-    order: 2;
-}
-
-#extensions_settings2>.quickReplySettings {
-    order: 3;
-}
-
-#extensions_settings2>.idle-settings {
-    order: 4;
-}
-
-#extensions_settings2>#memory_settings {
-    order: 5;
-}
-
-#extensions_settings2>.hypebot_settings {
-    order: 6;
-}
-
-#extensions_settings2>.regex_settings {
-    order: 7;
-}
-
-#extensions_settings2>.vectors_settings {
-    order: 8;
-}
-
-#extensions_settings2>.chromadb_settings {
-    order: 9;
-}
-
-#extensions_settings2>.randomizer_settings {
-    order: 10;
-}
-
-/** WAND MENU **/
-#extensionsMenu>#ttsExtensionMenuItem {
-    order: 1;
-}
-
-#extensionsMenu>#sd_gen {
-    order: 2;
-}
-
-#extensionsMenu>#send_picture {
-    order: 3;
-}
-
-#extensionsMenu>#token_counter {
-    order: 4;
-}
-
-#extensionsMenu>#objective-task-manual-check-menu-item {
-    order: 5;
-}
-
-#extensionsMenu>#roll_dice {
-    order: 6;
-}
-
-#extensionsMenu>#translate_chat {
-    order: 7;
+/* Fixes order of settings for extensions */
+.extension_container {
+    display: contents;
 }
 
-#extensionsMenu>#translate_input_message {
-    order: 8;
+#extensionsMenu>div.extension_container:empty {
+    display: none;
 }

package/public/css/loader.css

@@ -1,4 +1,4 @@
-#loader, #preloader {
+#preloader {
     position: fixed;
     margin: 0;
     padding: 0;

package/public/css/logprobs.css

@@ -98,7 +98,7 @@
     font-weight: bold;
 }
 
-.logprobs_top_candidate:not([disabled]):hover, .logprobs_top_candidate:not([disabled]):focus {
+.logprobs_top_candidate:not([disabled]):hover {
     background-color: rgba(0, 0, 0, 0.3);
 }
 

package/public/css/popup-safari-fix.css

@@ -0,0 +1,6 @@
+/* iPhone copium land */
+.ios .popup .popup-body {
+    height: fit-content;
+    max-height: 90vh;
+    max-height: 90svh;
+}