Prompt and additional prompt

gradio_demo.py

@@ -319,7 +319,7 @@ def restore(
 
     if torch.cuda.device_count() == 0:
         gr.Warning('Set this space to GPU config to make it work.')
-        return None, None, None, None
+        return [noisy_image] * 2, [noisy_image] * 2, None, None
 
     if output_format == "input":
         if noisy_image is None:
@@ -327,6 +327,20 @@ def restore(
         else:
             output_format = noisy_image.format
 
+    if prompt is None:
+        prompt = ""
+
+    if a_prompt is None:
+        a_prompt = ""
+
+    if n_prompt is None:
+        n_prompt = ""
+
+    if prompt != "" and a_prompt != "":
+        a_prompt = prompt + ", " + a_prompt
+    else:
+        a_prompt = prompt + a_prompt
+    print("Final prompt: " + str(a_prompt))
     input_image = noisy_image if denoise_image is None else denoise_image
     if 1 < downscale:
         input_height, input_width, input_channel = np.array(input_image).shape
@@ -407,7 +421,10 @@ def restore(
     print(information)
 
     # Only one image can be shown in the slider
-    return [noisy_image] + [results[0]], gr.update(format = output_format, value = [noisy_image] + results), gr.update(value = information, visible = True), event_id
+    return [noisy_image] + [results[0]],
+    gr.update(format = output_format, value = [noisy_image] + results),
+    gr.update(value = information, visible = True),
+    event_id
 
 def load_and_reset(param_setting):
     print('load_and_reset ==>>')
@@ -448,7 +465,7 @@ def log_information(result_gallery):
     print('log_information')
     if result_gallery is not None:
         for i, result in enumerate(result_gallery):
-            print(result[0][0])
+            print(result[0])
 
 def on_select_result(result_gallery, evt: gr.SelectData):
     print('on_select_result')
@@ -487,6 +504,9 @@ title_html = """
 claim_md = """
 ## **Piracy**
 The images are not stored but the logs are saved during a month.
+## **How to get SUPIR**
+You can get SUPIR on HuggingFace by [https://huggingface.co/spaces/Fabrice-TIERCELIN/SUPIR?duplicate=true](duplicating this space) and set GPU.
+You can also install SUPIR on your computer following [https://huggingface.co/blog/MonsterMMORPG/supir-sota-image-upscale-better-than-magnific-ai](this tutorial).
 ## **Terms of use**
 By using this service, users are required to agree to the following terms: The service is a research preview intended for non-commercial use only. It only provides limited safety measures and may generate offensive content. It must not be used for any illegal, harmful, violent, racist, or sexual purposes. The service may collect user dialogue data for future research. Please submit a feedback to us if you get any inappropriate answer! We will collect those to keep improving our models. For an optimal experience, please use desktop computers for this demo, as mobile devices may compromise its quality.
 ## **License**
@@ -507,15 +527,8 @@ with gr.Blocks(title="SUPIR") as interface:
 
     input_image = gr.Image(label="Input", show_label=True, type="numpy", height=600, elem_id="image-input")
     with gr.Group():
-        prompt = gr.Textbox(label="Image description for LlaVa", value="", placeholder="A person, walking, in a town, Summer, photorealistic", lines=3, visible=False)
-        a_prompt = gr.Textbox(label="Image description",
-                              info="Help the AI understand what the image represents; describe as much as possible",
-                              value='Cinematic, High Contrast, highly detailed, taken using a Canon EOS R '
-                                    'camera, hyper detailed photo - realistic maximum detail, 32k, Color '
-                                    'Grading, ultra HD, extreme meticulous detailing, skin pore detailing, '
-                                    'hyper sharpness, perfect without deformations.',
-                              lines=3)
-        a_prompt_hint = gr.HTML("You can use a <a href='"'https://huggingface.co/spaces/MaziyarPanahi/llava-llama-3-8b'"'>LlaVa space</a> to auto-generate the description of your image.")
+        prompt = gr.Textbox(label="Image description", info="Help the AI understand what the image represents; describe as much as possible; I advise you to write in English as other languages may not be handled", value="", placeholder="A person, walking, in a town, Summer, photorealistic", lines=3)
+        prompt_hint = gr.HTML("You can use a <a href='"'https://huggingface.co/spaces/MaziyarPanahi/llava-llama-3-8b'"'>LlaVa space</a> to auto-generate the description of your image.")
         upscale = gr.Radio([["x1", 1], ["x2", 2], ["x3", 3], ["x4", 4], ["x5", 5], ["x6", 6], ["x7", 7], ["x8", 8]], label="Upscale factor", info="Resolution x1 to x8", value=2, interactive=True)
         output_format = gr.Radio([["*.png", "png"], ["*.webp", "webp"], ["*.jpeg", "jpeg"], ["*.gif", "gif"], ["*.bmp", "bmp"]], label="Image format for result", info="File extention", value="png", interactive=True)
 
@@ -531,6 +544,13 @@ with gr.Blocks(title="SUPIR") as interface:
         qs = gr.Textbox(label="Question", info="Ask LLaVa what description you want", value="Describe the image and its style in a very detailed manner. The image is a realistic photography, not an art painting.", lines=3)
 
     with gr.Accordion("Advanced options", open=False):
+        a_prompt = gr.Textbox(label="Additional image description",
+                              info="Completes the main image description",
+                              value='Cinematic, High Contrast, highly detailed, taken using a Canon EOS R '
+                                    'camera, hyper detailed photo - realistic maximum detail, 32k, Color '
+                                    'Grading, ultra HD, extreme meticulous detailing, skin pore detailing, '
+                                    'hyper sharpness, perfect without deformations.',
+                              lines=3)
         n_prompt = gr.Textbox(label="Anti image description",
                               info="Disambiguate by listing what the image does NOT represent",
                               value='painting, oil painting, illustration, drawing, art, sketch, anime, '
@@ -635,8 +655,8 @@ with gr.Blocks(title="SUPIR") as interface:
                 [
                     "./Examples/Example1.png",
                     None,
-                    None,
-                    "Group of people, walking, happy, in the street, photorealistic, 8k, extremely detailled, Cinematic, High Contrast, highly detailed, taken using a Canon EOS R camera, hyper detailed photo - realistic maximum detail, 32k, Color Grading, ultra HD, extreme meticulous detailing, skin pore detailing, hyper sharpness, perfect without deformations.",
+                    "Group of people, walking, happy, in the street, photorealistic, 8k, extremely detailled",
+                    "Cinematic, High Contrast, highly detailed, taken using a Canon EOS R camera, hyper detailed photo - realistic maximum detail, 32k, Color Grading, ultra HD, extreme meticulous detailing, skin pore detailing, hyper sharpness, perfect without deformations.",
                     "painting, oil painting, illustration, drawing, art, sketch, anime, cartoon, CG Style, 3D render, unreal engine, blurring, bokeh, ugly, dirty, messy, worst quality, low quality, frames, watermark, signature, jpeg artifacts, deformed, lowres, over-smooth",
                     1,
                     1024,
@@ -665,8 +685,8 @@ with gr.Blocks(title="SUPIR") as interface:
                 [
                     "./Examples/Example2.jpeg",
                     None,
-                    None,
-                    "The head of a tabby cat, in a house, photorealistic, 8k, extremely detailled, Cinematic, High Contrast, highly detailed, taken using a Canon EOS R camera, hyper detailed photo - realistic maximum detail, 32k, Color Grading, ultra HD, extreme meticulous detailing, skin pore detailing, hyper sharpness, perfect without deformations.",
+                    "The head of a tabby cat, in a house, photorealistic, 8k, extremely detailled",
+                    "Cinematic, High Contrast, highly detailed, taken using a Canon EOS R camera, hyper detailed photo - realistic maximum detail, 32k, Color Grading, ultra HD, extreme meticulous detailing, skin pore detailing, hyper sharpness, perfect without deformations.",
                     "painting, oil painting, illustration, drawing, art, sketch, anime, cartoon, CG Style, 3D render, unreal engine, blurring, bokeh, ugly, dirty, messy, worst quality, low quality, frames, watermark, signature, jpeg artifacts, deformed, lowres, over-smooth",
                     1,
                     1024,