Commit Graph

1049 Commits

Author SHA1 Message Date
Cohee b69c5bcd17
Merge pull request #2177 from sasha0552/vllm-support
vLLM support
2024-05-03 20:03:05 +03:00
RossAscends 5ab1e74c5f WIP Debug Menu button to copy API setup to clipboard. 2024-05-03 16:35:32 +09:00
sasha0552 2bd239fe81
Initial vLLM support 2024-05-02 22:40:40 +00:00
Cohee 2f85e50c6f
Merge pull request #2171 from 24adamcho/generic-card-download
Character card import from generic sources (specifically Discord, Catbox.moe)
2024-05-01 19:58:17 +03:00
Cohee eb4cae4e6d Add WL to config. Code clean-up. 2024-05-01 19:52:34 +03:00
Cohee e4e6882f12 Fix scroll to bottom on chat open 2024-05-01 14:56:55 +03:00
Cohee 620cd6dfc2 Move persona functions from script. Clean-up exports 2024-05-01 14:03:24 +03:00
Cohee bddfd5763b Fix persona filter rule 2024-05-01 12:49:53 +03:00
Adam 5c552a3d53 added examples for catbox/discord import links 2024-04-29 23:44:15 -05:00
Wolfsblvt b4aa7831e7 Scored search sorting for char list 2024-04-30 04:30:39 +02:00
Wolfsblvt d1cdd60883 Scored search sorting for personas 2024-04-30 02:27:44 +02:00
Wolfsblvt a850352eab Scored search sorting for world info 2024-04-30 01:39:47 +02:00
Cohee 87219f897e Check that char.list has any filters before applying hidden block. 2024-04-28 21:33:37 +03:00
Cohee 73cf58826f Pause autoplay on external media removal 2024-04-28 20:11:58 +03:00
Cohee be4637a3a0 Handle <br> in message texts with Showdown instead of manually 2024-04-28 20:00:22 +03:00
Cohee 6ac6c7cfda #2159 Move debounce constants to a separate module 2024-04-28 19:47:53 +03:00
Cohee 94e9b8f4b1 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2024-04-28 19:29:12 +03:00
Cohee d51b155e52 Add ability for extensions to intercept edited message text 2024-04-28 18:39:32 +03:00
Matěj Račinský 754cdc4d58 refactor: prompt itemization split to multiple functions 2024-04-28 14:09:10 +02:00
Wolfsblvt 61e2877c4b Debounce Character and Persona search 2024-04-28 06:27:55 +02:00
Wolfsblvt d7ade487b8 Refactor common enum for debounce timeouts 2024-04-28 06:21:47 +02:00
Cohee f632888b4c Move scripts init at the end of HTML page 2024-04-27 23:44:08 +03:00
Cohee f479901c87
Merge pull request #2152 from Wolfsblvt/auto-sort-tags-option
Option to auto-sort tags (+UI improvements)
2024-04-27 17:45:23 +03:00
Cohee c95956766e Don't need a hack since you're not awaiting the popup 2024-04-27 17:33:52 +03:00
Wolfsblvt 2e562d187a Option to auto-sort tags (+UI improvements)
- Toggle to auto-sort tags alphabetically
- Init auto-sort based on current sorted state, if not chosen before
- Tag management redraw list if changes happen
- Tag management highlight renamed rows on auto-sort if they get automatically reordered
- Manual drag&drop of tags disables auto-sort option
- Small fixes to popup tag management pop drawing
- Utility function to flash highlight via CSS
2024-04-27 10:26:01 +02:00
Cohee f4ba1f68ef
Merge pull request #2136 from BlueprintCoding/release
Added import function for AICharacterCards.com cards
2024-04-26 22:42:04 +03:00
valadaptive dbcc75471f Refactor CFG prompt gen in getCombinedPrompt
We don't need to create the cfgPrompt variable unless useCfgPrompt is
true, so move it inside the if-block.
2024-04-25 09:09:30 -04:00
valadaptive 2a0497ca9e Only generate negative prompt for textgen API
The original comment mentions that we need to get the negative prompt
first since it "has the unmodified mesSend array", but we've cloned the
mesSend array since forever, so I don't think mutation is an issue
anymore.
2024-04-25 09:09:30 -04:00
valadaptive 2d0767306e Remove unnecessary cfgPrompt null-chains
We already check if cfgPrompt exists.
2024-04-25 09:09:30 -04:00
valadaptive 8ca83bb255 Extract CFG check 2024-04-25 09:09:30 -04:00
valadaptive 80a6406062 Don't reassign thisPromptBits
Instead, just use additionalPromptStuff where thisPromptBits was used
after the assignment.
2024-04-25 09:09:30 -04:00
valadaptive ff9345a843 Make generate_data preparation a switch-case
We switch based on main_api. In the future, I'd like to move the
openai-specific token count stuff outside the switch case and extract
the generate_data preparation into its own function that we can pass
main_api into.
2024-04-25 09:09:30 -04:00
valadaptive fe663c4f04 Move auto_adjust_response_length logic
This if-block only applies to Kobold Horde, so move it inside the Kobold
and Horde-specific case in the else-if chain.
2024-04-25 09:09:30 -04:00
Blueprint Coding 305afb3713 Added import function for AICharacterCards.com cards
Added ability to import cards directly from aicharactercards.com via it's api like Chub and Janny.
Video of it in action: https://streamable.com/gbfdtw

