test

.gitattributes

@@ -1,40 +0,0 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tar filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text
-lib/bin/clewd-superfetch-android-arm filter=lfs diff=lfs merge=lfs -text
-lib/bin/clewd-superfetch-linux-amd64 filter=lfs diff=lfs merge=lfs -text
-lib/bin/clewd-superfetch-linux-arm64 filter=lfs diff=lfs merge=lfs -text
-lib/bin/clewd-superfetch-mac-amd64 filter=lfs diff=lfs merge=lfs -text
-lib/bin/clewd-superfetch-win-amd64.exe filter=lfs diff=lfs merge=lfs -text

clewd.js

@@ -29,7 +29,7 @@ const convertToType = value => {
     return value;
 }, CookieCleaner = () => {
     Config.CookieArray = Config.CookieArray.filter(item => item !== Config.Cookie);
-    !process.env.Cookie && !process.env.CookieArray && writeSettings(Config);
+    writeSettings(Config);
     currentIndex = (currentIndex - 1 + Config.CookieArray.length) % Config.CookieArray.length;
 }, padtxt = content => {
     const {countTokens} = require('@anthropic-ai/tokenizer');
@@ -37,18 +37,8 @@ const convertToType = value => {
     tokens = countTokens(content);
     !apiKey && (content = placeholder.repeat(Math.floor(Math.max(1000, Config.Settings.padtxt - tokens) / countTokens(placeholder.trim()))) + '\n\n\n' + content.trim());
     return content;
-}, xmlPlot = content => {
-    // 检查内容中是否包含"<card>"
+}, xmlPlot = (content, nonsys = false) => {
     const card = content.includes('<card>');
-    //<card>越狱倒置
-    if (card) {
-        let segcontentHuman = content.split('\n\nHuman:');
-        const seglength = segcontentHuman.length;
-        if (/Assistant: *.$/.test(content) && seglength > 1 && !segcontentHuman[seglength - 2].includes('\n\nAssistant:')) {
-            segcontentHuman[seglength - 2] = segcontentHuman.splice(seglength - 1, 1, segcontentHuman[seglength - 2])[0];
-        }
-        content = segcontentHuman.join('\n\nHuman:');
-    }
     //role合并
     const MergeDisable = content.includes('<\!-- Merge Disable -->');
     const MergeHumanDisable = content.includes('<\!-- Merge Human Disable -->');
@@ -58,20 +48,16 @@ const convertToType = value => {
             content = content.replace(/(\n\n|^\s*)xmlPlot:\s*/gm, '$1');
         }
         if (!MergeHumanDisable) {
-            const Human = /^\s*Human:/.test(content);
-            content = content.replace(/(\n\n|^\s*)xmlPlot:/g, '$1Human:');
+            nonsys ? content = content.replace(/(\n\n|^\s*)xmlPlot:/g, '\n\nHuman:') : content = content.replace(/(?<!\n\n(Human|Assistant):.*?)(\n\n|^\s*)xmlPlot:\s*/gs, '$1');
             content = content.replace(/(?:\n\n|^\s*)Human:(.*?(?:\n\nAssistant:|$))/gs, function(match, p1) {return '\n\nHuman:' + p1.replace(/\n\nHuman:\s*/g, '\n\n')});
-            !apiKey && !Human && (content = content.replace(/^\s*Human:\s*/, ''));
         }
         if (!MergeAssistantDisable) {
             content = content.replace(/\n\nAssistant:(.*?(?:\n\nHuman:|$))/gs, function(match, p1) {return '\n\nAssistant:' + p1.replace(/\n\nAssistant:\s*/g, '\n\n')});
         }
     }
-    content = content.replace(/(\n\n|^\s*)xmlPlot:\s*/gm, '$1');
-    content = content.replace(/<\!-- Merge.*?Disable -->/gm, '');
+    content = content.replace(/(\n\n|^\s*)xmlPlot:\s*/gm, '$1').replace(/<\!-- Merge.*?Disable -->/gm, '');
     //自定义插入
-    content = content.replace(/(<\/?)PrevAssistant>/gm, '$1@1>');
-    content = content.replace(/(<\/?)PrevHuman>/gm, '$1@2>');
+    content = content.replace(/(<\/?)PrevAssistant>/gm, '$1@1>').replace(/(<\/?)PrevHuman>/gm, '$1@2>');
     let splitContent = content.split(/\n\n(?=Assistant:|Human:)/g);
     let match;
     while ((match = /<@(\d+)>(.*?)<\/@\1>/gs.exec(content)) !== null) {
@@ -103,18 +89,15 @@ const convertToType = value => {
     //Plain Prompt
     let segcontentHuman = content.split('\n\nHuman:');
     let segcontentlastIndex = segcontentHuman.length - 1;
-    if (segcontentlastIndex >= 2 && segcontentHuman[segcontentlastIndex].includes('<!-- Plain Prompt Enable -->') && !content.includes('\n\nPlainPrompt:')) {
-        content = segcontentHuman.slice(0, segcontentlastIndex).join('\n\nHuman:') + '\n\nPlainPrompt:' + segcontentHuman.slice(segcontentlastIndex).join('\n\nHuman:');
+    if (!apiKey && segcontentlastIndex >= 2 && segcontentHuman[segcontentlastIndex].includes('<!-- Plain Prompt Enable -->') && !content.includes('\n\nPlainPrompt:')) {
+        content = segcontentHuman.slice(0, segcontentlastIndex).join('\n\nHuman:') + '\n\nPlainPrompt:' + segcontentHuman.slice(segcontentlastIndex).join('\n\nHuman:').replace(/\n\nHuman: *PlainPrompt:/, '\n\nPlainPrompt:');
     }
     content = content.replace(/<\!-- Plain Prompt Enable -->/gm, '');
-    content = content.replace(/\n\nHuman: *PlainPrompt:/, '\n\nPlainPrompt:');
     //<card>群组
     if (!card) {
-        content = content.replace(/(<reply>\n|\n<\/reply>)/g, '');
-        return content.replace(/<customname>(.*?)<\/customname>/gm, '$1');
+        return content.replace(/(<reply>\n|\n<\/reply>)/g, '').replace(/<customname>(.*?)<\/customname>/gm, '$1');
     } else {
-        content = content.replace(/(<reply>\n|\n<\/reply>)\1*/g, '$1');
-        content = content.replace(/<customname>(.*?)<\/customname>:/gm, '$1:\n');
+        content = content.replace(/(<reply>\n|\n<\/reply>)\1*/g, '$1').replace(/<customname>(.*?)<\/customname>:/gm, '$1:\n');
     }
     //<card>在第一个"[Start a new"前面加上"<example>"，在最后一个"[Start a new"前面加上"</example>\n\n<plot>\n\n"
     const cardtag = content.match(/(?=\n\n<\/card>)/) || '</card>';
@@ -125,14 +108,23 @@ const convertToType = value => {
     firstChatStart != -1 && firstChatStart === lastChatStart && (content = content.slice(0, firstChatStart) + `\n\n${cardtag}` + content.slice(firstChatStart));
     firstChatStart != lastChatStart && (content = content.slice(0, firstChatStart) + `\n\n${cardtag}\n<example>` + content.slice(firstChatStart, lastChatStart) + `\n\n${exampletag}\n\n${plot}` + content.slice(lastChatStart));
     //<card>消除空XML tags、两端空白符和多余的\n
-    content = content.replace(/\s*<\|curtail\|>\s*/g, '\n');
-    content = content.replace(/\n<\/(card|hidden|META)>\s+?<\1>\n/g, '\n');
-    content = content.replace(/\n<(\/?card|example|hidden|plot|META)>\s+?<\1>/g, '\n<$1>');
-    content = content.replace(/(?:<!--.*?-->)?\n<(card|example|hidden|plot|META)>\s+?<\/\1>/g, '');
-    content = content.replace(/(?<=(: |\n)<(card|hidden|example|plot|META|EOT)>\n)\s*/g, '');
-    content = content.replace(/\s*(?=\n<\/(card|hidden|example|plot|META|EOT)>(\n|$))/g, '');
-    content = content.replace(/(?<=\n)\n(?=\n)/g, '');
-    return content.trim().replace(/^\s*Human:/, '\n\nHuman:');
+    content = content.replace(/\s*<\|curtail\|>\s*/g, '\n')
+        .replace(/\n<\/(card|hidden|META)>\s+?<\1>\n/g, '\n')
+        .replace(/\n<(\/?card|example|hidden|plot|META)>\s+?<\1>/g, '\n<$1>')
+        .replace(/(?:<!--.*?-->)?\n<(card|example|hidden|plot|META)>\s+?<\/\1>/g, '')
+        .replace(/(?<=(: |\n)<(card|hidden|example|plot|META|EOT)>\n)\s*/g, '')
+        .replace(/\s*(?=\n<\/(card|hidden|example|plot|META|EOT)>(\n|$))/g, '')
+        .replace(/(?<=\n)\n(?=\n)/g, '');
+    //确保格式正确
+    if (apiKey) {
+        content = content.trim().replace(/^Human:/, '\n\nHuman:')
+            .replace(/(\n\nAssistant|\n\nHuman):(?!.*?\n\n(Assistant|Human):).*$/s, function(match, p1) {return p1 === '\n\nAssistant' ? match : match + '\n\nAssistant: '})
+            .replace(/\s*<\|noAssistant\|>\s*(.*?)(?:\n\nAssistant:)?$/s, '\n\n$1');
+        content.includes('<|reverseHA|>') && (content = content.replace(/\s*<\|reverseHA\|>\s*/g, '\n\n').replace(/\n\n(Assistant|Human):/g, function(match, p1) {return p1 === 'Human' ? '\n\nAssistant:' : '\n\nHuman:'}))
+        return content;
+    } else {
+        return content.trim().replace(/^Human:|\n\nAssistant:$/g, '');
+    }
 };
 /******************************************************* */
 
@@ -395,6 +387,7 @@ const updateParams = res => {
     }
 /***************************** */
 }, writeSettings = async (config, firstRun = false) => {
+    if (process.env.Cookie || process.env.CookieArray) return ChangedSettings = '', UnknownSettings = '';
     write(ConfigPath, `/*\n* https://rentry.org/teralomaniac_clewd\n* https://github.com/teralomaniac/clewd\n*/\n\n// SET YOUR COOKIE BELOW\n\nmodule.exports = ${JSON.stringify(config, null, 4)}\n\n/*\n BufferSize\n * How many characters will be buffered before the AI types once\n * lower = less chance of \`PreventImperson\` working properly\n\n ---\n\n SystemInterval\n * How many messages until \`SystemExperiments alternates\`\n\n ---\n\n Other settings\n * https://gitgud.io/ahsk/clewd/#defaults\n * and\n * https://gitgud.io/ahsk/clewd/-/blob/master/CHANGELOG.md\n */`.trim().replace(/((?<!\r)\n|\r(?!\n))/g, '\r\n'));
     if (firstRun) {
         console.warn('config file created!\nedit config.js to set your settings and restart the program');
@@ -678,11 +671,13 @@ const updateParams = res => {
                     console.log(`${apiKey ? api_model : model} [${type}]${!retryRegen && systems.length > 0 ? ' ' + systems.join(' / ') : ''}`); //console.log(`${model} [${type}]${!retryRegen && systems.length > 0 ? ' ' + systems.join(' / ') : ''}`);
                     'R' !== type || prompt || (prompt = '...regen...');
 /******************************** */
-                    prompt = Config.Settings.xmlPlot ? xmlPlot(prompt) : genericFixes(prompt);
-                    !apiKey && Config.Settings.FullColon && (prompt = prompt.replace(/(?<=\n\n(H(?:uman)?|A(?:ssistant)?)):[ ]?/g, '： '));
+                    prompt = Config.Settings.xmlPlot ? xmlPlot(prompt, api_model && api_model != 'claude-2.1') : apiKey ? `\n\nHuman: ${genericFixes(prompt)}\n\nAssistant: ` : genericFixes(prompt);
+                    Config.Settings.FullColon && (prompt = apiKey
+                        ? prompt.replace(/(\n\nAssistant|\n\nHuman):/, function(match, p1) {return p1 === '\n\nHuman' ? match : p1 + '：'}).replace(/(\n\nAssistant|\n\nHuman):(?!.*?\n\n(Assistant|Human):)/s, function(match, p1) {return p1 === '\n\nAssistant' ? match : p1 + '：'})
+                        : prompt.replace(/(?<=\n\n(H(?:uman)?|A(?:ssistant)?)):[ ]?/g, '： '));
                     Config.Settings.padtxt && (prompt = padtxt(prompt));
 /******************************** */
-                    Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### PROMPT (${type}):\n${prompt}\n--\n####### [Tokens: ${tokens}] REPLY:\n`); //Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### PROMPT (${type}):\n${prompt}\n--\n####### REPLY:\n`);
+                    Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### ${apiKey ? api_model : model} PROMPT (${type}):\n${prompt}\n--\n####### [Tokens: ${tokens}] REPLY:\n`); //Logger?.write(`\n\n-------\n[${(new Date).toLocaleString()}]\n####### PROMPT (${type}):\n${prompt}\n--\n####### REPLY:\n`);
                     retryRegen || (fetchAPI = await (async (signal, model, prompt, temperature, type) => {
 /******************************** */
                         if (apiKey) {
@@ -816,7 +811,7 @@ const updateParams = res => {
       default:
         !['/', '/v1', '/favicon.ico'].includes(req.url) && (console.log('unknown request: ' + req.url)); //console.log('unknown request: ' + req.url);
         res.writeHead(200, {'Content-Type': 'text/html'});
-        res.write(`<!DOCTYPE html>\n<html>\n<head>\n<meta charset="utf-8">\n<script>\nfunction copyToClipboard(text) {\n  var textarea = document.createElement("textarea");\n  textarea.textContent = text;\n  textarea.style.position = "fixed";\n  document.body.appendChild(textarea);\n  textarea.select();\n  try {\n    return document.execCommand("copy");\n  } catch (ex) {\n    console.warn("Copy to clipboard failed.", ex);\n    return false;\n  } finally {\n    document.body.removeChild(textarea);\n  }\n}\nfunction copyLink(event) {\n  event.preventDefault();\n  const url = new URL(window.location.href);\n  const link = url.protocol + '//' + url.host + '/v1';\n  copyToClipboard(link);\n  alert('链接已复制: ' + link);\n}\n</script>\n</head>\n<body>\n${Main}<br/><br/>完全开源、免费且禁止商用<br/><br/>反向代理: <a href="v1" onclick="copyLink(event)">点击复制链接</a><br/>填入OpenAI API反向代理并选择OpenAI分类中的claude-2模型（酒馆需打开Show "External" models）<br/><br/>教程与FAQ: <a href="https://rentry.org/teralomaniac_clewd" target="FAQ">https://rentry.org/teralomaniac_clewd</a>\n</body>\n</html>`);
+        res.write(`<!DOCTYPE html>\n<html>\n<head>\n<meta charset="utf-8">\n<script>\nfunction copyToClipboard(text) {\n  var textarea = document.createElement("textarea");\n  textarea.textContent = text;\n  textarea.style.position = "fixed";\n  document.body.appendChild(textarea);\n  textarea.select();\n  try {\n    return document.execCommand("copy");\n  } catch (ex) {\n    console.warn("Copy to clipboard failed.", ex);\n    return false;\n  } finally {\n    document.body.removeChild(textarea);\n  }\n}\nfunction copyLink(event) {\n  event.preventDefault();\n  const url = new URL(window.location.href);\n  const link = url.protocol + '//' + url.host + '/v1';\n  copyToClipboard(link);\n  alert('链接已复制: ' + link);\n}\n</script>\n</head>\n<body>\n${Main}<br/><br/>完全开源、免费且禁止商用<br/><br/>点击复制反向代理: <a href="v1" onclick="copyLink(event)">Copy Link</a><br/>填入OpenAI API反向代理并选择OpenAI分类中的claude模型（酒馆需打开Show "External" models，仅在api模式有模型选择差异）<br/><br/>教程与FAQ: <a href="https://rentry.org/teralomaniac_clewd" target="FAQ">Rentry</a> | <a href="https://discord.com/invite/B7Wr25Z7BZ" target="FAQ">Discord</a><br/><br/><br/>请举报恶意盗用/商用本教程及Clewd修改版的这个B 站up<a href="https://space.bilibili.com/35307060" target="FAQ">浅睡一天一夜</a>\n</body>\n</html>`);
         res.end();
         /*res.json(
             {
@@ -872,9 +867,9 @@ const updateParams = res => {
             Config[key] = key === 'CookieArray' ? (process.env[key]?.split(',')?.map(x => x.replace(/[\[\]"\s]/g, '')) ?? Config[key]) : (convertToType(process.env[key]) ?? Config[key]);
         }
     }
-    Config.rProxy = Config.rProxy.endsWith('/') ? Config.rProxy.slice(0, -1) : Config.rProxy || AI.end();
+    Config.rProxy = Config.rProxy ? Config.rProxy.replace(/\/$/, '') : AI.end();
     Config.CookieArray = [...new Set(Config.CookieArray)];
-    !process.env.Cookie && !process.env.CookieArray && writeSettings(Config);
+    writeSettings(Config);
     currentIndex = Config.CookieIndex > 0 ? Config.CookieIndex - 1 : Config.Cookiecounter >= 0 ? Math.floor(Math.random() * Config.CookieArray.length) : 0;
 /***************************** */
     Proxy.listen(Config.Port, Config.Ip, onListen);

config.js

@@ -1,63 +0,0 @@
-/*
-* https://rentry.org/teralomaniac_clewd
-* https://github.com/teralomaniac/clewd
-*/
-
-// SET YOUR COOKIE BELOW
-
-module.exports = {
-    "Cookie": "",
-    "CookieArray": [],
-    "Cookiecounter": 1,
-    "CookieIndex": 0,
-    "ProxyPassword": "",
-    "Ip": "0.0.0.0",
-    "Port": 7860,
-    "localtunnel": false,
-    "BufferSize": 1,
-    "SystemInterval": 3,
-    "rProxy": "",
-    "api_rProxy": "",
-    "padtxt_placeholder": "",
-    "PromptExperimentFirst": "",
-    "PromptExperimentNext": "",
-    "PersonalityFormat": "{{char}}'s personality: {{personality}}",
-    "ScenarioFormat": "Dialogue scenario: {{scenario}}",
-    "Settings": {
-        "RenewAlways": true,
-        "RetryRegenerate": false,
-        "PromptExperiments": true,
-        "SystemExperiments": true,
-        "PreventImperson": false,
-        "AllSamples": false,
-        "NoSamples": false,
-        "StripAssistant": false,
-        "StripHuman": false,
-        "PassParams": false,
-        "ClearFlags": true,
-        "PreserveChats": false,
-        "LogMessages": true,
-        "FullColon": true,
-        "padtxt": 15000,
-        "xmlPlot": true,
-        "Superfetch": false
-    }
-}
-
-/*
- BufferSize
- * How many characters will be buffered before the AI types once
- * lower = less chance of `PreventImperson` working properly
-
- ---
-
- SystemInterval
- * How many messages until `SystemExperiments alternates`
-
- ---
-
- Other settings
- * https://gitgud.io/ahsk/clewd/#defaults
- * and
- * https://gitgud.io/ahsk/clewd/-/blob/master/CHANGELOG.md
- */

start.bat

@@ -1,5 +0,0 @@
-pushd %~dp0
-call npm install --no-audit --fund false
-node clewd.js
-pause
-popd

start.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if ! command -v npm &> /dev/null
-then
-    echo "Install nodejs"
-fi
-
-npm install --no-audit --fund false
-chown -R $(whoami) lib/bin/*
-chmod u+x lib/bin/*
-chmod -R 777 $(pwd)
-node clewd.js

update.bat

@@ -1,37 +0,0 @@
-@echo off
-pushd %~dp0
-
-if not exist .git (
-  GOTO:notgit
-)
-
-where /q git.exe
-if %ERRORLEVEL% EQU 0 (
-  GOTO:pull
-)
-GOTO:missgit
-
-
-:pull
-call git config --local url."https://".insteadOf git://
-call git config --local url."https://github.com/".insteadOf git@github.com:
-call git config --local url."https://".insteadOf ssh://
-call git pull --rebase --autostash
-if %ERRORLEVEL% neq 0 (
-  echo Error updating
-)
-GOTO:end
-
-:missgit
-echo Install git to update
-GOTO:end
-
-:notgit
-echo Only able to update if you clone the repository (git clone https://github.com/teralomaniac/clewd.git)
-GOTO:end
-
-
-:end
-pause
-popd
-exit /B

update.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if ! [ -x "$(command -v git)" ]
-then
-	echo "Install git to update"
-	exit
-fi
-
-if [ -x "$(command -v git)" ]
-then
-    if [ -d ".git" ]
-	then
-		git config --local url."https://".insteadOf git://
-		git config --local url."https://github.com/".insteadOf git@github.com:
-		git config --local url."https://".insteadOf ssh://
-		git pull --rebase --autostash
-	else
-		echo "Only able to update if you clone the repository (git clone https://github.com/teralomaniac/clewd.git)"
-	fi
-fi