Commit Graph

31 Commits

Author SHA1 Message Date
Aarni Koskela 3ba6c3c83c Fix up string formatting/concatenation to f-strings where feasible 2023-05-09 22:25:39 +03:00
AUTOMATIC 642d96dcc8 use exist_ok=True instead of checking if directory exists 2023-04-29 10:04:01 +03:00
darnell8 bb426de1cd Fix CLIP FileExistsError 2023-04-25 22:53:06 +08:00
Max Audron 5eee2ac398 add data-dir flag and set all user data directories based on it 2023-01-27 14:44:30 +01:00
AUTOMATIC 5228ec8bda remove fairscale requirement, add fake fairscale to make BLIP not complain about it mk2 2023-01-24 20:30:43 +03:00
AUTOMATIC 28189985e6 remove fairscale requirement, add fake fairscale to make BLIP not complain about it 2023-01-24 20:24:27 +03:00
AUTOMATIC 5c1cb9263f fix BLIP failing to import depending on configuration 2023-01-24 00:24:17 +03:00
Vladimir Mandic 04a561c11c
add option to skip interrogate categories 2023-01-23 12:29:23 -05:00
Vladimir Mandic 925dd09c91
improve interrogate 2023-01-23 09:03:17 -05:00
AUTOMATIC 6d805b669e make CLIP interrogator download original text files if the directory does not exist
remove random artist built-in extension (to re-added as a normal extension on demand)
remove artists.csv (but what does it mean????????????????????)
make interrogate buttons show Loading... when you click them
2023-01-21 09:14:27 +03:00
Vladimir Mandic d8d206c168
add state to interrogate 2023-01-03 11:01:04 -05:00
Vladimir Mandic 65be1df7bb
initialize result so not to cause exception on empty results 2022-12-31 07:46:04 -05:00
Yuval Aboulafia 3bf5591efe fix F541 f-string without any placeholders 2022-12-24 21:35:29 +02:00
AUTOMATIC 4b0dc206ed use modelloader for #4956 2022-12-03 18:45:51 +03:00
AUTOMATIC1111 2a649154ec
Merge pull request #4956 from TiagoSantos81/offline_BLIP
[CLIP interrogator] use local file, if available
2022-12-03 18:17:56 +03:00
brkirch 4d5f1691dd Use devices.autocast instead of torch.autocast 2022-11-30 10:33:42 -05:00
Tiago F. Santos a2ae5a6555 [interrogator] mkdir check 2022-11-24 13:04:45 +00:00
Tiago F. Santos 745f1e8f80 [CLIP interrogator] use local file, if available 2022-11-22 12:48:25 +00:00
mawr d587586d3b Added "--clip-models-path" switch to avoid using default "~/.cache/clip" and enable to run under unprivileged user without homedir 2022-10-31 00:14:07 +03:00
Patryk Wychowaniec 7157e5d064 interrogate: Fix CLIP-interrogation on CPU
Currently, trying to perform CLIP interrogation on a CPU fails, saying:

```
RuntimeError: "slow_conv2d_cpu" not implemented for 'Half'
```

This merge request fixes this issue by detecting whether the target
device is CPU and, if so, force-enabling `--no-half` and passing
`device="cpu"` to `clip.load()` (which then does some extra tricks to
ensure it works correctly on CPU).
2022-10-21 09:52:12 +03:00
AUTOMATIC b99d3cf6dd make CLIP interrogate ranks output sane values 2022-10-17 08:41:02 +03:00
DenkingOfficial 58f3ef7733 Fix CLIP Interrogator and disable ranks for it 2022-10-17 08:01:59 +03:00
brkirch fdef8253a4 Add 'interrogate' and 'all' choices to --use-cpu
* Add 'interrogate' and 'all' choices to --use-cpu
* Change type for --use-cpu argument to str.lower, so that choices are case insensitive
2022-10-14 16:31:39 +03:00
Greg Fuller d717eb079c Interrogate: add option to include ranks in output
Since the UI also allows users to specify ranks, it can be useful to show people what ranks are being returned by interrogate

This can also give much better results when feeding the interrogate results back into either img2img or txt2img, especially when trying to generate a specific character or scene for which you have a similar concept image

Testing Steps:

Launch Webui with command line arg: --deepdanbooru
Navigate to img2img tab, use interrogate DeepBooru, verify tags appears as before. Use "Interrogate CLIP", verify prompt appears as before
Navigate to Settings tab, enable new option, click "apply settings"
Navigate to img2img, Interrogate DeepBooru again, verify that weights appear and are properly formatted. Note that "Interrogate CLIP" prompt is still unchanged
In my testing, this change has no effect to "Interrogate CLIP", as it seems to generate a sentence-structured caption, and not a set of tags.

(reproduce changes from 6ed4faac46)
2022-10-11 18:02:41 -07:00
Aidan Holland 432782163a chore: Fix typos 2022-10-08 22:42:30 +03:00
AUTOMATIC c7543d4940 preprocessing for textual inversion added 2022-10-02 22:41:21 +03:00
AUTOMATIC d4dc4c1c63 fix for Error Interrogating when user has garbage in text files #479 2022-09-15 15:13:06 +03:00
AUTOMATIC c50fa7a932 remove mistaken error message 2022-09-12 12:26:37 +03:00
AUTOMATIC 9bb20be090 memory optimization for CLIP interrogator
changed default cfg_scale to a higher value
2022-09-12 11:55:27 +03:00
AUTOMATIC 8fb9c57ed6 add half() supporrt for CLIP interrogation 2022-09-11 23:24:24 +03:00
AUTOMATIC f194457229 CLIP interrogator 2022-09-11 18:48:36 +03:00