Commit Graph

1020 Commits

Author SHA1 Message Date
Cohee 3c0d7d8feb Return old minmax values for font scale 2023-08-25 01:30:56 +03:00
Cohee 2cce6e83fa Don't lose continued swipes 2023-08-25 01:27:27 +03:00
Cohee 3bf7747ee5
Merge pull request #1013 from bdashore3/staging
CFG: Whitespace fix
2023-08-25 01:08:04 +03:00
RossAscends 1a1878f095 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-25 07:06:54 +09:00
RossAscends ce5e706fac topbar resize, font scaling fix, mobile slider fix 2023-08-25 07:06:52 +09:00
kingbri 1dd1607b94 Generate: Migrate to array-based message concatenation
String addition is very limited in how flexible it can be. Using
an array will instead allow for various ways to shift around extension
prompts and insertion depths.

To preserve message order, each mesSend object contains both a message
and an array of extension prompts which are later added on top of
the message itself.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-24 18:02:17 -04:00
kingbri 0bc2ef2a33 CFG: Don't trim when getting prompt
Let the user figure it out. Whitespace in CFG is important.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-24 17:59:25 -04:00
Cohee 1900ab9726 #1005 Replace mobile detection method in get sortable delay. Make deviceInfo loading sync. Init Ross mods via function call. 2023-08-24 23:52:03 +03:00
Tony Ribeiro 1014d592f7 Added a refresh assets button to audio UI to detect audio asset again. Usefull after download an asset or putting a file manually. 2023-08-24 22:17:54 +02:00
Cohee ce67101651
Merge pull request #1012 from StefanDanielSchwarz/llama-2-chat-instruct-preset-fixes
Llama 2 chat instruct preset fixes
2023-08-24 22:51:55 +03:00
Tony Ribeiro 7e5bdb11a3 Updated audio/assets extension user feedback for muted/disconnected from assets repo. 2023-08-24 21:42:32 +02:00
Tony Ribeiro 3b6978010f
Merge branch 'SillyTavern:staging' into staging 2023-08-24 21:05:12 +02:00
Cohee cd24de3c2e Reformat code. 2023-08-24 21:59:26 +03:00
Stefan Daniel Schwarz 4b389eba61 no eol separator after replaced sys prompt 2023-08-24 20:30:24 +02:00
Cohee c91ab3b5e0 Add Kobold tokenization to best match logic. Fix not being able to stop group chat regeneration 2023-08-24 21:23:35 +03:00
Stefan Daniel Schwarz 56a6398189 system prompt in system sequence 2023-08-24 19:33:04 +02:00
Cohee 14d94d9108 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-24 20:20:03 +03:00
Cohee ab52af4fb5 Add support for Koboldcpp tokenization endpoint 2023-08-24 20:19:57 +03:00
Stefan Daniel Schwarz 582464a2e7 fix name 2023-08-24 18:47:15 +02:00
Cohee d4bd91f6ec Merge branch 'staging' of http://github.com/cohee1207/SillyTavern into staging 2023-08-24 18:32:46 +03:00
Cohee 7010e05f8e Sync bottom form height with the font size 2023-08-24 18:32:42 +03:00
Cohee cd2faea2b2 Fix group chats with streaming 2023-08-24 17:46:44 +03:00
Tony Ribeiro 43e70c9df1
Merge branch 'SillyTavern:staging' into staging 2023-08-24 15:18:02 +02:00
Cohee 8fea486e57 #1009 Update Vicuna 1.1 template 2023-08-24 15:50:14 +03:00
Cohee f5fd15ffd2 #976 Return "Continue on send". Allow continuing the first chat message. Add debug function for i18n. 2023-08-24 15:13:04 +03:00
Cohee 3e25c3f51c
Merge pull request #1008 from mweldon/novel-generate-until-sentence
Novel generate until sentence
2023-08-24 11:25:56 +03:00
Cohee d147bc40dc Fix alternate greetings 2023-08-24 11:04:46 +03:00
Mike Weldon 8202fab376 Remove commented lines I added by mistake 2023-08-23 18:08:55 -07:00
Mike Weldon 1d1109e43b Set generate_until_sentence for NovelAI
* Set generate_until_sentence true for NovelAI
* Add a Story String file for NovelAI with persona before character
  which works better
