sillytavern 1.12.0 → 1.12.1

package/.github/readme.md

@@ -196,6 +196,45 @@ For MacOS / Linux all of these will be done in a Terminal.
 5. Start the install launcher with: `chmod +x install.sh && ./install.sh` and choose what you wanna install
 6. After installation start the launcher with: `chmod +x launcher.sh && ./launcher.sh`
 
+## 🐋 Installing via Docker
+
+These instructions assume you have installed Docker, are able to access your command line for the installation of containers, and familiar with their general operation.
+
+### Building the image yourself
+
+We have a comprehensive guide on using SillyTavern in Docker [here](http://docs.sillytavern.app/installation/docker/) which covers installations on Windows, macOS and Linux! Give it a read if you wish to build the image yourself.
+
+### Using the GitHub Container Registry (easiest)
+
+You will need two mandatory directory mappings and a port mapping to allow SillyTavern to function. In the command, replace your selections in the following places:
+
+#### Container Variables
+
+##### Volume Mappings
+
+- [config] - The directory where SillyTavern configuration files will be stored on your host machine
+- [data] - The directory where SillyTavern user data (including characters) will be stored on your host machine
+- [plugins] - (optional) The directory where SillyTavern server plugins will be stored on your host machine
+
+##### Port Mappings
+
+- [PublicPort] - The port to expose the traffic on. This is mandatory, as you will be accessing the instance from outside of its virtual machine container. DO NOT expose this to the internet without implementing a separate service for security.
+
+##### Additional Settings
+
+- [TimeZone] - The timezone your instance should use. This is useful for making logs match your local time for easier troubleshooting. Use your TZ Identifier. (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)
+- [DockerNet] - The docker network that the container should be created with a connection to. If you don't know what it is, see the [official Docker documentation](https://docs.docker.com/reference/cli/docker/network/).
+- [version] - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" and "release" tags that point to the nightly images of the respective branches, but this may not be appropriate, if you are utilizing extensions that could be broken, and may need time to update.
+
+#### Install command
+
+1. Open your Command Line
+2. Run the following command
+
+`docker create --name='sillytavern' --net='[DockerNet]' -e TZ="[TimeZone]" -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
+
+> Note that 8000 is a default listening port. Don't forget to use an appropriate port if you change it in the config.
+
 ## 📱 Mobile - Installing via termux
 
 > \[!NOTE]
@@ -347,6 +386,7 @@ GNU Affero General Public License for more details.**
 * Korean translation by @doloroushyeonse
 * k_euler_a support for Horde by <https://github.com/Teashrock>
 * Chinese translation by [@XXpE3](https://github.com/XXpE3), 中文 ISSUES 可以联系 @XXpE3
+* Docker guide by [@mrguymiah](https://github.com/mrguymiah) and [@Bronya-Rand](https://github.com/Bronya-Rand)
 
 <!-- LINK GROUP -->
 [back-to-top]: https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square

package/.github/workflows/docker-publish.yml

@@ -30,7 +30,7 @@ jobs:
         run: |
           echo "IMAGE_NAME=${REPO,,}" >> ${GITHUB_ENV}
 
-      # Using the following workaround because currently GitHub Actions 
+      # Using the following workaround because currently GitHub Actions
       # does not support logical AND/OR operations on triggers
       # It's currently not possible to have `branches` under the `schedule` trigger
       - name: Checkout the release branch (on release)
@@ -65,7 +65,12 @@ jobs:
         id: metadata
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: ${{ env.BRANCH_NAME }}
+          # Release version tag if the workflow is triggered by a release
+          # Branch name tag if the workflow is triggered by a push
+          # Latest tag if the branch is release and the workflow is triggered by a push
+          tags: |
+            ${{ github.event_name == 'release' && github.ref_name || env.BRANCH_NAME }}
+            ${{ github.event_name == 'push' && env.BRANCH_NAME == 'release' && 'latest' || '' }}
 
       # Login into package repository as the person who created the release
       - name: Log in to the Container registry
@@ -87,10 +92,3 @@ jobs:
           push: true
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-
-      # If the workflow is triggered by a release, marks and push the image as such
-      - name: Docker tag latest and push
-        if: ${{ github.event_name == 'release' }}
-        run: |
-          docker tag $IMAGE_NAME:${{ github.ref_name }} $IMAGE_NAME:latest
-          docker push $IMAGE_NAME:latest

package/.github/workflows/update-i18n.yaml

@@ -0,0 +1,33 @@
+name: Update i18n data
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:                # Job-level permissions configuration starts here
+      contents: write           # 'write' access to repository contents
+    steps:
+    - name: disable auto crlf
+      uses: steve02081504/disable-autocrlf@v1
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
+        fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
+    - name: Create local changes
+      run: |
+        aria2c https://raw.githubusercontent.com/SillyTavern/SillyTavern-i18n/main/generate.py
+        aria2c https://raw.githubusercontent.com/SillyTavern/SillyTavern-i18n/main/requirements.txt
+        pip install -r ./requirements.txt
+        python ./generate.py "" --sort-keys
+        rm -f ./generate.py ./requirements.txt
+    - name: add all
+      run: git add -A
+    - name: push
+      uses: actions-go/push@master
+      with:
+        author-email: 41898282+github-actions[bot]@users.noreply.github.com
+        author-name: github-actions[bot]
+        commit-message: 'i18n changes'
+        remote: origin

package/docker/docker-compose.yml

@@ -10,4 +10,5 @@ services:
     volumes:
       - "./config:/home/node/app/config"
       - "./data:/home/node/app/data"
+      - "./plugins:/home/node/app/plugins"
     restart: unless-stopped

package/package.json

@@ -2,7 +2,7 @@
     "dependencies": {
         "@agnai/sentencepiece-js": "^1.1.1",
         "@agnai/web-tokenizers": "^0.1.3",
-        "@zeldafan0225/ai_horde": "^4.0.1",
+        "@zeldafan0225/ai_horde": "^5.1.0",
         "archiver": "^7.0.1",
         "bing-translate-api": "^2.9.1",
         "body-parser": "^1.20.2",
@@ -15,7 +15,6 @@
         "express": "^4.19.2",
         "form-data": "^4.0.0",
         "google-translate-api-browser": "^3.0.1",
-        "gpt3-tokenizer": "^1.1.5",
         "he": "^1.2.0",
         "helmet": "^7.1.0",
         "ip-matching": "^2.1.2",
@@ -44,6 +43,9 @@
         "yargs": "^17.7.1",
         "yauzl": "^2.10.0"
     },
+    "engines": {
+        "node": ">= 18"
+    },
     "overrides": {
         "parse-bmfont-xml": {
             "xml2js": "^0.5.0"
@@ -57,8 +59,8 @@
         "axios": {
             "follow-redirects": "^1.15.4"
         },
-        "@zeldafan0225/ai_horde": {
-            "esbuild": "npm:dry-uninstall"
+        "node-fetch": {
+            "whatwg-url": "^14.0.0"
         }
     },
     "name": "sillytavern",
@@ -68,7 +70,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.12.0",
+    "version": "1.12.1",
     "scripts": {
         "start": "node server.js",
         "start:no-csrf": "node server.js --disableCsrf",

package/public/css/mobile-styles.css

@@ -117,6 +117,11 @@
         max-width: unset;
     }
 
+    #wiActivationSettings,
+    #wiTopBlock {
+        flex-direction: column;
+    }
+
     #top-settings-holder,
     #top-bar {
         position: fixed;

package/public/css/promptmanager.css

@@ -19,7 +19,7 @@
 
 #completion_prompt_manager #completion_prompt_manager_list li {
     display: grid;
-    grid-template-columns: 4fr 80px 40px;
+    grid-template-columns: 4fr 80px 45px;
     margin-bottom: 0.5em;
     width: 100%
 }

package/public/css/select2-overrides.css

@@ -199,6 +199,8 @@ span.select2.select2-container .select2-selection__choice__remove:hover {
     transition: background-color 0.3s;
     color: var(--SmartThemeBodyColor);
     background-color: var(--black50a);
+    white-space: break-spaces;
+    word-break: break-all;
 }
 
 .select2_choice_clickable_buttonstyle+span.select2-container .select2-selection__choice__display:hover {
@@ -218,6 +220,14 @@ span.select2.select2-container .select2-selection__choice__remove:hover {
     /* Fix weird styling choice or huge margin around selected options */
     margin-block-start: 2px;
     margin-block-end: 2px;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    row-gap: 5px;
+}
+
+.select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-selection__choice {
+    margin-top: 0px;
 }
 
 .select2_multi_sameline+span.select2-container .select2-selection--multiple .select2-search__field {

package/public/css/st-tailwind.css

@@ -572,3 +572,23 @@ textarea:disabled {
     text-align: center;
     padding: 5px;
 }
+
+ul.li-padding-b-1 li {
+    padding-bottom: 1em;
+}
+
+ul.li-padding-b-2 li {
+    padding-bottom: 2em;
+}
+
+ul.li-padding-b-5 li {
+    padding-bottom: 5em;
+}
+
+ul.li-padding-bot5 li {
+    padding-bottom: 5px;
+}
+
+ul.li-padding-bot10 li {
+    padding-bottom: 10px;
+}

package/public/css/world-info.css

@@ -257,3 +257,8 @@ select.keyselect+span.select2-container .select2-selection--multiple {
 .switch_input_type_icon:hover {
     opacity: 1;
 }
+
+#wiCheckboxes {
+    align-self: center;
+    width: 100%;
+}

package/public/global.d.ts

@@ -1358,3 +1358,44 @@ declare namespace moment {
 declare global {
   const moment: typeof moment;
 }
+
+/**
+ * Callback data for the `LLM_FUNCTION_TOOL_REGISTER` event type that is triggered when a function tool can be registered.
+ */
+interface FunctionToolRegister {
+    /**
+     * The type of generation that is being used
+     */
+    type?: string;
+    /**
+     * Generation data, including messages and sampling parameters
+     */
+    data: Record<string, object>;
+    /**
+     * Callback to register an LLM function tool.
+     */
+    registerFunctionTool: typeof registerFunctionTool;
+}
+
+/**
+ * Callback data for the `LLM_FUNCTION_TOOL_REGISTER` event type that is triggered when a function tool is registered.
+ * @param name Name of the function tool to register
+ * @param description Description of the function tool
+ * @param params JSON schema for the parameters of the function tool
+ * @param required Whether the function tool should be forced to be used
+ */
+declare function registerFunctionTool(name: string, description: string, params: object, required: boolean): Promise<void>;
+
+/**
+ * Callback data for the `LLM_FUNCTION_TOOL_CALL` event type that is triggered when a function tool is called.
+ */
+interface FunctionToolCall {
+    /**
+     * Name of the function tool to call
+     */
+    name: string;
+    /**
+     * JSON object with the parameters to pass to the function tool
+     */
+    arguments: string;
+}