Commit Graph

355 Commits

Author SHA1 Message Date
Cohee 47c71a62f3 Don't rewrite settings if just moving the key 2023-12-14 19:58:27 +02:00
Cohee d4f96020f2 Migrate Palm secret key, fix vector source key access 2023-12-14 19:33:23 +02:00
Cohee 68bb616be3 Merge branch 'staging' into cleanup-sampler-order 2023-12-14 18:32:30 +02:00
based 5071b9a369 webstorm moment 2023-12-15 02:01:42 +10:00
based 60880cfd4d merge 2023-12-15 01:39:12 +10:00
based 698850b514 Merge remote-tracking branch 'fork/staging' into gemini
# Conflicts:
#	server.js
#	src/endpoints/prompt-converters.js
#	src/endpoints/tokenizers.js
2023-12-15 01:35:17 +10:00
based d5bcd96eef message inlining vision support 2023-12-15 01:28:54 +10:00
Cohee 38a34bf1d5 Fix silly argument naming 2023-12-14 17:14:05 +02:00
Cohee 00687a9379 Merge branch 'staging' into separate-altscale-endpoints 2023-12-14 17:12:19 +02:00
Cohee 40e15f5762 Fix conditional access to Palm response body 2023-12-14 16:18:10 +02:00
Cohee 2a5340232d Move prompt converters to a separate module. Camelcase local variables and add missing JSDocs. 2023-12-14 16:00:17 +02:00
Cohee 348253fd98 Fix import path 2023-12-14 15:36:44 +02:00
based 178b07f414 cleaned up a little 2023-12-14 23:18:56 +10:00
based 0b7c1a98cd added google vision caption support 2023-12-14 22:37:53 +10:00
valadaptive 0f25d51a53 Send Kobold sampler order as an array 2023-12-14 02:03:36 -05:00
based 3e82a7d439 tokenizer changes and fixes. + a toggle 2023-12-14 16:31:08 +10:00
based e26159c00d refactor and rework palm request to work with the 'content' format and added an endpoint for googles tokenizer 2023-12-14 15:49:50 +10:00
based be396991de finish implementing ui changes for google models 2023-12-14 11:53:26 +10:00
based 69e24c9686 change palm naming in UI 2023-12-14 11:14:41 +10:00
valadaptive b55ea8df04 Move alt Scale generation to its own module 2023-12-13 18:54:12 -05:00
valadaptive dba66e756a Move chat completions API endpoints to module 2023-12-13 18:53:22 -05:00
Cohee 796659f68c Add proper fetch import 2023-12-14 01:39:34 +02:00
Cohee 0cd92f13b4 Merge branch 'staging' into separate-kobold-endpoints 2023-12-14 01:33:36 +02:00
Cohee cebd6e9e0f Add API token ids from KoboldCpp 2023-12-14 01:28:18 +02:00
DonMoralez fec27820ff (claude)reworked prefix assignment, sysprompt mode, console message display 2023-12-13 21:19:26 +02:00
Cohee 0d0dd5e170 Revert old comment 2023-12-13 02:50:50 +02:00
Cohee 52de5869fe Rename file, add missing fetch 2023-12-13 02:22:35 +02:00
valadaptive 2c159ff93f Move Kobold API endpoints to their own module 2023-12-12 16:42:12 -05:00
valadaptive 35c2f8bf66 Move text completions API endpoints to own module 2023-12-12 16:41:16 -05:00
Cohee 2ca9015a5f Add filters to serpapi/visit 2023-12-12 03:56:36 +02:00
Cohee 299749a4e7 Add prerequisites for websearch extension 2023-12-12 01:08:47 +02:00
Cohee dbd52a7994
Merge pull request #1482 from valadaptive/sse-stream
Refactor server-sent events parsing
2023-12-10 18:32:19 +02:00
Cohee b107ace719 Avoid sending 401 in forwarded responses.
Status code 401 resets the client Basic auth, so we replace it with 400. This can produce an interesting artifact as "400 Unauthorized", but it's not out of spec.

"The reason phrases listed here are only recommendations -- they can be replaced by local equivalents or left out altogether without affecting the protocol."

