Pārlūkot izejas kodu

[2/?] [wip] ignore OPT_INCLUDE_RANKS for training filenames

Greg Fuller 2 gadi atpakaļ
vecāks
revīzija
f776254b12
2 mainītis faili ar 5 papildinājumiem un 2 dzēšanām
  1. 2 1
      modules/deepbooru.py
  2. 3 1
      modules/textual_inversion/preprocess.py

+ 2 - 1
modules/deepbooru.py

@@ -19,6 +19,7 @@ def get_deepbooru_tags(pil_image):
         release_process()
         release_process()
 
 
 
 
+OPT_INCLUDE_RANKS = "include_ranks"
 def create_deepbooru_opts():
 def create_deepbooru_opts():
     from modules import shared
     from modules import shared
 
 
@@ -26,7 +27,7 @@ def create_deepbooru_opts():
         "use_spaces": shared.opts.deepbooru_use_spaces,
         "use_spaces": shared.opts.deepbooru_use_spaces,
         "use_escape": shared.opts.deepbooru_escape,
         "use_escape": shared.opts.deepbooru_escape,
         "alpha_sort": shared.opts.deepbooru_sort_alpha,
         "alpha_sort": shared.opts.deepbooru_sort_alpha,
-        "include_ranks": shared.opts.interrogate_return_ranks,
+        OPT_INCLUDE_RANKS: shared.opts.interrogate_return_ranks,
     }
     }
 
 
 
 

+ 3 - 1
modules/textual_inversion/preprocess.py

@@ -17,7 +17,9 @@ def preprocess(process_src, process_dst, process_width, process_height, process_
             shared.interrogator.load()
             shared.interrogator.load()
 
 
         if process_caption_deepbooru:
         if process_caption_deepbooru:
-            deepbooru.create_deepbooru_process(opts.interrogate_deepbooru_score_threshold, deepbooru.create_deepbooru_opts())
+            db_opts = deepbooru.create_deepbooru_opts()
+            db_opts[deepbooru.OPT_INCLUDE_RANKS] = False
+            deepbooru.create_deepbooru_process(opts.interrogate_deepbooru_score_threshold, db_opts)
 
 
         preprocess_work(process_src, process_dst, process_width, process_height, process_flip, process_split, process_caption, process_caption_deepbooru)
         preprocess_work(process_src, process_dst, process_width, process_height, process_flip, process_split, process_caption, process_caption_deepbooru)