Commit Graph

984 Commits

Author SHA1 Message Date
Cohee
cb294983e7 Merge pull request #701 from 50h100a/api-tokenize
Added tokenizer option for Ooba-like APIs
2023-07-12 11:28:50 +03:00
Cohee
9bbf23e56f Merge pull request #695 from ThisIsPIRI/continue
Fix continue formatting
2023-07-12 11:28:15 +03:00
Cohee
4aeda77648 Merge pull request #697 from bdashore3/dev
Regex: Switch slash command hooks
2023-07-12 11:26:53 +03:00
50h100a
49ae2cbad6 New tokenizer option.
If you're running an ooba-like api, you can use the token-count endpoint.
Exact and fast!
2023-07-12 04:18:55 -04:00
ThisIsPIRI
dedb913b67 Fix continue formatting 2023-07-12 06:57:05 +09:00
Cohee
393fff6207 Fix double insertion of WI with Chat Completions 2023-07-12 00:26:29 +03:00
Cohee
c9cc8fcf18 Calculation fixes to prompt itemizer 2023-07-12 00:05:34 +03:00
Cohee
6b1965fcf4 #693 Format story string after WI insertion for instruct mode 2023-07-11 23:22:12 +03:00
kingbri
bd7d4beab5 Regex: Add slash command input hook
Slash command output for sys and sendas commands were being formatted,
but add the ability for user placement to also apply to slash command
invocations.

Some slash commands will require an output hook, so add exclusions
inside the code itself.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-07-11 15:28:30 -04:00
Cohee
9ebb1cfe90 #652 Add custom stop strings 2023-07-11 00:24:09 +03:00
Cohee
5c6c7fd3ca #612 SD manual prompt refine mode 2023-07-10 23:07:53 +03:00
Cohee
f76db66e25 Modify quiet prompt sending to text completion models. 2023-07-10 18:13:11 +03:00
BlipRanger
d5c38077a4 Missed a spot 2023-07-09 21:22:29 -04:00
BlipRanger
35688c3eb3 Cleanup/Rename for generation info 2023-07-09 20:15:35 -04:00
BlipRanger
ad001ea263 Actually copy extra instead of referencing the same object 2023-07-09 19:57:42 -04:00
BlipRanger
5f9fd017ea Unclear where this needs to be. 2023-07-09 16:50:16 -04:00
BlipRanger
bdc4d213dd Remove reliance on settings dict 2023-07-09 13:38:09 -04:00
BlipRanger
a15b2892a7 Merge branch 'dev' of https://github.com/BlipRanger/SillyTavern into dev 2023-07-08 18:55:50 -04:00
BlipRanger
d25eca0f29 Cleanup from gen info stuff 2023-07-08 18:55:47 -04:00
BlipRanger
eaa14d2804 Merge branch 'SillyTavern:dev' into dev 2023-07-08 18:54:31 -04:00
BlipRanger
148966affe Fix some issues with displaying the gen info 2023-07-08 18:53:23 -04:00
BlipRanger
0f7dad7a5e I think that corrects the extras for swiping 2023-07-08 17:44:36 -04:00
BlipRanger
5128b75216 Fixed model acquisiton 2023-07-08 17:13:52 -04:00
kingbri
3c3eed0996 Regex: Change how MD formatting works
Previously, there was a checkbox to select placement as MD display.
This was counterintuitive since some users believed MD display
enclosed the other placement options.

Now, add a universal switch to finely tune what parts of a chat should
be excluded with MD formatting. For example a regex with the option
enabled with AI output selected will only format replies from the
character.

This is an improvement since users can now choose what parts of a
chat to format rather than sticking with a global display specifier.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-07-08 14:10:15 -04:00
Cohee
68551ae15c Merge pull request #663 from vbdev537/dev
Add new Replacement Macro
2023-07-08 12:22:49 +03:00
BlipRanger
f72b055bfb Merge branch 'dev' of https://github.com/BlipRanger/SillyTavern into dev 2023-07-08 01:17:59 -04:00
BlipRanger
5a0c702f53 Handle swipes for extra info 2023-07-08 01:17:55 -04:00
BlipRanger
f2e4eb1696 Capture api/model to msgs 2023-07-08 00:40:29 -04:00
Cohee
8e5fd7938c Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev 2023-07-08 04:12:20 +03:00
Cohee
46e1a25d83 Fix cross-tab file drag and drop 2023-07-08 04:12:17 +03:00
50h100a
1be05fa514 Always run extension interceptors. 2023-07-07 19:41:57 -04:00
vbd537
1852279723 Add new Replacement Macro
Through the impersonate function it is possible for the AI to create a text as if it were in the place of the user's character, but the text is randomly generated without the user being able to suggest what he wants to be created. By including this new macro, the user will be able to guide the impersonate generation.
2023-07-07 18:10:27 -03:00
50h100a
f3d8f4a7da Merge branch 'dev' of https://github.com/SillyTavern/SillyTavern into smartcontext-improvements 2023-07-07 13:03:00 -04:00
Cohee
3162cf0e29 Merge pull request #653 from BlipRanger/feature/chroma-wi
Chroma Newline Chunking Option
2023-07-07 12:35:48 +03:00
50h100a
b4830f2b67 Include Smart Context in prompt summary when possible. 2023-07-07 03:23:40 -04:00
Cohee
cc98a0bd01 Merge pull request #639 from phiharri/confirm_delete 2023-07-07 09:08:51 +03:00
Cohee
8fcc074ced Merge pull request #651 from BlipRanger/feature/count 2023-07-07 09:07:50 +03:00
BlipRanger
49745b2b35 Cleanup 2023-07-07 00:26:58 -04:00
BlipRanger
e595f83590 Merge branch 'dev' of https://github.com/BlipRanger/SillyTavern into feature/chroma-wi 2023-07-06 23:58:30 -04:00
BlipRanger
02fb1bc26f Revert to the not evals. 2023-07-06 23:06:44 -04:00
kingbri
82624ff55b Regex: fix multiple script bug
Multiple scripts were not running due to improper variable assingment.
For efficiency's sake, do not do a string comparison before returning
and instead do another variable assignment in the parent function.

Doing this reduces the length of regex hooks in the parent calls,
but also removes the need for unnecessary O(n) complexity of comparing
two string variables.

If there are errors, it would be advisable to add string comparison
and revert back to the old logic in parent function calls.

Signed-off-by: kingbri <bdashore3@proton.me>
2023-07-06 22:32:40 -04:00
Cohee
f93fb78bc7 Don't append System narrator name to Chat completion messages. 2023-07-06 21:04:51 +03:00
Cohee
48e9332db9 Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev 2023-07-06 20:42:01 +03:00
Cohee
afea5d48f1 Add {{idle_duration}} macro 2023-07-06 20:41:58 +03:00
Cohee
afcd2b497d Merge branch 'dev' into confirm_delete 2023-07-06 18:25:27 +03:00
Cohee
7d9c346d25 Better visibility filter on counter 2023-07-06 18:21:14 +03:00
BlipRanger
bc52df493e Cleaned up code, relative font size 2023-07-06 11:07:38 -04:00
BlipRanger
bbe08ece84 Display total and dynamic character count 2023-07-06 00:42:04 -04:00
phiharri
1d640a2cbf Optional delete message confirmation 2023-07-06 01:43:57 +01:00
RossAscends
13ba5cec49 add help page for macros 2023-07-06 06:11:13 +09:00