diff --git a/.gitignore b/.gitignore index a35d5ddc5..46eeaf2a6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ public/settings.json /thumbnails whitelist.txt .vscode +secrets.json diff --git a/Update-Instructions.txt b/Update-Instructions.txt new file mode 100644 index 000000000..e8c88cd9b --- /dev/null +++ b/Update-Instructions.txt @@ -0,0 +1,55 @@ +How to Update SillyTavern + +This is not an installation guide. If you need installation instructions, look here: +https://docs.alpindale.dev/pygmalion-extras/sillytavern/#installation + +This guide assumes you have already installed SillyTavern once, and know how to run it on your OS. + +Linux/Termux: + +You definitely installed via git, so just 'git pull' inside the SillyTavern directory. + +Windows/MacOS: + +Method 1 - GIT + +We always recommend users install using 'git'. Here's why: + +When you have installed via `git clone`, all you have to do to update is type `git pull` in a command line in the ST folder. +The updates are applied automatically and safely. + +Method 2 - ZIP + +If you insist on installing via a zip, here is the tedious process for doing the update: + +1. Download the new release zip. +2. Unzip it into a folder OUTSIDE of your current ST installation. +3. Do the usual setup procedure for your OS to install the NodeJS requirements. + +4. Copy the following files/folders as necessary(*) from your old ST installation: + + - Backgrounds + - Characters + - Chats + - Groups + - Group chats + - KoboldAI Settings + - NovelAI Settings + - OpenAI Settings + - TextGen Settings (textgen = ooba) + - Themes + - User Avatars + - Worlds + - settings.json + + (*) 'As necessary' = "If you made any custom content related to those folders". + None of the folders are mandatory, so only copy what you need. + + **NB: DO NOT COPY THE ENTIRE /PUBLIC/ FOLDER.** + Doing so could break the new install and prevent new features from being present. + +5. Paste those items into the /Public/ folder of the new install. + +6. Start SillyTavern once again with the method appropriate to your OS, and pray you got it right. + +7. If everything shows up, you can safely delete the old ST folder. \ No newline at end of file diff --git a/colab/GPU.ipynb b/colab/GPU.ipynb index cf61955e4..238446cf1 100644 --- a/colab/GPU.ipynb +++ b/colab/GPU.ipynb @@ -6,68 +6,8 @@ "metadata": {}, "source": [ "**Links**
\n", - "SillyTavern GitHub: https://github.com/Cohee1207/SillyTavern
\n", "Extensions API GitHub: https://github.com/Cohee1207/SillyTavern-extras/
\n", - "SillyTavern community Discord (support and discussion): https://discord.gg/RZdyAEUPvj
\n", - "Contact the maintainer directly: Cohee#1207" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "cellView": "form", - "id": "_1gpebrnlp5-" - }, - "outputs": [], - "source": [ - "#@title <-- Convert TavernAI characters to SillyTavern format\n", - "\n", - "!mkdir /convert\n", - "%cd /convert\n", - "\n", - "import os\n", - "from google.colab import drive\n", - "\n", - "drive.mount(\"/convert/drive\")\n", - "\n", - "!git clone -b tools https://github.com/EnergoStalin/SillyTavern.git\n", - "%cd SillyTavern\n", - "\n", - "!curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash\n", - "!nvm install 19.1.0\n", - "!nvm use 19.1.0\n", - "\n", - "%cd tools/charaverter\n", - "\n", - "!npm i\n", - "\n", - "path = \"/convert/drive/MyDrive/TavernAI/characters\"\n", - "output = \"/convert/drive/MyDrive/SillyTavern/characters\"\n", - "if not os.path.exists(path):\n", - " path = output\n", - "\n", - "!mkdir -p $output\n", - "!node main.mjs $path $output\n", - "\n", - "drive.flush_and_unmount()\n", - "\n", - "%cd /\n", - "!rm -rf /convert" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "id": "ewkXkyiFP2Hq" - }, - "outputs": [], - "source": [ - "#@title <-- Tap this if you play on Mobile { display-mode: \"form\" }\n", - "%%html\n", - "Press play on the music player to keep the tab alive, then start KoboldAI below (Uses only 13MB of data)
\n", - "