Commit 8ca50f82 authored by AUTOMATIC's avatar AUTOMATIC
Browse files

fix broken prompts from file

parent f5ea1e9d
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@
 * Fix MPS on PyTorch 2.0.1, Intel Macs
 * Fix MPS on PyTorch 2.0.1, Intel Macs
 * make it so that custom context menu from contextMenu.js only disappears after user's click, ignoring non-user click events
 * make it so that custom context menu from contextMenu.js only disappears after user's click, ignoring non-user click events
 * prevent Reload UI button/link from reloading the page when it's not yet ready
 * prevent Reload UI button/link from reloading the page when it's not yet ready
 * fix prompts from file script failing to read contents from a drag/drop file




## 1.1.1
## 1.1.1
+5 −6
Original line number Original line Diff line number Diff line
@@ -100,10 +100,9 @@ def cmdargs(line):


def load_prompt_file(file):
def load_prompt_file(file):
    if file is None:
    if file is None:
        lines = []
        return None, gr.update(), gr.update(lines=7)
    else:
    else:
        lines = [x.strip() for x in file.decode('utf8', errors='ignore').split("\n")]
        lines = [x.strip() for x in file.decode('utf8', errors='ignore').split("\n")]

        return None, "\n".join(lines), gr.update(lines=7)
        return None, "\n".join(lines), gr.update(lines=7)




@@ -118,12 +117,12 @@ class Script(scripts.Script):
        prompt_txt = gr.Textbox(label="List of prompt inputs", lines=1, elem_id=self.elem_id("prompt_txt"))
        prompt_txt = gr.Textbox(label="List of prompt inputs", lines=1, elem_id=self.elem_id("prompt_txt"))
        file = gr.File(label="Upload prompt inputs", type='binary', elem_id=self.elem_id("file"))
        file = gr.File(label="Upload prompt inputs", type='binary', elem_id=self.elem_id("file"))


        file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt])
        file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt], show_progress=False)


        # We start at one line. When the text changes, we jump to seven lines, or two lines if no \n.
        # We start at one line. When the text changes, we jump to seven lines, or two lines if no \n.
        # We don't shrink back to 1, because that causes the control to ignore [enter], and it may
        # We don't shrink back to 1, because that causes the control to ignore [enter], and it may
        # be unclear to the user that shift-enter is needed.
        # be unclear to the user that shift-enter is needed.
        prompt_txt.change(lambda tb: gr.update(lines=7) if ("\n" in tb) else gr.update(lines=2), inputs=[prompt_txt], outputs=[prompt_txt])
        prompt_txt.change(lambda tb: gr.update(lines=7) if ("\n" in tb) else gr.update(lines=2), inputs=[prompt_txt], outputs=[prompt_txt], show_progress=False)
        return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]
        return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]


    def run(self, p, checkbox_iterate, checkbox_iterate_batch, prompt_txt: str):
    def run(self, p, checkbox_iterate, checkbox_iterate_batch, prompt_txt: str):