rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
SillyLossy
2023-04-20 17:11:21 +03:00
parent 60bfcc1a6b 1718452efb
commit f591961dd7
10 changed files with 110 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -13,3 +13,4 @@ config.conf
.DS_Store
public/settings.json
/thumbnails
whitelist.txt

6
Dockerfile
View File

@@ -3,6 +3,10 @@ FROM node:19.1.0-alpine3.16
# Arguments
ARG APP_HOME=/home/node/app
# Ensure proper handling of kernel signals
RUN apk add tini
ENTRYPOINT [ "tini", "--" ]
# Create app directory
WORKDIR ${APP_HOME}
@@ -42,4 +46,4 @@ RUN \
EXPOSE 8000
ENTRYPOINT [ "/bin/sh", "-c", "./docker-entrypoint.sh" ]
CMD [ "./docker-entrypoint.sh" ]

1
colab/GPU.ipynb
View File

@@ -300,7 +300,6 @@
" \"characters\",\n",
" \"chats\",\n",
" \"User Avatars\",\n",
" \"css\",\n",
" \"worlds\",\n",
" \"group chats\",\n",
" \"groups\",\n",

2
docker/docker-entrypoint.sh
View File

@@ -25,4 +25,4 @@ if [ ! -s "/home/node/app/config/settings.json" ]; then
fi
# Start the server
node /home/node/app/server.js
exec node /home/node/app/server.js

3
public/index.html
View File

@@ -1313,6 +1313,7 @@
</div>
<div class="drawer-content closedDrawer">
<div class="flex-container">
<input id="bg-filter" placeholder="Filter" class="text_pole" type="search" />
<div id="bg_menu_content">
<form id="form_bg_download" class="bg_example no-border no-shadow" action="javascript:void(null);" method="post" enctype="multipart/form-data">
<label class="input-file">
@@ -1891,4 +1892,4 @@
</div>
</body>
</html>
</html>

22
public/script.js
View File

@@ -878,7 +878,7 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
mes = mes.replace(/\n/g, "<br/>");
mes = mes.trim();
mes = mes.replace(/<code>[\s\S]*?<\/code>/g, function (match) {
mes = mes.replace(/<code(.*)>[\s\S]*?<\/code>/g, function (match) {
return match.replace(/&amp;/g, '&');
});
}
@@ -1344,7 +1344,7 @@ async function Generate(type, automatic_trigger, force_name2) {
} else {
//console.log('Regenerate call detected')
var textareaText = "";
if (chat[chat.length - 1]['is_user']) {//If last message from You
if (chat.length && chat[chat.length - 1]['is_user']) {//If last message from You
}
else if (type !== "swipe" && !isImpersonate) {
@@ -1485,7 +1485,7 @@ async function Generate(type, automatic_trigger, force_name2) {
if (!storyString.endsWith('\n')) {
storyString += '\n';
}
const replaceString = power_user.disable_examples_formatting ? `This is how ${name2} should talk` : '';
const replaceString = power_user.disable_examples_formatting ? '' : `This is how ${name2} should talk`;
example = example.replace(/<START>/i, replaceString);
}
storyString += appendToStoryString(example, '');
@@ -3499,6 +3499,10 @@ $(document).ready(function () {
chat[chat.length - 1]['swipes'][0] = chat[chat.length - 1]['mes']; //assign swipe array with last message from chat
}
chat[chat.length - 1]['swipe_id']++; //make new slot in array
// if message has memory attached - remove it to allow regen
if (chat[chat.length -1].extra && chat[chat.length -1].extra.memory) {
delete chat[chat.length -1].extra.memory;
}
//console.log(chat[chat.length-1]['swipes']);
if (parseInt(chat[chat.length - 1]['swipe_id']) === chat[chat.length - 1]['swipes'].length) { //if swipe id of last message is the same as the length of the 'swipes' array
@@ -5071,4 +5075,16 @@ $(document).ready(function () {
closeMessageEditor();
}
});
$("#bg-filter").on("input", function() {
const filterValue = $(this).val().toLowerCase();
$("#bg_menu_content > div").each(function() {
const $bgContent = $(this);
if ($bgContent.attr("title").toLowerCase().includes(filterValue)) {
$bgContent.show();
} else {
$bgContent.hide();
}
});
});
})

7
public/style.css
View File

@@ -50,13 +50,12 @@
/* base variable for blur strength slider calculations */
--blurStrength: 10;
color-scheme: only light;
/*styles for the color picker*/
--tool-cool-color-picker-btn-bg: transparent;
--tool-cool-color-picker-btn-border-color: transparent;
color-scheme: only light;
}
* {
@@ -3631,4 +3630,4 @@ body.movingUI #expression-holder {
overflow-y: auto;
overflow-x: hidden;
}
}
}

32
readme.md
View File

