Upload 3 files

app.py

@@ -48,6 +48,7 @@ css = """
 .title { font-size: 3em; align-items: center; text-align: center; }
 .info { align-items: center; text-align: center; }
 .desc [src$='#float'] { float: right; margin: 20px; }
+.image { margin: 0px auto; }
 """
 
 with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60, 3600)) as demo:
@@ -207,11 +208,13 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                 with gr.Tab("ControlNet / Img2img / Inpaint"):
                     task_sel = gr.Radio(label="Task Selector", choices=SDXL_TASK, value=TASK_MODEL_LIST[0])
                     with gr.Row():
+                        with gr.Column():
                         #image_control = gr.Image(label="Image ControlNet / Inpaint / Img2img", type="filepath", height=384, sources=["upload", "clipboard", "webcam"], show_share_button=False)
-                        image_control = gr.ImageEditor(label="Image ControlNet / Inpaint / Img2img", type="filepath", sources=["upload", "clipboard", "webcam"], image_mode='RGB',
-                                                       show_share_button=False, show_fullscreen_button=False, layers=False, canvas_size=(384, 384), width=384, height=512,
-                                                       brush=gr.Brush(colors=["#FFFFFF"], color_mode="fixed", default_size=32), eraser=gr.Eraser(default_size="32"))
-                        image_mask = gr.Image(label="Image Mask", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False)
+                            image_control = gr.ImageEditor(label="Image ControlNet / Inpaint / Img2img", type="filepath", sources=["upload", "clipboard", "webcam"], image_mode='RGB',
+                                                        show_share_button=False, show_fullscreen_button=False, layers=False, canvas_size=(384, 384), width=384, height=512,
+                                                        brush=gr.Brush(colors=["#FFFFFF"], color_mode="fixed", default_size=32), eraser=gr.Eraser(default_size="32"), elem_classes="image")
+                            result_to_ic_button = gr.Button("Get image from generated result")
+                        image_mask = gr.Image(label="Image Mask", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False, elem_classes="image")
                     with gr.Row():
                         strength = gr.Slider(minimum=0.01, maximum=1.0, step=0.01, value=0.55, label="Strength",
                                             info="This option adjusts the level of changes for img2img and inpainting.")
@@ -238,22 +241,26 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                     MODE_IP_OPTIONS = ["original", "style", "layout", "style+layout"]
                     with gr.Accordion("IP-Adapter 1", open=True, visible=True):
                         with gr.Row():
-                            #image_ip1 = gr.Image(label="IP Image", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False)
-                            image_ip1 = gr.ImageEditor(label="IP Image", type="filepath", sources=["upload", "clipboard", "webcam"], image_mode='RGB',
-                                                       show_share_button=False, show_fullscreen_button=False, layers=False, canvas_size=(384, 384), width=384, height=512,
-                                                       brush=gr.Brush(colors=["#FFFFFF"], color_mode="fixed", default_size=32), eraser=gr.Eraser(default_size="32"))
-                            mask_ip1 = gr.Image(label="IP Mask (optional)", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False)
+                            with gr.Column():
+                                #image_ip1 = gr.Image(label="IP Image", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False)
+                                image_ip1 = gr.ImageEditor(label="IP Image", type="filepath", sources=["upload", "clipboard", "webcam"], image_mode='RGB',
+                                                        show_share_button=False, show_fullscreen_button=False, layers=False, canvas_size=(384, 384), width=384, height=512,
+                                                        brush=gr.Brush(colors=["#FFFFFF"], color_mode="fixed", default_size=32), eraser=gr.Eraser(default_size="32"), elem_classes="image")
+                                result_to_ip1_button = gr.Button("Get image from generated result")
+                            mask_ip1 = gr.Image(label="IP Mask (optional)", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False, elem_classes="image")
                         with gr.Row():
                             model_ip1 = gr.Dropdown(value="plus_face", label="Model", choices=IP_MODELS)
                             mode_ip1 = gr.Dropdown(value="original", label="Mode", choices=MODE_IP_OPTIONS)
                             scale_ip1 = gr.Slider(minimum=0., maximum=2., step=0.01, value=0.7, label="Scale")
                     with gr.Accordion("IP-Adapter 2", open=True, visible=True):
                         with gr.Row():
