Compare commits
76
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e8663cd9c | ||
|
|
61139aa9b6 | ||
|
|
5e8d463ed4 | ||
|
|
c0a417b240 | ||
|
|
cc053e8356 | ||
|
|
d6b244cd25 | ||
|
|
e7c4f8ee98 | ||
|
|
a8f7e0d900 | ||
|
|
4613abc26e | ||
|
|
dd326d244f | ||
|
|
ccd8287833 | ||
|
|
30eaf26a43 | ||
|
|
98af17a8a4 | ||
|
|
0a9ba91852 | ||
|
|
814734d4af | ||
|
|
8992872765 | ||
|
|
558d72dde2 | ||
|
|
4ad7af3c06 | ||
|
|
bcc42de2e9 | ||
|
|
b4e162324b | ||
|
|
2c61f3be1e | ||
|
|
48e7d605df | ||
|
|
12b4fc50aa | ||
|
|
742d5601be | ||
|
|
4ed1372411 | ||
|
|
86b55c8696 | ||
|
|
1a7f88861d | ||
|
|
800caeb9e0 | ||
|
|
f91050136c | ||
|
|
f199580102 | ||
|
|
eaf2858e43 | ||
|
|
1cfdcd82e1 | ||
|
|
7228502f0b | ||
|
|
4f6977b779 | ||
|
|
6fea520309 | ||
|
|
aca0684c0b | ||
|
|
54aedc8797 | ||
|
|
b5cc683074 | ||
|
|
cd2c65c9d4 | ||
|
|
ed563cb7d8 | ||
|
|
32e1966757 | ||
|
|
380e31e8c5 | ||
|
|
46bd341ec1 | ||
|
|
aaf12b4925 | ||
|
|
c4672e953e | ||
|
|
4259eb7220 | ||
|
|
0168803f41 | ||
|
|
2463e83966 | ||
|
|
0a1a746bfd | ||
|
|
902bd10382 | ||
|
|
29ed34939c | ||
|
|
37943ea4b1 | ||
|
|
29e0df4886 | ||
|
|
6b49e9e7d0 | ||
|
|
bba96c6fbe | ||
|
|
8172dcd0ee | ||
|
|
10ae84fb62 | ||
|
|
bf6f0b0c46 | ||
|
|
3594fe224a | ||
|
|
1ca70787f9 | ||
|
|
691f0ce604 | ||
|
|
fe048f6bdc | ||
|
|
93bd9e217e | ||
|
|
fd582be5ca | ||
|
|
3a453d4cfa | ||
|
|
40ca51f4f1 | ||
|
|
060f224f28 | ||
|
|
aec9754b31 | ||
|
|
9f8c3e156a | ||
|
|
355598bb30 | ||
|
|
45d166ff6a | ||
|
|
69cf5571ba | ||
|
|
81be2c51a2 | ||
|
|
a900958bef | ||
|
|
56061f793c | ||
|
|
51ad27fb86 |
@@ -70,6 +70,7 @@ module.exports = {
|
||||
'**/dist/**',
|
||||
'**/.git/**',
|
||||
'public/lib/**',
|
||||
'public/scripts/extensions/third-party/**',
|
||||
'backups/**',
|
||||
'data/**',
|
||||
'cache/**',
|
||||
|
||||
@@ -26,7 +26,7 @@ SillyTavernは、多くのLLM API(KoboldAI/CPP、Horde、NovelAI、Ooba、Tabb
|
||||
|
||||
SillyTavern(略してST)は、テキスト生成LLM、画像生成エンジン、TTS音声モデルと対話するための、ローカルにインストールされるユーザーインターフェースです。
|
||||
|
||||
2023年2月にTavernAI 1.2.8のフォークとして始まり、SillyTavernは現在200人以上の貢献者と2年間の独立した開発を経て、知識豊富なAI愛好家のための主要なソフトウェアとして機能し続けています。
|
||||
2023年2月にTavernAI 1.2.8のフォークとして始まり、SillyTavernは現在300人以上の貢献者と3年間の独立した開発を経て、知識豊富なAI愛好家のための主要なソフトウェアとして機能し続けています。
|
||||
|
||||
## 私たちのビジョン
|
||||
|
||||
@@ -79,6 +79,7 @@ SillyTavern(略してST)は、テキスト生成LLM、画像生成エンジ
|
||||
* CncAnonのTavernAITurbo modの一部を許可を得て使用
|
||||
* PepperTacoの作品に触発されたビジュアルノベルモード (<https://github.com/peppertaco/Tavern/>)
|
||||
* GoogleによるNoto Sansフォント (OFLライセンス)
|
||||
* Chevrotainによるレキサー/パーサー (Apache-2.0ライセンス) <https://github.com/chevrotain/chevrotain>
|
||||
* Font Awesomeによるアイコンテーマ <https://fontawesome.com> (アイコン: CC BY 4.0, フォント: SIL OFL 1.1, コード: MITライセンス)
|
||||
* @OtisAlejandroによるデフォルトコンテンツ(Seraphinaキャラクターと伝承本)と@kallmefloccによる10K Discordユーザー記念背景
|
||||
* [@mrguymiah](https://github.com/mrguymiah)と[@Bronya-Rand](https://github.com/Bronya-Rand)によるDockerガイド
|
||||
|
||||
@@ -26,7 +26,7 @@ SillyTavern 为众多 LLM API(KoboldAI/CPP、Horde、NovelAI、Ooba、Tabby、
|
||||
|
||||
SillyTavern(简称 ST)是一个本地安装的用户界面,允许您与文本生成 LLM、图像生成引擎和 TTS 语音模型进行交互。
|
||||
|
||||
SillyTavern 于 2023 年 2 月作为 TavernAI 1.2.8 的一个分支开始,如今已拥有超过 200 名贡献者和 2 年的独立开发经验,并继续作为资深 AI 爱好者领先的软件。
|
||||
SillyTavern 于 2023 年 2 月作为 TavernAI 1.2.8 的一个分支开始,如今已拥有超过 300 名贡献者和 3 年的独立开发经验,并继续作为资深 AI 爱好者领先的软件。
|
||||
|
||||
## 我们的愿景
|
||||
|
||||
@@ -79,6 +79,7 @@ SillyTavern 于 2023 年 2 月作为 TavernAI 1.2.8 的一个分支开始,如
|
||||
* CncAnon 的 TavernAITurbo mod 的部分内容经许可使用
|
||||
* 视觉小说模式的灵感来自 PepperTaco 的工作 (<https://github.com/peppertaco/Tavern/>)
|
||||
* Noto Sans 字体 by Google (OFL 许可证)
|
||||
* Lexer/Parser 由 Chevrotain 提供 (Apache-2.0 许可证) <https://github.com/chevrotain/chevrotain>
|
||||
* 图标主题 by Font Awesome <https://fontawesome.com> (图标: CC BY 4.0, 字体: SIL OFL 1.1, 代码: MIT 许可证)
|
||||
* 默认内容由 @OtisAlejandro (Seraphina 角色和世界书) 和 @kallmeflocc (10K Discord 用户庆祝背景) 提供
|
||||
* Docker 指南由 [@mrguymiah](https://github.com/mrguymiah) 和 [@Bronya-Rand](https://github.com/Bronya-Rand) 提供
|
||||
|
||||
@@ -26,7 +26,7 @@ SillyTavern 提供一個統一的前端介面,整合多種大型語言模型
|
||||
|
||||
SillyTavern(簡稱 ST)是一款本地安裝的使用者介面,讓您能與大型語言模型(LLM)、影像生成引擎以及語音合成模型互動的前端。
|
||||
|
||||
SillyTavern 起源於 2023 年 2 月,作為 TavernAI 1.2.8 的分支版本發展至今。目前已有超過 200 位貢獻者,並擁有超過兩年的獨立開發歷史。如今,它已成為 AI 愛好者中備受推崇的軟體之一。
|
||||
SillyTavern 起源於 2023 年 2 月,作為 TavernAI 1.2.8 的分支版本發展至今。目前已有超過 300 位貢獻者,並擁有超過三年的獨立開發歷史。如今,它已成為 AI 愛好者中備受推崇的軟體之一。
|
||||
|
||||
## 我們的願景
|
||||
|
||||
@@ -42,7 +42,7 @@ SillyTavern 的硬體需求相當低。任何能夠運行 NodeJS 20 或更高版
|
||||
|
||||
### 歡迎加入我們的 Discord 伺服器
|
||||
|
||||
| [![][discord-shield-badge]][discord-link] | [加入我們的 Disocrd 伺服器](https://discord.gg/sillytavern) 以獲得技術支援、分享您喜愛的角色與提示詞。 |
|
||||
| [![][discord-shield-badge]][discord-link] | [加入我們的 Discord 伺服器](https://discord.gg/sillytavern) 以獲得技術支援、分享您喜愛的角色與提示詞。 |
|
||||
| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------- |
|
||||
|
||||
或直接聯繫開發者:
|
||||
@@ -79,6 +79,7 @@ SillyTavern 的硬體需求相當低。任何能夠運行 NodeJS 20 或更高版
|
||||
* 經授權使用部分來自 CncAnon 的 TavernAITurbo 模組
|
||||
* 視覺小說模式(Visual Novel Mode)的靈感,來源於 PepperTaco 的貢獻(<https://github.com/peppertaco/Tavern/>)
|
||||
* Noto Sans 字體由 Google 提供(OFL 許可)
|
||||
* Lexer/Parser 由 Chevrotain 提供 (Apache-2.0 許可) <https://github.com/chevrotain/chevrotain>
|
||||
* 主題圖示由 Font Awesome <https://fontawesome.com> 提供(圖示:CC BY 4.0,字體:SIL OFL 1.1,程式碼:MIT 許可)
|
||||
* 預設資源來源於 @OtisAlejandro(包含角色 Seraphina 與知識書)與 @kallmeflocc(SillyTavern 官方 Discord 伺服器成員突破 10K 的慶祝背景)
|
||||
* Docker 安裝指南由 [@mrguymiah](https://github.com/mrguymiah) 和 [@Bronya-Rand](https://github.com/Bronya-Rand) 編寫
|
||||
|
||||
+1
-1
@@ -75,7 +75,7 @@ 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.**
|
||||
|
||||
* [TavernAI](https://github.com/TavernAI/TavernAI) 1.2.8 by Humi: MIT License
|
||||
* [TavernAI](https://github.com/TavernAI/TavernAI-v1) 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 (<https://github.com/peppertaco/Tavern/>)
|
||||
* Noto Sans font by Google (OFL license)
|
||||
|
||||
@@ -34,6 +34,7 @@ whitelist.txt
|
||||
.vscode/**
|
||||
!.vscode/extensions.json
|
||||
.idea/
|
||||
.windsurf/
|
||||
secrets.json
|
||||
/dist
|
||||
/backups/
|
||||
|
||||
@@ -1,2 +1,8 @@
|
||||
ignore-scripts=true
|
||||
min-release-age=7
|
||||
allow-directory=none
|
||||
allow-file=none
|
||||
allow-git=none
|
||||
# Temporarily disabled due to an npm bug:
|
||||
# https://github.com/npm/cli/issues/9347
|
||||
# allow-remote=none
|
||||
|
||||
@@ -198,6 +198,8 @@ rateLimiting:
|
||||
accountsLoginMaxAttempts: 5
|
||||
# Set the maximum number of allowed failed account recovery attempts before rate limiting is applied. Set to 0 to disable rate limiting for account recovery.
|
||||
accountsRecoverMaxAttempts: 5
|
||||
# Set the maximum number of allowed failed account reset attempts before rate limiting is applied. Set to 0 to disable rate limiting for account resets.
|
||||
accountsResetMaxAttempts: 5
|
||||
# Set to true to enable support for real IPs in certain request headers for features like IP whitelisting, rate limiting and access logging.
|
||||
# Only change if you are sure that you use a correctly configured reverse proxy, otherwise this may lead to IP spoofing.
|
||||
forwardedHeaders:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"chat_completion_source": "openai",
|
||||
"openai_model": "gpt-4-turbo",
|
||||
"claude_model": "claude-sonnet-4-5",
|
||||
"openai_model": "gpt-5.6-terra",
|
||||
"claude_model": "claude-sonnet-5",
|
||||
"openrouter_model": "OR_Website",
|
||||
"openrouter_use_fallback": false,
|
||||
"openrouter_group_models": false,
|
||||
@@ -20,8 +20,8 @@
|
||||
"custom_include_body": "",
|
||||
"custom_exclude_body": "",
|
||||
"custom_include_headers": "",
|
||||
"google_model": "gemini-2.5-pro",
|
||||
"vertexai_model": "gemini-2.5-pro",
|
||||
"google_model": "gemini-3.7-flash",
|
||||
"vertexai_model": "gemini-3.7-flash",
|
||||
"temperature": 1,
|
||||
"frequency_penalty": 0,
|
||||
"presence_penalty": 0,
|
||||
|
||||
@@ -622,7 +622,7 @@
|
||||
},
|
||||
"wi_format": "{0}",
|
||||
"openai_model": "gpt-4-turbo",
|
||||
"claude_model": "claude-sonnet-4-5",
|
||||
"claude_model": "claude-sonnet-5",
|
||||
"ai21_model": "jamba-large",
|
||||
"openrouter_model": "OR_Website",
|
||||
"reverse_proxy": "",
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "sillytavern",
|
||||
"version": "1.18.0",
|
||||
"version": "1.19.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "sillytavern",
|
||||
"version": "1.18.0",
|
||||
"version": "1.19.0",
|
||||
"license": "AGPL-3.0",
|
||||
"dependencies": {
|
||||
"@adobe/css-tools": "^4.4.4",
|
||||
|
||||
+1
-1
@@ -115,7 +115,7 @@
|
||||
"type": "git",
|
||||
"url": "https://github.com/SillyTavern/SillyTavern.git"
|
||||
},
|
||||
"version": "1.18.0",
|
||||
"version": "1.19.0",
|
||||
"scripts": {
|
||||
"init": "node src/server-init.js",
|
||||
"start": "node server.js",
|
||||
|
||||
+4
-3
@@ -39,9 +39,10 @@ if (command === 'install') {
|
||||
}
|
||||
|
||||
async function updatePlugins() {
|
||||
const directories = fs.readdirSync(pluginsPath)
|
||||
.filter(file => !file.startsWith('.'))
|
||||
.filter(file => fs.statSync(path.join(pluginsPath, file)).isDirectory());
|
||||
const directories = fs.readdirSync(pluginsPath, { withFileTypes: true })
|
||||
.filter(dirent => dirent.isDirectory() || dirent.isSymbolicLink())
|
||||
.filter(dirent => !dirent.name.startsWith('.'))
|
||||
.map(dirent => dirent.name);
|
||||
|
||||
console.log(`Found ${color.cyan(directories.length)} directories in ./plugins`);
|
||||
|
||||
|
||||
+128
-120
@@ -2155,7 +2155,7 @@
|
||||
</strong>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-container flexFlowColumn wide100p textAlignCenter marginTop10" data-source="openai,custom,claude,xai,makersuite,vertexai,aimlapi,openrouter,pollinations,perplexity,cometapi,electronhub,azure_openai,chutes,nanogpt,deepseek">
|
||||
<div class="flex-container flexFlowColumn wide100p textAlignCenter marginTop10" data-source="openai,custom,claude,xai,makersuite,vertexai,aimlapi,openrouter,pollinations,perplexity,cometapi,electronhub,azure_openai,chutes,nanogpt,deepseek,fireworks">
|
||||
<div class="flex-container oneline-dropdown" title="Constrains effort on reasoning for reasoning models. Reducing reasoning effort can result in faster responses and fewer tokens used on reasoning in a response." data-i18n="[title]Constrains effort on reasoning for reasoning models.">
|
||||
<label for="openai_reasoning_effort">
|
||||
<span data-i18n="Reasoning Effort">Reasoning Effort</span>
|
||||
@@ -2169,14 +2169,17 @@
|
||||
<option data-i18n="openai_reasoning_effort_high" value="high">High</option>
|
||||
<option data-i18n="openai_reasoning_effort_maximum" value="max">Maximum</option>
|
||||
</select>
|
||||
<div class="toggle-description justifyLeft marginBot5" data-source="openai,custom,xai,aimlapi,openrouter,pollinations,perplexity,cometapi,electronhub,azure_openai,chutes" data-i18n="OpenAI-style options: low, medium, high. Minimum and maximum are aliased to low and high. Auto does not send an effort level.">
|
||||
OpenAI-style options: low, medium, high. Minimum and maximum are aliased to low and high. Auto does not send an effort level.
|
||||
<div class="toggle-description justifyLeft marginBot5" data-source="openai,custom,xai,aimlapi,openrouter,pollinations,perplexity,cometapi,electronhub,azure_openai,chutes" data-i18n="OpenAI-compatible effort levels vary by model. Minimum and maximum may use model-specific aliases. Auto does not send an effort level.">
|
||||
OpenAI-compatible effort levels vary by model. Minimum and maximum may use model-specific aliases. Auto does not send an effort level.
|
||||
</div>
|
||||
<div class="toggle-description justifyLeft marginBot5" data-source="fireworks" data-i18n="Fireworks supports low, medium, high, and max as distinct effort levels. Minimum is aliased to low. Auto does not send an effort level.">
|
||||
Fireworks supports low, medium, high, and max as distinct effort levels. Minimum is aliased to low. Auto does not send an effort level.
|
||||
</div>
|
||||
<strong class="toggle-description justifyLeft marginBot5" data-source="openrouter">
|
||||
Request model reasoning = Off with Reasoning Effort = Minimum disables reasoning entirely on models that support that, but can cause errors with some models.
|
||||
</strong>
|
||||
<div class="toggle-description justifyLeft marginBot5" data-source="claude" data-i18n="Allocates a portion of the response length for thinking (min: 1024 tokens, low: 10%, medium: 25%, high: 50%, max: 95%), but minimum 1024 tokens. Auto does not request thinking.">
|
||||
Allocates a portion of the response length for thinking (min: 1024 tokens, low: 10%, medium: 25%, high: 50%, max: 95%), but minimum 1024 tokens. Auto does not request thinking.
|
||||
<div class="toggle-description justifyLeft marginBot5" data-source="claude" data-i18n="Selects an effort level on adaptive-thinking models. On older Claude models, it allocates a portion of the response length to thinking. Auto does not request thinking.">
|
||||
Selects an effort level on adaptive-thinking models. On older Claude models, it allocates a portion of the response length to thinking. Auto does not request thinking.
|
||||
</div>
|
||||
<div class="toggle-description justifyLeft marginBot5" data-source="makersuite,vertexai">
|
||||
<span data-i18n="Sets a dynamic reasoning depth level for thinking (Flash 3/Pro 3). High and low are supported by both, minimal and medium are Flash 3 only. Auto lets the model decide.">
|
||||
@@ -2204,7 +2207,7 @@
|
||||
Constrains the verbosity of the model's response.
|
||||
</div>
|
||||
<strong class="toggle-description justifyLeft marginBot5" data-source="claude">
|
||||
On Opus 4.6 / Sonnet 4.6, a non-automatic Reasoning Effort takes precedence over Verbosity.
|
||||
On adaptive-thinking Claude models, a non-automatic Reasoning Effort takes precedence over Verbosity.
|
||||
</strong>
|
||||
</div>
|
||||
</div>
|
||||
@@ -2593,8 +2596,19 @@
|
||||
<small data-i18n="Example: http://127.0.0.1:5000">Example: http://127.0.0.1:5000</small>
|
||||
<input id="generic_api_url_text" name="generic_api_url" class="text_pole wide100p" value="" autocomplete="off" data-server-history="generic">
|
||||
</div>
|
||||
<datalist id="generic_model_fill"></datalist>
|
||||
<input id="generic_model_textgenerationwebui" list="generic_model_fill" class="text_pole wide100p" placeholder="Model ID (optional)" data-i18n="[placeholder]Model ID (optional)" type="text">
|
||||
<h4 data-i18n="Enter a Model ID">Enter a Model ID</h4>
|
||||
<div class="flex-container">
|
||||
<input list="generic_model_fill" id="generic_model_textgenerationwebui" class="text_pole wide100p" placeholder="Model ID (optional)" data-i18n="[placeholder]Model ID (optional)" type="text" autocomplete="off">
|
||||
<datalist id="generic_model_fill"></datalist>
|
||||
</div>
|
||||
<h4 data-i18n="Available Models">Available Models</h4>
|
||||
<div class="flex-container">
|
||||
<select id="generic_model_select" class="text_pole wide100p">
|
||||
<option value="" data-i18n="-- Connect to the API --">
|
||||
-- Connect to the API --
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div data-tg-type="ooba" class="flex-container flexFlowColumn">
|
||||
<div class="flex-container flexFlowColumn">
|
||||
@@ -2997,8 +3011,8 @@
|
||||
<br>
|
||||
</div>
|
||||
<div class="flex-container width100p">
|
||||
<input id="openai_proxy_password" type="password" class="text_pole flex1" placeholder="" form="openai_form" autocomplete="off" />
|
||||
<div id="openai_proxy_password_show" title="Peek a password" data-i18n="[title]Peek a password" class="menu_button fa-solid fa-eye-slash fa-fw"></div>
|
||||
<input id="openai_proxy_access_key" type="text" class="text_pole flex1 masked-secret" placeholder="" autocomplete="off" autocapitalize="none" autocorrect="off" spellcheck="false" />
|
||||
<div id="openai_proxy_access_key_show" title="Peek a password" data-i18n="[title]Peek a password" class="menu_button fa-solid fa-eye-slash fa-fw"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -3052,6 +3066,15 @@
|
||||
<div>
|
||||
<h4 data-i18n="OpenAI Model">OpenAI Model</h4>
|
||||
<select id="model_openai_select">
|
||||
<optgroup label="GPT-6">
|
||||
<option value="gpt-6-astra">gpt-6-astra</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-5.6">
|
||||
<option value="gpt-5.6">gpt-5.6</option>
|
||||
<option value="gpt-5.6-sol">gpt-5.6-sol</option>
|
||||
<option value="gpt-5.6-terra">gpt-5.6-terra</option>
|
||||
<option value="gpt-5.6-luna">gpt-5.6-luna</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-5.5">
|
||||
<option value="gpt-5.5">gpt-5.5</option>
|
||||
<option value="gpt-5.5-2026-04-23">gpt-5.5-2026-04-23</option>
|
||||
@@ -3065,12 +3088,12 @@
|
||||
<option value="gpt-5.4-nano-2026-03-17">gpt-5.4-nano-2026-03-17</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-5.3">
|
||||
<option value="gpt-5.3-chat-latest">gpt-5.3-chat-latest</option>
|
||||
<option value="gpt-5.3-chat-latest">gpt-5.3-chat-latest (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-5.2">
|
||||
<option value="gpt-5.2">gpt-5.2</option>
|
||||
<option value="gpt-5.2-2025-12-11">gpt-5.2-2025-12-11</option>
|
||||
<option value="gpt-5.2-chat-latest">gpt-5.2-chat-latest</option>
|
||||
<option value="gpt-5.2-chat-latest">gpt-5.2-chat-latest (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-5.1">
|
||||
<option value="gpt-5.1">gpt-5.1</option>
|
||||
@@ -3079,69 +3102,56 @@
|
||||
</optgroup>
|
||||
<optgroup label="GPT-5">
|
||||
<option value="gpt-5">gpt-5</option>
|
||||
<option value="gpt-5-2025-08-07">gpt-5-2025-08-07</option>
|
||||
<option value="gpt-5-2025-08-07">gpt-5-2025-08-07 (deprecated)</option>
|
||||
<option value="gpt-5-chat-latest">gpt-5-chat-latest</option>
|
||||
<option value="gpt-5-mini">gpt-5-mini</option>
|
||||
<option value="gpt-5-mini-2025-08-07">gpt-5-mini-2025-08-07</option>
|
||||
<option value="gpt-5-mini-2025-08-07">gpt-5-mini-2025-08-07 (deprecated)</option>
|
||||
<option value="gpt-5-nano">gpt-5-nano</option>
|
||||
<option value="gpt-5-nano-2025-08-07">gpt-5-nano-2025-08-07</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-4o">
|
||||
<option value="gpt-4o">gpt-4o</option>
|
||||
<option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option>
|
||||
<option value="gpt-4o-2024-08-06">gpt-4o-2024-08-06</option>
|
||||
<option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>
|
||||
<option value="chatgpt-4o-latest">chatgpt-4o-latest</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-4o mini">
|
||||
<option value="gpt-4o-mini">gpt-4o-mini</option>
|
||||
<option value="gpt-4o-mini-2024-07-18">gpt-4o-mini-2024-07-18</option>
|
||||
<option value="gpt-5-nano-2025-08-07">gpt-5-nano-2025-08-07 (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-4.1">
|
||||
<option value="gpt-4.1">gpt-4.1</option>
|
||||
<option value="gpt-4.1-2025-04-14">gpt-4.1-2025-04-14</option>
|
||||
<option value="gpt-4.1-mini">gpt-4.1-mini</option>
|
||||
<option value="gpt-4.1-mini-2025-04-14">gpt-4.1-mini-2025-04-14</option>
|
||||
<option value="gpt-4.1-nano">gpt-4.1-nano</option>
|
||||
<option value="gpt-4.1-nano-2025-04-14">gpt-4.1-nano-2025-04-14</option>
|
||||
<option value="gpt-4.1-nano">gpt-4.1-nano (deprecated)</option>
|
||||
<option value="gpt-4.1-nano-2025-04-14">gpt-4.1-nano-2025-04-14 (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="o1">
|
||||
<option value="o1">o1</option>
|
||||
<option value="o1-2024-12-17">o1-2024-12-17</option>
|
||||
<option value="o1-mini">o1-mini</option>
|
||||
<option value="o1-mini-2024-09-12">o1-mini-2024-09-12</option>
|
||||
<option value="o1-preview">o1-preview</option>
|
||||
<option value="o1-preview-2024-09-12">o1-preview-2024-09-12</option>
|
||||
<optgroup label="o4">
|
||||
<option value="o4-mini">o4-mini (deprecated)</option>
|
||||
<option value="o4-mini-2025-04-16">o4-mini-2025-04-16 (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="o3">
|
||||
<option value="o3">o3</option>
|
||||
<option value="o3-2025-04-16">o3-2025-04-16</option>
|
||||
<option value="o3-mini">o3-mini</option>
|
||||
<option value="o3-mini-2025-01-31">o3-mini-2025-01-31</option>
|
||||
<option value="o3-2025-04-16">o3-2025-04-16 (deprecated)</option>
|
||||
<option value="o3-mini">o3-mini (deprecated)</option>
|
||||
<option value="o3-mini-2025-01-31">o3-mini-2025-01-31 (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="o4">
|
||||
<option value="o4-mini">o4-mini</option>
|
||||
<option value="o4-mini-2025-04-16">o4-mini-2025-04-16</option>
|
||||
<optgroup label="o1">
|
||||
<option value="o1">o1 (deprecated)</option>
|
||||
<option value="o1-2024-12-17">o1-2024-12-17 (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-4.5">
|
||||
<option value="gpt-4.5-preview">gpt-4.5-preview</option>
|
||||
<option value="gpt-4.5-preview-2025-02-27">gpt-4.5-preview-2025-02-27</option>
|
||||
<optgroup label="GPT-4o">
|
||||
<option value="gpt-4o">gpt-4o</option>
|
||||
<option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option>
|
||||
<option value="gpt-4o-2024-08-06">gpt-4o-2024-08-06</option>
|
||||
<option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-4o mini">
|
||||
<option value="gpt-4o-mini">gpt-4o-mini</option>
|
||||
<option value="gpt-4o-mini-2024-07-18">gpt-4o-mini-2024-07-18</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-4 Turbo and GPT-4">
|
||||
<option value="gpt-4-turbo">gpt-4-turbo</option>
|
||||
<option value="gpt-4-turbo-2024-04-09">gpt-4-turbo-2024-04-09</option>
|
||||
<option value="gpt-4-turbo-preview">gpt-4-turbo-preview</option>
|
||||
<option value="gpt-4-0125-preview">gpt-4-0125-preview (2024)</option>
|
||||
<option value="gpt-4-1106-preview">gpt-4-1106-preview (2023)</option>
|
||||
<option value="gpt-4">gpt-4</option>
|
||||
<option value="gpt-4-0613">gpt-4-0613 (2023)</option>
|
||||
<option value="gpt-4-0314">gpt-4-0314 (2023)</option>
|
||||
<option value="gpt-4-turbo">gpt-4-turbo (deprecated)</option>
|
||||
<option value="gpt-4-turbo-2024-04-09">gpt-4-turbo-2024-04-09 (deprecated)</option>
|
||||
<option value="gpt-4">gpt-4 (deprecated)</option>
|
||||
<option value="gpt-4-0613">gpt-4-0613 (2023, deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="GPT-3.5 Turbo">
|
||||
<option value="gpt-3.5-turbo">gpt-3.5-turbo</option>
|
||||
<option value="gpt-3.5-turbo-0125">gpt-3.5-turbo-0125 (2024)</option>
|
||||
<option value="gpt-3.5-turbo-1106">gpt-3.5-turbo-1106 (2023)</option>
|
||||
<option value="gpt-3.5-turbo-instruct">gpt-3.5-turbo-instruct</option>
|
||||
<option value="gpt-3.5-turbo">gpt-3.5-turbo (deprecated)</option>
|
||||
<option value="gpt-3.5-turbo-0125">gpt-3.5-turbo-0125 (2024, deprecated)</option>
|
||||
<option value="gpt-3.5-turbo-1106">gpt-3.5-turbo-1106 (2023, deprecated)</option>
|
||||
<option value="gpt-3.5-turbo-instruct">gpt-3.5-turbo-instruct (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="Other">
|
||||
<option value="babbage-002">babbage-002</option>
|
||||
@@ -3176,6 +3186,11 @@
|
||||
<h4 data-i18n="Claude Model">Claude Model</h4>
|
||||
<select id="model_claude_select">
|
||||
<optgroup label="Versions">
|
||||
<option value="claude-fable-5-1">claude-fable-5-1</option>
|
||||
<option value="claude-fable-5">claude-fable-5</option>
|
||||
<option value="claude-opus-5">claude-opus-5</option>
|
||||
<option value="claude-sonnet-5">claude-sonnet-5</option>
|
||||
<option value="claude-opus-4-8">claude-opus-4-8</option>
|
||||
<option value="claude-opus-4-7">claude-opus-4-7</option>
|
||||
<option value="claude-opus-4-6">claude-opus-4-6</option>
|
||||
<option value="claude-opus-4-5">claude-opus-4-5</option>
|
||||
@@ -3185,21 +3200,10 @@
|
||||
<option value="claude-sonnet-4-5-20250929">claude-sonnet-4-5-20250929</option>
|
||||
<option value="claude-haiku-4-5">claude-haiku-4-5</option>
|
||||
<option value="claude-haiku-4-5-20251001">claude-haiku-4-5-20251001</option>
|
||||
<option value="claude-opus-4-1">claude-opus-4-1</option>
|
||||
<option value="claude-opus-4-1-20250805">claude-opus-4-1-20250805</option>
|
||||
<option value="claude-opus-4-0">claude-opus-4-0</option>
|
||||
<option value="claude-opus-4-20250514">claude-opus-4-20250514</option>
|
||||
<option value="claude-sonnet-4-0">claude-sonnet-4-0</option>
|
||||
<option value="claude-sonnet-4-20250514">claude-sonnet-4-20250514</option>
|
||||
<option value="claude-3-7-sonnet-latest">claude-3-7-sonnet-latest</option>
|
||||
<option value="claude-3-7-sonnet-20250219">claude-3-7-sonnet-20250219</option>
|
||||
<option value="claude-3-5-sonnet-latest">claude-3-5-sonnet-latest</option>
|
||||
<option value="claude-3-5-sonnet-20241022">claude-3-5-sonnet-20241022</option>
|
||||
<option value="claude-3-5-sonnet-20240620">claude-3-5-sonnet-20240620</option>
|
||||
<option value="claude-3-5-haiku-latest">claude-3-5-haiku-latest</option>
|
||||
<option value="claude-3-5-haiku-20241022">claude-3-5-haiku-20241022</option>
|
||||
<option value="claude-3-opus-20240229">claude-3-opus-20240229</option>
|
||||
<option value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
|
||||
<option value="claude-opus-4-0">claude-opus-4-0 (deprecated)</option>
|
||||
<option value="claude-opus-4-20250514">claude-opus-4-20250514 (deprecated)</option>
|
||||
<option value="claude-sonnet-4-0">claude-sonnet-4-0 (deprecated)</option>
|
||||
<option value="claude-sonnet-4-20250514">claude-sonnet-4-20250514 (deprecated)</option>
|
||||
</optgroup>
|
||||
</select>
|
||||
</div>
|
||||
@@ -3307,46 +3311,36 @@
|
||||
<div>
|
||||
<h4 data-i18n="Google Model">Google Model</h4>
|
||||
<select id="model_google_select">
|
||||
<optgroup label="Gemini 3.7">
|
||||
<option value="gemini-3.7-flash">gemini-3.7-flash</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.6">
|
||||
<option value="gemini-3.6-flash">gemini-3.6-flash</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.5">
|
||||
<option value="gemini-3.5-flash">gemini-3.5-flash</option>
|
||||
<option value="gemini-3.5-flash-lite">gemini-3.5-flash-lite</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.1">
|
||||
<option value="gemini-3.1-pro-preview">gemini-3.1-pro-preview</option>
|
||||
<option value="gemini-3.1-flash-lite-preview">gemini-3.1-flash-lite-preview</option>
|
||||
<option value="gemini-3.1-flash-image-preview">gemini-3.1-flash-image-preview</option>
|
||||
<option value="gemini-3.1-flash-lite">gemini-3.1-flash-lite</option>
|
||||
<option value="gemini-3.1-flash-image">gemini-3.1-flash-image</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.0">
|
||||
<option value="gemini-3-pro-preview">gemini-3-pro-preview</option>
|
||||
<option value="gemini-3-pro-image-preview">gemini-3-pro-image-preview</option>
|
||||
<option value="gemini-3-pro-image">gemini-3-pro-image</option>
|
||||
<option value="gemini-3-flash-preview">gemini-3-flash-preview</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 2.5">
|
||||
<option value="gemini-2.5-pro">gemini-2.5-pro</option>
|
||||
<option value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
|
||||
<option value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
|
||||
<option value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
|
||||
<option value="gemini-2.5-flash">gemini-2.5-flash</option>
|
||||
<option value="gemini-2.5-flash-preview-09-2025">gemini-2.5-flash-preview-09-2025</option>
|
||||
<option value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
|
||||
<option value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
|
||||
<option value="gemini-2.5-flash-lite-preview-09-2025">gemini-2.5-flash-lite-preview-09-2025</option>
|
||||
<option value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
|
||||
<option value="gemini-2.5-flash-image">gemini-2.5-flash-image</option>
|
||||
<option value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 2.0">
|
||||
<option value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05 → 2.5-exp-03-25</option>
|
||||
<option value="gemini-2.0-pro-exp">gemini-2.0-pro-exp → 2.5-exp-03-25</option>
|
||||
<option value="gemini-exp-1206">gemini-exp-1206 → 2.5-exp-03-25</option>
|
||||
<option value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
|
||||
<option value="gemini-2.0-flash-exp-image-generation">gemini-2.0-flash-exp-image-generation</option>
|
||||
<option value="gemini-2.0-flash-preview-image-generation">gemini-2.0-flash-preview-image-generation</option>
|
||||
<option value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
|
||||
<option value="gemini-2.0-flash">gemini-2.0-flash</option>
|
||||
<option value="gemini-2.0-flash-thinking-exp-01-21">gemini-2.0-flash-thinking-exp-01-21 → 2.5-flash-preview-05-20</option>
|
||||
<option value="gemini-2.0-flash-thinking-exp-1219">gemini-2.0-flash-thinking-exp-1219 → 2.5-flash-preview-05-20</option>
|
||||
<option value="gemini-2.0-flash-thinking-exp">gemini-2.0-flash-thinking-exp → 2.5-flash-preview-05-20</option>
|
||||
<option value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
|
||||
<option value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
|
||||
<option value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
|
||||
<option value="gemini-2.0-flash-lite">gemini-2.0-flash-lite</option>
|
||||
<option value="gemini-2.0-flash-001">gemini-2.0-flash-001 (deprecated)</option>
|
||||
<option value="gemini-2.0-flash">gemini-2.0-flash (deprecated)</option>
|
||||
<option value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001 (deprecated)</option>
|
||||
<option value="gemini-2.0-flash-lite">gemini-2.0-flash-lite (deprecated)</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemma">
|
||||
<option value="gemma-4-31b-it">gemma-4-31b-it</option>
|
||||
@@ -3487,14 +3481,23 @@
|
||||
<h4 data-i18n="Google Model">Google Model</h4>
|
||||
<select id="model_vertexai_select">
|
||||
<!-- data-mode="full" is for models that require a service account -->
|
||||
<optgroup label="Gemini 3.7">
|
||||
<option value="gemini-3.7-flash">gemini-3.7-flash</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.6">
|
||||
<option value="gemini-3.6-flash">gemini-3.6-flash</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.5">
|
||||
<option value="gemini-3.5-flash">gemini-3.5-flash</option>
|
||||
<option value="gemini-3.5-flash-lite">gemini-3.5-flash-lite</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.1">
|
||||
<option value="gemini-3.1-pro-preview">gemini-3.1-pro-preview</option>
|
||||
<option value="gemini-3.1-flash-lite-preview">gemini-3.1-flash-lite-preview</option>
|
||||
<option value="gemini-3.1-flash-image-preview">gemini-3.1-flash-image-preview</option>
|
||||
<option value="gemini-3.1-flash-lite">gemini-3.1-flash-lite</option>
|
||||
<option value="gemini-3.1-flash-image">gemini-3.1-flash-image</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 3.0">
|
||||
<option value="gemini-3-pro-preview">gemini-3-pro-preview</option>
|
||||
<option value="gemini-3-pro-image-preview">gemini-3-pro-image-preview</option>
|
||||
<option value="gemini-3-pro-image">gemini-3-pro-image</option>
|
||||
<option value="gemini-3-flash-preview">gemini-3-flash-preview</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 2.5">
|
||||
@@ -3502,14 +3505,11 @@
|
||||
<option value="gemini-2.5-flash">gemini-2.5-flash</option>
|
||||
<option value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
|
||||
<option value="gemini-2.5-flash-image">gemini-2.5-flash-image</option>
|
||||
<option value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
|
||||
</optgroup>
|
||||
<optgroup label="Gemini 2.0">
|
||||
<option value="gemini-2.0-flash-exp" data-mode="full">gemini-2.0-flash-exp</option>
|
||||
<option value="gemini-2.0-flash-preview-image-generation" data-mode="full">gemini-2.0-flash-preview-image-generation</option>
|
||||
<option value="gemini-2.0-flash">gemini-2.0-flash</option>
|
||||
<option value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
|
||||
<option value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
|
||||
<option value="gemini-2.0-flash">gemini-2.0-flash (deprecated)</option>
|
||||
<option value="gemini-2.0-flash-001">gemini-2.0-flash-001 (deprecated)</option>
|
||||
<option value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001 (deprecated)</option>
|
||||
</optgroup>
|
||||
</select>
|
||||
</div>
|
||||
@@ -3874,17 +3874,24 @@
|
||||
</select>
|
||||
</div>
|
||||
<div id="pollinations_form" data-source="pollinations">
|
||||
<h4>
|
||||
<a href="https://enter.pollinations.ai/" target="_blank" rel="noopener noreferrer" data-i18n="Pollinations API Key">
|
||||
Pollinations API Key
|
||||
</a>
|
||||
</h4>
|
||||
<div class="flex-container">
|
||||
<input id="api_key_pollinations" name="api_key_pollinations" class="text_pole flex1" value="" type="text" autocomplete="off">
|
||||
<div title="Manage API keys" data-i18n="[title]Manage API keys" class="menu_button fa-solid fa-key fa-fw manage-api-keys" data-key="api_key_pollinations"></div>
|
||||
</div>
|
||||
<div data-for="api_key_pollinations" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you click 'Connect'.">
|
||||
For privacy reasons, your API key will be hidden after you click 'Connect'.
|
||||
<h4 data-i18n="Pollinations Endpoint">Pollinations Endpoint</h4>
|
||||
<select id="pollinations_endpoint">
|
||||
<option value="anonymous" data-i18n="Anonymous (No Key)">Anonymous (No Key)</option>
|
||||
<option value="authenticated" data-i18n="Authenticated (API Key)">Authenticated (API Key)</option>
|
||||
</select>
|
||||
<div id="pollinations_key_section">
|
||||
<h4>
|
||||
<a href="https://enter.pollinations.ai/" target="_blank" rel="noopener noreferrer" data-i18n="Pollinations API Key">
|
||||
Pollinations API Key
|
||||
</a>
|
||||
</h4>
|
||||
<div class="flex-container">
|
||||
<input id="api_key_pollinations" name="api_key_pollinations" class="text_pole flex1" value="" type="text" placeholder="sk_..." autocomplete="off">
|
||||
<div title="Manage API keys" data-i18n="[title]Manage API keys" class="menu_button fa-solid fa-key fa-fw manage-api-keys" data-key="api_key_pollinations"></div>
|
||||
</div>
|
||||
<div data-for="api_key_pollinations" class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you click 'Connect'.">
|
||||
For privacy reasons, your API key will be hidden after you click 'Connect'.
|
||||
</div>
|
||||
</div>
|
||||
<h4 data-i18n="Pollinations Model">Pollinations Model</h4>
|
||||
<select id="model_pollinations_select">
|
||||
@@ -3938,6 +3945,7 @@
|
||||
</select>
|
||||
<h4 data-i18n="Z.AI Model">Z.AI Model</h4>
|
||||
<select id="model_zai_select">
|
||||
<option value="glm-5.2">glm-5.2</option>
|
||||
<option value="glm-5-turbo">glm-5-turbo</option>
|
||||
<option value="glm-5v-turbo">glm-5v-turbo</option>
|
||||
<option value="glm-5.1">glm-5.1</option>
|
||||
@@ -3984,7 +3992,7 @@
|
||||
<!-- Azure API Key -->
|
||||
<h4><span data-i18n="Azure API Key">Azure API Key</span></h4>
|
||||
<div class="flex-container">
|
||||
<input id="api_key_azure_openai" data-setting="api_key_azure_openai" class="text_pole flex1" type="password" autocomplete="off">
|
||||
<input id="api_key_azure_openai" data-setting="api_key_azure_openai" class="text_pole flex1" type="text" autocomplete="off">
|
||||
<div title="Manage API keys" data-i18n="[title]Manage API keys" class="menu_button fa-solid fa-key fa-fw manage-api-keys" data-key="api_key_azure_openai"></div>
|
||||
</div>
|
||||
<div class="neutral_warning" data-i18n="For privacy reasons, your API key will be hidden after you click 'Connect'." data-for="api_key_azure_openai">
|
||||
|
||||
@@ -717,7 +717,7 @@
|
||||
"Click to set a new User Name": "Cliquez pour définir un nouveau nom d'utilisateur",
|
||||
"Click to lock your selected persona to the current chat. Click again to remove the lock.": "Cliquez pour verrouiller votre persona sélectionnée sur la discussion actuelle. Cliquez à nouveau pour supprimer le verrou.",
|
||||
"Click to set user name for all messages": "Cliquez pour définir le nom d'utilisateur pour tous les messages",
|
||||
"Persona Description": "Description de la persona",
|
||||
"Persona Description": "Description du persona",
|
||||
"Example: [{{user}} is a 28-year-old Romanian cat girl.]": "Exemple : [{{user}} est une fille chat roumaine de 28 ans.]",
|
||||
"Tokens persona description": "Description des tokens",
|
||||
"Position:": "Position :",
|
||||
|
||||
+78
-22
@@ -215,7 +215,7 @@ import {
|
||||
} from './scripts/tags.js';
|
||||
import { checkOpenRouterAuth, initSecrets, readSecretState } from './scripts/secrets.js';
|
||||
import { markdownExclusionExt } from './scripts/showdown-exclusion.js';
|
||||
import { markdownUnderscoreExt, fixNestedEmphasis } from './scripts/showdown-emphasis.js';
|
||||
import { markdownUnderscoreExt } from './scripts/showdown-underscore.js';
|
||||
import { NOTE_MODULE_NAME, initAuthorsNote, metadata_keys, setFloatingPrompt, shouldWIAddPrompt } from './scripts/authors-note.js';
|
||||
import { registerPromptManagerMigration } from './scripts/PromptManager.js';
|
||||
import { getRegexedString, regex_placement } from './scripts/extensions/regex/engine.js';
|
||||
@@ -282,6 +282,7 @@ import { initDomHandlers } from './scripts/dom-handlers.js';
|
||||
import { SimpleMutex } from './scripts/util/SimpleMutex.js';
|
||||
import { AudioPlayer } from './scripts/audio-player.js';
|
||||
import { MacroEnvBuilder } from './scripts/macros/engine/MacroEnvBuilder.js';
|
||||
import { MessageFormatter } from './scripts/message-formatter.js';
|
||||
import { MacroEngine } from './scripts/macros/engine/MacroEngine.js';
|
||||
import { addChatBackupsBrowser } from './scripts/chat-backups.js';
|
||||
import { onboardingExperimentalMacroEngine } from './scripts/macros/engine/MacroDiagnostics.js';
|
||||
@@ -603,6 +604,7 @@ export let is_send_press = false; //Send generation
|
||||
export const isGenerating = () => (is_send_press || is_group_generating);
|
||||
|
||||
let this_del_mes = -1;
|
||||
let deleteToolCallsInDeleteMode = true;
|
||||
|
||||
/** @type {string} */
|
||||
let this_edit_mes_chname = '';
|
||||
@@ -1609,13 +1611,32 @@ export async function deleteLastMessage() {
|
||||
await eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
|
||||
}
|
||||
|
||||
function getMessageDeletionStartId(id, deleteToolCalls = true) {
|
||||
const message = chat[id];
|
||||
if (!deleteToolCalls || message?.is_user || message?.is_system) {
|
||||
return id;
|
||||
}
|
||||
|
||||
let startId = id;
|
||||
while (startId > 0) {
|
||||
const previousMessage = chat[startId - 1];
|
||||
if (!previousMessage?.is_system || !Array.isArray(previousMessage.extra?.tool_invocations)) {
|
||||
break;
|
||||
}
|
||||
startId--;
|
||||
}
|
||||
|
||||
return startId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a message from the chat by its ID, optionally asking for confirmation.
|
||||
* @param {number} id The ID of the message to delete.
|
||||
* @param {number} [swipeDeletionIndex] Deletes the swipe with that index.
|
||||
* @param {boolean} [askConfirmation=false] Whether to ask for confirmation before deleting.
|
||||
* @param {boolean} [deleteToolCalls=true] Whether to delete preceding tool-call messages.
|
||||
*/
|
||||
export async function deleteMessage(id, swipeDeletionIndex = undefined, askConfirmation = false) {
|
||||
export async function deleteMessage(id, swipeDeletionIndex = undefined, askConfirmation = false, deleteToolCalls = true) {
|
||||
const canDeleteSwipe = swipeDeletionIndex !== undefined && swipeDeletionIndex !== null;
|
||||
if (canDeleteSwipe) {
|
||||
if (swipeDeletionIndex < 0) {
|
||||
@@ -1653,13 +1674,19 @@ export async function deleteMessage(id, swipeDeletionIndex = undefined, askConfi
|
||||
return;
|
||||
}
|
||||
|
||||
chat.splice(id, 1);
|
||||
messageElement.remove();
|
||||
const firstMessageId = getMessageDeletionStartId(id, deleteToolCalls);
|
||||
const messageIds = Array.from({ length: id - firstMessageId + 1 }, (_, index) => id - index);
|
||||
|
||||
// Delete from the end so earlier indices remain stable.
|
||||
for (const messageId of messageIds) {
|
||||
chat.splice(messageId, 1);
|
||||
chatElement.find(`.mes[mesid="${messageId}"]`).remove();
|
||||
deleteItemizedPromptForMessage(messageId);
|
||||
}
|
||||
|
||||
chat_metadata.tainted = true;
|
||||
|
||||
const startIndex = [0, minId].includes(id) ? id : null;
|
||||
deleteItemizedPromptForMessage(id);
|
||||
const startIndex = firstMessageId <= minId ? firstMessageId : null;
|
||||
updateViewMessageIds(startIndex);
|
||||
saveChatDebounced();
|
||||
|
||||
@@ -1740,15 +1767,35 @@ export async function sendTextareaMessage() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats the message text into an HTML string using Markdown and other formatting.
|
||||
* @param {string} mes Message text
|
||||
* @param {string} ch_name Character name
|
||||
* @param {boolean} isSystem If the message was sent by the system
|
||||
* @param {boolean} isUser If the message was sent by the user
|
||||
* @param {number} messageId Message index in chat array
|
||||
* @param {Partial<DOMPurify.Config>} [sanitizerOverrides] DOMPurify sanitizer option overrides
|
||||
* @param {boolean} [isReasoning] If the message is reasoning output
|
||||
* @returns {string} HTML string
|
||||
* Formats raw message text into an HTML string ready for DOM insertion.
|
||||
*
|
||||
* The pipeline is, in order:
|
||||
* 1. Prompt-bias stripping (message 0 only)
|
||||
* 2. Comment / hidden-message normalisation
|
||||
* 3. `beforeRegex` extension hooks (see {@link MessageFormatter})
|
||||
* 4. Custom regex rules (`getRegexedString`)
|
||||
* 5. `afterRegex` extension hooks
|
||||
* 6. Markdown auto-fix (`fixMarkdown`)
|
||||
* 7. HTML tag encoding (`encode_tags`)
|
||||
* 8. Showdown Markdown → HTML conversion
|
||||
* 9. `afterMarkdown` extension hooks
|
||||
* 10. Name-prefix stripping (`allow_name2_display`)
|
||||
* 11. DOMPurify sanitization
|
||||
*
|
||||
* All extension hooks run **before** DOMPurify (steps 3, 5, 9) so their
|
||||
* output is always sanitised.
|
||||
*
|
||||
* @param {string} mes - Raw message text.
|
||||
* @param {string} ch_name - Character name associated with the message.
|
||||
* @param {boolean} isSystem - Whether the message is a system message.
|
||||
* @param {boolean} isUser - Whether the message was sent by the user.
|
||||
* @param {number} messageId - Index of the message in the chat array, or -1
|
||||
* for transient messages (e.g. streaming previews).
|
||||
* @param {Partial<DOMPurify.Config>} [sanitizerOverrides] - DOMPurify option
|
||||
* overrides. Merged on top of the default config.
|
||||
* @param {boolean} [isReasoning=false] - Whether the message is reasoning/thinking
|
||||
* output (affects regex placement and some display rules).
|
||||
* @returns {string} Sanitized HTML string ready to assign to `innerHTML`.
|
||||
*/
|
||||
export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, sanitizerOverrides = {}, isReasoning = false) {
|
||||
if (!mes) {
|
||||
@@ -1805,18 +1852,20 @@ export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, san
|
||||
const indexOf = usableMessages.findIndex(x => x.index === Number(messageId));
|
||||
const depth = messageId >= 0 && indexOf !== -1 ? (usableMessages.length - indexOf - 1) : undefined;
|
||||
|
||||
mes = MessageFormatter.runStage(MessageFormatter.stage.BEFORE_REGEX, mes,
|
||||
{ ch_name, isSystem, isUser, messageId, isReasoning },
|
||||
);
|
||||
|
||||
// Always override the character name
|
||||
mes = getRegexedString(mes, regexPlacement, {
|
||||
characterOverride: ch_name,
|
||||
isMarkdown: true,
|
||||
depth: depth,
|
||||
});
|
||||
}
|
||||
|
||||
// Convert nested same-delimiter emphasis to bold before any markdown fixing.
|
||||
// Must run before fixMarkdown which would strip the spaces that indicate nesting.
|
||||
if (!isSystem) {
|
||||
mes = fixNestedEmphasis(mes);
|
||||
mes = MessageFormatter.runStage(MessageFormatter.stage.AFTER_REGEX, mes,
|
||||
{ ch_name, isSystem, isUser, messageId, isReasoning },
|
||||
);
|
||||
}
|
||||
|
||||
if (power_user.auto_fix_generated_markdown) {
|
||||
@@ -1895,6 +1944,10 @@ export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, san
|
||||
mes = mes.replace(/<code(.*)>[\s\S]*?<\/code>/g, function (match) {
|
||||
return match.replace(/&/g, '&');
|
||||
});
|
||||
|
||||
mes = MessageFormatter.runStage(MessageFormatter.stage.AFTER_MARKDOWN, mes,
|
||||
{ ch_name, isSystem, isUser, messageId, isReasoning },
|
||||
);
|
||||
}
|
||||
|
||||
if (!power_user.allow_name2_display && ch_name && !isUser && !isSystem) {
|
||||
@@ -8139,7 +8192,7 @@ function updateMessage(div) {
|
||||
return { mesBlock, text, mes, bias };
|
||||
}
|
||||
|
||||
function openMessageDelete(fromSlashCommand) {
|
||||
function openMessageDelete(fromSlashCommand, deleteToolCalls = true) {
|
||||
closeMessageEditor();
|
||||
hideSwipeButtons();
|
||||
if (fromSlashCommand || (!is_send_press) || (selected_group && !is_group_generating)) {
|
||||
@@ -8158,6 +8211,7 @@ function openMessageDelete(fromSlashCommand) {
|
||||
is_group_generating: ${is_group_generating}`);
|
||||
}
|
||||
this_del_mes = -1;
|
||||
deleteToolCallsInDeleteMode = deleteToolCalls;
|
||||
is_delete_mode = true;
|
||||
}
|
||||
|
||||
@@ -11202,6 +11256,7 @@ jQuery(async function () {
|
||||
});
|
||||
$(this).addClass('selected'); //sets the bg of the mes selected for deletion
|
||||
var i = Number($(this).attr('mesid')); //checks the message ID in the chat
|
||||
i = getMessageDeletionStartId(i, deleteToolCallsInDeleteMode);
|
||||
this_del_mes = i;
|
||||
//as long as the current message ID is less than the total chat length
|
||||
while (i < chat.length) {
|
||||
@@ -11526,6 +11581,7 @@ jQuery(async function () {
|
||||
///////////// OPTIMIZED LISTENERS FOR LEFT SIDE OPTIONS POPUP MENU //////////////////////
|
||||
$('#options [id]').on('click', async function (event, customData) {
|
||||
const fromSlashCommand = customData?.fromSlashCommand || false;
|
||||
const deleteToolCalls = customData?.deleteToolCalls ?? true;
|
||||
var id = $(this).attr('id');
|
||||
|
||||
// Check whether a custom prompt was provided via custom data (for example through a slash command)
|
||||
@@ -11604,7 +11660,7 @@ jQuery(async function () {
|
||||
Generate('continue', buildOrFillAdditionalArgs());
|
||||
}
|
||||
} else if (id == 'option_delete_mes') {
|
||||
setTimeout(() => openMessageDelete(fromSlashCommand), animation_duration);
|
||||
setTimeout(() => openMessageDelete(fromSlashCommand, deleteToolCalls), animation_duration);
|
||||
} else if (id == 'option_close_chat') {
|
||||
await closeCurrentChat();
|
||||
} else if (id === 'option_settings') {
|
||||
|
||||
@@ -34,7 +34,7 @@ import {
|
||||
secret_state,
|
||||
} from './secrets.js';
|
||||
import { debounce, getStringHash, isValidUrl } from './utils.js';
|
||||
import { chat_completion_sources, oai_settings } from './openai.js';
|
||||
import { chat_completion_sources, oai_settings, POLLINATIONS_ENDPOINT } from './openai.js';
|
||||
import { getTokenCountAsync } from './tokenizers.js';
|
||||
import { textgen_types, textgenerationwebui_settings as textgen_settings, getTextGenServer } from './textgen-settings.js';
|
||||
import { debounce_timeout, SWIPE_SOURCE } from './constants.js';
|
||||
@@ -406,7 +406,7 @@ function RA_autoconnect(PrevApi) {
|
||||
|| (secret_state[SECRET_KEYS.FIREWORKS] && oai_settings.chat_completion_source == chat_completion_sources.FIREWORKS)
|
||||
|| (secret_state[SECRET_KEYS.COMETAPI] && oai_settings.chat_completion_source == chat_completion_sources.COMETAPI)
|
||||
|| (secret_state[SECRET_KEYS.ZAI] && oai_settings.chat_completion_source == chat_completion_sources.ZAI)
|
||||
|| (secret_state[SECRET_KEYS.POLLINATIONS] && oai_settings.chat_completion_source === chat_completion_sources.POLLINATIONS)
|
||||
|| ((secret_state[SECRET_KEYS.POLLINATIONS] || oai_settings.pollinations_endpoint === POLLINATIONS_ENDPOINT.ANONYMOUS) && oai_settings.chat_completion_source === chat_completion_sources.POLLINATIONS)
|
||||
|| (secret_state[SECRET_KEYS.WORKERS_AI] && oai_settings.chat_completion_source == chat_completion_sources.WORKERS_AI)
|
||||
|| (secret_state[SECRET_KEYS.MINIMAX] && oai_settings.chat_completion_source == chat_completion_sources.MINIMAX)
|
||||
|| (isValidUrl(oai_settings.custom_url) && oai_settings.chat_completion_source == chat_completion_sources.CUSTOM)
|
||||
|
||||
@@ -674,7 +674,9 @@ export class AutoComplete {
|
||||
this.clone.remove();
|
||||
}
|
||||
});
|
||||
mo.observe(this.textarea.parentElement, { childList: true });
|
||||
if (this.textarea.parentElement) {
|
||||
mo.observe(this.textarea.parentElement, { childList: true });
|
||||
}
|
||||
}
|
||||
this.clone.style.height = `${inputRect.height}px`;
|
||||
this.clone.style.left = `${inputRect.left}px`;
|
||||
|
||||
@@ -41,6 +41,7 @@ import { t } from './i18n.js';
|
||||
import {
|
||||
getUniqueName,
|
||||
isTrueBoolean,
|
||||
uuidv4,
|
||||
} from './utils.js';
|
||||
|
||||
const bookmarkNameToken = 'Checkpoint #';
|
||||
@@ -196,7 +197,8 @@ export async function createBranch(mesId, { swipeId = null } = {}) {
|
||||
|
||||
const lastMes = chat[mesId];
|
||||
const mainChatName = (getCurrentChatDetails()).sessionName;
|
||||
const newMetadata = { main_chat: mainChatName };
|
||||
// Mint a fresh integrity slug so the branch is distinguishable from its parent (#5942)
|
||||
const newMetadata = { main_chat: mainChatName, integrity: uuidv4() };
|
||||
const selectedSwipeId = swipeId === null ? null : Number(swipeId);
|
||||
|
||||
if (selectedSwipeId !== null && (!Number.isInteger(selectedSwipeId) || selectedSwipeId < 0 || selectedSwipeId >= (lastMes?.swipes?.length ?? 0))) {
|
||||
@@ -278,7 +280,8 @@ export async function createNewBookmark(mesId, { forceName = null } = {}) {
|
||||
}
|
||||
|
||||
const mainChat = selected_group ? groups?.find(x => x.id == selected_group)?.chat_id : characters[this_chid].chat;
|
||||
const newMetadata = { main_chat: mainChat };
|
||||
// Mint a fresh integrity slug so the checkpoint is distinguishable from its parent (#5942)
|
||||
const newMetadata = { main_chat: mainChat, integrity: uuidv4() };
|
||||
await saveItemizedPrompts(name);
|
||||
|
||||
if (selected_group) {
|
||||
|
||||
@@ -592,7 +592,7 @@ export class ChatCompletionService {
|
||||
}
|
||||
|
||||
// Ensure api-url is properly applied for all sources that accept it
|
||||
['custom_url', 'vertexai_region', 'zai_endpoint', 'siliconflow_endpoint', 'minimax_endpoint'].forEach(field => {
|
||||
['custom_url', 'vertexai_region', 'zai_endpoint', 'siliconflow_endpoint', 'minimax_endpoint', 'pollinations_endpoint'].forEach(field => {
|
||||
// The order is: connection profile => CC preset => CC settings
|
||||
overridePayload[field] = overridePayload[field] || settings[field] || oai_settings[field];
|
||||
});
|
||||
|
||||
@@ -1797,6 +1797,15 @@ export async function loadExtensionSettings(settings, versionChanged, enableAuto
|
||||
extensionTypes = Object.fromEntries(extensions.map(x => [x.name, x.type]));
|
||||
manifests = await getManifests(extensionNames);
|
||||
|
||||
// An extension without a loadable manifest cannot be used: drop it so state queries
|
||||
// and the extensions list do not report a ghost entry (e.g. leftover folder on disk)
|
||||
const namesWithoutManifest = extensionNames.filter(name => !Object.hasOwn(manifests, name));
|
||||
if (namesWithoutManifest.length) {
|
||||
console.warn('Ignoring extensions without a loadable manifest.json:', namesWithoutManifest);
|
||||
extensionNames = extensionNames.filter(name => Object.hasOwn(manifests, name));
|
||||
namesWithoutManifest.forEach(name => delete extensionTypes[name]);
|
||||
}
|
||||
|
||||
if (versionChanged && enableAutoUpdate) {
|
||||
await autoUpdateExtensions(false);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import { getContext, getApiUrl, doExtrasFetch, extension_settings, modules, rend
|
||||
import { appendMediaToMessage, chat_metadata, eventSource, event_types, getRequestHeaders, saveChatConditional, saveSettingsDebounced, substituteParams } from '../../../script.js';
|
||||
import { getMessageTimeStamp } from '../../RossAscends-mods.js';
|
||||
import { SECRET_KEYS, secret_state } from '../../secrets.js';
|
||||
import { oai_settings } from '../../openai.js';
|
||||
import { oai_settings, POLLINATIONS_ENDPOINT } from '../../openai.js';
|
||||
import { getMultimodalCaption } from '../shared.js';
|
||||
import { textgen_types, textgenerationwebui_settings } from '../../textgen-settings.js';
|
||||
import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
|
||||
@@ -18,6 +18,11 @@ const MODULE_NAME = 'caption';
|
||||
|
||||
const PROMPT_DEFAULT = 'What\'s in this image?';
|
||||
const TEMPLATE_DEFAULT = '[{{user}} sends {{char}} a picture that contains: {{caption}}]';
|
||||
const GOOGLE_MODEL_MIGRATIONS = new Map([
|
||||
['gemini-3.1-flash-lite-preview', 'gemini-3.1-flash-lite'],
|
||||
['gemini-3.1-flash-image-preview', 'gemini-3.1-flash-image'],
|
||||
['gemini-3-pro-image-preview', 'gemini-3-pro-image'],
|
||||
]);
|
||||
|
||||
/**
|
||||
* Migrates old extension settings to the new format.
|
||||
@@ -37,7 +42,12 @@ function migrateSettings() {
|
||||
if (extension_settings.caption.source === 'openai') {
|
||||
extension_settings.caption.source = 'multimodal';
|
||||
extension_settings.caption.multimodal_api = 'openai';
|
||||
extension_settings.caption.multimodal_model = 'gpt-4-turbo';
|
||||
extension_settings.caption.multimodal_model = 'gpt-5.6-luna';
|
||||
}
|
||||
|
||||
if (['google', 'vertexai'].includes(extension_settings.caption.multimodal_api)) {
|
||||
extension_settings.caption.multimodal_model = GOOGLE_MODEL_MIGRATIONS.get(extension_settings.caption.multimodal_model)
|
||||
?? extension_settings.caption.multimodal_model;
|
||||
}
|
||||
|
||||
if (!extension_settings.caption.multimodal_api) {
|
||||
@@ -45,7 +55,7 @@ function migrateSettings() {
|
||||
}
|
||||
|
||||
if (!extension_settings.caption.multimodal_model) {
|
||||
extension_settings.caption.multimodal_model = 'gpt-4-turbo';
|
||||
extension_settings.caption.multimodal_model = 'gpt-5.6-luna';
|
||||
}
|
||||
|
||||
if (!extension_settings.caption.prompt) {
|
||||
@@ -530,8 +540,8 @@ export async function init() {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Custom API doesn't need additional checks
|
||||
if (api === 'custom') {
|
||||
// Custom API and anonymous Pollinations don't need additional checks
|
||||
if (api === 'custom' || (api === 'pollinations' && oai_settings.pollinations_endpoint === POLLINATIONS_ENDPOINT.ANONYMOUS)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,6 +54,11 @@
|
||||
<option data-type="cohere" value="c4ai-aya-vision-8b">c4ai-aya-vision-8b</option>
|
||||
<option data-type="cohere" value="c4ai-aya-vision-32b">c4ai-aya-vision-32b</option>
|
||||
<option data-type="cohere" value="command-a-vision-07-2025">command-a-vision-07-2025</option>
|
||||
<option data-type="openai" value="gpt-6-astra">gpt-6-astra</option>
|
||||
<option data-type="openai" value="gpt-5.6">gpt-5.6</option>
|
||||
<option data-type="openai" value="gpt-5.6-sol">gpt-5.6-sol</option>
|
||||
<option data-type="openai" value="gpt-5.6-terra">gpt-5.6-terra</option>
|
||||
<option data-type="openai" value="gpt-5.6-luna">gpt-5.6-luna</option>
|
||||
<option data-type="openai" value="gpt-5.5">gpt-5.5</option>
|
||||
<option data-type="openai" value="gpt-5.5-2026-04-23">gpt-5.5-2026-04-23</option>
|
||||
<option data-type="openai" value="gpt-5.4">gpt-5.4</option>
|
||||
@@ -82,20 +87,21 @@
|
||||
<option data-type="openai" value="gpt-4.1-mini-2025-04-14">gpt-4.1-mini-2025-04-14</option>
|
||||
<option data-type="openai" value="gpt-4.1-nano">gpt-4.1-nano</option>
|
||||
<option data-type="openai" value="gpt-4.1-nano-2025-04-14">gpt-4.1-nano-2025-04-14</option>
|
||||
<option data-type="openai" value="gpt-4-vision-preview">gpt-4-vision-preview</option>
|
||||
<option data-type="openai" value="gpt-4-turbo">gpt-4-turbo</option>
|
||||
<option data-type="openai" value="gpt-4o">gpt-4o</option>
|
||||
<option data-type="openai" value="gpt-4o-mini">gpt-4o-mini</option>
|
||||
<option data-type="openai" value="gpt-4o-mini-2024-07-18">gpt-4o-mini-2024-07-18</option>
|
||||
<option data-type="openai" value="chatgpt-4o-latest">chatgpt-4o-latest</option>
|
||||
<option data-type="openai" value="o1">o1</option>
|
||||
<option data-type="openai" value="o1-2024-12-17">o1-2024-12-17</option>
|
||||
<option data-type="openai" value="o3">o3</option>
|
||||
<option data-type="openai" value="o3-2025-04-16">o3-2025-04-16</option>
|
||||
<option data-type="openai" value="o4-mini">o4-mini</option>
|
||||
<option data-type="openai" value="o4-mini-2025-04-16">o4-mini-2025-04-16</option>
|
||||
<option data-type="openai" value="gpt-4.5-preview">gpt-4.5-preview</option>
|
||||
<option data-type="openai" value="gpt-4.5-preview-2025-02-27">gpt-4.5-preview-2025-02-27</option>
|
||||
<option data-type="anthropic" value="claude-fable-5-1">claude-fable-5-1</option>
|
||||
<option data-type="anthropic" value="claude-fable-5">claude-fable-5</option>
|
||||
<option data-type="anthropic" value="claude-opus-5">claude-opus-5</option>
|
||||
<option data-type="anthropic" value="claude-sonnet-5">claude-sonnet-5</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-8">claude-opus-4-8</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-7">claude-opus-4-7</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-6">claude-opus-4-6</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-5">claude-opus-4-5</option>
|
||||
@@ -105,52 +111,26 @@
|
||||
<option data-type="anthropic" value="claude-sonnet-4-5-20250929">claude-sonnet-4-5-20250929</option>
|
||||
<option data-type="anthropic" value="claude-haiku-4-5">claude-haiku-4-5</option>
|
||||
<option data-type="anthropic" value="claude-haiku-4-5-20251001">claude-haiku-4-5-20251001</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-1">claude-opus-4-1</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-1-20250805">claude-opus-4-1-20250805</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-0">claude-opus-4-0</option>
|
||||
<option data-type="anthropic" value="claude-opus-4-20250514">claude-opus-4-20250514</option>
|
||||
<option data-type="anthropic" value="claude-sonnet-4-0">claude-sonnet-4-0</option>
|
||||
<option data-type="anthropic" value="claude-sonnet-4-20250514">claude-sonnet-4-20250514</option>
|
||||
<option data-type="anthropic" value="claude-3-7-sonnet-latest">claude-3-7-sonnet-latest</option>
|
||||
<option data-type="anthropic" value="claude-3-7-sonnet-20250219">claude-3-7-sonnet-20250219</option>
|
||||
<option data-type="anthropic" value="claude-3-5-sonnet-latest">claude-3-5-sonnet-latest</option>
|
||||
<option data-type="anthropic" value="claude-3-5-sonnet-20241022">claude-3-5-sonnet-20241022</option>
|
||||
<option data-type="anthropic" value="claude-3-5-sonnet-20240620">claude-3-5-sonnet-20240620</option>
|
||||
<option data-type="anthropic" value="claude-3-5-haiku-latest">claude-3-5-haiku-latest</option>
|
||||
<option data-type="anthropic" value="claude-3-5-haiku-20241022">claude-3-5-haiku-20241022</option>
|
||||
<option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
|
||||
<option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
|
||||
<option data-type="google" value="gemini-3.7-flash">gemini-3.7-flash</option>
|
||||
<option data-type="google" value="gemini-3.6-flash">gemini-3.6-flash</option>
|
||||
<option data-type="google" value="gemini-3.5-flash">gemini-3.5-flash</option>
|
||||
<option data-type="google" value="gemini-3.5-flash-lite">gemini-3.5-flash-lite</option>
|
||||
<option data-type="google" value="gemini-3.1-pro-preview">gemini-3.1-pro-preview</option>
|
||||
<option data-type="google" value="gemini-3.1-flash-lite-preview">gemini-3.1-flash-lite-preview</option>
|
||||
<option data-type="google" value="gemini-3.1-flash-image-preview">gemini-3.1-flash-image-preview</option>
|
||||
<option data-type="google" value="gemini-3-pro-preview">gemini-3-pro-preview</option>
|
||||
<option data-type="google" value="gemini-3-pro-image-preview">gemini-3-pro-image-preview</option>
|
||||
<option data-type="google" value="gemini-3.1-flash-lite">gemini-3.1-flash-lite</option>
|
||||
<option data-type="google" value="gemini-3.1-flash-image">gemini-3.1-flash-image</option>
|
||||
<option data-type="google" value="gemini-3-pro-image">gemini-3-pro-image</option>
|
||||
<option data-type="google" value="gemini-3-flash-preview">gemini-3-flash-preview</option>
|
||||
<option data-type="google" value="gemini-2.5-pro">gemini-2.5-pro</option>
|
||||
<option data-type="google" value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
|
||||
<option data-type="google" value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
|
||||
<option data-type="google" value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
|
||||
<option data-type="google" value="gemini-2.5-flash">gemini-2.5-flash</option>
|
||||
<option data-type="google" value="gemini-2.5-flash-preview-09-2025">gemini-2.5-flash-preview-09-2025</option>
|
||||
<option data-type="google" value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
|
||||
<option data-type="google" value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
|
||||
<option data-type="google" value="gemini-2.5-flash-lite-preview-09-2025">gemini-2.5-flash-lite-preview-09-2025</option>
|
||||
<option data-type="google" value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
|
||||
<option data-type="google" value="gemini-2.5-flash-image">gemini-2.5-flash-image</option>
|
||||
<option data-type="google" value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
|
||||
<option data-type="google" value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05 → 2.5-exp-03-25</option>
|
||||
<option data-type="google" value="gemini-2.0-pro-exp">gemini-2.0-pro-exp → 2.5-exp-03-25</option>
|
||||
<option data-type="google" value="gemini-exp-1206">gemini-exp-1206 → 2.5-exp-03-25</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-exp-image-generation">gemini-2.0-flash-exp-image-generation</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
|
||||
<option data-type="google" value="gemini-2.0-flash">gemini-2.0-flash</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-thinking-exp-01-21">gemini-2.0-flash-thinking-exp-01-21 → 2.5-flash-preview-5-20</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-thinking-exp-1219">gemini-2.0-flash-thinking-exp-1219 → 2.5-flash-preview-05-20</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-thinking-exp">gemini-2.0-flash-thinking-exp → 2.5-flash-preview-05-20</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-001">gemini-2.0-flash-001 (deprecated)</option>
|
||||
<option data-type="google" value="gemini-2.0-flash">gemini-2.0-flash (deprecated)</option>
|
||||
<option data-type="google" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001 (deprecated)</option>
|
||||
<option data-type="google" value="learnlm-2.0-flash-experimental">learnlm-2.0-flash-experimental</option>
|
||||
<option data-type="google" value="gemini-robotics-er-1.5-preview">gemini-robotics-er-1.5-preview</option>
|
||||
<option data-type="google" value="gemma-4-31b-it">gemma-4-31b-it</option>
|
||||
@@ -158,19 +138,21 @@
|
||||
<option data-type="google" value="gemma-3-27b-it">gemma-3-27b-it</option>
|
||||
<option data-type="google" value="gemma-3-12b-it">gemma-3-12b-it</option>
|
||||
<option data-type="google" value="gemma-3-4b-it">gemma-3-4b-it</option>
|
||||
<option data-type="vertexai" value="gemini-3.7-flash">gemini-3.7-flash</option>
|
||||
<option data-type="vertexai" value="gemini-3.6-flash">gemini-3.6-flash</option>
|
||||
<option data-type="vertexai" value="gemini-3.5-flash">gemini-3.5-flash</option>
|
||||
<option data-type="vertexai" value="gemini-3.5-flash-lite">gemini-3.5-flash-lite</option>
|
||||
<option data-type="vertexai" value="gemini-3.1-pro-preview">gemini-3.1-pro-preview</option>
|
||||
<option data-type="vertexai" value="gemini-3.1-flash-lite-preview">gemini-3.1-flash-lite-preview</option>
|
||||
<option data-type="vertexai" value="gemini-3.1-flash-image-preview">gemini-3.1-flash-image-preview</option>
|
||||
<option data-type="vertexai" value="gemini-3-pro-preview">gemini-3-pro-preview</option>
|
||||
<option data-type="vertexai" value="gemini-3-pro-image-preview">gemini-3-pro-image-preview</option>
|
||||
<option data-type="vertexai" value="gemini-3.1-flash-lite">gemini-3.1-flash-lite</option>
|
||||
<option data-type="vertexai" value="gemini-3.1-flash-image">gemini-3.1-flash-image</option>
|
||||
<option data-type="vertexai" value="gemini-3-pro-image">gemini-3-pro-image</option>
|
||||
<option data-type="vertexai" value="gemini-3-flash-preview">gemini-3-flash-preview</option>
|
||||
<option data-type="vertexai" value="gemini-2.5-pro">gemini-2.5-pro</option>
|
||||
<option data-type="vertexai" value="gemini-2.5-flash">gemini-2.5-flash</option>
|
||||
<option data-type="vertexai" value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
|
||||
<option data-type="vertexai" value="gemini-2.5-flash-image">gemini-2.5-flash-image</option>
|
||||
<option data-type="vertexai" value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
|
||||
<option data-type="vertexai" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
|
||||
<option data-type="vertexai" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
|
||||
<option data-type="vertexai" value="gemini-2.0-flash-001">gemini-2.0-flash-001 (deprecated)</option>
|
||||
<option data-type="vertexai" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001 (deprecated)</option>
|
||||
<option data-type="groq" value="meta-llama/llama-4-scout-17b-16e-instruct">meta-llama/llama-4-scout-17b-16e-instruct</option>
|
||||
<option data-type="groq" value="meta-llama/llama-4-maverick-17b-128e-instruct">meta-llama/llama-4-maverick-17b-128e-instruct</option>
|
||||
<option data-type="ollama" value="ollama_current" data-i18n="currently_selected">[Currently selected]</option>
|
||||
|
||||
@@ -1717,8 +1717,10 @@ async function setExpression(spriteFolderName, expression, { force = false, over
|
||||
* @param {string} expression - The expression label to use for the default image
|
||||
*/
|
||||
function setDefaultEmojiForImage(img, expression) {
|
||||
if (extension_settings.expressions.custom?.includes(expression)) {
|
||||
console.debug(`Can't set default emoji for a custom expression (${expression}). setting to ${DEFAULT_FALLBACK_EXPRESSION} instead.`);
|
||||
// Classifiers can return a falsy, literal "null"/"undefined", or otherwise unknown label,
|
||||
// and custom expressions have no default assets; only known labels have an image (#5863).
|
||||
if (!DEFAULT_EXPRESSIONS.includes(expression)) {
|
||||
console.debug(`Can't set default emoji for expression (${expression}). setting to ${DEFAULT_FALLBACK_EXPRESSION} instead.`);
|
||||
expression = DEFAULT_FALLBACK_EXPRESSION;
|
||||
}
|
||||
|
||||
|
||||
@@ -381,7 +381,7 @@ export class SettingsUi {
|
||||
if (name && name.length > 0) {
|
||||
const oldQrs = QuickReplySet.get(name);
|
||||
if (oldQrs) {
|
||||
const replace = Popup.show.confirm('Replace existing World Info', `A Quick Reply Set named "${name}" already exists.<br>Do you want to overwrite the existing Quick Reply Set?<br>The existing set will be deleted. This cannot be undone.`);
|
||||
const replace = await Popup.show.confirm('Replace existing Quick Reply set', `A Quick Reply Set named "${name}" already exists.<br>Do you want to overwrite the existing Quick Reply Set?<br>The existing set will be deleted. This cannot be undone.`);
|
||||
if (replace) {
|
||||
const idx = QuickReplySet.list.indexOf(oldQrs);
|
||||
await this.doDeleteQrSet(oldQrs);
|
||||
@@ -444,7 +444,7 @@ export class SettingsUi {
|
||||
qrs.init();
|
||||
const oldQrs = QuickReplySet.get(props.name);
|
||||
if (oldQrs) {
|
||||
const replace = Popup.show.confirm('Replace existing World Info', `A Quick Reply Set named "${name}" already exists.<br>Do you want to overwrite the existing Quick Reply Set?<br>The existing set will be deleted. This cannot be undone.`);
|
||||
const replace = await Popup.show.confirm('Replace existing Quick Reply set', `A Quick Reply Set named "${props.name}" already exists.<br>Do you want to overwrite the existing Quick Reply Set?<br>The existing set will be deleted. This cannot be undone.`);
|
||||
if (replace) {
|
||||
const idx = QuickReplySet.list.indexOf(oldQrs);
|
||||
await this.doDeleteQrSet(oldQrs);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { CONNECT_API_MAP, createModelIcon, getRequestHeaders, substituteParams } from '../../script.js';
|
||||
import { extension_settings, openThirdPartyExtensionMenu } from '../extensions.js';
|
||||
import { t } from '../i18n.js';
|
||||
import { oai_settings, proxies, ZAI_ENDPOINT } from '../openai.js';
|
||||
import { oai_settings, proxies, ZAI_ENDPOINT, POLLINATIONS_ENDPOINT } from '../openai.js';
|
||||
import { SECRET_KEYS, secret_state } from '../secrets.js';
|
||||
import { textgen_types, textgenerationwebui_settings } from '../textgen-settings.js';
|
||||
import { getTokenCountAsync } from '../tokenizers.js';
|
||||
@@ -126,6 +126,10 @@ export async function getMultimodalCaption(base64Img, prompt) {
|
||||
requestBody.zai_endpoint = oai_settings.zai_endpoint || ZAI_ENDPOINT.COMMON;
|
||||
}
|
||||
|
||||
if (extension_settings.caption.multimodal_api === 'pollinations') {
|
||||
requestBody.pollinations_endpoint = oai_settings.pollinations_endpoint || POLLINATIONS_ENDPOINT.AUTHENTICATED;
|
||||
}
|
||||
|
||||
if (extension_settings.caption.multimodal_api === 'workers_ai') {
|
||||
requestBody.workers_ai_account_id = oai_settings.workers_ai_account_id;
|
||||
}
|
||||
@@ -284,7 +288,7 @@ function throwIfInvalidModel(useReverseProxy) {
|
||||
throw new Error('Z.AI API key is not set.');
|
||||
}
|
||||
|
||||
if (multimodalApi === 'pollinations' && !secret_state[SECRET_KEYS.POLLINATIONS]) {
|
||||
if (multimodalApi === 'pollinations' && oai_settings.pollinations_endpoint !== POLLINATIONS_ENDPOINT.ANONYMOUS && !secret_state[SECRET_KEYS.POLLINATIONS]) {
|
||||
throw new Error('Pollinations API key is not set.');
|
||||
}
|
||||
|
||||
@@ -449,6 +453,7 @@ export class ConnectionManagerRequestService {
|
||||
zai_endpoint: profile['api-url'],
|
||||
siliconflow_endpoint: profile['api-url'],
|
||||
minimax_endpoint: profile['api-url'],
|
||||
pollinations_endpoint: profile['api-url'],
|
||||
reverse_proxy: proxyPreset?.url,
|
||||
proxy_password: proxyPreset?.password,
|
||||
custom_prompt_post_processing: profile['prompt-post-processing'],
|
||||
|
||||
@@ -344,7 +344,7 @@
|
||||
|
||||
<div data-sd-source="bfl">
|
||||
<div class="flex-container flexnowrap alignItemsBaseline marginBot5">
|
||||
<a href="https://api.bfl.ml/" target="_blank" rel="noopener noreferrer">
|
||||
<a href="https://api.bfl.ai/" target="_blank" rel="noopener noreferrer">
|
||||
<strong data-i18n="API Key">API Key</strong>
|
||||
<i class="fa-solid fa-share-from-square"></i>
|
||||
</a>
|
||||
|
||||
@@ -12,7 +12,7 @@ export class GoogleNativeTtsProvider {
|
||||
|
||||
defaultSettings = {
|
||||
voiceMap: {},
|
||||
model: 'gemini-2.5-flash-preview-tts',
|
||||
model: 'gemini-3.1-flash-tts-preview',
|
||||
apiType: 'makersuite',
|
||||
};
|
||||
|
||||
@@ -32,6 +32,7 @@ export class GoogleNativeTtsProvider {
|
||||
<select id="google-tts-model">
|
||||
<option value="gemini-2.5-flash-preview-tts">Gemini 2.5 Flash Preview TTS</option>
|
||||
<option value="gemini-2.5-pro-preview-tts">Gemini 2.5 Pro Preview TTS</option>
|
||||
<option value="gemini-3.1-flash-tts-preview">Gemini 3.1 Flash TTS Preview</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>`;
|
||||
|
||||
@@ -55,10 +55,6 @@ class MiniMaxTtsProvider {
|
||||
<i class="fa-solid fa-key"></i>
|
||||
<span>Click to set API Key</span>
|
||||
</div>
|
||||
<div id="minimax_group_id" class="menu_button menu_button_icon manage-api-keys" data-key="minimax_group_id">
|
||||
<i class="fa-solid fa-key"></i>
|
||||
<span>Click to set Group ID</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tts_block">
|
||||
<label for="minimax_tts_api_host">API Host</label>
|
||||
@@ -173,9 +169,8 @@ class MiniMaxTtsProvider {
|
||||
|
||||
constructor() {
|
||||
this.handler = async function (/** @type {string} */ key) {
|
||||
if (![SECRET_KEYS.MINIMAX, SECRET_KEYS.MINIMAX_GROUP_ID].includes(key)) return;
|
||||
if (key !== SECRET_KEYS.MINIMAX) return;
|
||||
$('#api_key_minimax').toggleClass('success', !!secret_state[SECRET_KEYS.MINIMAX]);
|
||||
$('#minimax_group_id').toggleClass('success', !!secret_state[SECRET_KEYS.MINIMAX_GROUP_ID]);
|
||||
await this.onRefreshClick();
|
||||
}.bind(this);
|
||||
}
|
||||
@@ -588,13 +583,12 @@ class MiniMaxTtsProvider {
|
||||
}
|
||||
|
||||
$('#api_key_minimax').toggleClass('success', !!secret_state[SECRET_KEYS.MINIMAX]);
|
||||
$('#minimax_group_id').toggleClass('success', !!secret_state[SECRET_KEYS.MINIMAX_GROUP_ID]);
|
||||
[event_types.SECRET_WRITTEN, event_types.SECRET_DELETED, event_types.SECRET_ROTATED].forEach(event => {
|
||||
eventSource.on(event, this.handler);
|
||||
});
|
||||
|
||||
// Only check ready status when API credentials are available
|
||||
if (secret_state[SECRET_KEYS.MINIMAX] && secret_state[SECRET_KEYS.MINIMAX_GROUP_ID]) {
|
||||
if (secret_state[SECRET_KEYS.MINIMAX]) {
|
||||
try {
|
||||
await this.checkReady();
|
||||
console.debug('MiniMax TTS: Settings loaded and ready');
|
||||
@@ -608,8 +602,8 @@ class MiniMaxTtsProvider {
|
||||
|
||||
// Perform a simple readiness check
|
||||
async checkReady() {
|
||||
if (!secret_state[SECRET_KEYS.MINIMAX] || !secret_state[SECRET_KEYS.MINIMAX_GROUP_ID]) {
|
||||
const error = new Error('API Key and Group ID are required');
|
||||
if (!secret_state[SECRET_KEYS.MINIMAX]) {
|
||||
const error = new Error('API Key is required');
|
||||
console.error('MiniMax TTS checkReady error:', error.message);
|
||||
throw error;
|
||||
}
|
||||
@@ -709,8 +703,8 @@ class MiniMaxTtsProvider {
|
||||
|
||||
async fetchTtsVoiceObjects() {
|
||||
try {
|
||||
if (!secret_state[SECRET_KEYS.MINIMAX] || !secret_state[SECRET_KEYS.MINIMAX_GROUP_ID]) {
|
||||
console.warn('MiniMax TTS: API Key and Group ID required for fetching voices');
|
||||
if (!secret_state[SECRET_KEYS.MINIMAX]) {
|
||||
console.warn('MiniMax TTS: API Key required for fetching voices');
|
||||
console.warn('Using all available voices (default + custom). Please check your API credentials');
|
||||
return this.getAllVoices();
|
||||
}
|
||||
@@ -775,8 +769,8 @@ class MiniMaxTtsProvider {
|
||||
async fetchTtsGeneration(inputText, voiceId, language = null) {
|
||||
console.info(`Generating new MiniMax TTS for voice_id ${voiceId}`);
|
||||
|
||||
if (!secret_state[SECRET_KEYS.MINIMAX] || !secret_state[SECRET_KEYS.MINIMAX_GROUP_ID]) {
|
||||
const error = new Error('API Key and Group ID are required');
|
||||
if (!secret_state[SECRET_KEYS.MINIMAX]) {
|
||||
const error = new Error('API Key is required');
|
||||
console.error('MiniMax TTS fetchTtsGeneration error:', error.message);
|
||||
throw error;
|
||||
}
|
||||
|
||||
@@ -1908,13 +1908,14 @@ async function uploadGroupAvatar(event) {
|
||||
|
||||
$('#dialogue_popup').addClass('large_dialogue_popup wide_dialogue_popup');
|
||||
|
||||
const croppedImage = await callGenericPopup('Set the crop position of the avatar image', POPUP_TYPE.CROP, '', { cropImage: result });
|
||||
const croppedImage = power_user.never_resize_avatars ? result :
|
||||
await callGenericPopup('Set the crop position of the avatar image', POPUP_TYPE.CROP, '', { cropImage: result });
|
||||
|
||||
if (!croppedImage) {
|
||||
return;
|
||||
}
|
||||
|
||||
let thumbnail = await createThumbnail(String(croppedImage), 200, 300);
|
||||
let thumbnail = await createThumbnail(String(croppedImage), 300, 300);
|
||||
//remove data:image/whatever;base64
|
||||
thumbnail = thumbnail.replace(/^data:image\/[a-z]+;base64,/, '');
|
||||
let _thisGroup = groups.find((x) => x.id == openGroupId);
|
||||
|
||||
@@ -289,8 +289,8 @@ export function registerCoreMacros() {
|
||||
description: 'Any kind of text as comment. If you want multiline comments, consider using a scoped macro like {{//}}First\nSecond{{///}}.',
|
||||
},
|
||||
],
|
||||
list: true, // We consume any arguments as if this is a list, but we'll ignore them in the handler anyway
|
||||
strictArgs: false, // and we also always remove it, even if the parsing might say it's invalid
|
||||
// list: true, // We consume any arguments as if this is a list, but we'll ignore them in the handler anyway
|
||||
// strictArgs: false, // and we also always remove it, even if the parsing might say it's invalid
|
||||
description: 'Comment macro that produces an empty string. Can be used for writing into prompt definitions, without being passed to the context.',
|
||||
returns: '',
|
||||
displayOverride: '{{// ...}}',
|
||||
|
||||
@@ -155,6 +155,62 @@ export function registerVariableMacros() {
|
||||
},
|
||||
});
|
||||
|
||||
// {{setvarkey::name::key::value}} -> ''
|
||||
MacroRegistry.registerMacro('setvarkey', {
|
||||
aliases: [{ alias: 'setvarindex' }],
|
||||
category: MacroCategory.VARIABLE,
|
||||
unnamedArgs: [
|
||||
{
|
||||
name: 'name',
|
||||
type: MacroValueType.STRING,
|
||||
description: 'The name of the local object or array.',
|
||||
},
|
||||
{
|
||||
name: 'key',
|
||||
type: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
description: 'The key of an object or the index of an array.',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
type: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
description: 'The value to set at the specified key or index.',
|
||||
},
|
||||
],
|
||||
description: 'Sets a value at a specific key or index in a local object or array. If the variable does not exist, it will be created based on the type of the key.',
|
||||
returns: '',
|
||||
exampleUsage: ['{{setvarkey::myarray::0::foo}}', '{{setvarkey::myobj::uniquekey::somevalue}}'],
|
||||
handler: ({ unnamedArgs: [name, key, value] }) => {
|
||||
ctx.variables.local.set(name, value, { index: key });
|
||||
return '';
|
||||
},
|
||||
});
|
||||
|
||||
// {{getvarkey::name::key}} -> returns value at key
|
||||
MacroRegistry.registerMacro('getvarkey', {
|
||||
aliases: [{ alias: 'getvarindex' }],
|
||||
category: MacroCategory.VARIABLE,
|
||||
unnamedArgs: [
|
||||
{
|
||||
name: 'name',
|
||||
type: MacroValueType.STRING,
|
||||
description: 'The name of the local object or array variable to get from.',
|
||||
},
|
||||
{
|
||||
name: 'key',
|
||||
type: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
description: 'The key of an object or the index of an array.',
|
||||
},
|
||||
],
|
||||
description: 'Gets a value at a specific key or index in a local object or array variable.',
|
||||
returns: 'The value at the specified key or index in the local object or array variable.',
|
||||
returnType: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
exampleUsage: ['{{getvarkey::myarray::0}}', '{{getvarkey::myobj::uniquekey}}'],
|
||||
handler: ({ unnamedArgs: [name, key], normalize }) => {
|
||||
const result = ctx.variables.local.get(name, { index: key });
|
||||
return normalize(result);
|
||||
},
|
||||
});
|
||||
|
||||
// {{setglobalvar::name::value}} -> ''
|
||||
MacroRegistry.registerMacro('setglobalvar', {
|
||||
category: MacroCategory.VARIABLE,
|
||||
@@ -302,4 +358,60 @@ export function registerVariableMacros() {
|
||||
return '';
|
||||
},
|
||||
});
|
||||
|
||||
// {{setglobalvarkey::name::key::value}} -> ''
|
||||
MacroRegistry.registerMacro('setglobalvarkey', {
|
||||
aliases: [{ alias: 'setglobalvarindex' }],
|
||||
category: MacroCategory.VARIABLE,
|
||||
unnamedArgs: [
|
||||
{
|
||||
name: 'name',
|
||||
type: MacroValueType.STRING,
|
||||
description: 'The name of the global object or array variable.',
|
||||
},
|
||||
{
|
||||
name: 'key',
|
||||
type: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
description: 'The key of an object or the index of an array element to set.',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
type: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
description: 'The value to set at the specified key or index.',
|
||||
},
|
||||
],
|
||||
description: 'Sets a value at a specific key or index in a global object or array variable. If the variable does not exist, it will be created based on the type of the key.',
|
||||
returns: '',
|
||||
exampleUsage: ['{{setglobalvarkey::myarray::0::foo}}', '{{setglobalvarkey::myobj::uniquekey::bar}}'],
|
||||
handler: ({ unnamedArgs: [name, key, value] }) => {
|
||||
ctx.variables.global.set(name, value, { index: key });
|
||||
return '';
|
||||
},
|
||||
});
|
||||
|
||||
// {{getglobalvarkey::name::key}} -> returns value at key
|
||||
MacroRegistry.registerMacro('getglobalvarkey', {
|
||||
aliases: [{ alias: 'getglobalvarindex' }],
|
||||
category: MacroCategory.VARIABLE,
|
||||
unnamedArgs: [
|
||||
{
|
||||
name: 'name',
|
||||
type: MacroValueType.STRING,
|
||||
description: 'The name of the global object or array variable to get from.',
|
||||
},
|
||||
{
|
||||
name: 'key',
|
||||
type: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
description: 'The key of an object or the index of an array element to get.',
|
||||
},
|
||||
],
|
||||
description: 'Gets a value at a specific key or index in a global object or array variable.',
|
||||
returns: 'The value at the specified key or index in the global object or array variable.',
|
||||
returnType: [MacroValueType.STRING, MacroValueType.NUMBER],
|
||||
exampleUsage: ['{{getglobalvarkey::myarray::0}}', '{{getglobalvarkey::myobj::uniquekey}}'],
|
||||
handler: ({ unnamedArgs: [name, key], normalize }) => {
|
||||
const result = ctx.variables.global.get(name, { index: key });
|
||||
return normalize(result);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -189,7 +189,21 @@ class MacroCstWalker {
|
||||
|
||||
// Check for closing block flag
|
||||
const flagTokens = /** @type {IToken[]} */ (children.flags || []);
|
||||
const isClosing = flagTokens.some(token => token.image === MacroFlagType.CLOSING_BLOCK);
|
||||
let isClosing = flagTokens.some(token => token.image === MacroFlagType.CLOSING_BLOCK);
|
||||
|
||||
// Special case for the comment macro (//):
|
||||
// The lexer always greedily tokenizes '//' before a single '/', so {{///}} is parsed as
|
||||
// {{// /}} (comment with arg '/') rather than {{/ //}} (closing block for //).
|
||||
// We detect this by checking if the '//' macro's positionally-first argument token starts with '/'.
|
||||
if (!isClosing && name === '//') {
|
||||
const firstArgNode = /** @type {CstNode?} */ ((argumentNodes || [])[0]);
|
||||
if (firstArgNode) {
|
||||
const firstToken = this.#getFirstTokenInNode(firstArgNode);
|
||||
if (firstToken?.image?.startsWith('/')) {
|
||||
isClosing = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
name,
|
||||
@@ -227,7 +241,7 @@ class MacroCstWalker {
|
||||
for (const item of items) {
|
||||
if (item.type !== 'macro') continue;
|
||||
|
||||
const info = this.#extractMacroInfo(item.node);
|
||||
const info = this.extractMacroInfo(item.node);
|
||||
if (!info) continue;
|
||||
|
||||
if (info.isClosing) {
|
||||
@@ -1098,6 +1112,34 @@ class MacroCstWalker {
|
||||
return !!value && typeof value === 'object' && 'name' in value && 'children' in value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the positionally-first leaf token (by startOffset) across all children of a CST node.
|
||||
* Chevrotain groups tokens by type in the children object, so we must scan all type arrays
|
||||
* and pick the token with the smallest startOffset rather than assuming any one array is ordered first.
|
||||
*
|
||||
* @param {CstNode} node
|
||||
* @returns {IToken|null}
|
||||
*/
|
||||
#getFirstTokenInNode(node) {
|
||||
const children = node?.children || {};
|
||||
/** @type {IToken|null} */
|
||||
let first = null;
|
||||
|
||||
for (const key of Object.keys(children)) {
|
||||
for (const element of children[key] || []) {
|
||||
// Skip CST nodes (nested rules) — we only want leaf tokens
|
||||
if (this.#isCstNode(element)) continue;
|
||||
const token = /** @type {IToken} */ (element);
|
||||
if (typeof token.startOffset !== 'number' || isNaN(token.startOffset)) continue;
|
||||
if (first === null || token.startOffset < first.startOffset) {
|
||||
first = token;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return first;
|
||||
}
|
||||
|
||||
/**
|
||||
* Evaluates scoped content between an opening and closing macro tag.
|
||||
* This resolves any nested macros within the scoped content.
|
||||
@@ -1146,7 +1188,7 @@ class MacroCstWalker {
|
||||
const item = items[i];
|
||||
if (item.type !== 'macro') continue;
|
||||
|
||||
const info = this.#extractMacroInfo(item.node);
|
||||
const info = this.extractMacroInfo(item.node);
|
||||
if (!info) continue;
|
||||
|
||||
macroInfos.push({
|
||||
@@ -1254,36 +1296,6 @@ class MacroCstWalker {
|
||||
return items.filter((_, index) => !itemsToRemove.has(index));
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts macro name and closing flag status from a macro node.
|
||||
*
|
||||
* @param {CstNode} macroNode
|
||||
* @returns {{ name: string, isClosing: boolean } | null}
|
||||
*/
|
||||
#extractMacroInfo(macroNode) {
|
||||
const children = macroNode.children || {};
|
||||
|
||||
// Check if this is a variable expression - they can't be scoped
|
||||
const variableExprNode = (children.variableExpr || [])[0];
|
||||
if (variableExprNode) {
|
||||
return null; // Variable expressions don't support scoped content
|
||||
}
|
||||
|
||||
// Regular macro - get info from macroBody
|
||||
const macroBodyNode = /** @type {CstNode?} */ ((children.macroBody || [])[0]);
|
||||
const bodyChildren = macroBodyNode?.children || {};
|
||||
|
||||
const identifierTokens = /** @type {IToken[]} */ (bodyChildren['Macro.identifier'] || []);
|
||||
const name = identifierTokens[0]?.image || '';
|
||||
|
||||
if (!name) return null;
|
||||
|
||||
// Check for closing block flag (inside macroBody)
|
||||
const flagTokens = /** @type {IToken[]} */ (children.flags || []);
|
||||
const isClosing = flagTokens.some(token => token.image === MacroFlagType.CLOSING_BLOCK);
|
||||
|
||||
return { name, isClosing };
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a macro can accept scoped content as an additional argument.
|
||||
|
||||
@@ -214,11 +214,16 @@ const Def = {
|
||||
// Macro args allow nested macros
|
||||
enter(Tokens.Macro.Start, modes.macro_def),
|
||||
|
||||
// PIPE/FILTER FEATURE DISABLED: Lines below commented out until pipe/filter feature is fully implemented.
|
||||
// Currently, having these active breaks macros that use | as a regular character in argument values (e.g., {{setvar::foo::|bar}})
|
||||
// See: https://github.com/SillyTavern/SillyTavern/issues/5618
|
||||
// TODO: Re-enable when filter flag (>) logic is properly implemented to conditionally enable pipe parsing
|
||||
|
||||
// We allow escaped pipes to not start output modifiers. We need to capture this first, before the pipe
|
||||
using(Tokens.Filter.EscapedPipe),
|
||||
// using(Tokens.Filter.EscapedPipe),
|
||||
|
||||
// If at any place during args writing there is a pipe, we lex it as an output identifier, and then continue with lex its args
|
||||
enter(Tokens.Filter.Pipe, modes.macro_filter_modifer),
|
||||
// enter(Tokens.Filter.Pipe, modes.macro_filter_modifer),
|
||||
|
||||
using(Tokens.Args.DoubleColon),
|
||||
using(Tokens.Args.Colon),
|
||||
|
||||
@@ -0,0 +1,259 @@
|
||||
import { messageFormatting } from '../script.js';
|
||||
|
||||
/**
|
||||
* Pipeline stages at which extension hooks may run.
|
||||
* All stages occur **before** DOMPurify sanitization so output is always safe.
|
||||
*
|
||||
* - `BEFORE_REGEX` – Raw message text, after prompt-bias stripping but before
|
||||
* custom regex rules are applied. Suitable for transforms
|
||||
* that should be invisible to regex rules.
|
||||
* - `AFTER_REGEX` – After custom regex rules, before Markdown conversion.
|
||||
* The text is still plain Markdown at this point.
|
||||
* - `AFTER_MARKDOWN` – After Markdown-to-HTML conversion (showdown), before
|
||||
* DOMPurify. The value is an HTML string. This is the
|
||||
* **default** stage and the most common insertion point
|
||||
* for extensions that want to annotate rendered HTML (e.g.
|
||||
* adding ruby tags, tooltips, highlights).
|
||||
*
|
||||
* > There is intentionally no post-sanitize stage.
|
||||
* > All hooks run before DOMPurify so their output is always sanitized along
|
||||
* > with the rest of the message. If your hook inserts HTML, make sure it is
|
||||
* > safe to pass through DOMPurify (i.e. avoid `<script>` tags and inline
|
||||
* > event handlers — they will be stripped anyway, but it is still bad
|
||||
* > practice to produce them).
|
||||
*
|
||||
* @enum {string}
|
||||
*/
|
||||
export const formatting_stage = {
|
||||
BEFORE_REGEX: 'beforeRegex',
|
||||
AFTER_REGEX: 'afterRegex',
|
||||
AFTER_MARKDOWN: 'afterMarkdown',
|
||||
};
|
||||
|
||||
/**
|
||||
* @typedef {formatting_stage[keyof formatting_stage]} MessageFormattingStage
|
||||
*/
|
||||
|
||||
/**
|
||||
* Message metadata supplied by {@link messageFormatting} to {@link MessageFormatter#runStage}.
|
||||
* Does not include `stage` — that is injected by `runStage` itself.
|
||||
*
|
||||
* @typedef {Object} MessageFormattingBase
|
||||
* @property {string} characterName - Character name associated with the message.
|
||||
* @property {boolean} isSystem - Whether the message is a system message.
|
||||
* @property {boolean} isUser - Whether the message was sent by the user.
|
||||
* @property {number} messageId - Index of the message in the chat array, or -1 for transient messages (e.g. streaming previews).
|
||||
* @property {boolean} isReasoning - Whether the message is reasoning/thinking output.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Immutable context object passed to every formatting hook.
|
||||
* Built from {@link MessageFormattingBase} with `stage` added and the whole
|
||||
* object frozen by {@link MessageFormatter#runStage}.
|
||||
*
|
||||
* @typedef {Readonly<MessageFormattingBase & { stage: MessageFormattingStage }>} MessageFormattingContext
|
||||
*/
|
||||
|
||||
/**
|
||||
* A formatting hook function.
|
||||
* Receives the current message text (plain Markdown or HTML, depending on
|
||||
* the stage) and an immutable context object. Must return the (possibly
|
||||
* modified) message text **synchronously** as a `string`. Passing an async
|
||||
* function to {@link MessageFormatter#addHook} will throw a `TypeError` at
|
||||
* registration time. If a hook returns a non-string at runtime, a console
|
||||
* warning is emitted and the return value is ignored (the pipeline continues
|
||||
* with the previous text unchanged).
|
||||
*
|
||||
* @callback MessageFormattingHook
|
||||
* @param {string} mes - Current message text at this pipeline stage.
|
||||
* @param {MessageFormattingContext} ctx - Immutable metadata about the message.
|
||||
* @returns {string} The (possibly transformed) message text.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Options accepted by {@link MessageFormatter#addHook}.
|
||||
*
|
||||
* @typedef {Object} AddHookOptions
|
||||
* @property {hook_order|number} [order=hook_order.NORMAL] - Numeric priority within the stage.
|
||||
* Lower numbers run first. Use the exported {@link hook_order} constants for readable values.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Ordering buckets for formatting hooks.
|
||||
* Use these when calling {@link MessageFormatter#addHook} to express
|
||||
* intent rather than bare numbers.
|
||||
*
|
||||
* @enum {number}
|
||||
*/
|
||||
export const hook_order = {
|
||||
EARLIEST: 0,
|
||||
EARLY: 10,
|
||||
NORMAL: 50,
|
||||
LATE: 90,
|
||||
LATEST: 100,
|
||||
};
|
||||
|
||||
/** @type {MessageFormatter} */
|
||||
let instance;
|
||||
|
||||
/**
|
||||
* Singleton instance of {@link MessageFormatter}.
|
||||
* Exported under the class name so callers can write
|
||||
* `import { MessageFormatter } from './message-formatter.js'`
|
||||
* and use it directly.
|
||||
*
|
||||
* @type {MessageFormatter}
|
||||
*/
|
||||
export { instance as MessageFormatter };
|
||||
|
||||
/**
|
||||
* Manages the message-formatting pipeline and exposes registration points
|
||||
* for extensions that need to transform message text before it reaches the
|
||||
* DOM.
|
||||
*
|
||||
* Extensions should obtain the singleton via `getContext().messageFormatter`
|
||||
* and call {@link MessageFormatter#addHook} once during their init phase.
|
||||
*
|
||||
* @example
|
||||
* // In your extension's init function:
|
||||
* const { messageFormatter } = getContext();
|
||||
* messageFormatter.addHook((mes, ctx) => {
|
||||
* if (ctx.isUser) return mes;
|
||||
* return addFurigana(mes);
|
||||
* });
|
||||
*
|
||||
* // With an explicit stage and order (using the enum accessors on the singleton):
|
||||
* const { messageFormatter } = getContext();
|
||||
* messageFormatter.addHook((mes, ctx) => transform(mes), {
|
||||
* stage: messageFormatter.stage.AFTER_REGEX,
|
||||
* order: messageFormatter.order.EARLY,
|
||||
* });
|
||||
*/
|
||||
class MessageFormatter {
|
||||
/** @type {MessageFormatter} */
|
||||
static #instance;
|
||||
|
||||
/** @returns {MessageFormatter} */
|
||||
static get instance() {
|
||||
return MessageFormatter.#instance ?? (MessageFormatter.#instance = new MessageFormatter());
|
||||
}
|
||||
|
||||
/**
|
||||
* Internal storage: one sorted bucket per stage.
|
||||
*
|
||||
* @type {Map<MessageFormattingStage, { fn: MessageFormattingHook, order: number }[]>}
|
||||
*/
|
||||
#hooks = new Map();
|
||||
|
||||
/**
|
||||
* Exposes {@link formatting_stage} on the instance so extensions can
|
||||
* access stage constants without a separate import.
|
||||
* @type {typeof formatting_stage}
|
||||
* @readonly
|
||||
*/
|
||||
stage = formatting_stage;
|
||||
|
||||
/**
|
||||
* Exposes {@link hook_order} on the instance so extensions can
|
||||
* access order constants without a separate import.
|
||||
* @type {typeof hook_order}
|
||||
* @readonly
|
||||
*/
|
||||
order = hook_order;
|
||||
|
||||
constructor() {
|
||||
this.#hooks.set(formatting_stage.BEFORE_REGEX, []);
|
||||
this.#hooks.set(formatting_stage.AFTER_REGEX, []);
|
||||
this.#hooks.set(formatting_stage.AFTER_MARKDOWN, []);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a hook function to run at a specific pipeline stage.
|
||||
*
|
||||
* Should be called once during the extension's init/setup phase.
|
||||
* Hooks are applied in ascending `order` within each stage.
|
||||
*
|
||||
* @param {MessageFormattingHook} fn - The hook function.
|
||||
* @param {AddHookOptions & { stage?: MessageFormattingStage }} [options={}]
|
||||
* Options object. `stage` defaults to `'afterMarkdown'`; `order` defaults to `50`.
|
||||
* @returns {void}
|
||||
*
|
||||
* @throws {TypeError} If `fn` is not a function or is an async function.
|
||||
* @throws {RangeError} If `stage` is not a known {@link formatting_stage} value.
|
||||
*/
|
||||
addHook(fn, { stage = formatting_stage.AFTER_MARKDOWN, order = hook_order.NORMAL } = {}) {
|
||||
if (typeof fn !== 'function') throw new TypeError('MessageFormatter: hook must be a function');
|
||||
if (fn.constructor?.name === 'AsyncFunction') throw new TypeError(`MessageFormatter: hook registered for stage '${stage}' must be synchronous — async functions are not supported`);
|
||||
if (!this.#hooks.has(stage)) throw new RangeError(`MessageFormatter: unknown stage '${stage}'`);
|
||||
this.#hooks.get(stage).push({ fn, order });
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs all hooks registered for the given stage in order.
|
||||
* Called internally by {@link messageFormatting} at each pipeline point.
|
||||
* Extensions do not need to call this directly.
|
||||
*
|
||||
* @param {MessageFormattingStage} stage - The pipeline stage to execute.
|
||||
* @param {string} mes - Current message text.
|
||||
* @param {MessageFormattingBase} base - Message metadata. `stage` is injected automatically.
|
||||
* @returns {string} The message text after all hooks have been applied.
|
||||
*/
|
||||
runStage(stage, mes, base) {
|
||||
const bucket = this.#hooks.get(stage);
|
||||
if (!bucket?.length) return mes;
|
||||
const ctx = Object.freeze({ ...base, stage });
|
||||
const sorted = bucket.slice().sort((a, b) => a.order - b.order);
|
||||
for (const { fn } of sorted) {
|
||||
try {
|
||||
const result = fn(mes, ctx);
|
||||
if (typeof result !== 'string') {
|
||||
console.warn(`[MessageFormatter] Hook at stage '${stage}' returned ${/** @type {unknown} */ (result) instanceof Promise ? 'a Promise (hook may be async)' : typeof result} instead of a string. The hook's return value has been ignored.`);
|
||||
} else {
|
||||
mes = result;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(`[MessageFormatter] Hook error at stage '${stage}':`, e);
|
||||
}
|
||||
}
|
||||
return mes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats a message using the full pipeline (including all registered
|
||||
* hooks). This is a convenience shim over the top-level
|
||||
* {@link messageFormatting} function and accepts the same arguments.
|
||||
*
|
||||
* Extensions that already import `getContext()` can use this instead of
|
||||
* importing `messageFormatting` directly from `script.js`.
|
||||
*
|
||||
* The pipeline is, in order:
|
||||
* 1. Prompt-bias stripping (message 0 only)
|
||||
* 2. Comment / hidden-message normalisation
|
||||
* 3. `beforeRegex` extension hooks (see {@link MessageFormatter})
|
||||
* 4. Custom regex rules (`getRegexedString`)
|
||||
* 5. `afterRegex` extension hooks
|
||||
* 6. Markdown auto-fix (`fixMarkdown`)
|
||||
* 7. HTML tag encoding (`encode_tags`)
|
||||
* 8. Showdown Markdown → HTML conversion
|
||||
* 9. `afterMarkdown` extension hooks
|
||||
* 10. Name-prefix stripping (`allow_name2_display`)
|
||||
* 11. DOMPurify sanitization
|
||||
*
|
||||
* All extension hooks run **before** DOMPurify (steps 3, 5, 9) so their
|
||||
* output is always sanitised.
|
||||
*
|
||||
* @param {string} mes - Raw message text.
|
||||
* @param {string} characterName - Character name.
|
||||
* @param {boolean} isSystem - Whether this is a system message.
|
||||
* @param {boolean} isUser - Whether this was sent by the user.
|
||||
* @param {number} messageId - Message index in the chat array.
|
||||
* @param {Partial<import('dompurify').Config>} [sanitizerOverrides={}] - DOMPurify option overrides.
|
||||
* @param {boolean} [isReasoning=false] - Whether this is reasoning output.
|
||||
* @returns {string} Formatted HTML string ready for DOM insertion.
|
||||
*/
|
||||
format(mes, characterName, isSystem, isUser, messageId, sanitizerOverrides = {}, isReasoning = false) {
|
||||
return messageFormatting(mes, characterName, isSystem, isUser, messageId, sanitizerOverrides, isReasoning);
|
||||
}
|
||||
}
|
||||
|
||||
instance = MessageFormatter.instance;
|
||||
@@ -205,7 +205,7 @@ export function loadNovelPreset(preset) {
|
||||
nai_settings.logit_bias = preset.logit_bias || [];
|
||||
nai_settings.preamble = preset.preamble || default_preamble;
|
||||
nai_settings.min_p = preset.min_p || 0;
|
||||
nai_settings.math1_temp = preset.math1_temp || 1;
|
||||
nai_settings.math1_temp = preset.math1_temp ?? 1;
|
||||
nai_settings.math1_quad = preset.math1_quad || 0;
|
||||
nai_settings.math1_quad_entropy_scale = preset.math1_quad_entropy_scale || 0;
|
||||
nai_settings.extensions = preset.extensions || {};
|
||||
@@ -259,7 +259,7 @@ export function loadNovelSettings(data, settings) {
|
||||
nai_settings.order = settings.order || default_order;
|
||||
nai_settings.logit_bias = settings.logit_bias || [];
|
||||
nai_settings.min_p = settings.min_p || 0;
|
||||
nai_settings.math1_temp = settings.math1_temp || 1;
|
||||
nai_settings.math1_temp = settings.math1_temp ?? 1;
|
||||
nai_settings.math1_quad = settings.math1_quad || 0;
|
||||
nai_settings.math1_quad_entropy_scale = settings.math1_quad_entropy_scale || 0;
|
||||
nai_settings.extensions = settings.extensions || {};
|
||||
|
||||
+173
-26
@@ -14,6 +14,7 @@ import {
|
||||
extension_prompt_roles,
|
||||
extension_prompt_types,
|
||||
Generate,
|
||||
getCurrentChatId,
|
||||
getExtensionPrompt,
|
||||
getExtensionPromptMaxDepth,
|
||||
getMediaDisplay,
|
||||
@@ -133,6 +134,7 @@ const max_200k = 200 * 1000;
|
||||
const max_256k = 256 * 1000;
|
||||
const max_400k = 400 * 1000;
|
||||
const max_1mil = 1000 * 1000;
|
||||
const max_1050k = 1050 * 1000;
|
||||
const max_2mil = 2000 * 1000;
|
||||
const unlocked_max = max_2mil;
|
||||
const oai_max_temp = 2.0;
|
||||
@@ -267,6 +269,11 @@ export const ZAI_ENDPOINT = {
|
||||
CODING: 'coding',
|
||||
};
|
||||
|
||||
export const POLLINATIONS_ENDPOINT = {
|
||||
AUTHENTICATED: 'authenticated',
|
||||
ANONYMOUS: 'anonymous',
|
||||
};
|
||||
|
||||
export const SILICONFLOW_ENDPOINT = {
|
||||
GLOBAL: 'global',
|
||||
CN: 'cn',
|
||||
@@ -335,6 +342,7 @@ export const settingsToUpdate = {
|
||||
aimlapi_model: ['#model_aimlapi_select', 'aimlapi_model', false, true],
|
||||
xai_model: ['#model_xai_select', 'xai_model', false, true],
|
||||
pollinations_model: ['#model_pollinations_select', 'pollinations_model', false, true],
|
||||
pollinations_endpoint: ['#pollinations_endpoint', 'pollinations_endpoint', false, true],
|
||||
moonshot_model: ['#model_moonshot_select', 'moonshot_model', false, true],
|
||||
fireworks_model: ['#model_fireworks_select', 'fireworks_model', false, true],
|
||||
cometapi_model: ['#model_cometapi_select', 'cometapi_model', false, true],
|
||||
@@ -369,7 +377,7 @@ export const settingsToUpdate = {
|
||||
prompts: ['', 'prompts', false, false],
|
||||
prompt_order: ['', 'prompt_order', false, false],
|
||||
show_external_models: ['#openai_show_external_models', 'show_external_models', true, true],
|
||||
proxy_password: ['#openai_proxy_password', 'proxy_password', false, true],
|
||||
proxy_password: ['#openai_proxy_access_key', 'proxy_password', false, true],
|
||||
assistant_prefill: ['#claude_assistant_prefill', 'assistant_prefill', false, false],
|
||||
assistant_impersonation: ['#claude_assistant_impersonation', 'assistant_impersonation', false, false],
|
||||
use_sysprompt: ['#use_sysprompt', 'use_sysprompt', true, false],
|
||||
@@ -429,10 +437,10 @@ const default_settings = {
|
||||
personality_format: default_personality_format,
|
||||
sort_models: 'alphabetically',
|
||||
group_models: false,
|
||||
openai_model: 'gpt-4-turbo',
|
||||
claude_model: 'claude-sonnet-4-5',
|
||||
google_model: 'gemini-2.5-pro',
|
||||
vertexai_model: 'gemini-2.5-pro',
|
||||
openai_model: 'gpt-5.6-terra',
|
||||
claude_model: 'claude-sonnet-5',
|
||||
google_model: 'gemini-3.7-flash',
|
||||
vertexai_model: 'gemini-3.7-flash',
|
||||
ai21_model: 'jamba-large',
|
||||
mistralai_model: 'mistral-large-latest',
|
||||
cohere_model: 'command-r-plus',
|
||||
@@ -451,6 +459,7 @@ const default_settings = {
|
||||
aimlapi_model: 'chatgpt-4o-latest',
|
||||
xai_model: 'grok-3-beta',
|
||||
pollinations_model: 'openai',
|
||||
pollinations_endpoint: POLLINATIONS_ENDPOINT.AUTHENTICATED,
|
||||
cometapi_model: 'gpt-4o',
|
||||
moonshot_model: 'kimi-latest',
|
||||
fireworks_model: 'accounts/fireworks/models/kimi-k2-instruct',
|
||||
@@ -1614,6 +1623,21 @@ export async function prepareOpenAIMessages({
|
||||
return [chat, promptManager.tokenHandler.counts];
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts a human-readable message from a Chat Completion error response.
|
||||
* Providers can return an error object without a message field, or the error as
|
||||
* a plain string. statusText is only used for non-2xx responses, since for an
|
||||
* HTTP 200 carrying an error payload it is just "OK" (#5647).
|
||||
* @param {object} data Parsed response body
|
||||
* @param {Response} response Fetch response
|
||||
* @returns {string} Error message to display and throw
|
||||
*/
|
||||
function getChatCompletionErrorMessage(data, response) {
|
||||
const error = data?.error ?? data?.detail?.error;
|
||||
const message = typeof error === 'string' ? error : (error?.message || error?.code || error?.type);
|
||||
return String(message || (!response.ok && response.statusText) || t`Unknown error`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles errors during streaming requests.
|
||||
* @param {Response} response
|
||||
@@ -1636,7 +1660,7 @@ export function tryParseStreamingError(response, decoded, { quiet = false } = {}
|
||||
// if trying to fix "[object Object]" displayed to users, start here
|
||||
|
||||
if (data.error) {
|
||||
!quiet && toastr.error(data.error.message || response.statusText, 'Chat Completion API');
|
||||
!quiet && toastr.error(getChatCompletionErrorMessage(data, response), 'Chat Completion API');
|
||||
throw new Error(data);
|
||||
}
|
||||
|
||||
@@ -1646,7 +1670,7 @@ export function tryParseStreamingError(response, decoded, { quiet = false } = {}
|
||||
}
|
||||
|
||||
if (data.detail) {
|
||||
!quiet && toastr.error(data.detail?.error?.message || response.statusText, 'Chat Completion API');
|
||||
!quiet && toastr.error(getChatCompletionErrorMessage(data, response), 'Chat Completion API');
|
||||
throw new Error(data);
|
||||
}
|
||||
} catch {
|
||||
@@ -2281,14 +2305,12 @@ function saveModelList(data) {
|
||||
|
||||
if (oai_settings.chat_completion_source === chat_completion_sources.FIREWORKS) {
|
||||
$('#model_fireworks_select').empty();
|
||||
model_list.sort((a, b) => (a?.name || a?.id || '').localeCompare(b?.name || b?.id || ''));
|
||||
model_list.forEach((model) => {
|
||||
if (!model?.supports_chat) {
|
||||
return;
|
||||
}
|
||||
$('#model_fireworks_select').append(
|
||||
$('<option>', {
|
||||
value: model.id,
|
||||
text: model.id,
|
||||
text: model.name || model.id,
|
||||
}));
|
||||
});
|
||||
|
||||
@@ -2538,6 +2560,7 @@ function getReasoningEffort(settings = null, model = null) {
|
||||
chat_completion_sources.ELECTRONHUB,
|
||||
chat_completion_sources.CHUTES,
|
||||
chat_completion_sources.DEEPSEEK,
|
||||
chat_completion_sources.FIREWORKS,
|
||||
];
|
||||
|
||||
if (!reasoningEffortSources.includes(settings.chat_completion_source)) {
|
||||
@@ -2549,6 +2572,9 @@ function getReasoningEffort(settings = null, model = null) {
|
||||
switch (settings.reasoning_effort) {
|
||||
case reasoning_effort_types.auto:
|
||||
return undefined;
|
||||
case reasoning_effort_types.min:
|
||||
case reasoning_effort_types.low:
|
||||
return reasoning_effort_types.low;
|
||||
case reasoning_effort_types.max:
|
||||
return reasoning_effort_types.max;
|
||||
default:
|
||||
@@ -2556,6 +2582,17 @@ function getReasoningEffort(settings = null, model = null) {
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.chat_completion_source === chat_completion_sources.FIREWORKS) {
|
||||
switch (settings.reasoning_effort) {
|
||||
case reasoning_effort_types.auto:
|
||||
return undefined;
|
||||
case reasoning_effort_types.min:
|
||||
return reasoning_effort_types.low;
|
||||
default:
|
||||
return settings.reasoning_effort;
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.chat_completion_source === chat_completion_sources.CUSTOM && /^koboldcpp\/(.+)$/.test(model)) {
|
||||
switch (settings.reasoning_effort) {
|
||||
case reasoning_effort_types.auto:
|
||||
@@ -2584,7 +2621,7 @@ function getReasoningEffort(settings = null, model = null) {
|
||||
}
|
||||
|
||||
if ([chat_completion_sources.OPENAI, chat_completion_sources.AZURE_OPENAI].includes(settings.chat_completion_source)) {
|
||||
if (/^gpt-5\.(4|5)/.test(model)) {
|
||||
if (/^gpt-5\.(4|5|6)/.test(model)) {
|
||||
return 'none';
|
||||
}
|
||||
if (/^gpt-5/.test(model)) {
|
||||
@@ -2594,6 +2631,15 @@ function getReasoningEffort(settings = null, model = null) {
|
||||
|
||||
return reasoning_effort_types.low;
|
||||
case reasoning_effort_types.max:
|
||||
if ([chat_completion_sources.OPENAI, chat_completion_sources.AZURE_OPENAI].includes(settings.chat_completion_source)
|
||||
&& /^gpt-6-astra/.test(model)) {
|
||||
return reasoning_effort_types.max;
|
||||
}
|
||||
if ([chat_completion_sources.OPENAI, chat_completion_sources.AZURE_OPENAI].includes(settings.chat_completion_source)
|
||||
&& /^gpt-5\.6/.test(model)) {
|
||||
// GPT-5.6 reserves "max" effort for the Responses API.
|
||||
return 'xhigh';
|
||||
}
|
||||
return reasoning_effort_types.high;
|
||||
default:
|
||||
return settings.reasoning_effort;
|
||||
@@ -2649,6 +2695,20 @@ export async function createGenerationParameters(settings, model, type, messages
|
||||
}
|
||||
messages = messages.filter(msg => msg && typeof msg === 'object');
|
||||
|
||||
// DeepSeek only accepts image blocks in user messages. Media can also be
|
||||
// attached to system and assistant messages by the shared inlining path.
|
||||
const isDeepSeekVisionModel = typeof model === 'string' && model.toLowerCase().includes('deepseek-v4-flash-vision-exp');
|
||||
if (isDeepSeekVisionModel) {
|
||||
messages = messages.flatMap((message) => {
|
||||
if (!['system', 'assistant'].includes(message.role) || !Array.isArray(message.content)) {
|
||||
return [message];
|
||||
}
|
||||
|
||||
const content = message.content.filter(block => block?.type !== 'image_url');
|
||||
return content.length > 0 ? [{ ...message, content }] : [];
|
||||
});
|
||||
}
|
||||
|
||||
// "OpenAI-like" sources
|
||||
const gptSources = [
|
||||
chat_completion_sources.OPENAI,
|
||||
@@ -2692,6 +2752,7 @@ export async function createGenerationParameters(settings, model, type, messages
|
||||
const logprobsSupportedSources = [
|
||||
chat_completion_sources.OPENAI,
|
||||
chat_completion_sources.AZURE_OPENAI,
|
||||
chat_completion_sources.OPENROUTER,
|
||||
chat_completion_sources.CUSTOM,
|
||||
chat_completion_sources.DEEPSEEK,
|
||||
chat_completion_sources.XAI,
|
||||
@@ -2837,6 +2898,10 @@ export async function createGenerationParameters(settings, model, type, messages
|
||||
generate_data.nanogpt_payg_override = settings.nanogpt_payg_override;
|
||||
}
|
||||
|
||||
if (settings.chat_completion_source === chat_completion_sources.FIREWORKS && type !== 'quiet') {
|
||||
generate_data.chat_id = getCurrentChatId();
|
||||
}
|
||||
|
||||
if ([chat_completion_sources.MAKERSUITE, chat_completion_sources.VERTEXAI].includes(settings.chat_completion_source)) {
|
||||
const stopStringsLimit = 5;
|
||||
generate_data.top_k = Number(settings.top_k_openai);
|
||||
@@ -2933,6 +2998,10 @@ export async function createGenerationParameters(settings, model, type, messages
|
||||
delete generate_data.frequency_penalty;
|
||||
}
|
||||
|
||||
if (settings.chat_completion_source === chat_completion_sources.POLLINATIONS) {
|
||||
generate_data.pollinations_endpoint = settings.pollinations_endpoint || POLLINATIONS_ENDPOINT.AUTHENTICATED;
|
||||
}
|
||||
|
||||
if (settings.chat_completion_source === chat_completion_sources.SILICONFLOW) {
|
||||
generate_data.siliconflow_endpoint = settings.siliconflow_endpoint || SILICONFLOW_ENDPOINT.GLOBAL;
|
||||
}
|
||||
@@ -3025,6 +3094,31 @@ export async function createGenerationParameters(settings, model, type, messages
|
||||
}
|
||||
}
|
||||
|
||||
if (gptSources.includes(settings.chat_completion_source) && /gpt-6-astra/.test(model)) {
|
||||
generate_data.max_completion_tokens = generate_data.max_tokens;
|
||||
delete generate_data.max_tokens;
|
||||
delete generate_data.temperature;
|
||||
delete generate_data.top_p;
|
||||
delete generate_data.logprobs;
|
||||
delete generate_data.top_logprobs;
|
||||
}
|
||||
|
||||
// Claude Fable / Claude 5 models removed sampling parameters and reject them with HTTP 400,
|
||||
// including via OpenAI-compatible proxies. Unanchored to also match prefixed ids
|
||||
// like 'anthropic/claude-fable-5' or 'anthropic/claude-opus-5'.
|
||||
if (/claude-(fable|opus-5|sonnet-5)/.test(model)) {
|
||||
delete generate_data.temperature;
|
||||
delete generate_data.top_p;
|
||||
delete generate_data.top_k;
|
||||
delete generate_data.frequency_penalty;
|
||||
delete generate_data.presence_penalty;
|
||||
// Keep reasoning_effort for the native Claude source, where the backend maps it to
|
||||
// adaptive thinking; proxies may translate it into a thinking budget that these models reject.
|
||||
if (settings.chat_completion_source !== chat_completion_sources.CLAUDE) {
|
||||
delete generate_data.reasoning_effort;
|
||||
}
|
||||
}
|
||||
|
||||
if (jsonSchema) {
|
||||
generate_data.json_schema = jsonSchema;
|
||||
}
|
||||
@@ -3100,7 +3194,7 @@ async function sendOpenAIRequest(type, messages, signal, { jsonSchema = null } =
|
||||
checkModerationError(data);
|
||||
|
||||
if (data.error) {
|
||||
const message = data.error.message || response.statusText || t`Unknown error`;
|
||||
const message = getChatCompletionErrorMessage(data, response);
|
||||
toastr.error(message, t`API returned an error`);
|
||||
throw new Error(message);
|
||||
}
|
||||
@@ -3192,7 +3286,7 @@ export function getStreamingReply(data, state, { chatCompletionSource = null, ov
|
||||
}
|
||||
});
|
||||
return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
|
||||
} else if ([chat_completion_sources.CUSTOM, chat_completion_sources.POLLINATIONS, chat_completion_sources.AIMLAPI, chat_completion_sources.MOONSHOT, chat_completion_sources.COMETAPI, chat_completion_sources.ELECTRONHUB, chat_completion_sources.NANOGPT, chat_completion_sources.ZAI, chat_completion_sources.SILICONFLOW, chat_completion_sources.CHUTES, chat_completion_sources.WORKERS_AI].includes(chat_completion_source)) {
|
||||
} else if ([chat_completion_sources.CUSTOM, chat_completion_sources.POLLINATIONS, chat_completion_sources.AIMLAPI, chat_completion_sources.MOONSHOT, chat_completion_sources.COMETAPI, chat_completion_sources.ELECTRONHUB, chat_completion_sources.NANOGPT, chat_completion_sources.ZAI, chat_completion_sources.SILICONFLOW, chat_completion_sources.CHUTES, chat_completion_sources.WORKERS_AI, chat_completion_sources.FIREWORKS].includes(chat_completion_source)) {
|
||||
if (show_thoughts) {
|
||||
state.reasoning +=
|
||||
data.choices?.filter(x => x?.delta?.reasoning_content)?.[0]?.delta?.reasoning_content ??
|
||||
@@ -3229,6 +3323,7 @@ function parseChatCompletionLogprobs(data) {
|
||||
: parseOpenAITextLogprobs(data.choices[0]?.logprobs);
|
||||
case chat_completion_sources.OPENAI:
|
||||
case chat_completion_sources.AZURE_OPENAI:
|
||||
case chat_completion_sources.OPENROUTER:
|
||||
case chat_completion_sources.DEEPSEEK:
|
||||
case chat_completion_sources.XAI:
|
||||
case chat_completion_sources.CUSTOM:
|
||||
@@ -4182,6 +4277,12 @@ function migrateChatCompletionSettings(settings) {
|
||||
{ oldKey: 'chat_completion_source', oldValue: 'palm', newKey: 'chat_completion_source', newValue: chat_completion_sources.MAKERSUITE },
|
||||
{ oldKey: 'custom_prompt_post_processing', oldValue: custom_prompt_post_processing_types.CLAUDE, newKey: 'custom_prompt_post_processing', newValue: custom_prompt_post_processing_types.MERGE },
|
||||
{ oldKey: 'ai21_model', oldValue: /^j2-/, newKey: 'ai21_model', newValue: 'jamba-large' },
|
||||
{ oldKey: 'google_model', oldValue: 'gemini-3.1-flash-lite-preview', newKey: 'google_model', newValue: 'gemini-3.1-flash-lite' },
|
||||
{ oldKey: 'vertexai_model', oldValue: 'gemini-3.1-flash-lite-preview', newKey: 'vertexai_model', newValue: 'gemini-3.1-flash-lite' },
|
||||
{ oldKey: 'google_model', oldValue: 'gemini-3.1-flash-image-preview', newKey: 'google_model', newValue: 'gemini-3.1-flash-image' },
|
||||
{ oldKey: 'vertexai_model', oldValue: 'gemini-3.1-flash-image-preview', newKey: 'vertexai_model', newValue: 'gemini-3.1-flash-image' },
|
||||
{ oldKey: 'google_model', oldValue: 'gemini-3-pro-image-preview', newKey: 'google_model', newValue: 'gemini-3-pro-image' },
|
||||
{ oldKey: 'vertexai_model', oldValue: 'gemini-3-pro-image-preview', newKey: 'vertexai_model', newValue: 'gemini-3-pro-image' },
|
||||
{ oldKey: 'image_inlining', oldValue: false, newKey: 'media_inlining', newValue: false },
|
||||
{ oldKey: 'image_inlining', oldValue: true, newKey: 'media_inlining', newValue: true },
|
||||
{ oldKey: 'video_inlining', oldValue: true, newKey: 'media_inlining', newValue: true },
|
||||
@@ -4428,6 +4529,10 @@ async function getStatusOpen() {
|
||||
data.workers_ai_account_id = oai_settings.workers_ai_account_id;
|
||||
}
|
||||
|
||||
if (oai_settings.chat_completion_source === chat_completion_sources.POLLINATIONS) {
|
||||
data.pollinations_endpoint = oai_settings.pollinations_endpoint || POLLINATIONS_ENDPOINT.AUTHENTICATED;
|
||||
}
|
||||
|
||||
const canBypass = (oai_settings.chat_completion_source === chat_completion_sources.OPENAI && oai_settings.bypass_status_check) || oai_settings.chat_completion_source === chat_completion_sources.CUSTOM;
|
||||
if (canBypass) {
|
||||
setOnlineStatus(t`Status check bypassed`);
|
||||
@@ -4894,6 +4999,23 @@ async function onLogitBiasPresetDeleteClick() {
|
||||
saveSettingsDebounced();
|
||||
}
|
||||
|
||||
/**
|
||||
* Promise that resolves when the most recently started preset application has fully completed.
|
||||
* The change handler defers the actual apply behind an event emission, so programmatic preset
|
||||
* switches (e.g. /preset, connection profiles) must await this to sequence follow-up commands
|
||||
* such as /api and /model correctly.
|
||||
* @type {Promise<void>}
|
||||
*/
|
||||
let presetApplicationPromise = Promise.resolve();
|
||||
|
||||
/**
|
||||
* Gets a promise that resolves when the currently pending preset application completes.
|
||||
* @returns {Promise<void>} Promise that resolves when the preset is fully applied.
|
||||
*/
|
||||
export function getPresetApplicationPromise() {
|
||||
return presetApplicationPromise;
|
||||
}
|
||||
|
||||
// Load OpenAI preset settings
|
||||
function onSettingsPresetChange() {
|
||||
const presetNameBefore = oai_settings.preset_settings_openai;
|
||||
@@ -4909,7 +5031,7 @@ function onSettingsPresetChange() {
|
||||
const updateCheckbox = (selector, value) => $(selector).prop('checked', value).trigger('input', { source: 'preset' });
|
||||
|
||||
// Allow subscribers to alter the preset before applying deltas
|
||||
eventSource.emit(event_types.OAI_PRESET_CHANGED_BEFORE, {
|
||||
presetApplicationPromise = eventSource.emit(event_types.OAI_PRESET_CHANGED_BEFORE, {
|
||||
preset: preset,
|
||||
presetName: presetName,
|
||||
settingsToUpdate: settingsToUpdate,
|
||||
@@ -4970,6 +5092,8 @@ function getMaxContextOpenAI(value) {
|
||||
|
||||
/** @type {[RegExp, number][]} */
|
||||
const contextMap = [
|
||||
[/^gpt-6-astra/, max_1050k],
|
||||
[/^gpt-5\.6/, max_1050k],
|
||||
[/^gpt-5\.[45]/, max_1mil],
|
||||
[/^gpt-5/, max_400k],
|
||||
[/gpt-4\.1/, max_1mil],
|
||||
@@ -5018,6 +5142,7 @@ function getGeminiMaxContext(model, isUnlocked) {
|
||||
/** @type {[RegExp, number][]} */
|
||||
const contextMap = [
|
||||
[/gemini-2\.5-flash-image/, max_32k],
|
||||
[/gemini-3\.1-flash-image/, max_128k],
|
||||
[/gemini-3-pro-image/, max_64k],
|
||||
[/gemini-(?:3[.\d]*|2\.(?:5|0))-(pro|flash)/, max_1mil],
|
||||
[/(gemini-exp|learnlm-2\.0-flash|gemini-robotics)/, max_1mil],
|
||||
@@ -5137,6 +5262,7 @@ function getZaiMaxContext(model, isUnlocked) {
|
||||
}
|
||||
|
||||
const contextMap = {
|
||||
'glm-5.2': max_1mil,
|
||||
'glm-5.1': max_200k,
|
||||
'glm-5-turbo': max_200k,
|
||||
'glm-5v-turbo': max_200k,
|
||||
@@ -5604,7 +5730,7 @@ async function onModelChange() {
|
||||
if (oai_settings.chat_completion_source == chat_completion_sources.CLAUDE) {
|
||||
if (oai_settings.max_context_unlocked) {
|
||||
$('#openai_max_context').attr('max', unlocked_max);
|
||||
} else if (/^claude-(sonnet-4-5|sonnet-4-6|opus-4-6|opus-4-7)/.test(value)) {
|
||||
} else if (/^claude-(sonnet-4-5|sonnet-4-6|sonnet-5|opus-4-6|opus-4-7|opus-4-8|opus-5|fable)/.test(value)) {
|
||||
$('#openai_max_context').attr('max', max_1mil);
|
||||
} else if (/^claude-(3|opus|haiku|sonnet)/.test(value)) {
|
||||
$('#openai_max_context').attr('max', max_200k);
|
||||
@@ -5934,7 +6060,7 @@ async function onConnectButtonClick(e) {
|
||||
[chat_completion_sources.AZURE_OPENAI]: { key: SECRET_KEYS.AZURE_OPENAI, selector: '#api_key_azure_openai', proxy: false },
|
||||
[chat_completion_sources.ZAI]: { key: SECRET_KEYS.ZAI, selector: '#api_key_zai', proxy: true },
|
||||
[chat_completion_sources.CHUTES]: { key: SECRET_KEYS.CHUTES, selector: '#api_key_chutes', proxy: false },
|
||||
[chat_completion_sources.POLLINATIONS]: { key: SECRET_KEYS.POLLINATIONS, selector: '#api_key_pollinations', proxy: false },
|
||||
[chat_completion_sources.POLLINATIONS]: { key: SECRET_KEYS.POLLINATIONS, selector: '#api_key_pollinations', proxy: false, keyless: oai_settings.pollinations_endpoint === POLLINATIONS_ENDPOINT.ANONYMOUS },
|
||||
[chat_completion_sources.WORKERS_AI]: { key: SECRET_KEYS.WORKERS_AI, selector: '#api_key_workers_ai', proxy: false },
|
||||
[chat_completion_sources.MINIMAX]: { key: SECRET_KEYS.MINIMAX, selector: '#api_key_minimax', proxy: false },
|
||||
};
|
||||
@@ -6017,6 +6143,7 @@ function toggleChatCompletionForms() {
|
||||
} else if (oai_settings.chat_completion_source == chat_completion_sources.XAI) {
|
||||
$('#model_xai_select').trigger('change');
|
||||
} else if (oai_settings.chat_completion_source == chat_completion_sources.POLLINATIONS) {
|
||||
$('#pollinations_key_section').toggle(oai_settings.pollinations_endpoint === POLLINATIONS_ENDPOINT.AUTHENTICATED);
|
||||
$('#model_pollinations_select').trigger('change');
|
||||
} else if (oai_settings.chat_completion_source == chat_completion_sources.MOONSHOT) {
|
||||
$('#model_moonshot_select').trigger('change');
|
||||
@@ -6066,10 +6193,8 @@ function reconnectOpenAi() {
|
||||
}
|
||||
}
|
||||
|
||||
function onProxyPasswordShowClick() {
|
||||
const $input = $('#openai_proxy_password');
|
||||
const type = $input.attr('type') === 'password' ? 'text' : 'password';
|
||||
$input.attr('type', type);
|
||||
function onProxyAccessKeyShowClick() {
|
||||
$('#openai_proxy_access_key').toggleClass('masked-secret');
|
||||
$(this).toggleClass('fa-eye-slash fa-eye');
|
||||
}
|
||||
|
||||
@@ -6116,14 +6241,18 @@ export function isImageInliningSupported() {
|
||||
'gpt-4.1',
|
||||
'gpt-4.5-preview',
|
||||
'gpt-4o',
|
||||
'gpt-6-astra',
|
||||
'gpt-5',
|
||||
'o1',
|
||||
'o3',
|
||||
'o4-mini',
|
||||
// Claude
|
||||
'claude-3',
|
||||
'claude-fable',
|
||||
'claude-opus-4',
|
||||
'claude-opus-5',
|
||||
'claude-sonnet-4',
|
||||
'claude-sonnet-5',
|
||||
'claude-haiku-4',
|
||||
// Cohere
|
||||
'c4ai-aya-vision',
|
||||
@@ -6156,6 +6285,8 @@ export function isImageInliningSupported() {
|
||||
'moonshot-v1-128k-vision-preview',
|
||||
'kimi-k2.5',
|
||||
'kimi-latest',
|
||||
// DeepSeek
|
||||
'deepseek-v4-flash-vision-exp',
|
||||
// Z.AI (GLM)
|
||||
'glm-4.5v',
|
||||
'glm-4.6v',
|
||||
@@ -6215,10 +6346,14 @@ export function isImageInliningSupported() {
|
||||
return visionSupportedModels.some(model => oai_settings.zai_model.includes(model));
|
||||
case chat_completion_sources.SILICONFLOW:
|
||||
return visionSupportedModels.some(model => oai_settings.siliconflow_model.includes(model));
|
||||
case chat_completion_sources.DEEPSEEK:
|
||||
return visionSupportedModels.some(model => oai_settings.deepseek_model.includes(model));
|
||||
case chat_completion_sources.WORKERS_AI: {
|
||||
const waiModel = Array.isArray(model_list) && model_list.find(m => m.id === oai_settings.workers_ai_model);
|
||||
return Boolean(waiModel && Array.isArray(waiModel.properties) && waiModel.properties.some(p => p.property_id === 'vision' && p.value === 'true'));
|
||||
}
|
||||
case chat_completion_sources.FIREWORKS:
|
||||
return (Array.isArray(model_list) && model_list.find(m => m.id === oai_settings.fireworks_model)?.supports_image_input);
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
@@ -6387,7 +6522,7 @@ function setProxyPreset(name, url, password) {
|
||||
oai_settings.reverse_proxy = url;
|
||||
$('#openai_reverse_proxy').val(oai_settings.reverse_proxy);
|
||||
oai_settings.proxy_password = password;
|
||||
$('#openai_proxy_password').val(oai_settings.proxy_password);
|
||||
$('#openai_proxy_access_key').val(oai_settings.proxy_password);
|
||||
reconnectOpenAi();
|
||||
}
|
||||
|
||||
@@ -6406,7 +6541,7 @@ function onProxyPresetChange() {
|
||||
$('#save_proxy').on('click', async function () {
|
||||
const presetName = $('#openai_reverse_proxy_name').val();
|
||||
const reverseProxy = $('#openai_reverse_proxy').val();
|
||||
const proxyPassword = $('#openai_proxy_password').val();
|
||||
const proxyPassword = $('#openai_proxy_access_key').val();
|
||||
|
||||
setProxyPreset(presetName, reverseProxy, proxyPassword);
|
||||
saveSettingsDebounced();
|
||||
@@ -6440,7 +6575,7 @@ $('#delete_proxy').on('click', async function () {
|
||||
oai_settings.reverse_proxy = selected_proxy.url;
|
||||
$('#openai_reverse_proxy').val(selected_proxy.url);
|
||||
oai_settings.proxy_password = selected_proxy.password;
|
||||
$('#openai_proxy_password').val(selected_proxy.password);
|
||||
$('#openai_proxy_access_key').val(selected_proxy.password);
|
||||
|
||||
saveSettingsDebounced();
|
||||
$('#openai_proxy_preset').val(selected_proxy.name);
|
||||
@@ -6855,11 +6990,17 @@ export function initOpenAI() {
|
||||
saveSettingsDebounced();
|
||||
});
|
||||
|
||||
$('#openai_proxy_password').on('input', function () {
|
||||
$('#openai_proxy_access_key').on('input', function () {
|
||||
oai_settings.proxy_password = String($(this).val());
|
||||
saveSettingsDebounced();
|
||||
});
|
||||
|
||||
$('#openai_proxy_access_key').on('copy cut', function (event) {
|
||||
if ($(this).hasClass('masked-secret')) {
|
||||
event.preventDefault();
|
||||
}
|
||||
});
|
||||
|
||||
$('#claude_assistant_prefill').on('input', function () {
|
||||
oai_settings.assistant_prefill = String($(this).val());
|
||||
saveSettingsDebounced();
|
||||
@@ -7193,6 +7334,12 @@ export function initOpenAI() {
|
||||
oai_settings.zai_endpoint = String($(this).val());
|
||||
saveSettingsDebounced();
|
||||
});
|
||||
$('#pollinations_endpoint').on('input', function () {
|
||||
oai_settings.pollinations_endpoint = String($(this).val());
|
||||
$('#pollinations_key_section').toggle(oai_settings.pollinations_endpoint === POLLINATIONS_ENDPOINT.AUTHENTICATED);
|
||||
reconnectOpenAi();
|
||||
saveSettingsDebounced();
|
||||
});
|
||||
$('#siliconflow_endpoint').on('input', function () {
|
||||
oai_settings.siliconflow_endpoint = String($(this).val());
|
||||
saveSettingsDebounced();
|
||||
@@ -7243,7 +7390,7 @@ export function initOpenAI() {
|
||||
$('#openai_logit_bias_export_preset').on('click', onLogitBiasPresetExportClick);
|
||||
$('#openai_logit_bias_delete_preset').on('click', onLogitBiasPresetDeleteClick);
|
||||
$('#import_oai_preset').on('click', onImportPresetClick);
|
||||
$('#openai_proxy_password_show').on('click', onProxyPasswordShowClick);
|
||||
$('#openai_proxy_access_key_show').on('click', onProxyAccessKeyShowClick);
|
||||
$('#customize_additional_parameters').on('click', onCustomizeParametersClick);
|
||||
$('#openai_proxy_preset').on('change', onProxyPresetChange);
|
||||
}
|
||||
|
||||
@@ -85,6 +85,7 @@ export const POPUP_RESULT = {
|
||||
* @property {number?} [max] - The maximum value for number inputs
|
||||
* @property {number?} [step] - The step value for number inputs
|
||||
* @property {boolean?} [disabled=false] - Whether the input should be disabled
|
||||
* @property {boolean?} [autoFocus=false] - Whether this input should be auto-focused when the popup opens
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -336,6 +337,7 @@ export class Popup {
|
||||
inputElement.id = input.id;
|
||||
inputElement.checked = Boolean(input.defaultState ?? false);
|
||||
inputElement.disabled = Boolean(input.disabled ?? false);
|
||||
if (input.autoFocus) { inputElement.setAttribute('autofocus', ''); inputElement.tabIndex = 0; }
|
||||
label.appendChild(inputElement);
|
||||
const labelText = document.createElement('span');
|
||||
labelText.innerText = input.label;
|
||||
@@ -362,6 +364,7 @@ export class Popup {
|
||||
inputElement.value = String(input.defaultState ?? '');
|
||||
inputElement.placeholder = input.tooltip ?? '';
|
||||
inputElement.disabled = Boolean(input.disabled ?? false);
|
||||
if (input.autoFocus) { inputElement.setAttribute('autofocus', ''); inputElement.tabIndex = 0; }
|
||||
setTitleFromTooltip(inputElement, input.tooltip);
|
||||
|
||||
const labelText = document.createElement('span');
|
||||
@@ -384,6 +387,7 @@ export class Popup {
|
||||
inputElement.rows = input.rows ?? 1;
|
||||
inputElement.placeholder = input.tooltip ?? '';
|
||||
inputElement.disabled = Boolean(input.disabled ?? false);
|
||||
if (input.autoFocus) { inputElement.setAttribute('autofocus', ''); inputElement.tabIndex = 0; }
|
||||
setTitleFromTooltip(inputElement, input.tooltip);
|
||||
|
||||
const labelText = document.createElement('span');
|
||||
@@ -409,6 +413,7 @@ export class Popup {
|
||||
inputElement.max = String(input.max ?? '');
|
||||
inputElement.step = String(input.step ?? '');
|
||||
inputElement.disabled = Boolean(input.disabled ?? false);
|
||||
if (input.autoFocus) { inputElement.setAttribute('autofocus', ''); inputElement.tabIndex = 0; }
|
||||
setTitleFromTooltip(inputElement, input.tooltip);
|
||||
|
||||
inputElement.addEventListener('change', () => {
|
||||
|
||||
@@ -2818,9 +2818,10 @@ async function loadUntilMesId(mesId) {
|
||||
return target;
|
||||
}
|
||||
|
||||
async function doMesCut(_, text) {
|
||||
async function doMesCut(args, text) {
|
||||
console.debug(`was asked to cut message id #${text}`);
|
||||
const range = stringToRange(text, 0, chat.length - 1);
|
||||
const deleteToolCalls = args?.toolcalls === undefined || isTrueBoolean(args.toolcalls);
|
||||
|
||||
//reject invalid args or no args
|
||||
if (!range) {
|
||||
@@ -2828,12 +2829,16 @@ async function doMesCut(_, text) {
|
||||
return;
|
||||
}
|
||||
|
||||
let totalMesToCut = (range.end - range.start) + 1;
|
||||
let mesIDToCut = range.start;
|
||||
const messagesToCut = chat.slice(range.start, range.end + 1);
|
||||
let cutText = '';
|
||||
|
||||
for (let i = 0; i < totalMesToCut; i++) {
|
||||
cutText += (chat[mesIDToCut]?.mes || '') + '\n';
|
||||
for (const message of messagesToCut) {
|
||||
const mesIDToCut = chat.indexOf(message);
|
||||
if (mesIDToCut === -1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
cutText += (message?.mes || '') + '\n';
|
||||
let mesToCut = $('#chat').find(`.mes[mesid=${mesIDToCut}]`);
|
||||
|
||||
if (!mesToCut.length) {
|
||||
@@ -2845,7 +2850,7 @@ async function doMesCut(_, text) {
|
||||
}
|
||||
|
||||
setEditedMessageId(mesIDToCut);
|
||||
await deleteMessage(mesIDToCut, null, false);
|
||||
await deleteMessage(mesIDToCut, null, false, deleteToolCalls);
|
||||
}
|
||||
|
||||
await saveChatConditional();
|
||||
@@ -2853,7 +2858,7 @@ async function doMesCut(_, text) {
|
||||
return cutText;
|
||||
}
|
||||
|
||||
async function doDelMode(_, text) {
|
||||
async function doDelMode(args, text) {
|
||||
//reject invalid args
|
||||
if (text && isNaN(text)) {
|
||||
toastr.warning('Must enter a number or nothing.');
|
||||
@@ -2862,7 +2867,8 @@ async function doDelMode(_, text) {
|
||||
|
||||
// Just enter the delete mode.
|
||||
if (!text) {
|
||||
$('#option_delete_mes').trigger('click', { fromSlashCommand: true });
|
||||
const deleteToolCalls = args?.toolcalls === undefined || isTrueBoolean(args.toolcalls);
|
||||
$('#option_delete_mes').trigger('click', { fromSlashCommand: true, deleteToolCalls });
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -2879,7 +2885,7 @@ async function doDelMode(_, text) {
|
||||
}
|
||||
|
||||
const range = `${chat.length - count}-${chat.length - 1}`;
|
||||
return doMesCut(_, range);
|
||||
return doMesCut(args, range);
|
||||
}
|
||||
|
||||
function doResetPanels() {
|
||||
@@ -4145,6 +4151,15 @@ jQuery(() => {
|
||||
name: 'del',
|
||||
callback: doDelMode,
|
||||
aliases: ['delete', 'delmode'],
|
||||
namedArgumentList: [
|
||||
SlashCommandNamedArgument.fromProps({
|
||||
name: 'toolcalls',
|
||||
description: 'also delete associated tool-call messages',
|
||||
typeList: [ARGUMENT_TYPE.BOOLEAN],
|
||||
defaultValue: 'true',
|
||||
enumList: commonEnumProviders.boolean('trueFalse')(),
|
||||
}),
|
||||
],
|
||||
unnamedArgumentList: [
|
||||
new SlashCommandArgument(
|
||||
'optional number', [ARGUMENT_TYPE.NUMBER], false,
|
||||
@@ -4157,6 +4172,15 @@ jQuery(() => {
|
||||
name: 'cut',
|
||||
callback: doMesCut,
|
||||
returns: 'the text of cut messages separated by a newline',
|
||||
namedArgumentList: [
|
||||
SlashCommandNamedArgument.fromProps({
|
||||
name: 'toolcalls',
|
||||
description: 'also delete associated tool-call messages',
|
||||
typeList: [ARGUMENT_TYPE.BOOLEAN],
|
||||
defaultValue: 'true',
|
||||
enumList: commonEnumProviders.boolean('trueFalse')(),
|
||||
}),
|
||||
],
|
||||
unnamedArgumentList: [
|
||||
SlashCommandArgument.fromProps({
|
||||
description: 'number or range',
|
||||
|
||||
@@ -23,7 +23,7 @@ import { t } from './i18n.js';
|
||||
import { instruct_presets } from './instruct-mode.js';
|
||||
import { kai_settings } from './kai-settings.js';
|
||||
import { convertNovelPreset } from './nai-settings.js';
|
||||
import { oai_settings, openai_setting_names, openai_settings } from './openai.js';
|
||||
import { getPresetApplicationPromise, oai_settings, openai_setting_names, openai_settings } from './openai.js';
|
||||
import { POPUP_RESULT, POPUP_TYPE, Popup } from './popup.js';
|
||||
import { context_presets, getContextSettings, power_user } from './power-user.js';
|
||||
import { reasoning_templates } from './reasoning.js';
|
||||
@@ -406,14 +406,21 @@ class PresetManager {
|
||||
|
||||
/**
|
||||
* Selects a preset by option value.
|
||||
* The returned promise resolves when the preset is fully applied. Chat Completion presets
|
||||
* apply asynchronously after the change event, so callers that run follow-up commands
|
||||
* (e.g. /preset followed by /api) must await it to avoid overriding their own changes.
|
||||
* @param {string} value Preset option value
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
selectPreset(value) {
|
||||
async selectPreset(value) {
|
||||
const option = $(this.select).filter(function () {
|
||||
return $(this).val() === value;
|
||||
});
|
||||
option.prop('selected', true);
|
||||
$(this.select).val(value).trigger('change');
|
||||
if (this.apiId === 'openai') {
|
||||
await getPresetApplicationPromise();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -938,7 +945,7 @@ async function presetCommandCallback(_, name) {
|
||||
const presetValue = presetManager.findPreset(exactMatch);
|
||||
|
||||
if (presetValue) {
|
||||
presetManager.selectPreset(presetValue);
|
||||
await presetManager.selectPreset(presetValue);
|
||||
shouldReconnect && await waitForConnection();
|
||||
}
|
||||
}
|
||||
@@ -961,7 +968,7 @@ async function presetCommandCallback(_, name) {
|
||||
console.log('Found fuzzy preset match', fuzzyPresetName);
|
||||
|
||||
if (currentPreset !== fuzzyPresetName) {
|
||||
presetManager.selectPreset(fuzzyPresetValue);
|
||||
await presetManager.selectPreset(fuzzyPresetValue);
|
||||
shouldReconnect && await waitForConnection();
|
||||
}
|
||||
}
|
||||
|
||||
+52
-12
@@ -73,6 +73,25 @@ function getMessageFromJquery(element) {
|
||||
return { messageId: messageId, message, messageBlock };
|
||||
}
|
||||
|
||||
/**
|
||||
* Collapses reasoning blocks that cannot be closed by their header.
|
||||
* @param {JQuery<HTMLElement>} messageBlock Message block
|
||||
*/
|
||||
function closeReasoningDetailsWithoutContent(messageBlock) {
|
||||
const details = messageBlock.find('.mes_reasoning_details');
|
||||
if (details.attr('data-has-content') !== 'true') {
|
||||
details.removeAttr('open');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens reasoning blocks only when they have visible content.
|
||||
* @param {JQuery<HTMLElement>} details Reasoning details elements
|
||||
*/
|
||||
function openReasoningDetailsWithContent(details) {
|
||||
details.filter('[data-has-content="true"]').attr('open', '');
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggles the auto-expand state of reasoning blocks.
|
||||
*/
|
||||
@@ -80,7 +99,7 @@ function toggleReasoningAutoExpand() {
|
||||
const reasoningBlocks = document.querySelectorAll('details.mes_reasoning_details');
|
||||
reasoningBlocks.forEach((block) => {
|
||||
if (block instanceof HTMLDetailsElement) {
|
||||
block.open = power_user.reasoning.auto_expand;
|
||||
block.open = power_user.reasoning.auto_expand && block.dataset.hasContent === 'true';
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -135,6 +154,7 @@ export function extractReasoningFromData(data, {
|
||||
case chat_completion_sources.SILICONFLOW:
|
||||
case chat_completion_sources.ZAI:
|
||||
case chat_completion_sources.WORKERS_AI:
|
||||
case chat_completion_sources.FIREWORKS:
|
||||
case chat_completion_sources.CUSTOM: {
|
||||
return data?.choices?.[0]?.message?.reasoning_content
|
||||
?? data?.choices?.[0]?.message?.reasoning
|
||||
@@ -364,7 +384,7 @@ export class ReasoningHandler {
|
||||
|
||||
this.updateDom(messageId);
|
||||
|
||||
if (power_user.reasoning.auto_expand && this.state !== ReasoningState.Hidden) {
|
||||
if (power_user.reasoning.auto_expand && this.messageReasoningDetailsDom.dataset.hasContent === 'true') {
|
||||
this.messageReasoningDetailsDom.open = true;
|
||||
}
|
||||
}
|
||||
@@ -551,7 +571,12 @@ export class ReasoningHandler {
|
||||
setDatasetProperty(this.messageReasoningDetailsDom, 'type', this.type);
|
||||
|
||||
// Update the reasoning message
|
||||
const reasoning = trimSpaces(this.reasoningDisplayText ?? this.reasoning);
|
||||
const rawReasoning = this.reasoningDisplayText ?? this.reasoning;
|
||||
const reasoning = trimSpaces(rawReasoning);
|
||||
// Keep whitespace-only saved reasoning editable without showing it as visible content.
|
||||
const hasStoredReasoning = Boolean(this.reasoningDisplayText || this.reasoning);
|
||||
const hasReasoningContent = Boolean(String(rawReasoning ?? '').trim());
|
||||
setDatasetProperty(this.messageReasoningDetailsDom, 'hasContent', hasReasoningContent ? 'true' : null);
|
||||
const displayReasoning = messageFormatting(reasoning, '', false, false, messageId, {}, true);
|
||||
|
||||
if (power_user.stream_fade_in) {
|
||||
@@ -563,7 +588,8 @@ export class ReasoningHandler {
|
||||
// Update tooltip for hidden reasoning edit
|
||||
/** @type {HTMLElement} */
|
||||
const button = this.messageDom.querySelector('.mes_edit_add_reasoning');
|
||||
button.title = this.state === ReasoningState.Hidden ? t`Hidden reasoning - Add reasoning block` : t`Add reasoning block`;
|
||||
const isHiddenLikeReasoning = this.state === ReasoningState.Hidden || (hasStoredReasoning && !hasReasoningContent);
|
||||
button.title = isHiddenLikeReasoning ? t`Hidden reasoning - Add reasoning block` : t`Add reasoning block`;
|
||||
|
||||
// Make sure that hidden reasoning headers are collapsed by default, to not show a useless edit button
|
||||
if (this.state === ReasoningState.Hidden) {
|
||||
@@ -934,8 +960,9 @@ function registerReasoningSlashCommands() {
|
||||
closeMessageEditor('reasoning');
|
||||
updateMessageBlock(messageId, message);
|
||||
|
||||
if (isTrueBoolean(String(args.collapse))) $(`#chat [mesid="${messageId}"] .mes_reasoning_details`).removeAttr('open');
|
||||
if (isFalseBoolean(String(args.collapse))) $(`#chat [mesid="${messageId}"] .mes_reasoning_details`).attr('open', '');
|
||||
const details = $(`#chat [mesid="${messageId}"] .mes_reasoning_details`);
|
||||
if (isTrueBoolean(String(args.collapse))) details.removeAttr('open');
|
||||
if (isFalseBoolean(String(args.collapse))) openReasoningDetailsWithContent(details);
|
||||
return message.extra.reasoning;
|
||||
},
|
||||
}));
|
||||
@@ -1134,7 +1161,7 @@ function registerReasoningSlashCommands() {
|
||||
unnamedArgumentList: reasoningVisibilityArgs,
|
||||
callback: (_args, value) => {
|
||||
const details = getReasoningDetailsElements(value.toString());
|
||||
if (details) details.attr('open', '');
|
||||
if (details) openReasoningDetailsWithContent(details);
|
||||
return '';
|
||||
},
|
||||
}));
|
||||
@@ -1151,7 +1178,7 @@ function registerReasoningSlashCommands() {
|
||||
const $el = $(this);
|
||||
if ($el.attr('open') !== undefined) {
|
||||
$el.removeAttr('open');
|
||||
} else {
|
||||
} else if ($el.attr('data-has-content') === 'true') {
|
||||
$el.attr('open', '');
|
||||
}
|
||||
});
|
||||
@@ -1198,8 +1225,8 @@ function setReasoningEventHandlers() {
|
||||
|
||||
$(document).on('click', '.mes_reasoning_header', function (e) {
|
||||
const details = $(this).closest('.mes_reasoning_details');
|
||||
// Along with the CSS rules to mark blocks not toggle-able when they are empty, prevent them from actually being toggled, or being edited
|
||||
if (details.find('.mes_reasoning').is(':empty')) {
|
||||
// Keep click behavior aligned with CSS: only blocks with backing content can toggle or enter edit mode.
|
||||
if (details.attr('data-has-content') !== 'true') {
|
||||
e.preventDefault();
|
||||
return;
|
||||
}
|
||||
@@ -1228,6 +1255,10 @@ function setReasoningEventHandlers() {
|
||||
return;
|
||||
}
|
||||
|
||||
if (messageBlock.find('.reasoning_edit_textarea').length > 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const reasoning = String(message?.extra?.reasoning ?? '');
|
||||
const chatElement = document.getElementById('chat');
|
||||
const textarea = document.createElement('textarea');
|
||||
@@ -1265,6 +1296,7 @@ function setReasoningEventHandlers() {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
|
||||
$('.mes_reasoning_details[open]:not([data-has-content="true"])').removeAttr('open');
|
||||
$('.mes_reasoning_details[open] .mes_reasoning_header').trigger('click');
|
||||
});
|
||||
|
||||
@@ -1281,11 +1313,13 @@ function setReasoningEventHandlers() {
|
||||
newReasoning = substituteParams(newReasoning);
|
||||
textarea.remove();
|
||||
if (newReasoning === message.extra.reasoning) {
|
||||
closeReasoningDetailsWithoutContent(messageBlock);
|
||||
return;
|
||||
}
|
||||
updateReasoningFromValue(message, newReasoning);
|
||||
await saveChatConditional();
|
||||
updateMessageBlock(messageId, message);
|
||||
closeReasoningDetailsWithoutContent(messageBlock);
|
||||
|
||||
messageBlock.find('.mes_edit_done:visible').trigger('click');
|
||||
await eventSource.emit(event_types.MESSAGE_REASONING_EDITED, messageId);
|
||||
@@ -1302,6 +1336,7 @@ function setReasoningEventHandlers() {
|
||||
messageBlock.find('.mes_reasoning_edit_cancel:visible').trigger('click');
|
||||
|
||||
updateReasoningUI(messageBlock);
|
||||
closeReasoningDetailsWithoutContent(messageBlock);
|
||||
});
|
||||
|
||||
$(document).on('click', '.mes_edit_add_reasoning', async function () {
|
||||
@@ -1310,7 +1345,12 @@ function setReasoningEventHandlers() {
|
||||
return;
|
||||
}
|
||||
|
||||
if (message.extra.reasoning) {
|
||||
const details = messageBlock.find('.mes_reasoning_details');
|
||||
if (details.find('.reasoning_edit_textarea').length > 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (message.extra.reasoning && details.attr('data-has-content') === 'true') {
|
||||
toastr.info(t`Reasoning already exists.`, t`Edit Message`);
|
||||
return;
|
||||
}
|
||||
@@ -1324,7 +1364,7 @@ function setReasoningEventHandlers() {
|
||||
}
|
||||
|
||||
// Open the reasoning area so we can actually edit it
|
||||
messageBlock.find('.mes_reasoning_details').attr('open', '');
|
||||
details.attr('open', '');
|
||||
messageBlock.find('.mes_reasoning_edit').trigger('click');
|
||||
await saveChatConditional();
|
||||
});
|
||||
|
||||
@@ -1,237 +0,0 @@
|
||||
/**
|
||||
* Showdown emphasis extensions and pre-processing utilities.
|
||||
*
|
||||
* Contains:
|
||||
* - markdownUnderscoreExt: Showdown output extension for _word_ emphasis
|
||||
* - fixNestedEmphasis: Pre-processor to convert nested same-delimiter emphasis to bold
|
||||
*/
|
||||
|
||||
// ===== Underscore Emphasis Extension =====
|
||||
|
||||
/**
|
||||
* Showdown extension that replaces words surrounded by singular underscores with <em> tags.
|
||||
* @returns {import('showdown').ShowdownExtension[]} An array of Showdown extensions
|
||||
*/
|
||||
export const markdownUnderscoreExt = () => {
|
||||
try {
|
||||
if (!canUseNegativeLookbehind()) {
|
||||
console.log('Showdown-underscore extension: Negative lookbehind not supported. Skipping.');
|
||||
return [];
|
||||
}
|
||||
|
||||
return [{
|
||||
type: 'output',
|
||||
regex: new RegExp('(<code(?:\\s+[^>]*)?>[\\s\\S]*?<\\/code>|<style(?:\\s+[^>]*)?>[\\s\\S]*?<\\/style>)|\\b(?<!_)_(?!_)(.*?)(?<!_)_(?!_)\\b', 'gi'),
|
||||
replace: function (match, tagContent, italicContent) {
|
||||
if (tagContent) {
|
||||
// If it's inside <code> or <style> tags, return unchanged
|
||||
return match;
|
||||
} else if (italicContent) {
|
||||
// If it's an italic group, apply the replacement
|
||||
return '<em>' + italicContent + '</em>';
|
||||
}
|
||||
// If none of the conditions are met, return the original match
|
||||
return match;
|
||||
},
|
||||
}];
|
||||
} catch (e) {
|
||||
console.error('Error in Showdown-underscore extension:', e);
|
||||
return [];
|
||||
}
|
||||
};
|
||||
|
||||
function canUseNegativeLookbehind() {
|
||||
try {
|
||||
new RegExp('(?<!_)');
|
||||
return true;
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// ===== Nested Emphasis Pre-Processor =====
|
||||
|
||||
/**
|
||||
* Fixes nested emphasis that showdown cannot handle.
|
||||
*
|
||||
* Showdown cannot handle nested emphasis with the same delimiter character.
|
||||
* This function handles two cases:
|
||||
* 1. `*outer *inner* outer*` — inner `*` promoted to `**` (renders as bold-inside-italic)
|
||||
* 2. `**outer **inner** outer**` — inner `**` stripped (bold-inside-bold is redundant)
|
||||
*
|
||||
* Uses CommonMark-like flanking rules and stack-based pairing to detect nesting.
|
||||
*
|
||||
* @param {string} text The message text to process
|
||||
* @returns {string} The processed text with nested emphasis fixed
|
||||
* @example
|
||||
* fixNestedEmphasis("*She sighs. *I can't do this,* she says.*")
|
||||
* // → "*She sighs. **I can't do this,** she says.*"
|
||||
* fixNestedEmphasis("**This is **bold**, isn't it?**")
|
||||
* // → "**This is bold, isn't it?**"
|
||||
*/
|
||||
export function fixNestedEmphasis(text) {
|
||||
// Temporarily replace code blocks and inline code to protect them from modification
|
||||
const codeBlocks = [];
|
||||
let processed = text.replace(/```[\s\S]*?```|~~~[\s\S]*?~~~|``[\s\S]*?``|`[^`\n]*`/g, (match) => {
|
||||
codeBlocks.push(match);
|
||||
return `\x00CODE_BLOCK_${codeBlocks.length - 1}\x00`;
|
||||
});
|
||||
|
||||
processed = processed.split('\n').map(line => {
|
||||
// Fix nested ** inside ** first (strip inner), then nested * inside * (promote inner)
|
||||
line = fixNestedBoldLine(line);
|
||||
line = fixNestedItalicLine(line);
|
||||
return line;
|
||||
}).join('\n');
|
||||
|
||||
// Restore code blocks
|
||||
processed = processed.replace(/\x00CODE_BLOCK_(\d+)\x00/g, (_, idx) => codeBlocks[parseInt(idx)]);
|
||||
|
||||
return processed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds nested `**...**` pairs inside other `**...**` pairs and strips the inner delimiters.
|
||||
* Bold inside bold is redundant — like GitHub, the whole block renders as bold.
|
||||
* @param {string} line A single line of text
|
||||
* @returns {string} The processed line
|
||||
*/
|
||||
function fixNestedBoldLine(line) {
|
||||
// Find all ** positions (exactly two consecutive asterisks, not part of ***)
|
||||
const positions = [];
|
||||
for (let i = 0; i < line.length - 1; i++) {
|
||||
if (line[i] === '*' && line[i + 1] === '*') {
|
||||
const before = i > 0 ? line[i - 1] : '';
|
||||
const after = i + 2 < line.length ? line[i + 2] : '';
|
||||
// Must be exactly ** (not *** or more)
|
||||
if (before !== '*' && after !== '*') {
|
||||
positions.push(i);
|
||||
i++; // skip the second *
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Need at least 4 ** delimiters for nesting to be possible
|
||||
if (positions.length < 4) return line;
|
||||
|
||||
// Stack-based pairing with flanking rules
|
||||
const stack = [];
|
||||
const pairs = [];
|
||||
|
||||
for (let i = 0; i < positions.length; i++) {
|
||||
const pos = positions[i];
|
||||
// For **, check the char before the first * and after the second *
|
||||
const charBefore = pos > 0 ? line[pos - 1] : '';
|
||||
const charAfter = pos + 2 < line.length ? line[pos + 2] : '';
|
||||
|
||||
const canClose = charBefore !== '' && !/\s/.test(charBefore);
|
||||
const canOpen = charAfter !== '' && !/\s/.test(charAfter);
|
||||
|
||||
if (canClose && stack.length > 0) {
|
||||
const openIdx = stack.pop();
|
||||
pairs.push([openIdx, i]);
|
||||
} else if (canOpen) {
|
||||
stack.push(i);
|
||||
}
|
||||
}
|
||||
|
||||
// Determine which pairs are nested inside others
|
||||
const nestedPositions = new Set();
|
||||
for (let i = 0; i < pairs.length; i++) {
|
||||
const [outerOpen, outerClose] = [positions[pairs[i][0]], positions[pairs[i][1]]];
|
||||
for (let j = 0; j < pairs.length; j++) {
|
||||
if (i === j) continue;
|
||||
const [innerOpen, innerClose] = [positions[pairs[j][0]], positions[pairs[j][1]]];
|
||||
if (innerOpen > outerOpen && innerClose < outerClose) {
|
||||
// Inner pair is nested — mark both its ** delimiters for removal
|
||||
nestedPositions.add(innerOpen);
|
||||
nestedPositions.add(innerClose);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (nestedPositions.size === 0) return line;
|
||||
|
||||
// Build result, skipping the nested ** delimiters
|
||||
let result = '';
|
||||
for (let i = 0; i < line.length; i++) {
|
||||
if (nestedPositions.has(i)) {
|
||||
i++; // skip both characters of **
|
||||
continue;
|
||||
}
|
||||
result += line[i];
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds nested `*...*` pairs inside other `*...*` pairs and promotes them to `**...**`.
|
||||
* This converts inner emphasis to bold so showdown renders bold-inside-italic.
|
||||
* @param {string} line A single line of text
|
||||
* @returns {string} The processed line
|
||||
*/
|
||||
function fixNestedItalicLine(line) {
|
||||
// Find all single-* positions (not part of ** or ***)
|
||||
const positions = [];
|
||||
for (let i = 0; i < line.length; i++) {
|
||||
if (line[i] === '*') {
|
||||
const before = i > 0 ? line[i - 1] : '';
|
||||
const after = i < line.length - 1 ? line[i + 1] : '';
|
||||
if (before !== '*' && after !== '*') {
|
||||
positions.push(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Need at least 4 single asterisks for nesting to be possible
|
||||
if (positions.length < 4) return line;
|
||||
|
||||
// Use stack-based pairing with CommonMark-like flanking rules:
|
||||
// - An asterisk can OPEN emphasis if followed by a non-whitespace character
|
||||
// - An asterisk can CLOSE emphasis if preceded by a non-whitespace character
|
||||
const stack = [];
|
||||
const pairs = [];
|
||||
|
||||
for (let i = 0; i < positions.length; i++) {
|
||||
const pos = positions[i];
|
||||
const charBefore = pos > 0 ? line[pos - 1] : '';
|
||||
const charAfter = pos < line.length - 1 ? line[pos + 1] : '';
|
||||
|
||||
const canClose = charBefore !== '' && !/\s/.test(charBefore);
|
||||
const canOpen = charAfter !== '' && !/\s/.test(charAfter);
|
||||
|
||||
// Prefer closing over opening (matches CommonMark behavior)
|
||||
if (canClose && stack.length > 0) {
|
||||
const openIdx = stack.pop();
|
||||
pairs.push([openIdx, i]);
|
||||
} else if (canOpen) {
|
||||
stack.push(i);
|
||||
}
|
||||
}
|
||||
|
||||
// Determine nesting: a pair is nested if fully contained within another pair
|
||||
const nestedIndices = new Set();
|
||||
for (let i = 0; i < pairs.length; i++) {
|
||||
const [outerOpen, outerClose] = [positions[pairs[i][0]], positions[pairs[i][1]]];
|
||||
for (let j = 0; j < pairs.length; j++) {
|
||||
if (i === j) continue;
|
||||
const [innerOpen, innerClose] = [positions[pairs[j][0]], positions[pairs[j][1]]];
|
||||
if (innerOpen > outerOpen && innerClose < outerClose) {
|
||||
nestedIndices.add(innerOpen);
|
||||
nestedIndices.add(innerClose);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (nestedIndices.size === 0) return line;
|
||||
|
||||
// Build result with doubled asterisks at nested positions
|
||||
let result = '';
|
||||
for (let i = 0; i < line.length; i++) {
|
||||
result += line[i];
|
||||
if (nestedIndices.has(i)) {
|
||||
result += '*';
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -38,6 +38,7 @@ import {
|
||||
newAssistantChat,
|
||||
online_status,
|
||||
reloadCurrentChat,
|
||||
refreshSwipeButtons,
|
||||
removeMacros,
|
||||
renameCharacter,
|
||||
renameChat,
|
||||
@@ -57,11 +58,11 @@ import {
|
||||
swipe,
|
||||
stopGeneration,
|
||||
substituteParams,
|
||||
syncMesToSwipe,
|
||||
system_avatar,
|
||||
system_message_types,
|
||||
this_chid,
|
||||
updateMessageElement,
|
||||
updateSwipeCounter,
|
||||
} from '../script.js';
|
||||
import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
|
||||
import { SlashCommandParserError } from './slash-commands/SlashCommandParserError.js';
|
||||
@@ -70,7 +71,7 @@ import { hideChatMessageRange } from './chats.js';
|
||||
import { getContext, saveMetadataDebounced } from './extensions.js';
|
||||
import { getRegexedString, regex_placement } from './extensions/regex/engine.js';
|
||||
import { findGroupMemberId, groups, is_group_generating, openGroupById, regenerateGroup, resetSelectedGroup, saveGroupChat, selected_group, getGroupMembers } from './group-chats.js';
|
||||
import { chat_completion_sources, MINIMAX_ENDPOINT, oai_settings, promptManager, SILICONFLOW_ENDPOINT, ZAI_ENDPOINT } from './openai.js';
|
||||
import { chat_completion_sources, MINIMAX_ENDPOINT, oai_settings, POLLINATIONS_ENDPOINT, promptManager, SILICONFLOW_ENDPOINT, ZAI_ENDPOINT } from './openai.js';
|
||||
import { user_avatar } from './personas.js';
|
||||
import { addEphemeralStoppingString, chat_styles, context_presets, flushEphemeralStoppingStrings, playMessageSound, power_user } from './power-user.js';
|
||||
import { SERVER_INPUTS, textgen_types, textgenerationwebui_settings } from './textgen-settings.js';
|
||||
@@ -3135,6 +3136,7 @@ export function initDefaultSlashCommands() {
|
||||
new SlashCommandEnumValue('vertexai', 'Google Vertex AI', enumTypes.getBasedOnIndex(UNIQUE_APIS.findIndex(x => x === 'vertexai')), 'V'),
|
||||
new SlashCommandEnumValue('siliconflow', 'SiliconFlow', enumTypes.getBasedOnIndex(UNIQUE_APIS.findIndex(x => x === 'siliconflow')), 'S'),
|
||||
new SlashCommandEnumValue('minimax', 'MiniMax', enumTypes.getBasedOnIndex(UNIQUE_APIS.findIndex(x => x === 'minimax')), 'M'),
|
||||
new SlashCommandEnumValue('pollinations', 'Pollinations', enumTypes.getBasedOnIndex(UNIQUE_APIS.findIndex(x => x === 'pollinations')), 'P'),
|
||||
new SlashCommandEnumValue('kobold', 'KoboldAI Classic', enumTypes.getBasedOnIndex(UNIQUE_APIS.findIndex(x => x === 'kobold')), 'K'),
|
||||
...Object.values(textgen_types).filter(api => Object.keys(SERVER_INPUTS).includes(api)).map(api => new SlashCommandEnumValue(api, null, enumTypes.getBasedOnIndex(UNIQUE_APIS.findIndex(x => x === 'textgenerationwebui')), 'T')),
|
||||
],
|
||||
@@ -3168,7 +3170,7 @@ export function initDefaultSlashCommands() {
|
||||
${t`If a manual API is provided to <b>set</b> the URL, make sure to set <code>connect=false</code>, as auto-connect only works for the currently selected API, or consider switching to it with <code>/api</code> first.`}
|
||||
</div>
|
||||
<div>
|
||||
${t`This slash command works for most of the Text Completion sources, KoboldAI Classic, and also Custom OpenAI compatible, Z.AI, SiliconFlow, MiniMax, and Google Vertex AI for the Chat Completion sources. If unsure which APIs are supported, check the auto-completion of the optional <code>api</code> argument of this command.`}
|
||||
${t`This slash command works for most of the Text Completion sources, KoboldAI Classic, and also Custom OpenAI compatible, Z.AI, SiliconFlow, MiniMax, Pollinations, and Google Vertex AI for the Chat Completion sources. If unsure which APIs are supported, check the auto-completion of the optional <code>api</code> argument of this command.`}
|
||||
</div>
|
||||
`,
|
||||
}));
|
||||
@@ -4615,6 +4617,7 @@ async function echoCallback(args, value) {
|
||||
* @param {string} value - The swipe text to add (unnamed argument)
|
||||
*/
|
||||
async function addSwipeCallback(args, value) {
|
||||
const lastMessageId = chat.length - 1;
|
||||
const lastMessage = chat[chat.length - 1];
|
||||
|
||||
if (!lastMessage) {
|
||||
@@ -4662,15 +4665,13 @@ async function addSwipeCallback(args, value) {
|
||||
const newSwipeId = lastMessage.swipes.length - 1;
|
||||
|
||||
if (isTrueBoolean(args.switch)) {
|
||||
// Make sure ad-hoc changes to extras are saved before swiping away
|
||||
syncMesToSwipe();
|
||||
lastMessage.swipe_id = newSwipeId;
|
||||
lastMessage.mes = lastMessage.swipes[newSwipeId];
|
||||
lastMessage.extra = structuredClone(lastMessage.swipe_info?.[newSwipeId]?.extra ?? lastMessage.extra ?? {});
|
||||
await swipe(null, SWIPE_DIRECTION.RIGHT, { source: SWIPE_SOURCE.SLASH_COMMAND, repeated: false, forceMesId: lastMessageId, forceSwipeId: newSwipeId });
|
||||
} else {
|
||||
await updateSwipeCounter(lastMessageId, { message: lastMessage });
|
||||
refreshSwipeButtons();
|
||||
}
|
||||
|
||||
await saveChatConditional();
|
||||
await reloadCurrentChat();
|
||||
|
||||
return String(newSwipeId);
|
||||
}
|
||||
@@ -6686,6 +6687,32 @@ async function setApiUrlCallback({ api = null, connect = 'true', quiet = 'false'
|
||||
return oai_settings.vertexai_region || defaultRegion;
|
||||
}
|
||||
|
||||
const isCurrentlyPollinations = main_api === 'openai' && oai_settings.chat_completion_source === chat_completion_sources.POLLINATIONS;
|
||||
if (api === chat_completion_sources.POLLINATIONS || (!api && isCurrentlyPollinations)) {
|
||||
if (!url) {
|
||||
return oai_settings.pollinations_endpoint || POLLINATIONS_ENDPOINT.AUTHENTICATED;
|
||||
}
|
||||
|
||||
const permittedValues = Object.values(POLLINATIONS_ENDPOINT);
|
||||
if (!permittedValues.includes(url)) {
|
||||
!isQuiet && toastr.warning(t`Valid options are: ${permittedValues.join(', ')}`, t`Pollinations endpoint '${url}' is not a valid option.`);
|
||||
return '';
|
||||
}
|
||||
|
||||
if (!isCurrentlyPollinations && autoConnect) {
|
||||
toastr.warning(t`Pollinations API is not the currently selected API, so we cannot do an auto-connect. Consider switching to it via /api beforehand.`);
|
||||
return '';
|
||||
}
|
||||
|
||||
$('#pollinations_endpoint').val(url).trigger('input');
|
||||
|
||||
if (autoConnect) {
|
||||
$('#api_button_openai').trigger('click');
|
||||
}
|
||||
|
||||
return oai_settings.pollinations_endpoint || POLLINATIONS_ENDPOINT.AUTHENTICATED;
|
||||
}
|
||||
|
||||
// Special handling for Kobold Classic API
|
||||
const isCurrentlyKoboldClassic = main_api === 'kobold';
|
||||
if (api === 'kobold' || (!api && isCurrentlyKoboldClassic)) {
|
||||
|
||||
@@ -110,6 +110,7 @@ import { ConnectionManagerRequestService } from './extensions/shared.js';
|
||||
import { updateReasoningUI, parseReasoningFromString, getReasoningTemplateByName } from './reasoning.js';
|
||||
import { IGNORE_SYMBOL } from './constants.js';
|
||||
import { macros } from './macros/macro-system.js';
|
||||
import { MessageFormatter } from './message-formatter.js';
|
||||
|
||||
export function getContext() {
|
||||
return {
|
||||
@@ -242,6 +243,7 @@ export function getContext() {
|
||||
scrollChatToBottom,
|
||||
scrollOnMediaLoad,
|
||||
macros,
|
||||
messageFormatter: MessageFormatter,
|
||||
loader,
|
||||
swipe: {
|
||||
left: swipe_left,
|
||||
|
||||
+18
-14
@@ -2289,28 +2289,32 @@ function printViewTagList(tagContainer, empty = true) {
|
||||
function removeMissingTagFilters() {
|
||||
const tagIds = new Set(tags.map(tag => tag.id));
|
||||
const assignedTagIds = new Set(Object.values(tag_map).flat());
|
||||
const openBogusFolderIds = new Set(getOpenBogusFolders().map(tag => tag.id));
|
||||
const isEmptyOpenBogusFolder = (tagId) => openBogusFolderIds.has(tagId) && !assignedTagIds.has(tagId);
|
||||
// Filter lists only print tags that are assigned to at least one entity. A filter on an unassigned
|
||||
// tag therefore has no element to toggle, and "Clear all filters" can't reset it either, because it
|
||||
// works by clicking the printed elements. Drop those filters instead of leaving them stuck.
|
||||
const isUnclearable = (tagId) => !tagIds.has(tagId) || !assignedTagIds.has(tagId);
|
||||
|
||||
for (const helper of [groupCandidatesFilter, groupMembersFilter, entitiesFilter]) {
|
||||
const { selected, excluded } = helper.getFilterData(FILTER_TYPES.TAG);
|
||||
const storagePrefix = getFilterStorageKey(helper);
|
||||
let anyRemoved = false;
|
||||
|
||||
if (Array.isArray(selected)) {
|
||||
for (let i = selected.length - 1; i >= 0; i--) {
|
||||
if (!tagIds.has(selected[i]) || isEmptyOpenBogusFolder(selected[i])) {
|
||||
selected.splice(i, 1);
|
||||
anyRemoved = true;
|
||||
}
|
||||
for (const tagIdList of [selected, excluded]) {
|
||||
if (!Array.isArray(tagIdList)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (Array.isArray(excluded)) {
|
||||
for (let i = excluded.length - 1; i >= 0; i--) {
|
||||
if (!tagIds.has(excluded[i]) || isEmptyOpenBogusFolder(excluded[i])) {
|
||||
excluded.splice(i, 1);
|
||||
anyRemoved = true;
|
||||
for (let i = tagIdList.length - 1; i >= 0; i--) {
|
||||
if (!isUnclearable(tagIdList[i])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (storagePrefix) {
|
||||
accountStorage.removeItem(`${storagePrefix}_tag_${tagIdList[i]}`);
|
||||
}
|
||||
|
||||
tagIdList.splice(i, 1);
|
||||
anyRemoved = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,6 @@
|
||||
</div>
|
||||
<div class="resetCodeBlock">
|
||||
<label data-i18n="Reset Code:" for="password">Reset Code:</label>
|
||||
<input type="text" name="code" class="text_pole" placeholder="XXXX">
|
||||
<input type="text" name="code" class="text_pole" placeholder="XXXXXX">
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -49,6 +49,7 @@ const OPENROUTER_PROVIDERS = [
|
||||
'Clarifai',
|
||||
'Cloudflare',
|
||||
'Cohere',
|
||||
'Crucible',
|
||||
'Crusoe',
|
||||
'DeepInfra',
|
||||
'DeepSeek',
|
||||
@@ -80,14 +81,17 @@ const OPENROUTER_PROVIDERS = [
|
||||
'Morph',
|
||||
'NCompass',
|
||||
'Nebius',
|
||||
'Nex AGI',
|
||||
'NextBit',
|
||||
'Novita',
|
||||
'Nvidia',
|
||||
'OpenAI',
|
||||
'OpenInference',
|
||||
'Parasail',
|
||||
'Perceptron',
|
||||
'Perplexity',
|
||||
'Phala',
|
||||
'Poolside',
|
||||
'Recraft',
|
||||
'Reka',
|
||||
'Relace',
|
||||
@@ -212,7 +216,7 @@ const NANOGPT_PROVIDERS = [
|
||||
},
|
||||
{
|
||||
'id': 'ionet',
|
||||
'label': 'Io Net',
|
||||
'label': 'io.net',
|
||||
},
|
||||
{
|
||||
'id': 'inceptron',
|
||||
@@ -256,7 +260,11 @@ const NANOGPT_PROVIDERS = [
|
||||
},
|
||||
{
|
||||
'id': 'neuralwatt',
|
||||
'label': 'Neuralwatt',
|
||||
'label': 'NeuralWatt',
|
||||
},
|
||||
{
|
||||
'id': 'tensorix',
|
||||
'label': 'Tensorix',
|
||||
},
|
||||
{
|
||||
'id': 'nextbit',
|
||||
@@ -302,14 +310,26 @@ const NANOGPT_PROVIDERS = [
|
||||
'id': 'together',
|
||||
'label': 'Together',
|
||||
},
|
||||
{
|
||||
'id': 'uomi',
|
||||
'label': 'UOMI',
|
||||
},
|
||||
{
|
||||
'id': 'venice',
|
||||
'label': 'Venice',
|
||||
},
|
||||
{
|
||||
'id': 'wafer',
|
||||
'label': 'Wafer',
|
||||
},
|
||||
{
|
||||
'id': 'wandb',
|
||||
'label': 'Weights & Biases',
|
||||
},
|
||||
{
|
||||
'id': 'xiaomi',
|
||||
'label': 'Xiaomi',
|
||||
},
|
||||
{
|
||||
'id': 'zai',
|
||||
'label': 'Z.AI',
|
||||
@@ -590,15 +610,37 @@ export function loadGenericModels(data) {
|
||||
return;
|
||||
}
|
||||
|
||||
data.sort((a, b) => a.id.localeCompare(b.id));
|
||||
const models = data
|
||||
.filter(model => model && typeof model.id === 'string' && model.id.length > 0)
|
||||
.sort((a, b) => a.id.localeCompare(b.id));
|
||||
|
||||
const dataList = $('#generic_model_fill');
|
||||
dataList.empty();
|
||||
|
||||
for (const model of data) {
|
||||
const modelSelect = $('#generic_model_select');
|
||||
modelSelect.empty();
|
||||
modelSelect.append($('<option>', { value: '' }));
|
||||
|
||||
for (const model of models) {
|
||||
const option = document.createElement('option');
|
||||
option.value = model.id;
|
||||
option.text = model.id;
|
||||
dataList.append(option);
|
||||
|
||||
const selectOption = document.createElement('option');
|
||||
selectOption.value = model.id;
|
||||
selectOption.text = model.id;
|
||||
selectOption.selected = model.id === textgen_settings.generic_model;
|
||||
modelSelect.append(selectOption);
|
||||
}
|
||||
|
||||
// Keep free-text entry for IDs that are not in the /v1/models list
|
||||
if (textgen_settings.generic_model && !models.find(x => x.id === textgen_settings.generic_model)) {
|
||||
modelSelect.append($('<option>', {
|
||||
value: textgen_settings.generic_model,
|
||||
text: textgen_settings.generic_model,
|
||||
selected: true,
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1031,6 +1073,13 @@ function onLlamaCppModelSelect() {
|
||||
$('#api_button_textgenerationwebui').trigger('click');
|
||||
}
|
||||
|
||||
function onGenericModelSelect() {
|
||||
const modelId = String($('#generic_model_select').val() ?? '');
|
||||
textgen_settings.generic_model = modelId;
|
||||
$('#generic_model_textgenerationwebui').val(modelId);
|
||||
$('#api_button_textgenerationwebui').trigger('click');
|
||||
}
|
||||
|
||||
function onOpenRouterModelSelect() {
|
||||
const modelId = String($('#openrouter_model').val());
|
||||
textgen_settings.openrouter_model = modelId;
|
||||
@@ -1348,6 +1397,7 @@ export function initTextGenModels() {
|
||||
$('#tabby_download_model').on('click', downloadTabbyModel);
|
||||
$('#tabby_model').on('change', onTabbyModelSelect);
|
||||
$('#llamacpp_model').on('change', onLlamaCppModelSelect);
|
||||
$('#generic_model_select').on('change', onGenericModelSelect);
|
||||
$('#featherless_model').on('change', () => onFeatherlessModelSelect(String($('#featherless_model').val())));
|
||||
|
||||
const providersSelect = $('.openrouter_providers');
|
||||
@@ -1401,6 +1451,13 @@ export function initTextGenModels() {
|
||||
width: '100%',
|
||||
allowClear: true,
|
||||
});
|
||||
$('#generic_model_select').select2({
|
||||
placeholder: t`Select a model`,
|
||||
searchInputPlaceholder: t`Search models...`,
|
||||
searchInputCssClass: 'text_pole',
|
||||
width: '100%',
|
||||
allowClear: true,
|
||||
});
|
||||
$('#model_infermaticai_select').select2({
|
||||
placeholder: t`Select a model`,
|
||||
searchInputPlaceholder: t`Search models...`,
|
||||
|
||||
@@ -639,7 +639,7 @@ export function getTokenizerModel() {
|
||||
}
|
||||
|
||||
if (oai_settings.chat_completion_source == chat_completion_sources.ELECTRONHUB && oai_settings.electronhub_model) {
|
||||
if (oai_settings.electronhub_model.includes('gpt-4o') || oai_settings.electronhub_model.includes('gpt-5')) {
|
||||
if (oai_settings.electronhub_model.includes('gpt-4o') || oai_settings.electronhub_model.includes('gpt-5') || oai_settings.electronhub_model.includes('gpt-6-astra')) {
|
||||
return gpt4oTokenizer;
|
||||
} else if (oai_settings.electronhub_model.includes('gpt-4.1') || oai_settings.electronhub_model.includes('gpt-4.5')) {
|
||||
return gpt4oTokenizer;
|
||||
|
||||
@@ -580,7 +580,13 @@ export class ToolManager {
|
||||
}
|
||||
|
||||
if (typeof deltaValue === 'string') {
|
||||
if (typeof targetValue === 'string') {
|
||||
// `id`, `name`, `type` are sent in full by some providers on every
|
||||
// streaming chunk; concatenating them would duplicate the value.
|
||||
if (key === 'id' || key === 'name' || key === 'type') {
|
||||
if (!targetValue) {
|
||||
target[key] = deltaValue;
|
||||
}
|
||||
} else if (typeof targetValue === 'string') {
|
||||
// Concatenate strings
|
||||
target[key] = targetValue + deltaValue;
|
||||
} else {
|
||||
@@ -613,6 +619,12 @@ export class ToolManager {
|
||||
return false;
|
||||
}
|
||||
|
||||
// GPT-6 Astra supports tool calling only through the Responses API.
|
||||
if ([chat_completion_sources.OPENAI, chat_completion_sources.AZURE_OPENAI].includes(settings.chat_completion_source)
|
||||
&& /^gpt-6-astra/.test(model)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Post-processing will forcefully remove past tool calls from the prompt, making them useless
|
||||
const { NONE, MERGE_TOOLS, SEMI_TOOLS, STRICT_TOOLS } = custom_prompt_post_processing_types;
|
||||
const allowedPromptPostProcessing = [NONE, MERGE_TOOLS, SEMI_TOOLS, STRICT_TOOLS];
|
||||
|
||||
+34
-12
@@ -7,7 +7,7 @@ import {
|
||||
} from '../lib.js';
|
||||
|
||||
import { getContext } from './extensions.js';
|
||||
import { characters, getRequestHeaders, processDroppedFiles, this_chid, user_avatar } from '../script.js';
|
||||
import { animation_duration, characters, getRequestHeaders, processDroppedFiles, this_chid, user_avatar } from '../script.js';
|
||||
import { isMobile } from './RossAscends-mods.js';
|
||||
import { collapseNewlines, power_user } from './power-user.js';
|
||||
import { debounce_timeout } from './constants.js';
|
||||
@@ -2786,32 +2786,54 @@ export function arraysEqual(a, b) {
|
||||
* @param {string | HTMLElement} target - The CSS selector or the HTML element of the information block
|
||||
* @param {string | HTMLElement?} content - The message to display inside the information block (supports HTML) or an HTML element
|
||||
* @param {'hint' | 'info' | 'warning' | 'error'} [type='info'] - The type of message, which determines the styling of the information block
|
||||
* @param {object} [options={}] - Optional settings
|
||||
* @param {boolean} [options.animate=true] - Whether to animate the block sliding in when first shown
|
||||
*/
|
||||
export function setInfoBlock(target, content, type = 'info') {
|
||||
export function setInfoBlock(target, content, type = 'info', { animate = true } = {}) {
|
||||
if (!content) {
|
||||
clearInfoBlock(target);
|
||||
return;
|
||||
}
|
||||
|
||||
const infoBlock = typeof target === 'string' ? document.querySelector(target) : target;
|
||||
if (infoBlock) {
|
||||
infoBlock.className = `info-block ${type}`;
|
||||
if (typeof content === 'string') {
|
||||
infoBlock.innerHTML = content;
|
||||
} else {
|
||||
infoBlock.innerHTML = '';
|
||||
infoBlock.appendChild(content);
|
||||
}
|
||||
if (!infoBlock) return;
|
||||
|
||||
const wasVisible = infoBlock.classList.contains('info-block');
|
||||
|
||||
if (!wasVisible && animate) {
|
||||
$(infoBlock).hide();
|
||||
}
|
||||
|
||||
infoBlock.className = `info-block ${type}`;
|
||||
if (typeof content === 'string') {
|
||||
infoBlock.innerHTML = content;
|
||||
} else {
|
||||
infoBlock.innerHTML = '';
|
||||
infoBlock.appendChild(content);
|
||||
}
|
||||
|
||||
if (!wasVisible && animate) {
|
||||
$(infoBlock).slideDown(animation_duration * 1.5);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears the content and style of an information block.
|
||||
* @param {string | HTMLElement} target - The CSS selector or the HTML element of the information block
|
||||
* @param {object} [options={}] - Optional settings
|
||||
* @param {boolean} [options.animate=true] - Whether to animate the block fading out before clearing
|
||||
*/
|
||||
export function clearInfoBlock(target) {
|
||||
export function clearInfoBlock(target, { animate = true } = {}) {
|
||||
const infoBlock = typeof target === 'string' ? document.querySelector(target) : target;
|
||||
if (infoBlock && infoBlock.classList.contains('info-block')) {
|
||||
if (!infoBlock || !infoBlock.classList.contains('info-block')) return;
|
||||
|
||||
if (animate) {
|
||||
$(infoBlock).slideUp(animation_duration * 1.5, () => {
|
||||
infoBlock.className = '';
|
||||
infoBlock.innerHTML = '';
|
||||
$(infoBlock).css('display', '');
|
||||
});
|
||||
} else {
|
||||
infoBlock.className = '';
|
||||
infoBlock.innerHTML = '';
|
||||
}
|
||||
|
||||
+113
-26
@@ -1,7 +1,7 @@
|
||||
import { Fuse } from '../lib.js';
|
||||
|
||||
import { saveSettings, substituteParams, getRequestHeaders, chat_metadata, this_chid, characters, saveCharacterDebounced, menu_type, eventSource, event_types, getExtensionPromptByName, saveMetadata, getCurrentChatId, extension_prompt_roles, create_save, createOrEditCharacter, name1, getOneCharacter, select_selected_character } from '../script.js';
|
||||
import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, getCharaFilename, getSortableDelay, escapeRegex, PAGINATION_TEMPLATE, navigation_option, waitUntilCondition, isTrueBoolean, setValueByPath, flashHighlight, select2ModifyOptions, getSelect2OptionId, dynamicSelect2DataViaAjax, highlightRegex, select2ChoiceClickSubscribe, isFalseBoolean, getSanitizedFilename, checkOverwriteExistingData, getStringHash, parseStringArray, cancelDebounce, findChar, onlyUnique, equalsIgnoreCaseAndAccents, uuidv4, normalizeArray, getUniqueName, logSlashCommandWarn, addLongPressEvent, escapeHtml } from './utils.js';
|
||||
import { download, debounce, initScrollHeight, resetScrollHeight, parseJsonFile, extractDataFromPng, getFileBuffer, getCharaFilename, getSortableDelay, escapeRegex, PAGINATION_TEMPLATE, navigation_option, waitUntilCondition, isTrueBoolean, setValueByPath, flashHighlight, select2ModifyOptions, getSelect2OptionId, dynamicSelect2DataViaAjax, highlightRegex, select2ChoiceClickSubscribe, isFalseBoolean, getSanitizedFilename, checkOverwriteExistingData, getStringHash, parseStringArray, cancelDebounce, findChar, onlyUnique, equalsIgnoreCaseAndAccents, uuidv4, normalizeArray, getUniqueName, logSlashCommandWarn, addLongPressEvent, escapeHtml, setInfoBlock, clearInfoBlock } from './utils.js';
|
||||
import { extension_settings, getContext } from './extensions.js';
|
||||
import { NOTE_MODULE_NAME, metadata_keys, shouldWIAddPrompt } from './authors-note.js';
|
||||
import { isMobile } from './RossAscends-mods.js';
|
||||
@@ -2495,45 +2495,125 @@ async function displayWorldEntries(name, data, navigation = navigation_option.no
|
||||
|
||||
$('#world_apply_current_sorting').off('click').on('click', async () => {
|
||||
const entryCount = Object.keys(data.entries).length;
|
||||
const moreThan100 = entryCount > 100;
|
||||
|
||||
let content = '<span>' + t`Apply your current sorting to the "Order" field. The Order values will go down from the chosen number.` + '</span>';
|
||||
if (moreThan100) {
|
||||
content += '<div class="m-t-1"><i class="fa-solid fa-triangle-exclamation" style="color: #FFD43B;"></i> ' + t`More than 100 entries in this world. If you don't choose a number higher than that, the lower entries will default to 0.<br />(Usual default: 100)<br />Minimum: ${entryCount}` + '</div>';
|
||||
}
|
||||
const contentEl = document.createElement('div');
|
||||
|
||||
const result = await Popup.show.input(t`Apply Current Sorting`, content, '100', { okButton: t`Apply`, cancelButton: 'Cancel' });
|
||||
if (!result) return;
|
||||
const heading = document.createElement('h3');
|
||||
heading.textContent = t`Apply Current Sorting`;
|
||||
contentEl.appendChild(heading);
|
||||
|
||||
const description = document.createElement('span');
|
||||
const descriptionText = document.createElement('p');
|
||||
descriptionText.innerHTML = t`Assigns Order values to all entries based on their current sort position.`;
|
||||
contentEl.appendChild(descriptionText);
|
||||
const descriptionDetail = document.createElement('p');
|
||||
descriptionDetail.innerHTML = t`Entries are ordered <b>descending</b> by default — the first entry in the list gets the highest value and will be inserted first into the prompt.`;
|
||||
contentEl.appendChild(descriptionDetail);
|
||||
const entryCountText = document.createElement('small');
|
||||
entryCountText.textContent = t`(${entryCount} entries total)`;
|
||||
contentEl.appendChild(entryCountText);
|
||||
contentEl.appendChild(description);
|
||||
|
||||
const warningEl = document.createElement('div');
|
||||
contentEl.appendChild(warningEl);
|
||||
|
||||
/** @type {(startInput: HTMLInputElement, stepInput: HTMLInputElement, ascendingInput: HTMLInputElement) => void} */
|
||||
const updateWarning = (startInput, stepInput, ascendingInput) => {
|
||||
const startVal = Number(startInput.value);
|
||||
const stepVal = Number(stepInput.value);
|
||||
const isAscending = ascendingInput.checked;
|
||||
if (!isAscending && !isNaN(startVal) && !isNaN(stepVal) && startVal - (entryCount - 1) * stepVal < 0) {
|
||||
setInfoBlock(warningEl, t`Some entries will be clamped to Order 0, causing collisions at the bottom. The last entry would reach ${startVal - (entryCount - 1) * stepVal} (${entryCount} entries, step ${stepVal}).`, 'warning');
|
||||
} else {
|
||||
clearInfoBlock(warningEl);
|
||||
}
|
||||
};
|
||||
|
||||
/** @type {import('./popup.js').CustomPopupInput[]} */
|
||||
const customInputs = [
|
||||
{
|
||||
id: 'wi_sort_start',
|
||||
label: t`Starting value`,
|
||||
tooltip: t`The Order value assigned to the first entry. In descending mode, values count down from here; in ascending mode, values count up from here.` + ' ' + t`(${entryCount} entries total)`,
|
||||
type: 'number',
|
||||
defaultState: '100',
|
||||
min: 0,
|
||||
step: 1,
|
||||
autoFocus: true,
|
||||
},
|
||||
{
|
||||
id: 'wi_sort_step',
|
||||
label: t`Step`,
|
||||
tooltip: t`The gap between each Order value. For example, a step of 5 produces values like 100, 95, 90... (descending) or 0, 5, 10... (ascending).`,
|
||||
type: 'number',
|
||||
defaultState: '1',
|
||||
min: 1,
|
||||
step: 1,
|
||||
},
|
||||
{
|
||||
id: 'wi_sort_ascending',
|
||||
label: t`Ascending order`,
|
||||
tooltip: t`When checked, Order values count upward from the starting value (first sorted entry gets the lowest Order). When unchecked, values count downward (first sorted entry gets the highest Order).`,
|
||||
type: 'checkbox',
|
||||
defaultState: false,
|
||||
},
|
||||
];
|
||||
|
||||
const popup = new Popup(contentEl, POPUP_TYPE.TEXT, null, {
|
||||
okButton: t`Apply`,
|
||||
cancelButton: t`Cancel`,
|
||||
customInputs,
|
||||
});
|
||||
|
||||
const startInput = /** @type {HTMLInputElement} */ (popup.dlg.querySelector('#wi_sort_start'));
|
||||
const stepInput = /** @type {HTMLInputElement} */ (popup.dlg.querySelector('#wi_sort_step'));
|
||||
const ascendingInput = /** @type {HTMLInputElement} */ (popup.dlg.querySelector('#wi_sort_ascending'));
|
||||
startInput.addEventListener('input', () => updateWarning(startInput, stepInput, ascendingInput));
|
||||
stepInput.addEventListener('input', () => updateWarning(startInput, stepInput, ascendingInput));
|
||||
ascendingInput.addEventListener('change', () => updateWarning(startInput, stepInput, ascendingInput));
|
||||
updateWarning(startInput, stepInput, ascendingInput);
|
||||
|
||||
const result = await popup.show();
|
||||
if (result !== POPUP_RESULT.AFFIRMATIVE) return;
|
||||
|
||||
const start = Number(popup.inputResults.get('wi_sort_start') ?? '100');
|
||||
const step = Number(popup.inputResults.get('wi_sort_step') ?? '1');
|
||||
const ascending = Boolean(popup.inputResults.get('wi_sort_ascending'));
|
||||
|
||||
const start = Number(result);
|
||||
if (isNaN(start) || start < 0) {
|
||||
toastr.error(t`Invalid number: ${result}`, t`Apply Current Sorting`);
|
||||
toastr.error(t`Invalid starting value: ${start}`, t`Apply Current Sorting`);
|
||||
return;
|
||||
}
|
||||
if (start < entryCount) {
|
||||
toastr.warning(t`A number lower than the entry count has been chosen. All entries below that will default to 0.`, t`Apply Current Sorting`);
|
||||
if (isNaN(step) || step < 1) {
|
||||
toastr.error(t`Invalid step value: ${step}`, t`Apply Current Sorting`);
|
||||
return;
|
||||
}
|
||||
if (!ascending && start < entryCount) {
|
||||
toastr.warning(t`A starting value lower than the entry count has been chosen. All entries below that will default to 0.`, t`Apply Current Sorting`);
|
||||
}
|
||||
|
||||
// We need to sort the entries here, as the data source isn't sorted
|
||||
const entries = Object.values(data.entries);
|
||||
sortWorldInfoEntries(entries);
|
||||
|
||||
let updated = 0, current = start;
|
||||
for (const entry of entries) {
|
||||
const newOrder = Math.max(current--, 0);
|
||||
if (entry.order === newOrder) continue;
|
||||
let updated = 0;
|
||||
entries.forEach((entry, index) => {
|
||||
const newOrder = ascending
|
||||
? start + index * step
|
||||
: Math.max(start - index * step, 0);
|
||||
if (entry.order === newOrder) return;
|
||||
|
||||
entry.order = newOrder;
|
||||
setWIOriginalDataValue(data, entry.order, 'order', entry.order);
|
||||
setWIOriginalDataValue(data, entry.uid, 'order', entry.order);
|
||||
updated++;
|
||||
}
|
||||
});
|
||||
|
||||
if (updated > 0) {
|
||||
toastr.info(`Updated ${updated} Order values`, 'Apply Custom Sorting');
|
||||
toastr.info(t`Updated ${updated} Order values`, t`Apply Current Sorting`);
|
||||
await saveWorldInfo(name, data, true);
|
||||
updateEditor(navigation_option.previous);
|
||||
} else {
|
||||
toastr.info('All values up to date', 'Apply Custom Sorting');
|
||||
toastr.info(t`All values up to date`, t`Apply Current Sorting`);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -4911,12 +4991,19 @@ export async function checkWorldInfo(chat, maxContext, isDryRun, globalScanData
|
||||
console.debug(`[WI] Search done. Found ${activatedNow.size} possible entries.`);
|
||||
|
||||
// Sort the entries for the probability and the budget limit checks
|
||||
const newEntries = [...activatedNow]
|
||||
.sort((a, b) => {
|
||||
const isASticky = timedEffects.isEffectActive('sticky', a) ? 1 : 0;
|
||||
const isBSticky = timedEffects.isEffectActive('sticky', b) ? 1 : 0;
|
||||
return isBSticky - isASticky || sortedEntries.indexOf(a) - sortedEntries.indexOf(b);
|
||||
});
|
||||
let newEntries;
|
||||
if (activatedNow.size > 1) {
|
||||
const sortedEntriesIndex = new Map(sortedEntries.map((entry, index) => [entry, index]));
|
||||
newEntries = [...activatedNow]
|
||||
.sort((a, b) => {
|
||||
const isASticky = timedEffects.isEffectActive('sticky', a) ? 1 : 0;
|
||||
const isBSticky = timedEffects.isEffectActive('sticky', b) ? 1 : 0;
|
||||
return isBSticky - isASticky
|
||||
|| (sortedEntriesIndex.get(a) ?? -1) - (sortedEntriesIndex.get(b) ?? -1);
|
||||
});
|
||||
} else {
|
||||
newEntries = [...activatedNow];
|
||||
}
|
||||
|
||||
|
||||
let newContent = '';
|
||||
|
||||
+15
-7
@@ -466,7 +466,7 @@ input[type='checkbox']:focus-visible {
|
||||
align-items: baseline;
|
||||
}
|
||||
|
||||
.mes:has(.mes_reasoning:empty) .mes_reasoning_header {
|
||||
.mes_reasoning_details:not([data-has-content="true"]) .mes_reasoning_header {
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
@@ -489,10 +489,11 @@ input[type='checkbox']:focus-visible {
|
||||
.mes_reasoning_details:has(.reasoning_edit_textarea) .mes_reasoning_actions .mes_button:not(.edit_button),
|
||||
.mes_reasoning_details:not(:has(.reasoning_edit_textarea)) .mes_reasoning_actions .edit_button,
|
||||
.mes_block:has(.edit_textarea):has(.reasoning_edit_textarea) .mes_reasoning_actions,
|
||||
.mes.reasoning:not([data-reasoning-state="hidden"]) .mes_edit_add_reasoning,
|
||||
.mes:has(.mes_reasoning:empty) .mes_reasoning_arrow,
|
||||
.mes:has(.mes_reasoning:empty) .mes_reasoning,
|
||||
.mes:has(.mes_reasoning:empty) .mes_reasoning_copy {
|
||||
.mes.reasoning:has(.mes_reasoning_details[data-has-content="true"]) .mes_edit_add_reasoning,
|
||||
.mes:has(.mes_reasoning_details .reasoning_edit_textarea) .mes_edit_add_reasoning,
|
||||
.mes_reasoning_details:not([data-has-content="true"]) .mes_reasoning_arrow,
|
||||
.mes_reasoning_details:not([data-has-content="true"]) .mes_reasoning,
|
||||
.mes_reasoning_details:not([data-has-content="true"]) .mes_reasoning_copy {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -500,8 +501,10 @@ input[type='checkbox']:focus-visible {
|
||||
background-color: color-mix(in srgb, var(--SmartThemeQuoteColor) 33%, var(--SmartThemeBlurTintColor) 66%);
|
||||
}
|
||||
|
||||
/** If hidden reasoning should not be shown, we hide all blocks that don't have content */
|
||||
#chat:not([data-show-hidden-reasoning="true"]):not(:has(.reasoning_edit_textarea)) .mes:has(.mes_reasoning:empty) .mes_reasoning_details {
|
||||
/** If hidden reasoning should not be shown, we hide all blocks that don't have content,
|
||||
* except the one currently being edited.
|
||||
*/
|
||||
#chat:not([data-show-hidden-reasoning="true"]) .mes_reasoning_details:not([data-has-content="true"]):not(:has(.reasoning_edit_textarea)) {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -2678,6 +2681,11 @@ textarea::placeholder {
|
||||
height: fit-content;
|
||||
}
|
||||
|
||||
/* Keep non-login secrets visually masked without using password input semantics. */
|
||||
.masked-secret {
|
||||
-webkit-text-security: disc;
|
||||
}
|
||||
|
||||
select.text_pole {
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
+2
-2
@@ -4,7 +4,7 @@ import yaml from 'yaml';
|
||||
import color from 'chalk';
|
||||
import _ from 'lodash';
|
||||
import { serverDirectory } from './server-directory.js';
|
||||
import { keyToEnv, setConfigFilePath } from './util.js';
|
||||
import { keyToEnv, setConfigFilePath, stringToBool } from './util.js';
|
||||
|
||||
const keyMigrationMap = [
|
||||
{
|
||||
@@ -181,7 +181,7 @@ export function addMissingConfigValues(configPath) {
|
||||
const newEnvKey = keyToEnv(newKey);
|
||||
if (process.env[oldEnvKey] && !process.env[newEnvKey]) {
|
||||
const oldValue = process.env[oldEnvKey];
|
||||
const newValue = migrate(oldValue);
|
||||
const newValue = migrate(stringToBool(oldValue));
|
||||
process.env[newEnvKey] = newValue;
|
||||
delete process.env[oldEnvKey];
|
||||
console.warn(color.yellow(`Warning: Using a deprecated environment variable: ${oldEnvKey}. Please use ${newEnvKey} instead.`));
|
||||
|
||||
+11
-1
@@ -456,7 +456,7 @@ export const AZURE_OPENAI_KEYS = [
|
||||
'reasoning_effort',
|
||||
];
|
||||
|
||||
export const OPENAI_VERBOSITY_MODELS = /^gpt-5/;
|
||||
export const OPENAI_VERBOSITY_MODELS = /^(?:gpt-5|gpt-6-astra)/;
|
||||
|
||||
export const OPENAI_REASONING_EFFORT_MODELS = [
|
||||
'o1',
|
||||
@@ -487,6 +487,11 @@ export const OPENAI_REASONING_EFFORT_MODELS = [
|
||||
'gpt-5.4-nano-2026-03-17',
|
||||
'gpt-5.5',
|
||||
'gpt-5.5-2026-04-23',
|
||||
'gpt-5.6',
|
||||
'gpt-5.6-sol',
|
||||
'gpt-5.6-terra',
|
||||
'gpt-5.6-luna',
|
||||
'gpt-6-astra',
|
||||
];
|
||||
|
||||
export const OPENAI_REASONING_EFFORT_MAP = {
|
||||
@@ -561,6 +566,11 @@ export const ZAI_ENDPOINT = {
|
||||
CODING: 'coding',
|
||||
};
|
||||
|
||||
export const POLLINATIONS_ENDPOINT = {
|
||||
AUTHENTICATED: 'authenticated',
|
||||
ANONYMOUS: 'anonymous',
|
||||
};
|
||||
|
||||
export const SILICONFLOW_ENDPOINT = {
|
||||
GLOBAL: 'global',
|
||||
CN: 'cn',
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/* eslint-disable dot-notation */
|
||||
import { createHmac } from 'node:crypto';
|
||||
import process from 'node:process';
|
||||
import util from 'node:util';
|
||||
import express from 'express';
|
||||
@@ -20,6 +21,7 @@ import {
|
||||
SILICONFLOW_ENDPOINT,
|
||||
MINIMAX_ENDPOINT,
|
||||
ZAI_ENDPOINT,
|
||||
POLLINATIONS_ENDPOINT,
|
||||
} from '../../constants.js';
|
||||
import {
|
||||
forwardFetchResponse,
|
||||
@@ -65,6 +67,8 @@ import {
|
||||
getWebTokenizer,
|
||||
} from '../tokenizers.js';
|
||||
import { getVertexAIAuth, getProjectIdFromServiceAccount } from '../google.js';
|
||||
import { getCookieSecret } from '../../users.js';
|
||||
import { fetchGoogleModels, GoogleModelsHttpError } from './google-models.js';
|
||||
|
||||
const API_OPENAI = 'https://api.openai.com/v1';
|
||||
const API_CLAUDE = 'https://api.anthropic.com/v1';
|
||||
@@ -83,6 +87,7 @@ const API_DEEPSEEK = 'https://api.deepseek.com/beta';
|
||||
const API_XAI = 'https://api.x.ai/v1';
|
||||
const API_AIMLAPI = 'https://api.aimlapi.com/v1';
|
||||
const API_POLLINATIONS = 'https://gen.pollinations.ai/v1';
|
||||
const API_POLLINATIONS_ANON = 'https://text.pollinations.ai/v1';
|
||||
const API_MOONSHOT = 'https://api.moonshot.ai/v1';
|
||||
const API_FIREWORKS = 'https://api.fireworks.ai/inference/v1';
|
||||
const API_COMETAPI = 'https://api.cometapi.com/v1';
|
||||
@@ -106,6 +111,18 @@ const cachingAtDepth = (() => {
|
||||
})();
|
||||
const enableAdaptiveThinking = getConfigValue('claude.enableAdaptiveThinking', true, 'boolean');
|
||||
|
||||
/**
|
||||
* Lazily-cached HMAC key (instance cookie secret) for session-affinity hashing.
|
||||
* @type {string|undefined}
|
||||
*/
|
||||
let affinityKey;
|
||||
function getAffinityKey() {
|
||||
if (affinityKey === undefined) {
|
||||
affinityKey = getCookieSecret(globalThis.DATA_ROOT);
|
||||
}
|
||||
return affinityKey;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cache for cacheable (writing) OpenRouter model IDs.
|
||||
* @type {string[]}
|
||||
@@ -231,13 +248,17 @@ async function sendClaudeRequest(request, response) {
|
||||
const useTools = Array.isArray(request.body.tools) && request.body.tools.length > 0;
|
||||
const useSystemPrompt = Boolean(request.body.use_sysprompt);
|
||||
const convertedPrompt = convertClaudeMessages(request.body.messages, request.body.assistant_prefill, useSystemPrompt, useTools, getPromptNames(request));
|
||||
const useThinking = /^claude-(3-7|opus-4|sonnet-4|haiku-4-5|opus-4-5|opus-4-6|sonnet-4-6|opus-4-7)/.test(request.body.model);
|
||||
const useWebSearch = /^claude-(3-5|3-7|opus-4|sonnet-4|haiku-4-5|opus-4-5|opus-4-6|sonnet-4-6|opus-4-7)/.test(request.body.model) && Boolean(request.body.enable_web_search);
|
||||
// Unanchored to also match prefixed ids passed through proxies, e.g. 'anthropic/claude-fable-5'
|
||||
const isFableModel = /claude-fable/.test(request.body.model);
|
||||
const isFable51Model = /claude-fable-5-1/.test(request.body.model);
|
||||
const isClaude5Model = /claude-(opus-5|sonnet-5)/.test(request.body.model);
|
||||
const useThinking = /^claude-(3-7|opus-4|sonnet-4|haiku-4-5|opus-4-5|opus-4-6|sonnet-4-6|opus-4-7)/.test(request.body.model) || isFableModel || isClaude5Model;
|
||||
const useWebSearch = (/^claude-(3-5|3-7|opus-4|sonnet-4|haiku-4-5|opus-4-5|opus-4-6|sonnet-4-6|opus-4-7)/.test(request.body.model) || isFableModel || isClaude5Model) && Boolean(request.body.enable_web_search);
|
||||
const isLimitedSampling = /^claude-(opus-4-1|sonnet-4-5|haiku-4-5|opus-4-5|opus-4-6|sonnet-4-6)/.test(request.body.model);
|
||||
const useVerbosity = /^claude-(opus-4-5|opus-4-6|sonnet-4-6|opus-4-7)/.test(request.body.model);
|
||||
const noPrefillModel = /^claude-(opus-4-6|sonnet-4-6|opus-4-7)/.test(request.body.model);
|
||||
const isAdaptiveModel = /^claude-(opus-4-7)/.test(request.body.model) || (enableAdaptiveThinking && /^claude-(opus-4-6|sonnet-4-6)/.test(request.body.model));
|
||||
const noSamplingModel = /^claude-(opus-4-7)/.test(request.body.model);
|
||||
const useVerbosity = /^claude-(opus-4-5|opus-4-6|sonnet-4-6|opus-4-7|opus-4-8)/.test(request.body.model) || isFableModel || isClaude5Model;
|
||||
const noPrefillModel = /^claude-(opus-4-6|sonnet-4-6|opus-4-7|opus-4-8)/.test(request.body.model) || isFableModel || isClaude5Model;
|
||||
const isAdaptiveModel = /^claude-(opus-4-7|opus-4-8)/.test(request.body.model) || isFableModel || isClaude5Model || (enableAdaptiveThinking && /^claude-(opus-4-6|sonnet-4-6)/.test(request.body.model));
|
||||
const noSamplingModel = /^claude-(opus-4-7|opus-4-8)/.test(request.body.model) || isFableModel || isClaude5Model;
|
||||
let fixThinkingPrefill = false;
|
||||
// Add custom stop sequences
|
||||
const stopSequences = [];
|
||||
@@ -278,15 +299,24 @@ async function sendClaudeRequest(request, response) {
|
||||
}
|
||||
}
|
||||
|
||||
// Structured output is a forced tool
|
||||
// Fable 5.1 rejects forced tools, but supports native JSON outputs.
|
||||
if (request.body.json_schema) {
|
||||
const jsonTool = {
|
||||
name: request.body.json_schema.name,
|
||||
description: request.body.json_schema.description || 'Well-formed JSON object',
|
||||
input_schema: request.body.json_schema.value,
|
||||
};
|
||||
requestBody.tools = [...(requestBody.tools || []), jsonTool];
|
||||
requestBody.tool_choice = { type: 'tool', name: request.body.json_schema.name };
|
||||
if (isFable51Model) {
|
||||
requestBody.output_config = {
|
||||
format: {
|
||||
type: 'json_schema',
|
||||
schema: request.body.json_schema.value,
|
||||
},
|
||||
};
|
||||
} else {
|
||||
const jsonTool = {
|
||||
name: request.body.json_schema.name,
|
||||
description: request.body.json_schema.description || 'Well-formed JSON object',
|
||||
input_schema: request.body.json_schema.value,
|
||||
};
|
||||
requestBody.tools = [...(requestBody.tools || []), jsonTool];
|
||||
requestBody.tool_choice = { type: 'tool', name: request.body.json_schema.name };
|
||||
}
|
||||
}
|
||||
|
||||
if (useWebSearch) {
|
||||
@@ -321,13 +351,13 @@ async function sendClaudeRequest(request, response) {
|
||||
}
|
||||
|
||||
const reasoningEffort = request.body.reasoning_effort;
|
||||
const includeReasoning = Boolean(request.body.include_reasoning);
|
||||
const budgetTokens = calculateClaudeBudgetTokens(requestBody.max_tokens, reasoningEffort, requestBody.stream, isAdaptiveModel);
|
||||
|
||||
// Adaptive thinking: returns a string effort level (like Gemini 3)
|
||||
if (useThinking && typeof budgetTokens === 'string') {
|
||||
fixThinkingPrefill = true;
|
||||
requestBody.thinking = { type: 'adaptive' };
|
||||
const includeReasoning = Boolean(request.body.include_reasoning);
|
||||
if (noSamplingModel && includeReasoning) {
|
||||
requestBody.thinking.display = 'summarized';
|
||||
}
|
||||
@@ -335,6 +365,10 @@ async function sendClaudeRequest(request, response) {
|
||||
requestBody.output_config.effort = budgetTokens;
|
||||
// top_k is not allowed in adaptive mode
|
||||
delete requestBody.top_k;
|
||||
} else if (useThinking && (isFableModel || isClaude5Model) && reasoningEffort === 'auto' && includeReasoning) {
|
||||
// Fable/Claude 5 auto thinking is already enabled, but readable summaries require an explicit display request.
|
||||
fixThinkingPrefill = true;
|
||||
requestBody.thinking = { type: 'adaptive', display: 'summarized' };
|
||||
} else if (useThinking && Number.isInteger(budgetTokens)) {
|
||||
// Traditional thinking: returns a numeric budget
|
||||
fixThinkingPrefill = true;
|
||||
@@ -485,12 +519,14 @@ async function sendMakerSuiteRequest(request, response) {
|
||||
'gemini-2.0-flash-preview-image-generation',
|
||||
'gemini-2.5-flash-image-preview',
|
||||
'gemini-2.5-flash-image',
|
||||
'gemini-3-pro-image-preview',
|
||||
'gemini-3.1-flash-image-preview',
|
||||
'gemini-3-pro-image',
|
||||
'gemini-3.1-flash-image',
|
||||
];
|
||||
|
||||
const isThinkingConfigModel = m => (/^gemini-2.5-(flash|pro)/.test(m) && !/-image(-preview)?$/.test(m)) || (/^gemini-3[.\d]*-(flash|pro)/.test(m));
|
||||
const isImageSizeModel = m => /^gemini-3/.test(m);
|
||||
// https://ai.google.dev/gemini-api/docs/latest-model#api-changes-and-parameter-updates
|
||||
const noSamplingModel = /gemini-3\.[67]-flash|gemini-3\.5-flash-lite/.test(model);
|
||||
|
||||
const noSearchModels = [
|
||||
'gemini-2.0-flash-lite',
|
||||
@@ -504,6 +540,13 @@ async function sendMakerSuiteRequest(request, response) {
|
||||
delete generationConfig.stopSequences;
|
||||
}
|
||||
|
||||
if (noSamplingModel) {
|
||||
delete generationConfig.temperature;
|
||||
delete generationConfig.topP;
|
||||
delete generationConfig.topK;
|
||||
delete generationConfig.candidateCount;
|
||||
}
|
||||
|
||||
const enableImageModality = requestImages && imageGenerationModels.includes(model);
|
||||
const enableImageConfig = enableImageModality && (aspectRatio || imageSize);
|
||||
if (enableImageModality) {
|
||||
@@ -1789,8 +1832,9 @@ router.post('/status', async function (request, statusResponse) {
|
||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.AIMLAPI, request.body.secret_id);
|
||||
headers = { ...AIMLAPI_HEADERS };
|
||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.POLLINATIONS) {
|
||||
const isAnonymous = request.body.pollinations_endpoint === POLLINATIONS_ENDPOINT.ANONYMOUS;
|
||||
apiUrl = 'https://gen.pollinations.ai/text';
|
||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.POLLINATIONS, request.body.secret_id);
|
||||
apiKey = isAnonymous ? 'anonymous' : readSecret(request.user.directories, SECRET_KEYS.POLLINATIONS, request.body.secret_id);
|
||||
headers = {};
|
||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.GROQ) {
|
||||
apiUrl = API_GROQ;
|
||||
@@ -1806,9 +1850,61 @@ router.post('/status', async function (request, statusResponse) {
|
||||
apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MOONSHOT, request.body.secret_id);
|
||||
headers = {};
|
||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.FIREWORKS) {
|
||||
apiUrl = API_FIREWORKS;
|
||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.FIREWORKS, request.body.secret_id);
|
||||
headers = {};
|
||||
const modelsUrl = 'https://api.fireworks.ai/v1/accounts/fireworks/models?filter=supports_serverless%3Dtrue&pageSize=200';
|
||||
|
||||
try {
|
||||
const response = await fetch(modelsUrl, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Authorization': 'Bearer ' + apiKey,
|
||||
...headers,
|
||||
},
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
/** @type {any} */
|
||||
const data = await response.json();
|
||||
const models = Array.isArray(data?.models)
|
||||
? data.models
|
||||
.filter(m => m?.contextLength > 0 && m?.kind !== 'EMBEDDING_MODEL')
|
||||
.map(m => ({
|
||||
id: m.name,
|
||||
name: m.displayName,
|
||||
context_length: m.contextLength,
|
||||
supports_tools: m.supportsTools,
|
||||
supports_image_input: m.supportsImageInput,
|
||||
}))
|
||||
: [];
|
||||
|
||||
// Add fast router versions for models that have them
|
||||
const fastRouters = {
|
||||
'accounts/fireworks/models/glm-5p2': 'accounts/fireworks/routers/glm-5p2-fast',
|
||||
'accounts/fireworks/models/kimi-k2p6': 'accounts/fireworks/routers/kimi-k2p6-fast',
|
||||
'accounts/fireworks/models/kimi-k2p7-code': 'accounts/fireworks/routers/kimi-k2p7-code-fast',
|
||||
'accounts/fireworks/models/kimi-k3': 'accounts/fireworks/routers/kimi-k3-fast',
|
||||
};
|
||||
for (const [standardId, fastId] of Object.entries(fastRouters)) {
|
||||
const standard = models.find(m => m.id === standardId);
|
||||
if (standard) {
|
||||
models.push({
|
||||
...standard,
|
||||
id: fastId,
|
||||
name: standard.name + ' (fast)',
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
console.debug('Available Fireworks models:', models.map(m => m.id));
|
||||
return statusResponse.send({ data: models });
|
||||
} else {
|
||||
console.warn('Fireworks models endpoint failed:', response.status, response.statusText);
|
||||
return statusResponse.send({ error: true, data: { data: [] } });
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error fetching Fireworks models:', error);
|
||||
return statusResponse.send({ error: true, data: { data: [] } });
|
||||
}
|
||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.MAKERSUITE) {
|
||||
apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.MAKERSUITE, request.body.secret_id);
|
||||
apiUrl = trimTrailingSlash(request.body.reverse_proxy || API_MAKERSUITE);
|
||||
@@ -1823,26 +1919,15 @@ router.post('/status', async function (request, statusResponse) {
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(modelsUrl);
|
||||
|
||||
if (response.ok) {
|
||||
/** @type {any} */
|
||||
const data = await response.json();
|
||||
// Transform Google AI Studio models to OpenAI format
|
||||
const models = data.models
|
||||
?.filter(model => model.supportedGenerationMethods?.includes('generateContent'))
|
||||
?.map(model => ({
|
||||
...model,
|
||||
id: model.name.replace('models/', ''),
|
||||
})) || [];
|
||||
|
||||
console.info('Available Google AI Studio models:', models.map(m => m.id));
|
||||
return statusResponse.send({ data: models });
|
||||
} else {
|
||||
console.warn('Google AI Studio models endpoint failed:', response.status, response.statusText);
|
||||
const models = await fetchGoogleModels(modelsUrl);
|
||||
console.info('Available Google AI Studio models:', models.map(m => m.id));
|
||||
return statusResponse.send({ data: models });
|
||||
} catch (error) {
|
||||
if (error instanceof GoogleModelsHttpError) {
|
||||
console.warn('Google AI Studio models endpoint failed:', error.status, error.statusText);
|
||||
return statusResponse.send({ error: true, bypass: true, data: { data: [] } });
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
console.error('Error fetching Google AI Studio models:', error);
|
||||
return statusResponse.send({ error: true, bypass: true, data: { data: [] } });
|
||||
}
|
||||
@@ -2227,6 +2312,11 @@ router.post('/generate', async function (request, response) {
|
||||
},
|
||||
};
|
||||
|
||||
if (request.body.logprobs > 0) {
|
||||
bodyParams['top_logprobs'] = request.body.logprobs;
|
||||
bodyParams['logprobs'] = true;
|
||||
}
|
||||
|
||||
if (request.body.min_p !== undefined) {
|
||||
bodyParams['min_p'] = request.body.min_p;
|
||||
}
|
||||
@@ -2366,6 +2456,9 @@ router.post('/generate', async function (request, response) {
|
||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.FIREWORKS, request.body.secret_id);
|
||||
headers = {};
|
||||
bodyParams = {};
|
||||
if (request.body.reasoning_effort) {
|
||||
bodyParams['reasoning_effort'] = request.body.reasoning_effort;
|
||||
}
|
||||
if (request.body.json_schema) {
|
||||
bodyParams['response_format'] = {
|
||||
type: 'json_schema',
|
||||
@@ -2377,6 +2470,9 @@ router.post('/generate', async function (request, response) {
|
||||
},
|
||||
};
|
||||
}
|
||||
if (request.body.chat_id) {
|
||||
headers['x-session-affinity'] = createHmac('sha256', getAffinityKey()).update(request.body.chat_id).digest('hex').slice(0, 16);
|
||||
}
|
||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.NANOGPT) {
|
||||
apiUrl = API_NANOGPT;
|
||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.NANOGPT, request.body.secret_id);
|
||||
@@ -2414,20 +2510,23 @@ router.post('/generate', async function (request, response) {
|
||||
};
|
||||
}
|
||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.POLLINATIONS) {
|
||||
apiUrl = API_POLLINATIONS;
|
||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.POLLINATIONS, request.body.secret_id);
|
||||
const isAnonymous = request.body.pollinations_endpoint === POLLINATIONS_ENDPOINT.ANONYMOUS;
|
||||
apiUrl = isAnonymous ? API_POLLINATIONS_ANON : API_POLLINATIONS;
|
||||
apiKey = isAnonymous ? 'anonymous' : readSecret(request.user.directories, SECRET_KEYS.POLLINATIONS, request.body.secret_id);
|
||||
headers = {};
|
||||
bodyParams = {
|
||||
reasoning_effort: request.body.reasoning_effort,
|
||||
seed: request.body.seed ?? Math.floor(Math.random() * 99999999),
|
||||
};
|
||||
if (request.body.json_schema) {
|
||||
bodyParams['response_format'] = {
|
||||
type: 'json_schema',
|
||||
json_schema: {
|
||||
schema: request.body.json_schema.value,
|
||||
},
|
||||
};
|
||||
if (!isAnonymous) {
|
||||
bodyParams['reasoning_effort'] = request.body.reasoning_effort;
|
||||
if (request.body.json_schema) {
|
||||
bodyParams['response_format'] = {
|
||||
type: 'json_schema',
|
||||
json_schema: {
|
||||
schema: request.body.json_schema.value,
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.MOONSHOT) {
|
||||
apiUrl = new URL(request.body.reverse_proxy || API_MOONSHOT).toString();
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
import fetch from 'node-fetch';
|
||||
|
||||
const GOOGLE_MODELS_PAGE_SIZE = 1000;
|
||||
|
||||
export class GoogleModelsHttpError extends Error {
|
||||
/**
|
||||
* @param {number} status HTTP status code
|
||||
* @param {string} statusText HTTP status text
|
||||
*/
|
||||
constructor(status, statusText) {
|
||||
super(`Google AI Studio models endpoint returned ${status} ${statusText}`.trim());
|
||||
this.name = 'GoogleModelsHttpError';
|
||||
this.status = status;
|
||||
this.statusText = statusText;
|
||||
}
|
||||
}
|
||||
|
||||
export class GoogleModelsResponseError extends Error {
|
||||
/**
|
||||
* @param {string} message Error message
|
||||
* @param {ErrorOptions} [options] Error options
|
||||
*/
|
||||
constructor(message, options) {
|
||||
super(message, options);
|
||||
this.name = 'GoogleModelsResponseError';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches every page of Google AI Studio models and converts supported models.
|
||||
*
|
||||
* @param {string | URL} modelsUrl Google AI Studio models endpoint
|
||||
* @param {typeof fetch} [fetchImpl] Fetch implementation
|
||||
* @returns {Promise<object[]>} Models that support content generation
|
||||
*/
|
||||
export async function fetchGoogleModels(modelsUrl, fetchImpl = fetch) {
|
||||
const requestUrl = new URL(modelsUrl);
|
||||
requestUrl.searchParams.set('pageSize', String(GOOGLE_MODELS_PAGE_SIZE));
|
||||
requestUrl.searchParams.delete('pageToken');
|
||||
|
||||
const models = [];
|
||||
const pageTokens = new Set();
|
||||
let pageNumber = 1;
|
||||
|
||||
while (true) {
|
||||
let response;
|
||||
|
||||
try {
|
||||
response = await fetchImpl(requestUrl.toString());
|
||||
} catch (cause) {
|
||||
throw new GoogleModelsResponseError(`Failed to fetch Google AI Studio models page ${pageNumber}.`, { cause });
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new GoogleModelsHttpError(response.status, response.statusText);
|
||||
}
|
||||
|
||||
let data;
|
||||
try {
|
||||
data = await response.json();
|
||||
} catch (cause) {
|
||||
throw new GoogleModelsResponseError(`Failed to parse Google AI Studio models page ${pageNumber}.`, { cause });
|
||||
}
|
||||
|
||||
if (!data || !Array.isArray(data.models)) {
|
||||
throw new GoogleModelsResponseError(`Google AI Studio models page ${pageNumber} has an invalid models field.`);
|
||||
}
|
||||
|
||||
models.push(...data.models);
|
||||
|
||||
const nextPageToken = data.nextPageToken;
|
||||
if (nextPageToken === undefined || nextPageToken === '') {
|
||||
break;
|
||||
}
|
||||
if (typeof nextPageToken !== 'string') {
|
||||
throw new GoogleModelsResponseError(`Google AI Studio models page ${pageNumber} has an invalid nextPageToken.`);
|
||||
}
|
||||
if (pageTokens.has(nextPageToken)) {
|
||||
throw new GoogleModelsResponseError(`Google AI Studio models pagination repeated token on page ${pageNumber}.`);
|
||||
}
|
||||
|
||||
pageTokens.add(nextPageToken);
|
||||
requestUrl.searchParams.set('pageToken', nextPageToken);
|
||||
pageNumber++;
|
||||
}
|
||||
|
||||
return models
|
||||
.filter(model => model?.supportedGenerationMethods?.includes('generateContent'))
|
||||
.map((model, index) => {
|
||||
if (typeof model.name !== 'string') {
|
||||
throw new GoogleModelsResponseError(`Google AI Studio model at index ${index} has an invalid name.`);
|
||||
}
|
||||
|
||||
return {
|
||||
...model,
|
||||
id: model.name.replace('models/', ''),
|
||||
};
|
||||
});
|
||||
}
|
||||
@@ -14,7 +14,7 @@ import storage from 'node-persist';
|
||||
|
||||
import { AVATAR_WIDTH, AVATAR_HEIGHT, DEFAULT_AVATAR_PATH } from '../constants.js';
|
||||
import { default as validateAvatarUrlMiddleware, getFileNameValidationFunction, forbiddenRegExp } from '../middleware/validateFileName.js';
|
||||
import { deepMerge, humanizedDateTime, tryParse, MemoryLimitedMap, getConfigValue, mutateJsonString, clientRelativePath, getUniqueName, sanitizeSafeCharacterReplacements } from '../util.js';
|
||||
import { deepMerge, humanizedDateTime, tryParse, MemoryLimitedMap, getConfigValue, mutateJsonString, clientRelativePath, getUniqueName, sanitizeSafeCharacterReplacements, getArrayBufferSlice } from '../util.js';
|
||||
import { TavernCardValidator } from '../validator/TavernCardValidator.js';
|
||||
import { parse, read, write } from '../character-card-parser.js';
|
||||
import { readWorldInfoFile } from './worldinfo.js';
|
||||
@@ -765,7 +765,7 @@ async function importFromYaml(uploadPath, context, preservedFileName) {
|
||||
async function importFromCharX(uploadPath, { request }, preservedFileName) {
|
||||
const fileBuffer = fs.readFileSync(uploadPath);
|
||||
// Create a properly-sized ArrayBuffer (Node's buffer pool can cause oversized .buffer)
|
||||
const data = fileBuffer.buffer.slice(fileBuffer.byteOffset, fileBuffer.byteOffset + fileBuffer.byteLength);
|
||||
const data = getArrayBufferSlice(fileBuffer);
|
||||
fs.unlinkSync(uploadPath);
|
||||
|
||||
const parser = new CharXParser(data);
|
||||
@@ -801,7 +801,7 @@ async function importFromCharX(uploadPath, { request }, preservedFileName) {
|
||||
}
|
||||
|
||||
async function importFromByaf(uploadPath, { request }, preservedFileName) {
|
||||
const data = (await fsPromises.readFile(uploadPath)).buffer;
|
||||
const data = getArrayBufferSlice(await fsPromises.readFile(uploadPath));
|
||||
await fsPromises.unlink(uploadPath);
|
||||
console.info('Importing from BYAF');
|
||||
|
||||
@@ -1081,7 +1081,9 @@ router.post('/rename', validateAvatarUrlMiddleware, async function (request, res
|
||||
|
||||
// Rename chats folder
|
||||
if (fs.existsSync(oldChatsPath) && !fs.existsSync(newChatsPath)) {
|
||||
fs.cpSync(oldChatsPath, newChatsPath, { recursive: true });
|
||||
// Supplying a filter avoids a Node.js Windows copyDir crash while preserving all entries.
|
||||
// https://github.com/nodejs/node/issues/63970
|
||||
fs.cpSync(oldChatsPath, newChatsPath, { recursive: true, filter: () => true });
|
||||
fs.rmSync(oldChatsPath, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
|
||||
+107
-32
@@ -1,3 +1,4 @@
|
||||
import crypto from 'node:crypto';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import readline from 'node:readline';
|
||||
@@ -30,6 +31,23 @@ const checkIntegrity = !!getConfigValue('backups.chat.checkIntegrity', true, 'bo
|
||||
|
||||
export const CHAT_BACKUPS_PREFIX = 'chat_';
|
||||
|
||||
/**
|
||||
* Builds a stable filename key for a chat's backups.
|
||||
* Non-ASCII characters are replaced with underscores, so names such as CJK ones
|
||||
* would all collapse to the same key and share one backup quota. A short hash of
|
||||
* the raw name keeps those keys distinct while ASCII names stay unchanged (#5780).
|
||||
* @param {string} name The name of the chat.
|
||||
* @returns {string} Sanitized filename key for the backup files.
|
||||
*/
|
||||
export function getBackupKey(name) {
|
||||
const sanitized = sanitize(name).replace(/[^a-z0-9]/gi, '_').toLowerCase();
|
||||
if (/[^\x20-\x7E]/.test(name)) {
|
||||
const hash = crypto.createHash('sha256').update(name).digest('hex').slice(0, 8);
|
||||
return `${sanitized}_${hash}`;
|
||||
}
|
||||
return sanitized;
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves a chat to the backups directory.
|
||||
* @param {string} directory The user's backup directory.
|
||||
@@ -44,8 +62,7 @@ function backupChat(directory, name, data, backupPrefix = CHAT_BACKUPS_PREFIX) {
|
||||
if (!fs.existsSync(directory)) {
|
||||
console.error(`The chat couldn't be backed up because no directory exists at ${directory}!`);
|
||||
}
|
||||
// replace non-alphanumeric characters with underscores
|
||||
name = sanitize(name).replace(/[^a-z0-9]/gi, '_').toLowerCase();
|
||||
name = getBackupKey(name);
|
||||
|
||||
const backupFile = path.join(directory, `${backupPrefix}${name}_${generateTimestamp()}.jsonl`);
|
||||
|
||||
@@ -66,15 +83,19 @@ function backupChat(directory, name, data, backupPrefix = CHAT_BACKUPS_PREFIX) {
|
||||
const backupFunctions = new Map();
|
||||
|
||||
/**
|
||||
* Gets a backup function for a user.
|
||||
* Gets a backup function for a user and chat.
|
||||
* Throttling is keyed per user and chat so that rapid saves in one chat cannot
|
||||
* swallow the throttled backup of another chat saved in the same window.
|
||||
* @param {string} handle User handle
|
||||
* @param {string} name The name of the chat, as passed to backupChat
|
||||
* @returns {typeof backupChat} Backup function
|
||||
*/
|
||||
function getBackupFunction(handle) {
|
||||
if (!backupFunctions.has(handle)) {
|
||||
backupFunctions.set(handle, _.throttle(backupChat, throttleInterval, { leading: true, trailing: true }));
|
||||
function getBackupFunction(handle, name) {
|
||||
const key = `${handle} ${name}`;
|
||||
if (!backupFunctions.has(key)) {
|
||||
backupFunctions.set(key, _.throttle(backupChat, throttleInterval, { leading: true, trailing: true }));
|
||||
}
|
||||
return backupFunctions.get(handle) || (() => { });
|
||||
return backupFunctions.get(key) || (() => { });
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -319,12 +340,25 @@ async function checkChatIntegrity(filePath, integritySlug) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Parse the first line of the chat file as JSON
|
||||
// If the chat file is empty, there is nothing that could be lost by overwriting it
|
||||
if (fs.statSync(filePath).size === 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Parse the first line of the chat file as JSON. Strip a UTF-8 BOM an external editor may have added.
|
||||
const firstLine = await readFirstLine(filePath);
|
||||
const jsonData = tryParse(firstLine);
|
||||
const jsonData = tryParse(String(firstLine ?? '').replace(/^\uFEFF/, ''));
|
||||
|
||||
// If the first line of a non-empty file is not a JSON object, the file may be corrupted or truncated.
|
||||
// Fail the check so the client asks for an explicit overwrite confirmation instead of silently losing data.
|
||||
if (typeof jsonData !== 'object' || jsonData === null || Array.isArray(jsonData)) {
|
||||
console.warn(`File "${filePath}" is not empty, but its first line could not be parsed as a chat header. Overwriting it requires an explicit confirmation.`);
|
||||
return false;
|
||||
}
|
||||
|
||||
const chatIntegrity = jsonData?.chat_metadata?.integrity;
|
||||
|
||||
// If the chat has no integrity metadata, assume it's intact
|
||||
// If the chat has no integrity metadata, assume it's intact (legacy chats created before integrity checks existed)
|
||||
if (!chatIntegrity) {
|
||||
console.debug(`File "${filePath}" does not have integrity metadata matching "${integritySlug}". The integrity validation has been skipped.`);
|
||||
return true;
|
||||
@@ -357,33 +391,66 @@ async function checkChatIntegrity(filePath, integritySlug) {
|
||||
* @typedef {(textArray: string[]) => boolean} ChatMatchFunction
|
||||
*/
|
||||
export async function getChatInfo(pathToFile, additionalData = {}, withMetadata = false, matcher = null) {
|
||||
return new Promise(async (res) => {
|
||||
const parsedPath = path.parse(pathToFile);
|
||||
const stats = await fs.promises.stat(pathToFile);
|
||||
const hasMatcher = (typeof matcher === 'function');
|
||||
const parsedPath = path.parse(pathToFile);
|
||||
const hasMatcher = (typeof matcher === 'function');
|
||||
|
||||
const chatData = {
|
||||
match: false,
|
||||
file_id: parsedPath.name,
|
||||
file_name: parsedPath.base,
|
||||
file_size: formatBytes(stats.size),
|
||||
chat_items: 0,
|
||||
mes: '[The chat is empty]',
|
||||
last_mes: stats.mtimeMs,
|
||||
...additionalData,
|
||||
};
|
||||
// A chat that is deleted while a scan is running is not an error: treat it like a corrupted chat and move on.
|
||||
const chatVanished = () => {
|
||||
console.warn('Chat file was deleted while it was being scanned:', pathToFile);
|
||||
return { match: false };
|
||||
};
|
||||
|
||||
if (stats.size === 0) {
|
||||
res(chatData);
|
||||
return;
|
||||
let stats;
|
||||
try {
|
||||
stats = await fs.promises.stat(pathToFile);
|
||||
} catch (error) {
|
||||
if (error.code === 'ENOENT') {
|
||||
return chatVanished();
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
const chatData = {
|
||||
match: false,
|
||||
file_id: parsedPath.name,
|
||||
file_name: parsedPath.base,
|
||||
file_size: formatBytes(stats.size),
|
||||
chat_items: 0,
|
||||
mes: '[The chat is empty]',
|
||||
last_mes: stats.mtimeMs,
|
||||
...additionalData,
|
||||
};
|
||||
|
||||
if (stats.size === 0) {
|
||||
return chatData;
|
||||
}
|
||||
|
||||
return new Promise((res, rej) => {
|
||||
const fileStream = fs.createReadStream(pathToFile);
|
||||
|
||||
// The file can still disappear between the stat above and the stream opening
|
||||
fileStream.on('error', (error) => {
|
||||
if (error.code === 'ENOENT') {
|
||||
res(chatVanished());
|
||||
return;
|
||||
}
|
||||
rej(error);
|
||||
});
|
||||
|
||||
const rl = readline.createInterface({
|
||||
input: fileStream,
|
||||
crlfDelay: Infinity,
|
||||
});
|
||||
|
||||
// readline re-emits input stream errors; without a listener the emit throws
|
||||
rl.on('error', (error) => {
|
||||
if (error.code === 'ENOENT') {
|
||||
res(chatVanished());
|
||||
return;
|
||||
}
|
||||
rej(error);
|
||||
});
|
||||
|
||||
let lastLine;
|
||||
let itemCounter = 0;
|
||||
let hasAnyMatch = false;
|
||||
@@ -410,8 +477,6 @@ export async function getChatInfo(pathToFile, additionalData = {}, withMetadata
|
||||
lastLine = line;
|
||||
});
|
||||
rl.on('close', () => {
|
||||
rl.close();
|
||||
|
||||
if (lastLine) {
|
||||
const jsonData = tryParse(lastLine);
|
||||
if (jsonData && (jsonData.name || jsonData.character_name || jsonData.chat_metadata)) {
|
||||
@@ -422,9 +487,19 @@ export async function getChatInfo(pathToFile, additionalData = {}, withMetadata
|
||||
|
||||
res(chatData);
|
||||
} else {
|
||||
console.warn('Found an invalid or corrupted chat file:', pathToFile);
|
||||
res({});
|
||||
// The last line is unparseable or lacks known fields (e.g. a truncated write or an external edit).
|
||||
// Resolve a degraded preview from the stat data instead of hiding an otherwise intact chat
|
||||
// from the chat list, search and recents.
|
||||
console.warn('Found an invalid or corrupted last line in a chat file:', pathToFile);
|
||||
// Exclude both the metadata line and the unreadable trailing line.
|
||||
chatData.chat_items = Math.max(itemCounter - 2, 0);
|
||||
chatData.mes = '[The message is empty]';
|
||||
chatData.match = hasMatcher ? hasAnyMatch : true;
|
||||
res(chatData);
|
||||
}
|
||||
} else {
|
||||
// The file was truncated after the stat reported a non-zero size; treat it like an empty chat
|
||||
res(chatData);
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -464,7 +539,7 @@ export async function trySaveChat(chatData, filePath, skipIntegrityCheck = false
|
||||
throw new IntegrityMismatchError(`Chat integrity check failed for "${filePath}". The expected integrity slug was "${chatIntegritySlug}".`);
|
||||
}
|
||||
tryWriteFileSync(filePath, jsonlData);
|
||||
getBackupFunction(handle)(backupDirectory, cardName, jsonlData);
|
||||
getBackupFunction(handle, cardName)(backupDirectory, cardName, jsonlData);
|
||||
}
|
||||
|
||||
router.post('/save', validateAvatarUrlMiddleware, async function (request, response) {
|
||||
|
||||
@@ -6,7 +6,7 @@ import sanitize from 'sanitize-filename';
|
||||
import { CheckRepoActions, default as simpleGit } from 'simple-git';
|
||||
|
||||
import { PUBLIC_DIRECTORIES } from '../constants.js';
|
||||
import { getConfigValue, isValidUrl } from '../util.js';
|
||||
import { color, getConfigValue, isValidUrl } from '../util.js';
|
||||
import { createGitClient } from '../git/client.js';
|
||||
|
||||
const gitBackend = getConfigValue('git.backend', 'auto');
|
||||
@@ -486,17 +486,35 @@ router.get('/discover', function (request, response) {
|
||||
fs.mkdirSync(PUBLIC_DIRECTORIES.globalExtensions);
|
||||
}
|
||||
|
||||
/**
|
||||
* A directory without a manifest.json is not a usable extension: typically a leftover
|
||||
* from a manual deletion (e.g. a locked .git directory on Windows). Listing it would
|
||||
* make the client report a ghost extension and request its manifest in vain on every load.
|
||||
* @param {string} parentDirectory Directory containing extension folders
|
||||
* @param {string} folder Extension folder name
|
||||
* @returns {boolean} Whether the folder contains a manifest
|
||||
*/
|
||||
const hasManifest = (parentDirectory, folder) => {
|
||||
const manifestExists = fs.existsSync(path.join(parentDirectory, folder, 'manifest.json'));
|
||||
if (!manifestExists) {
|
||||
console.warn(color.yellow(`Extension folder "${path.join(parentDirectory, folder)}" has no manifest.json and was skipped. Remove the folder to get rid of this warning.`));
|
||||
}
|
||||
return manifestExists;
|
||||
};
|
||||
|
||||
// Get all folders in system extensions folder, excluding third-party
|
||||
const builtInExtensions = fs
|
||||
.readdirSync(PUBLIC_DIRECTORIES.extensions)
|
||||
.filter(f => fs.statSync(path.join(PUBLIC_DIRECTORIES.extensions, f)).isDirectory())
|
||||
.filter(f => f !== 'third-party')
|
||||
.filter(f => hasManifest(PUBLIC_DIRECTORIES.extensions, f))
|
||||
.map(f => ({ type: 'system', name: f }));
|
||||
|
||||
// Get all folders in local extensions folder
|
||||
const userExtensions = fs
|
||||
.readdirSync(path.join(request.user.directories.extensions))
|
||||
.filter(f => fs.statSync(path.join(request.user.directories.extensions, f)).isDirectory())
|
||||
.filter(f => hasManifest(request.user.directories.extensions, f))
|
||||
.map(f => ({ type: 'local', name: `third-party/${f}` }));
|
||||
|
||||
// Get all folders in global extensions folder
|
||||
@@ -504,6 +522,7 @@ router.get('/discover', function (request, response) {
|
||||
const globalExtensions = fs
|
||||
.readdirSync(PUBLIC_DIRECTORIES.globalExtensions)
|
||||
.filter(f => fs.statSync(path.join(PUBLIC_DIRECTORIES.globalExtensions, f)).isDirectory())
|
||||
.filter(f => hasManifest(PUBLIC_DIRECTORIES.globalExtensions, f))
|
||||
.map(f => ({ type: 'global', name: `third-party/${f}` }))
|
||||
.filter(f => !userExtensions.some(e => e.name === f.name));
|
||||
|
||||
|
||||
@@ -33,12 +33,11 @@ router.post('/generate-voice', async (request, response) => {
|
||||
} = request.body;
|
||||
|
||||
const apiKey = readSecret(request.user.directories, SECRET_KEYS.MINIMAX);
|
||||
const groupId = readSecret(request.user.directories, SECRET_KEYS.MINIMAX_GROUP_ID);
|
||||
|
||||
// Validate required parameters
|
||||
if (!text || !voiceId || !apiKey || !groupId) {
|
||||
if (!text || !voiceId || !apiKey) {
|
||||
console.warn('MiniMax TTS: Missing required parameters');
|
||||
return response.status(400).json({ error: 'Missing required parameters: text, voiceId, apiKey, and groupId are required' });
|
||||
return response.status(400).json({ error: 'Missing required parameters: text, voiceId, and apiKey are required' });
|
||||
}
|
||||
|
||||
const requestBody = {
|
||||
@@ -64,7 +63,7 @@ router.post('/generate-voice', async (request, response) => {
|
||||
requestBody.lang = language;
|
||||
}
|
||||
|
||||
const apiUrl = `${apiHost}/v1/t2a_v2?GroupId=${groupId}`;
|
||||
const apiUrl = `${apiHost}/v1/t2a_v2`;
|
||||
|
||||
console.debug('MiniMax TTS Request:', {
|
||||
url: apiUrl,
|
||||
|
||||
@@ -140,7 +140,7 @@ router.post('/status', async function (req, res) {
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await fetch(API_NOVELAI + '/user/subscription', {
|
||||
const response = await fetch(IMAGE_NOVELAI + '/user/subscription', {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
|
||||
+5
-15
@@ -8,6 +8,7 @@ import express from 'express';
|
||||
import { getConfigValue, mergeObjectWithYaml, excludeKeysByYaml, trimV1, delay } from '../util.js';
|
||||
import { setAdditionalHeaders } from '../additional-headers.js';
|
||||
import { readSecret, SECRET_KEYS } from './secrets.js';
|
||||
import { POLLINATIONS_ENDPOINT } from '../constants.js';
|
||||
import { AIMLAPI_HEADERS, OPENROUTER_HEADERS, SILICONFLOW_ENDPOINT, ZAI_ENDPOINT } from '../constants.js';
|
||||
|
||||
export const router = express.Router();
|
||||
@@ -98,7 +99,8 @@ router.post('/caption-image', async (request, response) => {
|
||||
}
|
||||
|
||||
if (request.body.api === 'pollinations') {
|
||||
key = readSecret(request.user.directories, SECRET_KEYS.POLLINATIONS);
|
||||
const isAnonymous = request.body.pollinations_endpoint === POLLINATIONS_ENDPOINT.ANONYMOUS;
|
||||
key = isAnonymous ? 'anonymous' : readSecret(request.user.directories, SECRET_KEYS.POLLINATIONS);
|
||||
bodyParams.seed = Math.floor(Math.random() * Math.pow(2, 32));
|
||||
}
|
||||
|
||||
@@ -182,7 +184,8 @@ router.post('/caption-image', async (request, response) => {
|
||||
}
|
||||
|
||||
if (request.body.api === 'pollinations') {
|
||||
apiUrl = 'https://gen.pollinations.ai/v1/chat/completions';
|
||||
const isAnonymous = request.body.pollinations_endpoint === POLLINATIONS_ENDPOINT.ANONYMOUS;
|
||||
apiUrl = isAnonymous ? 'https://text.pollinations.ai/v1/chat/completions' : 'https://gen.pollinations.ai/v1/chat/completions';
|
||||
}
|
||||
|
||||
if (request.body.api === 'moonshot' && !request.body.reverse_proxy) {
|
||||
@@ -232,19 +235,6 @@ router.post('/caption-image', async (request, response) => {
|
||||
apiUrl = `${trimV1(request.body.server_url)}/v1/chat/completions`;
|
||||
}
|
||||
|
||||
if (request.body.api === 'ooba') {
|
||||
const imgMessage = body.messages.pop();
|
||||
body.messages.push({
|
||||
role: 'user',
|
||||
content: imgMessage?.content?.[0]?.text,
|
||||
});
|
||||
body.messages.push({
|
||||
role: 'user',
|
||||
content: [],
|
||||
image_url: imgMessage?.content?.[1]?.image_url?.url,
|
||||
});
|
||||
}
|
||||
|
||||
setAdditionalHeaders(request, { headers }, apiUrl);
|
||||
console.debug('Multimodal captioning request', body);
|
||||
|
||||
|
||||
+13
-3
@@ -6,6 +6,7 @@ import { decode } from 'html-entities';
|
||||
import { readSecret, SECRET_KEYS } from './secrets.js';
|
||||
import { trimV1 } from '../util.js';
|
||||
import { setAdditionalHeaders } from '../additional-headers.js';
|
||||
import { getUntrustedRequestAgent } from '../private-request-filter.js';
|
||||
|
||||
export const router = express.Router();
|
||||
|
||||
@@ -416,8 +417,14 @@ router.post('/visit', async (request, response) => {
|
||||
throw new Error('Invalid port');
|
||||
}
|
||||
|
||||
// Reject IP addresses
|
||||
if (ipRegex.v4({ exact: true }).test(urlObj.hostname) || ipRegex.v6({ exact: true }).test(urlObj.hostname)) {
|
||||
// Reject IP addresses. A bracketed IPv6 literal keeps its brackets in URL.hostname.
|
||||
const bareHostname = urlObj.hostname.replace(/^\[|\]$/g, '');
|
||||
if (ipRegex.v4({ exact: true }).test(bareHostname) || ipRegex.v6({ exact: true }).test(bareHostname)) {
|
||||
throw new Error('Invalid hostname');
|
||||
}
|
||||
|
||||
// Reject localhost and .localhost domains to prevent SSRF bypass
|
||||
if (urlObj.hostname === 'localhost' || urlObj.hostname.endsWith('.localhost')) {
|
||||
throw new Error('Invalid hostname');
|
||||
}
|
||||
} catch (error) {
|
||||
@@ -427,7 +434,10 @@ router.post('/visit', async (request, response) => {
|
||||
|
||||
console.info('Visiting web URL', url);
|
||||
|
||||
const result = await fetch(url, { headers: visitHeaders });
|
||||
// The URL checks above only guard the literal input. The agent enforces the actual network
|
||||
// boundary: it blocks connections to private addresses after DNS resolution, on every redirect
|
||||
// hop, and pins the connection to the validated IP to prevent DNS rebinding.
|
||||
const result = await fetch(url, { headers: visitHeaders, agent: getUntrustedRequestAgent() });
|
||||
|
||||
if (!result.ok) {
|
||||
console.error(`Visit failed ${result.status} ${result.statusText}`);
|
||||
|
||||
@@ -101,7 +101,7 @@ pollinations.post('/voices', async (req, res) => {
|
||||
throw new Error('Invalid data format received from Pollinations');
|
||||
}
|
||||
|
||||
const audioModelData = data.find(m => m.name === model);
|
||||
const audioModelData = data.find(m => m.name === model || m.aliases?.includes(model));
|
||||
if (!audioModelData || !Array.isArray(audioModelData.voices)) {
|
||||
throw new Error('No voices found for the specified model');
|
||||
}
|
||||
|
||||
@@ -586,7 +586,7 @@ comfy.post('/generate', async (request, response) => {
|
||||
/** @type {any} */
|
||||
const data = await promptResult.json();
|
||||
const id = data.prompt_id;
|
||||
const historyUrl = new URL(urlJoin(request.body.url, '/history'));
|
||||
const historyUrl = new URL(urlJoin(request.body.url, `/history/${id}`));
|
||||
while (true) {
|
||||
const result = await fetch(historyUrl);
|
||||
if (!result.ok) {
|
||||
@@ -611,7 +611,8 @@ comfy.post('/generate', async (request, response) => {
|
||||
}
|
||||
const outputs = Object.keys(item.outputs).map(it => item.outputs[it]);
|
||||
console.debug('ComfyUI outputs:', outputs);
|
||||
const imgInfo = outputs.map(it => it.images).flat()[0] ?? outputs.map(it => it.gifs).flat()[0];
|
||||
const imgInfo = outputs.map(it => it.images).filter(Array.isArray).flat()[0]
|
||||
?? outputs.map(it => it.gifs).filter(Array.isArray).flat()[0];
|
||||
if (!imgInfo) {
|
||||
throw new Error('ComfyUI did not return any recognizable outputs.');
|
||||
}
|
||||
@@ -1528,7 +1529,7 @@ bfl.post('/generate', async (request, response) => {
|
||||
|
||||
console.debug('BFL request:', requestBody);
|
||||
|
||||
const result = await fetch(`https://api.bfl.ml/v1/${request.body.model}`, {
|
||||
const result = await fetch(`https://api.bfl.ai/v1/${request.body.model}`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(requestBody),
|
||||
headers: {
|
||||
@@ -1545,12 +1546,18 @@ bfl.post('/generate', async (request, response) => {
|
||||
/** @type {any} */
|
||||
const taskData = await result.json();
|
||||
const { id } = taskData;
|
||||
const pollingUrl = taskData.polling_url ?? `https://api.bfl.ai/v1/get_result?id=${id}`;
|
||||
|
||||
const MAX_ATTEMPTS = 100;
|
||||
for (let i = 0; i < MAX_ATTEMPTS; i++) {
|
||||
await delay(2500);
|
||||
|
||||
const statusResult = await fetch(`https://api.bfl.ml/v1/get_result?id=${id}`);
|
||||
// The bfl.ai API requires authentication on the polling request as well
|
||||
const statusResult = await fetch(pollingUrl, {
|
||||
headers: {
|
||||
'x-key': key,
|
||||
},
|
||||
});
|
||||
|
||||
if (!statusResult.ok) {
|
||||
const text = await statusResult.text();
|
||||
|
||||
@@ -14,7 +14,7 @@ import tiktoken from 'tiktoken';
|
||||
|
||||
import { TEXTGEN_TYPES } from '../constants.js';
|
||||
import { setAdditionalHeaders } from '../additional-headers.js';
|
||||
import { getConfigValue, isValidUrl } from '../util.js';
|
||||
import { getConfigValue, isValidUrl, trimV1 } from '../util.js';
|
||||
|
||||
/**
|
||||
* @typedef { (req: import('express').Request, res: import('express').Response) => Promise<any> } TokenizationHandler
|
||||
@@ -442,7 +442,7 @@ export function getTokenizerModel(requestModel) {
|
||||
return 'o1';
|
||||
}
|
||||
|
||||
if (requestModel.includes('gpt-5') || requestModel.includes('o3') || requestModel.includes('o4-mini')) {
|
||||
if (requestModel.includes('gpt-5') || requestModel.includes('gpt-6-astra') || requestModel.includes('o3') || requestModel.includes('o4-mini')) {
|
||||
return 'o1';
|
||||
}
|
||||
|
||||
@@ -1086,7 +1086,7 @@ router.post('/remote/textgenerationwebui/encode', async function (request, respo
|
||||
setAdditionalHeaders(request, args, baseUrl);
|
||||
|
||||
// Convert to string + remove trailing slash + /v1 suffix
|
||||
let url = String(baseUrl).replace(/\/$/, '').replace(/\/v1$/, '');
|
||||
let url = trimV1(baseUrl);
|
||||
|
||||
switch (request.body.api_type) {
|
||||
case TEXTGEN_TYPES.TABBY:
|
||||
@@ -1109,10 +1109,12 @@ router.post('/remote/textgenerationwebui/encode', async function (request, respo
|
||||
url += '/v1/tokenize';
|
||||
args.body = JSON.stringify({ 'model': model, 'prompt': text });
|
||||
break;
|
||||
default:
|
||||
case TEXTGEN_TYPES.OOBA:
|
||||
url += '/v1/internal/encode';
|
||||
args.body = JSON.stringify({ 'text': text });
|
||||
break;
|
||||
default:
|
||||
return response.sendStatus(400);
|
||||
}
|
||||
|
||||
const result = await fetch(url, args);
|
||||
|
||||
@@ -4,15 +4,25 @@ import crypto from 'node:crypto';
|
||||
|
||||
import storage from 'node-persist';
|
||||
import express from 'express';
|
||||
import { RateLimiterMemory, RateLimiterRes } from 'rate-limiter-flexible';
|
||||
|
||||
import { getUserAvatar, toKey, getPasswordHash, getPasswordSalt, createBackupArchive, ensurePublicDirectoriesExist, toAvatarKey, getAccountVersion } from '../users.js';
|
||||
import { SETTINGS_FILE } from '../constants.js';
|
||||
import { checkForNewContent, CONTENT_TYPES } from './content-manager.js';
|
||||
import { color, Cache, getConfigValue } from '../util.js';
|
||||
import { getIpAddress, retryAfter } from '../express-common.js';
|
||||
|
||||
const RESET_POINTS = getConfigValue('rateLimiting.accountsResetMaxAttempts', 5, 'number');
|
||||
const PREFER_REAL_IP_HEADER = getConfigValue('rateLimiting.preferRealIpHeader', false, 'boolean');
|
||||
const RESET_CACHE = new Cache(5 * 60 * 1000);
|
||||
|
||||
const generateResetCode = () => Array.from({ length: 6 }, () => crypto.randomInt(0, 10)).join('');
|
||||
|
||||
export const router = express.Router();
|
||||
const resetLimiter = new RateLimiterMemory({
|
||||
points: RESET_POINTS > 0 ? RESET_POINTS : Number.MAX_SAFE_INTEGER,
|
||||
duration: 300,
|
||||
});
|
||||
|
||||
router.post('/logout', async (request, response) => {
|
||||
try {
|
||||
@@ -223,14 +233,27 @@ router.post('/change-name', async (request, response) => {
|
||||
|
||||
router.post('/reset-step1', async (request, response) => {
|
||||
try {
|
||||
const resetCode = String(crypto.randomInt(1000, 9999));
|
||||
const ip = getIpAddress(request, PREFER_REAL_IP_HEADER);
|
||||
const rateLimit = await resetLimiter.get(ip);
|
||||
|
||||
// Check for existing rate limits, but allow requesting a new code unless locked out
|
||||
if (rateLimit !== null && rateLimit.consumedPoints > resetLimiter.points) {
|
||||
throw rateLimit;
|
||||
}
|
||||
|
||||
const resetCode = generateResetCode();
|
||||
console.log();
|
||||
console.log(color.magenta(`${request.user.profile.name}, your account reset code is: `) + color.red(resetCode));
|
||||
console.log();
|
||||
RESET_CACHE.set(request.user.profile.handle, resetCode);
|
||||
return response.sendStatus(204);
|
||||
} catch (error) {
|
||||
console.error('Recover step 1 failed:', error);
|
||||
if (error instanceof RateLimiterRes) {
|
||||
console.error('Reset step 1 failed: Rate limited from', getIpAddress(request, PREFER_REAL_IP_HEADER));
|
||||
return retryAfter(response, error).status(429).send({ error: 'Too many attempts. Try again later or contact your admin.' });
|
||||
}
|
||||
|
||||
console.error('Reset step 1 failed:', error);
|
||||
return response.sendStatus(500);
|
||||
}
|
||||
});
|
||||
@@ -238,19 +261,27 @@ router.post('/reset-step1', async (request, response) => {
|
||||
router.post('/reset-step2', async (request, response) => {
|
||||
try {
|
||||
if (!request.body.code) {
|
||||
console.warn('Recover step 2 failed: Missing required fields');
|
||||
console.warn('Reset step 2 failed: Missing required fields');
|
||||
return response.status(400).json({ error: 'Missing required fields' });
|
||||
}
|
||||
|
||||
if (request.user.profile.password && request.user.profile.password !== getPasswordHash(request.body.password, request.user.profile.salt)) {
|
||||
console.warn('Recover step 2 failed: Incorrect password');
|
||||
console.warn('Reset step 2 failed: Incorrect password');
|
||||
return response.status(400).json({ error: 'Incorrect password' });
|
||||
}
|
||||
|
||||
const ip = getIpAddress(request, PREFER_REAL_IP_HEADER);
|
||||
const rateLimit = await resetLimiter.get(ip);
|
||||
|
||||
if (rateLimit !== null && rateLimit.consumedPoints > resetLimiter.points) {
|
||||
throw rateLimit;
|
||||
}
|
||||
|
||||
const code = RESET_CACHE.get(request.user.profile.handle);
|
||||
|
||||
if (!code || code !== request.body.code) {
|
||||
console.warn('Recover step 2 failed: Incorrect code');
|
||||
await resetLimiter.consume(ip);
|
||||
console.warn('Reset step 2 failed: Incorrect code');
|
||||
return response.status(400).json({ error: 'Incorrect code' });
|
||||
}
|
||||
|
||||
@@ -260,10 +291,16 @@ router.post('/reset-step2', async (request, response) => {
|
||||
await ensurePublicDirectoriesExist();
|
||||
await checkForNewContent([request.user.directories]);
|
||||
|
||||
await resetLimiter.delete(ip);
|
||||
RESET_CACHE.remove(request.user.profile.handle);
|
||||
return response.sendStatus(204);
|
||||
} catch (error) {
|
||||
console.error('Recover step 2 failed:', error);
|
||||
if (error instanceof RateLimiterRes) {
|
||||
console.error('Reset step 2 failed: Rate limited from', getIpAddress(request, PREFER_REAL_IP_HEADER));
|
||||
return retryAfter(response, error).status(429).send({ error: 'Too many attempts. Try again later or contact your admin.' });
|
||||
}
|
||||
|
||||
console.error('Reset step 2 failed:', error);
|
||||
return response.sendStatus(500);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -26,6 +26,12 @@ export default async function corsProxyMiddleware(req, res) {
|
||||
|
||||
headersToRemove.forEach(header => delete headers[header]);
|
||||
|
||||
// Force a set of encodings that node-fetch/undici can transparently decompress.
|
||||
// Some origins (e.g. Cloudflare-fronted sites) will respond with zstd when a browser's
|
||||
// full Accept-Encoding list is forwarded as-is; undici does not decode zstd, so the raw
|
||||
// compressed bytes would otherwise be piped straight through to the client as garbage.
|
||||
headers['accept-encoding'] = 'gzip, deflate, br';
|
||||
|
||||
const bodyMethods = ['POST', 'PUT', 'PATCH'];
|
||||
|
||||
const response = await fetch(url, {
|
||||
|
||||
@@ -196,6 +196,35 @@ class PrivateRequestAgent extends Agent {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether requests to untrusted URLs should follow the global agent chain instead of the strict agent:
|
||||
* either the private request filter is enabled (the global agents filter with the user's configured
|
||||
* whitelist), or a request proxy owns outbound routing and a direct connection would bypass it.
|
||||
* @type {boolean}
|
||||
*/
|
||||
let untrustedFilteringDelegated = false;
|
||||
|
||||
/** @type {PrivateRequestAgent|null} */
|
||||
let strictAgent = null;
|
||||
|
||||
/**
|
||||
* Get the agent to use for outbound requests to untrusted, user-supplied URLs (e.g. /api/search/visit).
|
||||
* Returns a strict agent that blocks all private addresses at connection time, including on redirect hops,
|
||||
* regardless of whether the private request filter is enabled. Returns undefined when the global agent
|
||||
* chain already handles these requests (private request filter enabled, or request proxy owns routing),
|
||||
* so the default agent selection applies.
|
||||
* @returns {PrivateRequestAgent|undefined} The agent to pass to the outbound request, or undefined.
|
||||
*/
|
||||
export function getUntrustedRequestAgent() {
|
||||
if (untrustedFilteringDelegated) {
|
||||
return undefined;
|
||||
}
|
||||
if (!strictAgent) {
|
||||
strictAgent = new PrivateRequestAgent({ privateAddressWhitelist: [], logBlocked: true, logAllowed: false, allowUnresolvedHosts: false, enableKeepAlive: false });
|
||||
}
|
||||
return strictAgent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize the private request filter by replacing the global HTTP and HTTPS agents with an instance of PrivateRequestAgent.
|
||||
* @param {object} options Options for initializing the private request filter.
|
||||
@@ -206,8 +235,11 @@ class PrivateRequestAgent extends Agent {
|
||||
* @param {boolean} options.logAllowed Whether to log allowed requests to the console.
|
||||
* @param {boolean} options.allowUnresolvedHosts Whether to allow requests to hosts that cannot be resolved.
|
||||
* @param {boolean} options.enableKeepAlive Whether to enable HTTP/HTTPS keep-alive.
|
||||
* @param {boolean} [options.requestProxyEnabled] Whether a request proxy is enabled and owns outbound routing.
|
||||
*/
|
||||
export default function initPrivateRequestFilter({ listen, enabled, privateAddressWhitelist, logBlocked, logAllowed, allowUnresolvedHosts, enableKeepAlive }) {
|
||||
export default function initPrivateRequestFilter({ listen, enabled, privateAddressWhitelist, logBlocked, logAllowed, allowUnresolvedHosts, enableKeepAlive, requestProxyEnabled }) {
|
||||
untrustedFilteringDelegated = !!enabled || !!requestProxyEnabled;
|
||||
|
||||
if (!enabled) {
|
||||
if (listen) {
|
||||
console.warn();
|
||||
|
||||
@@ -453,13 +453,17 @@ export function convertGooglePrompt(messages, model, useSysPrompt, names) {
|
||||
const system_instruction = { parts: sysPrompt.map(text => ({ text })) };
|
||||
const toolNameMap = {};
|
||||
|
||||
// https://ai.google.dev/gemini-api/docs/latest-model#prefilled-model-turn-validation
|
||||
const noPrefillModel = /gemini-3\.[67]-flash|gemini-3\.5-flash-lite/.test(model);
|
||||
|
||||
const contents = [];
|
||||
messages.forEach((message, index) => {
|
||||
// fix the roles
|
||||
if (message.role === 'system' || message.role === 'tool') {
|
||||
message.role = 'user';
|
||||
} else if (message.role === 'assistant') {
|
||||
message.role = 'model';
|
||||
// A trailing model turn is a prefill, which is rejected by the newest models
|
||||
message.role = noPrefillModel && index === messages.length - 1 ? 'user' : 'model';
|
||||
}
|
||||
|
||||
// Convert the content to an array of parts
|
||||
@@ -1259,11 +1263,13 @@ export function calculateGoogleBudgetTokens(maxTokens, reasoningEffort, model) {
|
||||
}
|
||||
|
||||
function getGemini3FlashBudget() {
|
||||
// https://ai.google.dev/gemini-api/docs/models/gemini-3.7-flash
|
||||
const noMinimalThinking = /gemini-3\.7-flash/.test(model);
|
||||
switch (reasoningEffort) {
|
||||
case REASONING_EFFORT.auto:
|
||||
return null;
|
||||
case REASONING_EFFORT.min:
|
||||
return 'minimal';
|
||||
return noMinimalThinking ? 'low' : 'minimal';
|
||||
case REASONING_EFFORT.low:
|
||||
return 'low';
|
||||
case REASONING_EFFORT.medium:
|
||||
|
||||
@@ -343,6 +343,7 @@ async function preSetupTasks() {
|
||||
logAllowed: !!getConfigValue('privateAddressWhitelist.log.allowedRequests', false, 'boolean'),
|
||||
allowUnresolvedHosts: !!getConfigValue('privateAddressWhitelist.allowUnresolvedHosts', false, 'boolean'),
|
||||
enableKeepAlive: cliArgs.enableKeepAlive,
|
||||
requestProxyEnabled: !!cliArgs.requestProxyEnabled,
|
||||
};
|
||||
initPrivateRequestFilter(requestFilterOptions);
|
||||
|
||||
|
||||
+37
-14
@@ -486,6 +486,20 @@ export async function readAllChunks(readableStream) {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a precisely-sized ArrayBuffer from a Uint8Array view such as a Node Buffer.
|
||||
* This avoids leaking unrelated bytes from the underlying backing store.
|
||||
* @param {Uint8Array} view Source byte view
|
||||
* @returns {ArrayBuffer} Exact ArrayBuffer slice for the provided view
|
||||
*/
|
||||
export function getArrayBufferSlice(view) {
|
||||
if (!(view instanceof Uint8Array)) {
|
||||
throw new TypeError('Expected Uint8Array');
|
||||
}
|
||||
|
||||
return view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength);
|
||||
}
|
||||
|
||||
function isObject(item) {
|
||||
return (item && typeof item === 'object' && !Array.isArray(item));
|
||||
}
|
||||
@@ -666,18 +680,7 @@ export function removeOldBackups(directory, prefix, limit = null) {
|
||||
* @returns {string[]} List of image file names
|
||||
*/
|
||||
export function getImages(directoryPath, sortBy = 'name', type = MEDIA_REQUEST_TYPE.IMAGE) {
|
||||
function getSortFunction() {
|
||||
switch (sortBy) {
|
||||
case 'name':
|
||||
return Intl.Collator().compare;
|
||||
case 'date':
|
||||
return (a, b) => fs.statSync(path.join(directoryPath, a)).mtimeMs - fs.statSync(path.join(directoryPath, b)).mtimeMs;
|
||||
default:
|
||||
return (_a, _b) => 0;
|
||||
}
|
||||
}
|
||||
|
||||
return fs
|
||||
const files = fs
|
||||
.readdirSync(directoryPath, { withFileTypes: true })
|
||||
.filter(dirent => dirent.isFile())
|
||||
.map(dirent => dirent.name)
|
||||
@@ -696,8 +699,28 @@ export function getImages(directoryPath, sortBy = 'name', type = MEDIA_REQUEST_T
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
})
|
||||
.sort(getSortFunction());
|
||||
});
|
||||
|
||||
switch (sortBy) {
|
||||
case 'name':
|
||||
return files.sort(Intl.Collator().compare);
|
||||
case 'date': {
|
||||
const mtimes = new Map();
|
||||
for (const file of files) {
|
||||
try {
|
||||
mtimes.set(file, fs.statSync(path.join(directoryPath, file)).mtimeMs);
|
||||
} catch (err) {
|
||||
if (err?.code !== 'ENOENT') {
|
||||
throw err;
|
||||
}
|
||||
mtimes.set(file, 0);
|
||||
}
|
||||
}
|
||||
return files.sort((a, b) => mtimes.get(a) - mtimes.get(b));
|
||||
}
|
||||
default:
|
||||
return files;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
import path from 'node:path';
|
||||
import process from 'node:process';
|
||||
import { afterAll, beforeAll, describe, expect, test } from '@jest/globals';
|
||||
import archiver from 'archiver';
|
||||
|
||||
import { ByafParser } from '../src/byaf.js';
|
||||
import { getArrayBufferSlice } from '../src/util.js';
|
||||
|
||||
// The parser reads the default avatar from a repo-root-relative path
|
||||
const originalCwd = process.cwd();
|
||||
beforeAll(() => process.chdir(path.resolve(originalCwd, '..')));
|
||||
afterAll(() => process.chdir(originalCwd));
|
||||
|
||||
/**
|
||||
* Builds a minimal valid BYAF archive in memory.
|
||||
* @returns {Promise<Buffer>} Zipped BYAF bytes
|
||||
*/
|
||||
function buildByafArchive() {
|
||||
return new Promise((resolve, reject) => {
|
||||
const archive = archiver('zip', { zlib: { level: 9 } });
|
||||
const chunks = [];
|
||||
archive.on('data', chunk => chunks.push(chunk));
|
||||
archive.on('error', reject);
|
||||
archive.on('end', () => resolve(Buffer.concat(chunks)));
|
||||
|
||||
archive.append(JSON.stringify({
|
||||
characters: ['characters/character.json'],
|
||||
scenarios: ['scenarios/scenario.json'],
|
||||
}), { name: 'manifest.json' });
|
||||
archive.append(JSON.stringify({
|
||||
name: 'Byaf Test Character',
|
||||
persona: 'A test persona.',
|
||||
images: [{ path: 'images/icon.png', label: '' }],
|
||||
}), { name: 'characters/character.json' });
|
||||
const pngPixel = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==', 'base64');
|
||||
archive.append(pngPixel, { name: 'characters/images/icon.png' });
|
||||
archive.append(JSON.stringify({
|
||||
name: 'Test Scenario',
|
||||
messages: [],
|
||||
}), { name: 'scenarios/scenario.json' });
|
||||
archive.finalize();
|
||||
});
|
||||
}
|
||||
|
||||
describe('BYAF import buffer handling', () => {
|
||||
/** @type {Buffer} */
|
||||
let zipBuffer;
|
||||
/** @type {Buffer} */
|
||||
let pooledView;
|
||||
|
||||
beforeAll(async () => {
|
||||
zipBuffer = await buildByafArchive();
|
||||
// Simulate Node's buffer pooling: the archive bytes sit at an offset inside
|
||||
// a larger backing buffer surrounded by unrelated bytes.
|
||||
const backing = Buffer.alloc(zipBuffer.length + 8192, 0xFF);
|
||||
zipBuffer.copy(backing, 4096);
|
||||
pooledView = backing.subarray(4096, 4096 + zipBuffer.length);
|
||||
});
|
||||
|
||||
test('parses a real BYAF archive from an exact ArrayBuffer slice of a pooled view', async () => {
|
||||
const exact = getArrayBufferSlice(pooledView);
|
||||
expect(exact.byteLength).toBe(zipBuffer.length);
|
||||
|
||||
const parser = new ByafParser(exact);
|
||||
const result = await parser.parse();
|
||||
expect(result.card?.data?.name).toBe('Byaf Test Character');
|
||||
});
|
||||
|
||||
test('the raw oversized backing buffer is not parseable, which is why callers must slice', async () => {
|
||||
const parser = new ByafParser(pooledView.buffer);
|
||||
await expect(parser.parse()).rejects.toThrow();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,78 @@
|
||||
import { beforeAll, afterAll, describe, test, expect } from '@jest/globals';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
|
||||
// chats.js reads these config values at module load. Environment variables take
|
||||
// precedence over config.yaml, so setting them here lets the module import
|
||||
// without a config file present. The short throttle interval keeps lodash
|
||||
// timers from delaying the Jest process while still being long enough that a
|
||||
// per-user (rather than per-chat) throttle would defer the second chat's backup.
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_ENABLED = 'true';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_MAXTOTALBACKUPS = '-1';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_THROTTLEINTERVAL = '200';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_CHECKINTEGRITY = 'false';
|
||||
process.env.SILLYTAVERN_BACKUPS_COMMON_NUMBEROFBACKUPS = '1';
|
||||
|
||||
/** @type {import('../src/endpoints/chats.js')} */
|
||||
let chats;
|
||||
let workDir;
|
||||
|
||||
beforeAll(async () => {
|
||||
chats = await import('../src/endpoints/chats.js');
|
||||
workDir = fs.mkdtempSync(path.join(os.tmpdir(), 'st-backups-'));
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
fs.rmSync(workDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
/**
|
||||
* Builds a minimal chat array like the client sends it.
|
||||
* @param {string} message Message text
|
||||
* @returns {object[]} Chat array
|
||||
*/
|
||||
function makeChat(message) {
|
||||
return [
|
||||
{ user_name: 'User', character_name: 'Char', chat_metadata: {} },
|
||||
{ name: 'Char', is_user: false, mes: message },
|
||||
];
|
||||
}
|
||||
|
||||
describe('getBackupKey', () => {
|
||||
test('keeps plain ASCII names unchanged', () => {
|
||||
expect(chats.getBackupKey('Seraphina')).toBe('seraphina');
|
||||
expect(chats.getBackupKey('Some Test')).toBe('some_test');
|
||||
});
|
||||
|
||||
test('produces distinct stable keys for names that sanitize identically', () => {
|
||||
const keyA = chats.getBackupKey('雷电将军');
|
||||
const keyB = chats.getBackupKey('测试角色');
|
||||
|
||||
expect(keyA).not.toBe(keyB);
|
||||
expect(chats.getBackupKey('雷电将军')).toBe(keyA);
|
||||
});
|
||||
});
|
||||
|
||||
describe('chat backups', () => {
|
||||
test('chats with equal-length CJK names get independent backups and quotas', async () => {
|
||||
const backupsDir = path.join(workDir, 'backups');
|
||||
const chatsDir = path.join(workDir, 'chats');
|
||||
fs.mkdirSync(backupsDir, { recursive: true });
|
||||
fs.mkdirSync(chatsDir, { recursive: true });
|
||||
|
||||
// numberOfBackups is 1: with a shared backup key, the second chat's
|
||||
// backup would evict the first; with a shared throttle, it would not be
|
||||
// written at the leading edge at all
|
||||
await chats.trySaveChat(makeChat('first'), path.join(chatsDir, 'a.jsonl'), true, 'test-user', '雷电将军', backupsDir);
|
||||
await chats.trySaveChat(makeChat('second'), path.join(chatsDir, 'b.jsonl'), true, 'test-user', '测试角色', backupsDir);
|
||||
|
||||
const backupFiles = fs.readdirSync(backupsDir);
|
||||
expect(backupFiles).toHaveLength(2);
|
||||
|
||||
const keyA = chats.getBackupKey('雷电将军');
|
||||
const keyB = chats.getBackupKey('测试角色');
|
||||
expect(backupFiles.some(f => f.startsWith(`chat_${keyA}_`))).toBe(true);
|
||||
expect(backupFiles.some(f => f.startsWith(`chat_${keyB}_`))).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,130 @@
|
||||
import { beforeAll, beforeEach, afterEach, describe, test, expect, jest } from '@jest/globals';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
|
||||
// chats.js reads these config values at module load. Environment variables take
|
||||
// precedence over config.yaml, so the module imports without a config file.
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_ENABLED = 'false';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_MAXTOTALBACKUPS = '-1';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_THROTTLEINTERVAL = '0';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_CHECKINTEGRITY = 'true';
|
||||
|
||||
/** @type {import('../src/endpoints/chats.js')} */
|
||||
let chats;
|
||||
|
||||
beforeAll(async () => {
|
||||
chats = await import('../src/endpoints/chats.js');
|
||||
});
|
||||
|
||||
function makeChatJsonl() {
|
||||
return [
|
||||
JSON.stringify({ user_name: 'User', character_name: 'Char', chat_metadata: { note: 'meta' } }),
|
||||
JSON.stringify({ name: 'Char', is_user: false, mes: 'First message', send_date: '2026-01-01T00:00:00.000Z' }),
|
||||
JSON.stringify({ name: 'User', is_user: true, mes: 'Second message', send_date: '2026-01-02T00:00:00.000Z' }),
|
||||
].join('\n');
|
||||
}
|
||||
|
||||
describe('getChatInfo', () => {
|
||||
let tmpDir;
|
||||
let chatFile;
|
||||
|
||||
beforeEach(() => {
|
||||
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'st-chat-info-'));
|
||||
chatFile = path.join(tmpDir, 'chat.jsonl');
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.restoreAllMocks();
|
||||
fs.rmSync(tmpDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
test('reads info from a normal chat file', async () => {
|
||||
fs.writeFileSync(chatFile, makeChatJsonl());
|
||||
const info = await chats.getChatInfo(chatFile, {}, true);
|
||||
expect(info.file_id).toBe('chat');
|
||||
expect(info.file_name).toBe('chat.jsonl');
|
||||
expect(info.chat_items).toBe(2);
|
||||
expect(info.mes).toBe('Second message');
|
||||
expect(info.last_mes).toBe('2026-01-02T00:00:00.000Z');
|
||||
expect(info.match).toBe(true);
|
||||
expect(info.chat_metadata).toEqual({ note: 'meta' });
|
||||
});
|
||||
|
||||
test('returns defaults for an empty chat file', async () => {
|
||||
fs.writeFileSync(chatFile, '');
|
||||
const info = await chats.getChatInfo(chatFile);
|
||||
expect(info.file_name).toBe('chat.jsonl');
|
||||
expect(info.chat_items).toBe(0);
|
||||
expect(info.mes).toBe('[The chat is empty]');
|
||||
expect(info.match).toBe(false);
|
||||
});
|
||||
|
||||
test('applies the matcher against message content', async () => {
|
||||
fs.writeFileSync(chatFile, makeChatJsonl());
|
||||
const matching = await chats.getChatInfo(chatFile, {}, false, lines => lines.some(l => l.includes('Second')));
|
||||
expect(matching.match).toBe(true);
|
||||
const nonMatching = await chats.getChatInfo(chatFile, {}, false, lines => lines.some(l => l.includes('nope')));
|
||||
expect(nonMatching.match).toBe(false);
|
||||
});
|
||||
|
||||
test('resolves without match when the file was already deleted', async () => {
|
||||
const info = await chats.getChatInfo(path.join(tmpDir, 'gone.jsonl'));
|
||||
expect(info).toEqual({ match: false });
|
||||
});
|
||||
|
||||
test('resolves without match when the file is deleted between stat and read', async () => {
|
||||
// Simulate the race: stat succeeds, but the file is gone when the stream opens
|
||||
jest.spyOn(fs.promises, 'stat').mockResolvedValue(/** @type {any} */({ size: 100, mtimeMs: 1_000_000 }));
|
||||
const info = await chats.getChatInfo(path.join(tmpDir, 'ghost.jsonl'));
|
||||
expect(info).toEqual({ match: false });
|
||||
});
|
||||
|
||||
test('resolves instead of hanging when the file is truncated between stat and read', async () => {
|
||||
// Simulate the race: stat reports content, but the file is empty when read
|
||||
fs.writeFileSync(chatFile, '');
|
||||
jest.spyOn(fs.promises, 'stat').mockResolvedValue(/** @type {any} */({ size: 100, mtimeMs: 1_000_000 }));
|
||||
const info = await chats.getChatInfo(chatFile);
|
||||
expect(info.file_name).toBe('chat.jsonl');
|
||||
expect(info.chat_items).toBe(0);
|
||||
expect(info.mes).toBe('[The chat is empty]');
|
||||
expect(info.match).toBe(false);
|
||||
});
|
||||
|
||||
test('rejects with the original error for non-ENOENT stat failures', async () => {
|
||||
const eacces = Object.assign(new Error('EACCES: permission denied'), { code: 'EACCES' });
|
||||
jest.spyOn(fs.promises, 'stat').mockRejectedValue(eacces);
|
||||
await expect(chats.getChatInfo(chatFile)).rejects.toThrow('EACCES');
|
||||
});
|
||||
|
||||
test('resolves a degraded preview for a fully corrupted chat file', async () => {
|
||||
fs.writeFileSync(chatFile, 'not json at all\nstill not json');
|
||||
const info = await chats.getChatInfo(chatFile);
|
||||
expect(info.file_id).toBe('chat');
|
||||
expect(info.file_name).toBe('chat.jsonl');
|
||||
expect(info.chat_items).toBe(0);
|
||||
expect(info.mes).toBe('[The message is empty]');
|
||||
expect(info.match).toBe(true);
|
||||
});
|
||||
|
||||
test('resolves a degraded preview when only the last line is unparseable', async () => {
|
||||
// e.g. a partially flushed write or an external edit truncated the final line
|
||||
fs.writeFileSync(chatFile, makeChatJsonl() + '\n' + '{"name": "User", "is_user": true, "mes": "Trunc');
|
||||
const info = await chats.getChatInfo(chatFile);
|
||||
expect(info.file_id).toBe('chat');
|
||||
expect(info.file_name).toBe('chat.jsonl');
|
||||
expect(info.chat_items).toBe(2);
|
||||
expect(info.mes).toBe('[The message is empty]');
|
||||
expect(info.match).toBe(true);
|
||||
});
|
||||
|
||||
test('matcher still applies to intact messages when the last line is unparseable', async () => {
|
||||
fs.writeFileSync(chatFile, makeChatJsonl() + '\n' + '{"broken');
|
||||
const matching = await chats.getChatInfo(chatFile, {}, false, lines => lines.some(l => l.includes('Second')));
|
||||
expect(matching.match).toBe(true);
|
||||
expect(matching.file_name).toBe('chat.jsonl');
|
||||
const nonMatching = await chats.getChatInfo(chatFile, {}, false, lines => lines.some(l => l.includes('nope')));
|
||||
expect(nonMatching.match).toBe(false);
|
||||
expect(nonMatching.file_name).toBe('chat.jsonl');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,167 @@
|
||||
import { beforeAll, beforeEach, afterEach, describe, test, expect } from '@jest/globals';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
|
||||
// chats.js reads these config values at module load. Environment variables take
|
||||
// precedence over config.yaml, so setting them here lets the module import
|
||||
// without a config file present. The throttle interval is zeroed so lodash
|
||||
// throttle timers don't keep the Jest process alive.
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_ENABLED = 'false';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_MAXTOTALBACKUPS = '-1';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_THROTTLEINTERVAL = '0';
|
||||
process.env.SILLYTAVERN_BACKUPS_CHAT_CHECKINTEGRITY = 'true';
|
||||
|
||||
/** @type {import('../src/endpoints/chats.js')} */
|
||||
let chats;
|
||||
|
||||
beforeAll(async () => {
|
||||
chats = await import('../src/endpoints/chats.js');
|
||||
});
|
||||
|
||||
const BOM = String.fromCharCode(0xFEFF);
|
||||
const SLUG = '1e6905db-bab6-4901-913b-06d18cab5a8f';
|
||||
const OTHER_SLUG = 'f1c1d103-464a-418a-a643-f9dab81589b9';
|
||||
|
||||
/**
|
||||
* Builds a chat array like the client sends it.
|
||||
* @param {string|null} slug Integrity slug for the header, or null for none
|
||||
* @returns {object[]} Chat array
|
||||
*/
|
||||
function makeChat(slug) {
|
||||
const metadata = slug ? { integrity: slug } : {};
|
||||
return [
|
||||
{ user_name: 'User', character_name: 'Char', chat_metadata: metadata },
|
||||
{ name: 'Char', is_user: false, mes: 'Hello' },
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Serializes a chat array the same way trySaveChat does.
|
||||
* @param {object[]} chatData Chat array
|
||||
* @returns {string} JSONL string
|
||||
*/
|
||||
function toJsonl(chatData) {
|
||||
return chatData.map(m => JSON.stringify(m)).join('\n');
|
||||
}
|
||||
|
||||
describe('trySaveChat integrity check', () => {
|
||||
let tmpDir;
|
||||
let chatFile;
|
||||
let backupDir;
|
||||
|
||||
beforeEach(() => {
|
||||
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'st-chat-integrity-'));
|
||||
chatFile = path.join(tmpDir, 'chat.jsonl');
|
||||
backupDir = path.join(tmpDir, 'backups');
|
||||
fs.mkdirSync(backupDir);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
fs.rmSync(tmpDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
function save(chatData, { force = false } = {}) {
|
||||
return chats.trySaveChat(chatData, chatFile, force, 'default-user', 'Char', backupDir);
|
||||
}
|
||||
|
||||
test('writes a new file when none exists', async () => {
|
||||
const chatData = makeChat(SLUG);
|
||||
await save(chatData);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(chatData));
|
||||
});
|
||||
|
||||
test('overwrites when the integrity slug matches', async () => {
|
||||
fs.writeFileSync(chatFile, toJsonl(makeChat(SLUG)));
|
||||
const newChat = makeChat(SLUG);
|
||||
newChat[1].mes = 'Updated';
|
||||
await save(newChat);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(newChat));
|
||||
});
|
||||
|
||||
test('refuses to overwrite when the integrity slug mismatches and keeps the original bytes', async () => {
|
||||
const originalBytes = toJsonl(makeChat(SLUG));
|
||||
fs.writeFileSync(chatFile, originalBytes);
|
||||
await expect(save(makeChat(OTHER_SLUG))).rejects.toThrow(/integrity check failed/i);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(originalBytes);
|
||||
});
|
||||
|
||||
test('overwrites a legacy chat whose header has no integrity metadata', async () => {
|
||||
const legacyHeader = JSON.stringify({ user_name: 'User', character_name: 'Char', create_date: '2023-01-01' });
|
||||
fs.writeFileSync(chatFile, legacyHeader + '\n' + JSON.stringify({ name: 'Char', mes: 'Old' }));
|
||||
const newChat = makeChat(SLUG);
|
||||
await save(newChat);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(newChat));
|
||||
});
|
||||
|
||||
test('overwrites an empty file', async () => {
|
||||
fs.writeFileSync(chatFile, '');
|
||||
const newChat = makeChat(SLUG);
|
||||
await save(newChat);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(newChat));
|
||||
});
|
||||
|
||||
test('refuses to overwrite a non-empty file with an unparseable first line and keeps the original bytes', async () => {
|
||||
const originalBytes = 'this is not json{{{';
|
||||
fs.writeFileSync(chatFile, originalBytes);
|
||||
await expect(save(makeChat(SLUG))).rejects.toThrow(/integrity check failed/i);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(originalBytes);
|
||||
});
|
||||
|
||||
test('refuses to overwrite a truncated header and keeps the original bytes', async () => {
|
||||
const originalBytes = toJsonl(makeChat(SLUG)).slice(0, 25);
|
||||
fs.writeFileSync(chatFile, originalBytes);
|
||||
await expect(save(makeChat(SLUG))).rejects.toThrow(/integrity check failed/i);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(originalBytes);
|
||||
});
|
||||
|
||||
test('refuses to overwrite when the first line parses to a non-object', async () => {
|
||||
const originalBytes = '42\n' + JSON.stringify({ name: 'Char', mes: 'Orphan' });
|
||||
fs.writeFileSync(chatFile, originalBytes);
|
||||
await expect(save(makeChat(SLUG))).rejects.toThrow(/integrity check failed/i);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(originalBytes);
|
||||
});
|
||||
|
||||
test('refuses to overwrite when the file starts with a blank line but has content below', async () => {
|
||||
const originalBytes = '\n' + toJsonl(makeChat(SLUG));
|
||||
fs.writeFileSync(chatFile, originalBytes);
|
||||
await expect(save(makeChat(SLUG))).rejects.toThrow(/integrity check failed/i);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(originalBytes);
|
||||
});
|
||||
|
||||
test('ignores a UTF-8 BOM in front of a valid matching header', async () => {
|
||||
fs.writeFileSync(chatFile, BOM + toJsonl(makeChat(SLUG)));
|
||||
const newChat = makeChat(SLUG);
|
||||
newChat[1].mes = 'Updated';
|
||||
await save(newChat);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(newChat));
|
||||
});
|
||||
|
||||
test('still checks the integrity slug behind a UTF-8 BOM', async () => {
|
||||
const originalBytes = BOM + toJsonl(makeChat(SLUG));
|
||||
fs.writeFileSync(chatFile, originalBytes);
|
||||
await expect(save(makeChat(OTHER_SLUG))).rejects.toThrow(/integrity check failed/i);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(originalBytes);
|
||||
});
|
||||
|
||||
test('force overwrites a corrupted file when the user confirmed', async () => {
|
||||
fs.writeFileSync(chatFile, 'this is not json{{{');
|
||||
const newChat = makeChat(SLUG);
|
||||
await save(newChat, { force: true });
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(newChat));
|
||||
});
|
||||
|
||||
test('force overwrites a mismatching file when the user confirmed', async () => {
|
||||
fs.writeFileSync(chatFile, toJsonl(makeChat(SLUG)));
|
||||
const newChat = makeChat(OTHER_SLUG);
|
||||
await save(newChat, { force: true });
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(newChat));
|
||||
});
|
||||
|
||||
test('skips the check when the incoming chat has no integrity slug (existing behavior)', async () => {
|
||||
fs.writeFileSync(chatFile, toJsonl(makeChat(SLUG)));
|
||||
const newChat = makeChat(null);
|
||||
await save(newChat);
|
||||
expect(fs.readFileSync(chatFile, 'utf8')).toBe(toJsonl(newChat));
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { afterEach, beforeEach, describe, expect, jest, test } from '@jest/globals';
|
||||
import { addMissingConfigValues } from '../src/config-init.js';
|
||||
|
||||
const oldEnvKey = 'SILLYTAVERN_DISABLETHUMBNAILS';
|
||||
const newEnvKey = 'SILLYTAVERN_THUMBNAILS_ENABLED';
|
||||
|
||||
describe('addMissingConfigValues', () => {
|
||||
let tempDirectory;
|
||||
let configPath;
|
||||
|
||||
beforeEach(() => {
|
||||
tempDirectory = fs.mkdtempSync(path.join(os.tmpdir(), 'sillytavern-config-'));
|
||||
configPath = path.join(tempDirectory, 'config.yaml');
|
||||
fs.writeFileSync(configPath, '{}\n');
|
||||
delete process.env[oldEnvKey];
|
||||
delete process.env[newEnvKey];
|
||||
jest.spyOn(console, 'log').mockImplementation(() => {});
|
||||
jest.spyOn(console, 'warn').mockImplementation(() => {});
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
delete process.env[oldEnvKey];
|
||||
delete process.env[newEnvKey];
|
||||
fs.rmSync(tempDirectory, { recursive: true, force: true });
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
test.each([
|
||||
['false', 'true'],
|
||||
['true', 'false'],
|
||||
])('migrates the boolean environment value %s to %s', (oldValue, newValue) => {
|
||||
process.env[oldEnvKey] = oldValue;
|
||||
|
||||
addMissingConfigValues(configPath);
|
||||
|
||||
expect(process.env[newEnvKey]).toBe(newValue);
|
||||
expect(process.env[oldEnvKey]).toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,63 @@
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import process from 'node:process';
|
||||
import { afterAll, beforeAll, describe, expect, test } from '@jest/globals';
|
||||
|
||||
// extensions.js reads these config values at module load or per request; the env var
|
||||
// overrides avoid needing a config.yaml in the test environment
|
||||
process.env.SILLYTAVERN_GIT_BACKEND = 'auto';
|
||||
process.env.SILLYTAVERN_EXTENSIONS_ENABLED = 'true';
|
||||
|
||||
// The extensions endpoint resolves the built-in extensions folder relative to the repo root
|
||||
const originalCwd = process.cwd();
|
||||
beforeAll(() => process.chdir(path.resolve(originalCwd, '..')));
|
||||
afterAll(() => process.chdir(originalCwd));
|
||||
|
||||
describe('extensions discover', () => {
|
||||
/** @type {import('node:http').Server} */
|
||||
let server;
|
||||
let baseUrl;
|
||||
let userExtensionsDir;
|
||||
|
||||
beforeAll(async () => {
|
||||
userExtensionsDir = fs.mkdtempSync(path.join(os.tmpdir(), 'st-extensions-'));
|
||||
|
||||
// A valid extension with a manifest
|
||||
fs.mkdirSync(path.join(userExtensionsDir, 'Valid-Extension'));
|
||||
fs.writeFileSync(path.join(userExtensionsDir, 'Valid-Extension', 'manifest.json'), JSON.stringify({ display_name: 'Valid' }));
|
||||
|
||||
// A leftover folder without a manifest (e.g. locked .git remnant after manual deletion)
|
||||
fs.mkdirSync(path.join(userExtensionsDir, 'Deleted-Husk'));
|
||||
fs.mkdirSync(path.join(userExtensionsDir, 'Deleted-Husk', '.git'));
|
||||
|
||||
const { default: express } = await import('express');
|
||||
const { router } = await import('../src/endpoints/extensions.js');
|
||||
const app = express();
|
||||
app.use((req, _res, next) => {
|
||||
req.user = {
|
||||
profile: { handle: 'test-user' },
|
||||
directories: { extensions: userExtensionsDir },
|
||||
};
|
||||
next();
|
||||
});
|
||||
app.use(router);
|
||||
server = app.listen(0, '127.0.0.1');
|
||||
await new Promise(resolve => server.once('listening', resolve));
|
||||
baseUrl = `http://127.0.0.1:${server.address().port}`;
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await new Promise((resolve, reject) => server.close(error => error ? reject(error) : resolve()));
|
||||
fs.rmSync(userExtensionsDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
test('lists folders with a manifest and skips folders without one', async () => {
|
||||
const response = await fetch(`${baseUrl}/discover`);
|
||||
expect(response.status).toBe(200);
|
||||
const extensions = await response.json();
|
||||
const names = extensions.map(x => x.name);
|
||||
expect(names).toContain('third-party/Valid-Extension');
|
||||
expect(names).not.toContain('third-party/Deleted-Husk');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,106 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { testSetup } from './frontent-test-utils.js';
|
||||
|
||||
test.describe('/addswipe without chat reload', () => {
|
||||
test.beforeEach(testSetup.awaitST);
|
||||
|
||||
test('adds swipes in place without reloading the chat', async ({ page }) => {
|
||||
const result = await page.evaluate(async () => {
|
||||
const { newAssistantChat } = await import('./script.js');
|
||||
const ctx = window.SillyTavern.getContext();
|
||||
const commands = ctx.SlashCommandParser.commands;
|
||||
const args = { quiet: 'true' };
|
||||
const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
|
||||
|
||||
async function waitFor(condition, timeoutMs = 5000, intervalMs = 50) {
|
||||
const start = Date.now();
|
||||
while (Date.now() - start < timeoutMs) {
|
||||
if (condition()) return true;
|
||||
await delay(intervalMs);
|
||||
}
|
||||
throw new Error('Timed out waiting for condition');
|
||||
}
|
||||
|
||||
// A fresh account runs onboarding on load: dismiss its popup and wait for the
|
||||
// welcome messages to finish arriving, so they don't land inside the test chat.
|
||||
for (let i = 0; i < 10; i++) {
|
||||
const okButton = document.querySelector('.popup:popover-open .popup-button-ok, dialog[open] .popup-button-ok');
|
||||
if (!okButton) break;
|
||||
okButton.click();
|
||||
await delay(300);
|
||||
}
|
||||
const chat = ctx.chat;
|
||||
let settledLength = -1;
|
||||
await waitFor(() => {
|
||||
const stable = chat.length === settledLength;
|
||||
settledLength = chat.length;
|
||||
return stable;
|
||||
}, 10000, 700);
|
||||
|
||||
await newAssistantChat({ temporary: true });
|
||||
const message = {
|
||||
name: 'Assistant',
|
||||
is_user: false,
|
||||
is_system: false,
|
||||
send_date: new Date().toISOString(),
|
||||
mes: 'Original greeting',
|
||||
extra: {},
|
||||
};
|
||||
chat.push(message);
|
||||
await ctx.addOneMessage(message);
|
||||
const mesId = chat.length - 1;
|
||||
await waitFor(() => document.querySelector(`.mes[mesid="${mesId}"]`) !== null);
|
||||
const mesDiv = document.querySelector(`.mes[mesid="${mesId}"]`);
|
||||
// A full chat reload replaces the message elements, so element identity
|
||||
// and ad-hoc DOM state prove the chat was updated in place.
|
||||
mesDiv.dataset.tempUiState = 'alive';
|
||||
const domAlive = () => mesDiv.isConnected && mesDiv.dataset.tempUiState === 'alive';
|
||||
const counter = () => document.querySelector(`.mes[mesid="${mesId}"] .swipes-counter`)
|
||||
?.textContent?.replace(/\u200b/g, '')?.trim();
|
||||
|
||||
const noSwitch = { returned: await commands['addswipe'].callback({ ...args }, 'Added swipe A') };
|
||||
await delay(500);
|
||||
Object.assign(noSwitch, {
|
||||
swipes: chat[mesId].swipes.length,
|
||||
swipeId: chat[mesId].swipe_id,
|
||||
mes: chat[mesId].mes,
|
||||
domAlive: domAlive(),
|
||||
counter: counter(),
|
||||
});
|
||||
|
||||
const warnings = [];
|
||||
const origWarning = window.toastr.warning;
|
||||
window.toastr.warning = (msg, ...rest) => { warnings.push(String(msg)); return origWarning.call(window.toastr, msg, ...rest); };
|
||||
const preSwitchState = { len: chat.length, last: { name: chat[chat.length - 1]?.name, is_user: chat[chat.length - 1]?.is_user, is_system: chat[chat.length - 1]?.is_system, mes: chat[chat.length - 1]?.mes?.slice(0, 30) } };
|
||||
const withSwitch = { returned: await commands['addswipe'].callback({ ...args, switch: 'true' }, 'Added swipe B') };
|
||||
window.toastr.warning = origWarning;
|
||||
withSwitch.debug = { preSwitchState, warnings };
|
||||
await delay(1000);
|
||||
Object.assign(withSwitch, {
|
||||
swipes: chat[mesId].swipes.length,
|
||||
swipeId: chat[mesId].swipe_id,
|
||||
mes: chat[mesId].mes,
|
||||
domAlive: domAlive(),
|
||||
counter: counter(),
|
||||
visibleText: document.querySelector(`.mes[mesid="${mesId}"] .mes_text`)?.textContent?.trim(),
|
||||
});
|
||||
|
||||
return { noSwitch, withSwitch };
|
||||
});
|
||||
|
||||
expect(result.noSwitch.returned).toBe('1');
|
||||
expect(result.noSwitch.swipes).toBe(2);
|
||||
expect(result.noSwitch.swipeId).toBe(0);
|
||||
expect(result.noSwitch.mes).toBe('Original greeting');
|
||||
expect(result.noSwitch.domAlive).toBe(true);
|
||||
expect(result.noSwitch.counter).toBe('1/2');
|
||||
|
||||
expect(result.withSwitch.returned, JSON.stringify(result.withSwitch.debug)).toBe('2');
|
||||
expect(result.withSwitch.swipes).toBe(3);
|
||||
expect(result.withSwitch.swipeId).toBe(2);
|
||||
expect(result.withSwitch.mes).toBe('Added swipe B');
|
||||
expect(result.withSwitch.domAlive).toBe(true);
|
||||
expect(result.withSwitch.counter).toBe('3/3');
|
||||
expect(result.withSwitch.visibleText).toBe('Added swipe B');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,76 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { testSetup } from './frontent-test-utils.js';
|
||||
|
||||
test.describe('deleting assistant messages with tool calls', () => {
|
||||
test.beforeEach(testSetup.awaitST);
|
||||
|
||||
test('deletes preceding tool calls unless explicitly disabled', async ({ page }) => {
|
||||
const result = await page.evaluate(async () => {
|
||||
const { addOneMessage, chat, deleteMessage, newAssistantChat } = await import('./script.js');
|
||||
const commands = window.SillyTavern.getContext().SlashCommandParser.commands;
|
||||
const testMessages = new Set(['Run a tool', 'Tool result', 'Done']);
|
||||
const snapshot = () => chat
|
||||
.filter(message => testMessages.has(message.mes))
|
||||
.map(message => ({
|
||||
mes: message.mes,
|
||||
toolCall: Array.isArray(message.extra?.tool_invocations),
|
||||
}));
|
||||
|
||||
const addMessages = async () => {
|
||||
const messages = [
|
||||
{ name: 'User', is_user: true, is_system: false, mes: 'Run a tool', extra: {} },
|
||||
{
|
||||
name: 'System',
|
||||
is_user: false,
|
||||
is_system: true,
|
||||
mes: 'Tool result',
|
||||
extra: { isSmallSys: true, tool_invocations: [{ id: 'call-1', name: 'lookup' }] },
|
||||
},
|
||||
{ name: 'Assistant', is_user: false, is_system: false, mes: 'Done', extra: {} },
|
||||
];
|
||||
for (const message of messages) {
|
||||
chat.push(message);
|
||||
await addOneMessage(message);
|
||||
}
|
||||
};
|
||||
|
||||
await newAssistantChat({ temporary: true });
|
||||
await addMessages();
|
||||
await deleteMessage(chat.length - 1, undefined, false);
|
||||
const automatic = snapshot();
|
||||
|
||||
await newAssistantChat({ temporary: true });
|
||||
await addMessages();
|
||||
await commands.cut.callback({ toolcalls: 'false' }, String(chat.length - 1));
|
||||
const disabled = snapshot();
|
||||
|
||||
await newAssistantChat({ temporary: true });
|
||||
await addMessages();
|
||||
chat.push({ name: 'Assistant', is_user: false, is_system: false, mes: 'Later', extra: {} });
|
||||
await addOneMessage(chat.at(-1));
|
||||
await commands.del.callback({ toolcalls: 'true' }, '2');
|
||||
const range = chat
|
||||
.filter(message => new Set([...testMessages, 'Later']).has(message.mes))
|
||||
.map(message => message.mes);
|
||||
|
||||
await newAssistantChat({ temporary: true });
|
||||
await addMessages();
|
||||
document.querySelector('#option_delete_mes').click();
|
||||
await new Promise(resolve => setTimeout(resolve, 200));
|
||||
document.querySelector(`.mes[mesid="${chat.length - 1}"]`).click();
|
||||
document.querySelector('#dialogue_del_mes_ok').click();
|
||||
await new Promise(resolve => setTimeout(resolve, 50));
|
||||
const deleteMode = snapshot();
|
||||
|
||||
return { automatic, deleteMode, disabled, range };
|
||||
});
|
||||
|
||||
expect(result.automatic).toEqual([{ mes: 'Run a tool', toolCall: false }]);
|
||||
expect(result.disabled).toEqual([
|
||||
{ mes: 'Run a tool', toolCall: false },
|
||||
{ mes: 'Tool result', toolCall: true },
|
||||
]);
|
||||
expect(result.range).toEqual(['Run a tool']);
|
||||
expect(result.deleteMode).toEqual([{ mes: 'Run a tool', toolCall: false }]);
|
||||
});
|
||||
});
|
||||
@@ -124,6 +124,44 @@ test.describe('MacroEngine', () => {
|
||||
const output = await evaluateWithEngine(page, input);
|
||||
expect(output).toBe('StartEnd');
|
||||
});
|
||||
|
||||
test.describe('Scoped comment macro', () => {
|
||||
test('should remove scoped comment block (basic)', async ({ page }) => {
|
||||
const input = 'Before{{//}}This entire block is a comment.{{///}}After';
|
||||
const output = await evaluateWithEngine(page, input);
|
||||
expect(output).toBe('BeforeAfter');
|
||||
});
|
||||
|
||||
test('should remove scoped comment block spanning multiple lines', async ({ page }) => {
|
||||
const input = 'Start\n{{//}}\n This entire block is a comment.\n It can span multiple lines.\n{{///}}\nEnd';
|
||||
const output = await evaluateWithEngine(page, input);
|
||||
expect(output).toBe('Start\n\nEnd');
|
||||
});
|
||||
|
||||
test('should remove scoped comment block with extra slashes in closing tag', async ({ page }) => {
|
||||
const input = 'A{{//}}ignored{{////}}B';
|
||||
const output = await evaluateWithEngine(page, input);
|
||||
expect(output).toBe('AB');
|
||||
});
|
||||
|
||||
test('should remove scoped comment block with macros inside (macros not evaluated)', async ({ page }) => {
|
||||
const input = 'X{{//}}{{user}} should be ignored{{///}}Y';
|
||||
const output = await evaluateWithEngine(page, input);
|
||||
expect(output).toBe('XY');
|
||||
});
|
||||
|
||||
test('should not treat bare {{//}} without matching closer as scoped', async ({ page }) => {
|
||||
const input = 'A{{// just a comment}}B';
|
||||
const output = await evaluateWithEngine(page, input);
|
||||
expect(output).toBe('AB');
|
||||
});
|
||||
|
||||
test('should handle scoped comment adjacent to other text and macros', async ({ page }) => {
|
||||
const input = '{{user}}{{//}}ignored block{{///}}{{user}}';
|
||||
const output = await evaluateWithEngine(page, input);
|
||||
expect(output).toBe('UserUser');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Trim macro', () => {
|
||||
|
||||
@@ -508,6 +508,49 @@ test.describe('MacroLexer', () => {
|
||||
expect(tokens).toEqual(expectedTokens);
|
||||
});
|
||||
// TODO: test invalid argument name identifiers
|
||||
|
||||
// REGRESSION TEST: https://github.com/SillyTavern/SillyTavern/issues/5618
|
||||
// {{setvar::foo::|bar}} - pipe character should NOT be treated as Filter.Pipe (which breaks parsing)
|
||||
test('should handle pipe character in argument values (issue #5618)', async ({ page }) => {
|
||||
const input = '{{setvar::foo::|bar}}';
|
||||
const tokens = await runLexerGetTokens(page, input);
|
||||
|
||||
const expectedTokens = [
|
||||
{ type: 'Macro.Start', text: '{{' },
|
||||
{ type: 'Macro.Identifier', text: 'setvar' },
|
||||
{ type: 'Args.DoubleColon', text: '::' },
|
||||
{ type: 'Identifier', text: 'foo' },
|
||||
{ type: 'Args.DoubleColon', text: '::' },
|
||||
// Pipe is captured as Unknown (not Filter.Pipe), which allows the macro to parse correctly
|
||||
{ type: 'Unknown', text: '|' },
|
||||
{ type: 'Identifier', text: 'bar' },
|
||||
{ type: 'Macro.End', text: '}}' },
|
||||
];
|
||||
|
||||
expect(tokens).toEqual(expectedTokens);
|
||||
});
|
||||
|
||||
// Test multiple pipes in argument values
|
||||
test('should handle multiple pipe characters in argument values', async ({ page }) => {
|
||||
const input = '{{setvar::key::a|b|c}}';
|
||||
const tokens = await runLexerGetTokens(page, input);
|
||||
|
||||
const expectedTokens = [
|
||||
{ type: 'Macro.Start', text: '{{' },
|
||||
{ type: 'Macro.Identifier', text: 'setvar' },
|
||||
{ type: 'Args.DoubleColon', text: '::' },
|
||||
{ type: 'Identifier', text: 'key' },
|
||||
{ type: 'Args.DoubleColon', text: '::' },
|
||||
{ type: 'Identifier', text: 'a' },
|
||||
{ type: 'Unknown', text: '|' },
|
||||
{ type: 'Identifier', text: 'b' },
|
||||
{ type: 'Unknown', text: '|' },
|
||||
{ type: 'Identifier', text: 'c' },
|
||||
{ type: 'Macro.End', text: '}}' },
|
||||
];
|
||||
|
||||
expect(tokens).toEqual(expectedTokens);
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Macro Execution Modifiers', () => {
|
||||
@@ -931,7 +974,8 @@ test.describe('MacroLexer', () => {
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Macro Output Modifiers', () => {
|
||||
// SKIPPED: Pipe/filter feature temporarily disabled. See https://github.com/SillyTavern/SillyTavern/issues/5618
|
||||
test.describe.skip('Macro Output Modifiers', () => {
|
||||
// {{macro | outputModifier}}
|
||||
test('should support output modifier without arguments', async ({ page }) => {
|
||||
const input = '{{macro | outputModifier}}';
|
||||
|
||||
@@ -0,0 +1,323 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { testSetup } from './frontent-test-utils.js';
|
||||
|
||||
/**
|
||||
* @typedef {import('../../public/scripts/message-formatter.js').MessageFormattingContext} MessageFormattingContext
|
||||
*/
|
||||
|
||||
test.describe('MessageFormatter', () => {
|
||||
// message-formatter.js imports script.js, which requires the full ST module
|
||||
// graph to be settled before dynamic import works (otherwise hits SlashCommandParser TDZ).
|
||||
test.beforeEach(testSetup.awaitST);
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// Module exports & singleton
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
test.describe('Module exports & singleton', () => {
|
||||
test('should export formatting_stage with expected keys', async ({ page }) => {
|
||||
const stage = await page.evaluate(async () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { formatting_stage } = await import('./scripts/message-formatter.js');
|
||||
return formatting_stage;
|
||||
});
|
||||
|
||||
expect(stage).toEqual({
|
||||
BEFORE_REGEX: 'beforeRegex',
|
||||
AFTER_REGEX: 'afterRegex',
|
||||
AFTER_MARKDOWN: 'afterMarkdown',
|
||||
});
|
||||
});
|
||||
|
||||
test('should export hook_order with expected keys', async ({ page }) => {
|
||||
const order = await page.evaluate(async () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { hook_order } = await import('./scripts/message-formatter.js');
|
||||
return hook_order;
|
||||
});
|
||||
|
||||
expect(order).toMatchObject({
|
||||
EARLIEST: 0,
|
||||
EARLY: 10,
|
||||
NORMAL: 50,
|
||||
LATE: 90,
|
||||
LATEST: 100,
|
||||
});
|
||||
});
|
||||
|
||||
test('should expose stage and order constants on the instance', async ({ page }) => {
|
||||
const result = await page.evaluate(async () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage, hook_order } = await import('./scripts/message-formatter.js');
|
||||
return {
|
||||
stageMatches: JSON.stringify(MessageFormatter.stage) === JSON.stringify(formatting_stage),
|
||||
orderMatches: JSON.stringify(MessageFormatter.order) === JSON.stringify(hook_order),
|
||||
};
|
||||
});
|
||||
|
||||
expect(result.stageMatches).toBe(true);
|
||||
expect(result.orderMatches).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// addHook — registration validation
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
test.describe('addHook — registration validation', () => {
|
||||
test('should throw TypeError when registering a non-function hook', async ({ page }) => {
|
||||
const errorMessage = await page.evaluate(async () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { formatting_stage } = await import('./scripts/message-formatter.js');
|
||||
|
||||
// Use a fresh MessageFormatter instance so we don't pollute the singleton
|
||||
const { MessageFormatter: MF } = await import('./scripts/message-formatter.js');
|
||||
try {
|
||||
// @ts-ignore intentional misuse
|
||||
MF.addHook('not a function', { stage: formatting_stage.AFTER_MARKDOWN });
|
||||
return null;
|
||||
} catch (e) {
|
||||
return { name: e.name, message: e.message };
|
||||
}
|
||||
});
|
||||
|
||||
expect(errorMessage).not.toBeNull();
|
||||
expect(errorMessage.name).toBe('TypeError');
|
||||
});
|
||||
|
||||
test('should throw TypeError when registering an async hook', async ({ page }) => {
|
||||
const errorMessage = await page.evaluate(async () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter } = await import('./scripts/message-formatter.js');
|
||||
try {
|
||||
MessageFormatter.addHook(async (mes) => mes);
|
||||
return null;
|
||||
} catch (e) {
|
||||
return { name: e.name, message: e.message };
|
||||
}
|
||||
});
|
||||
|
||||
expect(errorMessage).not.toBeNull();
|
||||
expect(errorMessage.name).toBe('TypeError');
|
||||
expect(errorMessage.message).toContain('synchronous');
|
||||
});
|
||||
|
||||
test('should throw RangeError when registering a hook with an unknown stage', async ({ page }) => {
|
||||
const errorMessage = await page.evaluate(async () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter } = await import('./scripts/message-formatter.js');
|
||||
try {
|
||||
// @ts-ignore intentional misuse
|
||||
MessageFormatter.addHook((mes) => mes, { stage: 'nonExistentStage' });
|
||||
return null;
|
||||
} catch (e) {
|
||||
return { name: e.name, message: e.message };
|
||||
}
|
||||
});
|
||||
|
||||
expect(errorMessage).not.toBeNull();
|
||||
expect(errorMessage.name).toBe('RangeError');
|
||||
expect(errorMessage.message).toContain('nonExistentStage');
|
||||
});
|
||||
|
||||
test('should successfully register a valid synchronous hook', async ({ page }) => {
|
||||
const threw = await page.evaluate(async () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter } = await import('./scripts/message-formatter.js');
|
||||
try {
|
||||
MessageFormatter.addHook((mes) => mes);
|
||||
return false;
|
||||
} catch {
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
expect(threw).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// runStage — hook execution
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
test.describe('runStage — hook execution', () => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js').MessageFormattingBase} */
|
||||
const BASE_CTX = { ch_name: 'Test', isSystem: false, isUser: false, messageId: 1, isReasoning: false };
|
||||
|
||||
test('should return the message unchanged when no hooks are registered for a stage', async ({ page }) => {
|
||||
// Use a unique tag that no registered hook could produce so the result
|
||||
// is deterministic regardless of hooks other tests added to the singleton.
|
||||
const TAG = `__mf_test_nohooks_${Date.now()}`;
|
||||
const output = await page.evaluate(async ({ base, tag }) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage } = await import('./scripts/message-formatter.js');
|
||||
// No hook is registered that would append/modify `tag`, so it must come back unchanged.
|
||||
return MessageFormatter.runStage(formatting_stage.AFTER_MARKDOWN, tag, base);
|
||||
}, { base: BASE_CTX, tag: TAG });
|
||||
|
||||
expect(output).toBe(TAG);
|
||||
});
|
||||
|
||||
test('should apply a registered hook and return the transformed text', async ({ page }) => {
|
||||
const TAG = `__mf_test_transform_${Date.now()}`;
|
||||
const output = await page.evaluate(async ({ base, tag }) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage } = await import('./scripts/message-formatter.js');
|
||||
MessageFormatter.addHook((mes) => mes + tag, { stage: formatting_stage.BEFORE_REGEX });
|
||||
return MessageFormatter.runStage(formatting_stage.BEFORE_REGEX, 'hello', base);
|
||||
}, { base: BASE_CTX, tag: TAG });
|
||||
|
||||
expect(output).toBe(`hello${TAG}`);
|
||||
});
|
||||
|
||||
test('should pass an immutable frozen context to hooks', async ({ page }) => {
|
||||
const result = await page.evaluate(async (base) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage } = await import('./scripts/message-formatter.js');
|
||||
|
||||
let receivedCtx = null;
|
||||
let isFrozen = false;
|
||||
|
||||
MessageFormatter.addHook((mes, ctx) => {
|
||||
receivedCtx = { ...ctx };
|
||||
isFrozen = Object.isFrozen(ctx);
|
||||
return mes;
|
||||
}, { stage: formatting_stage.AFTER_REGEX });
|
||||
|
||||
MessageFormatter.runStage(formatting_stage.AFTER_REGEX, 'text', base);
|
||||
|
||||
return { receivedCtx, isFrozen };
|
||||
}, BASE_CTX);
|
||||
|
||||
expect(result.receivedCtx.stage).toBe('afterRegex');
|
||||
expect(result.receivedCtx.ch_name).toBe(BASE_CTX.ch_name);
|
||||
expect(result.isFrozen).toBe(true);
|
||||
});
|
||||
|
||||
test('should inject the correct stage into the context', async ({ page }) => {
|
||||
const stages = await page.evaluate(async (base) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage } = await import('./scripts/message-formatter.js');
|
||||
|
||||
const seen = [];
|
||||
const hook = (mes, ctx) => { seen.push(ctx.stage); return mes; };
|
||||
|
||||
MessageFormatter.addHook(hook, { stage: formatting_stage.BEFORE_REGEX });
|
||||
MessageFormatter.addHook(hook, { stage: formatting_stage.AFTER_REGEX });
|
||||
MessageFormatter.addHook(hook, { stage: formatting_stage.AFTER_MARKDOWN });
|
||||
|
||||
MessageFormatter.runStage(formatting_stage.BEFORE_REGEX, 'a', base);
|
||||
MessageFormatter.runStage(formatting_stage.AFTER_REGEX, 'b', base);
|
||||
MessageFormatter.runStage(formatting_stage.AFTER_MARKDOWN, 'c', base);
|
||||
|
||||
return seen;
|
||||
}, BASE_CTX);
|
||||
|
||||
expect(stages).toContain('beforeRegex');
|
||||
expect(stages).toContain('afterRegex');
|
||||
expect(stages).toContain('afterMarkdown');
|
||||
});
|
||||
|
||||
test('should run hooks in ascending order within a stage', async ({ page }) => {
|
||||
const TAG = `__mf_test_order_${Date.now()}`;
|
||||
const output = await page.evaluate(async ({ base, tag }) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage, hook_order } = await import('./scripts/message-formatter.js');
|
||||
|
||||
MessageFormatter.addHook((mes) => mes + `[late${tag}]`, { stage: formatting_stage.AFTER_MARKDOWN, order: hook_order.LATE });
|
||||
MessageFormatter.addHook((mes) => mes + `[early${tag}]`, { stage: formatting_stage.AFTER_MARKDOWN, order: hook_order.EARLY });
|
||||
MessageFormatter.addHook((mes) => mes + `[normal${tag}]`, { stage: formatting_stage.AFTER_MARKDOWN, order: hook_order.NORMAL });
|
||||
|
||||
return MessageFormatter.runStage(formatting_stage.AFTER_MARKDOWN, '', base);
|
||||
}, { base: BASE_CTX, tag: TAG });
|
||||
|
||||
// early → normal → late
|
||||
const earlyIdx = output.indexOf(`[early${TAG}]`);
|
||||
const normalIdx = output.indexOf(`[normal${TAG}]`);
|
||||
const lateIdx = output.indexOf(`[late${TAG}]`);
|
||||
expect(earlyIdx).toBeLessThan(normalIdx);
|
||||
expect(normalIdx).toBeLessThan(lateIdx);
|
||||
});
|
||||
|
||||
test('should continue pipeline and skip a hook that throws', async ({ page }) => {
|
||||
const TAG = `__mf_test_throw_${Date.now()}`;
|
||||
const output = await page.evaluate(async ({ base, tag }) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage, hook_order } = await import('./scripts/message-formatter.js');
|
||||
|
||||
// Hook 1: throws
|
||||
MessageFormatter.addHook(() => { throw new Error('intentional test error'); }, {
|
||||
stage: formatting_stage.BEFORE_REGEX,
|
||||
order: hook_order.EARLY,
|
||||
});
|
||||
// Hook 2: appends tag to prove it still ran
|
||||
MessageFormatter.addHook((mes) => mes + tag, {
|
||||
stage: formatting_stage.BEFORE_REGEX,
|
||||
order: hook_order.LATE,
|
||||
});
|
||||
|
||||
return MessageFormatter.runStage(formatting_stage.BEFORE_REGEX, 'base', base);
|
||||
}, { base: BASE_CTX, tag: TAG });
|
||||
|
||||
expect(output).toBe(`base${TAG}`);
|
||||
});
|
||||
|
||||
test('should ignore a hook that returns a non-string and keep the previous text', async ({ page }) => {
|
||||
const TAG = `__mf_test_nonstring_${Date.now()}`;
|
||||
const result = await page.evaluate(async ({ base, tag }) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage, hook_order } = await import('./scripts/message-formatter.js');
|
||||
|
||||
const warnings = [];
|
||||
const origWarn = console.warn.bind(console);
|
||||
console.warn = (...args) => { warnings.push(args.join(' ')); origWarn(...args); };
|
||||
|
||||
// Hook 1: returns undefined (bad hook)
|
||||
MessageFormatter.addHook(() => undefined, {
|
||||
stage: formatting_stage.AFTER_REGEX,
|
||||
order: hook_order.EARLY,
|
||||
});
|
||||
// Hook 2: valid, appends tag
|
||||
MessageFormatter.addHook((mes) => mes + tag, {
|
||||
stage: formatting_stage.AFTER_REGEX,
|
||||
order: hook_order.LATE,
|
||||
});
|
||||
|
||||
const output = MessageFormatter.runStage(formatting_stage.AFTER_REGEX, 'original', base);
|
||||
|
||||
console.warn = origWarn;
|
||||
return { output, hasWarning: warnings.some(w => w.includes('undefined')) };
|
||||
}, { base: BASE_CTX, tag: TAG });
|
||||
|
||||
expect(result.output).toBe(`original${TAG}`);
|
||||
expect(result.hasWarning).toBe(true);
|
||||
});
|
||||
|
||||
test('should warn and keep text when a hook returns a Promise (simulated async escape)', async ({ page }) => {
|
||||
const result = await page.evaluate(async (base) => {
|
||||
/** @type {import('../../public/scripts/message-formatter.js')} */
|
||||
const { MessageFormatter, formatting_stage } = await import('./scripts/message-formatter.js');
|
||||
|
||||
const warnings = [];
|
||||
const origWarn = console.warn.bind(console);
|
||||
console.warn = (...args) => { warnings.push(args.join(' ')); origWarn(...args); };
|
||||
|
||||
// Bypasses registration check by wrapping async call inside a sync function
|
||||
MessageFormatter.addHook(() => Promise.resolve('sneaky async'), {
|
||||
stage: formatting_stage.BEFORE_REGEX,
|
||||
});
|
||||
|
||||
const output = MessageFormatter.runStage(formatting_stage.BEFORE_REGEX, 'safe', base);
|
||||
|
||||
console.warn = origWarn;
|
||||
return {
|
||||
output,
|
||||
hasPromiseWarning: warnings.some(w => w.toLowerCase().includes('promise')),
|
||||
};
|
||||
}, BASE_CTX);
|
||||
|
||||
expect(result.output).toBe('safe');
|
||||
expect(result.hasPromiseWarning).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,78 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { testSetup } from './frontent-test-utils.js';
|
||||
|
||||
test.describe('Quick Reply overwrite cancellation', () => {
|
||||
test.beforeEach(testSetup.awaitST);
|
||||
|
||||
for (const operation of ['create', 'import']) {
|
||||
test(`should keep the existing set when ${operation} overwrite is cancelled`, async ({ page }) => {
|
||||
const result = await page.evaluate(async (operation) => {
|
||||
const { Popup, POPUP_RESULT } = await import('./scripts/popup.js');
|
||||
const { QuickReplySet } = await import('./scripts/extensions/quick-reply/src/QuickReplySet.js');
|
||||
const { SettingsUi } = await import('./scripts/extensions/quick-reply/src/ui/SettingsUi.js');
|
||||
|
||||
const setName = 'STAGE_REPRO_OVERWRITE_CANCEL';
|
||||
const existingSet = { name: setName };
|
||||
const originalSets = QuickReplySet.list;
|
||||
const originalInput = Popup.show.input;
|
||||
const originalConfirm = Popup.show.confirm;
|
||||
const originalFrom = QuickReplySet.from;
|
||||
const originalAddQuickReply = QuickReplySet.prototype.addQuickReply;
|
||||
let deleteCalls = 0;
|
||||
let confirmMessage = '';
|
||||
|
||||
try {
|
||||
QuickReplySet.list = [existingSet];
|
||||
Popup.show.input = async () => setName;
|
||||
Popup.show.confirm = async (_title, message) => {
|
||||
confirmMessage = message;
|
||||
return POPUP_RESULT.NEGATIVE;
|
||||
};
|
||||
QuickReplySet.prototype.addQuickReply = () => {};
|
||||
QuickReplySet.from = props => ({
|
||||
...props,
|
||||
qrList: [],
|
||||
init: () => {},
|
||||
save: async () => {},
|
||||
});
|
||||
|
||||
const settingsUi = new SettingsUi({});
|
||||
settingsUi.currentSet = document.createElement('select');
|
||||
settingsUi.doDeleteQrSet = async () => deleteCalls++;
|
||||
settingsUi.rerender = () => {};
|
||||
settingsUi.onQrSetChange = () => {};
|
||||
settingsUi.prepareGlobalSetList = () => {};
|
||||
settingsUi.prepareChatSetList = () => {};
|
||||
settingsUi.prepareCharacterSetList = () => {};
|
||||
|
||||
if (operation === 'create') {
|
||||
await settingsUi.addQrSet();
|
||||
} else {
|
||||
const file = {
|
||||
name: 'duplicate.json',
|
||||
text: async () => JSON.stringify({ version: 2, name: setName, qrList: [] }),
|
||||
};
|
||||
await settingsUi.importSingleQrSet(file);
|
||||
}
|
||||
|
||||
return {
|
||||
confirmMessage,
|
||||
deleteCalls,
|
||||
setNames: QuickReplySet.list.map(set => set.name),
|
||||
setName,
|
||||
};
|
||||
} finally {
|
||||
QuickReplySet.list = originalSets;
|
||||
Popup.show.input = originalInput;
|
||||
Popup.show.confirm = originalConfirm;
|
||||
QuickReplySet.from = originalFrom;
|
||||
QuickReplySet.prototype.addQuickReply = originalAddQuickReply;
|
||||
}
|
||||
}, operation);
|
||||
|
||||
expect(result.confirmMessage).toContain(`"${result.setName}"`);
|
||||
expect(result.deleteCalls).toBe(0);
|
||||
expect(result.setNames).toEqual([result.setName]);
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,741 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { testSetup } from './frontent-test-utils.js';
|
||||
|
||||
function createEditableReasoningMessageHtml({ detailsAttributes = 'data-has-content="false"', includeMessageContainers = false, includeMessageEditControls = false } = {}) {
|
||||
const messageContainers = includeMessageContainers
|
||||
? `
|
||||
<div class="mes_text"></div>
|
||||
<div class="mes_media_wrapper"></div>
|
||||
<div class="mes_file_wrapper"></div>`
|
||||
: '';
|
||||
const messageEditControls = includeMessageEditControls
|
||||
? `
|
||||
<div class="mes_edit_done menu_button edit_button">Done message</div>
|
||||
<div class="mes_edit_cancel menu_button edit_button">Cancel message</div>`
|
||||
: '';
|
||||
const messageButtons = includeMessageEditControls
|
||||
? `
|
||||
<div class="mes_buttons" style="display: flex;"></div>
|
||||
<div class="mes_bias"></div>`
|
||||
: '';
|
||||
|
||||
return `
|
||||
<div class="mes reasoning" mesid="0" data-reasoning-state="done">
|
||||
<div class="mes_block">
|
||||
${messageButtons}
|
||||
<div class="mes_edit_buttons" style="display: inline-flex;">
|
||||
<div class="mes_edit_add_reasoning menu_button">Add reasoning</div>${messageEditControls}
|
||||
</div>${messageContainers}
|
||||
<details class="mes_reasoning_details"${detailsAttributes ? ` ${detailsAttributes}` : ''}>
|
||||
<summary class="mes_reasoning_summary">
|
||||
<div class="mes_reasoning_header">
|
||||
<span class="mes_reasoning_header_title">Thought for some time</span>
|
||||
</div>
|
||||
<div class="mes_reasoning_actions">
|
||||
<div class="mes_button edit_button mes_reasoning_edit">Edit</div>
|
||||
<div class="mes_reasoning_edit_done menu_button edit_button">Done</div>
|
||||
<div class="mes_reasoning_edit_cancel menu_button edit_button">Cancel</div>
|
||||
</div>
|
||||
</summary>
|
||||
<div class="mes_reasoning"></div>
|
||||
</details>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
test.describe('Reasoning hidden blocks', () => {
|
||||
test.beforeEach(testSetup.awaitST);
|
||||
|
||||
test('keeps unrelated hidden reasoning blocks hidden while another block is being edited', async ({ page }) => {
|
||||
const result = await page.evaluate(() => {
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
chat.removeAttribute('data-show-hidden-reasoning');
|
||||
chat.innerHTML = `
|
||||
<div class="mes reasoning" mesid="1">
|
||||
<details class="mes_reasoning_details" data-has-content="false">
|
||||
<summary class="mes_reasoning_summary">
|
||||
<div class="mes_reasoning_header">
|
||||
<span class="mes_reasoning_header_title">Thought for some time</span>
|
||||
</div>
|
||||
</summary>
|
||||
<div class="mes_reasoning_actions">
|
||||
<button class="mes_button edit_button mes_reasoning_edit">Edit</button>
|
||||
<button class="mes_button mes_reasoning_edit_done">Done</button>
|
||||
<button class="mes_button mes_reasoning_edit_cancel">Cancel</button>
|
||||
</div>
|
||||
<div class="mes_reasoning"></div>
|
||||
</details>
|
||||
</div>
|
||||
<div class="mes reasoning" mesid="2">
|
||||
<details class="mes_reasoning_details" data-has-content="false">
|
||||
<summary class="mes_reasoning_summary">
|
||||
<div class="mes_reasoning_header">
|
||||
<span class="mes_reasoning_header_title">Thought for some time</span>
|
||||
</div>
|
||||
</summary>
|
||||
<div class="mes_reasoning_actions">
|
||||
<button class="mes_button edit_button mes_reasoning_edit">Edit</button>
|
||||
<button class="mes_button mes_reasoning_edit_done">Done</button>
|
||||
<button class="mes_button mes_reasoning_edit_cancel">Cancel</button>
|
||||
</div>
|
||||
<div class="mes_reasoning"></div>
|
||||
</details>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const firstDetails = chat.querySelector('[mesid="1"] .mes_reasoning_details');
|
||||
const secondDetails = chat.querySelector('[mesid="2"] .mes_reasoning_details');
|
||||
if (!firstDetails || !secondDetails) {
|
||||
throw new Error('Missing reasoning blocks');
|
||||
}
|
||||
|
||||
const before = {
|
||||
first: getComputedStyle(firstDetails).display,
|
||||
second: getComputedStyle(secondDetails).display,
|
||||
};
|
||||
|
||||
const textarea = document.createElement('textarea');
|
||||
textarea.className = 'reasoning_edit_textarea';
|
||||
textarea.value = ' ';
|
||||
firstDetails.querySelector('.mes_reasoning').before(textarea);
|
||||
|
||||
const after = {
|
||||
first: getComputedStyle(firstDetails).display,
|
||||
second: getComputedStyle(secondDetails).display,
|
||||
textarea: getComputedStyle(textarea).display,
|
||||
};
|
||||
|
||||
return { before, after };
|
||||
});
|
||||
|
||||
expect(result.before.first).toBe('none');
|
||||
expect(result.before.second).toBe('none');
|
||||
expect(result.after.first).not.toBe('none');
|
||||
expect(result.after.second).toBe('none');
|
||||
expect(result.after.textarea).not.toBe('none');
|
||||
});
|
||||
|
||||
test('hides add reasoning button while hidden-like reasoning is being edited', async ({ page }) => {
|
||||
const addReasoningDisplay = await page.evaluate(() => {
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
chat.removeAttribute('data-show-hidden-reasoning');
|
||||
chat.innerHTML = `
|
||||
<div class="mes reasoning" mesid="1" data-reasoning-state="done">
|
||||
<div class="mes_block">
|
||||
<div class="mes_edit_buttons" style="display: inline-flex;">
|
||||
<button class="mes_edit_add_reasoning menu_button">Add reasoning</button>
|
||||
</div>
|
||||
<details class="mes_reasoning_details" data-has-content="false" open>
|
||||
<summary class="mes_reasoning_summary">
|
||||
<div class="mes_reasoning_header">
|
||||
<span class="mes_reasoning_header_title">Thought for some time</span>
|
||||
</div>
|
||||
</summary>
|
||||
<div class="mes_reasoning_actions">
|
||||
<button class="mes_button edit_button mes_reasoning_edit">Edit</button>
|
||||
</div>
|
||||
<textarea class="reasoning_edit_textarea">\n</textarea>
|
||||
<div class="mes_reasoning"></div>
|
||||
</details>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const addReasoning = chat.querySelector('.mes_edit_add_reasoning');
|
||||
if (!addReasoning) {
|
||||
throw new Error('Missing add reasoning button');
|
||||
}
|
||||
|
||||
return getComputedStyle(addReasoning).display;
|
||||
});
|
||||
|
||||
expect(addReasoningDisplay).toBe('none');
|
||||
});
|
||||
|
||||
test('does not create duplicate reasoning editors when add is clicked repeatedly', async ({ page }) => {
|
||||
const result = await page.evaluate(async () => {
|
||||
const reasoningModule = await import('/scripts/reasoning.js');
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.removeAttribute('data-show-hidden-reasoning');
|
||||
chat.innerHTML = `
|
||||
<div class="mes reasoning" mesid="0" data-reasoning-state="done">
|
||||
<div class="mes_block">
|
||||
<div class="mes_edit_buttons" style="display: inline-flex;">
|
||||
<div class="mes_edit_add_reasoning menu_button">Add reasoning</div>
|
||||
</div>
|
||||
<details class="mes_reasoning_details" data-has-content="false">
|
||||
<summary class="mes_reasoning_summary">
|
||||
<div class="mes_reasoning_header">
|
||||
<span class="mes_reasoning_header_title">Thought for some time</span>
|
||||
</div>
|
||||
<div class="mes_reasoning_actions">
|
||||
<div class="mes_button edit_button mes_reasoning_edit">Edit</div>
|
||||
</div>
|
||||
</summary>
|
||||
<div class="mes_reasoning"></div>
|
||||
</details>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const addReasoning = chat.querySelector('.mes_edit_add_reasoning');
|
||||
if (!addReasoning) {
|
||||
throw new Error('Missing add reasoning button');
|
||||
}
|
||||
|
||||
addReasoning.click();
|
||||
addReasoning.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
const textareas = chat.querySelectorAll('.reasoning_edit_textarea');
|
||||
return {
|
||||
addDisplay: getComputedStyle(addReasoning).display,
|
||||
detailsOpen: chat.querySelector('.mes_reasoning_details')?.open,
|
||||
textareaCount: textareas.length,
|
||||
textareaValue: textareas[0]?.value,
|
||||
};
|
||||
});
|
||||
|
||||
expect(result.detailsOpen).toBe(true);
|
||||
expect(result.addDisplay).toBe('none');
|
||||
expect(result.textareaCount).toBe(1);
|
||||
expect(result.textareaValue).toBe('\n');
|
||||
});
|
||||
|
||||
test('close all collapses stale open hidden-like reasoning details', async ({ page }) => {
|
||||
const result = await page.evaluate(async () => {
|
||||
const reasoningModule = await import('/scripts/reasoning.js');
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = `
|
||||
<button class="mes_reasoning_close_all">Close all</button>
|
||||
<div class="mes reasoning" mesid="0">
|
||||
<details class="mes_reasoning_details" data-has-content="false" open>
|
||||
<summary class="mes_reasoning_summary">
|
||||
<div class="mes_reasoning_header">
|
||||
<span class="mes_reasoning_header_title">Thought for some time</span>
|
||||
</div>
|
||||
</summary>
|
||||
<div class="mes_reasoning"></div>
|
||||
</details>
|
||||
</div>
|
||||
<div class="mes reasoning" mesid="1">
|
||||
<details class="mes_reasoning_details" data-has-content="true" open>
|
||||
<summary class="mes_reasoning_summary">
|
||||
<div class="mes_reasoning_header">
|
||||
<span class="mes_reasoning_header_title">Thought for some time</span>
|
||||
</div>
|
||||
</summary>
|
||||
<div class="mes_reasoning">visible reasoning</div>
|
||||
</details>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const hiddenDetails = chat.querySelector('[mesid="0"] .mes_reasoning_details');
|
||||
const visibleDetails = chat.querySelector('[mesid="1"] .mes_reasoning_details');
|
||||
const closeAll = chat.querySelector('.mes_reasoning_close_all');
|
||||
if (!hiddenDetails || !visibleDetails || !closeAll) {
|
||||
throw new Error('Missing close-all test elements');
|
||||
}
|
||||
|
||||
const before = {
|
||||
hiddenOpen: hiddenDetails.open,
|
||||
visibleOpen: visibleDetails.open,
|
||||
};
|
||||
|
||||
closeAll.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
return {
|
||||
before,
|
||||
after: {
|
||||
hiddenOpen: hiddenDetails.open,
|
||||
visibleOpen: visibleDetails.open,
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
expect(result.before.hiddenOpen).toBe(true);
|
||||
expect(result.before.visibleOpen).toBe(true);
|
||||
expect(result.after.hiddenOpen).toBe(false);
|
||||
expect(result.after.visibleOpen).toBe(false);
|
||||
});
|
||||
|
||||
test('collapses whitespace-only reasoning after confirming edit with show hidden enabled', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const reasoningModule = await import('/scripts/reasoning.js');
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
const addReasoning = chat.querySelector('.mes_edit_add_reasoning');
|
||||
if (!addReasoning) {
|
||||
throw new Error('Missing add reasoning button');
|
||||
}
|
||||
|
||||
addReasoning.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
const textarea = chat.querySelector('.reasoning_edit_textarea');
|
||||
const beforeDone = {
|
||||
detailsOpen: details?.open,
|
||||
textareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
textareaValue: textarea?.value,
|
||||
};
|
||||
|
||||
chat.querySelector('.mes_reasoning_edit_done')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
return {
|
||||
beforeDone,
|
||||
afterDone: {
|
||||
detailsOpen: details?.open,
|
||||
textareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
},
|
||||
};
|
||||
}, createEditableReasoningMessageHtml());
|
||||
|
||||
expect(result.beforeDone.detailsOpen).toBe(true);
|
||||
expect(result.beforeDone.textareaCount).toBe(1);
|
||||
expect(result.beforeDone.textareaValue).toBe('\n');
|
||||
expect(result.afterDone.textareaCount).toBe(0);
|
||||
expect(result.afterDone.detailsOpen).toBe(false);
|
||||
});
|
||||
|
||||
test('collapses whitespace-only reasoning after canceling edit with show hidden enabled', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const reasoningModule = await import('/scripts/reasoning.js');
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
const addReasoning = chat.querySelector('.mes_edit_add_reasoning');
|
||||
if (!addReasoning) {
|
||||
throw new Error('Missing add reasoning button');
|
||||
}
|
||||
|
||||
addReasoning.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
const beforeCancel = {
|
||||
detailsOpen: details?.open,
|
||||
textareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
};
|
||||
|
||||
chat.querySelector('.mes_reasoning_edit_cancel')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
return {
|
||||
beforeCancel,
|
||||
afterCancel: {
|
||||
detailsOpen: details?.open,
|
||||
textareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
},
|
||||
};
|
||||
}, createEditableReasoningMessageHtml());
|
||||
|
||||
expect(result.beforeCancel.detailsOpen).toBe(true);
|
||||
expect(result.beforeCancel.textareaCount).toBe(1);
|
||||
expect(result.afterCancel.textareaCount).toBe(0);
|
||||
expect(result.afterCancel.detailsOpen).toBe(false);
|
||||
});
|
||||
|
||||
test('collapses whitespace-only reasoning after confirming message edit with reasoning edit open', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const [reasoningModule, scriptModule] = await Promise.all([
|
||||
import('/scripts/reasoning.js'),
|
||||
import('/script.js'),
|
||||
]);
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
chat.querySelector('.mes_edit_add_reasoning')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
await scriptModule.messageEdit(0);
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
const editTextarea = chat.querySelector('#curEditTextarea');
|
||||
if (editTextarea) {
|
||||
editTextarea.value = 'Foo edited';
|
||||
}
|
||||
const beforeDone = {
|
||||
detailsOpen: chat.querySelector('.mes_reasoning_details')?.open,
|
||||
reasoningTextareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
messageTextareaCount: chat.querySelectorAll('#curEditTextarea').length,
|
||||
};
|
||||
|
||||
chat.querySelector('.mes_edit_done')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
return {
|
||||
beforeDone,
|
||||
afterDone: {
|
||||
detailsOpen: chat.querySelector('.mes_reasoning_details')?.open,
|
||||
reasoningTextareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
messageTextareaCount: chat.querySelectorAll('#curEditTextarea').length,
|
||||
messageValue: context.chat[0]?.mes,
|
||||
reasoningValue: context.chat[0]?.extra?.reasoning,
|
||||
},
|
||||
};
|
||||
}, createEditableReasoningMessageHtml({ includeMessageContainers: true, includeMessageEditControls: true }));
|
||||
|
||||
expect(result.beforeDone.detailsOpen).toBe(true);
|
||||
expect(result.beforeDone.reasoningTextareaCount).toBe(1);
|
||||
expect(result.beforeDone.messageTextareaCount).toBe(1);
|
||||
expect(result.afterDone.reasoningTextareaCount).toBe(0);
|
||||
expect(result.afterDone.messageTextareaCount).toBe(0);
|
||||
expect(result.afterDone.detailsOpen).toBe(false);
|
||||
expect(result.afterDone.messageValue).toBe('Foo edited');
|
||||
expect(result.afterDone.reasoningValue).toBe('\n');
|
||||
});
|
||||
|
||||
test('collapses whitespace-only reasoning after canceling message edit with reasoning edit open', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const [reasoningModule, scriptModule] = await Promise.all([
|
||||
import('/scripts/reasoning.js'),
|
||||
import('/script.js'),
|
||||
]);
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
chat.querySelector('.mes_edit_add_reasoning')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
await scriptModule.messageEdit(0);
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
const editTextarea = chat.querySelector('#curEditTextarea');
|
||||
if (editTextarea) {
|
||||
editTextarea.value = 'Foo should cancel';
|
||||
}
|
||||
const beforeCancel = {
|
||||
detailsOpen: chat.querySelector('.mes_reasoning_details')?.open,
|
||||
reasoningTextareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
messageTextareaCount: chat.querySelectorAll('#curEditTextarea').length,
|
||||
};
|
||||
|
||||
chat.querySelector('.mes_edit_cancel')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
return {
|
||||
beforeCancel,
|
||||
afterCancel: {
|
||||
detailsOpen: chat.querySelector('.mes_reasoning_details')?.open,
|
||||
reasoningTextareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
messageTextareaCount: chat.querySelectorAll('#curEditTextarea').length,
|
||||
messageValue: context.chat[0]?.mes,
|
||||
reasoningValue: context.chat[0]?.extra?.reasoning,
|
||||
},
|
||||
};
|
||||
}, createEditableReasoningMessageHtml({ includeMessageContainers: true, includeMessageEditControls: true }));
|
||||
|
||||
expect(result.beforeCancel.detailsOpen).toBe(true);
|
||||
expect(result.beforeCancel.reasoningTextareaCount).toBe(1);
|
||||
expect(result.beforeCancel.messageTextareaCount).toBe(1);
|
||||
expect(result.afterCancel.reasoningTextareaCount).toBe(0);
|
||||
expect(result.afterCancel.messageTextareaCount).toBe(0);
|
||||
expect(result.afterCancel.detailsOpen).toBe(false);
|
||||
expect(result.afterCancel.messageValue).toBe('Foo');
|
||||
expect(result.afterCancel.reasoningValue).toBe('\n');
|
||||
});
|
||||
|
||||
test('keeps whitespace-only reasoning collapsed when auto-expand is enabled', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const [reasoningModule, powerUserModule] = await Promise.all([
|
||||
import('/scripts/reasoning.js'),
|
||||
import('/scripts/power-user.js'),
|
||||
]);
|
||||
reasoningModule.initReasoning();
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo', gen_started: new Date().toISOString() });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
const previousAutoExpand = powerUserModule.power_user.reasoning.auto_expand;
|
||||
powerUserModule.power_user.reasoning.auto_expand = true;
|
||||
try {
|
||||
reasoningModule.updateReasoningUI(chat.querySelector('.mes'));
|
||||
} finally {
|
||||
powerUserModule.power_user.reasoning.auto_expand = previousAutoExpand;
|
||||
}
|
||||
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
return {
|
||||
detailsOpen: details?.open,
|
||||
hasContent: details?.getAttribute('data-has-content'),
|
||||
};
|
||||
}, createEditableReasoningMessageHtml({ detailsAttributes: '' }));
|
||||
|
||||
expect(result.hasContent).toBeNull();
|
||||
expect(result.detailsOpen).toBe(false);
|
||||
});
|
||||
|
||||
test('treats whitespace-only reasoning as hidden-like when trim spaces is disabled', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const [reasoningModule, powerUserModule] = await Promise.all([
|
||||
import('/scripts/reasoning.js'),
|
||||
import('/scripts/power-user.js'),
|
||||
]);
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo', gen_started: new Date().toISOString() });
|
||||
chat.removeAttribute('data-show-hidden-reasoning');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
const previousTrimSpaces = powerUserModule.power_user.trim_spaces;
|
||||
try {
|
||||
powerUserModule.power_user.trim_spaces = false;
|
||||
reasoningModule.updateReasoningUI(chat.querySelector('.mes'));
|
||||
} finally {
|
||||
powerUserModule.power_user.trim_spaces = previousTrimSpaces;
|
||||
}
|
||||
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
const beforeAddDisplay = details ? getComputedStyle(details).display : null;
|
||||
const addReasoning = chat.querySelector('.mes_edit_add_reasoning');
|
||||
addReasoning?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
const textarea = chat.querySelector('.reasoning_edit_textarea');
|
||||
return {
|
||||
beforeAddDisplay,
|
||||
afterAddDisplay: details ? getComputedStyle(details).display : null,
|
||||
detailsOpen: details?.open,
|
||||
hasContent: details?.getAttribute('data-has-content'),
|
||||
textareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
textareaValue: textarea?.value,
|
||||
};
|
||||
}, createEditableReasoningMessageHtml({ detailsAttributes: '' }));
|
||||
|
||||
expect(result.hasContent).toBeNull();
|
||||
expect(result.beforeAddDisplay).toBe('none');
|
||||
expect(result.afterAddDisplay).not.toBe('none');
|
||||
expect(result.detailsOpen).toBe(true);
|
||||
expect(result.textareaCount).toBe(1);
|
||||
expect(result.textareaValue).toBe('\n');
|
||||
});
|
||||
|
||||
test('does not expand whitespace-only reasoning through slash commands', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const [reasoningModule, slashCommandsModule] = await Promise.all([
|
||||
import('/scripts/reasoning.js'),
|
||||
import('/scripts/slash-commands.js'),
|
||||
]);
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
await slashCommandsModule.executeSlashCommandsWithOptions('/reasoning-expand 0');
|
||||
const afterExpand = details?.open;
|
||||
await slashCommandsModule.executeSlashCommandsWithOptions('/reasoning-toggle 0');
|
||||
const afterToggle = details?.open;
|
||||
|
||||
return {
|
||||
afterExpand,
|
||||
afterToggle,
|
||||
hasContent: details?.getAttribute('data-has-content'),
|
||||
};
|
||||
}, createEditableReasoningMessageHtml());
|
||||
|
||||
expect(result.hasContent).toBe('false');
|
||||
expect(result.afterExpand).toBe(false);
|
||||
expect(result.afterToggle).toBe(false);
|
||||
});
|
||||
|
||||
test('expands visible reasoning through slash commands', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const [reasoningModule, slashCommandsModule] = await Promise.all([
|
||||
import('/scripts/reasoning.js'),
|
||||
import('/scripts/slash-commands.js'),
|
||||
]);
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: 'visible reasoning' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
await slashCommandsModule.executeSlashCommandsWithOptions('/reasoning-expand 0');
|
||||
const afterExpand = details?.open;
|
||||
await slashCommandsModule.executeSlashCommandsWithOptions('/reasoning-toggle 0');
|
||||
const afterToggleClosed = details?.open;
|
||||
await slashCommandsModule.executeSlashCommandsWithOptions('/reasoning-toggle 0');
|
||||
const afterToggleOpen = details?.open;
|
||||
|
||||
return {
|
||||
afterExpand,
|
||||
afterToggleClosed,
|
||||
afterToggleOpen,
|
||||
hasContent: details?.getAttribute('data-has-content'),
|
||||
};
|
||||
}, createEditableReasoningMessageHtml({ detailsAttributes: 'data-has-content="true"' }));
|
||||
|
||||
expect(result.hasContent).toBe('true');
|
||||
expect(result.afterExpand).toBe(true);
|
||||
expect(result.afterToggleClosed).toBe(false);
|
||||
expect(result.afterToggleOpen).toBe(true);
|
||||
});
|
||||
|
||||
test('keeps reasoning expanded after changing whitespace-only reasoning to visible content', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const reasoningModule = await import('/scripts/reasoning.js');
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
chat.querySelector('.mes_edit_add_reasoning')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
const textarea = chat.querySelector('.reasoning_edit_textarea');
|
||||
textarea.value = 'visible reasoning';
|
||||
chat.querySelector('.mes_reasoning_edit_done')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
return {
|
||||
detailsOpen: details?.open,
|
||||
hasContent: details?.getAttribute('data-has-content'),
|
||||
textareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
reasoningText: chat.querySelector('.mes_reasoning')?.textContent,
|
||||
};
|
||||
}, createEditableReasoningMessageHtml({ includeMessageContainers: true }));
|
||||
|
||||
expect(result.textareaCount).toBe(0);
|
||||
expect(result.hasContent).toBe('true');
|
||||
expect(result.detailsOpen).toBe(true);
|
||||
expect(result.reasoningText).toContain('visible reasoning');
|
||||
});
|
||||
|
||||
test('collapses reasoning after changing whitespace-only reasoning to different whitespace', async ({ page }) => {
|
||||
const result = await page.evaluate(async (messageHtml) => {
|
||||
const reasoningModule = await import('/scripts/reasoning.js');
|
||||
reasoningModule.initReasoning();
|
||||
|
||||
const context = window.SillyTavern.getContext();
|
||||
const chat = document.getElementById('chat');
|
||||
if (!chat) {
|
||||
throw new Error('Missing #chat container');
|
||||
}
|
||||
|
||||
context.chat.length = 0;
|
||||
context.chat.push({ extra: { reasoning: '\n' }, name: 'Ilo', mes: 'Foo' });
|
||||
chat.setAttribute('data-show-hidden-reasoning', 'true');
|
||||
chat.innerHTML = messageHtml;
|
||||
|
||||
chat.querySelector('.mes_edit_add_reasoning')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
const textarea = chat.querySelector('.reasoning_edit_textarea');
|
||||
textarea.value = ' ';
|
||||
chat.querySelector('.mes_reasoning_edit_done')?.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
|
||||
const details = chat.querySelector('.mes_reasoning_details');
|
||||
return {
|
||||
detailsOpen: details?.open,
|
||||
hasContent: details?.getAttribute('data-has-content'),
|
||||
textareaCount: chat.querySelectorAll('.reasoning_edit_textarea').length,
|
||||
};
|
||||
}, createEditableReasoningMessageHtml({ includeMessageContainers: true }));
|
||||
|
||||
expect(result.textareaCount).toBe(0);
|
||||
expect(result.hasContent).toBeNull();
|
||||
expect(result.detailsOpen).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -1,246 +0,0 @@
|
||||
import { test, expect } from '@playwright/test';
|
||||
import { testSetup } from './frontent-test-utils.js';
|
||||
|
||||
test.describe('fixNestedEmphasis', () => {
|
||||
test.beforeEach(testSetup.goST);
|
||||
|
||||
test.describe('Basic nested emphasis', () => {
|
||||
test('should convert inner emphasis to bold within outer emphasis', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*She looks at you. *Are you okay?* she asks.*');
|
||||
expect(result).toBe('*She looks at you. **Are you okay?** she asks.*');
|
||||
});
|
||||
|
||||
test('should handle the issue example case', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*Some Text *Nested Emphasis Text* More text*');
|
||||
expect(result).toBe('*Some Text **Nested Emphasis Text** More text*');
|
||||
});
|
||||
|
||||
test('should handle short nested action/speech', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*action *speech* action*');
|
||||
expect(result).toBe('*action **speech** action*');
|
||||
});
|
||||
|
||||
test('should handle nested emphasis with punctuation in inner text', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*She sighs. *I never asked for this,* she mutters, turning away.*');
|
||||
expect(result).toBe('*She sighs. **I never asked for this,** she mutters, turning away.*');
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Multiple nested pairs', () => {
|
||||
test('should handle multiple nested pairs in same outer emphasis', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*action *speech1* middle *speech2* end*');
|
||||
expect(result).toBe('*action **speech1** middle **speech2** end*');
|
||||
});
|
||||
|
||||
test('should handle multiple nested pairs with longer text', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*She said *hello* and *goodbye* to him.*');
|
||||
expect(result).toBe('*She said **hello** and **goodbye** to him.*');
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Text that should NOT be modified', () => {
|
||||
test('should not modify simple emphasis', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*normal emphasis*');
|
||||
expect(result).toBe('*normal emphasis*');
|
||||
});
|
||||
|
||||
test('should not modify bold text', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**bold text**');
|
||||
expect(result).toBe('**bold text**');
|
||||
});
|
||||
|
||||
test('should not modify sequential (non-nested) emphasis', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*first emphasis* and *second emphasis*');
|
||||
expect(result).toBe('*first emphasis* and *second emphasis*');
|
||||
});
|
||||
|
||||
test('should not modify already-correct bold inside italic', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*text **already bold** text*');
|
||||
expect(result).toBe('*text **already bold** text*');
|
||||
});
|
||||
|
||||
test('should not modify triple emphasis', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '***triple emphasis***');
|
||||
expect(result).toBe('***triple emphasis***');
|
||||
});
|
||||
|
||||
test('should not modify plain text', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, 'no formatting at all');
|
||||
expect(result).toBe('no formatting at all');
|
||||
});
|
||||
|
||||
test('should not modify adjacent emphasis without spaces (non-nested pattern)', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*hello*world*bye*');
|
||||
expect(result).toBe('*hello*world*bye*');
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Nested bold (** inside **)', () => {
|
||||
test('should strip inner ** when nested inside outer **', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**This is **bold**, is it?**');
|
||||
expect(result).toBe('**This is bold, is it?**');
|
||||
});
|
||||
|
||||
test('should strip inner ** for simple nesting', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**text **nested** text**');
|
||||
expect(result).toBe('**text nested text**');
|
||||
});
|
||||
|
||||
test('should strip inner ** for short content', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**a **b** c**');
|
||||
expect(result).toBe('**a b c**');
|
||||
});
|
||||
|
||||
test('should strip inner ** with longer word', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**She said **hello** to him**');
|
||||
expect(result).toBe('**She said hello to him**');
|
||||
});
|
||||
|
||||
test('should handle multiple nested ** pairs', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**She **whispered** and then **shouted** at him**');
|
||||
expect(result).toBe('**She whispered and then shouted at him**');
|
||||
});
|
||||
|
||||
test('should not modify normal bold (no nesting)', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**normal bold**');
|
||||
expect(result).toBe('**normal bold**');
|
||||
});
|
||||
|
||||
test('should not modify sequential bold', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '**first** and **second**');
|
||||
expect(result).toBe('**first** and **second**');
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Edge cases', () => {
|
||||
test('should handle nested emphasis next to sequential emphasis', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*start *nested* end* and *another*');
|
||||
expect(result).toBe('*start **nested** end* and *another*');
|
||||
});
|
||||
|
||||
test('should not modify asterisk preceded by space (non-flanking)', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*single asterisk at end *');
|
||||
expect(result).toBe('*single asterisk at end *');
|
||||
});
|
||||
|
||||
test('should handle nested emphasis adjacent to punctuation', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*She said: *"Hello!"* quietly.*');
|
||||
expect(result).toBe('*She said: **"Hello!"** quietly.*');
|
||||
});
|
||||
|
||||
test('should handle tabs as whitespace around nested emphasis', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*She looks.\t*Are you okay?*\tshe asks.*');
|
||||
expect(result).toBe('*She looks.\t**Are you okay?**\tshe asks.*');
|
||||
});
|
||||
|
||||
test('should process each line independently for multi-line text', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '*first line\n*nested* second line*');
|
||||
// Lines are processed independently - first line has only 1 asterisk, second has 3
|
||||
expect(result).toBe('*first line\n*nested* second line*');
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Code block protection', () => {
|
||||
test('should not modify content inside inline code', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '`*code *nested* code*`');
|
||||
expect(result).toBe('`*code *nested* code*`');
|
||||
});
|
||||
|
||||
test('should not modify content inside fenced code blocks', async ({ page }) => {
|
||||
const result = await runFixNestedEmphasis(page, '```\n*code *nested* code*\n```');
|
||||
expect(result).toBe('```\n*code *nested* code*\n```');
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Realistic roleplay examples', () => {
|
||||
test('should handle dialogue within action narration', async ({ page }) => {
|
||||
const input = '*She reaches out, her hand trembling. *Please... don\'t leave me,* she whispers, tears streaming down her face.*';
|
||||
const expected = '*She reaches out, her hand trembling. **Please... don\'t leave me,** she whispers, tears streaming down her face.*';
|
||||
const result = await runFixNestedEmphasis(page, input);
|
||||
expect(result).toBe(expected);
|
||||
});
|
||||
|
||||
test('should handle multiple dialogue lines within narration', async ({ page }) => {
|
||||
const input = '*The door creaks open. *Who\'s there?* a voice calls out from the darkness. *Show yourself!* it demands.*';
|
||||
const expected = '*The door creaks open. **Who\'s there?** a voice calls out from the darkness. **Show yourself!** it demands.*';
|
||||
const result = await runFixNestedEmphasis(page, input);
|
||||
expect(result).toBe(expected);
|
||||
});
|
||||
});
|
||||
|
||||
test.describe('Full pipeline (fixNestedEmphasis + showdown)', () => {
|
||||
test('should render nested emphasis as italic with bold inside', async ({ page }) => {
|
||||
const html = await runFullPipeline(page, '*action *speech* action*');
|
||||
expect(html).toContain('<em>');
|
||||
expect(html).toContain('<strong>');
|
||||
expect(html).toContain('speech');
|
||||
});
|
||||
|
||||
test('should render basic nested example correctly', async ({ page }) => {
|
||||
const html = await runFullPipeline(page, '*Some Text *Nested Emphasis Text* More text*');
|
||||
expect(html).toMatch(/<em>.*<strong>Nested Emphasis Text<\/strong>.*<\/em>/);
|
||||
});
|
||||
|
||||
test('should not break normal emphasis rendering', async ({ page }) => {
|
||||
const html = await runFullPipeline(page, '*normal emphasis*');
|
||||
expect(html).toContain('<em>normal emphasis</em>');
|
||||
});
|
||||
|
||||
test('should not break bold rendering', async ({ page }) => {
|
||||
const html = await runFullPipeline(page, '**bold text**');
|
||||
expect(html).toContain('<strong>bold text</strong>');
|
||||
});
|
||||
|
||||
test('should not break sequential emphasis rendering', async ({ page }) => {
|
||||
const html = await runFullPipeline(page, '*first* and *second*');
|
||||
expect(html).toContain('<em>first</em>');
|
||||
expect(html).toContain('<em>second</em>');
|
||||
});
|
||||
|
||||
test('should render nested bold as single bold block', async ({ page }) => {
|
||||
const html = await runFullPipeline(page, '**This is **bold**, is it?**');
|
||||
expect(html).toContain('<strong>');
|
||||
expect(html).toContain('This is bold');
|
||||
expect(html).not.toContain('**');
|
||||
});
|
||||
|
||||
test('should render stripped nested bold correctly', async ({ page }) => {
|
||||
const html = await runFullPipeline(page, '**text **nested** text**');
|
||||
expect(html).toMatch(/<strong>text nested text<\/strong>/);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Run fixNestedEmphasis in the browser context.
|
||||
* @param {import('@playwright/test').Page} page
|
||||
* @param {string} input
|
||||
* @returns {Promise<string>}
|
||||
*/
|
||||
async function runFixNestedEmphasis(page, input) {
|
||||
return await page.evaluate(async (text) => {
|
||||
/** @type {import('../../public/scripts/showdown-emphasis.js')} */
|
||||
const { fixNestedEmphasis } = await import('./scripts/showdown-emphasis.js');
|
||||
return fixNestedEmphasis(text);
|
||||
}, input);
|
||||
}
|
||||
|
||||
/**
|
||||
* Run fixNestedEmphasis followed by showdown conversion in the browser context.
|
||||
* @param {import('@playwright/test').Page} page
|
||||
* @param {string} input
|
||||
* @returns {Promise<string>}
|
||||
*/
|
||||
async function runFullPipeline(page, input) {
|
||||
return await page.evaluate(async (text) => {
|
||||
/** @type {import('../../public/scripts/showdown-emphasis.js')} */
|
||||
const { fixNestedEmphasis } = await import('./scripts/showdown-emphasis.js');
|
||||
const { showdown } = await import('./lib.js');
|
||||
const converter = new showdown.Converter({
|
||||
literalMidWordUnderscores: true,
|
||||
simpleLineBreaks: true,
|
||||
});
|
||||
const fixed = fixNestedEmphasis(text);
|
||||
return converter.makeHtml(fixed);
|
||||
}, input);
|
||||
}
|
||||
@@ -20,11 +20,21 @@ export const testSetup = {
|
||||
if (await testSetup.isLoginPage({ page })) {
|
||||
// eslint-disable-next-line playwright/no-networkidle
|
||||
await page.waitForLoadState('networkidle');
|
||||
const userSelect = page.locator('#userList .userSelect').last();
|
||||
if (await userSelect.count()) {
|
||||
await userSelect.click();
|
||||
// Try accounts from last to first: clicking a password-protected account stays on the login page
|
||||
const userSelects = page.locator('#userList .userSelect');
|
||||
const userCount = await userSelects.count();
|
||||
for (let i = userCount - 1; i >= 0; i--) {
|
||||
await userSelects.nth(i).click();
|
||||
const loggedIn = await page
|
||||
.waitForURL(url => url.toString().startsWith(baseURL) && url.pathname !== '/login', { timeout: 3000 })
|
||||
.then(() => true, () => false);
|
||||
if (loggedIn) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (await testSetup.isLoginPage({ page })) {
|
||||
throw new Error('Could not log into any account without a password.');
|
||||
}
|
||||
await page.waitForURL(url => url.toString().startsWith(baseURL) && url.pathname !== '/login');
|
||||
}
|
||||
await page.waitForFunction('document.getElementById("preloader") === null', { timeout: 0 });
|
||||
},
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
import { describe, expect, jest, test } from '@jest/globals';
|
||||
import {
|
||||
fetchGoogleModels,
|
||||
GoogleModelsHttpError,
|
||||
GoogleModelsResponseError,
|
||||
} from '../src/endpoints/backends/google-models.js';
|
||||
|
||||
function createResponse(data, overrides = {}) {
|
||||
return {
|
||||
ok: true,
|
||||
status: 200,
|
||||
statusText: 'OK',
|
||||
json: async () => data,
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
describe('Google AI Studio model pagination', () => {
|
||||
test('fetches every page and returns generateContent models', async () => {
|
||||
const fetchMock = jest.fn()
|
||||
.mockResolvedValueOnce(createResponse({
|
||||
models: [
|
||||
{
|
||||
name: 'models/gemini-2.5-flash',
|
||||
supportedGenerationMethods: ['generateContent', 'countTokens'],
|
||||
},
|
||||
{
|
||||
name: 'models/gemini-embedding-001',
|
||||
supportedGenerationMethods: ['embedContent'],
|
||||
},
|
||||
],
|
||||
nextPageToken: 'second-page',
|
||||
}))
|
||||
.mockResolvedValueOnce(createResponse({
|
||||
models: [{
|
||||
name: 'models/gemini-2.5-pro',
|
||||
supportedGenerationMethods: ['generateContent'],
|
||||
}],
|
||||
}));
|
||||
|
||||
const models = await fetchGoogleModels('https://example.com/v1beta/models?key=secret', fetchMock);
|
||||
|
||||
expect(models).toEqual([
|
||||
{
|
||||
id: 'gemini-2.5-flash',
|
||||
name: 'models/gemini-2.5-flash',
|
||||
supportedGenerationMethods: ['generateContent', 'countTokens'],
|
||||
},
|
||||
{
|
||||
id: 'gemini-2.5-pro',
|
||||
name: 'models/gemini-2.5-pro',
|
||||
supportedGenerationMethods: ['generateContent'],
|
||||
},
|
||||
]);
|
||||
expect(fetchMock).toHaveBeenCalledTimes(2);
|
||||
|
||||
const firstUrl = new URL(fetchMock.mock.calls[0][0]);
|
||||
expect(firstUrl.searchParams.get('key')).toBe('secret');
|
||||
expect(firstUrl.searchParams.get('pageSize')).toBe('1000');
|
||||
expect(firstUrl.searchParams.has('pageToken')).toBe(false);
|
||||
|
||||
const secondUrl = new URL(fetchMock.mock.calls[1][0]);
|
||||
expect(secondUrl.searchParams.get('key')).toBe('secret');
|
||||
expect(secondUrl.searchParams.get('pageSize')).toBe('1000');
|
||||
expect(secondUrl.searchParams.get('pageToken')).toBe('second-page');
|
||||
});
|
||||
|
||||
test('preserves reverse proxy query parameters', async () => {
|
||||
const fetchMock = jest.fn().mockResolvedValue(createResponse({ models: [] }));
|
||||
|
||||
await fetchGoogleModels('https://proxy.example/v1beta/models?tenant=test', fetchMock);
|
||||
|
||||
const requestUrl = new URL(fetchMock.mock.calls[0][0]);
|
||||
expect(requestUrl.searchParams.get('tenant')).toBe('test');
|
||||
expect(requestUrl.searchParams.get('pageSize')).toBe('1000');
|
||||
});
|
||||
|
||||
test('rejects an HTTP failure without returning partial models', async () => {
|
||||
const fetchMock = jest.fn()
|
||||
.mockResolvedValueOnce(createResponse({
|
||||
models: [],
|
||||
nextPageToken: 'second-page',
|
||||
}))
|
||||
.mockResolvedValueOnce(createResponse(null, {
|
||||
ok: false,
|
||||
status: 503,
|
||||
statusText: 'Service Unavailable',
|
||||
}));
|
||||
|
||||
await expect(fetchGoogleModels('https://example.com/v1beta/models', fetchMock))
|
||||
.rejects.toEqual(expect.objectContaining({
|
||||
name: GoogleModelsHttpError.name,
|
||||
status: 503,
|
||||
statusText: 'Service Unavailable',
|
||||
}));
|
||||
});
|
||||
|
||||
test('rejects a malformed models field', async () => {
|
||||
const fetchMock = jest.fn().mockResolvedValue(createResponse({ models: null }));
|
||||
|
||||
await expect(fetchGoogleModels('https://example.com/v1beta/models', fetchMock))
|
||||
.rejects.toThrow('invalid models field');
|
||||
});
|
||||
|
||||
test('rejects a repeated page token', async () => {
|
||||
const fetchMock = jest.fn()
|
||||
.mockResolvedValueOnce(createResponse({ models: [], nextPageToken: 'repeated' }))
|
||||
.mockResolvedValueOnce(createResponse({ models: [], nextPageToken: 'repeated' }));
|
||||
|
||||
await expect(fetchGoogleModels('https://example.com/v1beta/models', fetchMock))
|
||||
.rejects.toBeInstanceOf(GoogleModelsResponseError);
|
||||
expect(fetchMock).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
test('rejects a supported model without a valid name', async () => {
|
||||
const fetchMock = jest.fn().mockResolvedValue(createResponse({
|
||||
models: [{ supportedGenerationMethods: ['generateContent'] }],
|
||||
}));
|
||||
|
||||
await expect(fetchGoogleModels('https://example.com/v1beta/models', fetchMock))
|
||||
.rejects.toThrow('invalid name');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,80 @@
|
||||
import { beforeAll, describe, expect, jest, test } from '@jest/globals';
|
||||
|
||||
const jqueryElement = {
|
||||
append: jest.fn(function () { return this; }),
|
||||
children: jest.fn(() => ({ each: jest.fn() })),
|
||||
detach: jest.fn(function () { return this; }),
|
||||
empty: jest.fn(function () { return this; }),
|
||||
find: jest.fn(function () { return this; }),
|
||||
on: jest.fn(function () { return this; }),
|
||||
prop: jest.fn(function () { return this; }),
|
||||
trigger: jest.fn(function () { return this; }),
|
||||
val: jest.fn(function () { return this; }),
|
||||
};
|
||||
|
||||
global.$ = jest.fn(() => jqueryElement);
|
||||
|
||||
jest.unstable_mockModule('../public/script.js', () => ({
|
||||
abortStatusCheck: { signal: undefined },
|
||||
event_types: {},
|
||||
eventSource: { emit: jest.fn() },
|
||||
getRequestHeaders: jest.fn(),
|
||||
getStoppingStrings: jest.fn(),
|
||||
resultCheckStatus: jest.fn(),
|
||||
saveSettingsDebounced: jest.fn(),
|
||||
setGenerationParamsFromPreset: jest.fn(),
|
||||
setOnlineStatus: jest.fn(),
|
||||
startStatusLoading: jest.fn(),
|
||||
}));
|
||||
jest.unstable_mockModule('../public/scripts/power-user.js', () => ({
|
||||
MAX_CONTEXT_DEFAULT: 8192,
|
||||
MAX_RESPONSE_DEFAULT: 150,
|
||||
power_user: {},
|
||||
}));
|
||||
jest.unstable_mockModule('../public/scripts/tokenizers.js', () => ({
|
||||
getTextTokens: jest.fn(),
|
||||
tokenizers: { NONE: 0, NERD: 1, NERD2: 2, LLAMA3: 3 },
|
||||
}));
|
||||
jest.unstable_mockModule('../public/scripts/sse-stream.js', () => ({ getEventSourceStream: jest.fn() }));
|
||||
jest.unstable_mockModule('../public/scripts/utils.js', () => ({
|
||||
getSortableDelay: jest.fn(),
|
||||
getStringHash: jest.fn(),
|
||||
onlyUnique: jest.fn(),
|
||||
}));
|
||||
jest.unstable_mockModule('../public/scripts/logit-bias.js', () => ({
|
||||
BIAS_CACHE: new Map(),
|
||||
createNewLogitBiasEntry: jest.fn(),
|
||||
displayLogitBias: jest.fn(),
|
||||
getLogitBiasListResult: jest.fn(),
|
||||
}));
|
||||
jest.unstable_mockModule('../public/scripts/secrets.js', () => ({
|
||||
SECRET_KEYS: {},
|
||||
secret_state: {},
|
||||
writeSecret: jest.fn(),
|
||||
}));
|
||||
|
||||
let loadNovelPreset;
|
||||
let loadNovelSettings;
|
||||
let naiSettings;
|
||||
|
||||
beforeAll(async () => {
|
||||
({
|
||||
loadNovelPreset,
|
||||
loadNovelSettings,
|
||||
nai_settings: naiSettings,
|
||||
} = await import('../public/scripts/nai-settings.js'));
|
||||
});
|
||||
|
||||
describe('NovelAI settings', () => {
|
||||
test('preserves a zero Math1 temperature when loading settings', () => {
|
||||
loadNovelSettings(
|
||||
{ novelai_setting_names: [], novelai_settings: [] },
|
||||
{ ...naiSettings, math1_temp: 0 },
|
||||
);
|
||||
expect(naiSettings.math1_temp).toBe(0);
|
||||
|
||||
naiSettings.math1_temp = 1;
|
||||
loadNovelPreset({ ...naiSettings, genamt: 150, math1_temp: 0 });
|
||||
expect(naiSettings.math1_temp).toBe(0);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,67 @@
|
||||
import { afterAll, beforeAll, beforeEach, describe, expect, jest, test } from '@jest/globals';
|
||||
|
||||
const fetchMock = jest.fn();
|
||||
jest.unstable_mockModule('node-fetch', () => ({ default: fetchMock }));
|
||||
jest.unstable_mockModule('../src/transformers.js', () => ({ getPipeline: jest.fn() }));
|
||||
jest.unstable_mockModule('../src/endpoints/secrets.js', () => ({
|
||||
readSecret: jest.fn(),
|
||||
SECRET_KEYS: {},
|
||||
}));
|
||||
|
||||
describe('Pollinations TTS model aliases', () => {
|
||||
/** @type {import('node:http').Server} */
|
||||
let server;
|
||||
let baseUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
const { default: express } = await import('express');
|
||||
const { router: speechRouter } = await import('../src/endpoints/speech.js');
|
||||
const app = express();
|
||||
app.use(express.json());
|
||||
app.use('/speech', speechRouter);
|
||||
server = app.listen(0, '127.0.0.1');
|
||||
await new Promise(resolve => server.once('listening', resolve));
|
||||
const address = server.address();
|
||||
baseUrl = `http://127.0.0.1:${address.port}`;
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await new Promise((resolve, reject) => server.close(error => error ? reject(error) : resolve()));
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fetchMock.mockReset();
|
||||
});
|
||||
|
||||
test.each([undefined, 'openai-audio', 'openai/gpt-audio-mini'])('looks up voices for %s', async (model) => {
|
||||
fetchMock.mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => [{ name: 'openai/gpt-audio-mini', aliases: ['openai-audio'], voices: ['alloy', 'nova'] }],
|
||||
});
|
||||
|
||||
const response = await fetch(`${baseUrl}/speech/pollinations/voices`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ model }),
|
||||
});
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(await response.json()).toEqual(['alloy', 'nova']);
|
||||
});
|
||||
|
||||
test('still accepts catalogs without aliases', async () => {
|
||||
fetchMock.mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => [{ name: 'openai-audio', voices: ['alloy'] }],
|
||||
});
|
||||
|
||||
const response = await fetch(`${baseUrl}/speech/pollinations/voices`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: '{}',
|
||||
});
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(await response.json()).toEqual(['alloy']);
|
||||
});
|
||||
});
|
||||
@@ -31,6 +31,8 @@ jest.unstable_mockModule('../src/express-common.js', () => ({
|
||||
|
||||
/** @type {import('../src/private-request-filter.js').default} */
|
||||
let initPrivateRequestFilter;
|
||||
/** @type {import('../src/private-request-filter.js').getUntrustedRequestAgent} */
|
||||
let getUntrustedRequestAgent;
|
||||
/** @type {import('node:http').default} */
|
||||
let http;
|
||||
/** @type {import('node:https').default} */
|
||||
@@ -39,7 +41,7 @@ let originalHttpGlobalAgent;
|
||||
let originalHttpsGlobalAgent;
|
||||
|
||||
beforeAll(async () => {
|
||||
({ default: initPrivateRequestFilter } = await import('../src/private-request-filter.js'));
|
||||
({ default: initPrivateRequestFilter, getUntrustedRequestAgent } = await import('../src/private-request-filter.js'));
|
||||
({ default: http } = await import('node:http'));
|
||||
({ default: https } = await import('node:https'));
|
||||
originalHttpGlobalAgent = http.globalAgent;
|
||||
@@ -59,14 +61,15 @@ afterAll(() => {
|
||||
https.globalAgent = originalHttpsGlobalAgent;
|
||||
});
|
||||
|
||||
function initAgent({ privateAddressWhitelist = [], allowUnresolvedHosts = false } = {}) {
|
||||
function initAgent({ privateAddressWhitelist = [], allowUnresolvedHosts = false, enabled = true, requestProxyEnabled = false } = {}) {
|
||||
initPrivateRequestFilter({
|
||||
listen: false,
|
||||
enabled: true,
|
||||
enabled,
|
||||
privateAddressWhitelist,
|
||||
logBlocked: false,
|
||||
logAllowed: false,
|
||||
allowUnresolvedHosts,
|
||||
requestProxyEnabled,
|
||||
});
|
||||
|
||||
return http.globalAgent;
|
||||
@@ -128,3 +131,69 @@ describe('private request filter', () => {
|
||||
expect(mockNetConnect).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe('untrusted request agent', () => {
|
||||
test('returns undefined when the private request filter is enabled', () => {
|
||||
initAgent({ enabled: true });
|
||||
expect(getUntrustedRequestAgent()).toBeUndefined();
|
||||
});
|
||||
|
||||
test('returns undefined when a request proxy owns outbound routing', () => {
|
||||
initAgent({ enabled: false, requestProxyEnabled: true });
|
||||
expect(getUntrustedRequestAgent()).toBeUndefined();
|
||||
});
|
||||
|
||||
test('returns the same strict agent instance when the filter is disabled', () => {
|
||||
initAgent({ enabled: false });
|
||||
const agent = getUntrustedRequestAgent();
|
||||
expect(agent).toBeDefined();
|
||||
expect(getUntrustedRequestAgent()).toBe(agent);
|
||||
});
|
||||
|
||||
test('blocks private addresses even when the configured whitelist allows them', async () => {
|
||||
initAgent({ enabled: false, privateAddressWhitelist: ['127.0.0.0/8', '::1/128'] });
|
||||
const agent = getUntrustedRequestAgent();
|
||||
|
||||
await expect(agent.connect({}, { host: '127.0.0.1', secureEndpoint: false }))
|
||||
.rejects
|
||||
.toThrow('Blocked request to private IP address: 127.0.0.1');
|
||||
await expect(agent.connect({}, { host: '::1', secureEndpoint: false }))
|
||||
.rejects
|
||||
.toThrow('Blocked request to private IP address: ::1');
|
||||
expect(mockNetConnect).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('blocks hostnames that resolve to private addresses', async () => {
|
||||
initAgent({ enabled: false });
|
||||
mockLookup.mockResolvedValue({ address: '192.168.1.8' });
|
||||
const agent = getUntrustedRequestAgent();
|
||||
|
||||
await expect(agent.connect({}, { host: 'internal.example.com', secureEndpoint: false }))
|
||||
.rejects
|
||||
.toThrow('Blocked request to private IP address: 192.168.1.8');
|
||||
expect(mockNetConnect).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('blocks unresolvable hostnames', async () => {
|
||||
initAgent({ enabled: false });
|
||||
mockLookup.mockRejectedValue(new Error('lookup failed'));
|
||||
const agent = getUntrustedRequestAgent();
|
||||
|
||||
await expect(agent.connect({}, { host: 'missing-host.local', secureEndpoint: false }))
|
||||
.rejects
|
||||
.toThrow('Unable to resolve host: missing-host.local');
|
||||
expect(mockNetConnect).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('connects public hostnames to their resolved IP for both http and https', async () => {
|
||||
initAgent({ enabled: false });
|
||||
mockLookup.mockResolvedValue({ address: '93.184.216.34' });
|
||||
const agent = getUntrustedRequestAgent();
|
||||
|
||||
await agent.connect({}, { host: 'example.com', secureEndpoint: false });
|
||||
expect(mockNetConnect).toHaveBeenCalledWith(expect.objectContaining({ host: '93.184.216.34' }));
|
||||
|
||||
await agent.connect({}, { host: 'example.com', secureEndpoint: true });
|
||||
expect(mockTlsConnect).toHaveBeenCalledWith(expect.objectContaining({ host: '93.184.216.34' }));
|
||||
});
|
||||
});
|
||||
|
||||
@@ -166,6 +166,40 @@ describe('calculateGoogleBudgetTokens', () => {
|
||||
test('max returns high', () => expect(mod.calculateGoogleBudgetTokens(8192, 'max', 'gemini-3.5-flash')).toBe('high'));
|
||||
});
|
||||
|
||||
test('Gemini 3.7 Flash uses Gemini 3 thinking levels without minimal', () => {
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'auto', 'gemini-3.7-flash')).toBeNull();
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'min', 'gemini-3.7-flash')).toBe('low');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'medium', 'gemini-3.7-flash')).toBe('medium');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'max', 'gemini-3.7-flash')).toBe('high');
|
||||
});
|
||||
|
||||
test('Gemini 3.6 Flash uses Gemini 3 thinking levels', () => {
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'auto', 'gemini-3.6-flash')).toBeNull();
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'min', 'gemini-3.6-flash')).toBe('minimal');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'medium', 'gemini-3.6-flash')).toBe('medium');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'max', 'gemini-3.6-flash')).toBe('high');
|
||||
});
|
||||
|
||||
test('Gemini 3.5 Flash-Lite uses Gemini 3 thinking levels', () => {
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'auto', 'gemini-3.5-flash-lite')).toBeNull();
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'min', 'gemini-3.5-flash-lite')).toBe('minimal');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'medium', 'gemini-3.5-flash-lite')).toBe('medium');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'max', 'gemini-3.5-flash-lite')).toBe('high');
|
||||
});
|
||||
|
||||
test('stable Gemini 3.1 Flash-Lite uses Gemini 3 thinking levels', () => {
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'min', 'gemini-3.1-flash-lite')).toBe('minimal');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'medium', 'gemini-3.1-flash-lite')).toBe('medium');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'max', 'gemini-3.1-flash-lite')).toBe('high');
|
||||
});
|
||||
|
||||
test('stable Gemini 3 image models use Gemini 3 thinking levels', () => {
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'min', 'gemini-3.1-flash-image')).toBe('minimal');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'max', 'gemini-3.1-flash-image')).toBe('high');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'min', 'gemini-3-pro-image')).toBe('low');
|
||||
expect(mod.calculateGoogleBudgetTokens(8192, 'max', 'gemini-3-pro-image')).toBe('high');
|
||||
});
|
||||
|
||||
describe('gemini-3 pro', () => {
|
||||
test('auto returns null', () => expect(mod.calculateGoogleBudgetTokens(8192, 'auto', 'gemini-3.0-pro')).toBeNull());
|
||||
test('min returns low', () => expect(mod.calculateGoogleBudgetTokens(8192, 'min', 'gemini-3.0-pro')).toBe('low'));
|
||||
@@ -1028,6 +1062,29 @@ describe('convertGooglePrompt', () => {
|
||||
expect(result.contents.filter(c => c.role === 'user')).toHaveLength(1);
|
||||
});
|
||||
|
||||
for (const model of ['gemini-3.7-flash', 'gemini-3.6-flash', 'gemini-3.5-flash-lite']) {
|
||||
test(`merges a trailing prefill into the user turn on ${model}`, () => {
|
||||
const messages = [
|
||||
{ role: 'user', content: 'Hi' },
|
||||
{ role: 'assistant', content: 'Prefill' },
|
||||
];
|
||||
const result = mod.convertGooglePrompt(messages, model, false, names);
|
||||
expect(result.contents).toHaveLength(1);
|
||||
expect(result.contents[0].role).toBe('user');
|
||||
expect(result.contents[0].parts[0].text).toBe('Hi\n\nPrefill');
|
||||
});
|
||||
}
|
||||
|
||||
test('keeps non-trailing model turns on models without prefill support', () => {
|
||||
const messages = [
|
||||
{ role: 'user', content: 'Hi' },
|
||||
{ role: 'assistant', content: 'Hello' },
|
||||
{ role: 'user', content: 'How are you?' },
|
||||
];
|
||||
const result = mod.convertGooglePrompt(messages, 'gemini-3.6-flash', false, names);
|
||||
expect(result.contents.map(c => c.role)).toEqual(['user', 'model', 'user']);
|
||||
});
|
||||
|
||||
test('converts image_url to inlineData', () => {
|
||||
const messages = [
|
||||
{ role: 'user', content: [
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
import { describe, test, expect, jest, beforeAll, afterAll, beforeEach } from '@jest/globals';
|
||||
|
||||
// secrets.js reads this config value at module load. The env var override takes
|
||||
// precedence over config.yaml, so the search router imports without a config file.
|
||||
process.env.SILLYTAVERN_ALLOWKEYSEXPOSURE = 'false';
|
||||
|
||||
const fetchMock = jest.fn();
|
||||
jest.unstable_mockModule('node-fetch', () => ({
|
||||
default: fetchMock,
|
||||
}));
|
||||
|
||||
/** @type {import('express').Router} */
|
||||
let router;
|
||||
/** @type {import('../src/private-request-filter.js').getUntrustedRequestAgent} */
|
||||
let getUntrustedRequestAgent;
|
||||
/** @type {import('node:http').Server} */
|
||||
let server;
|
||||
let baseUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
({ router } = await import('../src/endpoints/search.js'));
|
||||
({ getUntrustedRequestAgent } = await import('../src/private-request-filter.js'));
|
||||
const express = (await import('express')).default;
|
||||
const app = express();
|
||||
app.use(express.json());
|
||||
app.use('/api/search', router);
|
||||
server = app.listen(0, '127.0.0.1');
|
||||
await new Promise(resolve => server.once('listening', resolve));
|
||||
baseUrl = `http://127.0.0.1:${server.address().port}`;
|
||||
});
|
||||
|
||||
afterAll(() => new Promise(resolve => server.close(resolve)));
|
||||
|
||||
beforeEach(() => {
|
||||
fetchMock.mockReset();
|
||||
fetchMock.mockResolvedValue({
|
||||
ok: true,
|
||||
headers: { get: () => 'text/html' },
|
||||
text: async () => '<html>ok</html>',
|
||||
});
|
||||
});
|
||||
|
||||
function visit(url) {
|
||||
return fetch(`${baseUrl}/api/search/visit`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ url }),
|
||||
});
|
||||
}
|
||||
|
||||
describe('POST /api/search/visit URL validation', () => {
|
||||
const rejectedUrls = [
|
||||
['missing url', undefined],
|
||||
['empty url', ''],
|
||||
['relative url', '/etc/passwd'],
|
||||
['ftp protocol', 'ftp://example.com/'],
|
||||
['file protocol', 'file:///etc/passwd'],
|
||||
['non-standard port', 'http://example.com:8080/'],
|
||||
['literal IPv4 loopback', 'http://127.0.0.1/'],
|
||||
['literal IPv4 private', 'http://10.0.0.1/'],
|
||||
['literal IPv4 metadata service', 'http://169.254.169.254/'],
|
||||
['hex IPv4 form', 'http://0x7f000001/'],
|
||||
['octal IPv4 form', 'http://0177.0.0.1/'],
|
||||
['decimal IPv4 form', 'http://2130706433/'],
|
||||
['bracketed IPv6 loopback', 'http://[::1]/'],
|
||||
['bracketed IPv6 link-local', 'http://[fe80::1]/'],
|
||||
['localhost', 'http://localhost/'],
|
||||
['localhost subdomain', 'http://sub.localhost/'],
|
||||
['https localhost', 'https://localhost/'],
|
||||
];
|
||||
|
||||
for (const [label, url] of rejectedUrls) {
|
||||
test(`rejects ${label} with 400 before any request is made`, async () => {
|
||||
const response = await visit(url);
|
||||
expect(response.status).toBe(400);
|
||||
expect(fetchMock).not.toHaveBeenCalled();
|
||||
});
|
||||
}
|
||||
|
||||
const allowedUrls = [
|
||||
['public http url', 'http://example.com/'],
|
||||
['public https url', 'https://example.com/some/page?query=1'],
|
||||
];
|
||||
|
||||
for (const [label, url] of allowedUrls) {
|
||||
test(`passes ${label} to fetch through the untrusted request agent`, async () => {
|
||||
const response = await visit(url);
|
||||
expect(response.status).toBe(200);
|
||||
expect(await response.text()).toBe('<html>ok</html>');
|
||||
expect(fetchMock).toHaveBeenCalledTimes(1);
|
||||
expect(fetchMock).toHaveBeenCalledWith(url, expect.objectContaining({
|
||||
agent: getUntrustedRequestAgent(),
|
||||
}));
|
||||
expect(getUntrustedRequestAgent()).toBeDefined();
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,35 @@
|
||||
import { describe, test, expect } from '@jest/globals';
|
||||
import fs from 'node:fs';
|
||||
|
||||
const indexHtml = fs.readFileSync(new URL('../public/index.html', import.meta.url), 'utf8');
|
||||
const openaiJs = fs.readFileSync(new URL('../public/scripts/openai.js', import.meta.url), 'utf8');
|
||||
const styleCss = fs.readFileSync(new URL('../public/style.css', import.meta.url), 'utf8');
|
||||
const inputTags = indexHtml.match(/<input\b[^>]*>/gi) ?? [];
|
||||
|
||||
function getInputById(id) {
|
||||
return inputTags.find(tag => tag.includes(`id="${id}"`));
|
||||
}
|
||||
|
||||
describe('secret inputs', () => {
|
||||
test('keeps the proxy access key out of password manager form detection', () => {
|
||||
const input = getInputById('openai_proxy_access_key');
|
||||
|
||||
expect(input).toBeDefined();
|
||||
expect(input).toContain('type="text"');
|
||||
expect(input).toContain('masked-secret');
|
||||
expect(input).not.toMatch(/\sform=/i);
|
||||
expect(indexHtml).not.toContain('id="openai_proxy_password"');
|
||||
expect(openaiJs).not.toContain('#openai_proxy_password');
|
||||
expect(openaiJs).toMatch(/proxy_password:\s*\['#openai_proxy_access_key', 'proxy_password'/);
|
||||
expect(openaiJs).toMatch(/\$\('#openai_proxy_access_key'\)\.toggleClass\('masked-secret'\)/);
|
||||
expect(openaiJs).toMatch(/\$\('#openai_proxy_access_key'\)\.on\('copy cut', function \(event\) \{\s*if \(\$\(this\)\.hasClass\('masked-secret'\)\) \{\s*event\.preventDefault\(\);/s);
|
||||
expect(styleCss).toMatch(/\.masked-secret\s*{[^}]*-webkit-text-security:\s*disc;/s);
|
||||
});
|
||||
|
||||
test('uses a regular text input for the Azure API key', () => {
|
||||
const input = getInputById('api_key_azure_openai');
|
||||
|
||||
expect(input).toBeDefined();
|
||||
expect(input).toContain('type="text"');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,113 @@
|
||||
import { afterAll, beforeAll, beforeEach, describe, expect, jest, test } from '@jest/globals';
|
||||
|
||||
const fetchMock = jest.fn();
|
||||
jest.unstable_mockModule('node-fetch', () => ({ default: fetchMock }));
|
||||
jest.unstable_mockModule('../src/endpoints/secrets.js', () => ({
|
||||
readSecret: jest.fn(),
|
||||
SECRET_KEYS: {},
|
||||
}));
|
||||
|
||||
describe('ComfyUI generation', () => {
|
||||
/** @type {import('node:http').Server} */
|
||||
let server;
|
||||
let baseUrl;
|
||||
|
||||
beforeAll(async () => {
|
||||
const { default: express } = await import('express');
|
||||
const { router } = await import('../src/endpoints/stable-diffusion.js');
|
||||
const app = express();
|
||||
app.use(express.json());
|
||||
app.use(router);
|
||||
server = app.listen(0, '127.0.0.1');
|
||||
await new Promise(resolve => server.once('listening', resolve));
|
||||
const address = server.address();
|
||||
baseUrl = `http://127.0.0.1:${address.port}`;
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await new Promise((resolve, reject) => server.close(error => error ? reject(error) : resolve()));
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fetchMock.mockReset();
|
||||
});
|
||||
|
||||
test('skips output nodes without images', async () => {
|
||||
fetchMock
|
||||
.mockResolvedValueOnce({ ok: true, json: async () => ({ prompt_id: 'prompt-1' }) })
|
||||
.mockResolvedValueOnce({
|
||||
ok: true,
|
||||
json: async () => ({
|
||||
'prompt-1': {
|
||||
status: { status_str: 'success' },
|
||||
outputs: {
|
||||
117: { a_images: [{ filename: 'comparison.png' }] },
|
||||
197: { images: [{ filename: 'result.png', subfolder: '', type: 'temp' }] },
|
||||
},
|
||||
},
|
||||
}),
|
||||
})
|
||||
.mockResolvedValueOnce({ ok: true, arrayBuffer: async () => Uint8Array.from([1, 2, 3]).buffer });
|
||||
|
||||
const response = await fetch(`${baseUrl}/comfy/generate`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ url: 'http://127.0.0.1:8188', prompt: '{}' }),
|
||||
});
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(await response.json()).toEqual({ format: 'png', data: 'AQID' });
|
||||
});
|
||||
|
||||
test('falls back to gifs when no output node has images', async () => {
|
||||
fetchMock
|
||||
.mockResolvedValueOnce({ ok: true, json: async () => ({ prompt_id: 'prompt-2' }) })
|
||||
.mockResolvedValueOnce({
|
||||
ok: true,
|
||||
json: async () => ({
|
||||
'prompt-2': {
|
||||
status: { status_str: 'success' },
|
||||
outputs: {
|
||||
10: { text: ['some non-media output'] },
|
||||
42: { gifs: [{ filename: 'animation.webp', subfolder: '', type: 'output' }] },
|
||||
},
|
||||
},
|
||||
}),
|
||||
})
|
||||
.mockResolvedValueOnce({ ok: true, arrayBuffer: async () => Uint8Array.from([4, 5, 6]).buffer });
|
||||
|
||||
const response = await fetch(`${baseUrl}/comfy/generate`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ url: 'http://127.0.0.1:8188', prompt: '{}' }),
|
||||
});
|
||||
|
||||
expect(response.status).toBe(200);
|
||||
expect(await response.json()).toEqual({ format: 'webp', data: 'BAUG' });
|
||||
});
|
||||
|
||||
test('reports an error when no output has images or gifs', async () => {
|
||||
fetchMock
|
||||
.mockResolvedValueOnce({ ok: true, json: async () => ({ prompt_id: 'prompt-3' }) })
|
||||
.mockResolvedValueOnce({
|
||||
ok: true,
|
||||
json: async () => ({
|
||||
'prompt-3': {
|
||||
status: { status_str: 'success' },
|
||||
outputs: {
|
||||
10: { text: ['no media at all'] },
|
||||
},
|
||||
},
|
||||
}),
|
||||
});
|
||||
|
||||
const response = await fetch(`${baseUrl}/comfy/generate`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ url: 'http://127.0.0.1:8188', prompt: '{}' }),
|
||||
});
|
||||
|
||||
expect(response.status).toBe(500);
|
||||
expect(await response.text()).toContain('did not return any recognizable outputs');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,136 @@
|
||||
import { afterEach, beforeEach, describe, test, expect, jest } from '@jest/globals';
|
||||
import fs from 'node:fs';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { getImages } from '../src/util';
|
||||
import { MEDIA_REQUEST_TYPE } from '../src/constants';
|
||||
|
||||
describe('getImages', () => {
|
||||
let tmpDir;
|
||||
|
||||
beforeEach(() => {
|
||||
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'st-getimages-'));
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
fs.rmSync(tmpDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
function writeFile(name, mtimeMs = null) {
|
||||
const filePath = path.join(tmpDir, name);
|
||||
fs.writeFileSync(filePath, '');
|
||||
if (mtimeMs !== null) {
|
||||
const secs = mtimeMs / 1000;
|
||||
fs.utimesSync(filePath, secs, secs);
|
||||
}
|
||||
}
|
||||
|
||||
test('sorts by name with natural collation', () => {
|
||||
writeFile('b.png');
|
||||
writeFile('a.png');
|
||||
writeFile('c.png');
|
||||
expect(getImages(tmpDir, 'name')).toEqual(['a.png', 'b.png', 'c.png']);
|
||||
});
|
||||
|
||||
test('sorts by date oldest-first using file mtime', () => {
|
||||
writeFile('newest.png', 3_000_000);
|
||||
writeFile('oldest.png', 1_000_000);
|
||||
writeFile('middle.png', 2_000_000);
|
||||
expect(getImages(tmpDir, 'date')).toEqual(['oldest.png', 'middle.png', 'newest.png']);
|
||||
});
|
||||
|
||||
test('reads each file mtime only once when sorting by date', () => {
|
||||
for (let i = 0; i < 8; i++) {
|
||||
writeFile(`img${i}.png`, (8 - i) * 1_000_000);
|
||||
}
|
||||
const spy = jest.spyOn(fs, 'statSync');
|
||||
try {
|
||||
const result = getImages(tmpDir, 'date');
|
||||
expect(result).toEqual(['img7.png', 'img6.png', 'img5.png', 'img4.png', 'img3.png', 'img2.png', 'img1.png', 'img0.png']);
|
||||
expect(spy).toHaveBeenCalledTimes(8);
|
||||
} finally {
|
||||
spy.mockRestore();
|
||||
}
|
||||
});
|
||||
|
||||
test('falls back to mtime 0 if a file disappears between readdir and stat', () => {
|
||||
writeFile('survivor.png', 2_000_000);
|
||||
writeFile('ghost.png', 1_000_000);
|
||||
const realStat = fs.statSync;
|
||||
const spy = jest.spyOn(fs, 'statSync').mockImplementation((p, ...rest) => {
|
||||
if (typeof p === 'string' && p.endsWith('ghost.png')) {
|
||||
const err = new Error('ENOENT');
|
||||
err.code = 'ENOENT';
|
||||
throw err;
|
||||
}
|
||||
return realStat(p, ...rest);
|
||||
});
|
||||
try {
|
||||
expect(getImages(tmpDir, 'date')).toEqual(['ghost.png', 'survivor.png']);
|
||||
} finally {
|
||||
spy.mockRestore();
|
||||
}
|
||||
});
|
||||
|
||||
test('propagates non-ENOENT stat errors (e.g. EACCES) instead of masking them', () => {
|
||||
writeFile('readable.png', 1_000_000);
|
||||
writeFile('forbidden.png', 2_000_000);
|
||||
const realStat = fs.statSync;
|
||||
const spy = jest.spyOn(fs, 'statSync').mockImplementation((p, ...rest) => {
|
||||
if (typeof p === 'string' && p.endsWith('forbidden.png')) {
|
||||
const err = new Error('EACCES');
|
||||
err.code = 'EACCES';
|
||||
throw err;
|
||||
}
|
||||
return realStat(p, ...rest);
|
||||
});
|
||||
try {
|
||||
expect(() => getImages(tmpDir, 'date')).toThrow(/EACCES/);
|
||||
} finally {
|
||||
spy.mockRestore();
|
||||
}
|
||||
});
|
||||
|
||||
test('filters to image types by default', () => {
|
||||
writeFile('keep.png');
|
||||
writeFile('keep.jpg');
|
||||
writeFile('drop.mp4');
|
||||
writeFile('drop.mp3');
|
||||
writeFile('drop.txt');
|
||||
writeFile('no-extension');
|
||||
expect(getImages(tmpDir, 'name')).toEqual(['keep.jpg', 'keep.png']);
|
||||
});
|
||||
|
||||
test('filters to video types when requested', () => {
|
||||
writeFile('drop.png');
|
||||
writeFile('keep.mp4');
|
||||
writeFile('keep.webm');
|
||||
expect(getImages(tmpDir, 'name', MEDIA_REQUEST_TYPE.VIDEO)).toEqual(['keep.mp4', 'keep.webm']);
|
||||
});
|
||||
|
||||
test('filters to audio types when requested', () => {
|
||||
writeFile('drop.png');
|
||||
writeFile('keep.mp3');
|
||||
writeFile('keep.wav');
|
||||
expect(getImages(tmpDir, 'name', MEDIA_REQUEST_TYPE.AUDIO)).toEqual(['keep.mp3', 'keep.wav']);
|
||||
});
|
||||
|
||||
test('accepts combined media-type bitmask', () => {
|
||||
writeFile('img.png');
|
||||
writeFile('clip.mp4');
|
||||
writeFile('song.mp3');
|
||||
const result = getImages(tmpDir, 'name', MEDIA_REQUEST_TYPE.IMAGE | MEDIA_REQUEST_TYPE.AUDIO);
|
||||
expect(result).toEqual(['img.png', 'song.mp3']);
|
||||
});
|
||||
|
||||
test('skips subdirectories', () => {
|
||||
writeFile('real.png');
|
||||
fs.mkdirSync(path.join(tmpDir, 'sub.png'));
|
||||
expect(getImages(tmpDir, 'name')).toEqual(['real.png']);
|
||||
});
|
||||
|
||||
test('returns empty array for an empty directory', () => {
|
||||
expect(getImages(tmpDir, 'name')).toEqual([]);
|
||||
expect(getImages(tmpDir, 'date')).toEqual([]);
|
||||
});
|
||||
});
|
||||
@@ -29,6 +29,7 @@ import {
|
||||
generateTimestamp,
|
||||
mergeObjectWithYaml,
|
||||
excludeKeysByYaml,
|
||||
getArrayBufferSlice,
|
||||
Cache,
|
||||
MemoryLimitedMap,
|
||||
} from '../src/util';
|
||||
@@ -519,6 +520,25 @@ describe('mergeObjectWithYaml', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('getArrayBufferSlice', () => {
|
||||
test('returns an exact ArrayBuffer for Buffer views', () => {
|
||||
const source = Buffer.alloc(16, 0);
|
||||
source.write('abc', 4, 'utf8');
|
||||
const view = source.subarray(4, 7);
|
||||
|
||||
expect(view.byteLength).toBe(3);
|
||||
expect(view.buffer.byteLength).toBe(16);
|
||||
|
||||
const exact = getArrayBufferSlice(view);
|
||||
expect(exact.byteLength).toBe(3);
|
||||
expect(Buffer.from(exact).toString('utf8')).toBe('abc');
|
||||
});
|
||||
|
||||
test('throws for non-Uint8Array input', () => {
|
||||
expect(() => getArrayBufferSlice('abc')).toThrow(TypeError);
|
||||
});
|
||||
});
|
||||
|
||||
describe('excludeKeysByYaml', () => {
|
||||
test('should delete keys listed in a YAML array', () => {
|
||||
const obj = { a: 1, b: 2, c: 3 };
|
||||
|
||||
Reference in New Issue
Block a user