Commit Graph

173 Commits (49ec047af8ba73889f65a65585ef16b4a26b416b)

Author SHA1 Message Date
DominikDoom ac790c8ede Return dict instead of array for clarity 2023-09-26 12:12:46 +02:00
DominikDoom 22365ec8d6 Add missing type return to list request 2023-09-26 12:02:36 +02:00
DominikDoom 030a83aa4d Use query parameter instead of path to fix wildcard subfolder issues 2023-09-26 11:55:12 +02:00
DominikDoom 460d32a4ed Ensure proper reload, fix error message 2023-09-26 11:45:42 +02:00
DominikDoom 581bf1e6a4 Use composite key with name & type to prevent collisions 2023-09-26 11:35:24 +02:00
DominikDoom 94ec8884c3 Fix SD.Next error caused by embeddings without filenames
This only ignores these embeddings, the root cause is a bug / behavioral difference in SD.Next
Fixes #242
2023-09-26 10:30:01 +02:00
DominikDoom 6cf9acd6ab Catch sqlite exceptions, add tag list endpoint 2023-09-24 20:06:40 +02:00
DominikDoom 109a8a155e Change endpoint name for consistency 2023-09-24 18:00:41 +02:00
DominikDoom b44c36425a Fix db load version comparison, add sort options 2023-09-24 17:59:14 +02:00
DominikDoom 1e81403180 Safety catches for DB API access 2023-09-24 16:50:39 +02:00
DominikDoom 0f487a5c5c WIP database setup inspired by ImageBrowser 2023-09-24 16:28:32 +02:00
DominikDoom 67eeb5fbf6 Merge branch 'main' into feature-sort-by-frequent-use 2023-09-19 12:14:12 +02:00
DominikDoom 5911248ab9 Merge branch 'feature-sorting' into main
Update including a new sorting option for extra network models & wildcards.
For now only by date modified, this might be expanded in the future.
A "sort by frequent use" is also in the works.
2023-09-19 12:13:01 +02:00
DominikDoom 1c693c0263 Catch UnicodeDecodeError to prevent corrupted yaml files from breaking the extension
As mentioned in #240
2023-09-17 15:28:34 +02:00
DominikDoom 11ffed8afc Merge branch 'feature-sorting' into feature-sort-by-frequent-use 2023-09-15 16:37:34 +02:00
DominikDoom f626b9453d Merge branch 'main' into feature-sorting 2023-09-13 21:56:29 +02:00
DominikDoom 018c6c8198 Fix Umi tag gathering & sorting
Fixes #238
2023-09-13 21:50:41 +02:00
DominikDoom 2846d79b7d Small cleanup, add reverse option
Properly add text at the end on non-reverse numeric
2023-09-13 19:39:48 +02:00
DominikDoom 44effca702 Add sorting to javascript side
Now uses the sortKey if available. Elements without a sortKey will always use name as fallback.
Removed sort direction API again since it needs to be modeled case-by-case in the javascript anyway.
2023-09-13 14:03:49 +02:00
DominikDoom 475ef59197 Rework sorting function to calculate keys instead of pre-sort the list
Rename added/changed variables to be clearer
2023-09-13 11:46:17 +02:00
Symbiomatrix 3953260485
Model sort selection. 2023-09-13 01:34:49 +03:00
DominikDoom 0a8e7d7d84 Stub API setup for tag usage stats 2023-09-12 14:10:15 +02:00
hakaserver 37b5dca66e lyco_path fix 2023-09-12 00:57:35 -03:00
DominikDoom 4d4f23e551 Formatting 2023-09-09 14:43:55 +02:00
DominikDoom 80b47c61bb Add new setting to choose where keywords get inserted
Closes #232
2023-09-09 14:41:52 +02:00
DominikDoom 57821aae6a Add option to include embeddings in normal search
along with new keybind functionality for quick jumping between sections.
Closes #230
2023-09-07 13:18:04 +02:00
DominikDoom e23bb6d4ea Add support for --wildcards-dir cmd argument
Refactor PR #229 a bit to share code with this
2023-09-02 17:59:27 +02:00
Joel Clark 53f46c91a2 feat: Allow support for custom wildcard directory in sd-dynamic-prompts 2023-09-02 21:30:01 +10:00
DominikDoom 32c4589df3 Rework wildcards to use own API endpoint
Maybe fixes #226
2023-08-29 09:39:32 +02:00
Symbiomatrix 6f93d19a2b
Edit error message. 2023-08-20 20:02:57 +03:00
Symbiomatrix 79bab04fd2
Typo. 2023-08-20 18:59:12 +03:00
Symbiomatrix 5b69d1e622
Embedding forced reload. 2023-08-20 18:51:37 +03:00
DominikDoom f63bbf947f Fix API endpoint to work with symlinks / external folders
Fixes #217
2023-08-07 22:15:48 +02:00
DominikDoom ebe276ee44 Fix for lora filenames containing dots
Since file extensions are already cut off before the client-side request, it's not needed here anymore
2023-08-07 19:22:50 +02:00
DominikDoom 995a5ecdba Live preview images for extra networks
Same as the thumbnails in the extra networks tab, just in a small preview window during completion
2023-08-07 18:50:55 +02:00
DominikDoom cdf092f3ac Fix lora keyword lookup for deep subfolders 2023-08-07 15:17:49 +02:00
bluelovers 599ad7f95f
fix: known_lora_hashes.txt
https://github.com/DominikDoom/a1111-sd-webui-tagcomplete/issues/214