https://www.rfc-editor.org/rfc/rfc9110.html#name-overview-of-status-codes
2023-12-10 18:00:04 +02:00
valadaptive 30502ac949 Split up Kobold and textgenerationwebui endpoints
The endpoint was one big if/else statement that did two entirely
different things depending on the value of main_api. It makes more sense
for those to be two separate endpoints.
2023-12-09 20:26:24 -05:00
valadaptive 04e92efe29 Move API tokenization endpoint into /tokenizers
Requires extracting some more functions out of server.js.
2023-12-09 19:35:49 -05:00
Cohee 44ac2ca4e6 Avoid returning 401 as API response code 2023-12-09 15:11:35 +02:00
valadaptive 055d6c4337 Properly forward status codes from streams 2023-12-07 18:06:17 -05:00
valadaptive c0a7472fe9 Move background file instead of copying+deleting 2023-12-07 15:28:04 -05:00
valadaptive e7dce9b107 Remove response_dw_bg 2023-12-07 15:24:05 -05:00
valadaptive 32c86c1e95 Move backgrounds endpoints into separate file 2023-12-07 15:24:05 -05:00
valadaptive eb1d4aed4d Move stats helpers into stats endpoint 2023-12-07 13:04:54 -05:00
valadaptive afe0dfe913 Move stats endpoints into separate file 2023-12-07 13:00:34 -05:00
valadaptive bf2b59279b Move worldinfo endpoints into separate file 2023-12-06 20:00:51 -05:00
valadaptive cf2b074d4b Move group endpoints into separate file 2023-12-06 20:00:31 -05:00
valadaptive e870c35613 Move chat endpoints into separate file 2023-12-06 19:59:32 -05:00
valadaptive 9c850b0b0c Fix double file extension on uploaded images 2023-12-06 17:29:10 -05:00
valadaptive 66da13b1bb Use withFileTypes instead of stat'ing each file 2023-12-06 17:22:37 -05:00
valadaptive 5096e70c11 Move client-relative path logic to helper function 2023-12-06 17:22:37 -05:00
valadaptive 39d771cc4a Replace path "\" with "/" server-side 2023-12-06 17:22:37 -05:00
valadaptive 795ca2247b Return filename validation messages 2023-12-06 17:22:37 -05:00
valadaptive 41d427f4a8 Move sanitize call inside validation function
Also rename it (again) to validateAssetFileName.
2023-12-06 16:46:52 -05:00
Cohee 100dae5fd0
Merge pull request #1444 from valadaptive/characters-endpoint
Move character endpoints into their own module
2023-12-06 23:45:14 +02:00
Cohee d0a35deeec Fix OpenAI presets extension 2023-12-06 21:46:08 +02:00
Cohee 60909cef1f Fix server crash on import. Fix possible undefined warning 2023-12-06 01:02:48 +02:00
valadaptive 4faa20bb1f Remove "upload" endpoint from assets API
I accidentally reintroduced this when splitting up the commits, I think
2023-12-05 15:02:30 -05:00
valadaptive c00df4f45b Clean up file name sanitization
- Checking for null bytes is unnecessary because the check for illegal
characters directly below it will catch them.
- We can use the path.extname method to get the file extension more
cleanly. It returns the *last* extension (e.g.
path.extname('file.foo.js') === '.js'), so behavior is preserved.
- Normalizing the path is unnecessary. We don't allow any path
separators in the file name, so it does nothing.
- Stripping '..', path separators, and '$' is unnecessary because of the
earlier illegal character check.
2023-12-05 09:25:45 -05:00
valadaptive a457484c2d Move character endpoints into their own module 2023-12-04 17:35:06 -05:00
Cohee 1ade0fda11 Merge branch 'staging' into stable-diffusion-router 2023-12-05 00:25:24 +02:00
Cohee b287d5f3bd Merge branch 'staging' into tokenizers-router 2023-12-05 00:19:44 +02:00
Cohee 21e19674b4 Merge branch 'staging' into vectors-router 2023-12-05 00:15:36 +02:00
Cohee 444f67e930 Merge branch 'staging' into translate-router 2023-12-05 00:11:06 +02:00
Cohee eb273ced59 Merge branch 'staging' into thumbnails-router 2023-12-05 00:08:15 +02:00
Cohee 9d0a0bc139 Merge branch 'staging' into sprites-router 2023-12-05 00:01:03 +02:00
Cohee 2acb7d1ae5 Merge branch 'staging' into serpapi-router 2023-12-04 23:57:23 +02:00
Cohee 1eb6f33e8b Merge branch 'staging' into secrets-router 2023-12-04 23:54:54 +02:00
Cohee 6fc0e485cd Merge branch 'staging' into presets-router 2023-12-04 23:51:08 +02:00
Cohee 32c3c34e4b Merge branch 'staging' into openai-router 2023-12-04 23:45:50 +02:00
Cohee dca470c9e9 Merge branch 'staging' into novelai-router 2023-12-04 22:14:46 +02:00
Cohee 6fd6d4fc4d Merge branch 'staging' into horde-router 2023-12-04 22:07:39 +02:00
Cohee aff821aa07 Fix discovery endpoint route 2023-12-04 21:54:03 +02:00
Cohee 3085dbe12c Merge branch 'staging' into extensions-router 2023-12-04 21:51:00 +02:00
Cohee d22d0c7cc2 Merge branch 'staging' into content-manager-router 2023-12-04 21:46:25 +02:00
Cohee a2387130f3 Merge branch 'staging' into classify-router 2023-12-04 21:39:39 +02:00
Cohee 1d4ac50fd7 Merge branch 'staging' into caption-router 2023-12-04 21:31:01 +02:00
valadaptive 68049afd84 Use Express router for vectors endpoint 2023-12-04 13:01:52 -05:00
valadaptive 15ba2441ce Use Express router for translate endpoint 2023-12-04 13:00:59 -05:00
valadaptive 4e073250a2 Use Express router for tokenizers endpoint 2023-12-04 13:00:13 -05:00
valadaptive 2d54a67a1f Use Express router for thumbnails endpoint 2023-12-04 12:59:24 -05:00
valadaptive 7f129df7b8 Use Express router for stable diffusion endpoint 2023-12-04 12:58:02 -05:00
valadaptive 173bc5975f Use Express router for sprites endpoint 2023-12-04 12:57:13 -05:00
valadaptive 35ce955b00 Use Express router for serpapi endpoint 2023-12-04 12:56:22 -05:00
valadaptive 091255d451 Use Express router for secrets endpoint 2023-12-04 12:55:13 -05:00
valadaptive ba74288e4a Use Express router for presets endpoint 2023-12-04 12:54:18 -05:00
valadaptive 2d19645c4e Use Express router for openai endpoint 2023-12-04 12:53:17 -05:00
valadaptive e6b549bc48 Use Express router for novelai endpoint 2023-12-04 12:52:27 -05:00
valadaptive 2e990bf336 Use Express router for horde endpoint 2023-12-04 12:51:02 -05:00
valadaptive babe9abbe9 Use Express router for extensions endpoint 2023-12-04 12:48:29 -05:00
valadaptive 4c911d3155 Use Express router for content endpoint 2023-12-04 12:47:38 -05:00
valadaptive 0ad753f317 Use Express router for classify endpoint 2023-12-04 12:45:17 -05:00
valadaptive d2e1577acb Use Express router for caption endpoint 2023-12-04 12:43:37 -05:00
valadaptive d24c1dde10 Use Express router for assets + "files" endpoints
I've split out the "file/upload" endpoint into its own module, and
renamed it to "files" to be consistent with the existing naming scheme.
2023-12-04 12:40:53 -05:00
Cohee 893ca25199 lint: format 2023-12-04 19:12:41 +02:00
Cohee 95ef108e84 Merge branch 'staging' into express-common 2023-12-04 19:09:20 +02:00
Cohee fcbfdc70af Merge branch 'staging' into sd-next-upscalers 2023-12-04 19:07:34 +02:00
Cohee 8476ec7570 Merge branch 'staging' into tokenizer-renames 2023-12-04 19:01:38 +02:00
valadaptive 3931f791b2 Move parsers into express-common module
This will allow endpoint modules to import them themselves, instead of
requiring server.js to pass them in.
2023-12-04 10:25:40 -05:00
valadaptive 4919a2e9a2 Move endpoints into their own folder 2023-12-04 10:24:21 -05:00
valadaptive 9d4990d25d Rename sd-next/upscalers to sd/next/upscalers 2023-12-04 10:22:47 -05:00
valadaptive 57bc95133e Rename tokenizer routes
They're all under tokenizers/ now, and there are "count", "encode", and
"decode" endpoints. This forms a clearer hierarchy.
2023-12-04 10:17:43 -05:00
valadaptive c073a89e2c Move endpoints into their own folder 2023-12-04 10:17:43 -05:00
valadaptive baae99831d Move endpoints into their own folder 2023-12-04 10:16:11 -05:00
valadaptive 2180610363 Rename /viewsecrets to /api/secrets/view 2023-12-04 10:14:51 -05:00
valadaptive db4da0b8aa Move endpoints into their own folder 2023-12-04 10:14:51 -05:00
valadaptive ebde9c2c1f Copy chat_completion_sources enum to server code 2023-12-03 15:04:01 -05:00
valadaptive a68505e857 Copy textgen-types enum to server code 2023-12-03 15:00:25 -05:00
Cohee 40b132176d Add preset restoration 2023-12-03 17:16:33 +02:00
Cohee 45df576f1c Re-add default presets for content manager 2023-12-03 15:07:21 +02:00
Cohee 64a3564892 lint: Comma dangle 2023-12-02 22:06:57 +02:00
Cohee 08fedf3a96 lint: Use 4 space indent 2023-12-02 21:56:16 +02:00
Cohee c63cd87cc0 lint: Require semicolons 2023-12-02 21:11:06 +02:00
valadaptive a37f874e38 Require single quotes 2023-12-02 13:04:51 -05:00
Cohee a06f1e8ad6
Merge pull request #1431 from valadaptive/eslint-fixes-3
ESLint fixes part 3 - more significant changes
2023-12-02 19:55:54 +02:00
Cohee a367285ac2
Merge pull request #1430 from valadaptive/eslint-fixes-2
ESLint fixes, part 2 - bulky changes
2023-12-02 19:43:11 +02:00
valadaptive 518bb58d5a Enable no-unused-vars lint
This is the big one. Probably needs thorough review to make sure I
didn't accidentally remove any setInterval or fetch calls.
2023-12-02 12:11:19 -05:00
valadaptive c893e2165e Enable no-prototype-builtins lint 2023-12-02 12:10:31 -05:00
Cohee c98b23ee72 #1405 Don't add formality for unsupported languages 2023-12-02 19:08:21 +02:00
valadaptive b023312117 Enable no-useless-escape lint 2023-12-02 10:32:26 -05:00
valadaptive 0a27275772 Enable no-extra-semi lint 2023-12-02 10:32:26 -05:00
valadaptive 27e63a7a77 Enable no-case-declarations lint 2023-12-02 10:32:26 -05:00
valadaptive 367f3dba27 Enable no-unsafe-finally lint 2023-12-02 10:32:07 -05:00
valadaptive 12cdb76a20 Enable no-regex-spaces lint
I noticed the old code was replacing two spaces with one space, over and
over. Instead, I changed it to remove all consecutive strings of spaces
just once, using the "+" quantifier. This should behave the same but is
nicer to read and faster.
2023-12-02 10:32:07 -05:00
Cohee 726bb2e041 #1405 Add formality config for deepl 2023-12-01 14:12:56 +02:00
Cohee 19df1f52cd Vector storage file retrieval 2023-11-30 00:01:59 +02:00
Cohee e0bf2b8e3e [FEATURE_REQUEST] Sending PDF/HTML files? #1414 2023-11-29 17:51:30 +02:00
Cohee e541c2b186 #1412 Add randomized user ids to OpenAI 2023-11-29 00:11:10 +02:00
dllt98 50ebd1cf66
Add support for importing character from JanitorAI (#1401)
* Add Janny support

* Add description

* Remove unofficial JanAI mirror
2023-11-27 03:29:19 +02:00
Cohee e6c96553d0 Add text trimming commands 2023-11-26 13:55:22 +02:00
Cohee a7024a1d34 Migrate to config.yaml 2023-11-25 23:45:33 +02:00
Aisu Wata a6898365d1 Claude system message order fix 2023-11-24 17:58:20 -03:00
Cohee 45b714fb9e Don't crash server if google translate fails 2023-11-23 00:59:34 +02:00
Cohee 56b63c0e02 #1386 Fix PaLM API 2023-11-22 17:36:34 +02:00
Cohee df4ed389bf System prompt for Claude 2 2023-11-21 22:11:26 +02:00
Cohee 52d9855916 Code lint 2023-11-21 02:00:50 +02:00
Cohee 91429ce516
Merge pull request #1378 from LenAnderson/more-comfy-merge
Add more ComfyUI options
2023-11-21 01:55:00 +02:00
Cohee 9b75e49b54 Add support for Yi tokenizer 2023-11-21 00:21:58 +02:00
LenAnderson 3d4442ab25 make api routes kebab 2023-11-20 18:27:50 +00:00
LenAnderson 8b5a56a99c use DIRECTORIES const for comfy workflow path 2023-11-20 18:26:13 +00:00
kingbri 6a511fdfcf Secrets: Add find endpoint
Requires the user to set allowKeysExposure to true before any calls
can work.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-11-20 12:05:54 -05:00
LenAnderson 46cc04c798 add default comfy workflow 2023-11-20 15:59:38 +00:00
LenAnderson 9c41a9d2ac fix merge duplicates 2023-11-20 15:58:48 +00:00
LenAnderson 777d105602 fix formatting 2023-11-20 12:40:27 +00:00
LenAnderson 06ececc1a5 add managing multiple comfy workflows 2023-11-20 12:39:06 +00:00
LenAnderson 5e5c111d25 add VAE selection 2023-11-20 12:34:37 +00:00
Cohee 9dcc23825a [chore] Reformat 2023-11-19 21:17:02 +02:00
Cohee 5e6fcd28b2
Merge pull request #1371 from LenAnderson/staging
Add ComfyUI to the Stable Diffusion extension
2023-11-19 21:14:42 +02:00
Cohee 96b87641ca Add OpenAI Whisper API 2023-11-19 20:30:34 +02:00
LenAnderson 9dd1e59421 move requests to comfy into ST server 2023-11-19 18:29:41 +00:00
Cohee 57165cbe48 Fix invalid SerpApi secret id 2023-11-19 01:41:39 +02:00
Cohee 6f9be2eee9 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-11-17 23:19:25 +02:00
Cohee 0608c0afac Add OpenRouter and Llava to captioning plugin. 2023-11-17 23:19:21 +02:00