Merge pull request #262 from Cohee1207/dev

1.5.0

.gitignore

@@ -7,6 +7,7 @@ public/groups/
 public/worlds/
 public/css/bg_load.css
 public/themes/
+public/OpenAI Settings/
 /uploads/
 *.jsonl
 config.conf

Start.bat

@@ -1,3 +1,5 @@
+pushd %~dp0
 call npm install
 node server.js
-pause
+pause
+popd

config.conf

@@ -4,10 +4,11 @@ const whitelist = ['127.0.0.1']; //Example for add several IP in whitelist: ['12
 const whitelistMode = true; //Disabling enabling the ip whitelist mode. true/false
 const basicAuthMode = false; //Toggle basic authentication for endpoints.
 const basicAuthUser = {username: "user", password: "password"}; //Login credentials when basicAuthMode is true.
+const disableThumbnails = false; //Disables the generation of thumbnails, opting to use the raw images instead
 const autorun = true; //Autorun in the browser. true/false
 const enableExtensions = true; //Enables support for TavernAI-extras project
 const listen = true; // If true, Can be access from other device or PC. otherwise can be access only from hosting machine.
 
 module.exports = {
-  port, whitelist, whitelistMode, basicAuthMode, basicAuthUser, autorun, enableExtensions, listen
+  port, whitelist, whitelistMode, basicAuthMode, basicAuthUser, autorun, enableExtensions, listen, disableThumbnails
 };

package-lock.json

@@ -1,12 +1,13 @@
 {
     "name": "sillytavern",
-    "version": "1.4.9",
+    "version": "1.5.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
-            "version": "1.4.9",
+            "version": "1.5.0",
+            "license": "AGPL-3.0",
             "dependencies": {
                 "@dqbd/tiktoken": "^1.0.2",
                 "axios": "^1.3.4",
@@ -14,6 +15,7 @@
                 "cookie-parser": "^1.4.6",
                 "cors": "^2.8.5",
                 "csrf-csrf": "^2.2.3",
+                "device-detector-js": "^3.0.3",
                 "exifreader": "^4.12.0",
                 "express": "^4.18.2",
                 "gpt3-tokenizer": "^1.1.5",
@@ -837,6 +839,14 @@
                 "npm": "1.2.8000 || >= 1.4.16"
             }
         },
+        "node_modules/device-detector-js": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/device-detector-js/-/device-detector-js-3.0.3.tgz",
+            "integrity": "sha512-jM89LJAvP6uOd84at8OlD9dWP8KeYCCHUde0RT0HQo/stdoRH4b54Xl/fntx2nEXCmqiFhmo+/cJetS2VGUHPw==",
+            "engines": {
+                "node": ">= 8.11.4"
+            }
+        },
         "node_modules/dom-walk": {
             "version": "0.1.2"
         },
@@ -1448,7 +1458,8 @@
         },
         "node_modules/open": {
             "version": "8.4.2",
-            "license": "MIT",
+            "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+            "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
             "dependencies": {
                 "define-lazy-prop": "^2.0.0",
                 "is-docker": "^2.1.1",
@@ -2060,7 +2071,8 @@
         },
         "node_modules/yargs": {
             "version": "17.7.2",
-            "license": "MIT",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
             "dependencies": {
                 "cliui": "^8.0.1",
                 "escalade": "^3.1.1",

package.json

@@ -6,6 +6,7 @@
         "cookie-parser": "^1.4.6",
         "cors": "^2.8.5",
         "csrf-csrf": "^2.2.3",
+        "device-detector-js": "^3.0.3",
         "exifreader": "^4.12.0",
         "express": "^4.18.2",
         "gpt3-tokenizer": "^1.1.5",
@@ -33,7 +34,12 @@
         }
     },
     "name": "sillytavern",
-    "version": "1.4.9",
+    "license": "AGPL-3.0",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Cohee1207/SillyTavern.git"
+    },
+    "version": "1.5.0",
     "scripts": {
         "start": "node server.js"
     },

public/NovelAI Settings/Classic-Krake.settings

@@ -6,8 +6,8 @@
    "temperature": 1.7,
    "max_length": 90,
    "min_length": 1,
-   "tail_free_sampling": 0.6602,
-   "repetition_penalty": 1.0565,
+   "tail_free_sampling": 0.66,
+   "repetition_penalty": 1.06,
    "repetition_penalty_range": 340,
    "repetition_penalty_frequency": 0,
    "repetition_penalty_presence": 0

public/css/bright.min.css

