Merge branch 'SillyTavern:release' into release

teralomaniac · Oct 9, 2023 · d47ed87 · d47ed87
2 parents 5f4e864 + c9c4f30
commit d47ed87
Show file tree

Hide file tree

Showing 85 changed files with 2,941 additions and 835 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ COPY . ./
 
 # Copy default chats, characters and user avatars to <folder>.default folder
 RUN \
-  IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds" && \
+  IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings" && \
   \
   echo "*** Store default $RESOURCES in <folder>.default ***" && \
   for R in $RESOURCES; do mv "public/$R" "public/$R.default"; done && \

diff --git a/default/settings.json b/default/settings.json
@@ -406,7 +406,6 @@
         "tfs": 1,
         "rep_pen_slope": 0,
         "single_line": false,
-        "use_stop_sequence": false,
         "streaming_kobold": false,
         "sampler_order": [
             6,
@@ -416,7 +415,12 @@
             3,
             4,
             5
-        ]
+        ],
+        "mirostat": 0,
+        "mirostat_tau": 5,
+        "mirostat_eta": 0.1,
+        "use_default_badwordsids": false,
+        "grammar": ""
     },
     "oai_settings": {
         "preset_settings_openai": "Default",

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Initialize missing user files
-IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,worlds"
+IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings"
 for R in $RESOURCES; do
   if [ ! -e "config/$R" ]; then
     echo "Resource not found, copying from defaults: $R"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
         "device-detector-js": "^3.0.3",
         "express": "^4.18.2",
         "google-translate-api-browser": "^3.0.1",
+        "bing-translate-api": "^2.9.1",
         "gpt3-tokenizer": "^1.1.5",
         "ip-matching": "^2.1.2",
         "ipaddr.js": "^2.0.1",
@@ -46,7 +47,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.10.4",
+    "version": "1.10.5",
     "scripts": {
         "start": "node server.js",
         "start-multi": "node server.js --disableCsrf",

diff --git a/public/KoboldAI Settings/Ace of Spades.settings b/public/KoboldAI Settings/Ace of Spades.settings
@@ -1,12 +1,12 @@
 {
     "temp": 1.15,
-    "top_k": 0,
+    "rep_pen": 1.05,
+    "rep_pen_range": 2048,
     "top_p": 0.95,
     "top_a": 0,
+    "top_k": 0,
     "typical": 1,
     "tfs": 0.8,
-    "rep_pen": 1.05,
-    "rep_pen_range": 2048,
     "rep_pen_slope": 7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         5,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Basic Coherence.settings b/public/KoboldAI Settings/Basic Coherence.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.59,
-    "top_k": 0,
+    "rep_pen": 1.1,
+    "rep_pen_range": 2048,
     "top_p": 1,
     "top_a": 0,
+    "top_k": 0,
     "typical": 1,
     "tfs": 0.87,
-    "rep_pen": 1.1,
-    "rep_pen_range": 2048,
     "rep_pen_slope": 0.3,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Best Guess.settings b/public/KoboldAI Settings/Best Guess.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.8,
-    "top_k": 100,
+    "rep_pen": 1.15,
+    "rep_pen_range": 2048,
     "top_p": 0.9,
     "top_a": 0,
+    "top_k": 100,
     "typical": 1,
     "tfs": 1,
-    "rep_pen": 1.15,
-    "rep_pen_range": 2048,
     "rep_pen_slope": 3.4,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Coherent Creativity.settings b/public/KoboldAI Settings/Coherent Creativity.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.51,
+    "rep_pen": 1.2,
+    "rep_pen_range": 2048,
     "top_p": 1,
-    "top_k": 0,
-    "tfs": 0.99,
     "top_a": 0,
+    "top_k": 0,
     "typical": 1,
-    "rep_pen": 1.2,
-    "rep_pen_range": 2048,
+    "tfs": 0.99,
     "rep_pen_slope": 0,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Deterministic.settings b/public/KoboldAI Settings/Deterministic.settings
@@ -8,7 +8,6 @@
     "typical": 1,
     "tfs": 1,
     "rep_pen_slope": 0,
-    "single_line": false,
     "sampler_order": [
         6,
         0,
@@ -17,5 +16,9 @@
         4,
         2,
         5
-    ]
-}
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
+}
diff --git a/public/KoboldAI Settings/Genesis.settings b/public/KoboldAI Settings/Genesis.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.63,
-    "top_k": 0,
+    "rep_pen": 1.05,
+    "rep_pen_range": 2048,
     "top_p": 0.98,
     "top_a": 0,
+    "top_k": 0,
     "typical": 1,
     "tfs": 0.98,
-    "rep_pen": 1.05,
-    "rep_pen_range": 2048,
     "rep_pen_slope": 0.1,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         5,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Godlike.settings b/public/KoboldAI Settings/Godlike.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.7,
-    "top_k": 0,
+    "rep_pen": 1.1,
+    "rep_pen_range": 1024,
     "top_p": 0.5,
     "top_a": 0.75,
+    "top_k": 0,
     "typical": 0.19,
     "tfs": 0.97,
-    "rep_pen": 1.1,
-    "rep_pen_range": 1024,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         2,
         1,
         0
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Good Winds.settings b/public/KoboldAI Settings/Good Winds.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.7,
-    "top_k": 0,
+    "rep_pen": 1.1,
+    "rep_pen_range": 1024,
     "top_p": 1,
     "top_a": 0,
+    "top_k": 0,
     "typical": 1,
     "tfs": 0.9,
-    "rep_pen": 1.1,
-    "rep_pen_range": 1024,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         4,
         5
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Liminal Drift.settings b/public/KoboldAI Settings/Liminal Drift.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.66,
-    "top_k": 0,
+    "rep_pen": 1.1,
+    "rep_pen_range": 1024,
     "top_p": 1,
     "top_a": 0.96,
+    "top_k": 0,
     "typical": 0.6,
     "tfs": 1,
-    "rep_pen": 1.1,
-    "rep_pen_range": 1024,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         0,
         2,
         3
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Low Rider.settings b/public/KoboldAI Settings/Low Rider.settings
@@ -1,12 +1,12 @@
 {
     "temp": 0.94,
-    "top_k": 12,
+    "rep_pen": 1.05,
+    "rep_pen_range": 2048,
     "top_p": 1,
     "top_a": 0,
+    "top_k": 12,
     "typical": 1,
     "tfs": 0.94,
-    "rep_pen": 1.05,
-    "rep_pen_range": 2048,
     "rep_pen_slope": 0.2,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Luna Moth.settings b/public/KoboldAI Settings/Luna Moth.settings
@@ -1,12 +1,12 @@
 {
     "temp": 1.5,
-    "top_k": 85,
+    "rep_pen": 1.1,
+    "rep_pen_range": 2048,
     "top_p": 0.24,
     "top_a": 0,
+    "top_k": 85,
     "typical": 1,
     "tfs": 1,
-    "rep_pen": 1.1,
-    "rep_pen_range": 2048,
     "rep_pen_slope": 0,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         1,
         4
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }
diff --git a/public/KoboldAI Settings/Mayday.settings b/public/KoboldAI Settings/Mayday.settings
@@ -1,12 +1,12 @@
 {
     "temp": 1.05,
-    "top_k": 0,
+    "rep_pen": 1.1,
+    "rep_pen_range": 1024,
     "top_p": 0.95,
     "top_a": 0,
+    "top_k": 0,
     "typical": 1,
     "tfs": 1,
-    "rep_pen": 1.1,
-    "rep_pen_range": 1024,
     "rep_pen_slope": 0.7,
     "sampler_order": [
         6,
@@ -16,5 +16,9 @@
         3,
         4,
         5
-    ]
+    ],
+    "mirostat": 0,
+    "mirostat_tau": 5,
+    "mirostat_eta": 0.1,
+    "grammar": ""
 }