Upload 2 files

app.py

@@ -344,8 +344,9 @@ class GuiSD:
             vae_model=None,
             type_model_precision=torch.float16,
             retain_task_model_in_cache=False,
-            device="cpu",
+            #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...")
@@ -725,12 +726,12 @@ class GuiSD:
 sd_gen = GuiSD()
 
 #@spaces.GPU
-def sd_gen_load_new_model(*args, progress=gr.Progress(track_tqdm=True)):
-    yield from sd_gen.load_new_model(*args, progress)
+#def sd_gen_load_new_model(*args, progress=gr.Progress(track_tqdm=True)):
+#    yield from sd_gen.load_new_model(*args, progress)
 
-@spaces.GPU
-def sd_gen_generate_pipeline(*args, progress=gr.Progress(track_tqdm=True)):
-    yield from sd_gen.generate_pipeline(*args, progress)
+#@spaces.GPU
+#def sd_gen_generate_pipeline(*args, progress=gr.Progress(track_tqdm=True)):
+#    yield from sd_gen.generate_pipeline(*args, progress)
 
 ## BEGIN MOD
 CSS ="""
@@ -1250,8 +1251,8 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                             "votepurchase/animagine-xl-3.1",
                         ],
                     ],
-                    #fn=sd_gen.generate_pipeline,
-                    fn=sd_gen_generate_pipeline,
+                    fn=sd_gen.generate_pipeline,
+                    #fn=sd_gen_generate_pipeline,
                     inputs=[
                         prompt_gui,
                         neg_prompt_gui,
@@ -1430,8 +1431,8 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
         translate_prompt_button.click(translate_prompt, [series_dbt], [series_dbt], queue=False)
 
         generate_button.click(
-            #fn=sd_gen.load_new_model,
-            fn=sd_gen_load_new_model,
+            fn=sd_gen.load_new_model,
+            #fn=sd_gen_load_new_model,
             inputs=[
                 model_name_gui,
                 vae_model_gui,
@@ -1441,8 +1442,8 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
             queue=True,
             show_progress="minimal",
         ).success(
-            #fn=sd_gen.generate_pipeline,
-            fn=sd_gen_generate_pipeline,
+            fn=sd_gen.generate_pipeline,
+            #fn=sd_gen_generate_pipeline,
             inputs=[
                 prompt_gui,
                 neg_prompt_gui,

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)
@@ -187,10 +186,10 @@ def get_model_id_list():
     try:
         models_likes = []
         for author in HF_MODEL_USER_LIKES:
-            models_likes.extend(api.list_models(author=author, cardData=True, sort="likes"))
+            models_likes.extend(api.list_models(author=author, task="text-to-image", cardData=True, sort="likes"))
         models_ex = []
         for author in HF_MODEL_USER_EX:
-            models_ex = api.list_models(author=author, cardData=True, sort="last_modified")
+            models_ex = api.list_models(author=author, task="text-to-image", cardData=True, sort="last_modified")
     except Exception as e:
         print(f"Error: Failed to list {author}'s models.")
         print(e)
@@ -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:
@@ -858,7 +859,7 @@ def find_similar_lora(q: str):
 def change_interface_mode(mode: str):
     if mode == "Fast":
         return gr.update(open=False), gr.update(visible=True), gr.update(open=False), gr.update(open=False),\
-        gr.update(visible=True), gr.update(open=False), gr.update(visible=True), gr.update(open=True),\
+        gr.update(visible=True), gr.update(open=False), gr.update(visible=True), gr.update(open=False),\
         gr.update(visible=True), gr.update(value="Fast")
     elif mode == "Simple": # t2i mode
         return gr.update(open=True), gr.update(visible=True), gr.update(open=False), gr.update(open=False),\
@@ -866,11 +867,11 @@ def change_interface_mode(mode: str):
         gr.update(visible=False), gr.update(value="Standard")
     elif mode == "LoRA": # t2i LoRA  mode
         return gr.update(open=True), gr.update(visible=True), gr.update(open=True), gr.update(open=False),\
-        gr.update(visible=True), gr.update(open=True), gr.update(visible=True), gr.update(open=True),\
+        gr.update(visible=True), gr.update(open=True), gr.update(visible=True), gr.update(open=False),\
         gr.update(visible=False), gr.update(value="Standard")
     else: # Standard
         return gr.update(open=False), gr.update(visible=True), gr.update(open=False), gr.update(open=False),\
-        gr.update(visible=True), gr.update(open=False), gr.update(visible=True), gr.update(open=True),\
+        gr.update(visible=True), gr.update(open=False), gr.update(visible=True), gr.update(open=False),\
         gr.update(visible=True), gr.update(value="Standard")