diff --git a/colab/GPU.ipynb b/colab/GPU.ipynb index cb3a5aa9a..c1474e479 100644 --- a/colab/GPU.ipynb +++ b/colab/GPU.ipynb @@ -65,9 +65,9 @@ "\n", "Model = \"Pygmalion 6B\" #@param [ \"Pygmalion 6B\", \"Pygmalion 6B Dev\"] {allow-input: true}\n", "Version = \"Official\" \n", - "Provider = \"Cloudflare\" \n", + "KoboldAI_Provider = \"Localtunnel\" #@param [\"Localtunnel\", \"Cloudflare\"]\n", "use_google_drive = True #@param {type:\"boolean\"}\n", - "\n", + "Provider = KoboldAI_Provider\n", "!nvidia-smi\n", "import subprocess\n", "import time\n", @@ -133,7 +133,11 @@ "#Henk's KoboldAI script\n", "!wget https://koboldai.org/ckds && chmod +x ckds\n", "!./ckds --init only\n", - "p = subprocess.Popen(['/content/ckds', '--model', Model], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n", + "if Provider == \"Localtunnel\":\n", + " p = subprocess.Popen(['/content/ckds', '--model', Model, '--localtunnel', 'yes'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n", + "else:\n", + " p = subprocess.Popen(['/content/ckds', '--model', Model], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n", + "\n", "\n", "#Do not repeat! Tricks performed by a professional!\n", "url = ''\n", diff --git a/config.conf b/config.conf new file mode 100644 index 000000000..38a6aeac0 --- /dev/null +++ b/config.conf @@ -0,0 +1,8 @@ +const port = 8000; +const whitelist = ['127.0.0.1']; //Example for add several IP in whitelist: ['127.0.0.1', '192.168.0.10'] +const whitelistMode = true; //Disabling enabling the ip whitelist mode. true/false +const autorun = true; //Autorun in the browser. true/false + +module.exports = { + port, whitelist, whitelistMode, autorun +}; \ No newline at end of file diff --git a/config.json b/config.json deleted file mode 100644 index b24016f3c..000000000 --- a/config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "port": 8000, - "whitelist": ["127.0.0.1"], - "whitelistMode": true -} diff --git a/package-lock.json b/package-lock.json index 032117c27..09b5cdb9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,16 @@ { "name": "TavernAI", - "version": "1.2.7", + "version": "1.2.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "TavernAI", - "version": "1.2.7", + "version": "1.2.8", "dependencies": { + "cookie-parser": "^1.4.6", + "cors": "^2.8.5", + "csrf-csrf": "^2.2.3", "express": "^4.18.2", "multer": "^1.4.5-lts.1", "node-rest-client": "^3.1.1", @@ -283,6 +286,26 @@ "node": ">= 0.6" } }, + "node_modules/cookie-parser": { + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz", + "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==", + "dependencies": { + "cookie": "0.4.1", + "cookie-signature": "1.0.6" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/cookie-parser/node_modules/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -293,6 +316,18 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/crc-32": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-0.3.0.tgz", @@ -301,6 +336,14 @@ "node": ">=0.8" } }, + "node_modules/csrf-csrf": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/csrf-csrf/-/csrf-csrf-2.2.3.tgz", + "integrity": "sha512-ph3Mt9Bn0IBe2hhm/HBFLAey9NjY+IFPj3RLiK76XBE196HGJrr0Emh3DllhwJtpW93YY0trW3qFyMRlpgPwTQ==", + "dependencies": { + "http-errors": "^2.0.0" + } + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -1689,6 +1732,22 @@ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" }, + "cookie-parser": { + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz", + "integrity": "sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==", + "requires": { + "cookie": "0.4.1", + "cookie-signature": "1.0.6" + }, + "dependencies": { + "cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" + } + } + }, "cookie-signature": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", @@ -1699,11 +1758,28 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "crc-32": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-0.3.0.tgz", "integrity": "sha512-kucVIjOmMc1f0tv53BJ/5WIX+MGLcKuoBhnGqQrgKJNqLByb/sVMWfW/Aw6hw0jgcqjJ2pi9E5y32zOIpaUlsA==" }, + "csrf-csrf": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/csrf-csrf/-/csrf-csrf-2.2.3.tgz", + "integrity": "sha512-ph3Mt9Bn0IBe2hhm/HBFLAey9NjY+IFPj3RLiK76XBE196HGJrr0Emh3DllhwJtpW93YY0trW3qFyMRlpgPwTQ==", + "requires": { + "http-errors": "^2.0.0" + } + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", diff --git a/package.json b/package.json index 0a2677e83..5d1b7fd34 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "cors": "^2.8.5" }, "name": "TavernAI", - "version": "1.2.7", + "version": "1.2.8", "bin": { "TavernAI": "server.js" }, diff --git a/public/index.html b/public/index.html index e6a43c065..4bc4bdae6 100644 --- a/public/index.html +++ b/public/index.html @@ -36,7 +36,7 @@