diff options
| author | Greendayle <Greendayle> | 2022-10-05 20:05:24 +0000 |
|---|---|---|
| committer | Greendayle <Greendayle> | 2022-10-05 20:07:28 +0000 |
| commit | 17a99baf0c929e5df4dfc4b2a96aa3890a141112 (patch) | |
| tree | fdebfa0bacecc24904fbd5dfb6f29dd4cf6764d2 | |
| parent | 1506fab29ad54beb9f52236912abc432209c8089 (diff) | |
| download | stable-diffusion-webui-gfx803-17a99baf0c929e5df4dfc4b2a96aa3890a141112.tar.gz stable-diffusion-webui-gfx803-17a99baf0c929e5df4dfc4b2a96aa3890a141112.tar.bz2 stable-diffusion-webui-gfx803-17a99baf0c929e5df4dfc4b2a96aa3890a141112.zip | |
better model search
| -rw-r--r-- | modules/deepbooru.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/modules/deepbooru.py b/modules/deepbooru.py index 841cb9c5..a64fd9cd 100644 --- a/modules/deepbooru.py +++ b/modules/deepbooru.py @@ -9,8 +9,15 @@ import tensorflow as tf def _load_tf_and_return_tags(pil_image, threshold): this_folder = os.path.dirname(__file__) model_path = os.path.join(this_folder, '..', 'models', 'deepbooru', 'deepdanbooru-v3-20211112-sgd-e28') - if not os.path.exists(model_path): - return "Download https://github.com/KichangKim/DeepDanbooru/releases/download/v3-20211112-sgd-e28/deepdanbooru-v3-20211112-sgd-e28.zip unpack and put into models/deepbooru" + + model_good = False + for path_candidate in [model_path, os.path.dirname(model_path)]: + if os.path.exists(os.path.join(path_candidate, 'project.json')): + model_path = path_candidate + model_good = True + if not model_good: + return ("Download https://github.com/KichangKim/DeepDanbooru/releases/download/v3-20211112-sgd-e28/" + "deepdanbooru-v3-20211112-sgd-e28.zip unpack and put into models/deepbooru") tags = dd.project.load_tags_from_project(model_path) model = dd.project.load_model_from_project( |