-                            #image_ip2 = gr.Image(label="IP Image", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False)
-                            image_ip2 = gr.ImageEditor(label="IP Image", type="filepath", sources=["upload", "clipboard", "webcam"], image_mode='RGB',
-                                                       show_share_button=False, show_fullscreen_button=False, layers=False, canvas_size=(384, 384), width=384, height=512,
-                                                       brush=gr.Brush(colors=["#FFFFFF"], color_mode="fixed", default_size=32), eraser=gr.Eraser(default_size="32"))
-                            mask_ip2 = gr.Image(label="IP Mask (optional)", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False)
+                            with gr.Column():
+                                #image_ip2 = gr.Image(label="IP Image", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False)
+                                image_ip2 = gr.ImageEditor(label="IP Image", type="filepath", sources=["upload", "clipboard", "webcam"], image_mode='RGB',
+                                                        show_share_button=False, show_fullscreen_button=False, layers=False, canvas_size=(384, 384), width=384, height=512,
+                                                        brush=gr.Brush(colors=["#FFFFFF"], color_mode="fixed", default_size=32), eraser=gr.Eraser(default_size="32"), elem_classes="image")
+                                result_to_ip2_button = gr.Button("Get image from generated result")
+                            mask_ip2 = gr.Image(label="IP Mask (optional)", type="filepath", height=384, sources=["upload", "clipboard"], show_share_button=False, elem_classes="image")
                         with gr.Row():
                             model_ip2 = gr.Dropdown(value="base", label="Model", choices=IP_MODELS)
                             mode_ip2 = gr.Dropdown(value="style", label="Mode", choices=MODE_IP_OPTIONS)
@@ -265,12 +272,13 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                             image_base = gr.ImageEditor(sources=["upload", "clipboard", "webcam"],
                                 brush=gr.Brush(default_size="32", color_mode="fixed", colors=["rgba(0, 0, 0, 1)", "rgba(0, 0, 0, 0.1)", "rgba(255, 255, 255, 0.1)"]),
                                 eraser=gr.Eraser(default_size="32"), show_share_button=False, show_fullscreen_button=False,
-                                canvas_size=(384, 384), width=384, height=512)
+                                canvas_size=(384, 384), width=384, height=512, elem_classes="image")
+                            result_to_cm_button = gr.Button("Get image from generated result")
                             invert_mask = gr.Checkbox(value=False, label="Invert mask")
                             cm_btn = gr.Button("Create mask")
                         with gr.Column():
-                            img_source = gr.Image(interactive=False, height=384, show_share_button=False)
-                            img_result = gr.Image(label="Mask image", show_label=True, interactive=False, height=384, show_share_button=False)
+                            img_source = gr.Image(interactive=False, height=384, show_share_button=False, elem_classes="image")
+                            img_result = gr.Image(label="Mask image", show_label=True, interactive=False, height=384, show_share_button=False, elem_classes="image")
                             cm_btn_send = gr.Button("Send to ControlNet / Img2img / Inpaint")
                             cm_btn_send_ip1 = gr.Button("Send to IP-Adapter 1")
                             cm_btn_send_ip2 = gr.Button("Send to IP-Adapter 2")
@@ -362,11 +370,16 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
 
     model_name.change(update_task_options, [model_name, task], [task], queue=False, show_api=False)\
     .success(update_task_options, [model_name, task_sel], [task_sel], queue=False, show_api=False)
-    task_sel.change(lambda x: x, [task_sel], [task], queue=False, show_api=False)
-    task.change(change_preprocessor_choices, [task], [preprocessor_name], queue=False, show_api=False)
+    task_sel.select(lambda x: x, [task_sel], [task], queue=False, show_api=False)
+    task.change(change_preprocessor_choices, [task], [preprocessor_name], queue=False, show_api=False)\
+    .success(lambda x: x, [task], [task_sel], queue=False, show_api=False)
     active_textual_inversion.change(update_textual_inversion, [active_textual_inversion, model_name], [use_textual_inversion], queue=False, show_api=False)
     model_name.change(update_textual_inversion, [active_textual_inversion, model_name], [use_textual_inversion], queue=False, show_api=False)
     use_textual_inversion.change(set_textual_inversion_prompt, [use_textual_inversion, prompt, negative_prompt, prompt_syntax], [prompt, negative_prompt])
