Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "sillytavern",
-    "version": "1.9.2",
+    "version": "1.9.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "license": "AGPL-3.0",
             "dependencies": {
                 "@dqbd/tiktoken": "^1.0.2",

package.json

@@ -51,7 +51,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.9.2",
+    "version": "1.9.3",
     "scripts": {
         "start": "node server.js",
         "pkg": "pkg --compress Gzip --no-bytecode --public ."

public/scripts/nai-settings.js

@@ -90,13 +90,6 @@ function loadNovelSettings(settings) {
     nai_settings.cfg_scale = settings.cfg_scale;
     nai_settings.streaming_novel = !!settings.streaming_novel;
     loadNovelSettingsUi(nai_settings);
-
-    // reload the preset to migrate any new settings
-    for (const key of Object.keys(nai_settings)) {
-        if (typeof nai_settings[key] === 'number' && Number.isNaN(nai_settings[key])) {
-            $("#settings_perset_novel").trigger("change");
-        }
-    }
 }
 
 const phraseRepPenStrings = [

server.js

@@ -3275,6 +3275,10 @@ app.post("/generate_openai", jsonParser, function (request, response_generate_op
                 message = 'API key disabled or exhausted';
                 console.log(message);
                 break;
+            case 451:
+                message = error?.response?.data?.error?.message || 'Unavailable for legal reasons';
+                console.log(message);
+                break;
         }
 
         const quota_error = error?.response?.status === 429 && error?.response?.data?.error?.type === 'insufficient_quota';