Commit Graph

924 Commits

Author SHA1 Message Date
f4ba1f68ef Merge pull request #2136 from BlueprintCoding/release
Added import function for AICharacterCards.com cards
2024-04-26 22:42:04 +03:00
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
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
2d0767306e Remove unnecessary cfgPrompt null-chains
We already check if cfgPrompt exists.
2024-04-25 09:09:30 -04:00
8ca83bb255 Extract CFG check 2024-04-25 09:09:30 -04:00
80a6406062 Don't reassign thisPromptBits
Instead, just use additionalPromptStuff where thisPromptBits was used
after the assignment.
2024-04-25 09:09:30 -04:00
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
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
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
4370db6bdc Implement World Info activation using Vector Storage 2024-04-23 03:09:52 +03:00
6d1933c8f3 Escape name regex in message formatting function 2024-04-22 17:35:42 +03:00
ef5d505de3 Merge branch 'staging' into neo-server 2024-04-21 18:28:56 +03:00
dac89a87b7 Fix new characters highlight 2024-04-21 14:20:24 +03:00
70c4e82b89 Merge branch 'staging' into neo-server 2024-04-20 21:10:43 +03:00
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
b3bbec83b6 Merge branch 'staging' into neo-server 2024-04-20 02:56:05 +03:00
33ea3344ff Insert messages to chat load with splice 2024-04-20 02:44:19 +03:00
2a2a63c52c Add Perplexity as Chat Completion source 2024-04-20 00:09:38 +03:00
09d43403b2 Merge branch 'staging' into neo-server 2024-04-19 15:07:38 +03:00
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
2eafa2a212 Clean-up vectors upon deleting a file from Data Bank 2024-04-18 23:07:16 +03:00
16785ae005 Merge branch 'staging' into neo-server 2024-04-18 22:57:27 +03:00
75afe29f28 don't force amt_gen to model max on mancer model swap 2024-04-18 11:10:17 +09:00
59bb04f1b3 Implement generic interface for adding Data Bank scrapers 2024-04-18 00:14:41 +03:00
88637adfe2 Merge branch 'staging' into neo-server 2024-04-17 19:39:57 +03:00
242d57c14b Add Data Bank manager 2024-04-16 02:14:34 +03:00
d4d23f8234 Only close on left click 2024-04-15 20:38:59 +02:00
2fcbefc9f5 Fix right click closing the zoomed avatar image 2024-04-15 20:35:38 +02:00
2b12d3f8e8 Merge branch 'staging' into neo-server 2024-04-15 01:23:36 +03:00
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
022c180b62 Lint and clean-up 2024-04-15 00:39:15 +03:00
0263be8c1f Merge branch 'staging' into neo-server 2024-04-15 00:26:52 +03:00
4a553e1fc8 Merge branch 'release' into staging 2024-04-15 00:26:43 +03:00
789bb0da59 Fix extensions update loop 2024-04-15 00:24:15 +03:00
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
f19d6ac0ff Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2024-04-14 21:28:28 +03:00
20b950b120 Do not return null bias if empty string occurred. 2024-04-14 21:28:26 +03:00
23ac23010d Fix the rest of mobile cases 2024-04-14 21:17:18 +03:00
a899160311 Use global animation duration for avatars 2024-04-14 20:27:01 +03:00
1de409fdf7 Don't force aspect ratio of zoomed avatars. Prevent closing on drag grabber. 2024-04-14 20:20:22 +03:00
bd6fe19bf1 Merge branch 'staging' into llm-expressions 2024-04-14 19:43:34 +03:00
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
835d6c71fa Add option to toggle magnification behaviour 2024-04-14 17:00:10 +02:00
fd0c16bf12 Don't unblock generation if a parallel stream is still running after quiet gens 2024-04-14 17:26:58 +03:00
384708f577 Close zoomed image on click 2024-04-14 16:12:27 +02:00
cde6639d8a Merge remote-tracking branch 'origin/staging' into feature/zoomed-avatar-tweaks 2024-04-14 15:19:33 +02:00
ddc55c7c22 Merge branch 'staging' into neo-server 2024-04-14 15:00:50 +03:00
8e92a895ac Merge branch 'release' into staging 2024-04-14 15:00:39 +03:00
2a061fdf54 Fix app init order 2024-04-14 14:58:58 +03:00
0c4da602ab Adjust style and add magnification to zoomed avatar 2024-04-14 02:58:23 +02:00