Commit Graph

1999 Commits

Author SHA1 Message Date
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
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
based ca87f29771 added streaming for google models 2023-12-14 21:03:41 +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 22e048b5af Rename generate_altscale endpoint 2023-12-13 18:53:46 -05:00
valadaptive 92bd766bcb Rename chat completions endpoints
OpenAI calls this the "Chat Completions API", in contrast to their
previous "Text Completions API", so that's what I'm naming it; both
because other services besides OpenAI implement it, and to avoid
confusion with the existing /api/openai route used for OpenAI extras.
2023-12-13 18:52:08 -05: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
valadaptive 274605a07c Rename Kobold-related endpoints 2023-12-12 16:42:12 -05:00
valadaptive 5b3c96df50 Rename /textgenerationwebui endpoint
I'd like to migrate over to using "textgen" to mean text-generation APIs
in general, so I've renamed the /textgenerationwebui/* endpoints to
/backends/text-completions/*.
2023-12-12 16:40:14 -05:00
Cohee 83f2c1a8ed #1524 Add FPS limiter to streamed rendering 2023-12-12 22:11:23 +02:00
Cohee 9160de7714 Run macros on impersonation prompt 2023-12-12 19:24:32 +02:00
Cohee 9176f46caf Add /preset command 2023-12-12 19:14:17 +02:00
Cohee a9a05b17b9
Merge pull request #1517 from LenAnderson/firstIncludedMessageId
Add macro for first included message in context
2023-12-12 01:24:57 +02:00
Cohee 07fecacce2 Add to macro help 2023-12-12 01:24:21 +02:00
Cohee f1ed60953a
Merge pull request #1516 from LenAnderson/slash-command-for-getTokenCount
Add /tokens slash command to call getTokenCount
2023-12-12 01:19:24 +02:00
Cohee 299749a4e7 Add prerequisites for websearch extension 2023-12-12 01:08:47 +02:00
LenAnderson 69f90a0b30 add /tokens slash command to call getTokenCount 2023-12-11 22:51:07 +00:00
Cohee 1b11ddc26a Add vector storage to WI scanning 2023-12-11 22:47:26 +02:00
Cohee e713021737
Merge pull request #1511 from valadaptive/more-kobold-cleanups
More Kobold cleanups
2023-12-11 20:59:49 +02:00
Cohee 27782b2f83 Fix united version comparison 2023-12-11 20:44:29 +02:00
Cohee 7482a75bbd
Merge pull request #1493 from valadaptive/generate-cleanups
Clean up Generate(), part 1
2023-12-11 20:21:32 +02:00
Cohee d38a4dc6c1 Fix abort group generation 2023-12-11 20:03:31 +02:00
Cohee 0302686a96 Return from Generate if calling circuit breaker 2023-12-11 19:07:33 +02:00
Cohee e96fb0c1b5 Fix group wrapper not resolving to a valid text 2023-12-11 19:00:42 +02:00
Cohee 0fcf8fd491 Typing indicator fixed 2023-12-11 18:23:00 +02:00
Cohee 17105568f4 Reduce hard coded anim. durations 2023-12-11 16:23:21 +02:00
Cohee e7c2975ab0 Fix adv.defs overlap with past chats. Close CFG with Escape 2023-12-11 15:39:58 +02:00
Cohee c6bd3ef255 Fix /sys continue in groups 2023-12-11 15:08:20 +02:00
valadaptive 42d4ffe5e8 Remove Kobold "canUse(...)" functions
Replace them all with a versionCompare helper function which we can call
directly with the minimum version constants.
2023-12-10 20:39:21 -05:00
valadaptive d33cb0d8d1 Clarify getstatus API
Instead of "version" and "koboldVersion", have "koboldUnitedVersion" and
"koboldCppVersion", the latter of which is null if we're not connected
to KoboldCpp.
2023-12-10 20:34:11 -05:00
Cohee 7450112e9b Unbust user continue in group chats 2023-12-11 00:02:49 +02:00
Cohee 05b08f1ce2 Don't await delay promise 2023-12-10 21:51:16 +02:00
Cohee 2e50efc35c Limit waiting for TTS to init to 1 second on chat change 2023-12-10 21:50:52 +02:00
Cohee 420d186823 Add reduced motion toggle 2023-12-10 20:02:25 +02:00
valadaptive 33f969f097 Have Generate() return a promise
Generate(), being async, now returns a promise-within-a-promise.
If called with `let p = await Generate(...)`, it'll wait for generation
to *start*. If you then `await p`, you'll wait for generation to
*finish*. This makes it much easier to tell exactly when generation's
done. generateGroupWrapper has been similarly modified.
2023-12-10 12:30:10 -05:00
Cohee 13e016f3e5
Merge pull request #1508 from LenAnderson/tts-skip-codeblocks-option
add TTS option to skip codeblock narration
2023-12-10 19:28:16 +02:00
valadaptive 03884b29ad Always call resolve in Generate()
This lets us get rid of the janky hack in group-chats to tell when a
message is done generating.
2023-12-10 12:26:30 -05:00
valadaptive f5d2e50f5e Remove isGenerationAborted
Just check the AbortSignal.
2023-12-10 12:24:18 -05:00
Cohee dbd52a7994
Merge pull request #1482 from valadaptive/sse-stream
Refactor server-sent events parsing
2023-12-10 18:32:19 +02:00
LenAnderson bf88829b03 add option to skip codeblock narration 2023-12-10 16:32:10 +00:00
Cohee af89cfa870 Code clean-up 2023-12-10 16:48:25 +02:00
Cohee 5054de247b Merge branch 'staging' into qr-editor-tab-support 2023-12-10 16:36:28 +02:00
Cohee 9acef0fae6 Horde doesn't support API tokenizers 2023-12-10 16:21:06 +02:00
Cohee f54bf99006 Fix token ids not displaying in "API_CURRENT" mode for TextGen 2023-12-10 16:09:00 +02:00
Cohee 6957d9e7cf Fix display names of Best match tokenizers 2023-12-10 16:03:25 +02:00
Cohee 6e5eea5dba Unbreak previously selected API tokenizer in dropdown 2023-12-10 15:56:38 +02:00
Cohee d5140142fb Merge branch 'staging' into tokenizers-cleanup 2023-12-10 15:51:15 +02:00
Cohee 5f1683f43a More input padding and stricter sanitation 2023-12-10 15:07:39 +02:00
valadaptive 0201a0260c Default event type to 'message' if it's empty
Added to the upstream test suite. Matches the spec.
2023-12-10 04:45:10 -05:00
valadaptive 55976e61a3 Fix tokenizer override
I searched for all users of tokenizers.API, but missed that the menu
converts the numerical select values directly to enum values. I've used
the special tokenizer value 98 to represent "the tokenizer API for
whichever backend we're currently using".
2023-12-09 23:57:21 -05:00
valadaptive 0fce475a95 Implement random sort with a shuffle
Sorting with a random comparator doesn't actually shuffle an array.
Depending on the sorting algorithm used, there will be a bias to the
shuffle (see https://bost.ocks.org/mike/shuffle/compare.html).
If you open that link in Firefox, the bias will be especially bad.
Instead of implementing "random" character sort using a random sort
comparator, use the shuffle function instead.
2023-12-09 22:52:38 -05:00
valadaptive 014416546c Add padding once in getTokenCount
This means we don't have to pass the "padding" parameter into every
function so they can add the padding themselves--we can do it in just
one place instead.
2023-12-09 20:53:16 -05:00
valadaptive 2f2cd197cc Clean up tokenizer API code
Store the URLs for each tokenizer's action in one place at the top of
the file, instead of in a bunch of switch-cases. The URLs for the
textgen and Kobold APIs don't change and hence don't need to be
function arguments.
2023-12-09 20:48:41 -05:00
valadaptive 09465fbb97 Inline most get(...)TokenizerParams calls
For everything except textgenerationwebui, these params are now simple
enough that it doesn't make sense for them to be in a separate function.
2023-12-09 20:35:11 -05: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 7486ab3886 Separate textgen and Kobold tokenization APIs
They function differently and have different logic and API parameters,
so it makes sense to count them as two different APIs. Kobold's API
doesn't return tokens, so it can only be used to count them.

There's still a lot of duplicate code which I will clean up in the
following commits.
2023-12-09 20:24:56 -05:00
valadaptive 18177c147d Separate remote and server tokenization code paths
This lets us remove extraneous API params from paths where they aren't
needed.
2023-12-09 20:08:48 -05:00
valadaptive ddd73a204a Remove "remote" language from tokenizer functions
We'll be making a distinction between tokenizing *on* the server itself,
and tokenizing via the server having the AI service do it. It makes more
sense to use the term "remote" for the latter.
2023-12-09 19:49:22 -05:00
valadaptive 8bad059a62 Rename /tokenize_via_api endpoint
No redirect for this since I don't expect any extensions to be calling this directly.
2023-12-09 19:29:24 -05:00
LenAnderson a3ec8d709d add support for tab and shift-tab in QR editor 2023-12-09 17:56:36 +00:00
Cohee 2d7811fa46
Merge pull request #1499 from LenAnderson/qr-execute-from-any-preset
Allow /run for quick replies from any preset
2023-12-09 19:49:03 +02:00
LenAnderson d00861d913 allow /run for quick replies from other presets
/run otherPresetName.quickReplyLabel
2023-12-09 17:20:15 +00:00
Cohee e79f6d82da
Merge pull request #1498 from artisticMink/bulkedit-delete-optimization
Only refresh character list after all deletions have been processed.
2023-12-09 18:07:44 +02:00
Cohee b915b89ca9 Fix ESLint 2023-12-09 16:09:10 +02:00
Cohee ad9130b538 Single doc mode: edit on click 2023-12-09 16:01:43 +02:00
artisticMink dfd41a110a Prevent 'no such file or directory' error when mass deleting characters 2023-12-09 14:36:37 +01:00
artisticMink ba3966e148 Only refresh character list after all deletions have been processed. 2023-12-09 14:31:18 +01:00
valadaptive d735b12399 Refactor event stream parsing
I was really overcomplicating this before; this is simpler and faster.
Passes my existing test suite.
2023-12-08 15:05:57 -05:00
valadaptive 699c369443 Remove ignoreBOM
Apparently the ignoreBOM option actually means "include the BOM". I've
added a test for this in my own repository, and will also be submitting
a pull request to MDN to clarify this in their documentation.
2023-12-07 23:15:55 -05:00
Cohee b0e7b73a32 Fix streaming processor error handler hooks 2023-12-08 02:01:08 +02:00
valadaptive 5569a63595 Remove legacy_streaming setting
This was a workaround for older versions of Slaude that implemented SSE
improperly. This was fixed in Slaude 7 months ago, so the workaround can
be removed.
2023-12-07 18:00:36 -05:00
valadaptive cdcd913805 Don't stream events if the API returned a 4xx code 2023-12-07 18:00:36 -05:00
valadaptive 5540c165cf Refactor server-sent events parsing
Create one server-sent events stream class which implements the entire
spec (different line endings, chunking, etc) and use it in all the
streaming generators.
2023-12-07 18:00:36 -05:00
Cohee 6f610204d6
Merge pull request #1488 from LenAnderson/add-index-argument-to-setvar-/-setglobalvar
Add index argument to setvar / setglobalvar
2023-12-08 00:40:14 +02:00
Cohee 2607e787ff Put comment command on hold 2023-12-08 00:38:13 +02:00
Cohee e2f886d796 Revert pipe caching 2023-12-08 00:33:27 +02:00
Cohee 7f7ad6f523 Merge branch 'staging' into backgrounds-endpoint 2023-12-07 23:16:33 +02:00
Cohee 404b1562e5
Merge pull request #1491 from valadaptive/stats-endpoint
Move stats endpoints into their own module
2023-12-07 23:11:12 +02:00
valadaptive 2367f4f38f Rename backgrounds API endpoints 2023-12-07 15:17:19 -05:00
LenAnderson 65f2cc1952 add a comment slash commend /#
for commenting longer ST scripts
2023-12-07 18:29:28 +00:00
LenAnderson d52b5fb947 pass prev pipeResult through if result undefined 2023-12-07 18:28:58 +00:00
LenAnderson 5a719d635a use isArray instead of instanceof 2023-12-07 18:27:11 +00:00
LenAnderson 7bfed3fca1 /addvar on array to push 2023-12-07 18:12:05 +00:00
Cohee c84b6a5101 Add WI inclusion groups 2023-12-07 20:06:06 +02:00
valadaptive 26ebb417f4 Rename stats API endpoints 2023-12-07 13:00:34 -05:00
Cohee e804f27368 Convert value to string for echo. Fix return value 2023-12-07 19:37:55 +02:00
LenAnderson 2ee57afe2a add helpString for index in setvar 2023-12-07 16:51:45 +00:00
LenAnderson db6f782e0f add index to /setvar and /setglobalvar 2023-12-07 16:48:24 +00:00
Cohee b1f68d886c Fix WI field access for UID = 0 2023-12-07 18:45:34 +02:00
Cohee 72adb4c8aa Fix window.ai streaming 2023-12-07 17:42:06 +02:00
Cohee 785be22e51 Merge branch 'staging' into st-object-vars 2023-12-07 16:46:02 +02:00
Cohee e9a49b7997
Merge pull request #1485 from LenAnderson/qr-expand-editor
Add expand button to QR textareas
2023-12-07 15:31:01 +02:00
Cohee b506a17260 Fix expand after drag 2023-12-07 15:29:40 +02:00
LenAnderson afd32d1f4d better handling of array / object vars 2023-12-07 12:56:28 +00:00
LenAnderson 0290916035 stop expanding textarea 2023-12-07 12:29:00 +00:00
LenAnderson a1bfca78b3 add custom titles (tooltips) to QR buttons 2023-12-07 12:20:02 +00:00
LenAnderson d62ef8badc add expand button for QR textareas 2023-12-07 12:04:39 +00:00
Cohee 75abc6101a /input input => /input default 2023-12-07 13:44:49 +02:00
Cohee 0e6802c9d9 Too much lint 2023-12-07 13:35:48 +02:00
Cohee 25db4b6fde Merge branch 'staging' into feat/slash-commands-missing-args 2023-12-07 13:19:15 +02:00
Cohee 8082144c5a Merge branch 'staging' into worldinfo-endpoint 2023-12-07 12:58:57 +02:00
Cohee 0138008031 Merge branch 'staging' into groups-endpoint 2023-12-07 12:50:24 +02:00
Cohee c0fb5a4787
Merge pull request #1473 from valadaptive/chats-endpoint
Move chat endpoints into their own module
2023-12-07 12:36:43 +02:00
RossAscends c51a821b1e fix zen slider rep pen range value transfer 2023-12-07 11:52:10 +09:00
SrJuggernaut d6d0371459 add missing args to some slash commands 2023-12-06 19:26:29 -06:00
valadaptive c746e6a426 Rename worldinfo API endpoints 2023-12-06 20:00:51 -05:00
valadaptive 8027372fc2 Rename group API endpoints 2023-12-06 19:59:58 -05:00
valadaptive 6efe95f4f1 Rename chat API endpoints 2023-12-06 19:58:24 -05:00
Cohee f575e0d61d Add {{currentSwipeId}} / {{lastSwipeId}} macros 2023-12-07 02:35:24 +02:00
Cohee 393a15cd81 Run auto-executed STscripts after message rendered 2023-12-07 02:12:49 +02:00
Cohee 24aff67d50 Fix {{original}} macro left out if original is empty 2023-12-07 01:27:55 +02:00
valadaptive 39d771cc4a Replace path "\" with "/" server-side 2023-12-06 17:22:37 -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 5e282ac7b4 lint: infix spacing 2023-12-06 22:08:06 +02:00
LenAnderson ea7720a7de add /len slash command 2023-12-06 19:03:20 +00:00
LenAnderson a5c595d8ae add list accessors to /getvar and /getglobalvar 2023-12-06 19:03:10 +00:00
Cohee 64496425cc Save chat before reloading 2023-12-06 17:23:54 +02:00
Cohee 61f186764d Fix QR bar popout position 2023-12-06 14:53:29 +02:00
Cohee d36422e558 Fix/optimize bulk favorite 2023-12-06 01:56:07 +02:00
Cohee 356c3a4300 Fix amount gen on zen sliders 2023-12-05 14:12:06 +02:00
Cohee c9fbe75566 Rename WI logic ONE => ANY 2023-12-05 12:04:27 +02:00
Bronya Rand 537e9428e0 proper revert cuz vsc revert weird... 2023-12-05 03:00:26 -06:00
Bronya Rand f9ecc77b10 revert changes after cohee fix 2023-12-05 02:56:52 -06:00
valadaptive b689b8bd30 Rename character API endpoints
Precursor to moving the character API into its own module
2023-12-04 17:35:06 -05:00
Bronya Rand a90fe54e5b bak should not be here 2023-12-04 16:05:05 -06:00
Bronya Rand f71b83b14f add comment on new code and add () for logic checks 2023-12-04 16:00:02 -06:00
Bronya Rand 085daaeff7 simplify and proper NOT check fix 2023-12-04 15:57:04 -06:00
Cohee ddd16c1469
Merge pull request #1452 from valadaptive/assets-router
Use Express router for assets + "files" endpoints
2023-12-04 21:29:52 +02:00
Cohee 1ac494d468 Don't attempt to send files on dry runs. 2023-12-04 21:28:36 +02: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
valadaptive 5f1bed1e70 Enable object-curly-spacing lint 2023-12-04 12:32:41 -05: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
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
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 2180610363 Rename /viewsecrets to /api/secrets/view 2023-12-04 10:14:51 -05: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 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 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 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 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 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
RossAscends 43ad66ff90 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-12-03 21:59:23 +09:00
RossAscends 50f5b7b96f fix zenSliders 2023-12-03 21:59:21 +09:00
Cohee 91811f63b5 lint: Fix JSdocs 2023-12-03 14:23:20 +02:00
Cohee 5fb0807dcc Adjust max context step 2023-12-03 14:02:38 +02:00
Cohee a3bc51bcea Fix type-in max context for OAI 2023-12-03 13:56:22 +02:00
Cohee c051fc3ce9 Add wrapper for description popouts, make them wider 2023-12-03 03:21:11 +02:00
Cohee 4cb9cd128f Rename bookmarks to checkpoints 2023-12-03 03:11:14 +02:00
Cohee 3e9927dc67 Add editor textareas maximize 2023-12-03 02:01:06 +02:00
Cohee ff46a249d8 Add {{maxPrompt}} macro 2023-12-02 22:47:43 +02:00
Cohee 6e09e45651 Fix /trigger and /continue auto-execution 2023-12-02 22:34:46 +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
Cohee 9faa1e34b0 Merge branch 'staging' into singlequote 2023-12-02 20:43:41 +02:00
Cohee a28c23d295 Wait for generation unlock before running continue or trigger 2023-12-02 20:12:36 +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
Cohee 0477f6a553 Use best match API tokenizers for Text Completion sources 2023-12-02 19:42:15 +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 39bbef376f Enable no-undef lint
I'm not sure where run_edit is supposed to go or if any logic is
missing. I just made my best guess.
2023-12-02 12:11:19 -05:00
valadaptive 14afa1575b Enable no-redeclare lint 2023-12-02 12:11:19 -05:00
valadaptive c893e2165e Enable no-prototype-builtins lint 2023-12-02 12:10:31 -05:00
Cohee a91694ebbc Change audio format check 2023-12-02 18:41:54 +02:00
valadaptive b023312117 Enable no-useless-escape lint 2023-12-02 10:32:26 -05:00
valadaptive 97c49a405b Enable no-extra-boolean-cast 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 a665a4897d Enable no-unused-labels lint
I'm not sure why "esversion: 6" was at the top of the file. My best
guess is that whoever initially created it was using jshint, which says
"use 'esversion: 6'" if used to lint a file which contains ES6 code.
Even then, the proper syntax would be a comment.
2023-12-02 10:32:07 -05:00
valadaptive 1c121f1ba5 Enable use-isnan lint 2023-12-02 10:32:07 -05:00
valadaptive 9204a31d32 Enable no-self-assign lint 2023-12-02 10:32:07 -05:00
valadaptive c05aee8e72 Enable no-unsafe-negation lint
This actually fixes a bug--the old code was negating "audioData.type"
2023-12-02 10:32:07 -05:00
valadaptive 60ac1aa1c7 Enable no-empty lint 2023-12-02 10:32:07 -05:00
valadaptive 367f3dba27 Enable no-unsafe-finally lint 2023-12-02 10:32:07 -05:00
valadaptive e7ae1c4787 Enable no-dupe-keys lint 2023-12-02 10:32:07 -05:00
valadaptive 7c3dd75e6a Enable no-fallthrough lint 2023-12-02 10:32:07 -05:00
Cohee 249f9f649f Escape QR button labels 2023-12-02 15:19:44 +02:00
valadaptive 4c4e4caeb7 Pass in Kobold Classic API server url from client 2023-12-02 04:45:20 -05:00
Cohee 04ef9fba54 Disable context stop strings on pull but enable for new installs 2023-12-02 02:19:32 +02:00
Cohee 690c058a46 Fix boolean comparison 2023-12-02 00:04:38 +02:00
Cohee a2f293b6af Make context stop strings togglable 2023-12-01 23:06:37 +02:00
Cohee 9ad42025e5 Add depth to entry template 2023-12-01 22:09:13 +02:00
Cohee 07962e0e4e Add /setentryfield command 2023-12-01 21:51:49 +02:00
Cohee 69659e79e3 Add chat start and example separator as stop sequences 2023-12-01 19:01:06 +02:00
Cohee 19c6370fa5 Revert preset checkbox update logic 2023-12-01 11:55:05 +02:00
Cohee ca24e550a8 #1420 Revert undefined name variable resolution 2023-12-01 11:51:10 +02:00
Cohee bb727d5f9c Insert files before user text, not after 2023-12-01 03:54:28 +02:00
Cohee ebcefe67fc Add value increment variable and macros 2023-12-01 03:02:23 +02:00
Cohee fae90f8227 Add validation messages 2023-12-01 02:25:55 +02:00
Cohee 27d27127e0 Fix docstring typo 2023-12-01 02:11:47 +02:00
Cohee fe355c5d4f Add MVP set of WI manipulation commands 2023-12-01 01:50:10 +02:00
Cohee b6ed67b4b4 Add /regex command 2023-11-30 22:59:04 +02:00
Cohee b96054f337 Update max token limit for palm2 2023-11-30 19:02:31 +02:00
Cohee e9ad55aef2 Add seed input field for OpenAI settings #1412 2023-11-30 02:54:52 +02:00
Cohee c3259d1929 Bump package version 2023-11-30 01:41:20 +02:00
Cohee 252af836f0 #1418 Remove prefix from SD raw_last 2023-11-30 01:22:31 +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
RossAscends 307f0d88c3 'All' for ooba rep pen range zenslider, maxCtx tweak 2023-11-29 11:37:18 +09:00
RossAscends 9145406522 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-11-29 03:35:34 +09:00
RossAscends fcca1b1260 fix zenslider rep pen range for TextCompletions 2023-11-29 03:35:02 +09:00
Cohee 16527710b3 Make less obtrusive 2023-11-28 19:24:26 +02:00
Cohee a1098a4f31 Merge branch 'staging' into silerott-add-session-handling 2023-11-28 18:25:31 +02:00
Cohee f809d80ba2 Improve XTTS text processing 2023-11-28 16:56:50 +02:00
Cohee 82b7238b39 Add shorthand increment/decrement of variables 2023-11-28 16:00:04 +02:00
Cohee 5fd4ed6c81 Fix mobile QR context menu 2023-11-28 13:26:36 +02:00
Cohee 91f369c921 Raise slider limits 2023-11-28 11:48:34 +02:00
Cohee 5dd6665505 Don't set negative zIndex for regular image when using group VN mode 2023-11-28 11:40:39 +02:00
Cohee 91e1281208
Merge pull request #1407 from LenAnderson/fix-qr-popout-context
fix context menu for QR popout
2023-11-28 02:44:20 +02:00
Cohee 77e5c37c29 Fix extensions menu on long clicks 2023-11-28 02:43:24 +02:00
Cohee f3a10eadd5 Trigger concatenation on NaN current value 2023-11-28 01:46:44 +02:00
Cohee b0d21659eb /inject command to add prompt injections 2023-11-28 01:44:13 +02:00
Cohee 4f9f89c682 Add 3 more math operations 2023-11-28 00:52:50 +02:00
Cohee 87707b565f Add checkbox for restoring user input on page refresh 2023-11-28 00:29:34 +02:00
LenAnderson fd8551b73b fix context menu for Qr popout 2023-11-27 22:02:20 +00:00
Cohee d263760b25 #1393 Configurable group nudges, scenario and personality templates for prompt manager 2023-11-27 23:57:56 +02:00
Cohee 4c94bd0aa8 Add math operations 2023-11-27 21:10:50 +02:00
Cohee 188897a3df Add "at" argument to commands sending a message 2023-11-27 19:48:49 +02:00
Cohee 84811ec518 Fix image gen prefix combining 2023-11-27 16:10:42 +02:00
Cohee ffc4f22012 Add provider-specific TTS processing: XTTS - replace ellipsis, Novel - remove tildes. 2023-11-27 13:25:49 +02:00
Cohee edafb8dd13 Repurpose trigger command not just for groups 2023-11-27 11:16:40 +02:00
Cohee c742251c5a Mobile sprites fixes: hide non-VN sprite, fix group VN position, fix live2d conflicts 2023-11-27 03:22:35 +02:00
RossAscends fd8697afc0 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-11-27 09:48:07 +09:00
RossAscends 34d8588691 QR popout 2023-11-27 09:48:05 +09:00
Cohee fd0edd67a6 Fix recursive QR auto-execution 2023-11-27 02:18:36 +02:00
Cohee 3eeb137416 Fix persona switch input trigger 2023-11-26 19:56:19 +02:00
Cohee e587f208be Add resolution match on load 2023-11-26 18:19:37 +02:00
deffcolony aaeaa643e3
resolution presets for image generation extension (#1394)
+ New drawer with resolution presets at image generation extension

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2023-11-26 17:55:49 +02:00
Cohee 9c01a849cb Add buttons command 2023-11-26 17:05:55 +02:00
Cohee fb08552d46 Add instruct mode sequence macros 2023-11-26 16:37:05 +02:00
Cohee 3bc91f10ec Fix command aliases 2023-11-26 15:47:11 +02:00
Cohee 19f758a0fb #670 Add square avatars 2023-11-26 15:27:54 +02:00
Cohee e6c96553d0 Add text trimming commands 2023-11-26 13:55:22 +02:00
Cohee 809a55b2fd Merge branch 'config-yaml' into staging 2023-11-26 13:08:06 +02:00
Cohee c328d6f04a Add QR auto-exec on app startup 2023-11-26 02:12:31 +02:00
Cohee 9587a704c5 Fix docstrings 2023-11-26 01:52:41 +02:00
Cohee 283d49a6ee Add empty return value to /while 2023-11-26 01:49:37 +02:00
Cohee c259c0a72a Skip hidden messages from /message command 2023-11-26 01:15:19 +02:00
Cohee c6aea00e27 Resolve ephemeral stop strings variables 2023-11-26 00:56:55 +02:00
Cohee 50322ed8b0 Don't show auto-update toast if no extensions installed 2023-11-26 00:52:00 +02:00
Cohee a7024a1d34 Migrate to config.yaml 2023-11-25 23:45:33 +02:00
RossAscends 3ec692e76c fix /world unsetting function 2023-11-26 05:26:41 +09:00
Cohee 0bbaeeaedd Revert to get/set/add order for variable macro 2023-11-25 22:02:40 +02:00
Cohee 0410540066 Process variable macros line by line 2023-11-25 20:52:17 +02:00
Cohee a5c3e22833 #1055 Add new random syntax to docs 2023-11-25 20:41:46 +02:00
Cohee 0d9068f11e Don't replace {{addvar}} macros with the execution result 2023-11-25 20:33:07 +02:00
Cohee 67fa9c9595 Allow dice rolls in {{random}} 2023-11-25 20:11:47 +02:00
Cohee 67174c8cf8 Add functions to delete local and global variables 2023-11-25 19:53:00 +02:00
Cohee b8d7b0922d Fix evaluation order of named args 2023-11-25 18:18:57 +02:00
Cohee d862005c1c Revert "Replace macros in named args of boolean evaluation"
This reverts commit 6894b7ef72.
2023-11-25 18:16:53 +02:00
Cohee 6894b7ef72 Replace macros in named args of boolean evaluation 2023-11-25 18:12:28 +02:00
Cohee 06ade803fa Concatenate strings in /addvar 2023-11-25 17:45:40 +02:00
RossAscends 389c2b5435 force firstMes {{user}} update on persona switch 2023-11-25 23:40:27 +09:00
Cohee 8e49ecce49
Merge pull request #1395 from daswer123/staging 2023-11-24 20:07:51 +02:00
Cohee 851a00630a Add /popup command 2023-11-24 19:50:49 +02:00
Danil Boldyrev fbc72085f8 Hindi Support for XTTS 2023-11-24 20:16:49 +03:00
Cohee 4fd68e5be7 Skill issue 2023-11-24 19:10:09 +02:00
Cohee a178bdc3b0 Fix ephemeral stopping strings flush 2023-11-24 19:06:31 +02:00
Cohee 2c8e855385 Resolve variables in /fuzzy 2023-11-24 17:41:49 +02:00
Cohee adb3badcc1 Add /messages and /setinput commands 2023-11-24 17:12:59 +02:00
Cohee c9b3ccc585 Add STscript procedure calls with /run command 2023-11-24 15:58:00 +02:00
Cohee dd17c2483f Add lock=on/off to /gen and /genraw commands 2023-11-24 15:18:49 +02:00
Cohee 8e16f28827 Fix variable cast 2023-11-24 14:53:12 +02:00
Cohee d81371c2b7 Fix variables casting 2023-11-24 14:44:11 +02:00
Cohee bcf73e0e55 Add auto-execute on opening chat option to quick
reply settings
2023-11-24 14:02:04 +02:00
Cohee f1d375c2ba Add hidden/invisible/auto-exec only QR buttons 2023-11-24 13:50:42 +02:00
Cohee 720da5649b Don't auto-exec on disable QR 2023-11-24 13:32:27 +02:00
Cohee ad8709842b STscript improvements (see below)
Add /while loop
Add escaping of macros in sub-commands
Add /input prompt
2023-11-24 12:49:14 +02:00
RossAscends 55607ee847 remove HumiBlur from QR chain menus 2023-11-24 17:45:13 +09:00
Cohee d3ea5c081d Add /pass and /fuzzy commands 2023-11-24 02:21:50 +02:00
Cohee 74fbc88d7d Move macros replacement to script execution time 2023-11-24 01:56:43 +02:00
Cohee 461e8d7929 Update the tooltip on the vertical ellipsis button 2023-11-24 01:39:39 +02:00
Cohee e593dd4dbd Auto-executable QR 2023-11-24 01:32:02 +02:00
Cohee 7841f3d91f
Merge pull request #1392 from LenAnderson/qr-context
Add context menus for Quick Replies
2023-11-24 01:04:24 +02:00
Cohee c4e1fff1bc Respect # limit for ephemeral stop strings 2023-11-24 00:54:23 +02:00
Cohee 863554fea6 Add ephemeral stop strings to /genraw 2023-11-24 00:51:27 +02:00
Cohee c2e3bfa06d /genraw instruct=off 2023-11-24 00:36:35 +02:00
Cohee c50ed4bf6a STscript improvements (see below)
/abort command, {{pipe}} macro in named args, subcommand batch escaping with backslash, string literals and rules for /if, else clause for /if
2023-11-24 00:18:07 +02:00
Cohee 3594c4aac7 Add {{newline}} and {{pipe}} macros 2023-11-23 22:56:52 +02:00
Cohee 86819b6f4f Add /genraw command 2023-11-23 22:50:13 +02:00
Cohee 6d0982e823 Unleash the variables / STscript alpha 2023-11-23 22:36:48 +02:00
LenAnderson ab9c654708 Merge branch 'staging' into qr-context 2023-11-23 20:35:21 +00:00
LenAnderson cdbcd6cfb2 add a healthy dose of mobile copium 2023-11-23 20:34:20 +00:00
Cohee 22e17cd681 Pass image type to thumbnail creator 2023-11-23 20:50:08 +02:00
LenAnderson 81f135fa7c use client coords not screen coords 2023-11-23 17:42:31 +00:00
LenAnderson af2b108730 add context menu editor 2023-11-23 17:42:19 +00:00
LenAnderson 5e4dc388eb Merge branch 'staging' into qr-context 2023-11-23 15:57:35 +00:00
LenAnderson d32224041a add parent placeholders 2023-11-23 15:57:14 +00:00
RossAscends 73d6801406 slashcommand /movingui to set a MUI preset 2023-11-23 22:32:47 +09:00
LenAnderson e2a1892e6b Merge branch 'staging' into qr-context 2023-11-23 12:21:46 +00:00
LenAnderson cc426e9897 add qr context menus 2023-11-23 12:21:25 +00:00
RossAscends e0e303b339 Sortable QuickReplies 2023-11-23 19:49:15 +09:00
Cohee f802fe1797 Fix xtts separator 2023-11-22 17:47:58 +02:00
Cohee 2b54bfd1d5
Merge pull request #1380 from LenAnderson/checkbox-contrast
ensure checkboxes have contrast
2023-11-22 16:52:48 +02:00
Cohee 61908935f5 Stop string for user-continue. Trim spaces after name2 2023-11-22 16:16:48 +02:00
Cohee 55af72cb17 /addswipe command 2023-11-22 01:26:17 +02:00
Cohee 63e5bc9341 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-11-22 00:58:08 +02:00
Cohee 4f7523b896 Parallelize extensions auto-update + add a toast 2023-11-22 00:58:06 +02:00
RossAscends 0d84aed89c Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-11-22 07:48:40 +09:00
RossAscends fe21a7c25b Add toggle for hiding muted group member sprites 2023-11-22 07:48:35 +09:00
Cohee e5f7b0b5c7 Use explicit unnamed argument first if exists 2023-11-22 00:43:33 +02:00
Cohee 4b78ddbc8a First steps in slash command piping 2023-11-22 00:39:17 +02:00
Cohee 1b4d955aec Add swipe id validation for /delswipe 2023-11-21 23:33:20 +02:00
Cohee 284bd76589 Add /delswipe command 2023-11-21 23:28:11 +02:00
Cohee 2dc8f8f2f7 Add 5 group control commands 2023-11-21 22:35:59 +02:00
Cohee 5f77b2f816 Add Claude 2.1 2023-11-21 20:07:37 +02:00
Cohee 1891a03b11
Merge pull request #1383 from daswer123/staging
Add support for the new TTS - XTTSv2
2023-11-21 16:26:45 +02:00
Cohee 73e081dd99 Don't use global state to build Chat Completion prompts 2023-11-21 14:38:15 +02:00
Danil Boldyrev bcad0d4e51 add XTTS 2023-11-21 13:16:56 +03:00
LenAnderson 9f16b329c5 ensure checkboxes have contrast 2023-11-21 01:26:43 +00:00
Cohee 01b629bd49 New syntax for sendas command 2023-11-21 02:54:04 +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 ddbdceba64 Add sampler order for koboldcpp under text completions 2023-11-21 01:47:57 +02:00
Cohee 1ebfddf07e Use mistral and yi tokenizers for custom token bans 2023-11-21 01:04:27 +02:00
Cohee 9b75e49b54 Add support for Yi tokenizer 2023-11-21 00:21:58 +02:00
LenAnderson 1c725879d8 add func for loading dropdown opts for settings 2023-11-20 22:00:40 +00:00
Cohee 4222b2aa21 Add enable/disable group member commands 2023-11-20 23:49:04 +02:00
LenAnderson 3d4442ab25 make api routes kebab 2023-11-20 18:27:50 +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 d24c74e34a update comfy generate to use saved workflows 2023-11-20 12:51:36 +00:00
LenAnderson 06ececc1a5 add managing multiple comfy workflows 2023-11-20 12:39:06 +00:00