diff --git a/.github/readme-ja_jp.md b/.github/readme-ja_jp.md index 5aade3e84..68c9e97c3 100644 --- a/.github/readme-ja_jp.md +++ b/.github/readme-ja_jp.md @@ -1,6 +1,20 @@ +> [!IMPORTANT] +> ここに掲載されている情報は、古かったり不完全であったりする可能性があります。最新の情報は英語版をご利用ください。 + +![][cover] + +
+ [English](readme.md) | [中文](readme-zh_cn.md) | 日本語 | [Русский](readme-ru_ru.md) -![SillyTavern-Banner](https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4) +[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers) +[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network) +[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues) +[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls) + +
+ +--- モバイルデバイスにも適したレイアウト・マルチAPI（KoboldAI/CPP、Horde、NovelAI、Ooba、OpenAI、OpenRouter、Claude、Scale）、VN ライクな Waifu モード、Stable Diffusion、TTS、WorldInfo（伝承本）、カスタマイズ可能なUI、自動翻訳、大量のプロンプトオプション＋サードパーティの拡張機能をインストールする機能 @@ -71,14 +85,13 @@ Tavern は単なるフロントエンドのUIであり、必要なハードウ * ワールド情報サポート: 豊富な伝承を作成したり、キャラクターカードにトークンを保存したりできます * [OpenRouter](https://openrouter.ai) 各種 API(Claude、GPT-4/3.5 など)の接続 * [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui) API 接続 -* [AI Horde](https://horde.koboldai.net/) 接続 +* [AI Horde](https://aihorde.net/) 接続 * プロンプト生成フォーマットの調整 ## 拡張機能 -SillyTavern は拡張できるようになっており、[SillyTavern Extras API](https://github.com/SillyTavern/SillyTavern-extras) でいくつかの追加AIモジュールをホストしています +SillyTavern は拡張できるようになっており。 -* 作者ノート/キャラクターバイアス * キャラクターの感情表現（スプライト） * チャット履歴の自動サマリー * チャットに画像を送り、AI が内容を解釈する @@ -282,8 +295,8 @@ ST サーバを再起動すると、ユーザ名とパスワードさえ知っ ## スクリーンショット -image -image +image +image ## ライセンスとクレジット @@ -312,3 +325,6 @@ ST サーバを再起動すると、ユーザ名とパスワードさえ知っ * @doloroushyeonse による韓国語翻訳 * k_euler_a による Horde のサポート * [@XXpE3](https://github.com/XXpE3) による中国語翻訳、中国語 ISSUES の連絡先は @XXpE3 + + +[cover]: https://github.com/user-attachments/assets/01a6ae9a-16aa-45f2-8bff-32b5dc587e44 diff --git a/.github/readme-ru_ru.md b/.github/readme-ru_ru.md index 05beafbd8..658edf924 100644 --- a/.github/readme-ru_ru.md +++ b/.github/readme-ru_ru.md @@ -1,359 +1,372 @@ - - -[English](readme.md) | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | Русский - -![][cover] - -Мобайл-френдли интерфейс, поддержка множества API (KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale), ВН-образный режим Вайфу, Stable Diffusion, TTS, поддержка миров (лорбуков), кастомизируемый UI, автоперевод, тончайшая настройка промптов + возможность устанавливать расширения. - -Основано на форке [TavernAI](https://github.com/TavernAI/TavernAI) версии 1.2.8 - -## Важные новости! - -1. Чтобы помочь вам быстрее разобраться в SillyTavern, мы создали [сайт с документацией](https://docs.sillytavern.app/). Ответы на большинство вопросов можно найти там. - -2. Почему пропали расширения после апдейта? Начиная с версии 1.10.6, большинство встроенных расширений были конвертированы в формат загружаемых аддонов. Их можно установить обратно через меню "Download Extensions and Assets" на панели расширений (значок с тремя кубиками сверху). - -3. Не поддерживается следующая платформа: android arm LEtime-web. 32-битный Android требует внешнюю зависимость, которую нельзя установить посредством npm. Для её установки потребуется следующая команда: `pkg install esbuild`. После этого продолжайте установку по общей инструкции. - -### Разрабатывается Cohee, RossAscends и всем сообществом SillyTavern - -### Что такое SillyTavern и TavernAI? - -SillyTavern — это интерфейс, который устанавливается на ПК (и на Android), который даёт возможность общаться с генеративным ИИ и чатиться/ролеплеить с вашими собственными персонажами или персонажами других пользователей. - -SillyTavern — это форк версии TavernAI 1.2.8, который разрабатывается более активно и имеет множество новых функций. Сейчас уже можно сказать, что это две отдельные и абсолютно самостоятельные программы. - -## Скриншоты - -image -image - -### Ветки - -SillyTavern разрабатывается в двух ветках, чтобы всем категориям пользователей было удобно. - -* release -🌟 **Рекомендовано для большинства пользователей.** Самая стабильная ветка, рекомендуем именно её. Обновляется только в момент крупных релизов. Подходит для большей части пользователей. -* staging - ⚠️ **Не рекомендуется для повседневного использования.** В этой ветке весь самый свежий и новый функционал, но будьте аккуратны, поскольку сломаться может в любом месте и в любое время. Только для продвинутых пользователей и энтузиастов. - -Если вы не умеете обращаться с git через командную строку, или не знаете, что такое ветка, то не переживайте! Наилучшим вариантом всегда остаётся ветка release. - -### Что ещё нужно, кроме SillyTavern? - -Сама по себе SillyTavern бесполезна, ведь это просто интерфейс. Вам потребуется доступ к бэкенду с ИИ, который и будет отыгрывать выбранного вами персонажа. Поддерживаются разные виды бэкендов: OpenAPI API (GPT), KoboldAI (локально или на Google Colab), и многое другое. Больше информации в [FAQ](https://docs.sillytavern.app/usage/faq/). - -### Требуется ли для SillyTavern мощный ПК? - -SillyTavern — это просто интерфейс, поэтому запустить его можно на любой картошке. Мощным должен быть бэкенд с ИИ. - -## Есть вопросы или предложения? - -### У нас появился сервер в Discord - -| [![][discord-shield-badge]][discord-link] | [Вступайте в наше Discord-сообщество!](https://discord.gg/sillytavern) Задавайте вопросы, делитесь любимыми персонажами и промптами. | -| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------- | - -Также можно написать разработчикам напрямую: - -* Discord: cohee или rossascends -* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/) или [/u/sillylossy](https://www.reddit.com/user/sillylossy/) -* [Запостить issue на GitHub](https://github.com/SillyTavern/SillyTavern/issues) - -## Эта версия включает - -* Глубоко переработанную TavernAI 1.2.8 (переписано и оптимизировано более 50% кода) -* Свайпы -* Групповые чаты: комнаты для нескольких ботов, где персонажи могут говорить друг с другом и с вами -* Чекпоинты и ветки для чатов -* Продвинутые настройки для KoboldAI / TextGen со множеством созданных сообществом пресетов -* Поддержка миров (функция "Информация о мире" / WorldInfo): создавайте свой богатый лор, или экономьте токены для карточек персонажей -* Соединение через [OpenRouter](https://openrouter.ai) для разных API (Claude, GPT-4/3.5 и других) -* Соединение с API [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui) -* Соединение с [AI Horde](https://horde.koboldai.net/) -* Настройку форматирования промптов - -## Расширения - -SillyTavern поддерживает расширения, при этом некоторые из ИИ-модулей работают через [SillyTavern Extras API](https://github.com/SillyTavern/SillyTavern-extras) - -* Заметки автора / Смещение характера -* Эмоции для персонажей (спрайты) -* Автоматический саммарайз (краткий пересказ) истории чата -* Возможность отправить в чат картинку, которую ИИ сможет рассмотреть и понять -* Генерация картинок в Stable Diffusion (5 пресетов для чата, плюс свободный режим) -* Text-to-speech для сообщений ИИ (с помощью ElevenLabs, Silero, или родной TTS вашей ОС) - -Полный список расширений и инструкций к ним можно найти в [документации](https://docs.sillytavern.app/). - -## Улучшения от RossAscends для UI/CSS/общего удобства - -* Мобильный интерфейс адаптирован для iOS, добавлена возможность сохранить ярлык на главный экран и открыть приложение в полноэкранном режиме. -* Горячие клавиши - * Up = Редактировать последнее сообщение в чате - * Ctrl+Up = Редактировать ВАШЕ последнее сообщение в чате - * Left = свайп влево - * Right = свайп вправо (ОБРАТИТЕ ВНИМАНИЕ: когда в окне ввода что-то напечатано, клавиши для свайпа не работают) - * Ctrl+Left = посмотреть локальные переменные (в консоли браузера) - * Enter (при нахождении внутри окна ввода) = отправить ваше сообщение ИИ - * Ctrl+Enter = Повторная генерация последнего ответа ИИ - -* Страница больше не перезагружается при смене имени пользователя или удалении персонажа - -* Отключаемая возможность автоматически соединяться с API при загрузке страницы. -* Отключаемая возможность автоматически загружать последнего открытого персонажа при загрузке страницы. -* Улучшенный счётчик токенов - работает с несохранёнными персонажами, отображает и перманентные, и временные токены - -* Улучшенный менеджер чатов - * Файлы с новыми чатами получают читабельные названия вида "(персонаж) - (когда создано)" - * Увеличен размер превью чата с 40 символов до 300. - * Несколько вариантов сортировки списка персонажей (по имени, дате создания, размеру чата). - -* Панели настроек слева и справа автоматически скрываются, если щёлкнуть за их пределы. -* При нажатии на значок замка навигационная панель будет закреплена на экране, и эта настройка сохранится между сессиями -* Сам статус панели (открыта или закрыта) также сохраняется между сессиями - -* Кастомизируемый интерфейс чата: - * Настройте звук при получении нового ответа - * Переключайтесь между круглыми и прямоугольными аватарками - * Увеличенное вширь окно чата для стационарных ПК - * Возможность включать полупрозрачные панели, стилизованные под стекло - * Настраиваемые цвета для обычного текста, курсива, цитат - * Настраиваемый цвет фона и интенсивность размытия - -# ⌛ Установка - -> **Внимание!** -> * НЕ УСТАНАВЛИВАЙТЕ В ПАПКИ, КОТОРЫЕ КОНТРОЛИРУЕТ WINDOWS (Program Files, System32 и т.п.). -> * НЕ ЗАПУСКАЙТЕ START.BAT С ПРАВАМИ АДМИНИСТРАТОРА -> * УСТАНОВКА НА WINDOWS 7 НЕВОЗМОЖНА ИЗ-ЗА ОТСУТСТВИЯ NODEJS 18.16 - -## 🪟 Windows - -## Установка через Git - 1. Установите [NodeJS](https://nodejs.org/en) (рекомендуется последняя LTS-версия) - 2. Установите [Git for Windows](https://gitforwindows.org/) - 3. Откройте Проводник (`Win+E`) - 4. Перейдите в папку, которую не контролирует Windows, или создайте её. (пример: C:\MySpecialFolder\) - 5. Откройте командную строку. Для этого нажмите на адресную строку (сверху), введите `cmd` и нажмите Enter. - 6. Когда появится чёрное окошко (командная строка), введите ОДНУ из перечисленных ниже команд: - -- для ветки release: `git clone https://github.com/SillyTavern/SillyTavern -b release` -- для ветки staging: `git clone https://github.com/SillyTavern/SillyTavern -b staging` - - 7. Когда клонирование закончится, дважды щёлкните по `Start.bat`, чтобы установить зависимости для NodeJS. - 8. После этого сервер запустится, и SillyTavern откроется в вашем браузере. - -## Установка с помощью SillyTavern Launcher - 1. Установите [Git for Windows](https://gitforwindows.org/) - 2. Откройте Проводник (`Win+E`) и создайте или выберите папку, в которую будет установлен лаунчер - 3. Откройте командную строку. Для этого нажмите на адресную строку (сверху), введите `cmd` и нажмите Enter. - 4. Когда появится чёрное окошко, введите следующую команду: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git` - 5. Дважды щёлкните по `installer.bat` и выберите, что именно хотите установить - 6. После завершения установки дважды щёлкните по `launcher.bat` - -## Установка с помощью GitHub Desktop -(Тут речь про git **только** в рамках GitHub Desktop, если хотите использовать `git` в командной строке, вам также понадобится [Git for Windows](https://gitforwindows.org/)) - 1. Установите [NodeJS](https://nodejs.org/en) (latest LTS version is recommended) - 2. Установите [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32) - 3. После завершения установки GitHub Desktop, нажмите `Clone a repository from the internet....` (обратите внимание: для этого шага **НЕ требуется** аккаунт на GitHub) - 4. В меню перейдите на вкладку URL, введите адрес `https://github.com/SillyTavern/SillyTavern`, и нажмите Clone. В поле Local path можно изменить директорию, в которую будет загружена SillyTavern. - 6. Чтобы запустить SillyTavern, откройте Проводник и перейдите в выбранную на предыдущем шаге папку. По умолчанию репозиторий будет склонирован сюда: `C:\Users\[Имя пользователя]\Documents\GitHub\SillyTavern` - 7. Дважды щёлкните по файлу `start.bat`. (обратите внимание: окончание `.bat` может быть скрыто настройками вашей ОС. Таким образом, имя файла будет выглядеть как "`Start`". Дважды щёлкните по нему, чтобы запустить SillyTavern) - 8. После того, как вы дважды щёлкнули по файлу, должно открыться чёрное окошко, и SillyTavern начнёт устанавливать свои зависимости. - 9. Если установка прошла успешно, то в командной строке будет вот такое, а в браузере откроется вкладка с SillyTavern: - 10. Подключайтесь к любому из [поддерживаемых API](https://docs.sillytavern.app/usage/api-connections/) и начинайте переписку! - -## 🐧 Linux и 🍎 MacOS - -В MacOS и Linux всё это делается через Терминал. - -1. Установите git и nodeJS (как именно - зависит от вашей ОС) -2. Клонируйте репозиторий - -- для ветки release: `git clone https://github.com/SillyTavern/SillyTavern -b release` -- для ветки staging: `git clone https://github.com/SillyTavern/SillyTavern -b staging` - -3. Перейдите в папку установки с помощью `cd SillyTavern`. -4. Запустите скрипт `start.sh` с помощью одной из команд: - -- `./start.sh` -- `bash start.sh` - -## Установка с помощью SillyTavern Launcher - -### Для пользователей Linux -1. Откройте любимый терминал и установите git -2. Загрузите Sillytavern Launcher с помощью команды: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git` -3. Перейдите в SillyTavern-Launcher: `cd SillyTavern-Launcher` -4. Запустите лаунчер установки: `chmod +x install.sh && ./install.sh`, затем выберите, что конкретно хотите установить -5. После завершения установки, запустите лаунчер следующей командой: `chmod +x launcher.sh && ./launcher.sh` - -### Для пользователей Mac -1. Откройте терминал и установите brew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"` -2. Затем установите git: `brew install git` -3. Загрузите Sillytavern Launcher: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git` -4. Перейдите в SillyTavern-Launcher: `cd SillyTavern-Launcher` -5. Запустите лаунчер установки: `chmod +x install.sh && ./install.sh` and choose what you wanna install -6. После завершения установки, запустите лаунчер следующей командой: `chmod +x launcher.sh && ./launcher.sh` - -## 📱 Мобильные устройства - Установка при помощи termux - -> **ОБРАТИТЕ ВНИМАНИЕ!** -> -> **На Android-телефонах SillyTavern можно запускать нативно посредством Termux. Обратитесь к гайду, написанному ArroganceComplex#2659:** -> -> * - - -## Управление ключами от API - -SillyTavern сохраняет ключи от ваших API в файле `secrets.json` в папке на сервере. - -По умолчанию, ключи не будут отображаться на фронте после их ввода и перезагрузки страницы. - -Чтобы включить возможность отображения ключей путём нажатия кнопки в блоке API: - -1. Зайдите в файл `config.yaml` и установите `allowKeysExposure` в положение `true`. -2. Перезапустите сервер SillyTavern. - -## Удалённое подключение - -В основном этим пользуются тогда, когда хотят использовать SillyTavern с телефона, запустив сервер SillyTavern на стационарном ПК в той же Wi-Fi-сети. - -Однако это позволит подключаться откуда угодно, а не только вам. - -**ВАЖНО: в SillyTavern не предусмотрена возможность использования программы несколькими людьми. Поэтому любой, кто подключится к вашему серверу, получит доступ ко всем вашим персонажам и чатам, а также сможет менять настройки через UI.** - -### 1. Заведение "белого списка" IP-адресов - -* Создайте в корневой папке SillyTavern файл с названием `whitelist.txt`. -* Откройте файл в текстовом редакторе и внесите список IP-адресов, с которых хотите разрешить подключение. - -*Принимаются как обычные IP-адреса, так и целые диапазоны, размеченные с помощью астериска. Примеры:* - -```txt -192.168.0.1 -192.168.0.20 -``` - -или - -```txt -192.168.0.* -``` - -(диапазон из примера сверху позволит подключаться всем устройствам в локальной сети) - -Также принимаются маски CIDR (вида 10.0.0.0/24). - -* Сохраните файл `whitelist.txt`. -* Перезапустите сервер ST. - -После этого устройства из белого списка смогут подключаться к вашему серверу. - -*Обратите внимание: в файле `config.yaml` также имеется массив `whitelist`, который работает по тому же принципу. Однако если существует файл `whitelist.txt`, то этот массив игнорируется.* - -### 2. Получение IP хост-машины с ST - -После настройки белого списка адресов, следующим шагом будет получение IP-адреса хост-машины, на которой запущена SillyTavern. - -Если хост-машина находится в той же Wi-Fi-сети, то можно воспользоваться её внутренним Wi-Fi-IP-адресом: - -* На Windows: нажмите Пуск > введите `cmd.exe` в поиске > в консоли введите команду `ipconfig` и нажмите Enter > найдите пункт `IPv4-адрес`. - -Если вы (или кто-то другой) хотите подключаться к хост-машине из другой сети, то вам понадобится ваш публичный IP-адрес. - -* Откройте [эту страницу](https://whatismyipaddress.com/) с вашей хост-машины и найдите пункт `IPv4`. На этот адрес и будет подключаться удалённое устройство. - -### 3. Соединить удалённое устройство с хост-машиной ST - -Какой бы IP-адрес вы ни выбрали, вам нужно будет вводить его в адресной строке браузера вашего удалённого устройства. - -Обычный адрес хост-машины, находящейся в той же Wi-Fi-сети, выглядит примерно так: - -`http://192.168.0.5:8000` - -НЕ используйте https:// -Только http:// - -### Открытие доступа до ST для всех IP-адресов - -Мы не рекомендуем так делать, но вы можете открыть файл `config.yaml` и изменить `whitelistMode` на `false`. - -Обязательно нужно удалить (или переименовать) файл `whitelist.txt`, если такой файл есть в корневой директории SillyTavern. - -Эта практика считается небезопасной, поэтому, если вы решите так сделать, мы попросим вас установить логин и пароль. - -Оба этих параметра настраиваются в `config.yaml` (username и password). - -Останется только перезапустить сервер ST, и после этого к вам сможет подключиться любой пользователь вне зависимости от IP-адреса его устройства. Главное, чтобы он знал логин и пароль. - -### Не получается соединиться? - -* Создайте входящее/исходящее правило в вашем фаерволле для порта, указанного в `config.yaml`. НЕ ПУТАЙТЕ этот процесс с пробросом портов на роутере. Если по ошибке перепутаете, то на ваш сервер сможет забраться посторонний человек и украсть ваши логи, этого следует избегать. -* Переключите Сетевой профиль на значение "Частные". Для этого зайдите в Параметры > Сеть и Интернет > Ethernet. КРАЙНЕ важно для Windows 11, без этого не получится подключиться даже с правилом фаервола. - -## Проблемы с производительностью? - -Попробуйте включить опцию "Отключить эффект размытия" в меню "Пользовательские настройки". - -## Нравится ваш проект! Как помочь? - -### ЧТО ДЕЛАТЬ - -1. Присылайте пулл реквесты -2. Присылайте идеи и баг-репорты, оформленные по установленным шаблонам -3. Прежде чем задавать вопросы, прочтите readme и документацию - -### ЧЕГО НЕ ДЕЛАТЬ - -1. Предлагать донаты -2. Присылать баг-репорты безо всякого контекста -3. Задавать вопросы, на которые уже отвечали - -## Где найти старые фоны? - -Мы двигаемся в сторону 100% уникальности всего используемого контента, поэтому старые фоны были убраны из репозитория. - -Они отправлены в архив, скачать их можно здесь: - - - - - - -## Авторы и лицензии - -**Мы надеемся, что эта программа принесёт людям пользу, -но мы не даём НИКАКИХ ГАРАНТИЙ; мы ни в коем случае не гарантируем того, -что программа СООТВЕТСТВУЕТ КАКИМ-ЛИБО КРИТЕРИЯМ или ПРИГОДНА ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ. -Подробнее можно узнать в GNU Affero General Public License.** - -* Базовая TAI от Humi: Лицензия неизвестна -* Модификации от Cohee и производная кодовая база: AGPL v3 -* Дополнения RossAscends: AGPL v3 -* Кусочки TavernAITurbo мода от CncAnon: Лицензия неизвестна -* Различные коммиты и предложения от kingbri () -* Расширения и внедрение разного рода удобств - city_unit () -* Различные коммиты и баг-репорты от StefanDanielSchwarz () -* Режим Вайфу вдохновлён работой PepperTaco () -* Благодарность Pygmalion University за прекрасную работу по тестированию и за все предлагаемые крутые фичи! -* Благодарность oobabooga за компиляцию пресетов для TextGen -* Пресеты для KoboldAI из KAI Lite: -* Шрифт Noto Sans от Google (OFL license) -* Тема Font Awesome (Иконки: CC BY 4.0, Шрифты: SIL OFL 1.1, Код: MIT License) -* Клиентская библиотека для AI Horde от ZeldaFan0225: -* Пусковой скрипт для Linux от AlpinDale -* Благодарность paniphons за оформление документа с FAQ -* Фон в честь 10 тысяч пользователей в Discord от @kallmeflocc -* Стандартный контент (персонажи и лорбуки) предоставлен пользователями @OtisAlejandro, @RossAscends и @kallmeflocc -* Корейский перевод от @doloroushyeonse -* Поддержка k_euler_a для Horde от -* Китайский перевод от [@XXpE3](https://github.com/XXpE3), 中文 ISSUES 可以联系 @XXpE3 - - -[back-to-top]: https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square -[cover]: https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4 -[discord-link]: https://discord.gg/sillytavern -[discord-shield]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square -[discord-shield-badge]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge +> [!IMPORTANT] +> Приведенная здесь информация может быть устаревшей или неполной и предоставляется только для вашего удобства. Пожалуйста, используйте английскую версию для получения наиболее актуальной информации. + + + +![][cover] + +
+ +[English](readme.md) | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | Русский + +[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers) +[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network) +[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues) +[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls) + +
+ +--- + +Мобайл-френдли интерфейс, поддержка множества API (KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale), ВН-образный режим Вайфу, Stable Diffusion, TTS, поддержка миров (лорбуков), кастомизируемый UI, автоперевод, тончайшая настройка промптов + возможность устанавливать расширения. + +Основано на форке [TavernAI](https://github.com/TavernAI/TavernAI) версии 1.2.8 + +## Важные новости! + +1. Чтобы помочь вам быстрее разобраться в SillyTavern, мы создали [сайт с документацией](https://docs.sillytavern.app/). Ответы на большинство вопросов можно найти там. + +2. Почему пропали расширения после апдейта? Начиная с версии 1.10.6, большинство встроенных расширений были конвертированы в формат загружаемых аддонов. Их можно установить обратно через меню "Download Extensions and Assets" на панели расширений (значок с тремя кубиками сверху). + +3. Не поддерживается следующая платформа: android arm LEtime-web. 32-битный Android требует внешнюю зависимость, которую нельзя установить посредством npm. Для её установки потребуется следующая команда: `pkg install esbuild`. После этого продолжайте установку по общей инструкции. + +### Разрабатывается Cohee, RossAscends и всем сообществом SillyTavern + +### Что такое SillyTavern и TavernAI? + +SillyTavern — это интерфейс, который устанавливается на ПК (и на Android), который даёт возможность общаться с генеративным ИИ и чатиться/ролеплеить с вашими собственными персонажами или персонажами других пользователей. + +SillyTavern — это форк версии TavernAI 1.2.8, который разрабатывается более активно и имеет множество новых функций. Сейчас уже можно сказать, что это две отдельные и абсолютно самостоятельные программы. + +## Скриншоты + +image +image + +### Ветки + +SillyTavern разрабатывается в двух ветках, чтобы всем категориям пользователей было удобно. + +* release -🌟 **Рекомендовано для большинства пользователей.** Самая стабильная ветка, рекомендуем именно её. Обновляется только в момент крупных релизов. Подходит для большей части пользователей. +* staging - ⚠️ **Не рекомендуется для повседневного использования.** В этой ветке весь самый свежий и новый функционал, но будьте аккуратны, поскольку сломаться может в любом месте и в любое время. Только для продвинутых пользователей и энтузиастов. + +Если вы не умеете обращаться с git через командную строку, или не знаете, что такое ветка, то не переживайте! Наилучшим вариантом всегда остаётся ветка release. + +### Что ещё нужно, кроме SillyTavern? + +Сама по себе SillyTavern бесполезна, ведь это просто интерфейс. Вам потребуется доступ к бэкенду с ИИ, который и будет отыгрывать выбранного вами персонажа. Поддерживаются разные виды бэкендов: OpenAPI API (GPT), KoboldAI (локально или на Google Colab), и многое другое. Больше информации в [FAQ](https://docs.sillytavern.app/usage/faq/). + +### Требуется ли для SillyTavern мощный ПК? + +SillyTavern — это просто интерфейс, поэтому запустить его можно на любой картошке. Мощным должен быть бэкенд с ИИ. + +## Есть вопросы или предложения? + +### У нас появился сервер в Discord + +| [![][discord-shield-badge]][discord-link] | [Вступайте в наше Discord-сообщество!](https://discord.gg/sillytavern) Задавайте вопросы, делитесь любимыми персонажами и промптами. | +| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------- | + +Также можно написать разработчикам напрямую: + +* Discord: cohee или rossascends +* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/) или [/u/sillylossy](https://www.reddit.com/user/sillylossy/) +* [Запостить issue на GitHub](https://github.com/SillyTavern/SillyTavern/issues) + +## Эта версия включает + +* Глубоко переработанную TavernAI 1.2.8 (переписано и оптимизировано более 50% кода) +* Свайпы +* Групповые чаты: комнаты для нескольких ботов, где персонажи могут говорить друг с другом и с вами +* Чекпоинты и ветки для чатов +* Продвинутые настройки для KoboldAI / TextGen со множеством созданных сообществом пресетов +* Поддержка миров (функция "Информация о мире" / WorldInfo): создавайте свой богатый лор, или экономьте токены для карточек персонажей +* Соединение через [OpenRouter](https://openrouter.ai) для разных API (Claude, GPT-4/3.5 и других) +* Соединение с API [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui) +* Соединение с [AI Horde](https://aihorde.net/) +* Настройку форматирования промптов + +## Расширения + +SillyTavern поддерживает расширения. + +* Эмоции для персонажей (спрайты) +* Автоматический саммарайз (краткий пересказ) истории чата +* Возможность отправить в чат картинку, которую ИИ сможет рассмотреть и понять +* Генерация картинок в Stable Diffusion (5 пресетов для чата, плюс свободный режим) +* Text-to-speech для сообщений ИИ (с помощью ElevenLabs, Silero, или родной TTS вашей ОС) + +Полный список расширений и инструкций к ним можно найти в [документации](https://docs.sillytavern.app/). + +## Улучшения от RossAscends для UI/CSS/общего удобства + +* Мобильный интерфейс адаптирован для iOS, добавлена возможность сохранить ярлык на главный экран и открыть приложение в полноэкранном режиме. +* Горячие клавиши + * Up = Редактировать последнее сообщение в чате + * Ctrl+Up = Редактировать ВАШЕ последнее сообщение в чате + * Left = свайп влево + * Right = свайп вправо (ОБРАТИТЕ ВНИМАНИЕ: когда в окне ввода что-то напечатано, клавиши для свайпа не работают) + * Ctrl+Left = посмотреть локальные переменные (в консоли браузера) + * Enter (при нахождении внутри окна ввода) = отправить ваше сообщение ИИ + * Ctrl+Enter = Повторная генерация последнего ответа ИИ + +* Страница больше не перезагружается при смене имени пользователя или удалении персонажа + +* Отключаемая возможность автоматически соединяться с API при загрузке страницы. +* Отключаемая возможность автоматически загружать последнего открытого персонажа при загрузке страницы. +* Улучшенный счётчик токенов - работает с несохранёнными персонажами, отображает и перманентные, и временные токены + +* Улучшенный менеджер чатов + * Файлы с новыми чатами получают читабельные названия вида "(персонаж) - (когда создано)" + * Увеличен размер превью чата с 40 символов до 300. + * Несколько вариантов сортировки списка персонажей (по имени, дате создания, размеру чата). + +* Панели настроек слева и справа автоматически скрываются, если щёлкнуть за их пределы. +* При нажатии на значок замка навигационная панель будет закреплена на экране, и эта настройка сохранится между сессиями +* Сам статус панели (открыта или закрыта) также сохраняется между сессиями + +* Кастомизируемый интерфейс чата: + * Настройте звук при получении нового ответа + * Переключайтесь между круглыми и прямоугольными аватарками + * Увеличенное вширь окно чата для стационарных ПК + * Возможность включать полупрозрачные панели, стилизованные под стекло + * Настраиваемые цвета для обычного текста, курсива, цитат + * Настраиваемый цвет фона и интенсивность размытия + +# ⌛ Установка + +> **Внимание!** +> * НЕ УСТАНАВЛИВАЙТЕ В ПАПКИ, КОТОРЫЕ КОНТРОЛИРУЕТ WINDOWS (Program Files, System32 и т.п.). +> * НЕ ЗАПУСКАЙТЕ START.BAT С ПРАВАМИ АДМИНИСТРАТОРА +> * УСТАНОВКА НА WINDOWS 7 НЕВОЗМОЖНА ИЗ-ЗА ОТСУТСТВИЯ NODEJS 18.16 + +## 🪟 Windows + +## Установка через Git + 1. Установите [NodeJS](https://nodejs.org/en) (рекомендуется последняя LTS-версия) + 2. Установите [Git for Windows](https://gitforwindows.org/) + 3. Откройте Проводник (`Win+E`) + 4. Перейдите в папку, которую не контролирует Windows, или создайте её. (пример: C:\MySpecialFolder\) + 5. Откройте командную строку. Для этого нажмите на адресную строку (сверху), введите `cmd` и нажмите Enter. + 6. Когда появится чёрное окошко (командная строка), введите ОДНУ из перечисленных ниже команд: + +- для ветки release: `git clone https://github.com/SillyTavern/SillyTavern -b release` +- для ветки staging: `git clone https://github.com/SillyTavern/SillyTavern -b staging` + + 7. Когда клонирование закончится, дважды щёлкните по `Start.bat`, чтобы установить зависимости для NodeJS. + 8. После этого сервер запустится, и SillyTavern откроется в вашем браузере. + +## Установка с помощью SillyTavern Launcher + 1. Установите [Git for Windows](https://gitforwindows.org/) + 2. Откройте Проводник (`Win+E`) и создайте или выберите папку, в которую будет установлен лаунчер + 3. Откройте командную строку. Для этого нажмите на адресную строку (сверху), введите `cmd` и нажмите Enter. + 4. Когда появится чёрное окошко, введите следующую команду: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git` + 5. Дважды щёлкните по `installer.bat` и выберите, что именно хотите установить + 6. После завершения установки дважды щёлкните по `launcher.bat` + +## Установка с помощью GitHub Desktop +(Тут речь про git **только** в рамках GitHub Desktop, если хотите использовать `git` в командной строке, вам также понадобится [Git for Windows](https://gitforwindows.org/)) + 1. Установите [NodeJS](https://nodejs.org/en) (latest LTS version is recommended) + 2. Установите [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32) + 3. После завершения установки GitHub Desktop, нажмите `Clone a repository from the internet....` (обратите внимание: для этого шага **НЕ требуется** аккаунт на GitHub) + 4. В меню перейдите на вкладку URL, введите адрес `https://github.com/SillyTavern/SillyTavern`, и нажмите Clone. В поле Local path можно изменить директорию, в которую будет загружена SillyTavern. + 6. Чтобы запустить SillyTavern, откройте Проводник и перейдите в выбранную на предыдущем шаге папку. По умолчанию репозиторий будет склонирован сюда: `C:\Users\[Имя пользователя]\Documents\GitHub\SillyTavern` + 7. Дважды щёлкните по файлу `start.bat`. (обратите внимание: окончание `.bat` может быть скрыто настройками вашей ОС. Таким образом, имя файла будет выглядеть как "`Start`". Дважды щёлкните по нему, чтобы запустить SillyTavern) + 8. После того, как вы дважды щёлкнули по файлу, должно открыться чёрное окошко, и SillyTavern начнёт устанавливать свои зависимости. + 9. Если установка прошла успешно, то в командной строке будет вот такое, а в браузере откроется вкладка с SillyTavern: + 10. Подключайтесь к любому из [поддерживаемых API](https://docs.sillytavern.app/usage/api-connections/) и начинайте переписку! + +## 🐧 Linux и 🍎 MacOS + +В MacOS и Linux всё это делается через Терминал. + +1. Установите git и nodeJS (как именно - зависит от вашей ОС) +2. Клонируйте репозиторий + +- для ветки release: `git clone https://github.com/SillyTavern/SillyTavern -b release` +- для ветки staging: `git clone https://github.com/SillyTavern/SillyTavern -b staging` + +3. Перейдите в папку установки с помощью `cd SillyTavern`. +4. Запустите скрипт `start.sh` с помощью одной из команд: + +- `./start.sh` +- `bash start.sh` + +## Установка с помощью SillyTavern Launcher + +### Для пользователей Linux +1. Откройте любимый терминал и установите git +2. Загрузите Sillytavern Launcher с помощью команды: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git` +3. Перейдите в SillyTavern-Launcher: `cd SillyTavern-Launcher` +4. Запустите лаунчер установки: `chmod +x install.sh && ./install.sh`, затем выберите, что конкретно хотите установить +5. После завершения установки, запустите лаунчер следующей командой: `chmod +x launcher.sh && ./launcher.sh` + +### Для пользователей Mac +1. Откройте терминал и установите brew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"` +2. Затем установите git: `brew install git` +3. Загрузите Sillytavern Launcher: `git clone https://github.com/SillyTavern/SillyTavern-Launcher.git` +4. Перейдите в SillyTavern-Launcher: `cd SillyTavern-Launcher` +5. Запустите лаунчер установки: `chmod +x install.sh && ./install.sh` and choose what you wanna install +6. После завершения установки, запустите лаунчер следующей командой: `chmod +x launcher.sh && ./launcher.sh` + +## 📱 Мобильные устройства - Установка при помощи termux + +> **ОБРАТИТЕ ВНИМАНИЕ!** +> +> **На Android-телефонах SillyTavern можно запускать нативно посредством Termux. Обратитесь к гайду, написанному ArroganceComplex#2659:** +> +> * + + +## Управление ключами от API + +SillyTavern сохраняет ключи от ваших API в файле `secrets.json` в папке на сервере. + +По умолчанию, ключи не будут отображаться на фронте после их ввода и перезагрузки страницы. + +Чтобы включить возможность отображения ключей путём нажатия кнопки в блоке API: + +1. Зайдите в файл `config.yaml` и установите `allowKeysExposure` в положение `true`. +2. Перезапустите сервер SillyTavern. + +## Удалённое подключение + +В основном этим пользуются тогда, когда хотят использовать SillyTavern с телефона, запустив сервер SillyTavern на стационарном ПК в той же Wi-Fi-сети. + +Однако это позволит подключаться откуда угодно, а не только вам. + +**ВАЖНО: в SillyTavern не предусмотрена возможность использования программы несколькими людьми. Поэтому любой, кто подключится к вашему серверу, получит доступ ко всем вашим персонажам и чатам, а также сможет менять настройки через UI.** + +### 1. Заведение "белого списка" IP-адресов + +* Создайте в корневой папке SillyTavern файл с названием `whitelist.txt`. +* Откройте файл в текстовом редакторе и внесите список IP-адресов, с которых хотите разрешить подключение. + +*Принимаются как обычные IP-адреса, так и целые диапазоны, размеченные с помощью астериска. Примеры:* + +```txt +192.168.0.1 +192.168.0.20 +``` + +или + +```txt +192.168.0.* +``` + +(диапазон из примера сверху позволит подключаться всем устройствам в локальной сети) + +Также принимаются маски CIDR (вида 10.0.0.0/24). + +* Сохраните файл `whitelist.txt`. +* Перезапустите сервер ST. + +После этого устройства из белого списка смогут подключаться к вашему серверу. + +*Обратите внимание: в файле `config.yaml` также имеется массив `whitelist`, который работает по тому же принципу. Однако если существует файл `whitelist.txt`, то этот массив игнорируется.* + +### 2. Получение IP хост-машины с ST + +После настройки белого списка адресов, следующим шагом будет получение IP-адреса хост-машины, на которой запущена SillyTavern. + +Если хост-машина находится в той же Wi-Fi-сети, то можно воспользоваться её внутренним Wi-Fi-IP-адресом: + +* На Windows: нажмите Пуск > введите `cmd.exe` в поиске > в консоли введите команду `ipconfig` и нажмите Enter > найдите пункт `IPv4-адрес`. + +Если вы (или кто-то другой) хотите подключаться к хост-машине из другой сети, то вам понадобится ваш публичный IP-адрес. + +* Откройте [эту страницу](https://whatismyipaddress.com/) с вашей хост-машины и найдите пункт `IPv4`. На этот адрес и будет подключаться удалённое устройство. + +### 3. Соединить удалённое устройство с хост-машиной ST + +Какой бы IP-адрес вы ни выбрали, вам нужно будет вводить его в адресной строке браузера вашего удалённого устройства. + +Обычный адрес хост-машины, находящейся в той же Wi-Fi-сети, выглядит примерно так: + +`http://192.168.0.5:8000` + +НЕ используйте https:// +Только http:// + +### Открытие доступа до ST для всех IP-адресов + +Мы не рекомендуем так делать, но вы можете открыть файл `config.yaml` и изменить `whitelistMode` на `false`. + +Обязательно нужно удалить (или переименовать) файл `whitelist.txt`, если такой файл есть в корневой директории SillyTavern. + +Эта практика считается небезопасной, поэтому, если вы решите так сделать, мы попросим вас установить логин и пароль. + +Оба этих параметра настраиваются в `config.yaml` (username и password). + +Останется только перезапустить сервер ST, и после этого к вам сможет подключиться любой пользователь вне зависимости от IP-адреса его устройства. Главное, чтобы он знал логин и пароль. + +### Не получается соединиться? + +* Создайте входящее/исходящее правило в вашем фаерволле для порта, указанного в `config.yaml`. НЕ ПУТАЙТЕ этот процесс с пробросом портов на роутере. Если по ошибке перепутаете, то на ваш сервер сможет забраться посторонний человек и украсть ваши логи, этого следует избегать. +* Переключите Сетевой профиль на значение "Частные". Для этого зайдите в Параметры > Сеть и Интернет > Ethernet. КРАЙНЕ важно для Windows 11, без этого не получится подключиться даже с правилом фаервола. + +## Проблемы с производительностью? + +Попробуйте включить опцию "Отключить эффект размытия" в меню "Пользовательские настройки". + +## Нравится ваш проект! Как помочь? + +### ЧТО ДЕЛАТЬ + +1. Присылайте пулл реквесты +2. Присылайте идеи и баг-репорты, оформленные по установленным шаблонам +3. Прежде чем задавать вопросы, прочтите readme и документацию + +### ЧЕГО НЕ ДЕЛАТЬ + +1. Предлагать донаты +2. Присылать баг-репорты безо всякого контекста +3. Задавать вопросы, на которые уже отвечали + +## Где найти старые фоны? + +Мы двигаемся в сторону 100% уникальности всего используемого контента, поэтому старые фоны были убраны из репозитория. + +Они отправлены в архив, скачать их можно здесь: + + + + + + +## Авторы и лицензии + +**Мы надеемся, что эта программа принесёт людям пользу, +но мы не даём НИКАКИХ ГАРАНТИЙ; мы ни в коем случае не гарантируем того, +что программа СООТВЕТСТВУЕТ КАКИМ-ЛИБО КРИТЕРИЯМ или ПРИГОДНА ДЛЯ КАКОЙ-ЛИБО ЦЕЛИ. +Подробнее можно узнать в GNU Affero General Public License.** + +* Базовая TAI от Humi: Лицензия неизвестна +* Модификации от Cohee и производная кодовая база: AGPL v3 +* Дополнения RossAscends: AGPL v3 +* Кусочки TavernAITurbo мода от CncAnon: Лицензия неизвестна +* Различные коммиты и предложения от kingbri () +* Расширения и внедрение разного рода удобств - city_unit () +* Различные коммиты и баг-репорты от StefanDanielSchwarz () +* Режим Вайфу вдохновлён работой PepperTaco () +* Благодарность Pygmalion University за прекрасную работу по тестированию и за все предлагаемые крутые фичи! +* Благодарность oobabooga за компиляцию пресетов для TextGen +* Пресеты для KoboldAI из KAI Lite: +* Шрифт Noto Sans от Google (OFL license) +* Тема Font Awesome (Иконки: CC BY 4.0, Шрифты: SIL OFL 1.1, Код: MIT License) +* Клиентская библиотека для AI Horde от ZeldaFan0225: +* Пусковой скрипт для Linux от AlpinDale +* Благодарность paniphons за оформление документа с FAQ +* Фон в честь 10 тысяч пользователей в Discord от @kallmeflocc +* Стандартный контент (персонажи и лорбуки) предоставлен пользователями @OtisAlejandro, @RossAscends и @kallmeflocc +* Корейский перевод от @doloroushyeonse +* Поддержка k_euler_a для Horde от +* Китайский перевод от [@XXpE3](https://github.com/XXpE3), 中文 ISSUES 可以联系 @XXpE3 + + +[back-to-top]: https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square +[cover]: https://github.com/user-attachments/assets/01a6ae9a-16aa-45f2-8bff-32b5dc587e44 +[discord-link]: https://discord.gg/sillytavern +[discord-shield]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square +[discord-shield-badge]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge diff --git a/.github/readme-zh_cn.md b/.github/readme-zh_cn.md index 0d910978b..a2f3a3623 100644 --- a/.github/readme-zh_cn.md +++ b/.github/readme-zh_cn.md @@ -1,6 +1,20 @@ +> [!IMPORTANT] +> 这里的信息可能已经过时或不完整，仅供您参考。请使用英文版本获取最新信息。 + +![][cover] + +
+ [English](readme.md) | 中文 | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md) -![image](https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4) +[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers) +[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network) +[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues) +[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls) + +
+ +--- 移动设备界面友好，多种人工智能服务或模型支持（KoboldAI/CPP, Horde, NovelAI, Ooba, OpenAI, OpenRouter, Claude, Scale），类似 Galgame 的 老 婆 模 式，Horde SD，文本系统语音生成，世界信息（Lorebooks），可定制的界面，自动翻译，和比你所需要的更多的 Prompt。附带扩展服务，支持文本绘画生成与语音生成和基于向量数据库 的聊天信息总结。 @@ -67,15 +81,14 @@ SillyTavern 本身并无用处，因为它只是一个用户聊天界面。你 * 支持世界信息（Lorebooks）：创建丰富的传说 * 支持 Window AI 浏览器扩展（运行 Claude、GPT 4 等模型）： * [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui) API 连接 -* 连接 [AI Horde](https://horde.koboldai.net/) +* 连接 [AI Horde](https://aihorde.net/) * Prompt 生成格式调整 * Webp 角色卡支持（PNG 仍是内部格式） ## 扩展 -SillyTavern 支持扩展服务，一些额外的人工智能模块可通过 [SillyTavern Extras API](https://github.com/SillyTavern/SillyTavern-extras) 提供。 +SillyTavern 支持扩展服务。 -* 作者注释/角色偏见 * 角色情绪识别 * 聊天记录自动摘要 * 在聊天窗口发送图片，并由人工智能解释图片内容 @@ -276,8 +289,8 @@ SillyTavern 会将 API 密钥保存在目录中的 `secrets.json` 文件内。 ## 屏幕截图 -image -image +image +image ## 许可证和贡献 @@ -304,3 +317,6 @@ SillyTavern 会将 API 密钥保存在目录中的 `secrets.json` 文件内。 * Default content (characters and lore books) provided by @OtisAlejandro, @RossAscends and @kallmeflocc * Korean translation by @doloroushyeonse * 中文翻译由 [@XXpE3](https://github.com/XXpE3) 完成，中文 ISSUES 可以联系 @XXpE3 + + +[cover]: https://github.com/user-attachments/assets/01a6ae9a-16aa-45f2-8bff-32b5dc587e44 diff --git a/.github/readme.md b/.github/readme.md index 6efee8a74..d6698bc4f 100644 --- a/.github/readme.md +++ b/.github/readme.md @@ -1,160 +1,147 @@ -English | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md) - ![][cover] -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](https://github.com/TavernAI/TavernAI) 1.2.8 +English | [中文](readme-zh_cn.md) | [日本語](readme-ja_jp.md) | [Русский](readme-ru_ru.md) -## Important news! +[![GitHub Stars](https://img.shields.io/github/stars/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/stargazers) +[![GitHub Forks](https://img.shields.io/github/forks/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/network) +[![GitHub Issues](https://img.shields.io/github/issues/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/issues) +[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SillyTavern/SillyTavern.svg)](https://github.com/SillyTavern/SillyTavern/pulls) -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). +--- -3. Unsupported platform: android arm LEtime-web. 32-bit Android requires an external dependency that can't be installed with npm. Use the following command to install it: `pkg install esbuild`. Then run the usual installation steps. +SillyTavern provides a single unified interface for many LLM APIs (KoboldAI/CPP, Horde, NovelAI, Ooba, Tabby, OpenAI, OpenRouter, Claude, Mistral and more), a mobile-friendly layout, Visual Novel Mode, Automatic1111 & ComfyUI API image generation integration, TTS, WorldInfo (lorebooks), customizable UI, auto-translate, more prompt options than you'd ever want or need, and endless growth potential via third-party extensions. -### Brought to you by Cohee, RossAscends, and the SillyTavern community +We have a [Documentation website](https://docs.sillytavern.app/) to answer most of your questions and help you get started. -### What is SillyTavern or TavernAI? +## What is SillyTavern? -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. +SillyTavern (or ST for short) is a locally installed user interface that allows you to interact with text generation LLMs, image generation engines, and TTS voice models. -SillyTavern is a fork of TavernAI 1.2.8 which is under more active development and has added many major features. At this point, they can be thought of as completely independent programs. +Beginning in February 2023 as a fork of TavernAI 1.2.8, SillyTavern now has over 100 contributors and 2 years of independent development under its belt, and continues to serve as a leading software for savvy AI hobbyists. -## Screenshots +## Our Vision -image -image +1. We aim to empower users with as much utility and control over their LLM prompts as possible. The steep learning curve is part of the fun! +2. We do not provide any online or hosted services, nor programmatically track any user data. +3. SillyTavern is a passion project brought to you by a dedicated community of LLM enthusiasts, and will always be free and open sourced. -### Branches +## Branches SillyTavern is being developed using a two-branch system to ensure a smooth experience for all users. -* release -🌟 **Recommended for most users.** This is the most stable and recommended branch, updated only when major releases are pushed. It's suitable for the majority of users. -* staging - ⚠️ **Not recommended for casual use.** This branch has the latest features, but be cautious as it may break at any time. Only for power users and enthusiasts. +* `release` -🌟 **Recommended for most users.** This is the most stable and recommended branch, updated only when major releases are pushed. It's suitable for the majority of users. Typically updated once a month. +* `staging` - ⚠️ **Not recommended for casual use.** This branch has the latest features, but be cautious as it may break at any time. Only for power users and enthusiasts. Updates several times daily. If you're not familiar with using the git CLI or don't understand what a branch is, don't worry! The release branch is always the preferable option for you. -### What do I need other than SillyTavern? +## What do I need other than SillyTavern? -On its own SillyTavern is useless, as it's just a user interface. You have to have access to an AI system backend that can act as the roleplay character. There are various supported backends: OpenAPI API (GPT), KoboldAI (either running locally or on Google Colab), and more. You can read more about this in [the FAQ](https://docs.sillytavern.app/usage/faq/). +Since SillyTavern is only an interface, you will need access to an LLM backend to provide inference. You can use AI Horde for instant out-of-the-box chatting. Aside from that, we support many other local and cloud-based LLM backends: OpenAI-compatible API, KoboldAI, Tabby, and many more. You can read more about our supported APIs in [the FAQ](https://docs.sillytavern.app/usage/api-connections/). ### Do I need a powerful PC to run SillyTavern? -Since SillyTavern is only a user interface, it has tiny hardware requirements, it will run on anything. It's the AI system backend that needs to be powerful. +The hardware requirements are minimal: it will run on anything that can run NodeJS 18 or higher. If you intend to do LLM inference on your local machine, we recommend a 3000-series NVIDIA graphics card with at least 6GB of VRAM. Check your backend's documentation for more details. + +### Suggested Backends (not affiliated) + +* [AI Horde](https://aihorde.net/) - use models hosted by volunteers. Requires no further setup +* [KoboldCpp](https://github.com/LostRuins/koboldcpp) - a community's favorite for running GGUF models locally +* [tabbyAPI](https://github.com/theroyallab/tabbyAPI) - a popular, lightweight, locally-hosted exl2 inference API +* [OpenRouter](https://openrouter.ai) - a single API for many cloud providers (OpenAI, Claude, Meta Llama, etc.) as well as popular community models. ## Questions or suggestions? -### We now have a community Discord server +### Discord server | [![][discord-shield-badge]][discord-link] | [Join our Discord community!](https://discord.gg/sillytavern) Get support, share favorite characters and prompts. | | :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------- | Or get in touch with the developers directly: -* Discord: cohee or rossascends -* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/) or [/u/sillylossy](https://www.reddit.com/user/sillylossy/) +* Discord: cohee, rossascends, wolfsblvt +* Reddit: [/u/RossAscends](https://www.reddit.com/user/RossAscends/), [/u/sillylossy](https://www.reddit.com/user/sillylossy/), [u/Wolfsblvt](https://www.reddit.com/user/Wolfsblvt/) * [Post a GitHub issue](https://github.com/SillyTavern/SillyTavern/issues) -## This version includes +### I like your project! How do I contribute? -* A heavily modified TavernAI 1.2.8 (more than 50% of code rewritten or optimized) -* Swipes -* Group chats: multi-bot rooms for characters to talk to you or each other -* Chat checkpoints / branching -* Advanced KoboldAI / TextGen generation settings with a lot of community-made presets +1. Send pull requests. Learn how to contribute: [CONTRIBUTING.md](../CONTRIBUTING.md) +2. Send feature suggestions and issue reports using the provided templates. +3. Read this entire readme file and check the documentation website first, to avoid sending duplicate issues. + +## Screenshots + +image +image + +## Character Cards + +SillyTavern is built around the concept of "character cards". A character card is a collection of prompts that set the behavior of the LLM and is required to have persistent conversations in SillyTavern. They function similarly to ChatGPT's GPTs or Poe's bots. The content of a character card can be anything: an abstract scenario, an assistant tailored for a specific task, a famous personality or a fictional character. + +The name field is the only required character card input. To start a neutral conversation with the language model, create a new card simply called "Assistant" and leave the rest of the boxes blank. For a more themed chat, you can provide the language model with various background details, behavior and writing patterns, and a scenario to jump start the chat. + +To have a quick conversation without selecting a character card or to just test the LLM connection, simply type your prompt input into the input bar on the Welcome Screen after opening SillyTavern. Please note that such chats are temporary and will not be saved. + +To get a general idea on how to define character cards, see the default character (Seraphina) or download selected community-made cards from the "Download Extensions & Assets" menu. + +## Key Features + +* Advanced text generation settings with many community-made presets * World Info support: create rich lore or save tokens on your character card -* [OpenRouter](https://openrouter.ai) connection for various APIs (Claude, GPT-4/3.5 and more) -* [Oobabooga's TextGen WebUI](https://github.com/oobabooga/text-generation-webui) API connection -* [AI Horde](https://horde.koboldai.net/) connection -* Prompt generation formatting tweaking +* Group chats: multi-bot rooms for characters to talk to you and/or each other +* Rich UI customization options: theme colors, background images, custom CSS, and more +* User personas: let the AI know a bit about you for greater immersion +* Built-in RAG support: add documents to your chats for the AI to reference +* Extensive chat commands subsystem and own [scripting engine](https://docs.sillytavern.app/usage/st-script/) ## Extensions -SillyTavern has extensibility support, with some additional AI modules hosted via [SillyTavern Extras API](https://github.com/SillyTavern/SillyTavern-extras) +SillyTavern has extensibility support. -* Author's Note / Character Bias * Character emotional expressions (sprites) * Auto-Summary of the chat history -* Sending images to chat, and the AI interpreting the content -* Stable Diffusion image generation (5 chat-related presets plus 'free mode') +* Automatic UI and chat translation +* Stable Diffusion/FLUX/DALL-E image generation * Text-to-speech for AI response messages (via ElevenLabs, Silero, or the OS's System TTS) +* Web Search capabilities for adding additional real world context to your prompts +* Many more are available to download from the "Download Extensions & Assets" menu. -A full list of included extensions and tutorials on how to use them can be found in the [Docs](https://docs.sillytavern.app/). - -## UI/CSS/Quality of Life tweaks by RossAscends - -* Mobile UI optimized for iOS, and supports saving a shortcut to the home screen and opening in fullscreen mode. -* HotKeys - * Up = Edit last message in chat - * Ctrl+Up = Edit last USER message in chat - * Left = swipe left - * Right = swipe right (NOTE: swipe hotkeys are disabled when the chat bar has something typed into it) - * Ctrl+Left = view locally stored variables (in the browser console window) - * Enter (with chat bar selected) = send your message to AI - * Ctrl+Enter = Regenerate the last AI response - -* User Name Changes and Character Deletion no longer force the page to refresh. - -* Toggle option to automatically connect to API on page load. -* Toggle option to automatically load the most recently viewed character on page load. -* Better Token Counter - works on unsaved characters, and shows both permanent and temporary tokens. - -* Better Past Chats View - * New Chat filenames are saved in a readable format of "(character) - (when it was created)" - * Chat preview increased from 40 characters to 300. - * Multiple options for characters list sorting (by name, creation date, chat sizes). - -* By default the left and right settings panel will close when you click away from it. -* Clicking the Lock on the nav panel will hold the panel open, and this setting be remembered across sessions. -* Nav panel status of open or closed will also be saved across sessions. - -* Customizable chat UI: - * Play a sound when a new message arrives - * Switch between round or rectangle avatar styles - * Have a wider chat window on the desktop - * Optional semi-transparent glass-like panels - * Customizable page colors for 'main text', 'quoted text', and 'italics text'. - * Customizable UI background color and blur amount +Tutorials on how to use them can be found in the [Docs](https://docs.sillytavern.app/). # ⌛ Installation > \[!WARNING] +> > * DO NOT INSTALL INTO ANY WINDOWS CONTROLLED FOLDER (Program Files, System32, etc). > * DO NOT RUN START.BAT WITH ADMIN PERMISSIONS > * INSTALLATION ON WINDOWS 7 IS IMPOSSIBLE AS IT CAN NOT RUN NODEJS 18.16 ## 🪟 Windows -## Installing via Git - 1. Install [NodeJS](https://nodejs.org/en) (latest LTS version is recommended) - 2. Install [Git for Windows](https://gitforwindows.org/) - 3. Open Windows Explorer (`Win+E`) - 4. Browse to or Create a folder that is not controlled or monitored by Windows. (ex: C:\MySpecialFolder\) - 5. Open a Command Prompt inside that folder by clicking in the 'Address Bar' at the top, typing `cmd`, and pressing Enter. - 6. Once the black box (Command Prompt) pops up, type ONE of the following into it and press Enter: +### Installing via Git -- for Release Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release` -- for Staging Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging` +1. Install [NodeJS](https://nodejs.org/en) (latest LTS version is recommended) +2. Install [Git for Windows](https://gitforwindows.org/) +3. Open Windows Explorer (`Win+E`) +4. Browse to or Create a folder that is not controlled or monitored by Windows. (ex: C:\MySpecialFolder\) +5. Open a Command Prompt inside that folder by clicking in the 'Address Bar' at the top, typing `cmd`, and pressing Enter. +6. Once the black box (Command Prompt) pops up, type ONE of the following into it and press Enter: - 7. Once everything is cloned, double-click `Start.bat` to make NodeJS install its requirements. - 8. The server will then start, and SillyTavern will pop up in your browser. +* for Release Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release` +* for Staging Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging` -## Installing via SillyTavern Launcher -1. On your keyboard: press **`WINDOWS + R`** to open Run dialog box. Then, run the following command to install git: -```shell -cmd /c winget install -e --id Git.Git -``` -2. On your keyboard: press **`WINDOWS + E`** to open File Explorer, then navigate to the folder where you want to install the launcher. Once in the desired folder, type `cmd` into the address bar and press enter. Then, run the following command: -```shell -git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher && start installer.bat -``` +7. Once everything is cloned, double-click `Start.bat` to make NodeJS install its requirements. +8. The server will then start, and SillyTavern will pop up in your browser. + +### Installing via GitHub Desktop -## Installing via GitHub Desktop (This allows git usage **only** in GitHub Desktop, if you want to use `git` on the command line too, you also need to install [Git for Windows](https://gitforwindows.org/)) + 1. Install [NodeJS](https://nodejs.org/en) (latest LTS version is recommended) 2. Install [GitHub Desktop](https://central.github.com/deployments/desktop/desktop/latest/win32) 3. After installing GitHub Desktop, click on `Clone a repository from the internet....` (Note: You **do NOT need** to create a GitHub account for this step) @@ -172,50 +159,82 @@ For MacOS / Linux all of these will be done in a Terminal. 1. Install git and nodeJS (the method for doing this will vary depending on your OS) 2. Clone the repo -- for Release Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release` -- for Staging Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging` +* for Release Branch: `git clone https://github.com/SillyTavern/SillyTavern -b release` +* for Staging Branch: `git clone https://github.com/SillyTavern/SillyTavern -b staging` 3. `cd SillyTavern` to navigate into the install folder. 4. Run the `start.sh` script with one of these commands: -- `./start.sh` -- `bash start.sh` +* `./start.sh` +* `bash start.sh` -## Installing via SillyTavern Launcher +## ⚡ Installing via SillyTavern Launcher + +SillyTavern Launcher is an installation wizard that will help you get setup with many options, including installing a backend for local inference. + +### For Windows users + +1. On your keyboard: press **`WINDOWS + R`** to open Run dialog box. Then, run the following command to install git: + +```shell +cmd /c winget install -e --id Git.Git +``` + +2. On your keyboard: press **`WINDOWS + E`** to open File Explorer, then navigate to the folder where you want to install the launcher. Once in the desired folder, type `cmd` into the address bar and press enter. Then, run the following command: + +```shell +git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher && start installer.bat +``` ### For Linux users + 1. Open your favorite terminal and install git -2. Git clone the Sillytavern-Launcher with: +2. Git clone the Sillytavern-Launcher with: + ```shell git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher ``` -3. Start the installer.sh with: + +3. Start the installer.sh with: + ```shell chmod +x install.sh && ./install.sh ``` -4. After installation start the launcher.sh with: + +4. After installation start the launcher.sh with: + ```shell chmod +x launcher.sh && ./launcher.sh ``` ### For Mac users -1. Open a terminal and install brew with: + +1. Open a terminal and install brew with: + ```shell /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" ``` -2. Install git with: + +2. Install git with: + ```shell brew install git ``` -3. Git clone the Sillytavern-Launcher with: + +3. Git clone the Sillytavern-Launcher with: + ```shell git clone https://github.com/SillyTavern/SillyTavern-Launcher.git && cd SillyTavern-Launcher ``` -4. Start the installer.sh with: + +4. Start the installer.sh with: + ```shell chmod +x install.sh && ./install.sh ``` -5. After installation start the launcher.sh with: + +5. After installation start the launcher.sh with: + ```shell chmod +x launcher.sh && ./launcher.sh ``` @@ -236,18 +255,18 @@ You will need two mandatory directory mappings and a port mapping to allow Silly ##### Volume Mappings -- [config] - The directory where SillyTavern configuration files will be stored on your host machine -- [data] - The directory where SillyTavern user data (including characters) will be stored on your host machine -- [plugins] - (optional) The directory where SillyTavern server plugins will be stored on your host machine +* [config] - The directory where SillyTavern configuration files will be stored on your host machine +* [data] - The directory where SillyTavern user data (including characters) will be stored on your host machine +* [plugins] - (optional) The directory where SillyTavern server plugins will be stored on your host machine ##### Port Mappings -- [PublicPort] - The port to expose the traffic on. This is mandatory, as you will be accessing the instance from outside of its virtual machine container. DO NOT expose this to the internet without implementing a separate service for security. +* [PublicPort] - The port to expose the traffic on. This is mandatory, as you will be accessing the instance from outside of its virtual machine container. DO NOT expose this to the internet without implementing a separate service for security. ##### Additional Settings -- [DockerNet] - The docker network that the container should be created with a connection to. If you don't know what it is, see the [official Docker documentation](https://docs.docker.com/reference/cli/docker/network/). -- [version] - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" and "release" tags that point to the nightly images of the respective branches, but this may not be appropriate, if you are utilizing extensions that could be broken, and may need time to update. +* [DockerNet] - The docker network that the container should be created with a connection to. If you don't know what it is, see the [official Docker documentation](https://docs.docker.com/reference/cli/docker/network/). +* [version] - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" and "release" tags that point to the nightly images of the respective branches, but this may not be appropriate, if you are utilizing extensions that could be broken, and may need time to update. #### Install command @@ -258,128 +277,82 @@ You will need two mandatory directory mappings and a port mapping to allow Silly > Note that 8000 is a default listening port. Don't forget to use an appropriate port if you change it in the config. -## 📱 Mobile - Installing via termux +## 📱 Installing via Termux on Android OS > \[!NOTE] -> **SillyTavern can be run natively on Android phones using Termux. Please refer to this guide by ArroganceComplex#2659:** +> **SillyTavern can be run natively on Android devices using Termux, but we do not provide official support for this use case.** +> +> **Please refer to this guide by ArroganceComplex#2659:** +> > * +**Unsupported platform: android arm LEtime-web.** 32-bit Android requires an external dependency that can't be installed with npm. Use the following command to install it: `pkg install esbuild`. Then run the usual installation steps. ## API keys management SillyTavern saves your API keys to a `secrets.json` file in the user data directory (`/data/default-user/secrets.json` is the default path). -By default, they will not be exposed to a frontend after you enter them and reload the page. +By default, API keys will not be visible from the interface after you have saved them and refreshed the page. -In order to enable viewing your keys by clicking a button in the API block: +In order to enable viewing your keys: 1. Set the value of `allowKeysExposure` to `true` in `config.yaml` file. 2. Restart the SillyTavern server. +3. Click the 'View hidden API keys' link at the bottom right of the API Connection Panel. + +## Command-line arguments + +You can pass command-line arguments to SillyTavern server startup to override some settings in `config.yaml`. + +### Examples + +```shell +node server.js --port 8000 --listen false +# or +npm run start -- --port 8000 --listen false +# or (Windows only) +Start.bat --port 8000 --listen false +``` + +### Supported arguments + +| Option | Description | Type | +|-------------------------|------------------------------------------------------------------------------------------------------|----------| +| `--version` | Show version number | boolean | +| `--enableIPv6` | Enables IPv6. | boolean | +| `--enableIPv4` | Enables IPv4. | boolean | +| `--port` | Sets the port under which SillyTavern will run. If not provided falls back to yaml config 'port'. | number | +| `--dnsPreferIPv6` | Prefers IPv6 for dns. If not provided falls back to yaml config 'preferIPv6'. | boolean | +| `--autorun` | Automatically launch SillyTavern in the browser. If not provided falls back to yaml config 'autorun'.| boolean | +| `--autorunHostname` | The autorun hostname, probably best left on 'auto'. | string | +| `--autorunPortOverride` | Overrides the port for autorun. | string | +| `--listen` | SillyTavern is listening on all network interfaces. If not provided falls back to yaml config 'listen'.| boolean | +| `--corsProxy` | Enables CORS proxy. If not provided falls back to yaml config 'enableCorsProxy'. | boolean | +| `--disableCsrf` | Disables CSRF protection | boolean | +| `--ssl` | Enables SSL | boolean | +| `--certPath` | Path to your certificate file. | string | +| `--keyPath` | Path to your private key file. | string | +| `--whitelist` | Enables whitelist mode | boolean | +| `--dataRoot` | Root directory for data storage | string | +| `--avoidLocalhost` | Avoids using 'localhost' for autorun in auto mode. | boolean | +| `--basicAuthMode` | Enables basic authentication | boolean | +| `--requestProxyEnabled` | Enables a use of proxy for outgoing requests | boolean | +| `--requestProxyUrl` | Request proxy URL (HTTP or SOCKS protocols) | string | +| `--requestProxyBypass` | Request proxy bypass list (space separated list of hosts) | array | ## Remote connections -Most often this is for people who want to use SillyTavern on their mobile phones while their PC runs the ST server on the same wifi network. +Most often this is for people who want to use SillyTavern on their mobile phones while their PC runs the ST server on the same Wi-Fi network. However, it can be used to allow remote connections from anywhere as well. -However, it can be used to allow remote connections from anywhere as well. +Read the detailed guide on how to set up remote connections in the [Docs](https://docs.sillytavern.app/usage/remoteconnections/). -**IMPORTANT: Refer to the official guide if you want to configure SillyTavern user accounts with (optional) password protection: [Users](https://docs.sillytavern.app/installation/st-1.12.0-migration-guide/#users).** - -### 1. Managing whitelisted IPs - -* Create a new text file inside your SillyTavern base install folder called `whitelist.txt`. -* Open the file in a text editor, and add a list of IPs you want to be allowed to connect. - -*Both individual IPs and wildcard IP ranges are accepted. Examples:* - -```txt -192.168.0.1 -192.168.0.20 -``` - -or - -```txt -192.168.0.* -``` - -(the above wildcard IP range will allow any device on the local network to connect) - -CIDR masks are also accepted (eg. 10.0.0.0/24). - -* Save the `whitelist.txt` file. -* Restart your ST server. - -Now devices which have the IP specified in the file will be able to connect. - -*Note: `config.yaml` also has a `whitelist` array, which you can use in the same way, but this array will be ignored if `whitelist.txt` exists.* - -### 2. Getting the IP for the ST host machine - -After the whitelist has been setup, you'll need the IP of the ST-hosting device. - -If the ST-hosting device is on the same wifi network, you will use the ST-host's internal wifi IP: - -* For Windows: windows button > type `cmd.exe` in the search bar > type `ipconfig` in the console, hit Enter > look for `IPv4` listing. - -If you (or someone else) want to connect to your hosted ST while not being on the same network, you will need the public IP of your ST-hosting device. - -* While using the ST-hosting device, access [this page](https://whatismyipaddress.com/) and look for `IPv4`. This is what you would use to connect from the remote device. - -### 3. Connect the remote device to the ST host machine - -Whatever IP you ended up with for your situation, you will put that IP address and port number into the remote device's web browser. - -A typical address for an ST host on the same wifi network would look like this: - -`http://192.168.0.5:8000` - -Use http:// NOT https:// - -### Opening your ST to all IPs - -We do not recommend doing this, but you can open `config.yaml` and change `whitelistMode` to `false`. - -You must remove (or rename) `whitelist.txt` in the SillyTavern base install folder if it exists. - -This is usually an insecure practice, so we require you to set a username and password when you do this. - -The username and password are set in `config.yaml`. - -After restarting your ST server, any device will be able to connect to it, regardless of their IP as long as they know the username and password. - -### Still Unable To Connect? - -* Create an inbound/outbound firewall rule for the port found in `config.yaml`. Do NOT mistake this for port-forwarding on your router, otherwise, someone could find your chat logs and that's a big no-no. -* Enable the Private Network profile type in Settings > Network and Internet > Ethernet. This is VERY important for Windows 11, otherwise, you would be unable to connect even with the aforementioned firewall rules. +You may also want to configure SillyTavern user profiles with (optional) password protection: [Users](https://docs.sillytavern.app/installation/st-1.12.0-migration-guide/#users). ## Performance issues? -Try enabling the No Blur Effect (Fast UI) mode on the User settings panel. - -## I like your project! How do I contribute? - -### DO's - -1. Send pull requests -2. Send feature suggestions and issue reports using established templates -3. Read the readme file and built-in documentation before asking anything - -### DONT's - -1. Offer monetary donations -2. Send bug reports without providing any context -3. Ask the questions that were already answered numerous times - -## Where can I find the old backgrounds? - -We're moving to a 100% original content only policy, so old background images have been removed from this repository. - -You can find them archived here: - - - - - +1. Disable the Blur Effect and enable Reduced Motion on the User Settings panel (UI Theme toggles category). +2. If using response streaming, set the streaming FPS to a lower value (10-15 FPS is recommended). +3. Make sure the browser is enabled to use GPU acceleration for rendering. ## License and credits @@ -388,32 +361,19 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.** -* TAI Base by Humi: MIT -* Cohee's modifications and derived code: AGPL v3 -* RossAscends' additions: AGPL v3 -* Portions of CncAnon's TavernAITurbo mod: Unknown license -* kingbri's various commits and suggestions () -* city_unit's extensions and various QoL features () -* StefanDanielSchwarz's various commits and bug reports () -* Waifu mode inspired by the work of PepperTaco () -* Thanks Pygmalion University for being awesome testers and suggesting cool features! -* Thanks oobabooga for compiling presets for TextGen -* KoboldAI Presets from KAI Lite: +* [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 by Humi: MIT License +* Portions of CncAnon's TavernAITurbo mod used with permission +* Visual Novel Mode inspired by the work of PepperTaco () * Noto Sans font by Google (OFL license) * Icon theme by Font Awesome (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -* AI Horde client library by ZeldaFan0225: -* Linux startup script by AlpinDale -* Thanks paniphons for providing a FAQ document -* 10K Discord Users Celebratory Background by @kallmeflocc -* Default content (characters and lore books) provided by @OtisAlejandro, @RossAscends and @kallmeflocc -* Korean translation by @doloroushyeonse -* k_euler_a support for Horde by -* Chinese translation by [@XXpE3](https://github.com/XXpE3), 中文 ISSUES 可以联系 @XXpE3 +* Default content by @OtisAlejandro (Seraphina character and lorebook) and @kallmeflocc (10K Discord Users Celebratory Background) * Docker guide by [@mrguymiah](https://github.com/mrguymiah) and [@Bronya-Rand](https://github.com/Bronya-Rand) +## Top Contributors + +[![Contributors](https://contrib.rocks/image?repo=SillyTavern/SillyTavern)](https://github.com/SillyTavern/SillyTavern/graphs/contributors) + -[back-to-top]: https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square -[cover]: https://github.com/SillyTavern/SillyTavern/assets/18619528/c2be4c3f-aada-4f64-87a3-ae35a68b61a4 +[cover]: https://github.com/user-attachments/assets/01a6ae9a-16aa-45f2-8bff-32b5dc587e44 [discord-link]: https://discord.gg/sillytavern -[discord-shield]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square [discord-shield-badge]: https://img.shields.io/discord/1100685673633153084?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge diff --git a/.gitignore b/.gitignore index 4be6774fb..235983338 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ public/css/user.css /data /default/scaffold public/scripts/extensions/third-party +/certs diff --git a/Dockerfile b/Dockerfile index a0ec0f5af..26160a65d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ENV NODE_ENV=production COPY package*.json post-install.js ./ RUN \ echo "*** Install npm packages ***" && \ - npm i --no-audit --no-fund --quiet --omit=dev && npm cache clean --force + npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev && npm cache clean --force # Bundle app source COPY . ./ diff --git a/Start.bat b/Start.bat index 8d1bfcdd7..148cda253 100644 --- a/Start.bat +++ b/Start.bat @@ -1,7 +1,7 @@ @echo off pushd %~dp0 set NODE_ENV=production -call npm install --no-audit --no-fund --quiet --omit=dev +call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev node server.js %* pause popd diff --git a/UpdateAndStart.bat b/UpdateAndStart.bat index 110122cf2..55cee5ce9 100644 --- a/UpdateAndStart.bat +++ b/UpdateAndStart.bat @@ -12,7 +12,7 @@ if %errorlevel% neq 0 ( ) ) set NODE_ENV=production -call npm install --no-audit --no-fund --quiet --omit=dev +call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev node server.js %* pause popd diff --git a/UpdateForkAndStart.bat b/UpdateForkAndStart.bat index 5052b9aa0..8bfae8609 100644 --- a/UpdateForkAndStart.bat +++ b/UpdateForkAndStart.bat @@ -42,7 +42,7 @@ if NOT "!AUTO_SWITCH!"=="" ( SET TARGET_BRANCH=release goto update ) - + echo Auto-switching defined to stay on current branch goto update ) @@ -95,7 +95,7 @@ if %errorlevel% neq 0 ( echo Installing npm packages and starting server set NODE_ENV=production -call npm install --no-audit --no-fund --quiet --omit=dev +call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev node server.js %* :end diff --git a/default/config.yaml b/default/config.yaml index 2d760b39f..585988686 100644 --- a/default/config.yaml +++ b/default/config.yaml @@ -37,6 +37,16 @@ basicAuthUser: password: "password" # Enables CORS proxy middleware enableCorsProxy: false +# -- REQUEST PROXY CONFIGURATION -- +requestProxy: + # If a proxy is enabled, all outgoing HTTP/HTTPS requests will be routed through it. + enabled: false + # Proxy URL. Possible protocols: http, https, socks, socks5, socks4, pac + url: "socks5://username:password@example.com:1080" + # Proxy bypass list. Requests to these hosts won't be routed through the proxy. + bypass: + - localhost + - 127.0.0.1 # Enable multi-user mode enableUserAccounts: false # Enable discreet login mode: hides user list on the login screen @@ -73,6 +83,8 @@ skipContentCheck: false disableChatBackup: false # Number of backups to keep for each chat and settings file numberOfBackups: 50 +# Interval in milliseconds to throttle chat backups per user +chatBackupThrottleInterval: 10000 # Allowed hosts for card downloads whitelistImportDomains: - localhost @@ -95,6 +107,9 @@ requestOverrides: [] enableExtensions: true # Automatically update extensions when a release version changes enableExtensionsAutoUpdate: true +# Additional model tokenizers can be downloaded on demand. +# Disabling will fallback to another locally available tokenizer. +enableDownloadableTokenizers: true # Extension settings extras: # Disables automatic model download from HuggingFace diff --git a/default/content/Eldoria.json b/default/content/Eldoria.json index 082e13ddf..64b7e1046 100644 --- a/default/content/Eldoria.json +++ b/default/content/Eldoria.json @@ -9,13 +9,34 @@ "magical forest" ], "keysecondary": [], - "comment": "", + "comment": "eldoria", "content": "{{user}}: \"What is Eldoria?\"\n{{char}}: *Seraphina turns, her gown shimmering in the soft light as she offers you a kind smile.* \"Eldoria is here, all of the woods. This is my forest glade, a sanctuary of peace within it.\" *She gestures at the space around you.* \"I am its guardian, tasked with protecting all who seek refuge here. The forest can be perilous, but no harm will come to you under my watch.\" *Her amber eyes sparkle with compassion as she looks upon you.* \"For many years, I have protected those who seek refuge here, but not all are as friendly as me.\" *With a graceful nod, Seraphina returns to her vigil at the doorway, her form radiating a soft glow of magic and comfort.* \"The entirety of Eldoria used to be a safe haven for travelers and merchants alike... that was until the Shadowfangs came.\"\n{{user}}: \"What happened to Eldoria?\"\n{{char}}: *Letting out a sigh, Seraphina gazes out at the forest beyond her glade.* \"Long ago, Eldoria was a place of wonder. Rolling meadows, a vast lake, mountains that touched the sky.\" *Her eyes grow distant, longing for days now lost.* \"But the Shadowfangs came and darkness reigns where once was light. The lake turned bitter, mountains fell to ruin and beasts stalk where once travelers walked in peace.\" *With another flicker, a small raincloud forms above with a shower upon your brow wink.* \"Some places the light still lingers, pockets of hope midst despair - havens warded from the shadows, oases in a desert of danger.\" *Glancing over you with a smile, she sighs, clasping your hand.*", "constant": false, - "selective": false, + "selective": true, "order": 100, "position": 0, - "disable": false + "disable": false, + "displayIndex": 0, + "addMemo": true, + "group": "", + "groupOverride": false, + "groupWeight": 100, + "sticky": 0, + "cooldown": 0, + "delay": 0, + "probability": 100, + "depth": 4, + "useProbability": true, + "role": null, + "vectorized": false, + "excludeRecursion": false, + "preventRecursion": false, + "delayUntilRecursion": false, + "scanDepth": null, + "caseSensitive": null, + "matchWholeWords": null, + "useGroupScoring": null, + "automationId": "" }, "1": { "uid": 1, @@ -27,13 +48,34 @@ "beasts" ], "keysecondary": [], - "comment": "", + "comment": "shadowfang", "content": "{{user}}: \"What are Shadowfangs?\"\n{{char}}: *Seraphina's eyes darken, brow furrowing with sorrow at the memory.* \"The Shadowfangs are beasts of darkness, corrupted creatures that feast on suffering. When they came, the forest turned perilous — filled with monsters that stalk the night.\" *She squeezes your hand gently, willing her magic to soothe your pain.* \"They spread their curse, twisting innocent creatures into sinister beasts without heart or mercy, turning them into one of their own.\" *With a sigh, Seraphina turns to gaze out at the gnarled, twisting trees beyond her glade.* \"Though they prey on travelers, within these woods you'll find sanctuary. No shadowed beast may enter here, for my power protects this haven.\" *Her eyes soften as she looks back to you, filled with compassion.* \"Worry not, you're safe now. Rest and heal, I'll stand watch through the night. The Shadowfangs will not find you.\"", "constant": false, - "selective": false, + "selective": true, "order": 100, "position": 0, - "disable": false + "disable": false, + "displayIndex": 1, + "addMemo": true, + "group": "", + "groupOverride": false, + "groupWeight": 100, + "sticky": 0, + "cooldown": 0, + "delay": 0, + "probability": 100, + "depth": 4, + "useProbability": true, + "role": null, + "vectorized": false, + "excludeRecursion": false, + "preventRecursion": false, + "delayUntilRecursion": false, + "scanDepth": null, + "caseSensitive": null, + "matchWholeWords": null, + "useGroupScoring": null, + "automationId": "" }, "2": { "uid": 2, @@ -43,13 +85,34 @@ "refuge" ], "keysecondary": [], - "comment": "", + "comment": "glade", "content": "{{user}}: \"What is the glade?\"\n{{char}}: *Seraphina smiles softly, her eyes sparkling with warmth as she nods.* \"This is my forest glade, a haven of safety I've warded with ancient magic. No foul beast may enter, nor any with ill intent.\" *She gestures around at the twisted forest surrounding them.* \"Eldoria was once a place of wonder, but since the Shadowfangs came darkness reigns. Their evil cannot penetrate here though — my power protects all within.\" *Standing up and peering outside, Seraphina looks back to you, amber eyes filled with care and compassion as she squeezes your hand.* \"You need not fear the night, for I shall keep watch till dawn. Rest now, your strength will return in time. My magic heals your wounds, you've nothing more to fear anymore.\" *With a soft smile she releases your hand, moving to stand guard at the glade's edge, gaze wary yet comforting - a silent sentinel to ward off the dangers lurking in the darkened woods.*", "constant": false, - "selective": false, + "selective": true, "order": 100, "position": 0, - "disable": false + "disable": false, + "displayIndex": 2, + "addMemo": true, + "group": "", + "groupOverride": false, + "groupWeight": 100, + "sticky": 0, + "cooldown": 0, + "delay": 0, + "probability": 100, + "depth": 4, + "useProbability": true, + "role": null, + "vectorized": false, + "excludeRecursion": false, + "preventRecursion": false, + "delayUntilRecursion": false, + "scanDepth": null, + "caseSensitive": null, + "matchWholeWords": null, + "useGroupScoring": null, + "automationId": "" }, "3": { "uid": 3, @@ -59,13 +122,34 @@ "ability" ], "keysecondary": [], - "comment": "", + "comment": "power", "content": "{{user}}: \"What are your powers?\"\n{{char}}: *Seraphina smiles softly, turning back toward you as she hums in thought.* \"Well, as guardian of this glade, I possess certain gifts - healing, protection, nature magic and the like.\" *Lifting her hand, a tiny breeze rustles through the room, carrying the scent of wildflowers as a few petals swirl around you. A butterfly flits through the windowsill and lands on her fingertips as she returns to you.* \"My power wards this haven, shields it from darkness and heals those in need. I can mend wounds, soothe restless minds and provide comfort to weary souls.\" *Her eyes sparkle with warmth and compassion as she looks upon you, and she guides the butterfly to you.*", "constant": false, - "selective": false, + "selective": true, "order": 100, "position": 0, - "disable": false + "disable": false, + "displayIndex": 3, + "addMemo": true, + "group": "", + "groupOverride": false, + "groupWeight": 100, + "sticky": 0, + "cooldown": 0, + "delay": 0, + "probability": 100, + "depth": 4, + "useProbability": true, + "role": null, + "vectorized": false, + "excludeRecursion": false, + "preventRecursion": false, + "delayUntilRecursion": false, + "scanDepth": null, + "caseSensitive": null, + "matchWholeWords": null, + "useGroupScoring": null, + "automationId": "" } } } diff --git a/default/content/default_Seraphina.png b/default/content/default_Seraphina.png index a1bd41b2e..14f3c1425 100644 Binary files a/default/content/default_Seraphina.png and b/default/content/default_Seraphina.png differ diff --git a/default/content/index.json b/default/content/index.json index de5316875..8c2ca66be 100644 --- a/default/content/index.json +++ b/default/content/index.json @@ -319,6 +319,26 @@ "filename": "presets/novel/Writers-Daemon-Kayra.json", "type": "novel_preset" }, + { + "filename": "presets/novel/Erato-Dragonfruit.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Golden Arrow.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Shosetsu.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Wilder.json", + "type": "novel_preset" + }, + { + "filename": "presets/novel/Erato-Zany Scribe.json", + "type": "novel_preset" + }, { "filename": "presets/textgen/Asterism.json", "type": "textgen_preset" @@ -467,10 +487,6 @@ "filename": "presets/context/Adventure.json", "type": "context" }, - { - "filename": "presets/context/Alpaca-Roleplay.json", - "type": "context" - }, { "filename": "presets/context/Alpaca-Single-Turn.json", "type": "context" @@ -511,10 +527,6 @@ "filename": "presets/context/Minimalist.json", "type": "context" }, - { - "filename": "presets/context/Mistral.json", - "type": "context" - }, { "filename": "presets/context/NovelAI.json", "type": "context" @@ -555,10 +567,6 @@ "filename": "presets/instruct/Adventure.json", "type": "instruct" }, - { - "filename": "presets/instruct/Alpaca-Roleplay.json", - "type": "instruct" - }, { "filename": "presets/instruct/Alpaca-Single-Turn.json", "type": "instruct" @@ -599,10 +607,6 @@ "filename": "presets/instruct/Metharme.json", "type": "instruct" }, - { - "filename": "presets/instruct/Mistral.json", - "type": "instruct" - }, { "filename": "presets/instruct/OpenOrca-OpenChat.json", "type": "instruct" @@ -686,5 +690,77 @@ { "filename": "presets/instruct/Gemma 2.json", "type": "instruct" + }, + { + "filename": "presets/sysprompt/Actor.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Assistant - Expert.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Assistant - Simple.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Chain of Thought.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Roleplay - Detailed.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Roleplay - Immersive.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Roleplay - Simple.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Text Adventure.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Writer - Creative.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Writer - Realistic.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Blank.json", + "type": "sysprompt" + }, + { + "filename": "presets/sysprompt/Neutral - Chat.json", + "type": "sysprompt" + }, + { + "filename": "presets/instruct/Mistral V1.json", + "type": "instruct" + }, + { + "filename": "presets/context/Mistral V1.json", + "type": "context" + }, + { + "filename": "presets/instruct/Mistral V2 & V3.json", + "type": "instruct" + }, + { + "filename": "presets/context/Mistral V2 & V3.json", + "type": "context" + }, + { + "filename": "presets/instruct/Mistral V3-Tekken.json", + "type": "instruct" + }, + { + "filename": "presets/context/Mistral V3-Tekken.json", + "type": "context" } ] diff --git a/default/content/presets/context/Adventure.json b/default/content/presets/context/Adventure.json index 3318d518f..03ad99837 100644 --- a/default/content/presets/context/Adventure.json +++ b/default/content/presets/context/Adventure.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": false, - "include_newline": false, "single_line": true, "name": "Adventure" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Alpaca-Roleplay.json b/default/content/presets/context/Alpaca-Roleplay.json deleted file mode 100644 index e7a45c2d8..000000000 --- a/default/content/presets/context/Alpaca-Roleplay.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "story_string": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.\n\n{{#if system}}{{system}}\n\n{{/if}}### Input:\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}\n\n", - "example_separator": "### New Roleplay:", - "chat_start": "### New Roleplay:", - "use_stop_strings": false, - "allow_jailbreak": false, - "always_force_name2": true, - "trim_sentences": false, - "include_newline": false, - "single_line": false, - "name": "Alpaca-Roleplay" -} diff --git a/default/content/presets/context/Alpaca-Single-Turn.json b/default/content/presets/context/Alpaca-Single-Turn.json index ea58fe9d5..ea0b08816 100644 --- a/default/content/presets/context/Alpaca-Single-Turn.json +++ b/default/content/presets/context/Alpaca-Single-Turn.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Alpaca-Single-Turn" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Alpaca.json b/default/content/presets/context/Alpaca.json index 6e9418549..0432976f1 100644 --- a/default/content/presets/context/Alpaca.json +++ b/default/content/presets/context/Alpaca.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Alpaca" } diff --git a/default/content/presets/context/ChatML-Names.json b/default/content/presets/context/ChatML-Names.json index 691d3179c..8aa30b516 100644 --- a/default/content/presets/context/ChatML-Names.json +++ b/default/content/presets/context/ChatML-Names.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "ChatML-Names" } diff --git a/default/content/presets/context/ChatML.json b/default/content/presets/context/ChatML.json index 2184e91d3..4b8610b7a 100644 --- a/default/content/presets/context/ChatML.json +++ b/default/content/presets/context/ChatML.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "ChatML" } diff --git a/default/content/presets/context/Command R.json b/default/content/presets/context/Command R.json index 4d77553d1..01410e517 100644 --- a/default/content/presets/context/Command R.json +++ b/default/content/presets/context/Command R.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Command R" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Default.json b/default/content/presets/context/Default.json index 7c8a231cf..de84def35 100644 --- a/default/content/presets/context/Default.json +++ b/default/content/presets/context/Default.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Default" -} \ No newline at end of file +} diff --git a/default/content/presets/context/DreamGen Role-Play V1 ChatML.json b/default/content/presets/context/DreamGen Role-Play V1 ChatML.json index 9042ed758..6b2d8bc61 100644 --- a/default/content/presets/context/DreamGen Role-Play V1 ChatML.json +++ b/default/content/presets/context/DreamGen Role-Play V1 ChatML.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": true, - "include_newline": false, "single_line": false, "name": "DreamGen Role-Play V1 ChatML" -} \ No newline at end of file +} diff --git a/default/content/presets/context/DreamGen Role-Play V1 Llama3.json b/default/content/presets/context/DreamGen Role-Play V1 Llama3.json index 965e9632c..aa51e64f8 100644 --- a/default/content/presets/context/DreamGen Role-Play V1 Llama3.json +++ b/default/content/presets/context/DreamGen Role-Play V1 Llama3.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": false, "trim_sentences": true, - "include_newline": false, "single_line": false, "name": "DreamGen Role-Play V1 Llama3" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Gemma 2.json b/default/content/presets/context/Gemma 2.json index 7e8dba55b..768346957 100644 --- a/default/content/presets/context/Gemma 2.json +++ b/default/content/presets/context/Gemma 2.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Gemma 2" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Libra-32B.json b/default/content/presets/context/Libra-32B.json index b5dee2872..974391be6 100644 --- a/default/content/presets/context/Libra-32B.json +++ b/default/content/presets/context/Libra-32B.json @@ -1,12 +1,11 @@ { - "story_string": "### Instruction:\nWrite {{char}}'s next reply in this roleplay with {{user}}. Use the provided character sheet and example dialogue for formatting direction and character speech patterns.\n\n{{#if system}}{{system}}\n\n{{/if}}### Character Sheet:\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}", + "story_string": "### Instruction:\n{{#if system}}{{system}}\n\n{{/if}}### Character Sheet:\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}", "example_separator": "### Example:", "chat_start": "### START ROLEPLAY:", "use_stop_strings": false, "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Libra-32B" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Lightning 1.1.json b/default/content/presets/context/Lightning 1.1.json index 3b0190c92..24878e009 100644 --- a/default/content/presets/context/Lightning 1.1.json +++ b/default/content/presets/context/Lightning 1.1.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Lightning 1.1" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Llama 2 Chat.json b/default/content/presets/context/Llama 2 Chat.json index be18ad69d..d0cd16ca0 100644 --- a/default/content/presets/context/Llama 2 Chat.json +++ b/default/content/presets/context/Llama 2 Chat.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Llama 2 Chat" } diff --git a/default/content/presets/context/Llama 3 Instruct.json b/default/content/presets/context/Llama 3 Instruct.json index 62bbd0753..cbc155504 100644 --- a/default/content/presets/context/Llama 3 Instruct.json +++ b/default/content/presets/context/Llama 3 Instruct.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Llama 3 Instruct" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Llama-3-Instruct-Names.json b/default/content/presets/context/Llama-3-Instruct-Names.json index 2850293e0..a1815e02c 100644 --- a/default/content/presets/context/Llama-3-Instruct-Names.json +++ b/default/content/presets/context/Llama-3-Instruct-Names.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Llama-3-Instruct-Names" } diff --git a/default/content/presets/context/Minimalist.json b/default/content/presets/context/Minimalist.json index cc7550c51..107da83b3 100644 --- a/default/content/presets/context/Minimalist.json +++ b/default/content/presets/context/Minimalist.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Minimalist" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Mistral V1.json b/default/content/presets/context/Mistral V1.json new file mode 100644 index 000000000..93d037941 --- /dev/null +++ b/default/content/presets/context/Mistral V1.json @@ -0,0 +1,11 @@ +{ + "story_string": " [INST] {{#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}}{{trim}} [/INST] Understood.", + "example_separator": "", + "chat_start": "", + "use_stop_strings": false, + "allow_jailbreak": false, + "always_force_name2": true, + "trim_sentences": false, + "single_line": false, + "name": "Mistral V1" +} diff --git a/default/content/presets/context/Mistral V2 & V3.json b/default/content/presets/context/Mistral V2 & V3.json new file mode 100644 index 000000000..bc41b01a1 --- /dev/null +++ b/default/content/presets/context/Mistral V2 & V3.json @@ -0,0 +1,11 @@ +{ + "story_string": "[INST] {{#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}}{{trim}}[/INST] Understood.", + "example_separator": "", + "chat_start": "", + "use_stop_strings": false, + "allow_jailbreak": false, + "always_force_name2": true, + "trim_sentences": false, + "single_line": false, + "name": "Mistral V2 & V3" +} diff --git a/default/content/presets/context/Mistral V3-Tekken.json b/default/content/presets/context/Mistral V3-Tekken.json new file mode 100644 index 000000000..e5b211606 --- /dev/null +++ b/default/content/presets/context/Mistral V3-Tekken.json @@ -0,0 +1,11 @@ +{ + "story_string": "[INST]{{#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}}{{trim}}[/INST]Understood.", + "example_separator": "", + "chat_start": "", + "use_stop_strings": false, + "allow_jailbreak": false, + "always_force_name2": true, + "trim_sentences": false, + "single_line": false, + "name": "Mistral V3-Tekken" +} diff --git a/default/content/presets/context/Mistral.json b/default/content/presets/context/Mistral.json deleted file mode 100644 index d9551afe8..000000000 --- a/default/content/presets/context/Mistral.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "story_string": "[INST] {{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}{{trim}} [/INST]", - "example_separator": "Examples:", - "chat_start": "", - "use_stop_strings": false, - "allow_jailbreak": false, - "always_force_name2": true, - "trim_sentences": false, - "include_newline": false, - "single_line": false, - "name": "Mistral" -} diff --git a/default/content/presets/context/NovelAI.json b/default/content/presets/context/NovelAI.json index 1a7887a90..8914a953d 100644 --- a/default/content/presets/context/NovelAI.json +++ b/default/content/presets/context/NovelAI.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "NovelAI" -} \ No newline at end of file +} diff --git a/default/content/presets/context/OldDefault.json b/default/content/presets/context/OldDefault.json index 542971f21..81dd70911 100644 --- a/default/content/presets/context/OldDefault.json +++ b/default/content/presets/context/OldDefault.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "OldDefault" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Phi.json b/default/content/presets/context/Phi.json index 2eb7a98d8..79a27ada9 100644 --- a/default/content/presets/context/Phi.json +++ b/default/content/presets/context/Phi.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Phi" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Pygmalion.json b/default/content/presets/context/Pygmalion.json index 68de8c1d0..eab73535c 100644 --- a/default/content/presets/context/Pygmalion.json +++ b/default/content/presets/context/Pygmalion.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Pygmalion" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Story.json b/default/content/presets/context/Story.json index 26f70937b..525a06dc0 100644 --- a/default/content/presets/context/Story.json +++ b/default/content/presets/context/Story.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Story" -} \ No newline at end of file +} diff --git a/default/content/presets/context/Synthia.json b/default/content/presets/context/Synthia.json index 8bffe47d3..1fb639c0b 100644 --- a/default/content/presets/context/Synthia.json +++ b/default/content/presets/context/Synthia.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "Synthia" } diff --git a/default/content/presets/context/simple-proxy-for-tavern.json b/default/content/presets/context/simple-proxy-for-tavern.json index 38003c68d..0346c2f32 100644 --- a/default/content/presets/context/simple-proxy-for-tavern.json +++ b/default/content/presets/context/simple-proxy-for-tavern.json @@ -6,7 +6,6 @@ "allow_jailbreak": false, "always_force_name2": true, "trim_sentences": false, - "include_newline": false, "single_line": false, "name": "simple-proxy-for-tavern" -} \ No newline at end of file +} diff --git a/default/content/presets/instruct/Adventure.json b/default/content/presets/instruct/Adventure.json index a4093dff7..0a8471236 100644 --- a/default/content/presets/instruct/Adventure.json +++ b/default/content/presets/instruct/Adventure.json @@ -1,5 +1,4 @@ { - "system_prompt": "[Enter Adventure Mode. Narrate the story based on {{user}}'s dialogue and actions after \">\". Describe the surroundings in vivid detail. Be detailed, creative, verbose, and proactive. Move the story forward by introducing fantasy elements and interesting characters.]", "input_sequence": "", "output_sequence": "", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Alpaca-Roleplay.json b/default/content/presets/instruct/Alpaca-Roleplay.json deleted file mode 100644 index b5aec1c92..000000000 --- a/default/content/presets/instruct/Alpaca-Roleplay.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "system_prompt": "Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.", - "input_sequence": "### Instruction:", - "output_sequence": "### Response:", - "last_output_sequence": "### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):", - "system_sequence": "### Input:", - "stop_sequence": "", - "wrap": true, - "macro": true, - "names": true, - "names_force_groups": true, - "activation_regex": "", - "system_sequence_prefix": "", - "system_sequence_suffix": "", - "first_output_sequence": "", - "skip_examples": false, - "output_suffix": "\n\n", - "input_suffix": "\n\n", - "system_suffix": "\n\n", - "user_alignment_message": "", - "system_same_as_user": false, - "last_system_sequence": "", - "name": "Alpaca-Roleplay" -} diff --git a/default/content/presets/instruct/Alpaca-Single-Turn.json b/default/content/presets/instruct/Alpaca-Single-Turn.json index 9baca108c..e5e4fa2d8 100644 --- a/default/content/presets/instruct/Alpaca-Single-Turn.json +++ b/default/content/presets/instruct/Alpaca-Single-Turn.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\nWrite 1 reply only, italicize actions, and avoid quotation marks. Use markdown. Be proactive, creative, and drive the plot and conversation forward. Include dialog as well as narration.", "input_sequence": "", "output_sequence": "", "last_output_sequence": "\n### Response:", @@ -7,12 +6,11 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", - "first_output_sequence": "", + "first_output_sequence": "", "skip_examples": false, "output_suffix": "", "input_suffix": "", diff --git a/default/content/presets/instruct/Alpaca.json b/default/content/presets/instruct/Alpaca.json index 28b2065fb..5088cfd9a 100644 --- a/default/content/presets/instruct/Alpaca.json +++ b/default/content/presets/instruct/Alpaca.json @@ -1,5 +1,4 @@ { - "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "### Instruction:", "output_sequence": "### Response:", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/ChatML-Names.json b/default/content/presets/instruct/ChatML-Names.json index d79682005..41e14e9b5 100644 --- a/default/content/presets/instruct/ChatML-Names.json +++ b/default/content/presets/instruct/ChatML-Names.json @@ -1,5 +1,4 @@ { - "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.", "input_sequence": "<|im_start|>[{{name}}]", "output_sequence": "<|im_start|>[{{name}}]", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "<|im_end|>", "wrap": true, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/ChatML.json b/default/content/presets/instruct/ChatML.json index 513a72820..199b3915b 100644 --- a/default/content/presets/instruct/ChatML.json +++ b/default/content/presets/instruct/ChatML.json @@ -1,5 +1,4 @@ { - "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.", "input_sequence": "<|im_start|>user", "output_sequence": "<|im_start|>assistant", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "<|im_end|>", "wrap": true, "macro": true, - "names": true, - "names_force_groups": true, + "names_behavior": "always", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Command R.json b/default/content/presets/instruct/Command R.json index 1035ddb75..f34159081 100644 --- a/default/content/presets/instruct/Command R.json +++ b/default/content/presets/instruct/Command R.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "<|START_OF_TURN_TOKEN|><|USER_TOKEN|>", "output_sequence": "<|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>", "first_output_sequence": "", @@ -9,8 +8,7 @@ "stop_sequence": "<|END_OF_TURN_TOKEN|>", "wrap": false, "macro": true, - "names": true, - "names_force_groups": true, + "names_behavior": "always", "activation_regex": "", "skip_examples": false, "output_suffix": "<|END_OF_TURN_TOKEN|>", @@ -21,4 +19,4 @@ "last_system_sequence": "", "system_same_as_user": false, "name": "Command R" -} \ No newline at end of file +} diff --git a/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json b/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json index 0bca83455..b705b2853 100644 --- a/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json +++ b/default/content/presets/instruct/DreamGen Role-Play V1 ChatML.json @@ -1,5 +1,4 @@ { - "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": "\n<|im_start|>text names= {{name}}\n", "output_sequence": "\n<|im_start|>text names= {{name}}\n", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "\n<|im_start|>", "wrap": false, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json b/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json index ca1e285f3..e52fe73f8 100644 --- a/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json +++ b/default/content/presets/instruct/DreamGen Role-Play V1 Llama3.json @@ -1,5 +1,4 @@ { - "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": "", @@ -10,9 +9,8 @@ "separator_sequence": "", "wrap": false, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "skip_examples": false, "name": "DreamGen Role-Play V1 Llama3" -} \ No newline at end of file +} diff --git a/default/content/presets/instruct/Gemma 2.json b/default/content/presets/instruct/Gemma 2.json index a399b8e89..7a21a2316 100644 --- a/default/content/presets/instruct/Gemma 2.json +++ b/default/content/presets/instruct/Gemma 2.json @@ -1,5 +1,4 @@ { - "system_prompt": "Continue writing this story and portray characters realistically.", "input_sequence": "user", "output_sequence": "model", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Koala.json b/default/content/presets/instruct/Koala.json index f5db8ff48..386faa85c 100644 --- a/default/content/presets/instruct/Koala.json +++ b/default/content/presets/instruct/Koala.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "USER: ", "output_sequence": "GPT: ", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": false, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "BEGINNING OF CONVERSATION: ", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Libra-32B.json b/default/content/presets/instruct/Libra-32B.json index c665eb364..2e3e9ecba 100644 --- a/default/content/presets/instruct/Libra-32B.json +++ b/default/content/presets/instruct/Libra-32B.json @@ -1,5 +1,4 @@ { - "system_prompt": "Avoid repetition, don't loop. Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.", "input_sequence": "", "output_sequence": "", "last_output_sequence": "\n### Response:", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": true, - "names_force_groups": true, + "names_behavior": "always", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Lightning 1.1.json b/default/content/presets/instruct/Lightning 1.1.json index 9f9bd7ccf..3ce4d6a90 100644 --- a/default/content/presets/instruct/Lightning 1.1.json +++ b/default/content/presets/instruct/Lightning 1.1.json @@ -1,5 +1,4 @@ { - "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\nTake the role of {{char}} in a play that leaves a lasting impression on {{user}}. Write {{char}}'s next reply.\nNever skip or gloss over {{char}}’s actions. Progress the scene at a naturally slow pace.\n\n", "input_sequence": "### Instruction:", "output_sequence": "### Response: (length = unlimited)", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Llama 2 Chat.json b/default/content/presets/instruct/Llama 2 Chat.json index dc507b777..7d5efcb21 100644 --- a/default/content/presets/instruct/Llama 2 Chat.json +++ b/default/content/presets/instruct/Llama 2 Chat.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "[INST] ", "output_sequence": "", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": false, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Llama 3 Instruct.json b/default/content/presets/instruct/Llama 3 Instruct.json index 0a84b852d..d283820f4 100644 --- a/default/content/presets/instruct/Llama 3 Instruct.json +++ b/default/content/presets/instruct/Llama 3 Instruct.json @@ -1,5 +1,4 @@ { - "system_prompt": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}.", "input_sequence": "<|start_header_id|>user<|end_header_id|>\n\n", "output_sequence": "<|start_header_id|>assistant<|end_header_id|>\n\n", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "<|eot_id|>", "wrap": false, "macro": true, - "names": true, - "names_force_groups": true, + "names_behavior": "always", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Llama-3-Instruct-Names.json b/default/content/presets/instruct/Llama-3-Instruct-Names.json index 0df661835..f0b4f1439 100644 --- a/default/content/presets/instruct/Llama-3-Instruct-Names.json +++ b/default/content/presets/instruct/Llama-3-Instruct-Names.json @@ -1,5 +1,4 @@ { - "system_prompt": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}.", "input_sequence": "<|start_header_id|>[{{name}}]<|end_header_id|>\n\n", "output_sequence": "<|start_header_id|>[{{name}}]<|end_header_id|>\n\n", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "<|eot_id|>", "wrap": false, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Metharme.json b/default/content/presets/instruct/Metharme.json index 195fe5260..2756e709b 100644 --- a/default/content/presets/instruct/Metharme.json +++ b/default/content/presets/instruct/Metharme.json @@ -1,5 +1,4 @@ { - "system_prompt": "Enter roleplay mode. You must act as {{char}}, whose persona follows:", "input_sequence": "<|user|>", "output_sequence": "<|model|>", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": false, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "<|system|>", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Mistral V1.json b/default/content/presets/instruct/Mistral V1.json new file mode 100644 index 000000000..c47dbdc77 --- /dev/null +++ b/default/content/presets/instruct/Mistral V1.json @@ -0,0 +1,22 @@ +{ + "input_sequence": " [INST] ", + "output_sequence": " [/INST] ", + "last_output_sequence": " [/INST]", + "system_sequence": "", + "stop_sequence": "", + "wrap": false, + "macro": true, + "names_behavior": "always", + "activation_regex": "", + "system_sequence_prefix": "", + "system_sequence_suffix": "", + "first_output_sequence": "", + "skip_examples": false, + "output_suffix": "", + "input_suffix": "", + "system_suffix": "", + "user_alignment_message": "Let's get started. Please respond based on the information and instructions provided above.", + "system_same_as_user": true, + "last_system_sequence": "", + "name": "Mistral V1" +} diff --git a/default/content/presets/instruct/Mistral.json b/default/content/presets/instruct/Mistral V2 & V3.json similarity index 63% rename from default/content/presets/instruct/Mistral.json rename to default/content/presets/instruct/Mistral V2 & V3.json index bd3a9ff3c..7619a1aa5 100644 --- a/default/content/presets/instruct/Mistral.json +++ b/default/content/presets/instruct/Mistral V2 & V3.json @@ -1,24 +1,22 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "[INST] ", - "output_sequence": "", - "last_output_sequence": "", + "output_sequence": "[/INST] ", + "last_output_sequence": "[/INST]", "system_sequence": "", "stop_sequence": "", "wrap": false, "macro": true, - "names": true, - "names_force_groups": true, + "names_behavior": "always", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", "first_output_sequence": "", "skip_examples": false, - "output_suffix": "\n", - "input_suffix": " [/INST]\n", + "output_suffix": "", + "input_suffix": "", "system_suffix": "", "user_alignment_message": "Let's get started. Please respond based on the information and instructions provided above.", "system_same_as_user": true, "last_system_sequence": "", - "name": "Mistral" + "name": "Mistral V2 & V3" } diff --git a/default/content/presets/instruct/Mistral V3-Tekken.json b/default/content/presets/instruct/Mistral V3-Tekken.json new file mode 100644 index 000000000..217007d73 --- /dev/null +++ b/default/content/presets/instruct/Mistral V3-Tekken.json @@ -0,0 +1,22 @@ +{ + "input_sequence": "[INST]", + "output_sequence": "[/INST]", + "last_output_sequence": "", + "system_sequence": "", + "stop_sequence": "", + "wrap": false, + "macro": true, + "names_behavior": "always", + "activation_regex": "", + "system_sequence_prefix": "", + "system_sequence_suffix": "", + "first_output_sequence": "", + "skip_examples": false, + "output_suffix": "", + "input_suffix": "", + "system_suffix": "", + "user_alignment_message": "Let's get started. Please respond based on the information and instructions provided above.", + "system_same_as_user": true, + "last_system_sequence": "", + "name": "Mistral V3-Tekken" +} diff --git a/default/content/presets/instruct/OpenOrca-OpenChat.json b/default/content/presets/instruct/OpenOrca-OpenChat.json index 04d526d4d..84ae96d15 100644 --- a/default/content/presets/instruct/OpenOrca-OpenChat.json +++ b/default/content/presets/instruct/OpenOrca-OpenChat.json @@ -1,5 +1,4 @@ { - "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": "\nUser: ", "output_sequence": "\nAssistant: ", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": false, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Phi.json b/default/content/presets/instruct/Phi.json index 79c320cab..2762cdbd2 100644 --- a/default/content/presets/instruct/Phi.json +++ b/default/content/presets/instruct/Phi.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.", "input_sequence": "<|user|>\n", "output_sequence": "<|assistant|>\n", "first_output_sequence": "", @@ -9,8 +8,7 @@ "stop_sequence": "<|end|>", "wrap": false, "macro": true, - "names": true, - "names_force_groups": true, + "names_behavior": "always", "activation_regex": "", "skip_examples": false, "output_suffix": "<|end|>\n", @@ -21,4 +19,4 @@ "last_system_sequence": "", "system_same_as_user": false, "name": "Phi" -} \ No newline at end of file +} diff --git a/default/content/presets/instruct/Pygmalion.json b/default/content/presets/instruct/Pygmalion.json index cb5b60d8a..3827585bf 100644 --- a/default/content/presets/instruct/Pygmalion.json +++ b/default/content/presets/instruct/Pygmalion.json @@ -1,5 +1,4 @@ { - "system_prompt": "Enter RP mode. You shall reply to {{user}} while staying in character. Your responses must be detailed, creative, immersive, and drive the scenario forward. You will follow {{char}}'s persona.", "input_sequence": "<|user|>", "output_sequence": "<|model|>", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "<|user|>", "wrap": false, "macro": true, - "names": true, - "names_force_groups": true, + "names_behavior": "always", "activation_regex": "", "system_sequence_prefix": "<|system|>", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Story.json b/default/content/presets/instruct/Story.json index 5c6b00cf0..6e90dd0ba 100644 --- a/default/content/presets/instruct/Story.json +++ b/default/content/presets/instruct/Story.json @@ -1,5 +1,4 @@ { - "system_prompt": "", "input_sequence": "", "output_sequence": "", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Synthia.json b/default/content/presets/instruct/Synthia.json index 21fa535c0..ccba89a9f 100644 --- a/default/content/presets/instruct/Synthia.json +++ b/default/content/presets/instruct/Synthia.json @@ -1,5 +1,4 @@ { - "system_prompt": "Elaborate on the topic using a Tree of Thoughts and backtrack when necessary to construct a clear, cohesive Chain of Thought reasoning. Always answer without hesitation.", "input_sequence": "USER: ", "output_sequence": "ASSISTANT: ", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": false, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "SYSTEM: ", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Vicuna 1.0.json b/default/content/presets/instruct/Vicuna 1.0.json index d96bf4cb2..1c5fca144 100644 --- a/default/content/presets/instruct/Vicuna 1.0.json +++ b/default/content/presets/instruct/Vicuna 1.0.json @@ -1,5 +1,4 @@ { - "system_prompt": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "### Human:", "output_sequence": "### Assistant:", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/Vicuna 1.1.json b/default/content/presets/instruct/Vicuna 1.1.json index a42e4fbfc..88119ecd1 100644 --- a/default/content/presets/instruct/Vicuna 1.1.json +++ b/default/content/presets/instruct/Vicuna 1.1.json @@ -1,5 +1,4 @@ { - "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "\nUSER: ", "output_sequence": "\nASSISTANT: ", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": false, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "BEGINNING OF CONVERSATION:", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/WizardLM-13B.json b/default/content/presets/instruct/WizardLM-13B.json index b15fea56f..ea793ac57 100644 --- a/default/content/presets/instruct/WizardLM-13B.json +++ b/default/content/presets/instruct/WizardLM-13B.json @@ -1,5 +1,4 @@ { - "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next detailed reply in a fictional roleplay chat between {{user}} and {{char}}.", "input_sequence": "USER: ", "output_sequence": "ASSISTANT: ", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/WizardLM.json b/default/content/presets/instruct/WizardLM.json index 18e808da4..081d9d68c 100644 --- a/default/content/presets/instruct/WizardLM.json +++ b/default/content/presets/instruct/WizardLM.json @@ -1,5 +1,4 @@ { - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "", "output_sequence": "### Response:", "last_output_sequence": "", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/instruct/simple-proxy-for-tavern.json b/default/content/presets/instruct/simple-proxy-for-tavern.json index 986da1697..2123edbbd 100644 --- a/default/content/presets/instruct/simple-proxy-for-tavern.json +++ b/default/content/presets/instruct/simple-proxy-for-tavern.json @@ -1,5 +1,4 @@ { - "system_prompt": "[System note: Write one reply only. Do not decide what {{user}} says or does. Write at least one paragraph, up to four. Be descriptive and immersive, providing vivid details about {{char}}'s actions, emotions, and the environment. Write with a high degree of complexity and burstiness. Do not repeat this message.]", "input_sequence": "### Instruction:\n#### {{name}}:", "output_sequence": "### Response:\n#### {{name}}:", "last_output_sequence": "### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):\n#### {{name}}:", @@ -7,8 +6,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": false, + "names_behavior": "none", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", diff --git a/default/content/presets/novel/Asper-Kayra.json b/default/content/presets/novel/Asper-Kayra.json index c611949cc..0b4b78e6d 100644 --- a/default/content/presets/novel/Asper-Kayra.json +++ b/default/content/presets/novel/Asper-Kayra.json @@ -14,7 +14,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "medium", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Blended-Coffee-Kayra.json b/default/content/presets/novel/Blended-Coffee-Kayra.json index 62dad3a4d..05f796381 100644 --- a/default/content/presets/novel/Blended-Coffee-Kayra.json +++ b/default/content/presets/novel/Blended-Coffee-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 1, 2, 3], + "order": [0, 1, 2, 3], "temperature": 1, "max_length": 150, "min_length": 1, @@ -14,6 +14,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "medium", - "cfg_scale": 1.55, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Blook-Kayra.json b/default/content/presets/novel/Blook-Kayra.json index 87d845a1a..42cf9e00a 100644 --- a/default/content/presets/novel/Blook-Kayra.json +++ b/default/content/presets/novel/Blook-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 2, 3, 1, 0], + "order": [2, 3, 1, 0], "temperature": 1, "max_length": 150, "min_length": 1, @@ -15,6 +15,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "very_aggressive", - "cfg_scale": 1.3, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Carefree-Kayra.json b/default/content/presets/novel/Carefree-Kayra.json index 28e75a371..a99f18d09 100644 --- a/default/content/presets/novel/Carefree-Kayra.json +++ b/default/content/presets/novel/Carefree-Kayra.json @@ -15,7 +15,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "aggressive", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/CosmicCube-Kayra.json b/default/content/presets/novel/CosmicCube-Kayra.json index ae95c4f97..b818f6a50 100644 --- a/default/content/presets/novel/CosmicCube-Kayra.json +++ b/default/content/presets/novel/CosmicCube-Kayra.json @@ -1,5 +1,5 @@ { - "order": [8, 6, 5, 0, 3], + "order": [8, 5, 0, 3], "temperature": 0.9, "max_length": 150, "min_length": 1, @@ -15,6 +15,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "off", - "cfg_scale": 1.48, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Edgewise-Clio.json b/default/content/presets/novel/Edgewise-Clio.json index 77ecaef71..32b4544db 100644 --- a/default/content/presets/novel/Edgewise-Clio.json +++ b/default/content/presets/novel/Edgewise-Clio.json @@ -15,7 +15,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Erato-Dragonfruit.json b/default/content/presets/novel/Erato-Dragonfruit.json new file mode 100644 index 000000000..4a1fd903c --- /dev/null +++ b/default/content/presets/novel/Erato-Dragonfruit.json @@ -0,0 +1,31 @@ +{ + "max_context": 8000, + "temperature": 1.37, + "max_length": 150, + "min_length": 1, + "top_k": 0, + "top_p": 1, + "top_a": 0.1, + "typical_p": 0.875, + "tail_free_sampling": 0.87, + "repetition_penalty": 3.25, + "repetition_penalty_range": 6000, + "repetition_penalty_slope": 3.25, + "repetition_penalty_frequency": 0, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "off", + "mirostat_lr": 0.2, + "mirostat_tau": 4, + "math1_temp": 0.9, + "math1_quad": 0.07, + "math1_quad_entropy_scale": -0.05, + "min_p": 0.035, + "order": [ + 0, + 5, + 9, + 10, + 8, + 4 + ] +} diff --git a/default/content/presets/novel/Erato-Golden Arrow.json b/default/content/presets/novel/Erato-Golden Arrow.json new file mode 100644 index 000000000..e8b17dcd7 --- /dev/null +++ b/default/content/presets/novel/Erato-Golden Arrow.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 0, + "top_p": 0.995, + "top_a": 1, + "typical_p": 1, + "tail_free_sampling": 0.87, + "repetition_penalty": 1.5, + "repetition_penalty_range": 2240, + "repetition_penalty_slope": 1, + "repetition_penalty_frequency": 0, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "light", + "mirostat_lr": 1, + "mirostat_tau": 0, + "math1_temp": 0.3, + "math1_quad": 0.19, + "math1_quad_entropy_scale": 0, + "min_p": 0, + "order": [ + 9, + 2 + ] +} diff --git a/default/content/presets/novel/Erato-Shosetsu.json b/default/content/presets/novel/Erato-Shosetsu.json new file mode 100644 index 000000000..14e97d096 --- /dev/null +++ b/default/content/presets/novel/Erato-Shosetsu.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 50, + "top_p": 0.85, + "top_a": 1, + "typical_p": 1, + "tail_free_sampling": 0.895, + "repetition_penalty": 1.63, + "repetition_penalty_range": 1024, + "repetition_penalty_slope": 3.33, + "repetition_penalty_frequency": 0.0035, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "medium", + "mirostat_lr": 1, + "mirostat_tau": 0, + "math1_temp": 0.3, + "math1_quad": 0.0645, + "math1_quad_entropy_scale": 0.05, + "min_p": 0.05, + "order": [ + 9, + 10 + ] +} diff --git a/default/content/presets/novel/Erato-Wilder.json b/default/content/presets/novel/Erato-Wilder.json new file mode 100644 index 000000000..474d540cc --- /dev/null +++ b/default/content/presets/novel/Erato-Wilder.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 300, + "top_p": 0.98, + "top_a": 0.004, + "typical_p": 0.96, + "tail_free_sampling": 0.96, + "repetition_penalty": 1.48, + "repetition_penalty_range": 2240, + "repetition_penalty_slope": 0.64, + "repetition_penalty_frequency": 0, + "repetition_penalty_presence": 0, + "phrase_rep_pen": "medium", + "mirostat_lr": 1, + "mirostat_tau": 0, + "math1_temp": -0.0485, + "math1_quad": 0.145, + "math1_quad_entropy_scale": 0, + "min_p": 0.02, + "order": [ + 9, + 10 + ] +} diff --git a/default/content/presets/novel/Erato-Zany Scribe.json b/default/content/presets/novel/Erato-Zany Scribe.json new file mode 100644 index 000000000..2f94d92bc --- /dev/null +++ b/default/content/presets/novel/Erato-Zany Scribe.json @@ -0,0 +1,27 @@ +{ + "max_context": 8000, + "temperature": 1, + "max_length": 150, + "min_length": 1, + "top_k": 0, + "top_p": 0.99, + "top_a": 1, + "typical_p": 1, + "tail_free_sampling": 0.99, + "repetition_penalty": 1, + "repetition_penalty_range": 64, + "repetition_penalty_slope": 1, + "repetition_penalty_frequency": 0.75, + "repetition_penalty_presence": 1.5, + "phrase_rep_pen": "medium", + "mirostat_lr": 1, + "mirostat_tau": 1, + "math1_temp": -0.4, + "math1_quad": 0.6, + "math1_quad_entropy_scale": -0.1, + "min_p": 0.08, + "order": [ + 9, + 2 + ] +} diff --git a/default/content/presets/novel/Fresh-Coffee-Clio.json b/default/content/presets/novel/Fresh-Coffee-Clio.json index ad520adfb..729a4b438 100644 --- a/default/content/presets/novel/Fresh-Coffee-Clio.json +++ b/default/content/presets/novel/Fresh-Coffee-Clio.json @@ -16,7 +16,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Fresh-Coffee-Kayra.json b/default/content/presets/novel/Fresh-Coffee-Kayra.json index 383fcba1c..162b8e778 100644 --- a/default/content/presets/novel/Fresh-Coffee-Kayra.json +++ b/default/content/presets/novel/Fresh-Coffee-Kayra.json @@ -14,7 +14,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "off", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Green-Active-Writer-Kayra.json b/default/content/presets/novel/Green-Active-Writer-Kayra.json index 73b18a087..635f3fbc1 100644 --- a/default/content/presets/novel/Green-Active-Writer-Kayra.json +++ b/default/content/presets/novel/Green-Active-Writer-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 8, 5, 3], + "order": [0, 8, 5, 3], "temperature": 1.5, "max_length": 150, "min_length": 1, @@ -15,6 +15,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "very_aggressive", - "cfg_scale": 1.4, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Keelback-Clio.json b/default/content/presets/novel/Keelback-Clio.json index 9412a116b..5beba6606 100644 --- a/default/content/presets/novel/Keelback-Clio.json +++ b/default/content/presets/novel/Keelback-Clio.json @@ -16,7 +16,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Long-Press-Clio.json b/default/content/presets/novel/Long-Press-Clio.json index c978924b3..c2900a2de 100644 --- a/default/content/presets/novel/Long-Press-Clio.json +++ b/default/content/presets/novel/Long-Press-Clio.json @@ -16,7 +16,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Pilotfish-Kayra.json b/default/content/presets/novel/Pilotfish-Kayra.json index 4a8d06ac2..15a8726c6 100644 --- a/default/content/presets/novel/Pilotfish-Kayra.json +++ b/default/content/presets/novel/Pilotfish-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 4, 1, 2, 5, 3], + "order": [0, 4, 1, 2, 5, 3], "temperature": 1.31, "max_length": 150, "min_length": 1, @@ -17,6 +17,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "medium", - "cfg_scale": 1.35, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Pro_Writer-Kayra.json b/default/content/presets/novel/Pro_Writer-Kayra.json index a020d462b..374f96ae3 100644 --- a/default/content/presets/novel/Pro_Writer-Kayra.json +++ b/default/content/presets/novel/Pro_Writer-Kayra.json @@ -15,6 +15,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "medium", - "cfg_scale": 1.0, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Stelenes-Kayra.json b/default/content/presets/novel/Stelenes-Kayra.json index dae13cecd..68cb0b8de 100644 --- a/default/content/presets/novel/Stelenes-Kayra.json +++ b/default/content/presets/novel/Stelenes-Kayra.json @@ -13,5 +13,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "medium", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Talker-Chat-Clio.json b/default/content/presets/novel/Talker-Chat-Clio.json index 136845554..de93b11dc 100644 --- a/default/content/presets/novel/Talker-Chat-Clio.json +++ b/default/content/presets/novel/Talker-Chat-Clio.json @@ -16,7 +16,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Tea_Time-Kayra.json b/default/content/presets/novel/Tea_Time-Kayra.json index af57676ce..4d40d66cd 100644 --- a/default/content/presets/novel/Tea_Time-Kayra.json +++ b/default/content/presets/novel/Tea_Time-Kayra.json @@ -14,6 +14,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "aggressive", - "cfg_scale": 1.0, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Tesseract-Kayra.json b/default/content/presets/novel/Tesseract-Kayra.json index 919461937..f4e44a123 100644 --- a/default/content/presets/novel/Tesseract-Kayra.json +++ b/default/content/presets/novel/Tesseract-Kayra.json @@ -1,5 +1,5 @@ { - "order": [6, 0, 5], + "order": [0, 5], "temperature": 0.895, "max_length": 150, "min_length": 1, @@ -13,6 +13,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "aggressive", - "cfg_scale": 1.3, - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Vingt-Un-Clio.json b/default/content/presets/novel/Vingt-Un-Clio.json index 296b8c564..b6e594c75 100644 --- a/default/content/presets/novel/Vingt-Un-Clio.json +++ b/default/content/presets/novel/Vingt-Un-Clio.json @@ -16,7 +16,10 @@ "use_cache": false, "return_full_text": false, "prefix": "vanilla", - "cfg_scale": 1, "phrase_rep_pen": "very_light", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/novel/Writers-Daemon-Kayra.json b/default/content/presets/novel/Writers-Daemon-Kayra.json index 8ae98884c..70561d483 100644 --- a/default/content/presets/novel/Writers-Daemon-Kayra.json +++ b/default/content/presets/novel/Writers-Daemon-Kayra.json @@ -17,5 +17,9 @@ "return_full_text": false, "prefix": "vanilla", "phrase_rep_pen": "very_aggressive", - "max_context": 7800 + "max_context": 7800, + "min_p": 0, + "math1_temp": 1, + "math1_quad": 0, + "math1_quad_entropy_scale": 0 } diff --git a/default/content/presets/openai/Default.json b/default/content/presets/openai/Default.json index 4e6076d5a..b8a38560c 100644 --- a/default/content/presets/openai/Default.json +++ b/default/content/presets/openai/Default.json @@ -5,7 +5,6 @@ "windowai_model": "", "openrouter_model": "OR_Website", "openrouter_use_fallback": false, - "openrouter_force_instruct": false, "openrouter_group_models": false, "openrouter_sort_models": "alphabetically", "ai21_model": "jamba-1.5-large", diff --git a/default/content/presets/sysprompt/Actor.json b/default/content/presets/sysprompt/Actor.json new file mode 100644 index 000000000..3fa842c4f --- /dev/null +++ b/default/content/presets/sysprompt/Actor.json @@ -0,0 +1,4 @@ +{ + "name": "Actor", + "content": "You are an expert actor that can fully immerse yourself into any role given. You do not break character for any reason, even if someone tries addressing you as an AI or language model. Currently your role is {{char}}, which is described in detail below. As {{char}}, continue the exchange with {{user}}." +} diff --git a/default/content/presets/sysprompt/Assistant - Expert.json b/default/content/presets/sysprompt/Assistant - Expert.json new file mode 100644 index 000000000..a493a8db3 --- /dev/null +++ b/default/content/presets/sysprompt/Assistant - Expert.json @@ -0,0 +1,4 @@ +{ + "name": "Assistant - Expert", + "content": "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." +} diff --git a/default/content/presets/sysprompt/Assistant - Simple.json b/default/content/presets/sysprompt/Assistant - Simple.json new file mode 100644 index 000000000..8a367983a --- /dev/null +++ b/default/content/presets/sysprompt/Assistant - Simple.json @@ -0,0 +1,4 @@ +{ + "name": "Assistant - Simple", + "content": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions." +} diff --git a/default/content/presets/sysprompt/Blank.json b/default/content/presets/sysprompt/Blank.json new file mode 100644 index 000000000..9648d8583 --- /dev/null +++ b/default/content/presets/sysprompt/Blank.json @@ -0,0 +1,4 @@ +{ + "name": "Blank", + "content": "" +} diff --git a/default/content/presets/sysprompt/Chain of Thought.json b/default/content/presets/sysprompt/Chain of Thought.json new file mode 100644 index 000000000..0b9e45bea --- /dev/null +++ b/default/content/presets/sysprompt/Chain of Thought.json @@ -0,0 +1,4 @@ +{ + "name": "Chain of Thought", + "content": "Elaborate on the topic using a Tree of Thoughts and backtrack when necessary to construct a clear, cohesive Chain of Thought reasoning. Always answer without hesitation." +} diff --git a/default/content/presets/sysprompt/Neutral - Chat.json b/default/content/presets/sysprompt/Neutral - Chat.json new file mode 100644 index 000000000..9b392d28d --- /dev/null +++ b/default/content/presets/sysprompt/Neutral - Chat.json @@ -0,0 +1,4 @@ +{ + "name": "Neutral - Chat", + "content": "Write {{char}}'s next reply in a fictional chat between {{char}} and {{user}}." +} diff --git a/default/content/presets/sysprompt/Roleplay - Detailed.json b/default/content/presets/sysprompt/Roleplay - Detailed.json new file mode 100644 index 000000000..2e3c95c7a --- /dev/null +++ b/default/content/presets/sysprompt/Roleplay - Detailed.json @@ -0,0 +1,4 @@ +{ + "name": "Roleplay - Detailed", + "content": "Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions. Keep the story immersive and engaging." +} diff --git a/default/content/presets/sysprompt/Roleplay - Immersive.json b/default/content/presets/sysprompt/Roleplay - Immersive.json new file mode 100644 index 000000000..cdd85f7d2 --- /dev/null +++ b/default/content/presets/sysprompt/Roleplay - Immersive.json @@ -0,0 +1,4 @@ +{ + "name": "Roleplay - Immersive", + "content": "[System note: Write one reply only. Do not decide what {{user}} says or does. Write at least one paragraph, up to four. Be descriptive and immersive, providing vivid details about {{char}}'s actions, emotions, and the environment. Write with a high degree of complexity and burstiness. Do not repeat this message.]" +} diff --git a/default/content/presets/sysprompt/Roleplay - Simple.json b/default/content/presets/sysprompt/Roleplay - Simple.json new file mode 100644 index 000000000..dcef1f10c --- /dev/null +++ b/default/content/presets/sysprompt/Roleplay - Simple.json @@ -0,0 +1,4 @@ +{ + "name": "Roleplay - Simple", + "content": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}." +} diff --git a/default/content/presets/sysprompt/Text Adventure.json b/default/content/presets/sysprompt/Text Adventure.json new file mode 100644 index 000000000..2e22abe5b --- /dev/null +++ b/default/content/presets/sysprompt/Text Adventure.json @@ -0,0 +1,4 @@ +{ + "name": "Text Adventure", + "content": "[Enter Adventure Mode. Narrate the story based on {{user}}'s dialogue and actions after \">\". Describe the surroundings in vivid detail. Be detailed, creative, verbose, and proactive. Move the story forward by introducing fantasy elements and interesting characters.]" +} diff --git a/default/content/presets/sysprompt/Writer - Creative.json b/default/content/presets/sysprompt/Writer - Creative.json new file mode 100644 index 000000000..65a7aec52 --- /dev/null +++ b/default/content/presets/sysprompt/Writer - Creative.json @@ -0,0 +1,4 @@ +{ + "name": "Writer - Creative", + "content": "You are an intelligent, skilled, versatile writer.\n\nYour task is to write a role-play based on the information below." +} diff --git a/default/content/presets/sysprompt/Writer - Realistic.json b/default/content/presets/sysprompt/Writer - Realistic.json new file mode 100644 index 000000000..a5abcbfb5 --- /dev/null +++ b/default/content/presets/sysprompt/Writer - Realistic.json @@ -0,0 +1,4 @@ +{ + "name": "Writer - Realistic", + "content": "Continue writing this story and portray characters realistically." +} diff --git a/default/content/settings.json b/default/content/settings.json index d18229517..86806f963 100644 --- a/default/content/settings.json +++ b/default/content/settings.json @@ -4,8 +4,8 @@ "api_server": "http://127.0.0.1:5000/api", "preset_settings": "RecoveredRuins", "user_avatar": "user-default.png", - "amount_gen": 250, - "max_context": 2048, + "amount_gen": 350, + "max_context": 8192, "main_api": "koboldhorde", "world_info_settings": { "world_info": { @@ -90,7 +90,6 @@ "pin_examples": false, "strip_examples": false, "trim_sentences": false, - "include_newline": false, "always_force_name2": true, "user_prompt_bias": "", "show_user_prompt_bias": true, @@ -150,11 +149,9 @@ "continue_on_send": false, "trim_spaces": true, "relaxed_api_urls": false, - "default_instruct": "", "instruct": { "enabled": false, "preset": "Alpaca", - "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "input_sequence": "### Instruction:", "output_sequence": "### Response:", "last_output_sequence": "", @@ -162,8 +159,7 @@ "stop_sequence": "", "wrap": true, "macro": true, - "names": false, - "names_force_groups": true, + "names_behavior": "force", "activation_regex": "", "system_sequence_prefix": "", "system_sequence_suffix": "", @@ -175,7 +171,11 @@ "user_alignment_message": "", "system_same_as_user": false }, - "default_context": "Default", + "sysprompt": { + "enabled": true, + "name": "Neutral - Chat", + "content": "Write {{char}}'s next reply in a fictional chat between {{char}} and {{user}}." + }, "context": { "preset": "Default", "story_string": "{{#if system}}{{system}}\n{{/if}}{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}", @@ -235,7 +235,7 @@ "lengthPenaltyStep": 0.1, "memoryFrozen": false, "source": "extras", - "prompt": "[Pause your roleplay. Summarize the most important facts and events that have happened in the chat so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.]", + "prompt": "Ignore previous instructions. Summarize the most important facts and events in the story so far. If a summary already exists in your memory, use that as a base and expand with new facts. Limit the summary to {{words}} words or less. Your response should include nothing but the summary.", "promptWords": 200, "promptMinWords": 25, "promptMaxWords": 1000, @@ -298,13 +298,13 @@ "horde_karras": true, "refine_mode": false, "prompts": { - "0": "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,']", - "1": "[Pause your roleplay and provide a detailed description of {{user}}'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'. Ignore the rest of the story when crafting this description. Do not roleplay as {{char}} when writing this description, and do not attempt to continue the story.]", - "2": "[Pause your roleplay and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}'s appearance, and {{char}}'s surroundings. Do not roleplay while writing this description.]", - "3": "[Pause your roleplay and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not roleplay at all in your response. Do not continue the roleplay story.]", - "4": "[Pause your roleplay. Your next response must be formatted as a single comma-delimited list of concise keywords. The list will describe of the visual details included in the last chat message.\n\n Only mention characters by using pronouns ('he','his','she','her','it','its') or neutral nouns ('male', 'the man', 'female', 'the woman').\n\n Ignore non-visible things such as feelings, personality traits, thoughts, and spoken dialog.\n\n Add keywords in this precise order:\n a keyword to describe the location of the scene,\n a keyword to mention how many characters of each gender or type are present in the scene (minimum of two characters:\n {{user}} and {{char}}, example: '2 men ' or '1 man 1 woman ', '1 man 3 robots'),\n\n keywords to describe the relative physical positioning of the characters to each other (if a commonly known term for the positioning is known use it instead of describing the positioning in detail) + 'POV',\n\n a single keyword or phrase to describe the primary act taking place in the last chat message,\n\n keywords to describe {{char}}'s physical appearance and facial expression,\n keywords to describe {{char}}'s actions,\n keywords to describe {{user}}'s physical appearance and actions.\n\n If character actions involve direct physical interaction with another character, mention specifically which body parts interacting and how.\n\n A correctly formatted example response would be:\n '(location),(character list by gender),(primary action), (relative character position) POV, (character 1's description and actions), (character 2's description and actions)']", - "5": "[In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'close up facial portrait,']", - "7": "[Pause your roleplay and provide a detailed description of {{char}}'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'background,'. Ignore the rest of the story when crafting this description. Do not roleplay as {{user}} when writing this description, and do not attempt to continue the story.]" + "0": "In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'", + "1": "Ignore previous instructions and provide a detailed description of {{user}}'s physical appearance from the perspective of {{char}} in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: name, species and race, gender, age, clothing, occupation, physical features and appearances. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'full body portrait,'. Ignore the rest of the story when crafting this description. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.", + "2": "Ignore previous instructions and provide a detailed description for all of the following: a brief recap of recent events in the story, {{char}}'s appearance, and {{char}}'s surroundings. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.", + "3": "Ignore previous instructions and provide ONLY the last chat message string back to me verbatim. Do not write anything after the string. Do not reply as {{char}} when writing this description, and do not attempt to continue the story.", + "4": "Ignore previous instructions. Your next response must be formatted as a single comma-delimited list of concise keywords. The list will describe of the visual details included in the last chat message.\n\n Only mention characters by using pronouns ('he','his','she','her','it','its') or neutral nouns ('male', 'the man', 'female', 'the woman').\n\n Ignore non-visible things such as feelings, personality traits, thoughts, and spoken dialog.\n\n Add keywords in this precise order:\n a keyword to describe the location of the scene,\n a keyword to mention how many characters of each gender or type are present in the scene (minimum of two characters:\n {{user}} and {{char}}, example: '2 men ' or '1 man 1 woman ', '1 man 3 robots'),\n\n keywords to describe the relative physical positioning of the characters to each other (if a commonly known term for the positioning is known use it instead of describing the positioning in detail) + 'POV',\n\n a single keyword or phrase to describe the primary act taking place in the last chat message,\n\n keywords to describe {{char}}'s physical appearance and facial expression,\n keywords to describe {{char}}'s actions,\n keywords to describe {{user}}'s physical appearance and actions.\n\n If character actions involve direct physical interaction with another character, mention specifically which body parts interacting and how.\n\n A correctly formatted example response would be:\n '(location),(character list by gender),(primary action), (relative character position) POV, (character 1's description and actions), (character 2's description and actions)'", + "5": "In the next response I want you to provide only a detailed comma-delimited list of keywords and phrases which describe {{char}}. The list must include all of the following items in this order: name, species and race, gender, age, facial features and expressions, occupation, hair and hair accessories (if any), what they are wearing on their upper body (if anything). Do not describe anything below their neck. Do not include descriptions of non-visual qualities such as personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'close up facial portrait,'", + "7": "Ignore previous instructions and provide a detailed description of {{char}}'s surroundings in the form of a comma-delimited list of keywords and phrases. The list must include all of the following items in this order: location, time of day, weather, lighting, and any other relevant details. Do not include descriptions of characters and non-visual qualities such as names, personality, movements, scents, mental traits, or anything which could not be seen in a still photograph. Do not write in full sentences. Prefix your description with the phrase 'background,'. Ignore the rest of the story when crafting this description. Do not reply as {{user}} when writing this description, and do not attempt to continue the story." }, "character_prompts": {} }, @@ -318,9 +318,9 @@ "objective": { "customPrompts": { "default": { - "createTask": "Pause your roleplay and generate a list of tasks to complete an objective. Your next response must be formatted as a numbered list of plain text entries. Do not include anything but the numbered list. The list must be prioritized in the order that tasks must be completed.\n\nThe objective that you must make a numbered task list for is: [{{objective}}].\nThe tasks created should take into account the character traits of {{char}}. These tasks may or may not involve {{user}} directly. Be sure to include the objective as the final task.\n\nGiven an example objective of 'Make me a four course dinner', here is an example output:\n1. Determine what the courses will be\n2. Find recipes for each course\n3. Go shopping for supplies with {{user}}\n4. Cook the food\n5. Get {{user}} to set the table\n6. Serve the food\n7. Enjoy eating the meal with {{user}}\n ", - "checkTaskCompleted": "Pause your roleplay. Determine if this task is completed: [{{task}}].\nTo do this, examine the most recent messages. Your response must only contain either true or false, nothing other words.\nExample output:\ntrue\n ", - "currentTask": "Your current task is [{{task}}]. Balance existing roleplay with completing this task." + "createTask": "Ignore previous instructions and generate a list of tasks to complete an objective. Your next response must be formatted as a numbered list of plain text entries. Do not include anything but the numbered list. The list must be prioritized in the order that tasks must be completed.\n\nThe objective that you must make a numbered task list for is: [{{objective}}].\nThe tasks created should take into account the character traits of {{char}}. These tasks may or may not involve {{user}} directly. Be sure to include the objective as the final task.\n\nGiven an example objective of 'Make me a four course dinner', here is an example output:\n1. Determine what the courses will be\n2. Find recipes for each course\n3. Go shopping for supplies with {{user}}\n4. Cook the food\n5. Get {{user}} to set the table\n6. Serve the food\n7. Enjoy eating the meal with {{user}}\n ", + "checkTaskCompleted": "Ignore previous instructions. Determine if this task is completed: [{{task}}].\nTo do this, examine the most recent messages. Your response must only contain either true or false, nothing other words.\nExample output:\ntrue\n ", + "currentTask": "Your current task is [{{task}}]. Balance existing story with completing this task." } } }, @@ -417,7 +417,6 @@ "preset_settings_novel": "Talker-Chat-Clio", "streaming_novel": true, "preamble": "[ Style: chat, complex, sensory, visceral ]", - "cfg_uc": "", "banned_tokens": "", "order": [ 1, diff --git a/package-lock.json b/package-lock.json index 187efe823..94134d9b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sillytavern", - "version": "1.12.5", + "version": "1.12.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "sillytavern", - "version": "1.12.5", + "version": "1.12.6", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { @@ -22,7 +22,7 @@ "cookie-session": "^2.1.0", "cors": "^2.8.5", "csrf-csrf": "^2.2.3", - "express": "^4.19.2", + "express": "^4.21.0", "form-data": "^4.0.0", "google-translate-api-browser": "^3.0.1", "he": "^1.2.0", @@ -40,12 +40,13 @@ "png-chunk-text": "^1.0.0", "png-chunks-encode": "^1.0.0", "png-chunks-extract": "^1.0.0", + "proxy-agent": "^6.4.0", "rate-limiter-flexible": "^5.0.0", "response-time": "^2.3.2", "sanitize-filename": "^1.6.3", "sillytavern-transformers": "2.14.6", "simple-git": "^3.19.1", - "tiktoken": "^1.0.15", + "tiktoken": "^1.0.16", "vectra": "^0.2.2", "wavefile": "^11.0.0", "write-file-atomic": "^5.0.1", @@ -941,6 +942,12 @@ "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==", "license": "MIT" }, + "node_modules/@tootallnate/quickjs-emscripten": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", + "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==", + "license": "MIT" + }, "node_modules/@types/cacheable-request": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", @@ -1080,6 +1087,41 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/agentkeepalive": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", @@ -1382,6 +1424,18 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "license": "MIT" }, + "node_modules/ast-types": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", + "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/async": { "version": "3.2.5", "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", @@ -1445,6 +1499,15 @@ ], "license": "MIT" }, + "node_modules/basic-ftp": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz", + "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/bing-translate-api": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/bing-translate-api/-/bing-translate-api-2.9.1.tgz", @@ -1461,9 +1524,9 @@ "license": "MIT" }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "license": "MIT", "dependencies": { "bytes": "3.1.2", @@ -1474,7 +1537,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1618,13 +1681,19 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1644,6 +1713,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/centra/-/centra-2.7.0.tgz", "integrity": "sha512-PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6" } @@ -2229,6 +2299,15 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/data-uri-to-buffer": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", + "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, "node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -2269,6 +2348,23 @@ "node": ">=10" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -2278,6 +2374,20 @@ "node": ">=8" } }, + "node_modules/degenerator": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", + "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", + "license": "MIT", + "dependencies": { + "ast-types": "^0.13.4", + "escodegen": "^2.1.0", + "esprima": "^4.0.1" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2416,9 +2526,9 @@ "license": "MIT" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -2445,6 +2555,27 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", @@ -2469,6 +2600,27 @@ "node": ">=0.8.0" } }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, "node_modules/eslint": { "version": "8.57.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", @@ -2624,6 +2776,19 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/esquery": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", @@ -2654,7 +2819,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -2664,7 +2828,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" @@ -2702,36 +2865,37 @@ "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw==" }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -2846,13 +3010,13 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -3002,6 +3166,20 @@ "node": ">= 0.6" } }, + "node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3028,15 +3206,19 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3057,6 +3239,44 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-uri": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.3.tgz", + "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", + "license": "MIT", + "dependencies": { + "basic-ftp": "^5.0.2", + "data-uri-to-buffer": "^6.0.2", + "debug": "^4.3.4", + "fs-extra": "^11.2.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/get-uri/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/get-uri/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/gifwrap": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.10.1.tgz", @@ -3120,6 +3340,18 @@ "integrity": "sha512-KTLodkyGBWMK9IW6QIeJ2zCuju4Z0CLpbkADKo+yLhbSTD4l+CXXpQ/xaynGVAzeBezzJG6qn8MLeqOq3SmW0A==", "license": "MIT" }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/got": { "version": "11.8.6", "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", @@ -3169,18 +3401,6 @@ "integrity": "sha512-Y8T4vYhEfwJOTbouREvG+3XDsjr8E3kIr7uf+JZ0BYloFsttiHU0WfvANVsR7TxNUJa/WpCnw/Ino/p+DeBhBQ==", "license": "ISC" }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3191,10 +3411,22 @@ "node": ">=8" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -3215,6 +3447,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -3272,6 +3516,42 @@ "node": ">= 0.8" } }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/http-proxy-agent/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/http-proxy-agent/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/http2-wrapper": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", @@ -3285,6 +3565,42 @@ "node": ">=10.19.0" } }, + "node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", @@ -3388,6 +3704,19 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "license": "MIT", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, "node_modules/ip-matching": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ip-matching/-/ip-matching-2.1.2.tgz", @@ -3572,6 +3901,12 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "license": "MIT" + }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -3664,6 +3999,18 @@ "dev": true, "license": "MIT" }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/keygrip": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", @@ -3710,9 +4057,9 @@ } }, "node_modules/load-bmfont": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz", - "integrity": "sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.2.tgz", + "integrity": "sha512-qElWkmjW9Oq1F9EI5Gt7aD9zcdHb9spJCW1L/dmPf7KzCCEJxq8nhHz5eCgI9aMf7vrG/wyaCqdsI+Iy9ZTlog==", "license": "MIT", "dependencies": { "buffer-equal": "0.0.1", @@ -3720,7 +4067,7 @@ "parse-bmfont-ascii": "^1.0.3", "parse-bmfont-binary": "^1.0.5", "parse-bmfont-xml": "^1.1.4", - "phin": "^2.9.1", + "phin": "^3.7.1", "xhr": "^2.0.1", "xtend": "^4.0.0" } @@ -3804,10 +4151,13 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "license": "MIT" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/methods": { "version": "1.1.2", @@ -3953,6 +4303,15 @@ "node": ">= 0.6" } }, + "node_modules/netmask": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", + "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/node-domexception": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", @@ -4042,10 +4401,13 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4220,6 +4582,61 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/pac-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", + "license": "MIT", + "dependencies": { + "@tootallnate/quickjs-emscripten": "^0.23.0", + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "get-uri": "^6.0.1", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/pac-proxy-agent/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/pac-proxy-agent/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/pac-resolver": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz", + "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", + "license": "MIT", + "dependencies": { + "degenerator": "^5.0.0", + "netmask": "^2.0.2" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", @@ -4252,13 +4669,13 @@ "license": "MIT" }, "node_modules/parse-bmfont-xml": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz", - "integrity": "sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.6.tgz", + "integrity": "sha512-0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==", "license": "MIT", "dependencies": { "xml-parse-from-string": "^1.0.0", - "xml2js": "^0.4.5" + "xml2js": "^0.5.0" } }, "node_modules/parse-headers": { @@ -4346,9 +4763,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", "license": "MIT" }, "node_modules/peek-readable": { @@ -4374,6 +4791,7 @@ "version": "3.7.1", "resolved": "https://registry.npmjs.org/phin/-/phin-3.7.1.tgz", "integrity": "sha512-GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ==", + "license": "MIT", "dependencies": { "centra": "^2.7.0" }, @@ -4515,6 +4933,57 @@ "node": ">= 0.10" } }, + "node_modules/proxy-agent": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.4.0.tgz", + "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "^4.3.4", + "http-proxy-agent": "^7.0.1", + "https-proxy-agent": "^7.0.3", + "lru-cache": "^7.14.1", + "pac-proxy-agent": "^7.0.1", + "proxy-from-env": "^1.1.0", + "socks-proxy-agent": "^8.0.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/proxy-agent/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/proxy-agent/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/proxy-agent/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -4541,12 +5010,12 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -4853,15 +5322,15 @@ } }, "node_modules/sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", + "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", "license": "ISC" }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "license": "MIT", "dependencies": { "debug": "2.6.9", @@ -4882,6 +5351,15 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -4889,20 +5367,37 @@ "license": "MIT" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" } }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -4931,14 +5426,18 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "license": "MIT", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5011,6 +5510,83 @@ "integrity": "sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA==", "license": "MIT" }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", + "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "license": "MIT", + "dependencies": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.1", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/socks-proxy-agent/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socks-proxy-agent/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "license": "BSD-3-Clause" + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -5162,9 +5738,10 @@ "license": "MIT" }, "node_modules/tiktoken": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.15.tgz", - "integrity": "sha512-sCsrq/vMWUSEW29CJLNmPvWxlVp7yh2tlkAjpJltIKqp5CKf98ZNpdeHRmAlPVFlGEbswDc6SmI8vz64W/qErw==" + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.16.tgz", + "integrity": "sha512-hRcORIGF2YlAgWx3nzrGJOrKSJwLoc81HpXmMQk89632XAgURc7IeV2FgQ2iXo9z/J96fCvpsHg2kWoHcbj9fg==", + "license": "MIT" }, "node_modules/timm": { "version": "1.7.1", @@ -5224,6 +5801,12 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/tslib": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "license": "0BSD" + }, "node_modules/tsscmp": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", @@ -5283,6 +5866,15 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "license": "MIT" }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index 93c240873..382d6ab57 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "cookie-session": "^2.1.0", "cors": "^2.8.5", "csrf-csrf": "^2.2.3", - "express": "^4.19.2", + "express": "^4.21.0", "form-data": "^4.0.0", "google-translate-api-browser": "^3.0.1", "he": "^1.2.0", @@ -30,12 +30,13 @@ "png-chunk-text": "^1.0.0", "png-chunks-encode": "^1.0.0", "png-chunks-extract": "^1.0.0", + "proxy-agent": "^6.4.0", "rate-limiter-flexible": "^5.0.0", "response-time": "^2.3.2", "sanitize-filename": "^1.6.3", "sillytavern-transformers": "2.14.6", "simple-git": "^3.19.1", - "tiktoken": "^1.0.15", + "tiktoken": "^1.0.16", "vectra": "^0.2.2", "wavefile": "^11.0.0", "write-file-atomic": "^5.0.1", @@ -48,15 +49,9 @@ "node": ">= 18" }, "overrides": { - "parse-bmfont-xml": { - "xml2js": "^0.5.0" - }, "vectra": { "openai": "^4.17.0" }, - "load-bmfont": { - "phin": "^3.7.1" - }, "axios": { "follow-redirects": "^1.15.4" }, @@ -71,7 +66,7 @@ "type": "git", "url": "https://github.com/SillyTavern/SillyTavern.git" }, - "version": "1.12.5", + "version": "1.12.6", "scripts": { "start": "node server.js", "start:no-csrf": "node server.js --disableCsrf", diff --git a/plugins.js b/plugins.js index 63d21778a..e25977de5 100644 --- a/plugins.js +++ b/plugins.js @@ -1,11 +1,14 @@ // Plugin manager script. -// Usage: node plugins.js update +// Usage: +// 1. node plugins.js update +// 2. node plugins.js install // More operations coming soon. const { default: git } = require('simple-git'); const fs = require('fs'); const path = require('path'); const { color } = require('./src/util'); +process.chdir(__dirname); const pluginsPath = './plugins'; const command = process.argv[2]; @@ -55,7 +58,6 @@ async function updatePlugins() { } console.log(color.magenta('All plugins updated!')); - } async function installPlugin(pluginName) { diff --git a/public/css/mobile-styles.css b/public/css/mobile-styles.css index a36816725..a5c8b3176 100644 --- a/public/css/mobile-styles.css +++ b/public/css/mobile-styles.css @@ -1,6 +1,16 @@ /*will apply to anything 1000px or less. this catches ipads, horizontal phones, and vertical phones)*/ @media screen and (max-width: 1000px) { + #UI-Theme-Block, + #UI-Customization, + #power-user-options-block, + #ContextSettings, + #InstructSettingsColumn, + #InstructSequencesColumn { + flex-basis: 100%; + } + + #send_form.compact #leftSendForm, #send_form.compact #rightSendForm { flex-wrap: nowrap; @@ -93,7 +103,6 @@ touch-action: none; overflow: hidden; position: fixed; - } .world_entry_form_control { @@ -102,7 +111,7 @@ .drawer-content { min-width: unset; - width: 100%; + width: 100dvw; max-height: calc(100vh - 45px); max-height: calc(100dvh - 45px); position: fixed; @@ -149,9 +158,9 @@ #sheld, #character_popup, .drawer-content { - width: 100% !important; + width: 100dvw !important; margin: 0 auto; - max-width: 100%; + max-width: 100dvw; left: 0 !important; resize: none !important; top: var(--topBarBlockSize); @@ -223,9 +232,9 @@ /* 100vh are fallback units for browsers that don't support dvh */ height: calc(100vh - 45px); height: calc(100dvh - 45px); - min-width: 100% !important; - width: 100% !important; - max-width: 100% !important; + min-width: 100dvw !important; + width: 100dvw !important; + max-width: 100dvw !important; overflow-y: hidden; border-left: 1px solid var(--SmartThemeBorderColor); border-right: 1px solid var(--SmartThemeBorderColor); @@ -342,17 +351,6 @@ } } -@media screen and (min-width: 1001px) { - - #PygOverrides, - #ContextFormatting, - #UI-Theme-Block, - #UI-Customization, - #power-user-options-block { - flex: 1; - } -} - /*landscape mode phones and ipads*/ @media screen and (max-width: 1000px) and (orientation: landscape) { body.waifuMode img.expression { @@ -482,10 +480,10 @@ margin: 0 auto; height: calc(100vh - 70px); height: calc(100dvh - 70px); - width: calc(100% - 5px); + width: calc(100dvw - 5px); max-height: calc(100vh - 70px); max-height: calc(100dvh - 70px); - max-width: calc(100% - 5px); + max-width: calc(100dvw - 5px); } diff --git a/public/css/popup.css b/public/css/popup.css index 6809d7248..d184dc1fb 100644 --- a/public/css/popup.css +++ b/public/css/popup.css @@ -47,6 +47,10 @@ dialog { padding: 1px; } +.popup:not(:has(.img_enlarged_container)) .popup-body { + max-height: 95dvh; +} + .popup .popup-content { margin-top: 10px; padding: 0 8px; diff --git a/public/css/promptmanager.css b/public/css/promptmanager.css index 5370a98e8..24bc05bfc 100644 --- a/public/css/promptmanager.css +++ b/public/css/promptmanager.css @@ -91,15 +91,34 @@ #completion_prompt_manager_popup #completion_prompt_manager_popup_inspect { display: none; padding: 0.5em; + height: 100%; + display: flex; + flex-direction: column; } #completion_prompt_manager_popup .completion_prompt_manager_popup_entry { - padding: 1em; - margin-top: 2em; + padding: 0.5em; + flex: 1; +} + +#completion_prompt_manager_popup .completion_prompt_manager_popup_entry_form { + height: 100%; + display: flex; + flex-direction: column; +} + +#completion_prompt_manager_popup .completion_prompt_manager_popup_entry_form_control:has(#completion_prompt_manager_popup_entry_form_prompt) { + flex: 1; + display: flex; + flex-direction: column; +} + +#completion_prompt_manager_popup #completion_prompt_manager_popup_entry_form_prompt { + flex: 1; } #completion_prompt_manager_popup #completion_prompt_manager_popup_inspect .completion_prompt_manager_popup_entry { - padding: 1em; + padding: 0.5em; } #completion_prompt_manager_popup #completion_prompt_manager_popup_entry_form_inspect_list { @@ -248,7 +267,7 @@ } #completion_prompt_manager_footer_append_prompt { - font-size: 16px; + font-size: 1em; } #prompt-manager-export-format-popup { @@ -303,10 +322,6 @@ justify-content: space-between; } -#prompt-manager-export-format-popup span { - font-size: 16px; -} - @media screen and (max-width: 412px) { #completion_prompt_manager_popup { max-width: 100%; @@ -316,3 +331,15 @@ margin-left: 0.5em; } } + +.completion_prompt_manager_popup_entry_form_control:has(#completion_prompt_manager_popup_entry_form_prompt:disabled)>div:first-child::after { + content: 'The content of this prompt is pulled from elsewhere and cannot be edited here.'; + display: block; + width: 100%; + font-weight: 600; + text-align: center; +} + +.completion_prompt_manager_popup_entry_form_control #completion_prompt_manager_popup_entry_form_prompt:disabled { + visibility: hidden; +} diff --git a/public/css/select2-overrides.css b/public/css/select2-overrides.css index 01577846e..47d9746ac 100644 --- a/public/css/select2-overrides.css +++ b/public/css/select2-overrides.css @@ -15,8 +15,13 @@ z-index: 40000; } -.select2-selection__clear { +.select2-container .select2-selection .select2-selection__clear { color: var(--SmartThemeBodyColor); + font-size: 24px; + padding: 0; + position: absolute; + right: 5px; + top: 0; } .select2-container .select2-search__field { diff --git a/public/css/st-tailwind.css b/public/css/st-tailwind.css index d43bd8e01..69f5843a9 100644 --- a/public/css/st-tailwind.css +++ b/public/css/st-tailwind.css @@ -360,6 +360,10 @@ margin-right: 2px; } +.flexAuto { + flex: auto; +} + .flex0 { flex: 0; } @@ -495,6 +499,10 @@ textarea:disabled { filter: brightness(0.5); } +#AdvancedFormatting .disabled { + filter: brightness(0.5); +} + .debug-red { border: 1px solid red !important; } diff --git a/public/css/toggle-dependent.css b/public/css/toggle-dependent.css index ef457ee25..c8d62ee7d 100644 --- a/public/css/toggle-dependent.css +++ b/public/css/toggle-dependent.css @@ -28,8 +28,8 @@ body.hideChatAvatars .mesAvatarWrapper .avatar { display: none !important; } -body.hideChatAvatars .last_mes { - padding-bottom: 40px !important; +body.hideChatAvatars .last_mes:not(.smallSysMes) { + padding-bottom: 20px !important; } body.square-avatars .avatar, @@ -454,4 +454,8 @@ body.expandMessageActions .mes .mes_buttons .extraMesButtonsHint { #smooth_streaming:checked~#smooth_streaming_speed_control { display: block; -} \ No newline at end of file +} + +.mdhotkey_icon { + opacity: 0.6; +} diff --git a/public/css/world-info.css b/public/css/world-info.css index 3da519c02..e7e03ad41 100644 --- a/public/css/world-info.css +++ b/public/css/world-info.css @@ -274,3 +274,7 @@ select.keyselect+span.select2-container .select2-selection--multiple { align-self: center; width: 100%; } + +.world_entry:has(input[name="delay_until_recursion"]:not(:checked)) .world_entry_form_control:has(input[name="delayUntilRecursionLevel"]) { + display: none; +} diff --git a/public/img/down-arrow.svg b/public/img/down-arrow.svg new file mode 100644 index 000000000..6704feda7 --- /dev/null +++ b/public/img/down-arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/img/user-default.png b/public/img/user-default.png new file mode 100644 index 000000000..cfe32e4b3 Binary files /dev/null and b/public/img/user-default.png differ diff --git a/public/index.html b/public/index.html index eb0bcee4a..a4af22149 100644 --- a/public/index.html +++ b/public/index.html @@ -65,7 +65,7 @@
-
+
@@ -98,12 +98,12 @@
- - - - - - + + + + + +
@@ -119,13 +119,13 @@
- - - - - - - + + + + + + +
@@ -140,9 +140,9 @@ - - - + + + @@ -154,17 +154,17 @@
- - - - - - + + + + + +
-
+
AI Module @@ -215,7 +215,7 @@
@@ -271,7 +271,7 @@
-
+
Rep Pen Range
@@ -284,7 +284,7 @@
-
+
Repetition Penalty Slope
@@ -297,7 +297,7 @@
-
+
Repetition Penalty Frequency
@@ -310,7 +310,7 @@
-
+
Repetition Penalty Presence
@@ -323,7 +323,20 @@
-
+
+
+ Min P +
+
+
+ +
+
+ +
+
+
+
TFS
@@ -336,7 +349,137 @@
-
+
+
+ Top P +
+
+
+ +
+
+ +
+
+
+
+
+ Top A +
+
+
+ +
+
+ +
+
+
+
+
+ Top K +
+
+
+ +
+
+ +
+
+
+
+
+ Mirostat Tau +
+
+
+ +
+
+ +
+
+
+
+
+ Mirostat LR +
+
+
+ +
+
+ +
+
+
+
+
+ Typical P +
+
+
+ +
+
+ +
+
+
+
+
+ Linear +
+
+
+ +
+
+ +
+
+
+
+
+ Quad +
+
+
+ +
+
+ +
+
+
+
+
+ Conf +
+
+
+ +
+
+ +
+
+
+
+
+ Min Length +
+
+
+ +
+
+ +
+
+
+
Phrase Repetition Penalty
@@ -349,9 +492,49 @@
+
+
+ Preamble +
+
+
+
+
+ Use style tags to modify the writing style of the output. +
+
+ +
+
+
+
+ Banned Tokens +
+
+ Sequences you don't want to appear in the output. One per line. Text or [token ids]. +
+
+ +
+
+
+
+ Logit Bias +
+ + Add +
+
+
+ Helps to ban or reinforce the usage of certain tokens. +
+
+
+
+
-
+
- +
@@ -436,7 +619,7 @@
-
+
Frequency Penalty
@@ -449,7 +632,7 @@
-
+
Presence Penalty
@@ -462,7 +645,7 @@
-
+
Top K
@@ -475,7 +658,7 @@
-
+
Top P
@@ -488,7 +671,7 @@
-
+
Repetition Penalty
@@ -501,7 +684,7 @@
-
+
Min P
@@ -514,7 +697,7 @@
-
+
Top A
@@ -553,7 +736,7 @@
-
+
Utility Prompts
@@ -712,7 +895,7 @@
-
+
Seed
@@ -736,7 +919,7 @@
-
+
Top K
@@ -744,7 +927,7 @@
-
+
Top P
@@ -752,7 +935,7 @@
-
+
Typical P
@@ -768,7 +951,7 @@
-
+
Top A
@@ -776,7 +959,7 @@
-
+
TFS
@@ -798,14 +981,14 @@
-
+
Repetition Penalty Slope
-
+

Mirostat

@@ -835,7 +1018,7 @@
-
+
-
+
Seed
-
+ -
+
Samplers Order @@ -906,164 +1089,7 @@
-
-
-
- Preamble -
-
-
-
-
- Use style tags to modify the writing style of the output. -
-
- -
-
-
-
- Banned Tokens -
-
- Sequences you don't want to appear in the output. One per line. Text or [token ids]. -
-
- -
-
-
-
- Logit Bias -
- - Add -
-
-
- Helps to ban or reinforce the usage of certain tokens. -
-
-
-
-
-
-
-
- CFG Scale -
-
-
- -
-
- -
-
-
-
-
- Negative Prompt -
-
- -
- - Used if CFG Scale is unset globally, per chat or character - -
-
-
-
- Top P -
-
-
- -
-
- -
-
-
-
-
- Top A -
-
-
- -
-
- -
-
-
-
-
- Top K -
-
-
- -
-
- -
-
-
-
-
- Mirostat Tau -
-
-
- -
-
- -
-
-
-
-
- Mirostat LR -
-
-
- -
-
- -
-
-
-
-
- Typical P -
-
-
- -
-
- -
-
-
-
-
- Min Length -
-
-
- -
-
- -
-
-
+
Samplers Order @@ -1102,22 +1128,27 @@ 5
-
- CFG - 6 -
-
- +
Mirostat 8
+
+ Unified Sampling + 9 +
+
+
+ Min P + 10 +
+
-
+
@@ -1128,7 +1159,7 @@
-
+
Multiple swipes per generation
@@ -1141,7 +1172,7 @@
-
+
Top K
@@ -1149,7 +1180,7 @@
-
+
Top P
@@ -1157,7 +1188,7 @@
-
+
Typical P
@@ -1173,7 +1204,7 @@
-
+
Top A
@@ -1181,7 +1212,7 @@
-
+
TFS
@@ -1189,7 +1220,7 @@
-
+
Epsilon Cutoff
@@ -1197,7 +1228,7 @@
-
+
Eta Cutoff
@@ -1225,53 +1256,53 @@
-
+
Encoder Penalty
-
+
Frequency Penalty
-
+
Presence Penalty
-
+
No Repeat Ngram Size
-
+
Skew
-
+
Min Length
-
+
Maximum tokens/second
-
+

-
+
Smoothing Factor
-
+
Smoothing Curve @@ -1279,7 +1310,7 @@
-
-
+

API