+    result_to_cm_button.click(lambda x: x, [result], [image_base], queue=False, show_api=False)
+    result_to_ic_button.click(lambda x: x, [result], [image_control], queue=False, show_api=False)
+    result_to_ip1_button.click(lambda x: x, [result], [image_ip1], queue=False, show_api=False)
+    result_to_ip2_button.click(lambda x: x, [result], [image_ip2], queue=False, show_api=False)
 
     gr.on( #lambda x: None, inputs=None, outputs=result).then(
         triggers=[run_button.click, prompt.submit],

llmdolphin.py

@@ -76,6 +76,7 @@ llm_models = {
     "ChronoStar-Unleashed-v0.1.i1-Q4_K_M.gguf": ["mradermacher/ChronoStar-Unleashed-v0.1-i1-GGUF", MessagesFormatterType.MISTRAL],
     "Chatty-Harry_V3.0.i1-Q4_K_M.gguf": ["mradermacher/Chatty-Harry_V3.0-i1-GGUF", MessagesFormatterType.MISTRAL],
     "Tora-12B.i1-Q4_K_M.gguf": ["mradermacher/Tora-12B-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "ArliArli-Meg.Q4_K_M.gguf": ["mradermacher/ArliArli-Meg-GGUF", MessagesFormatterType.MISTRAL],
     "ChatML-Nemo-Pro-V2.i1-Q4_K_M.gguf": ["mradermacher/ChatML-Nemo-Pro-V2-i1-GGUF", MessagesFormatterType.MISTRAL],
     "Trinas_Nectar-8B-model_stock.i1-Q4_K_M.gguf": ["mradermacher/Trinas_Nectar-8B-model_stock-i1-GGUF", MessagesFormatterType.MISTRAL],
     "ChatWaifu_Magnum_V0.2.Q4_K_M.gguf": ["mradermacher/ChatWaifu_Magnum_V0.2-GGUF", MessagesFormatterType.MISTRAL],
@@ -83,6 +84,42 @@ llm_models = {
     "ChatWaifu_22B_v2.0_preview.Q4_K_S.gguf": ["mradermacher/ChatWaifu_22B_v2.0_preview-GGUF", MessagesFormatterType.MISTRAL],
     "ChatWaifu_v1.4.Q5_K_M.gguf": ["mradermacher/ChatWaifu_v1.4-GGUF", MessagesFormatterType.MISTRAL],
     "ChatWaifu_v1.3.1.Q4_K_M.gguf": ["mradermacher/ChatWaifu_v1.3.1-GGUF", MessagesFormatterType.MISTRAL],
+    "Josiefied-abliteratedV4-Qwen2.5-14B-Inst-BaseMerge-TIES.Q4_K_M.gguf": ["mradermacher/Josiefied-abliteratedV4-Qwen2.5-14B-Inst-BaseMerge-TIES-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "InfinityLake-2x7B.i1-Q4_K_M.gguf": ["mradermacher/InfinityLake-2x7B-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "InfinityKuno-2x7B.i1-Q4_K_M.gguf": ["mradermacher/InfinityKuno-2x7B-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Himeyuri-v0.1-12B.i1-Q4_K_M.gguf": ["mradermacher/Himeyuri-v0.1-12B-i1-GGUF", MessagesFormatterType.CHATML],
+    "MN-Chinofun-12B-3.i1-Q4_K_M.gguf": ["mradermacher/MN-Chinofun-12B-3-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "FuseChat-7B-VaRM.i1-Q5_K_M.gguf": ["mradermacher/FuseChat-7B-VaRM-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Dragon-8B-Model_Stock.i1-Q5_K_M.gguf": ["mradermacher/Dragon-8B-Model_Stock-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "DareBeagel-2x7B.i1-Q4_K_M.gguf": ["mradermacher/DareBeagel-2x7B-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Cautious_Qwen.Q5_K_M.gguf": ["mradermacher/Cautious_Qwen-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "Captain-Eris_Twighlight-Magnum-12B.i1-Q4_K_M.gguf": ["mradermacher/Captain-Eris_Twighlight-Magnum-12B-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Brainy_LLAMA.i1-Q5_K_M.gguf": ["mradermacher/Brainy_LLAMA-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Blue-Rose-Coder-12.3B-Instruct.i1-Q4_K_M.gguf": ["mradermacher/Blue-Rose-Coder-12.3B-Instruct-i1-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "BigTalker-Lite-8B.i1-Q5_K_M.gguf": ["mradermacher/BigTalker-Lite-8B-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Aura-8B-SFT.i1-Q4_K_M.gguf": ["mradermacher/Aura-8B-SFT-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Aura-8B.i1-Q4_K_M.gguf": ["mradermacher/Aura-8B-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Arconte-13B.i1-Q4_K_M.gguf": ["mradermacher/Arconte-13B-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Arabic-Orpo-Llama-3-8B-Instruct.i1-Q5_K_M.gguf": ["mradermacher/Arabic-Orpo-Llama-3-8B-Instruct-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Elusive_ALT1.1-8B-Model_Stock.i1-Q5_K_M.gguf": ["mradermacher/Elusive_ALT1.1-8B-Model_Stock-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "L3.1-Writplus-10B.i1-Q4_K_M.gguf": ["mradermacher/L3.1-Writplus-10B-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Aura-8B.Q4_K_S.gguf": ["mradermacher/Aura-8B-GGUF", MessagesFormatterType.LLAMA_3],
+    "Eclectic-Maid-10B-v2.i1-Q4_K_M.gguf": ["mradermacher/Eclectic-Maid-10B-v2-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Captain_BMO-0.420-Magnum-12B-Q4_K_M.gguf": ["bartowski/Captain_BMO-0.420-Magnum-12B-GGUF", MessagesFormatterType.MISTRAL],
+    "SeQwence-14Bv6.Q4_K_M.gguf": ["mradermacher/SeQwence-14Bv6-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "Shahin-v0.1.Q4_K_M.gguf": ["mradermacher/Shahin-v0.1-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "ZEUS-8B-V6.i1-Q5_K_M.gguf": ["mradermacher/ZEUS-8B-V6-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "AngelSlayer-12B-Unslop-Mell-RPMax-DARKNESS.i1-Q4_K_M.gguf": ["mradermacher/AngelSlayer-12B-Unslop-Mell-RPMax-DARKNESS-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "Llama-TI-8B-Instruct.i1-Q5_K_M.gguf": ["mradermacher/Llama-TI-8B-Instruct-i1-GGUF", MessagesFormatterType.LLAMA_3],
+    "Fusion3-14B-Instruct.i1-Q4_K_M.gguf": ["mradermacher/Fusion3-14B-Instruct-i1-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "L3-Sophie-improved-v1.Q5_K_M.gguf": ["mradermacher/L3-Sophie-improved-v1-GGUF", MessagesFormatterType.LLAMA_3],
+    "L3-8B-Stheno-2x8B-MoE.Q4_K_M.gguf": ["mradermacher/L3-8B-Stheno-2x8B-MoE-GGUF", MessagesFormatterType.LLAMA_3],
+    "megatron_1.1_MoE_2x7B.i1-Q4_K_M.gguf": ["mradermacher/megatron_1.1_MoE_2x7B-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "MT1-Gen3-MU-gemma-2-S2S5-9B.Q4_K_M.gguf": ["mradermacher/MT1-Gen3-MU-gemma-2-S2S5-9B-GGUF", MessagesFormatterType.ALPACA],
+    "MixtureofMerges-MoE-2x7bRP-v8.i1-Q4_K_M.gguf": ["mradermacher/MixtureofMerges-MoE-2x7bRP-v8-i1-GGUF", MessagesFormatterType.MISTRAL],
+    "EXAONE-3.5-7.8B-Instruct-Q4_K_M.gguf": ["bartowski/EXAONE-3.5-7.8B-Instruct-GGUF", MessagesFormatterType.OPEN_CHAT],
+    "MT1-Gen3-MUI-gemma-2-9B.Q4_K_M.gguf": ["mradermacher/MT1-Gen3-MUI-gemma-2-9B-GGUF", MessagesFormatterType.ALPACA],
+    "Fusion-14B-Instruct.i1-Q4_K_M.gguf": ["mradermacher/Fusion-14B-Instruct-i1-GGUF", MessagesFormatterType.OPEN_CHAT],
     "Lamarck-14B-v0.2-experimental.Q4_K_M.gguf": ["mradermacher/Lamarck-14B-v0.2-experimental-GGUF", MessagesFormatterType.OPEN_CHAT],
     "Llama3.1-Reddit-Writer-8B.Q5_K_M.gguf": ["mradermacher/Llama3.1-Reddit-Writer-8B-GGUF", MessagesFormatterType.LLAMA_3],
     "Franken-MistressMaid-10.5B-v2.i1-Q4_K_M.gguf": ["mradermacher/Franken-MistressMaid-10.5B-v2-i1-GGUF", MessagesFormatterType.MISTRAL],

requirements.txt

@@ -9,7 +9,7 @@ gdown
 opencv-python
 huggingface_hub
 scikit-build-core
-https://github.com/abetlen/llama-cpp-python/releases/download/v0.2.90-cu124/llama_cpp_python-0.2.90-cp310-cp310-linux_x86_64.whl
+https://github.com/abetlen/llama-cpp-python/releases/download/v0.3.4-cu124/llama_cpp_python-0.3.4-cp310-cp310-linux_x86_64.whl
 git+https://github.com/Maximilian-Winter/llama-cpp-agent
 pybind11>=2.12
 rapidfuzz