Just pass the last two slash vars from the url (the author and card title) from a page. EX: aicharcards/the-game-master to:
https://aicharactercards.com/wp-json/pngapi/v1/image/

In this example: https://aicharactercards.com/wp-json/pngapi/v1/image/aicharcards/the-game-master
2024-04-24 18:04:17 -06:00
Cohee 4370db6bdc Implement World Info activation using Vector Storage 2024-04-23 03:09:52 +03:00
Cohee 6d1933c8f3 Escape name regex in message formatting function 2024-04-22 17:35:42 +03:00
Cohee ef5d505de3 Merge branch 'staging' into neo-server 2024-04-21 18:28:56 +03:00
Cohee dac89a87b7 Fix new characters highlight 2024-04-21 14:20:24 +03:00
Cohee 70c4e82b89 Merge branch 'staging' into neo-server 2024-04-20 21:10:43 +03:00
Cohee 3a5886f53a Change generation type from regenerate to normal if the non-streaming generation fails to produce any text 2024-04-20 20:20:51 +03:00
Cohee b3bbec83b6 Merge branch 'staging' into neo-server 2024-04-20 02:56:05 +03:00
Cohee 33ea3344ff Insert messages to chat load with splice 2024-04-20 02:44:19 +03:00
Cohee 2a2a63c52c Add Perplexity as Chat Completion source 2024-04-20 00:09:38 +03:00
Cohee 09d43403b2 Merge branch 'staging' into neo-server 2024-04-19 15:07:38 +03:00
Cohee 794786da43 Remove unnecessary delays in the prompt builder.
This is no longer needed since the async token counter won't block the UI thread during the request preparation.
2024-04-19 02:08:18 +03:00
Cohee 2eafa2a212 Clean-up vectors upon deleting a file from Data Bank 2024-04-18 23:07:16 +03:00
Cohee 16785ae005 Merge branch 'staging' into neo-server 2024-04-18 22:57:27 +03:00
RossAscends 75afe29f28 don't force amt_gen to model max on mancer model swap 2024-04-18 11:10:17 +09:00
Cohee 59bb04f1b3 Implement generic interface for adding Data Bank scrapers 2024-04-18 00:14:41 +03:00
Cohee 88637adfe2 Merge branch 'staging' into neo-server 2024-04-17 19:39:57 +03:00
Cohee 242d57c14b Add Data Bank manager 2024-04-16 02:14:34 +03:00
Kristan Schlikow d4d23f8234
Only close on left click 2024-04-15 20:38:59 +02:00
Kristan Schlikow 2fcbefc9f5
Fix right click closing the zoomed avatar image 2024-04-15 20:35:38 +02:00
Cohee 2b12d3f8e8 Merge branch 'staging' into neo-server 2024-04-15 01:23:36 +03:00
Cohee f7eb57082a
Merge pull request #2090 from Dakraid/feature/zoomed-avatar-tweaks
Adjust style and add magnification to zoomed avatar
2024-04-15 00:44:27 +03:00
Cohee 022c180b62 Lint and clean-up 2024-04-15 00:39:15 +03:00
Cohee 0263be8c1f Merge branch 'staging' into neo-server 2024-04-15 00:26:52 +03:00
Cohee 4a553e1fc8 Merge branch 'release' into staging 2024-04-15 00:26:43 +03:00
Cohee 789bb0da59 Fix extensions update loop 2024-04-15 00:24:15 +03:00
Kristan Schlikow 54eec3e215
Separate handling for closing for mobile and desktop
Clicking on the image only closes on desktop now, while on mobile the close button has to be pressed as touch is used for the magnification
2024-04-14 22:17:38 +02:00
Cohee f19d6ac0ff Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2024-04-14 21:28:28 +03:00
Cohee 20b950b120 Do not return null bias if empty string occurred. 2024-04-14 21:28:26 +03:00
Cohee 23ac23010d Fix the rest of mobile cases 2024-04-14 21:17:18 +03:00
Cohee a899160311 Use global animation duration for avatars 2024-04-14 20:27:01 +03:00
Cohee 1de409fdf7 Don't force aspect ratio of zoomed avatars. Prevent closing on drag grabber. 2024-04-14 20:20:22 +03:00
Cohee bd6fe19bf1 Merge branch 'staging' into llm-expressions 2024-04-14 19:43:34 +03:00
Kristan Schlikow 928fa7a3fc
Close zoomed image when clicking the parent div instead of image
Makes it easier to close on mobile
2024-04-14 17:12:26 +02:00
Kristan Schlikow 835d6c71fa
Add option to toggle magnification behaviour 2024-04-14 17:00:10 +02:00
Cohee fd0c16bf12 Don't unblock generation if a parallel stream is still running after quiet gens 2024-04-14 17:26:58 +03:00
Kristan Schlikow 384708f577
Close zoomed image on click 2024-04-14 16:12:27 +02:00
Kristan Schlikow cde6639d8a
Merge remote-tracking branch 'origin/staging' into feature/zoomed-avatar-tweaks 2024-04-14 15:19:33 +02:00
Cohee ddc55c7c22 Merge branch 'staging' into neo-server 2024-04-14 15:00:50 +03:00
Cohee 8e92a895ac Merge branch 'release' into staging 2024-04-14 15:00:39 +03:00
Cohee 2a061fdf54 Fix app init order 2024-04-14 14:58:58 +03:00
Kristan Schlikow 0c4da602ab
Adjust style and add magnification to zoomed avatar 2024-04-14 02:58:23 +02:00
Cohee 4e1a9da840 Merge branch 'staging' into neo-server 2024-04-13 21:52:23 +03:00
Cohee 306bff0a92 #2085 Switch to async token counters 2024-04-13 21:33:19 +03:00
Cohee 1c4bad35b2 #2085 Implement async token counting 2024-04-13 21:05:31 +03:00
Cohee 1a372abaff Customizable avatars for users 2024-04-13 17:52:37 +03:00
Cohee 53386b35c9 Make Reset account functional 2024-04-13 00:11:20 +03:00
Cohee d8092ec3eb Merge branch 'staging' into neo-server 2024-04-12 00:01:52 +03:00
Cohee 356f1f9c39 Clean-up non-character state checks 2024-04-11 23:50:01 +03:00
Cohee 369c3512c0 Add async template renderer 2024-04-11 22:36:23 +03:00
Cohee 31ba3cf039 Merge branch 'staging' into neo-server 2024-04-11 21:47:10 +03:00
Yokayo a5d3c98e01
Bind strings to locale 2024-04-11 15:00:29 +07:00
Cohee 8f1d2e0163 Generic popup as a notarget for panel closing 2024-04-10 01:35:59 +03:00
Cohee 56a72eea5c Merge branch 'staging' into neo-server 2024-04-10 00:38:35 +03:00
Cohee 69d219cd7e Allow trimming chat start with {{trim}} macro 2024-04-10 00:32:53 +03:00
Cohee 497f38111f Merge branch 'staging' into neo-server 2024-04-09 20:26:03 +03:00
Cohee da01384cb6 Itemization: Deduct chat injects from total chat messages 2024-04-09 19:24:49 +03:00
Cohee 4f83782430 Fix double count of chat injects for message fitting logic 2024-04-09 19:06:39 +03:00
Cohee 3fd40a33de Fix double count of chat injects for message fitting logic 2024-04-09 19:06:10 +03:00
Cohee d4f428d4bc Add new popup to extensions API 2024-04-09 11:10:40 +03:00
LenAnderson 0e2a82ce00 add generic popups with their own elements 2024-04-08 18:42:33 -04:00
Cohee 72792ae9f9 Basic account management 2024-04-08 02:38:20 +03:00
Cohee b07a6a9a78 Update all endpoints to use user directories 2024-04-07 01:47:07 +03:00
Cohee d27efb21d6
Merge pull request #2014 from Wolfsblvt/fix-multi-char-import
Fix multi char import on import button click not importing tags
2024-04-05 02:00:29 +03:00
Wolfsblvt 2e9c96d1c9 Fix multi char import on button
- Fixes #1983
- importCharacter has to be async await to await user input on tag creation
2024-04-05 00:53:32 +02:00
Cohee 0804843805 Add per-character and per-group overrides for external media 2024-04-05 00:39:54 +03:00
Aisu Wata 5ab9d9b863 removed some remnant debug logs 2024-04-04 03:08:17 -03:00
Cohee cf6705baff Fix response length override 2024-04-03 02:33:01 +03:00
Cohee 27698fd024 Add ability to get model name with /model 2024-04-03 00:52:30 +03:00
Cohee c0bb90b649 Return instruct and context names when no name provided for slash command 2024-04-03 00:36:40 +03:00
Cohee 8a0997c47b Allow auto-continue in group chats 2024-04-03 00:27:11 +03:00
Cohee f13e718dc7 Compatibility with extensions 2024-04-02 20:25:37 +03:00
Cohee 910837441c
Merge pull request #1999 from Wolfsblvt/fix-autoscroll-firefox
Fix autoscroll stop not working on Firefox
2024-04-02 00:26:16 +03:00
Cohee 9838ba8044 #1994 Add Cohere as a Chat Completion source 2024-04-02 00:20:17 +03:00
Wolfsblvt 1be9551e9a Fix autoscroll stop not working on firefox 2024-04-01 23:12:54 +02:00
Cohee 3331cb6491 Add ability to temporarily override response length for /gen and /genraw 2024-03-31 21:02:38 +03:00
Cohee ad4269f476 Add system prompt to /genraw command 2024-03-31 19:42:12 +03:00
Cohee 045d4e972a
Merge pull request #1982 from Wolfsblvt/improve-bulk-edit-and-fixes
Improve bulk edit and bug fixes to tags
2024-03-31 11:00:28 +03:00
Cohee a96bb40505 #1991 Add API key for llama.cpp 2024-03-31 00:27:12 +02:00
Cohee 153f75cf1a Add role selection to Character's Note depth prompt 2024-03-30 23:12:01 +02:00
Wolfsblvt 71a630ad85 Code documentation for tags & bogus state
- Add lots of code documentation for tag functions (I'm sorry, I live in object oriented languages...)
- Fix bogus folder setting not being respected for some controls
2024-03-30 22:06:50 +01:00
Wolfsblvt 1ff40f0af4 Merge remote-tracking branch 'upstream/staging' into improve-bulk-edit-and-fixes 2024-03-30 19:03:03 +01:00
Cohee 26690353e1 + edge case comment 2024-03-30 16:05:43 +02:00
Cohee 34c79049ad Fix edge case with newlines in quiet prompts with wrap enabled 2024-03-30 16:04:10 +02:00
Cohee e99d37d549 Remove extraneous newlines when formatting quiet prompts 2024-03-30 15:54:42 +02:00
Cohee 12a36341f8 Fix newline trimming for the last message 2024-03-30 11:50:20 +02:00
Wolfsblvt ea4ba57408 Fix horizontal scrollbar appearing in popups
- Fix that annoying horizontal scrollbar appearing in popups, e.g. the tag popup when you drag tags around
- Still provide possibility to make popups actually utilize scrollbars
2024-03-30 05:41:54 +01:00
Wolfsblvt 80f4bd4d9e Global refactor of printCharacter and filter print
- (!) Refactor character list and filter redrawing to one global debounce
- Refactor all places where character list and filters where redrawn to the correct usage (hope I didn't miss any)
- Automatically redraw character list on each tag bulk edit
- Fix tags not being sorted in bulk edit mutual tags list
- Refactor bulk tag edit class to actually be an instance object
- Remember scroll position on character list redraw - unless it's a full refresh
2024-03-30 03:06:40 +01:00
Cohee 2d5b871f2a Fix array access 2024-03-29 15:01:08 +02:00
Wolfsblvt bf8b6b80d7 Refactor and improve bulk delete popup
- Improve bulk edit popup with display of avatars and better format
- Refactor both calls of bulk delete to use the same method
- Add display of filename on avatar hover for inline avatars (@Cohee you forgot this one (: )
2024-03-29 05:53:26 +01:00
Wolfsblvt 9005d3f790 Merge remote-tracking branch 'upstream/staging' into improve-bulk-edit-and-fixes 2024-03-29 02:42:27 +01:00
Cohee fcdd90cec4 Adjust last prompt line of quite gens 2024-03-28 21:51:02 +02:00
Cohee c4427349c9 Merge branch 'staging' into instruct-rework 2024-03-28 20:22:52 +02:00
Cohee 7c99d87238 Also clear prompt cache on streaming stop 2024-03-28 20:22:14 +02:00
Cohee 689af3151a Pre-populate chat history with injections 2024-03-28 02:59:52 +02:00
P3il4 6e411b06b9 Fix prompt cache after API error 2024-03-28 03:32:57 +03:00
Cohee 4b6a3054b1 Implement user alignment message 2024-03-28 02:27:37 +02:00
Cohee d02c93e84f Merge branch 'staging' into instruct-rework 2024-03-28 01:34:04 +02:00
Cohee 945e3e3b0e Add prefix to avatar tooltip 2024-03-28 01:27:28 +02:00
Cohee 03d255442e Return display avatar name on hover 2024-03-28 01:17:43 +02:00
Cohee 6ed604593c Copy tags on duplicating 2024-03-28 01:13:54 +02:00
Cohee 310acfe810 Use new instruct sequences in prompt formatting 2024-03-28 00:52:20 +02:00
Cohee 03582a8ec6
Merge pull request #1977 from Wolfsblvt/swipe-id-attribute
Include swipeid to all messages in chat
2024-03-28 00:13:51 +02:00
Wolfsblvt b8c6e6c85c Remove unnecessary swipe id check 2024-03-27 23:12:40 +01:00
Wolfsblvt 11b3162aa4 Include swipeid to all messages in chat 2024-03-27 22:11:19 +01:00
Cohee 5264e2b194 Emit events when a new group chat is created 2024-03-27 20:44:04 +02:00
Cohee 9bd1d79f08 Save a backup before deleting from new chat menu 2024-03-27 20:43:40 +02:00
Cohee 0bf6835de2 Add "compact" argument to message sending commands. 2024-03-27 19:40:34 +02:00
Cohee 6d02223bd4 Fix cases with persona autoswitch 2024-03-27 15:16:20 +02:00
Wolfsblvt 53848e1b0d Persona retrigger first message consistency fix 2024-03-27 09:49:59 +01:00
Wolfsblvt a4c4f36fc6 Bulk edit select improvements & bulk tag edit inline avatars
- bulk edit tags shows inline avatars for all selected characters
- allow shift-click selecting/deselecting multiple characters on bulk edit
- bulk select all button added
- bulk select shows selected character count
2024-03-27 08:33:32 +01:00
Cohee 7c0cf50d80 #1966 Fix selector 2024-03-26 00:07:26 +02:00
Cohee 5216d5c8c0 Fallback for token count display 2024-03-25 19:00:14 +02:00
Cohee 129febedce
Merge pull request #1962 from 50h100a/pr_mancerargs
Updates to Mancer parameters and a logprobs fix
2024-03-25 18:59:25 +02:00
Cohee e9b05d4adc Indicate injected items by extension prompts in finalMesSend 2024-03-25 18:37:32 +02:00
Cohee 0218eb1a18 Disable newline wrapping of in-chat extension prompts 2024-03-25 13:11:28 +02:00
Cohee df805d692b Fix some code 2024-03-24 21:42:27 +02:00