Commit Graph

2657 Commits

Author SHA1 Message Date
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 414c9bd5fb
Merge pull request #1450 from valadaptive/express-common
Move parsers into shared "express-common" module
2023-12-04 19:28:55 +02: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 d6fdafcacf
Merge pull request #1448 from valadaptive/sd-next-upscalers
Rename sd-next/upscalers to sd/sd-next/upscalers
2023-12-04 19:08:26 +02:00
Cohee fcbfdc70af Merge branch 'staging' into sd-next-upscalers 2023-12-04 19:07:34 +02:00
Cohee cce89dab05
Merge pull request #1449 from valadaptive/tokenizer-renames
Rename tokenizer endpoints
2023-12-04 19:06:49 +02:00
Cohee 8476ec7570 Merge branch 'staging' into tokenizer-renames 2023-12-04 19:01:38 +02:00
Cohee a846bb3f43
Merge pull request #1447 from valadaptive/viewsecrets-rename
Rename /viewsecrets to /api/secrets/view
2023-12-04 18:54:37 +02:00
Cohee 4bbb36a601 Merge branch 'staging' into viewsecrets-rename 2023-12-04 18:49:01 +02:00
Cohee 8bf18891b3 Add data model field for WI entry group 2023-12-04 18:47:35 +02:00
Cohee 11a60e5eec
Merge pull request #1446 from valadaptive/move-endpoints
Move endpoints into their own folder
2023-12-04 18:46:59 +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 24546621e3 Move endpoints into their own folder 2023-12-04 10:12:27 -05:00
Cohee b697a3c93f
Merge pull request #1445 from LenAnderson/fix-qr-reordering
Fix QR reordering
2023-12-04 16:16:23 +02:00
LenAnderson 76bfad8cdc fix: listeners calling wrong index after reorder 2023-12-04 13:33:28 +00:00
LenAnderson 8283d4dc08 fix: ctx button id after reordering 2023-12-04 13:28:58 +00:00
Cohee 604e62298c Concise welcome 2023-12-04 11:59:49 +02:00
Cohee 786e131c1e Disable scroll adjustment for firefox 2023-12-04 11:00:22 +02:00
Cohee 12a4194bd5
Merge pull request #1443 from valadaptive/aphrodite-fix
Fix holdover textgenerationwebui_settings
2023-12-04 00:37:58 +02:00
valadaptive 3c59b5b7a5 Fix holdover textgenerationwebui_settings 2023-12-03 17:36:25 -05:00
Cohee d44bb9f1e0
Merge pull request #1441 from valadaptive/completion-source-refactor
Refactor chat completion source API parameter
2023-12-04 00:35:11 +02:00
Cohee 671df1f62e Fix constant usage 2023-12-04 00:24:23 +02:00
Cohee 7a58a095a4 Merge branch 'staging' into completion-source-refactor 2023-12-04 00:22:02 +02:00
Cohee f7417e9fb3
Merge pull request #1437 from valadaptive/textgen-refactor
Clean up some textgen API code
2023-12-04 00:15:57 +02:00
Cohee 0a092629ce Fix undefined variable reference 2023-12-03 23:24:39 +02:00
valadaptive 24ccef3aba Fix "settings" variable being shadowed 2023-12-03 15:44:36 -05:00
valadaptive ebde9c2c1f Copy chat_completion_sources enum to server code 2023-12-03 15:04:01 -05:00
valadaptive e33c8bd955 Replace use_[source] with chat_completion_source
Same as the is_[api] replacement--it's easier to have one enum field
than several mutually-exclusive boolean ones
2023-12-03 15:03:39 -05:00
valadaptive a68505e857 Copy textgen-types enum to server code 2023-12-03 15:00:25 -05:00
valadaptive 9c33ddbafc Make textgen settings type checks more concise 2023-12-03 14:56:01 -05:00
valadaptive 047c897ead Remove is[API] functions
Just use an equality comparison. It's a bit longer, but only because
"textgenerationwebui_settings" is a long identifier.
2023-12-03 14:56:01 -05:00
valadaptive ba54e3dea0 Replaces is_[api] params with api_type param
These were 5 mutually-exclusive booleans, which can be replaced with one
param that takes on 5 values, one for each API type.
2023-12-03 14:56:01 -05:00
Cohee 8a1ead531c
Merge pull request #1439 from valadaptive/prompt-manager-class
Convert PromptManagerModule to a class
2023-12-03 21:52:27 +02:00
Cohee 486405df04
Merge pull request #1440 from SillyTavern/aphro-multiswipe
#1403 Add Aphrodite multi-swipe
2023-12-03 21:40:32 +02:00
Cohee 939e938ba2 Disallow multiswipe for quiet gens 2023-12-03 20:56:25 +02:00
Cohee 1786b0d340 #1403 Add Aphrodite multi-swipe 2023-12-03 20:40:09 +02:00
valadaptive b8b24540a9 Rename PromptManagerModule to PromptManager
The one place where it was imported renamed it to PromptManager anyway.
2023-12-03 12:14:56 -05:00
valadaptive 5c175bc647 Turn PromptManagerModule into a class 2023-12-03 12:13:53 -05:00
Cohee 676cc7731e #1436 Add unlock to response length 2023-12-03 18:30:21 +02:00
Cohee 40b132176d Add preset restoration 2023-12-03 17:16:33 +02:00
Cohee 14f395fdf9 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-12-03 15:11:49 +02:00
Cohee 45df576f1c Re-add default presets for content manager 2023-12-03 15:07:21 +02:00