@@ -0,0 +1,7 @@
+/*!
+  Theme: Bright
+  Author: Chris Kempson (http://chriskempson.com)
+  License: ~ MIT (or more permissive) [via base16-schemes-source]
+  Maintainer: @highlightjs/core-team
+  Version: 2021.09.0
+*/pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}.hljs{color:#e0e0e0;background:#000}.hljs ::selection,.hljs::selection{background-color:#505050;color:#e0e0e0}.hljs-comment{color:#b0b0b0}.hljs-tag{color:#d0d0d0}.hljs-operator,.hljs-punctuation,.hljs-subst{color:#e0e0e0}.hljs-operator{opacity:.7}.hljs-bullet,.hljs-deletion,.hljs-name,.hljs-selector-tag,.hljs-template-variable,.hljs-variable{color:#fb0120}.hljs-attr,.hljs-link,.hljs-literal,.hljs-number,.hljs-symbol,.hljs-variable.constant_{color:#fc6d24}.hljs-class .hljs-title,.hljs-title,.hljs-title.class_{color:#fda331}.hljs-strong{font-weight:700;color:#fda331}.hljs-addition,.hljs-code,.hljs-string,.hljs-title.class_.inherited__{color:#a1c659}.hljs-built_in,.hljs-doctag,.hljs-keyword.hljs-atrule,.hljs-quote,.hljs-regexp{color:#76c7b7}.hljs-attribute,.hljs-function .hljs-title,.hljs-section,.hljs-title.function_,.ruby .hljs-property{color:#6fb3d2}.diff .hljs-meta,.hljs-keyword,.hljs-template-tag,.hljs-type{color:#d381c3}.hljs-emphasis{color:#d381c3;font-style:italic}.hljs-meta,.hljs-meta .hljs-keyword,.hljs-meta .hljs-string{color:#be643c}.hljs-meta .hljs-keyword,.hljs-meta-keyword{font-weight:700}

public/css/notes.css

@@ -1,46 +1,73 @@
-
 body {
     margin: 0;
-	padding:0;
-	width: 100%;
+    padding: 0;
+    width: 100%;
     background-color: rgb(36, 37, 37);
     background-repeat: no-repeat;
     background-attachment: fixed;
     background-size: cover;
-	font-family: "Noto Sans", "Noto Color Emoji", sans-serif; 
-	font-size:16px; /*1rem*/
-	color: #999;
-	box-sizing: border-box;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	/*z-index:0;*/
+    font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
+    font-size: 16px;
+    /*1rem*/
+    color: #999;
+    box-sizing: border-box;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    /*z-index:0;*/
 }
 
 #main {
     padding-top: 20px;
-	/*z-index:1;*/
-	}
+    /*z-index:1;*/
+}
 
-#content{
+#content {
     margin: 0 auto;
     max-width: 700px;
-	border: 1px solid #333;
-	padding: 20px;
-	border-radius: 20px;
-	background-color: rgba(0,0,0,0.5);
-	line-height: 1.5rem;
-	box-shadow: 0 0 5px black;
-	/*z-index: 2;*/
+    border: 1px solid #333;
+    padding: 20px;
+    border-radius: 20px;
+    background-color: rgba(0, 0, 0, 0.5);
+    line-height: 1.5rem;
+    box-shadow: 0 0 5px black;
+    /*z-index: 2;*/
 }
 
 code {
-	border: 1px solid #999; 
-	background-color: rgba(0,0,0,0.5);
-	padding: 5px;
-	border-radius:5px;
-	display: block;
-	}
+    border: 1px solid #999;
+    background-color: rgba(0, 0, 0, 0.5);
+    padding: 5px;
+    border-radius: 5px;
+    display: block;
+    white-space: pre-line;
+}
 
-a {color: orange; text-decoration:none; border-bottom: 1px dotted orange; }
-h2, h3 {margin: 0; color:#ccc;}
-hr {border: 1px solid #999;}
+a {
+    color: orange;
+    text-decoration: none;
+    border-bottom: 1px dotted orange;
+}
+
+h2,
+h3 {
+    color: #ccc;
+}
+
+hr {
+    border: 1px solid #999;
+}
+
+table {
+    width: 100%;
+}
+
+table,
+th,
+td {
+    border: 1px solid;
+    border-collapse: collapse;
+}
+
+table img {
+    max-width: 200px;
+}

public/notes/1.html

@@ -1,44 +0,0 @@
-<html>
-    <head>
-        <title>Character Descriptions</title>
-        <link rel="stylesheet" href="/css/notes.css">
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<link rel="preconnect" href="https://fonts.googleapis.com">
-		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="">
-		<link href="https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&amp;display=swap" rel="stylesheet">
-    </head>
-    <body>
-        <div id="main">
-            <div id="content">
-                <h2>Character description</h2>
-                <p>
-					Used to add the character description and the rest that the AI should know.<br><br>
-					For example, you can add information about the world in which the action takes place and describe 
-                    the characteristics for the character you are playing for.<br><br>
-					Usually it all takes 200-350 tokens.
-				</p>
-                <h3>Methods and format</h3>
-                <p>
-					For most Kobold's models the easiest way is to use a free form for description, and in each sentence it is desirable to specify the name of the character.<br><br> 
-                    The entire description should be in one line without hyphenation.<br><br>
-					For example:<br><br>
-                    <code>
-						Chloe is a female elf. Chloe wears black-white maid dress with green collar and red glasses. Chloe has medium length black hair. Chloe's personality is...
-					</code>
-				</p>
-                
-                <p>
-					But that the AI would be less confused the best way is to use the W++ format.<Br><br>
-					Details here: <a target="_blank" href="https://github.com/KoboldAI/KoboldAI-Client/wiki/Pro-Tips">Pro-Tips</a>
-				</p>
-                <hr>
-				<p>
-					<u>A list of tags that are replaced when sending to generate:</u><br><br>
-					{{user}} and &lt;USER&gt; are replaced by the User's Name<br>
-					{{char}} and &lt;BOT&gt; are replaced by the Character's Name
-				</p>
-            </div>
-        </div>
-    </body>
-</html>