Upload app.py

app.py

@@ -15,12 +15,6 @@ import requests
 import pandas as pd
 from pathlib import Path
 
-# MOD macgaga:
-import importlib
-
-# Dynamischer Import der zusätzlichen Funktionen
-civitai_integration = importlib.import_module('civitai_integration')
-
 from env import models, num_loras, num_cns, HF_TOKEN, single_file_base_models
 from mod import (clear_cache, get_repo_safetensors, is_repo_name, is_repo_exists, get_model_trigger,
                  description_ui, compose_lora_json, is_valid_lora, fuse_loras, save_image, preprocess_i2i_image,
@@ -1030,86 +1024,43 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', fill_width=True, css=css, delete_ca
     )#.then(change_base_model, [model_name, cn_on, disable_model_cache, model_type], [result], queue=True, show_api=False)
     prompt_enhance.click(enhance_prompt, [prompt], [prompt], queue=False, show_api=False)
 
-lora_search_civitai_submit.click(
-    lambda query, tags, sort, period: search_civitai_lora(query, tags, sort, period),
-    inputs=[lora_search_civitai_query, lora_search_civitai_tag, lora_search_civitai_sort, lora_search_civitai_period],
-    outputs=[lora_search_civitai_json],
-).success(
-    civitai_integration.update_gallery_with_civitai_loras,  # Nutzt die ausgelagerte Funktion
-    inputs=[lora_search_civitai_json, loras_state],
-    outputs=[loras_state, gallery]
-)
-
-lora_search_civitai_json.change(
-    search_civitai_lora_json, 
-    [lora_search_civitai_query, lora_search_civitai_basemodel], 
-    [lora_search_civitai_json], 
-    queue=True, 
-    show_api=True
-)  # fn for api
-
-lora_search_civitai_result.change(
-    select_civitai_lora, 
-    [lora_search_civitai_result], 
-    [lora_download_url, lora_search_civitai_desc], 
-    scroll_to_output=True, 
-    queue=False, 
-    show_api=False
-)
-
-lora_search_civitai_gallery.select(
-    update_civitai_selection, 
-    None, 
-    [lora_search_civitai_result], 
-    queue=False, 
-    show_api=False
-)
-
-for i, l in enumerate(lora_repo):
-    deselect_lora_button.click(
-        lambda: ("", 1.0), 
-        None, 
-        [lora_repo[i], lora_wt[i]], 
-        queue=False, 
-        show_api=False
-    )
     gr.on(
-        triggers=[lora_download[i].click],
-        fn=download_my_lora_flux,
-        inputs=[lora_download_url, lora_repo[i]],
-        outputs=[lora_repo[i]],
+        triggers=[lora_search_civitai_submit.click, lora_search_civitai_query.submit],
+        fn=search_civitai_lora,
+        inputs=[lora_search_civitai_query, lora_search_civitai_basemodel, lora_search_civitai_sort, lora_search_civitai_period,
+                lora_search_civitai_tag, lora_search_civitai_user, lora_search_civitai_gallery],
+        outputs=[lora_search_civitai_result, lora_search_civitai_desc, lora_search_civitai_submit, lora_search_civitai_query, lora_search_civitai_gallery],
         scroll_to_output=True,
         queue=True,
         show_api=False,
     )
-    gr.on(
-        triggers=[lora_repo[i].change, lora_wt[i].change],
-        fn=update_loras_flux,
-        inputs=[prompt, lora_repo[i], lora_wt[i]],
-        outputs=[prompt, lora_repo[i], lora_wt[i], lora_info[i], lora_md[i]],
-        queue=False,
-        trigger_mode="once",
-        show_api=False,
-    ).success(
-        get_repo_safetensors, 
-        [lora_repo[i]], 
-        [lora_weights[i]], 
-        queue=False, 
-        show_api=False
-    ).success(
-        apply_lora_prompt_flux, 
-        [lora_info[i]], 
-        [lora_trigger[i]], 
-        queue=False, 
-        show_api=False
-    ).success(
-        compose_lora_json, 
-        [lora_repo_json, lora_num[i], lora_repo[i], lora_wt[i], lora_weights[i], lora_trigger[i]], 
-        [lora_repo_json], 
-        queue=False, 
-        show_api=False
-    )
+    lora_search_civitai_json.change(search_civitai_lora_json, [lora_search_civitai_query, lora_search_civitai_basemodel], [lora_search_civitai_json], queue=True, show_api=True)  # fn for api
+    lora_search_civitai_result.change(select_civitai_lora, [lora_search_civitai_result], [lora_download_url, lora_search_civitai_desc], scroll_to_output=True, queue=False, show_api=False)
+    lora_search_civitai_gallery.select(update_civitai_selection, None, [lora_search_civitai_result], queue=False, show_api=False)
 
+    for i, l in enumerate(lora_repo):
+        deselect_lora_button.click(lambda: ("", 1.0), None, [lora_repo[i], lora_wt[i]], queue=False, show_api=False)
+        gr.on(
+            triggers=[lora_download[i].click],
+            fn=download_my_lora_flux,
+            inputs=[lora_download_url, lora_repo[i]],
+            outputs=[lora_repo[i]],
+            scroll_to_output=True,
+            queue=True,
+            show_api=False,
+        )
+        gr.on(
+            triggers=[lora_repo[i].change, lora_wt[i].change],
+            fn=update_loras_flux,
+            inputs=[prompt, lora_repo[i], lora_wt[i]],
+            outputs=[prompt, lora_repo[i], lora_wt[i], lora_info[i], lora_md[i]],
+            queue=False,
+            trigger_mode="once",
+            show_api=False,
+        ).success(get_repo_safetensors, [lora_repo[i]], [lora_weights[i]], queue=False, show_api=False
+        ).success(apply_lora_prompt_flux, [lora_info[i]], [lora_trigger[i]], queue=False, show_api=False
+        ).success(compose_lora_json, [lora_repo_json, lora_num[i], lora_repo[i], lora_wt[i], lora_weights[i], lora_trigger[i]], [lora_repo_json], queue=False, show_api=False)
+        
     for i, m in enumerate(cn_mode):
         gr.on(
             triggers=[cn_mode[i].change, cn_scale[i].change],