Upload 2 files

dc.py

@@ -316,7 +316,7 @@ class GuiSD:
             retain_task_model_in_cache=False,
             #device="cpu",
         )
-        self.model.device = torch.device("cpu")
+        self.model.device = torch.device("cpu") #
 
     def infer_short(self, model, pipe_params, progress=gr.Progress(track_tqdm=True)):
         progress(0, desc="Start inference...")
@@ -700,7 +700,7 @@ from modutils import (safe_float, escape_lora_basename, to_lora_key, to_lora_pat
     normalize_prompt_list, get_civitai_info, search_lora_on_civitai)
 
 sd_gen = GuiSD()
-@spaces.GPU
+#@spaces.GPU
 def infer(prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps,
            model_name = load_diffusers_format_model[0], lora1 = None, lora1_wt = 1.0, lora2 = None, lora2_wt = 1.0,
            lora3 = None, lora3_wt = 1.0, lora4 = None, lora4_wt = 1.0, lora5 = None, lora5_wt = 1.0,
@@ -748,7 +748,7 @@ def infer(prompt, negative_prompt, seed, randomize_seed, width, height, guidance
     return output_image
 
 
-@spaces.GPU
+#@spaces.GPU
 def _infer(prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps,
             model_name = load_diffusers_format_model[0], lora1 = None, lora1_wt = 1.0, lora2 = None, lora2_wt = 1.0,
             lora3 = None, lora3_wt = 1.0, lora4 = None, lora4_wt = 1.0, lora5 = None, lora5_wt = 1.0,
@@ -809,7 +809,9 @@ def get_t2i_model_info(repo_id: str):
     info = []
     url = f"https://huggingface.co/{repo_id}/"
     if not 'diffusers' in tags: return ""
-    if 'diffusers:StableDiffusionXLPipeline' in tags:
+    if 'diffusers:FluxPipeline' in tags:
+        info.append("FLUX.1")
+    elif 'diffusers:StableDiffusionXLPipeline' in tags:
         info.append("SDXL")
     elif 'diffusers:StableDiffusionPipeline' in tags:
         info.append("SD1.5")

modutils.py

@@ -39,7 +39,6 @@ def get_local_model_list(dir_path):
 
 def download_things(directory, url, hf_token="", civitai_api_key=""):
     url = url.strip()
-    
     if "drive.google.com" in url:
         original_dir = os.getcwd()
         os.chdir(directory)
@@ -200,8 +199,8 @@ def get_model_id_list():
     anime_models = []
     real_models = []
     for model in models_ex:
-        if not model.private:
-            anime_models.append(model.id) if 'anime' in model.tags else real_models.append(model.id)
+        if not model.private and not model.gated and "diffusers:FluxPipeline" not in model.tags:
+            anime_models.append(model.id) if "anime" in model.tags else real_models.append(model.id)
     model_ids.extend(anime_models)
     model_ids.extend(real_models)
     model_id_list = model_ids.copy()
@@ -252,6 +251,8 @@ def get_tupled_model_list(model_list):
         tags = model.tags
         info = []
         if not 'diffusers' in tags: continue
+        if 'diffusers:FluxPipeline' in tags:
+            info.append("FLUX.1")
         if 'diffusers:StableDiffusionXLPipeline' in tags:
             info.append("SDXL")
         elif 'diffusers:StableDiffusionPipeline' in tags: