diff --git a/.github/readme-zh_cn.md b/.github/readme-zh_cn.md index d1212b8f8..415fce222 100644 --- a/.github/readme-zh_cn.md +++ b/.github/readme-zh_cn.md @@ -1,8 +1,8 @@ [English](readme.md) | 中文 -![image](https://github.com/SillyTavern/SillyTavern/assets/18619528/8c41a061-7f72-4d2b-9d54-e6d058209e7b) +![image](https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4) -移动设备界面友好,多种人工智能服务或模型支持(KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale),类似 Galgame 的 老 婆 模 式,Horde SD,文本系统语音生成,世界信息(Lorebooks),可定制的界面,自动翻译,和比你所需要的更多的 Prompt。附带扩展服务,支持文本绘画生成与语音生成和基于向量数据库 ChromaDB 的聊天信息总结。 +移动设备界面友好,多种人工智能服务或模型支持(KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale),类似 Galgame 的 老 婆 模 式,Horde SD,文本系统语音生成,世界信息(Lorebooks),可定制的界面,自动翻译,和比你所需要的更多的 Prompt。附带扩展服务,支持文本绘画生成与语音生成和基于向量数据库 的聊天信息总结。 基于 TavernAI 1.2.8 的分叉版本 @@ -81,7 +81,6 @@ SillyTavern 支持扩展服务,一些额外的人工智能模块可通过 [Sil * 在聊天窗口发送图片,并由人工智能解释图片内容 * 文本图像生成(5 预设,以及 "自由模式") * 聊天信息的文字转语音(通过 ElevenLabs、Silero 或操作系统的语音生成) -* ChromaDB 向量数据库,用于更智能的聊天 Prompt 扩展服务的完整功能介绍和使用教程,请参阅 [Docs](https://docs.sillytavern.app/extras/extensions/)。 diff --git a/.github/readme.md b/.github/readme.md index b23c8affd..885f25461 100644 --- a/.github/readme.md +++ b/.github/readme.md @@ -1,15 +1,19 @@ English | [中文](readme-zh_cn.md) -![image](https://github.com/SillyTavern/SillyTavern/assets/18619528/8c41a061-7f72-4d2b-9d54-e6d058209e7b) +![SillyTavern-Banner](https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4) -Mobile-friendly, Multi-API (KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale), VN-like Waifu Mode, Horde SD, System TTS, WorldInfo (lorebooks), customizable UI, auto-translate, and more prompt options than you'd ever want or need. Optional Extras server for more SD/TTS options + ChromaDB/Summarize. +Mobile-friendly layout, Multi-API (KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale), VN-like Waifu Mode, Stable Diffusion, TTS, WorldInfo (lorebooks), customizable UI, auto-translate, and more prompt options than you'd ever want or need + ability to install third-party extensions. -Based on a fork of TavernAI 1.2.8 +Based on a fork of [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 + +## Important news! + +1. We have created a [Documentation website](https://docs.sillytavern.app/) to answer most of your questions and help you get started. + +2. Missing extensions after the update? Since the 1.10.6 release version, most of the previously built-in extensions have been converted to downloadable add-ons. You can download them via the built-in "Download Extensions and Assets" menu in the extensions panel (stacked blocks icon in the top bar). ### Brought to you by Cohee, RossAscends, and the SillyTavern community -NOTE: We have created a [Documentation website](https://docs.sillytavern.app/) to answer most of your questions and help you get started. - ### What is SillyTavern or TavernAI? SillyTavern is a user interface you can install on your computer (and Android phones) that allows you to interact with text generation AIs and chat/roleplay with characters you or the community create. @@ -80,7 +84,6 @@ SillyTavern has extensibility support, with some additional AI modules hosted vi * Sending images to chat, and the AI interpreting the content * Stable Diffusion image generation (5 chat-related presets plus 'free mode') * Text-to-speech for AI response messages (via ElevenLabs, Silero, or the OS's System TTS) -* ChromaDB vector storage for smarter chat prompt formatting A full list of included extensions and tutorials on how to use them can be found in the [Docs](https://docs.sillytavern.app/extras/extensions/). diff --git a/colab/GPU.ipynb b/colab/GPU.ipynb index 855995ec8..c44ab7270 100644 --- a/colab/GPU.ipynb +++ b/colab/GPU.ipynb @@ -70,7 +70,7 @@ "#@markdown * ckpt/sd15 - base SD 1.5\n", "#@markdown * stabilityai/stable-diffusion-2-1-base - base SD 2.1\n", "extras_enable_chromadb = True #@param {type:\"boolean\"}\n", - "#@markdown Enables ChromaDB for Infinity Context plugin\n", + "#@markdown Enables ChromaDB module\n", "\n", "import subprocess\n", "import secrets\n", diff --git a/default/config.conf b/default/config.conf index 4c629e402..257db767e 100644 --- a/default/config.conf +++ b/default/config.conf @@ -10,6 +10,7 @@ const listen = true; // If true, Can be access from other device or PC. otherwis const allowKeysExposure = false; // If true, private API keys could be fetched to the frontend. const skipContentCheck = false; // If true, no new default content will be delivered to you. const thumbnailsQuality = 95; // Quality of thumbnails. 0-100 +const disableChatBackup = false; // Disables the backup of chat logs to the /backups folder // If true, Allows insecure settings for listen, whitelist, and authentication. // Change this setting only on "trusted networks". Do not change this value unless you are aware of the issues that can arise from changing this setting and configuring a insecure setting. @@ -26,6 +27,8 @@ const extras = { captioningModel: 'Xenova/vit-gpt2-image-captioning', // Feature extraction model. HuggingFace ID of a model in ONNX format. embeddingModel: 'Xenova/all-mpnet-base-v2', + // GPT-2 text generation model. HuggingFace ID of a model in ONNX format. + promptExpansionModel: 'Cohee/fooocus_expansion-onnx', }; // Request overrides for additional headers @@ -49,4 +52,5 @@ module.exports = { requestOverrides, thumbnailsQuality, extras, + disableChatBackup, }; diff --git a/package-lock.json b/package-lock.json index 3941462d2..19eb2d6fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sillytavern", - "version": "1.10.5", + "version": "1.10.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "sillytavern", - "version": "1.10.5", + "version": "1.10.6", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { diff --git a/package.json b/package.json index d2c9b7dd3..185af0b1d 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "type": "git", "url": "https://github.com/SillyTavern/SillyTavern.git" }, - "version": "1.10.5", + "version": "1.10.6", "scripts": { "start": "node server.js", "start-multi": "node server.js --disableCsrf", diff --git a/public/assets/blip/.placeholder b/public/assets/blip/.placeholder new file mode 100644 index 000000000..1ebb7122e --- /dev/null +++ b/public/assets/blip/.placeholder @@ -0,0 +1 @@ +Put blip audio files here diff --git a/public/assets/live2d/.placeholder b/public/assets/live2d/.placeholder new file mode 100644 index 000000000..c76c79ab1 --- /dev/null +++ b/public/assets/live2d/.placeholder @@ -0,0 +1 @@ +Put live2d model folders here diff --git a/public/context/Adventure.json b/public/context/Adventure.json index eaa107ce3..9b90cba54 100644 --- a/public/context/Adventure.json +++ b/public/context/Adventure.json @@ -1,6 +1,11 @@ { "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{personality}}\n{{/if}}{{#if scenario}}{{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}", - "chat_start": "", "example_separator": "", + "chat_start": "", + "always_force_name2": false, + "trim_sentences": false, + "include_newline": false, + "custom_stopping_strings": "[\"\\n\"]", + "custom_stopping_strings_macro": true, "name": "Adventure" } \ No newline at end of file diff --git a/public/css/extensions-panel.css b/public/css/extensions-panel.css index 1b866fb45..7c6832115 100644 --- a/public/css/extensions-panel.css +++ b/public/css/extensions-panel.css @@ -103,39 +103,39 @@ input.extension_missing[type="checkbox"] { } /** LEFT COLUMN **/ -#extensions_settings>.expression_settings { +#extensions_settings>#assets_ui { order: 1; } -#extensions_settings>.background_settings { +#extensions_settings>.expression_settings { order: 2; } -#extensions_settings>.sd_settings { +#extensions_settings>.background_settings { order: 3; } -#extensions_settings>#tts_settings { +#extensions_settings>.sd_settings { order: 4; } -#extensions_settings>#rvc_settings { +#extensions_settings>#tts_settings { order: 5; } -#extensions_settings>.objective-settings { +#extensions_settings>#rvc_settings { order: 6; } -#extensions_settings>#speech_recognition_settings { +#extensions_settings>.objective-settings { order: 7; } -#extensions_settings>#audio_settings { +#extensions_settings>#speech_recognition_settings { order: 8; } -#extensions_settings>#assets_ui { +#extensions_settings>#audio_settings { order: 9; } diff --git a/public/css/mobile-styles.css b/public/css/mobile-styles.css index ec2d80e4f..80df97ff6 100644 --- a/public/css/mobile-styles.css +++ b/public/css/mobile-styles.css @@ -188,7 +188,8 @@ #showRawPrompt, #copyPromptToClipboard, - #groupCurrentMemberPopoutButton { + #groupCurrentMemberPopoutButton, + #summaryExtensionPopoutButton { display: none; } @@ -292,7 +293,7 @@ display: none; } - #bg_menu_content { + .bg_list { width: unset; } } @@ -444,4 +445,4 @@ #horde_model { height: unset; } -} \ No newline at end of file +} diff --git a/public/css/rm-groups.css b/public/css/rm-groups.css index dfcb7c90f..4bc82ee6b 100644 --- a/public/css/rm-groups.css +++ b/public/css/rm-groups.css @@ -78,6 +78,7 @@ #rm_group_members:empty { width: 100%; + padding: 0.5em 0; } #rm_group_members:empty::before { @@ -226,4 +227,5 @@ .group_member .avatar { flex-shrink: 0; -} \ No newline at end of file + flex-basis: auto; +} diff --git a/public/css/st-tailwind.css b/public/css/st-tailwind.css index 37dc2f27d..dca40662a 100644 --- a/public/css/st-tailwind.css +++ b/public/css/st-tailwind.css @@ -6,6 +6,12 @@ color: var(--fullred); } +.highlighted { + color: black; + background-color: yellow; + text-shadow: none !important; +} + .m-t-0 { margin-top: 0; } diff --git a/public/css/tags.css b/public/css/tags.css index b6985c8a9..9fe53cdf6 100644 --- a/public/css/tags.css +++ b/public/css/tags.css @@ -138,8 +138,7 @@ filter: brightness(1); } -.tags_view, -.open_alternate_greetings { +.tags_view { margin: 0; aspect-ratio: 1 / 1; } @@ -171,4 +170,4 @@ -1px 1px 0px black, 1px -1px 0px black; opacity: 1; -} \ No newline at end of file +} diff --git a/public/css/toggle-dependent.css b/public/css/toggle-dependent.css index 9dac7e9d8..dfee3610d 100644 --- a/public/css/toggle-dependent.css +++ b/public/css/toggle-dependent.css @@ -328,8 +328,7 @@ body.movingUI .drawer-content, body.movingUI #expression-holder, body.movingUI .zoomed_avatar, body.movingUI .draggable, -body.movingUI #floatingPrompt, -body.movingUI #groupMemberListPopout { +body.movingUI #floatingPrompt { resize: both; } diff --git a/public/index.html b/public/index.html index 674256ddf..e5f1b3c18 100644 --- a/public/index.html +++ b/public/index.html @@ -86,6 +86,9 @@ + + + SillyTavern @@ -122,13 +125,13 @@
-

Kobold Presets +

Kobold Presets ? -

-
- @@ -140,14 +143,14 @@
-

+

NovelAI Presets ? -

-
- @@ -160,9 +163,9 @@
-

Chat Completion Presets

-
- @@ -175,10 +178,9 @@
-

Text Gen WebUI (ooba/Mancer) presets -

-
- @@ -220,9 +222,8 @@
-
- select -
+ +
@@ -233,12 +234,11 @@
- +
-
- select -
+ +
@@ -286,9 +286,8 @@
-
- select -
+ +
@@ -301,9 +300,8 @@
-
- select -
+ +
@@ -316,9 +314,8 @@
-
- select -
+ +
@@ -331,9 +328,8 @@
-
- select -
+ +
@@ -361,9 +357,8 @@
-
- select -
+ +
@@ -376,9 +371,8 @@
-
- select -
+ +
@@ -391,9 +385,8 @@
-
- select -
+ +
@@ -403,12 +396,11 @@
- +
-
- select -
+ +
@@ -421,9 +413,8 @@
-
- select -
+ +
@@ -436,9 +427,8 @@
-
- select -
+ +
@@ -451,9 +441,7 @@
-
- select -
+
@@ -494,9 +482,8 @@
-
- select -
+ +
@@ -509,9 +496,8 @@
-
- select -
+ +
@@ -524,9 +510,8 @@
-
- select -
+ +
@@ -539,9 +524,36 @@
-
- select -
+ + +
+ + +
+
+ Frequency Penalty +
+
+
+ +
+
+ + +
+
+
+
+
+ Presence Penalty +
+
+
+ +
+
+ +
@@ -554,9 +566,8 @@
-
- select -
+ +
@@ -569,9 +580,8 @@
-
- select -
+ +
@@ -600,9 +610,8 @@
-
- select -
+ +
@@ -641,8 +650,8 @@
-
- select
+ +
@@ -655,9 +664,8 @@
-
- select -
+ +
@@ -670,9 +678,8 @@
-
- select -
+ +
@@ -685,9 +692,8 @@
-
- select -
+ +
@@ -700,9 +706,8 @@
-
- select -
+ +
@@ -715,9 +720,8 @@
-
- select -
+ +
@@ -933,9 +937,8 @@
-
- select -
+ +
@@ -948,9 +951,8 @@
-
- select -
+ +
@@ -963,9 +965,8 @@
-
- select -
+ +
@@ -978,9 +979,8 @@
-
- select -
+ +
@@ -993,9 +993,8 @@
-
- select -
+ +
@@ -1040,9 +1039,8 @@
-
- select -
+ +
@@ -1058,9 +1056,8 @@
-
- select -
+ +
@@ -1076,9 +1073,8 @@
-
- select -
+ +
@@ -1190,9 +1186,8 @@
-
- select -
+ +
@@ -1214,12 +1209,10 @@
- +
-
- select -
+
@@ -1232,9 +1225,8 @@
-
- select -
+ +
@@ -1247,9 +1239,8 @@
-
- select -
+ +
@@ -1262,9 +1253,8 @@
-
- select -
+ +
@@ -1277,9 +1267,8 @@
-
- select -
+ +
@@ -1289,12 +1278,11 @@
- +
-
- select -
+ +
@@ -1307,9 +1295,8 @@
-
- select -
+ +
@@ -1375,9 +1362,8 @@
-
- select -
+ +
@@ -1390,9 +1376,8 @@
-
- select -
+ +
@@ -1405,9 +1390,8 @@
-
- select -
+ +
@@ -1420,9 +1404,8 @@
-
- select -
+ +
@@ -1435,9 +1418,8 @@
-
- select -
+ +
@@ -1450,9 +1432,8 @@
-
- select -
+ +
@@ -1465,9 +1446,8 @@
-
- select -
+ +
@@ -1533,9 +1513,8 @@
-
- select -
+ +
@@ -1561,9 +1540,8 @@
-
- select -
+ +
@@ -1576,9 +1554,8 @@
-
- select -
+ +
@@ -1599,9 +1576,8 @@
-
- select -
+ +
@@ -1616,9 +1592,8 @@
-
- select -
+ +
@@ -1631,9 +1606,8 @@
-
- select -
+ +
@@ -1646,9 +1620,8 @@
-
- select -
+ +
@@ -1694,6 +1667,20 @@ Send names in the ChatML objects. Helps the model to associate messages with characters. +
+ +
+ + Combines consecutive system messages into one (excluding example dialogues). + May improve coherence for some models. + +
+
+
+ + +   + + Most tokens have a leading space. + + +
@@ -1755,7 +1751,7 @@
-

API

+

API

@@ -2237,7 +2233,7 @@
-

Advanced Formatting +

Advanced Formatting ? @@ -2248,8 +2244,8 @@

Context Template

-
- +
+ @@ -2336,8 +2332,8 @@ -
- +
+ @@ -2499,18 +2495,6 @@ Always add character's name to prompt - - -

+

Worlds/Lorebooks ? @@ -2667,9 +2651,8 @@

-
- depth -
+ +
@@ -2683,9 +2666,8 @@
-
- budget -
+ +
@@ -2699,9 +2681,8 @@
-
- 0 -
+ +
@@ -2736,8 +2717,8 @@ Alert On Overflow -
+ @@ -2797,7 +2778,7 @@
-

User Settings

+

User Settings

-
- select -
+ +
@@ -2916,9 +2896,8 @@
-
- select -
+ +
@@ -2931,9 +2910,8 @@
-
- select -
+ +
@@ -2946,9 +2924,8 @@
-
- select -
+ +
@@ -3027,6 +3004,10 @@ Relaxed API URLs +
-

Character Handling

+

+ Character Handling +

+
+ + +
- +
+ + +
-
-