Support dragdrop for URLs

AUTOMATIC1111 · Mar 15, 2024 · 8eaa7e9 · 8eaa7e9
1 parent 3e0146f
commit 8eaa7e9
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 14 deletions.
diff --git a/javascript/dragdrop.js b/javascript/dragdrop.js
@@ -56,6 +56,10 @@ function eventHasFiles(e) {
     return false;
 }
 
+function getEventUrl(e) {
+    return e?.dataTransfer?.getData('URL') || e?.dataTransfer?.getData('text/html')?.match(/(?:src|href)=["'](.*?)["']/)?.[1];
+}
+
 function dragDropTargetIsPrompt(target) {
     if (target?.placeholder && target?.placeholder.indexOf("Prompt") >= 0) return true;
     if (target?.parentNode?.parentNode?.className?.indexOf("prompt") > 0) return true;
@@ -76,21 +80,30 @@ window.document.addEventListener('dragover', e => {
 
 window.document.addEventListener('drop', e => {
     const target = e.composedPath()[0];
-    if (!eventHasFiles(e)) return;
+    const url = getEventUrl(e);
+    if (!eventHasFiles(e) && !url) return;
 
     if (dragDropTargetIsPrompt(target)) {
         e.stopPropagation();
         e.preventDefault();
 
-        let prompt_target = get_tab_index('tabs') == 1 ? "img2img_prompt_image" : "txt2img_prompt_image";
+        const isImg2img = get_tab_index('tabs') == 1;
+        let prompt_image_target = isImg2img ? "img2img_prompt_image" : "txt2img_prompt_image";
+        let prompt_url_target = isImg2img ? "img2img_prompt_url" : "txt2img_prompt_url";
 
-        const imgParent = gradioApp().getElementById(prompt_target);
+        const imgParent = gradioApp().getElementById(prompt_image_target);
+        const urlParent = gradioApp().getElementById(prompt_url_target);
         const files = e.dataTransfer.files;
         const fileInput = imgParent.querySelector('input[type="file"]');
-        if (fileInput) {
+        const urlInput = urlParent.querySelector('textarea');
+        if (files && fileInput) {
             fileInput.files = files;
             fileInput.dispatchEvent(new Event('change'));
         }
+        if (url && urlInput) {
+            urlInput.value = url;
+            urlInput.dispatchEvent(new Event('input'));
+        }
     }
 
     var targetImage = target.closest('[data-testid="image"]');

diff --git a/modules/images.py b/modules/images.py
@@ -772,18 +772,31 @@ def read_info_from_image(image: Image.Image) -> tuple[str | None, dict]:
 def image_data(data):
     import gradio as gr
 
-    try:
-        image = read(io.BytesIO(data))
-        textinfo, _ = read_info_from_image(image)
-        return textinfo, None
-    except Exception:
-        pass
+    if not data:
+        return gr.update(), None
 
-    try:
-        text = data.decode('utf8')
-        assert len(text) < 10000
-        return text, None
+    if isinstance(data, bytes):
+        try:
+            image = Image.open(io.BytesIO(data))
+            textinfo, _ = read_info_from_image(image)
+            return textinfo, None
+        except Exception:
+            pass
 
+        try:
+            text = data.decode('utf8')
+            assert len(text) < 10000
+            return text, None
+        except Exception:
+            pass
+
+    import requests
+    try:
+        r = requests.get(data, timeout=5)
+        if r.status_code == 200:
+            image = Image.open(io.BytesIO(r.content))
+            textinfo, _ = read_info_from_image(image)
+            return textinfo, None
     except Exception:
         pass
 

diff --git a/modules/ui_toprow.py b/modules/ui_toprow.py
@@ -82,6 +82,7 @@ def create_prompts(self):
             with gr.Row(elem_id=f"{self.id_part}_prompt_row", elem_classes=["prompt-row"]):
                 self.prompt = gr.Textbox(label="Prompt", elem_id=f"{self.id_part}_prompt", show_label=False, lines=3, placeholder="Prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Esc to interrupt)", elem_classes=["prompt"])
                 self.prompt_img = gr.File(label="", elem_id=f"{self.id_part}_prompt_image", file_count="single", type="binary", visible=False)
+                self.prompt_url = gr.Textbox(label="", elem_id=f"{self.id_part}_prompt_url", visible=False)
 
             with gr.Row(elem_id=f"{self.id_part}_neg_prompt_row", elem_classes=["prompt-row"]):
                 self.negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{self.id_part}_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt\n(Press Ctrl+Enter to generate, Alt+Enter to skip, Esc to interrupt)", elem_classes=["prompt"])
@@ -93,6 +94,13 @@ def create_prompts(self):
             show_progress=False,
         )
 
+        self.prompt_url.input(
+            fn=modules.images.image_data,
+            inputs=[self.prompt_url],
+            outputs=[self.prompt, self.prompt_url],
+            show_progress=False,
+        )
+
     def create_submit_box(self):
         with gr.Row(elem_id=f"{self.id_part}_generate_box", elem_classes=["generate-box"] + (["generate-box-compact"] if self.is_compact else []), render=not self.is_compact) as submit_box:
             self.submit_box = submit_box