Commit Graph

56 Commits

Author SHA1 Message Date
Vladimir Mandic 91406bc9a0 update civit downloader 2023-08-26 14:13:56 +00:00
Vladimir Mandic 6a4d4ea5b7 update logging and model hashinh 2023-08-22 18:28:09 +00:00
Vladimir Mandic 53dcf157fb switch abs to relative paths 2023-08-21 08:11:30 +00:00
Vladimir Mandic 5eac99d3f5 optimize diffusers memory handling 2023-08-18 20:41:34 +00:00
Vladimir Mandic 20ba9aa649 update lint 2023-08-15 08:29:04 +02:00
Midcoastal 67f369ed25 A walk() optimization and lint fixes 2023-08-17 16:49:42 -04:00
Midcoastal 89da66207a I guess I didn't quite understand Lint error C416
Seems like a rather pedantic check, if you ask me...  Oh well.
2023-08-16 00:25:27 -04:00
Midcoastal 03363ce866 Resolve Lint Errors: C416 (x2), W291 and F541 2023-08-15 23:20:00 -04:00
Midcoastal 873e864640 Ooof, modelloader changes needed for TI upgrade 2023-08-15 23:09:24 -04:00
Midcoastal 7e4aed7948 Add a FS directory/path cacher
- Added FS dir/path mechanism to 'modules.modelloader'
- Refactored 'modules.modelloader.load_models' to use the cache
- Refactored 'modules.ui_extra_networks.find_*' methods to use the cache
- Added progress indicator to 'modules.ui_extra_networks.create_html'

The cache, as implimented, will always ensure it is up-to-date (per 'directory_has_changed') and significantly improves loading speed (when used with 'model_loader' and the 'find_*' methods) with large model directories.

Overall load speed tested with ~10k models (mix of checkpoints, loras, lycoris, and embeddings) and ~40k secndary files (images, descriptions, CivitAI Info, etc).  Loading speeds went from ~1 hour and 45 minutes to ~5 minutes.