https://github.com/canisminor1990/sd-webui-lobe-theme/issues/324
2023-08-07 09:54:10 +08:00
DominikDoom 0b2bb138ee Add option to keep wildcard file content order
instead of sorting alphabetically
Fixes #211
2023-08-05 13:42:24 +02:00
DominikDoom 0260765b27 Add support for dynamic-prompts yaml wildcards 2023-07-29 16:13:23 +02:00
DominikDoom acfdbf1ed4 Fix for loras in base folder 2023-07-26 14:53:03 +02:00
DominikDoom 2e271aea5c Support for new webui 1.5.0 lora features
Prefers trigger words over the model-keyword ones
Uses custom per-lora multiplier if set
2023-07-26 14:38:51 +02:00
DominikDoom de3380818e Quote lora filenames to handle commas in filenames
Fixes #206
2023-07-23 11:05:44 +02:00
DominikDoom acb85d7bb1 Make sure both temp folders exist 2023-07-23 09:01:26 +02:00
DominikDoom 39ea33be9f Fix encoding for load too
Fixes #204
2023-07-22 21:15:44 +02:00
DominikDoom 1cac893e63 Create temp folder first before touching if it doesn't exist
Fixes #203
2023-07-22 20:46:10 +02:00
DominikDoom 94823b871c Add missing utf-8 encoding to cache write
Fixes #202
2023-07-22 18:17:30 +02:00
DominikDoom 599ff8a6f2 Don't load lycos if they point to the same path as loras
E.g. when using --lyco-patch-lora to replace built-in Loras.
Prevents duplicate entries.
2023-07-22 17:52:51 +02:00
DominikDoom c41372143d Add option to load only user list for keywords 2023-07-22 14:08:32 +02:00
DominikDoom 3496fa58d9 Add trigger word completion using the model-keyword extension
Works for both the built-in and user defined list
Restructure some of the python helper for path reusability
2023-07-22 12:06:00 +02:00
DominikDoom 8523d7e9b5 Backwards compat fix for pre 1.3.0 webui versions
Closes #199
2023-07-07 10:30:28 +02:00
DominikDoom 77c0970500 Use info instead of html for readme links
For compatibility with SD.next
Closes #197
2023-07-06 16:55:51 +02:00
DominikDoom 707202ed71 Add override option for space at end of prompt
Closes #196
2023-07-06 12:53:16 +02:00
DominikDoom 922414b4ba Add separate "append spaces" setting
Also rewrote settings to use newer webui features
2023-07-06 12:39:47 +02:00
DominikDoom 4923c8a177 Add first-difference based wildcard completion
along with an option to choose the wanted mode
2023-06-20 18:22:08 +02:00
DominikDoom 0c8ed0d265 Use absolute paths for tags dir and wildcard temp files
Allows data-dir to function if used together with --gradio-allowed-path
Fixes #188
2023-06-15 21:17:03 +02:00
Piotr Zaborowski a7468da59b Add better error handing for malformed .yaml files 2023-06-15 00:32:43 +02:00
DominikDoom 2d7e6181f5 Fix embed refresh & JS selector 2023-05-26 17:18:53 +02:00
DominikDoom c6049fc2fa Separate refresh and write function to include embeds 2023-05-26 16:55:34 +02:00
DominikDoom a7da670e97 New "setting" for reloading temp files
This allows refreshing Lora, lycos, hypernets and wildcards without having to restart the UI
2023-05-26 15:40:25 +02:00
DominikDoom a95f422f10 Merge branch 'feature-rubytext' into main
Live translation feature, pretty WIP so expect some bugs
2023-05-15 19:06:09 +02:00
DominikDoom 1d40449942 Use file selection for chants, fix sorting 2023-05-11 18:37:55 +02:00
Gin a724da362c try chants 2023-05-11 10:18:49 +08:00
DominikDoom 6b42efaa40 Add multidiff upscaler to third party text 2023-05-04 13:04:08 +02:00
ReUnknown ea24f7657a Text update of settings related to third parties 2023-05-04 19:23:59 +09:00
DominikDoom 5fe5398b94 Cosmetic variable name fixes 2023-05-03 10:50:47 +02:00
DominikDoom 52f92e4d42 Use glob module instead of pathlib glob
Resolves symlink issue, closes #168
2023-05-03 10:41:22 +02:00
DominikDoom 0e177d0945 Add option for live preview 2023-05-02 17:59:36 +02:00
Kamilowaty122 11d94e11f9 Add support for LyCORIS
Adds support for LyCORIS from https://github.com/KohakuBlueleaf/a1111-sd-webui-lycoris
2023-04-15 07:49:11 +02:00
DominikDoom 223abf5420 Remove multiline args from fallback
Fixes #156
2023-04-05 13:05:44 +02:00
DominikDoom 4331bdccda Add mapping fallback for older gradio versions
Fixes #151, fixes #152, fixes #154
2023-04-04 09:06:48 +02:00
DominikDoom 873a15b5f6 Move user mappings to options to prevent override
Adresses #127
2023-04-03 14:14:39 +02:00
Dominik Reh 32c7749a5f Fallback for extensions dir
Fixes #145
2023-03-26 16:32:20 +02:00
Dominik Reh afe3f23afa Use paths provided by webui where applicable
This doesn't solve the gradio security policy issue, just eliminates a bit of guesswork
2023-03-26 10:59:22 +02:00
Dominik Reh 647d3f7ec3 Remove unused imports 2023-02-28 10:43:24 +01:00
Dominik Reh 90664d47bf Fixes for PR #128
Replaced the caret position detection with a more robust version
Added option to turn it off
2023-02-26 17:58:00 +01:00
Dominik Reh 823958507b Fix lora and hypernet sorting
Subfolders broke overall alphabetic order, so a final pass was needed
2023-02-25 13:03:05 +01:00
Dominik Reh 2de1c720ee Merge branch 'feature-extendability' into main 2023-02-11 15:15:46 +01:00
Dominik Reh 37e1c15e6d Make quality tags file the default 2023-02-11 14:16:31 +01:00
Dominik Reh f2c3574da7 Rework extra file system
Now just for adding new custom tags either before or after the rest
2023-02-11 14:13:42 +01:00
DominikDoom 8dd8ccc527
Fix safety check 2023-02-10 07:30:58 +01:00
Dominik Reh beba0ca714 Merge branch 'main' of https://github.com/DominikDoom/a1111-sd-webui-tagcomplete into main 2023-02-05 17:19:28 +01:00
Dominik Reh bb82f208c0 Catch lora attribute error
Should fix the issue for older webui versions.
Closes #119, #124
2023-02-05 17:19:24 +01:00
Piotr Zaborowski 86ead9b43d Add failsafe for badly formatted UmiAI YAML files 2023-02-02 14:37:07 +01:00
Dominik Reh 8ab0e2504b Fix meta display, add mixed results
< will show all three, while <e: <h: or <l: will limit it to that type.
2023-01-24 14:51:55 +01:00
Dominik Reh b29b496b88 Simplify lora and hypernetwork loading 2023-01-24 14:08:11 +01:00
JM ae01f41f30 add support for hypernetworks and lora 2023-01-22 19:24:59 +01:00
Dominik Reh 7fdad1bf62 Add back ability to use hashes in black/whitelist
They are displayed in the UI after all, just not in the dropdown but at the bottom
2023-01-14 14:57:39 +01:00
Dominik Reh a91a098243 Change blacklist to use model name instead of hash
Hotfix for recent webui changes to use proper sha256 hashes, which is currently not displayed in the UI
2023-01-14 14:24:44 +01:00
Dominik Reh d4db6a7907 Option to show ? wiki links for danbooru/e621 tags
Disabled by default since the wiki pages likely contain NSFW images.
Closes #109
2023-01-12 15:49:53 +01:00
Dominik Reh 52593e6ac8 Update setting descriptions for black/whitelist 2023-01-12 14:45:16 +01:00
Dominik Reh 849e346924 Black/whitelisting options for models
Enables selective (de)activation based on model hash.
Closes #14
2023-01-12 14:35:54 +01:00
Dominik Reh c048684909 Load embeds recursively in fallback
Webui now supports recursive embedding loading, so we also use it here.
This shouldn't happen since the newer version uses the non-fallback, but it doesn't hurt
2023-01-06 15:52:40 +01:00
Dominik Reh da9acfea2a Rework embedding load, now uses callback.
Should hopefully fix #100
2023-01-03 17:30:30 +01:00
Dominik Reh 89d36da47e Add fallback for embedding loading
Fixes error on outdated webuis, as mentioned in #98 and #99
2023-01-02 16:09:36 +01:00
Dominik Reh 5f2f746310 Skipped embeddings now also hold shape info
so we don't need to guess the type anymore if the model didn't load any.
2023-01-02 12:45:56 +01:00
Dominik Reh 6deefda279 Show version info for embeddings
Also allows searching by version to quickly find v1 or v2 model embeddings
Closes #97
2023-01-02 00:38:48 +01:00
catwars 16201605d0
Merge branch 'DominikDoom:main' into umi-suggestions 2022-12-26 02:10:49 +01:00
ctwrs d2b5142d7d Umi filtering - initial version 2022-12-24 01:32:45 +01:00
ctwrs f11abe60c2 Allow for selecting an empty tagFile to disable booru suggestions 2022-12-23 21:34:00 +01:00
Dominik Reh 97cbada882 Sort yaml tags by count 2022-12-20 13:28:43 +01:00