Merge pull request #1897 from valadaptive/ai-horde-dependency

Un-vendor ai_horde

package-lock.json

@@ -13,6 +13,7 @@
                 "@agnai/sentencepiece-js": "^1.1.1",
                 "@agnai/web-tokenizers": "^0.1.3",
                 "@dqbd/tiktoken": "^1.0.13",
+                "@zeldafan0225/ai_horde": "^4.0.1",
                 "bing-translate-api": "^2.9.1",
                 "body-parser": "^1.20.2",
                 "command-exists": "^1.2.9",
@@ -770,6 +771,11 @@
                 "node": ">=10"
             }
         },
+        "node_modules/@thunder04/supermap": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@thunder04/supermap/-/supermap-3.0.4.tgz",
+            "integrity": "sha512-LiPOoZ/a0L9I9+a0F3Ba4VMQIkZ4gAG0hBT9eqMWc+pjohSsYpxiMbyego+UxUk4nzh9yCHVWjYx3o6B7EGPhg=="
+        },
         "node_modules/@tokenizer/token": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
@@ -832,6 +838,16 @@
             "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
             "dev": true
         },
+        "node_modules/@zeldafan0225/ai_horde": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/@zeldafan0225/ai_horde/-/ai_horde-4.0.1.tgz",
+            "integrity": "sha512-mf1cknnBYzKCvgH4KAkdVY3J7sLkR2b79W6I9ZEA2aJCyua28bpZzNaCDSHKKyaNj+0wyHViC+L53X32jw9pMg==",
+            "dependencies": {
+                "@thunder04/supermap": "^3.0.2",
+                "centra": "^2.5.0",
+                "esbuild": "^0.12.28"
+            }
+        },
         "node_modules/abort-controller": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
@@ -1172,6 +1188,12 @@
                 "node": ">=6"
             }
         },
+        "node_modules/centra": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/centra/-/centra-2.6.0.tgz",
+            "integrity": "sha512-dgh+YleemrT8u85QL11Z6tYhegAs3MMxsaWAq/oXeAmYJ7VxL3SI9TZtnfaEvNDMAPolj25FXIb3S+HCI4wQaQ==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
+        },
         "node_modules/chalk": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1679,6 +1701,15 @@
                 "url": "https://github.com/fb55/entities?sponsor=1"
             }
         },
+        "node_modules/esbuild": {
+            "version": "0.12.29",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
+            "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
+            "hasInstallScript": true,
+            "bin": {
+                "esbuild": "bin/esbuild"
+            }
+        },
         "node_modules/escalade": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",

package.json

@@ -3,6 +3,7 @@
         "@agnai/sentencepiece-js": "^1.1.1",
         "@agnai/web-tokenizers": "^0.1.3",
         "@dqbd/tiktoken": "^1.0.13",
+        "@zeldafan0225/ai_horde": "^4.0.1",
         "bing-translate-api": "^2.9.1",
         "body-parser": "^1.20.2",
         "command-exists": "^1.2.9",

src/ai_horde/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 ZeldaFan0225
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

src/ai_horde/index.mjs

@@ -1,3 +0,0 @@
-import AIHorde from './index.js'
-export default AIHorde
-export { AIHorde }

src/endpoints/horde.js

@@ -1,6 +1,6 @@
 const fetch = require('node-fetch').default;
 const express = require('express');
-const AIHorde = require('../ai_horde');
+const AIHorde = require('@zeldafan0225/ai_horde');
 const { getVersion, delay, Cache } = require('../util');
 const { readSecret, SECRET_KEYS } = require('./secrets');
 const { jsonParser } = require('../express-common');