* Remove hardcoded dinkus for chat_start since it is in the Story String
2023-08-23 18:04:56 -07:00
Tony Ribeiro 07f625c688 Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-24 02:34:14 +02:00
Tony Ribeiro 46964b1b99 Add temp folder into assets, file are download into this temp file and moved only when complete. Allow to handle fail download. 2023-08-24 02:34:06 +02:00
Cohee 4aa31fcba9 Add fallback option for OpenRouter 2023-08-24 03:21:17 +03:00
Tony Ribeiro 7437b23fa2
Merge branch 'SillyTavern:staging' into staging 2023-08-24 01:43:10 +02:00
Tony Ribeiro 017df860e5 Sanitized character bgm request. 2023-08-24 01:42:52 +02:00
Cohee ffc8150eef Add missing space on continue 2023-08-24 02:38:02 +03:00
Cohee 4038e7f9e3 #999 Instruct mode fixes 2023-08-24 02:22:37 +03:00
Tony Ribeiro 9da9c73279 Updated assets ui css to make it relative size 2023-08-24 01:17:08 +02:00
Tony Ribeiro c29ae21869 Redesigned assets connect button 2023-08-24 01:02:34 +02:00
Cohee e2507e8840 #976 Add "quick continue" button. Remove "send to continue" option. 2023-08-24 01:37:44 +03:00
Tony Ribeiro a5f66bda63 Added sanitization of request input for assets_download function. Changed assets download UI for button with little animation while downloading. 2023-08-24 00:17:07 +02:00
Cohee 52c2fcd407 Fix OpenRouter model not persisting on page reload 2023-08-24 00:59:57 +03:00
Cohee d64c5880c8 Fix new chat reference not getting saved when starting a new chat 2023-08-24 00:54:36 +03:00
Cohee de0dbfb394 Merge branch 'roleplay-context' into staging 2023-08-24 00:30:04 +03:00
Cohee 17925423ae
Merge pull request #999 from StefanDanielSchwarz/roleplay-context
Return of the Roleplay Context
2023-08-24 00:29:05 +03:00
Cohee 1ce848c1c3 Move before / after char WI to story strings 2023-08-24 00:26:47 +03:00
Cohee fa7bb9143d
Merge pull request #1006 from deffcolony/staging
added Dutch (NL) translation
2023-08-23 23:40:44 +03:00
Stefan Daniel Schwarz dd7b21c63d renamed roleplay instruct preset 2023-08-23 22:23:51 +02:00
Stefan Daniel Schwarz 7cafa5d374 improved preset selection logic 2023-08-23 22:22:52 +02:00
deffcolony 58911e9eb8 added Dutch (NL) translation 2023-08-23 22:15:17 +02:00
Cohee 9aa03402fa
Merge pull request #1004 from SillyTavern/prompt-manager-persona-description
Prompt manager persona description
2023-08-23 22:11:47 +03:00
maver 65e595ad48 Increase prompt oder dummy user id by 1 2023-08-23 20:41:13 +02:00
maver 5a02250a1f Add persona description to prompt manager order 2023-08-23 20:40:26 +02:00
Cohee 460127ed3c
Merge pull request #1002 from qHiyokop/staging
Added Italian translation by qHiyokop
2023-08-23 21:39:15 +03:00
Cohee b1c1ac465c Merge branch 'release' into staging 2023-08-23 21:37:52 +03:00
RossAscends 632d03228f Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-24 03:34:25 +09:00
RossAscends 6c56fb0a6d 500ms delay for sliders on touch devices 2023-08-24 03:34:20 +09:00
Cohee 1d6b7c9947 Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging 2023-08-23 21:32:46 +03:00
Cohee 031a6cb2a4 Performance and data integrity improvements 2023-08-23 21:32:38 +03:00
Stefan Daniel Schwarz 9b932dfa15 byebye wizard 2023-08-23 20:24:45 +02:00
Stefan Daniel Schwarz 8938ea1d72 auto select presets 2023-08-23 20:17:45 +02:00
qHiyokop 2ccf029c9b Added Italian translation by qHiyokop 2023-08-24 04:08:28 +10:00
Tony Ribeiro 0afcf5a12b Added message to Asset UI to tell about need to refresh for asset to be used. 2023-08-23 20:01:55 +02:00
qHiyokop b0b6d925c0 Merge branch 'staging' of https://github.com/qHiyokop/SillyTavern into release 2023-08-24 03:54:33 +10:00
Tony Ribeiro 2e2cbd2c2d Changed audio to muted by default to avoid error on autoplay without user interact. 2023-08-23 19:44:29 +02:00
Tony Ribeiro 1d0ed86d01 update audio manifest 2023-08-23 18:58:54 +02:00
Tony Ribeiro df040e6402
Merge branch 'SillyTavern:staging' into staging 2023-08-23 18:52:10 +02:00
Tony Ribeiro f23115f6b3 - Added assets folder to .gitignore
- disabled audio extension by default
        - turned get request into post
        - avoid background that are data url
        - changed UI name to Dynamic Audio
        - Changed Assets/Audio ui load to use $.get
        - added assets json url as field in ui, with connect button require confirm from popup.