@@ -134,6 +134,17 @@ Restart your TAI server.
You will now be able to connect from other devices.
### Managing whitelisted IPs
You can add or remove whitelisted IPs by editing the `whitelist` array in `config.conf`. You can also provide a `whitelist.txt` file in the same directory as `config.conf` with one IP address per line like:
```txt
192.168.0.1
192.168.0.2
```
The `whitelist` array in `config.conf` will be ignored if `whitelist.txt` exists.
***Disclaimer: Anyone else who knows your IP address and TAI port number will be able to connect as well***
To connect over wifi you'll need your PC's local wifi IP address
@@ -144,8 +155,24 @@ if you want other people on the internet to connect, check [here](https://whatis
Try enabling the No Blur Effect (Fast UI) mode on the User settings panel.
## I like your project! How do I contribute?
### DO's
1. Send pull requests
2. Send feature suggestions and issue reports using established templates
3. Read the readme file and built-in documentation before asking anything
### DONT's
1. Offer monetary donations
2. Send bug reports without providing any context
3. Ask the questions that were already answered numerous times
## Questions or suggestions?
Contact us on Discord: Cohee#1207 or RossAscends#1779
Contact us on:
* Discord: Cohee#1207 or RossAscends#1779
* Reddit: /u/RossAscends or /u/sillylossy
## Screenshots
<img width="400" alt="image" src="https://user-images.githubusercontent.com/18619528/228649245-8061c60f-63dc-488e-9325-f151b7a3ec2d.png">
@@ -162,3 +189,6 @@ Contact us on Discord: Cohee#1207 or RossAscends#1779
* poe-api client adapted from https://github.com/ading2210/poe-api (GPL v3)
* GraphQL files for poe: https://github.com/muharamdani/poe (ISC License)
* KoboldAI Presets from KAI Lite: https://lite.koboldai.net/
* Noto Sans font by Google (OFL license)
* Icon theme by Font Awesome https://fontawesome.com (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Linux startup script by AlpinDale

82
server.js
View File

@@ -31,7 +31,17 @@ const webp = require('webp-converter');
const config = require(path.join(process.cwd(), './config.conf'));
const server_port = process.env.SILLY_TAVERN_PORT || config.port;
const whitelist = config.whitelist;
const whitelistPath = path.join(process.cwd(), "./whitelist.txt");
let whitelist = config.whitelist;
if (fs.existsSync(whitelistPath)) {
try {
let whitelistTxt = fs.readFileSync(whitelistPath, 'utf-8');
whitelist = whitelistTxt.split("\n").filter(ip => ip).map(ip => ip.trim());
} catch (e) { }
}
const whitelistMode = config.whitelistMode;
const autorun = config.autorun;
const enableExtensions = config.enableExtensions;
@@ -1548,47 +1558,51 @@ app.post("/importchat", urlencodedParser, function (request, response) {
}
const jsonData = json5.parse(data);
var new_chat = [];
if (jsonData.histories !== undefined) {
//console.log('/importchat confirms JSON histories are defined');
let i = 0;
new_chat[i] = {};
new_chat[0]['user_name'] = 'You';
new_chat[0]['character_name'] = ch_name;
new_chat[0]['create_date'] = humanizedISO8601DateTime() //Date.now();
i++;
jsonData.histories.histories[0].msgs.forEach(function (item) {
new_chat[i] = {};
if (item.src.is_human == true) {
new_chat[i]['name'] = 'You';
} else {
new_chat[i]['name'] = ch_name;
}
new_chat[i]['is_user'] = item.src.is_human;
new_chat[i]['is_name'] = true;
new_chat[i]['send_date'] = humanizedISO8601DateTime() //Date.now();
new_chat[i]['mes'] = item.text;
i++;
});
const chatJsonlData = new_chat.map(JSON.stringify).join('\n');
//console.log('/importchat saving a file: '+ch_name+' - '+humanizedISO8601DateTime()+' imported.jsonl');
fs.writeFile(chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + ' imported.jsonl', chatJsonlData, 'utf8', function (err) { //added ch_name and replaced Date.now() with humanizedISO8601DateTime
const chat = {
from(history) {
return [
{
user_name: 'You',
character_name: ch_name,
create_date: humanizedISO8601DateTime(),
if (err) {
response.send(err);
return console.log(err);
//response.send(err);
} else {
//response.redirect("/");
response.send({ res: true });
},
...history.msgs.map(
(message) => ({
name: message.src.is_human ? 'You' : ch_name,
is_user: message.src.is_human,
is_name: true,
send_date: humanizedISO8601DateTime(),
mes: message.text,
})
)];
}
}
const newChats = [];
(jsonData.histories.histories ?? []).forEach((history) => {
newChats.push(chat.from(history));
});
const errors = [];
newChats.forEach(chat => fs.writeFile(
chatsPath + avatar_url + '/' + ch_name + ' - ' + humanizedISO8601DateTime() + ' imported.jsonl',
chat.map(JSON.stringify).join('\n'),
'utf8',
(err) => err ?? errors.push(err)
)
);
if (0 < errors.length) {
response.send('Errors occurred while writing character files. Errors: ' + JSON.stringify(errors));
}
response.send({res: true});
} else {
response.send({ error: true });
return;
}
});
}
if (format === 'jsonl') {
@@ -2490,4 +2504,4 @@ function ensurePublicDirectoriesExist() {
fs.mkdirSync(dir, { recursive: true });
}
}
}
}

1
start.sh Executable file → Normal file
View File

@@ -22,4 +22,3 @@ fi
npm i
node server.js