Merge pull request #10 from GustavSO/dev

Empty clipboard bug + minor errors

scripts/UI/card.py

@@ -14,9 +14,6 @@
 class Card:
     def __init__(
         self,
-        title="name_placeholder",
-        creator="creator_placeholder",
-        type="type_placeholder",
         visibility=True,
     ) -> None:
         self.models: list[Model] = None
@@ -103,6 +100,10 @@ def get_components(self):
         ]
 
     def get_updates(self):
+        # If no model is selected, don't update the UI
+        if not self.selected_model:
+            return [gr.update() for _ in range(10)]
+
         name = namer.format_filename(
             opts.mm_auto_naming_formatting, self.selected_model
         )
@@ -150,7 +151,9 @@ def update_gallery(self):
     def change_model(self, evt: gr.SelectData):
         self.selected_model = self.models[evt.index]
         if len(self.selected_model.images) > self.selected_image_index:
-            self.selected_image = self.selected_model.images[self.selected_image_index][0]
+            self.selected_image = self.selected_model.images[self.selected_image_index][
+                0
+            ]
         else:
             self.selected_image = self.selected_model.images[0][0]
         return self.get_updates()

scripts/UI/single_model_page.py

@@ -1,5 +1,5 @@
 import gradio as gr
-from tkinter import Tk
+from tkinter import Tk, TclError
 from modules import shared
 from scripts.mm_libs import downloader, loader
 from scripts.mm_libs.debug import *
@@ -13,16 +13,17 @@ def fetch(input):
             d_info("Testing URL found. Using it as input.")
             input = shared.opts.mm_testing_model_url
         elif shared.opts.mm_auto_paste:
-            input = Tk().clipboard_get()
+            try:
+                input = Tk().clipboard_get()
+            except TclError:
+                d_warn("Clipboard is empty, using current input as URL")
+                return input
 
         models = downloader.fetch(input)
         if models:
             model_card.insert_models(models)
-            return model_card.get_updates() + [input]
-        else:
-            return gr.Textbox(value=input)
-
-
+        return input
+
     with gr.Row():
         model_url_input = gr.Textbox(
             placeholder="Civitai URL or model ID",
@@ -40,7 +41,7 @@ def fetch(input):
     fetch_btn.click(
         fn=fetch,
         inputs=model_url_input,
-        outputs=model_card.get_components() + [model_url_input],
+        outputs=model_url_input,
+    ).then(
+        fn=model_card.get_updates, outputs=model_card.get_components()
     ).then(fn=model_card.update_gallery, outputs=model_card.model_gallery)
-
-

scripts/mm_libs/debug.py

@@ -17,9 +17,10 @@ def d_error(text):
     timestamp = datetime.now().strftime('%H:%M:%S:%f')[:-3]
     if opts.mm_print_errors:
         print(f"\033[91m[Model Manager ({timestamp})]\033[0m {text}")
-    gr.Error(text)
+    raise gr.Error(text)
 
 def d_info(text):
     timestamp = datetime.now().strftime('%H:%M:%S:%f')[:-3]
-    print(f"\033[92m[Model Manager ({timestamp})]\033[0m {text}")
+    if opts.mm_print_info:
+        print(f"\033[92m[Model Manager ({timestamp})]\033[0m {text}")
     gr.Info(text)