2023-08-23 18:51:41 +02:00
Cohee 2c58f9d903
Merge pull request #1001 from bdashore3/staging
More CFG fixes
2023-08-23 18:49:36 +03:00
kingbri 0460375647 CFG: Don't inject anything when guidance scale doesn't exist
If the guidance scale is 1, completely disable sending CFG and creating
a negative prompt.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-08-23 11:27:58 -04:00
Cohee f48cc0db31 Unify cfgValues parsing between ooba/Novel 2023-08-23 18:26:56 +03:00
Cohee 2c2a68ef76 Fix instruct system sequence missing + {{original}} 2023-08-23 18:04:22 +03:00
Cohee fad6c164cb Don't set negative prompt from CFG extension to ooba at guidance scale 1.0 2023-08-23 17:44:38 +03:00
Cohee b751643364 Save pagination state on return to list from card 2023-08-23 16:48:44 +03:00
Cohee c32c080126 More comfy font sizes 2023-08-23 15:53:05 +03:00
Cohee 3c48e8ccd9 Increase toggle desc. font size 2023-08-23 11:02:49 +03:00
RossAscends 080f9d2426 center chat bar input, fix mobile top bar. 2023-08-23 16:53:31 +09:00
RossAscends a1bdaf2739 Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging 2023-08-23 16:41:09 +09:00
RossAscends 02ce9ba563 top bar 40px to 30px 2023-08-23 16:41:07 +09:00
Cohee 723e957b3c Merge branch 'staging' of http://github.com/cohee1207/SillyTavern into staging 2023-08-23 10:32:52 +03:00
Cohee e77da62b85 Add padding to cache key. Fix Safari display issues. Fix 400 on empty translate. Reset bias cache on changing model. 2023-08-23 10:32:48 +03:00
RossAscends 5474f29f2d bottom bar 40px to 30px 2023-08-23 16:19:54 +09:00
Tony Ribeiro ecb4436f07 Audio group chat cooldown bgm fixed. 2023-08-23 05:49:24 +02:00
Tony Ribeiro d070336e9c Merge branch 'staging' of https://github.com/Tony-sama/SillyTavern into staging 2023-08-23 05:11:07 +02:00
Tony Ribeiro 13dac1f4d3 Assets extension, factorised using the received json type to organise the assets in the UI/folders. 2023-08-23 05:10:55 +02:00
Tony Ribeiro 8e38229ed4 Audio extension, handle custome background. Factorised bgm/ambient file listing into one assets listing function on server.js. 2023-08-23 03:47:13 +02:00
Cohee b385bd190a Less strict rules for logit bias files import 2023-08-23 03:41:58 +03:00
Cohee f633f62065 Don't save null values to OpenAI logit bias 2023-08-23 03:36:04 +03:00
Tony Ribeiro 5009416f94
Merge branch 'SillyTavern:staging' into staging 2023-08-23 01:44:52 +02:00
Cohee bc5fc67906 Put tokenizer functions to a separate file. Cache local models token counts 2023-08-23 02:38:43 +03:00
Stefan Daniel Schwarz 252be20c16 Return of the Roleplay Context 2023-08-22 23:40:47 +02:00
Cohee 7250770c5d Don't reduce Claude token counts by 2 2023-08-22 23:20:53 +03:00
Cohee 07a9e493dc Fix preset saving stacking for instruct 2023-08-22 23:03:55 +03:00
Cohee 45302e4972
Merge pull request #997 from SillyTavern/static-quick-edit
Static quick edit
2023-08-22 22:47:48 +03:00
Cohee fd95b79ae9 Fix auto-translate plugin. Add new event types for post-rendering 2023-08-22 22:45:12 +03:00
maver 1ea7ad2572 Update quick edit when oai preset changes 2023-08-22 20:49:54 +02:00
maver 48992d4f53 Prevent context profiler from dangling on error 2023-08-22 20:39:46 +02:00
maver 0e378d93b2 Make quick edit fields static 2023-08-22 20:37:37 +02:00
Cohee 6599717bc5 Don't be negative. Be positive 2023-08-22 20:39:14 +03:00
Cohee 16406f2698 Fix Chat Completions itemization 2023-08-22 20:34:20 +03:00
Cohee 6923044a34 Allow CFG on impersonation 2023-08-22 19:35:56 +03:00