Commit Graph

108 Commits

Author SHA1 Message Date
Cohee 3cd3890263 #2286 Fix SD interactive mode loose trigger 2024-05-21 01:11:40 +03:00
Cohee f1a0462ca3 Fix toast msg in SD command 2024-05-13 23:11:07 +03:00
Len 1d75b98393
STscript Parser Rewrite (#1965)
* set isForced to true on input

* make floating auto-complete follow horizontal scrolling

* add callable closure vars

* changes to /let and /var for callable closures

* fix error message

* fix scope for closure arguments

* if should return the pipe result from closures

* use /run to call closures and no arguments on immediate closures

* throw exception from QRs window-function if no match

* when to show autocomplete vs info only

* autocomplete positioning

* autocomplete styling

* add theming to autocomplete (theme, dark, light)

* improve autocomplete show/hide logic and editor selection

* use blur tint color instead of chat tint color and use blur setting

* cleanup and docs

* use scope macros for QR args

* add enter to select autocomplete

* fix no executor found

* cleanup and comment

* fix alias list in help string

* fallback to empty string piped value if null or undefined

* fix typo

* blur textarea on ctrl+enter execute (and refocus after)

* stop executeSlashCommand if parser throws

* move /let and /var callbacks into functions

* switch textarea to monospace when value starts with slash

* add double pipe a pipe breaker

* fix /? slash

* remove some logging

* add "/:name" as shorthand for "/run name" after all

* move shit around

* fix error message

* use testRunShorthandEnd

* use parseQuotedValue and parseValue to determine name for "/:"

QR labels and set names can include spaces

* add some adjustments to make autocomplete work properly

some hint in there about "/:" would still be nice

* add autocomplete style  selector

* only strip quotes from subcommand if they are at both ends

* fix JSDoc

* escaping

* allow open quotes on dry run

* throwing shit at the wall for /: autocomplete

* escapes only for symbols

* clean up autocomplete

* improve performance

* fix scope macros

* remove unescaping of pipes

* fix macros in scope copy

* fix "/? slash"

* don't run parser for getNameAt if text has not changed

* fix options filter

* re-enable blur listener

* restore selection on non-replace select

* fix for escaping first character of value

* add support for {{pipe}} and {{var::}} closures

* add index support to var macro

* add scoped var macro to macro help

* more escape fixes

* reduce autocomplete render debounce

* cleanup

* restore old escape handling and parser flag for strict escaping

* fix "no match" autocomplete message

* add dummy commands for comments and parser flag

* fix type annotations

* somewhat safer macro replacements

* fix autocomplete select on blank / "no match"

* fix cutting off handled part in substitution

* add parser flag REPLACE_GETVAR

Replaces all {{getvar::}} and {{getglobalvar::}} macros with {{var::}}.
Inserts a series of command executors before the command with the macros that:
- save {{pipe}} to a var
- call /getvar or /getglobalvar to get the variable used in the macro
- call /let to save the retrieved variable
- return the saved {{pipe}} value

This helps to avoid double-substitutions when the var values contain text that could be interpreted as macros.

* remove old parser

* fix send on enter when no match

* deal with pipes in quoted values (loose escaping)

* add default parser flags to user settings

* allow quoted values in unnamed argument

* set parser flag without explicit state to "on"

* add click hint on parser error toast

* dirty more detailed cmd defs

* remove name from unnamed arg

* move autocomplete into class and floating with details

* replace jQuery's trigger('input') on #send_textarea with native events because jQuery does not dispatch the native event

* fix ctrl+space

* fix arrow navigation

* add comments

* fix pointer block

* add static fromProps

* fix up dummy commands

* migrate all commands to addCommandObject

* remove commented comment command

* fix alias in details

* add range as argument type

* switch to addCommandObject

* switch to addCommandObject

* fix height

* fix floating details position on left

* re-enable blur event

* use auto width for full details on floating autocomplete

* auto-size floating full details

* fix typo

* re-enable blur listener

* don't prevent enter when selected item is fully typed out

* add autocomplete details tooltips

* add language to slash command examples

* move makeItem into option and command and fix click select

* use autocomplete parts in /? slash

* fix alias formatting

* add language to slash command examples

* fix details position on initial input history

* small screen styles

* replace registerSlashCommand with detailed declarations

* put name on first line

* add missing returns

* fix missing comma

* fix alias display in autocomplete list

* remove args from help string

* move parser settings to its own section

* jsdoc

* hljs stscript lang

* add hljs to autocomplete help examples

* add missing import

* apply autocomplete colors to stscript codeblocks (hljs)

* add fromProps

* cache autocomplete elements

* towards generic autocomplete

* remove unused imports

* fix blanks

* add return types

* re-enable blur

* fix blank check

* Caption messages by id

* add aborting command execution

* fix return type

* fix chat input font reset

* add slash command progress indicator

* add missing return

* mark registerSlashCommand deprecated

* why??

* separate abort logic for commands

* remove parsing of quoted values from unnamed arg

* add adjustable autocomplete width

* revert stop button pulse

* add progress and pause/abort to QR editor

* add resize event on autocomplete width change

* add key= argument to all get vars

* refactoring

* introduce NamedArgumentAsignment

* add TODOs

* refactoring

* record start and end of named arg assignment

* refactoring

* prevent duplicate calls to show

* refactoring

* remove macro ac

* add secondary autocomplete and enum descriptions

* add syntax highlighting to QR editor

* add enum descriptions to /while

* add /let key=... to scope variable names

* add unnamed argument assignment class and unnamed argument splitting

* fix QR editor style

* remove dash before autocomplete help text

* add autocomplete for unnamed enums

* fix remaining dom after holding backslash

* fix for unnamed enums

* fix autocomplete for /parser-flag

* add parser-flag enum help

* fix type annotations

* fix autocomplete result for /:

* add colored autocomplete type icons

* collapse second line autocomplete help if empty

* mark optional named args in autocomplete

* fix when what

* remove duplicate debug buttons

* dispatch input on autocomplete select

* prevent grow from editor syntax layer

* add auto-adjust qr editor caret color

* remove text-shadow from autocomplete

* join value strings in /let and /var

* add /abort syntax highlight

* fix attempting secondary result when there is none

* rename settings headers and split autocomplete / stscript

* add parser flag tooltips

* add tooltips to chat width stops

* fix typo

* return clone of help item

* fix enum string

* don't make optional notice for autocomplete arguments smaller

* avoid scrollbar in chat input

* add rudimentary macro autocomplete

* strip macro from helptext

* finally remove closure delimiters around root

* cleanup

* fix index stuff for removed closure delimiters

* fix type hint

* add child commands to progress indicator

* include sub-separator in macro autocomplete

* remove all mentions of interruptsGeneration and purge

* remove unused imports

* fix syntax highlight with newline at end of input

* cleanup select pointer events

* coalesce onProgress call

* add regex to STscript syntax highlighting

* fix closure end

* fix autocomplete type icon alignment

* adjustments for small screens

* fix removing wrong element

* add missing "at=" arg to /sys, /comment, /sendas

* add font scale setting for autocomplete

* add target=_blank for parser flag links

* fix for searching enums

* remove REGEXP_MODE from hljs
just causes trouble

* fix autocomplete in closures

* fix typo

* fix type hint

* Get rid of scroll bar on load

* Add type hint for /send name argument. Fix 'at' types

* Add 'negative' arg hint to /sd command

* reenable blur event

* Allow /summarize to process any text

* Compact layout of script toggles

* Expand CSS by default

* fix double ranger indicator and adjust to narrow container

* make custom css input fill available vertical space

* reduce scroll lag

* use default cursor on scrollbar

* Clean-up module loading in index.html

* fix tab indent with hljs

---------

Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
2024-05-12 22:15:05 +03:00
Cohee 12eabd167d #2187 Add negative prefix arg to /sd command 2024-05-06 21:39:07 +03:00
Cohee e0df5783f8 Allow macros in positive and negative prompts 2024-04-29 13:50:55 +03:00
Cohee d97f0a4c4d Add new NAI Diffusion model 2024-04-23 03:18:45 +03:00
Cohee d5c0aed973 Replace Comfy avatar placeholders with empty pixel if message fails to load 2024-04-21 21:13:50 +03:00
Cohee eab545cafc Error handling for Comfy request 2024-04-19 00:39:04 +03:00
Cohee 901ffa3cdc Add char and user avatar placeholders to ComfyUI workflow editor
They resolve to base64 encoded data URIs of respective avatars.
2024-04-19 00:32:38 +03:00
Cohee 123131074c Change built-in extensions template render to async 2024-04-11 23:38:44 +03:00
Cohee c90105e9f6 Merge branch 'staging' into pollinations 2024-04-10 21:14:36 +03:00
Cohee 9e4b765db1 #2012 Replace all comfy seeds 2024-04-05 17:59:12 +03:00
Cohee 75ebdf394a Add pollinations as image generation source 2024-04-04 20:40:47 +03:00
Cohee d6b700483f Allow hyphens in SD prompts 2024-04-03 00:29:34 +03:00
Cohee c0fffde739 Fix SD "Raw last message" in groups 2024-04-02 13:15:31 +03:00
Cohee 9c7e29115f
Merge pull request #1989 from kir-gadjello/sd-drawthings-api
Implement drawthings local app api support for sd extension
2024-03-30 14:50:07 +02:00
Cohee 652987ae01 Add missing auth header 2024-03-30 14:23:50 +02:00
kir-gadjello dddcac9af8
implement drawthings local app api support for sd extension 2024-03-30 01:12:29 -03:00
Cohee c606cd1295 Add SMEA/DYN controls for NAI Diffusion 2024-03-20 21:23:56 +02:00
Cohee 6ab918605e Allow single quotes in generated SD prompts 2024-02-14 15:39:56 +02:00
Cohee 8d4c4c1945 Only snap resolution if pixel counts change 2024-02-13 11:40:37 +02:00
Cohee b8387df15e #1826 Allow snapping to known resolutions for face/bg generations 2024-02-12 17:28:39 +02:00
Cohee e537def312 Add return value to /sd command and quiet flag 2024-01-24 20:15:10 +02:00
Cohee 30732ada32 Lint fix 2024-01-01 16:08:24 +02:00
RigbyB b6570e775d ComfyUI request/prompt fix 2023-12-24 21:02:04 +00:00
Doa 41ac2c07b2 Adding negative character prompts for img sources that support it 2023-12-23 16:19:22 +00:00
Cohee ac70a0a592 Add TogetherAI for image generation 2023-12-18 03:33:05 +02:00
Cohee f6b59d0d3a Uniform command registration 2023-12-18 02:35:02 +02:00
LenAnderson 796ab7eff8 validate /icw 2023-12-17 22:57:10 +00:00
LenAnderson 56b9398353 add slash command to change comfy workflows 2023-12-17 22:24:22 +00:00
LenAnderson 55b9ebad3f add custom placeholders for comfy workflows 2023-12-17 22:17:08 +00:00
Cohee e0531f85dc
Merge pull request #1557 from SillyTavern/Deathspike/release
Allow comma after "char" prefix
2023-12-17 02:38:39 +02:00
Cohee 6e8a217482
Merge pull request #1548 from Deathspike/release
Add SD character-specific prompt prefix options to free-mode
2023-12-17 02:38:14 +02:00
Cohee 7fb9d9bfc1 Allow comma after "char" prefix 2023-12-17 02:34:42 +02:00
Deathspike 14400b05f9 Rework character-prefixed free-mode to support macro 2023-12-16 11:29:34 +01:00
Deathspike 8aa1814287 Fix SD character-prefixed free-mode user detection 2023-12-15 19:34:29 +01:00
Deathspike 008ac9d47e Add SD character-prefixed free-mode 2023-12-15 16:14:33 +01:00
Cohee bb8b8f9386 Fix sending PNG/WEBP to Google captioning 2023-12-14 20:36: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
valadaptive 9d4990d25d Rename sd-next/upscalers to sd/next/upscalers 2023-12-04 10:22:47 -05:00
Cohee 64a3564892 lint: Comma dangle 2023-12-02 22:06:57 +02:00
Cohee c63cd87cc0 lint: Require semicolons 2023-12-02 21:11:06 +02:00
valadaptive a37f874e38 Require single quotes 2023-12-02 13:04:51 -05: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 0a27275772 Enable no-extra-semi lint 2023-12-02 10:32:26 -05:00
Cohee 252af836f0 #1418 Remove prefix from SD raw_last 2023-11-30 01:22:31 +02:00
Cohee 84811ec518 Fix image gen prefix combining 2023-11-27 16:10:42 +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