Confounding variable to loading speeds: this is over a fiber-attached storage device.  Connection is 10gbe full-duplex, remote source has an NVMe raid cache.  Saturation of the network is the norm, but laintency is a factor.  Regardless, small-scale local-storage testing also shows measurable improvements, so this should be a welcome addition.
2023-08-15 16:07:41 -04:00
Vladimir Mandic 5d5f22e6e1 remove invalid downloaded files 2023-08-12 08:07:13 +00:00
Vladimir Mandic a77fa4c12e add job info 2023-08-09 08:42:26 +00:00
Vladimir Mandic a5f95f4b38 civitai model search and download 2023-08-09 08:01:37 +00:00
Patrick von Platen a9d239ab51 [Diffusers] Make all Kandinsky work 2023-07-25 21:47:49 +00:00
Vladimir Mandic 46709ee391 fix image metadata and diffuser search 2023-07-18 20:41:47 -04:00
Vladimir Mandic debec28be6 rework settings, image-watermark, safe config handling 2023-07-18 14:41:27 -04:00
Vladimir Mandic a7f5e75a35 fix secondary model location 2023-07-15 16:07:10 -04:00
Vladimir Mandic a16eee1504 bugfix release 2023-07-09 10:06:47 -04:00
Vladimir Mandic 89a7ea6a3f overal quality fixes 2023-07-08 09:49:41 -04:00
Vladimir Mandic 8241e33868 major diffusers update 2023-07-03 16:48:03 -04:00
Vladimir Mandic cc685a8729 wip diffusers 2023-07-02 21:07:26 -04:00
Vladimir Mandic a2caafe4df initial diffusers merge into dev 2023-07-02 14:04:54 -04:00
Vladimir Mandic 0ddf613b49 jumbo merge part two 2023-06-14 11:23:02 -04:00
Vladimir Mandic cb307399dd jumbo merge 2023-06-13 11:59:56 -04:00
Patrick von Platen 46d410687e Improve when loading from diffusers 2023-06-05 18:22:17 +00:00
Vladimir Mandic 851d129680 more diffusers work 2023-05-27 15:49:54 -04:00
Vladimir Mandic efd3810860 diffusers merge 2023-05-26 22:42:03 -04:00
Vladimir Mandic 6c66228cde fix models dir 2023-05-18 08:17:49 -04:00
Vladimir Mandic 0ccda9bc8b jumbo patch 2023-05-17 14:15:55 -04:00
Vladimir Mandic 176ac924af make tensorflow optional 2023-04-23 08:11:26 -04:00
Vladimir Mandic 8b1f26324b optional model loader and integrate image info 2023-04-17 15:31:43 -04:00
Vladimir Mandic 58df74cfd5 new middleware handler and ability to restart server on-the-fly 2023-04-16 15:57:00 -04:00
Vladimir Mandic f181885f0c Merge pull request #57 from AUTOMATIC1111/master
merge from upstream
2023-03-25 08:47:00 -04:00
Vladimir Mandic 73135f2c12 optimize model loader 2023-03-24 13:48:26 -04:00
ArrowM 00bd271faf Move load_file_from_url
Why?
one of the internal calls of `load_file_from_url` import cv2, which locks the cv2 site-package, which extensions may (and in our case, is) breaking the installation of some libraries. The base project should be limiting its import of unnecessary libraries when possible during the installation phase.
2023-03-21 21:13:30 -05:00
Brad Smith d118cb6ea3 use lowercase name for sorting; keep UpscalerLanczos and UpscalerNearest at the start of the list with UpscalerNone
Co-authored-by: catboxanon <122327233+catboxanon@users.noreply.github.com>
2023-03-06 13:21:42 -05:00
Brad Smith b15bc73c99 sort upscalers by name 2023-02-24 14:45:08 -05:00
spezialspezial 6524478850 Update modelloader.py
os.path.getmtime(filename) throws exception later in codepath when meeting broken symlink. For now catch it here early but more checks could be added for robustness.
2023-02-04 16:52:15 +01:00
AUTOMATIC ce3f639ec8 add more stuff to ignore when creating model from config
prevent .vae.safetensors files from being listed as stable diffusion models
2023-01-10 16:51:04 +03:00
AUTOMATIC 2d5a5076bb Make it so that upscalers are not repeated when restarting UI. 2023-01-03 18:38:21 +03:00
AUTOMATIC b6e5edd746 add built-in extension system
add support for adding upscalers in extensions
move LDSR, ScuNET and SwinIR to built-in extensions
2022-12-03 18:06:33 +03:00
Tim Patton ac7ecd2d84 Label and load SD .safetensors model files 2022-11-19 14:49:22 -05:00
victorca25 c9bb33dd43 add resrgan 8x, allow use 1x and up to 8x extra models, move BSRGAN model, add nearest 2022-10-30 12:54:06 +01:00
d8ahazard 5d26ba2b4b Merge branch 'master' into ScuNET 2022-10-02 07:56:22 -05:00
AUTOMATIC 0114057ad6 fix incorrect use of glob in modelloader for #1410 2022-10-02 15:49:42 +03:00
d8ahazard e82ea20299 Optimize model loader
Child classes only get populated to __subclassess__ when they are imported. We don't actually need to import any of them to webui any more, so clean up webUI imports and make sure loader imports children.

Also, fix command line paths not actually being passed to the scalers.
2022-09-30 15:26:18 -05:00
d8ahazard 5d52231bcb Logging....
Cleanup. Sorry.
2022-09-30 09:28:48 -05:00
d8ahazard ca87c09c0e Fix recursive model loading
Ensure we find checkpoints within subdirectories.
2022-09-30 09:28:28 -05:00
AUTOMATIC d1f098540a remove unwanted formatting/functionality from the PR 2022-09-30 11:42:40 +03:00
AUTOMATIC aec811c5e6 undo upscaler model filename tampering 2022-09-30 10:52:45 +03:00