Commit Graph

155 Commits

Author SHA1 Message Date
Wolfsblvt
6653757c5c Remove /imagine's variable usage in 'negative' 2024-06-28 04:06:22 +02:00
Cohee
990130d7c2 Clean-up wand menu styles 2024-06-24 23:32:24 +03:00
Cohee
62a1cb1dce Move built-in extensions to fixed wand containers 2024-06-24 23:17:58 +03:00
Cohee
c8b9b62d8a Update built-in extensions to use fixed order in extensions menu 2024-06-24 22:15:08 +03:00
Cohee
5a50ed97be Clean-up /sd command help 2024-06-23 15:27:19 +03:00
Wolfsblvt
48077d200b More slash command enums (nearly done) 2024-06-21 20:04:55 +02:00
Wolfsblvt
ffc84f5118 Merge branch 'staging' into slash-command-enums 2024-06-20 20:38:55 +02:00
Wolfsblvt
461b1a9d87 Even more enum refactorings (not done yet)
- Add common enum icons
- enum def for existing enum types, with color description
2024-06-20 20:33:45 +02:00
Cohee
88b6331aed Add swap SD dimensions button 2024-06-18 01:10:23 +03:00
Cohee
a9c4422c87 Redesign SD settings 2024-06-18 00:49:42 +03:00
Wolfsblvt
7f7ecdcca8 Merge branch 'staging' into slash-command-enums 2024-06-17 07:06:26 +02:00
Wolfsblvt
66d609c35f Several million refactoring of existing slash commands with enums (really) 2024-06-17 07:04:10 +02:00
Cohee
d75b30d51a Don't auto-adjust scroll height if not in viewport 2024-06-16 14:56:08 +03:00
Cohee
3cafc22e1d Fix textarea height adjust 2024-06-15 16:48:35 +03:00
Cohee
788a313024 Combine char. negative prompts in free mode 2024-06-15 16:24:32 +03:00
Cohee
67dc5e5252 Toggle SD message visibility by source 2024-06-15 15:57:50 +03:00
Cohee
bda4958cb3 Visible SD message template 2024-06-15 01:23:51 +03:00
Cohee
cef65a17f9 Fix SD prefix combiner for free mode 2024-06-15 00:03:25 +03:00
Cohee
560119bc3e LLM extended free mode SD prompts 2024-06-14 22:15:29 +03:00
Cohee
77b80da520 Extract SD templates 2024-05-30 23:37:19 +03:00
Cohee
961e778a75 Autocomplete can't be translated 2024-05-30 23:26:10 +03:00
Cohee
abafdadf33 Merge branch 'staging' into l18n-tw 2024-05-30 23:10:01 +03:00
Cohee
07cfc1fb0b Fix CLIP skip for SD.Next 2024-05-30 22:51:43 +03:00
Cohee
7af27bb6a9 Remove schedulers from SD.Next 2024-05-30 22:42:21 +03:00
Cohee
6228d1d3b1 Add schedulers selection for AUTO1111 2024-05-30 21:04:22 +03:00
Cohee
9ff2da4c8c Implement sharable SD prefixes 2024-05-30 00:21:27 +03:00
Cohee
e007fe7529 Add SD style deletion 2024-05-29 23:44:11 +03:00
Cohee
283bb2fa89 Add SD multimodal prompt toast 2024-05-29 23:38:55 +03:00
Cohee
4eb6657b51 Add SD seed control 2024-05-29 23:29:45 +03:00
Cohee
d350dbf0d7 Add Novel decrisper control 2024-05-29 03:00:42 +03:00
Cohee
110d343eea Add upscale amount control to DrawThings 2024-05-29 02:49:13 +03:00
Cohee
2aeaf43c28 Add CLIP skip control for SD 2024-05-29 02:14:08 +03:00
PasserDreamer
1e15be34b6 1. update index.html 18n.
2. update SD extension dropdown menu i18n.
3. update zh-tw.json.
4. add a template.json for translation.
2024-05-25 20:47:24 +08:00
Cohee
5e970c8a51 Only refresh settings on extras connected if current SD source is extras 2024-05-22 16:14:42 +03:00
Cohee
bce8627644 [chore] Replace tabs with spaces 2024-05-22 16:12:09 +03:00
Cohee
255cd1310d
Merge pull request #2281 from PasserDreamer/staging
Image Generation extension add i18n support.
2024-05-21 20:53:43 +03:00
Cohee
e0ac189acc #2290 Allow square brackets and underline in SD prompts 2024-05-21 16:51:11 +03:00
Cohee
226852233f Clean-up SD message sending 2024-05-21 15:03:57 +03:00
Cohee
630b72f13a #2290 Allow curly braces in SD prompts.
+remove unused code
2024-05-21 14:28:47 +03:00
Cohee
3cd3890263 #2286 Fix SD interactive mode loose trigger 2024-05-21 01:11:40 +03:00
PasserDreamer
c10323424d Update Image Generation 2024-05-20 18:49:33 +08:00
PasserDreamer
5506c81397 update Image Generation locale. 2024-05-20 18:15:16 +08:00
PasserDreamer
27e3a9201e Update zh-tw 2024-05-20 13:58:56 +08: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