Update app.py

app.py

@@ -8,7 +8,7 @@ import requests
 import io
 import os
 from PIL import Image
-import spaces
+#import spaces
 import numpy as np
 import cv2
 from pyzxing import BarCodeReader
@@ -61,7 +61,7 @@ def load_models_on_launch():
     loaded_controlnet = ControlNetModel.from_pretrained(
         controlnet_path,
         torch_dtype=torch.float16
-    ).to("cuda")
+    ).to("mps")
 
     diffusion_path = snapshot_download(DIFFUSION_MODELS["GhostMix"])
     loaded_pipe = StableDiffusionControlNetImg2ImgPipeline.from_pretrained(
@@ -69,7 +69,7 @@ def load_models_on_launch():
         controlnet=loaded_controlnet,
         torch_dtype=torch.float16,
         safety_checker=None,
-    ).to("cuda")
+    ).to("mps")
     print("Models loaded successfully!")
 
 # Modify the load_models function to use global variables
@@ -174,7 +174,7 @@ def invert_displayed_image(image):
         return Image.fromarray(inverted)
     return inverted
 
-@spaces.GPU()
+#@spaces.GPU()
 def inference(
     qr_code_content: str,
     prompt: str,
@@ -184,7 +184,6 @@ def inference(
     strength: float = 0.8,
     seed: int = -1,
     init_image: Image.Image | None = None,
-    qrcode_image: Image.Image | None = None,
     use_qr_code_as_init_image = True,
     sampler = "DPM++ Karras SDE",
     bg_color: str = "white",
@@ -205,8 +204,8 @@ def inference(
         if prompt is None or prompt == "":
             raise gr.Error("Prompt is required")
 
-        if qrcode_image is None and qr_code_content == "":
-            raise gr.Error("QR Code Image or QR Code Content is required")
+        if qr_code_content == "":
+            raise gr.Error("QR Code Content is required")
 
         pipe.scheduler = SAMPLER_MAP[sampler](pipe.scheduler.config)
 
@@ -214,22 +213,18 @@ def inference(
             seed = torch.randint(0, 2**32 - 1, (1,)).item()
         generator = torch.manual_seed(seed)
 
-        if qr_code_content != "" or qrcode_image.size == (1, 1):
-            print("Generating QR Code from content")
-            qr = qrcode.QRCode(
-                version=1,
-                error_correction=qrcode.constants.ERROR_CORRECT_H,
-                box_size=10,
-                border=4,
-            )
-            qr.add_data(qr_code_content)
-            qr.make(fit=True)
-
-            qrcode_image = qr.make_image(fill_color=qr_color, back_color=bg_color)
-            qrcode_image = resize_for_condition_image(qrcode_image, 768)
-        else:
-            print("Using QR Code Image")
-            qrcode_image = resize_for_condition_image(qrcode_image, 768)
+        print("Generating QR Code from content")
+        qr = qrcode.QRCode(
+            version=1,
+            error_correction=qrcode.constants.ERROR_CORRECT_H,
+            box_size=10,
+            border=4,
+        )
+        qr.add_data(qr_code_content)
+        qr.make(fit=True)
+
+        qrcode_image = qr.make_image(fill_color=qr_color, back_color=bg_color)
+        qrcode_image = resize_for_condition_image(qrcode_image, 768)
 
         # Determine which image to use as init_image and control_image
         if use_qr_code_as_init_image:
@@ -286,240 +281,133 @@ with gr.Blocks(theme='Hev832/Applio') as blocks:
         """
         ![Yamamoto Logo](https://cdn-uploads.huggingface.co/production/uploads/64740cf7485a7c8e1bd51ac9/_VyYxp5qE_nRZ_LJqBxmL.webp)
         # 🎨 Yamamoto QR Code Art Generator
-        ## Transform Your QR Codes into Brand Masterpieces
-        Welcome to Yamamoto's innovative QR Code Art Generator! This cutting-edge tool empowers our creative team to craft 
-        visually stunning, on-brand QR codes that perfectly blend functionality with artistic expression.
-        ## 🚀 How It Works:
-        1. **Enter Your QR Code Content**: Start by inputting the URL or text for your QR code.
-        2. **Craft Your Prompt**: Describe the artistic style or theme you envision for your QR code.
-        3. **Fine-tune with Advanced Settings**: Adjust parameters to perfect your creation (see tips below).
-        4. **Generate and Iterate**: Click 'Run' to create your art, then refine as needed.
-        ## 🌟 Tips for Spectacular Results:
-        - **Artistic Freedom**: Set between 0.8 and 0.95 for a balance of creativity and scannability.
-        - **QR Code Visibility**: Aim for 0.6 to 2.0 to ensure your code is both artistic and functional.
-        - **Prompt Crafting**: Use vivid, specific descriptions that align with your brand identity.
-        - **Experimentation**: Don't hesitate to try different settings and prompts to find your perfect style!
-        ## 🎭 Prompt Ideas to Spark Your Creativity:
-        - "A serene Japanese garden with cherry blossoms and a koi pond"
-        - "A futuristic cityscape with neon lights and flying cars"
-        - "An abstract painting with swirling colors and geometric shapes"
-        - "A vintage-style travel poster featuring iconic landmarks"
-        Remember, the magic lies in the details of your prompt and the fine-tuning of your settings. 
-        Happy creating!
+        Transform Your QR Codes into Brand Masterpieces
         """
     )
-    with gr.Row():
-        with gr.Column():
-            qr_code_content = gr.Textbox(
-                label="QR Code Content",
-                placeholder="Enter URL or text for your QR code",
-                info="This is what your QR code will link to or display when scanned.",
-            )
-
-            prompt = gr.Textbox(
-                label="Artistic Prompt",
-                placeholder="Describe the style or theme for your QR code art",
-                value="A high-resolution, photo-realistic minimalist rendering of Mount Fuji, depicted as a sharp, semi-realistic silhouette of a mountain range on the horizon. The mountain evokes strength and motion with clean, crisp lines and a sense of natural flow. The scene should feature detailed snow textures, subtle highlights on the mountain ridges, and a powerful yet serene atmosphere. The rendering should emphasize the strength of the mountain with a focus on clarity and precision in both texture and light. (Sharp outlines:1.5), (Photo-realistic:1.4), (Detailed textures:1.3), (Minimalist:1.3), (Semi-realistic:1.3), (Monochrome contrast:1.2), (Crisp detail:1.2), (Evoking strength:1.2), inspired by traditional Japanese woodblock prints, nature photography, and minimalist design principles.",
-                info="Be specific and creative! This guides the AI in creating your unique QR code art.",
-            )
-            negative_prompt = gr.Textbox(
-                label="Elements to Avoid",
-                placeholder="Describe what you don't want in the image",
-                value="ugly, disfigured, low quality, blurry, nsfw, bad_pictures, (bad_prompt_version2:0.8), EasyNegative, 3d, cartoon, anime, sketches, (worst quality:2), (low quality:2), (normal quality:2), lowres, normal quality, ((monochrome)), ((grayscale)), poorly drawn, distorted, overexposed, flat shading, bad proportions, deformed, pixelated, messy details, lack of contrast, unrealistic textures, bad anatomy, rough edges, low resolution, text artifacts.",
-                info="List elements or styles you want to avoid in your QR code art.",
-            )
-
-            run_btn = gr.Button("🎨 Create Your QR Art", variant="primary")  
-            
-            with gr.Accordion(label="Use Your Own Image as a Reference", open=True, visible=True) as init_image_acc:
-                init_image = gr.Image(label="Reference Image", type="pil")
-                with gr.Row():
-                    use_qr_code_as_init_image = gr.Checkbox(
-                        label="Uncheck to use your own image for generation", 
-                        value=True, 
-                        interactive=True,
-                        info="Allows you to use your own image for generation, otherwise a generic QR Code is created automatically as the base image"
-                    )
-                    invert_init_image_button = gr.Button("Invert Init Image")
-            
-            with gr.Accordion(label="QR Code Image (Optional)", open=False, visible=False):
-                qr_code_image = gr.Image(
-                    label="QR Code Image (Optional). Leave blank to automatically generate QR code",
-                    type="pil",
-                )
 
-                
-            with gr.Accordion("Set Custom QR Code Colors", open=False):
-                bg_color = gr.ColorPicker(
-                    label="Background Color", 
-                    value="#FFFFFF",
-                    info="Choose the background color for the QR code"
-                )
-                qr_color = gr.ColorPicker(
-                    label="QR Code Color", 
-                    value="#000000",
-                    info="Choose the color for the QR code pattern"
-                )
-                invert_final_image = gr.Checkbox(
-                    label="Invert Final Image", 
-                    value=False,
-                    info="Check this to invert the colors of the final image",
-                    visible=False,
-                )
-            with gr.Accordion("AI Model Selection", open=False):
-                controlnet_model_dropdown = gr.Dropdown(
-                    choices=list(CONTROLNET_MODELS.keys()),
-                    value="QR Code Monster",
-                    label="ControlNet Model",
-                    info="Select the ControlNet model for QR code generation"
-                )
-                diffusion_model_dropdown = gr.Dropdown(
-                    choices=list(DIFFUSION_MODELS.keys()),
-                    value="GhostMix",
-                    label="Diffusion Model",
-                    info="Select the main diffusion model for image generation"
-                )
-                
-        with gr.Column():
-            result_image = gr.Image(label="Your Artistic QR Code")
-            used_seed = gr.Number(label="Seed Used", interactive=False)
-            
-            with gr.Row(visible=False):
-                scan_button = gr.Button("Verify QR Code Works")
-                scan_result = gr.Textbox(label="Validation Result of QR Code", interactive=False)
-
-
-
-            gr.Markdown(
-                """
-                ### 🔍 Analyzing Your Creation
-                - Is the QR code scannable? Check with your phone camera to see if it can scan it.
-                - If not scannable, use the Brightness, Contrast, and Saturation sliders to optimize the QR code for scanning.
-                - Does the art style match your prompt? If not, try adjusting the 'Prompt Adherence'.
-                - Want more artistic flair? Increase the 'Artistic Freedom'.
-                - Need a clearer QR code? Raise the 'QR Code Visibility'.
-                """
-            )
-            
+    with gr.Tabs():
+        with gr.TabItem("1. Input & Design"):
             with gr.Row():
-                brightness = gr.Slider(minimum=0.1, maximum=2.0, step=0.1, value=1.0, label="Brightness")
-                contrast = gr.Slider(minimum=0.1, maximum=2.0, step=0.1, value=1.0, label="Contrast")
-                saturation = gr.Slider(minimum=0.1, maximum=2.0, step=0.1, value=1.0, label="Saturation")
-            with gr.Row():
-                invert_button = gr.Button("Invert Image")
-
-            with gr.Accordion("Advanced Art Controls", open=True):
-                with gr.Row():
-                    controlnet_conditioning_scale = gr.Slider(
-                        minimum=0.0,
-                        maximum=5.0,
-                        step=0.01,
-                        value=2,
-                        label="QR Code Visibility in Image",
+                with gr.Column(scale=1):
+                    qr_code_content = gr.Textbox(
+                        label="QR Code Content",
+                        placeholder="Enter URL or text for your QR code",
+                        info="This is what your QR code will link to or display when scanned.",
                     )
-                    with gr.Accordion("How Much QR Code Visibility is in Final Image (Click For Explanation)", open=False):
-                        gr.Markdown(
-                            """
-                            **QR Code Visibility** determines how much the QR code itself stands out in the final design. Think of it like balancing between how "artistic" the image looks and how "functional" the QR code is.
-                    
-                            - **Low settings (0.0-1)**: If you choose a lower value, the QR code will blend more into the art, and it might be hard to scan with a phone. This setting is great if you want the image to look amazing, but you might lose some of the scannability. Try this if you care more about art and less about the QR code being easily recognized.
-                            
-                            - **Medium settings (1-3)**: This is the sweet spot where the QR code remains clearly visible while still blending in with the art. You can still scan it easily with a phone, but it looks more creative. For most users, setting it around **1.1** is a great start to balance both art and function.
-                    
-                            - **High settings (3-5.0)**: If you need to make sure that the QR code is super easy to scan, even if it means the image looks less like art and more like a regular QR code, then choose a higher value. This is ideal when functionality is the main goal, and the artistic side can take a backseat.
-                            
-                            Start with **1.3** if you're unsure, and adjust up or down depending on whether you want the QR code to be more artistic or more functional.
-                            """
-                        )
-                
-                with gr.Row():
-                    strength = gr.Slider(
-                        minimum=0.0, 
-                        maximum=1.0, 
-                        step=0.01, 
-                        value=0.9, 
-                        label="Artistic Freedom for the AI When Generating",
+                    prompt = gr.Textbox(
+                        label="Artistic Prompt",
+                        placeholder="Describe the style or theme for your QR code art",
+                        value="A high-resolution, photo-realistic minimalist rendering of Mount Fuji, depicted as a sharp, semi-realistic silhouette of a mountain range on the horizon. The mountain evokes strength and motion with clean, crisp lines and a sense of natural flow. The scene should feature detailed snow textures, subtle highlights on the mountain ridges, and a powerful yet serene atmosphere. The rendering should emphasize the strength of the mountain with a focus on clarity and precision in both texture and light. (Sharp outlines:1.5), (Photo-realistic:1.4), (Detailed textures:1.3), (Minimalist:1.3), (Semi-realistic:1.3), (Monochrome contrast:1.2), (Crisp detail:1.2), (Evoking strength:1.2), inspired by traditional Japanese woodblock prints, nature photography, and minimalist design principles.",
+                        info="Be specific and creative! This guides the AI in creating your unique QR code art.",
                     )
-                    with gr.Accordion("How Much Artistic Freedom the AI has When Generating Image (Click For Explanation)", open=False):
-                        gr.Markdown(
-                            """
-                            **Artistic Freedom** controls how much the AI is allowed to change the QR code's look to match your description. It's like telling the AI how creative it can get with your QR code:
-                    
-                            - **Low settings (0.0-0.3)**: If you set this low, the AI will make small changes and your QR code will look more like a regular, plain QR code. This is useful if you want something that is still creative but not too wild, keeping it simple and easy to scan.
-                    
-                            - **Medium settings (0.4-0.7)**: Here, the AI will add more artistic touches but keep the QR code recognizable. You get the best of both worlds—your QR code will have some creative flair, but it will still be easy to scan. For most cases, setting it to **0.6** is a great way to keep the code functional and artistic.
-                    
-                            - **High settings (0.8-1.0)**: If you set this high, the AI will go all-out creative. The QR code will look amazing, but it might be difficult to scan because the art can start to take over the code. This setting is perfect if you're aiming for a highly creative piece of art and don't mind if it's a bit harder to scan. Start at **0.9** to explore creative but functional designs.
-                            """
-                        )
-                
-                with gr.Row():
-                    guidance_scale = gr.Slider(
-                        minimum=0.0,
-                        maximum=50.0,
-                        step=0.25,
-                        value=7.5,
-                        label="How Closely the AI Follows the Prompt",
- 
-                    )
-                    with gr.Accordion("How Closely the AI Follows the Prompt (Click For Explanation)", open=False):
-                        gr.Markdown(
-                            """
-                            **Follow the Prompt** tells the AI how closely it should follow your description when creating the QR code art. Think of it like giving the AI instructions on how strict or flexible it can be with your design ideas:
-                    
-                            - **Low settings (0-5)**: If you choose a lower value, the AI has more freedom to get creative on its own and may not stick too closely to your description. This is great if you want to see how the AI interprets your ideas in unexpected ways.
-                    
-                            - **Medium settings (5-15)**: This is a good balance where the AI will mostly follow your prompt but will also add some of its own creative touches. If you want to see some surprises but still want the design to look like what you described, start at around **7.5**.
-                    
-                            - **High settings (15+)**: If you choose a higher value, the AI will stick very closely to what you wrote in the description. This is good if you have a very specific idea and don't want the AI to change much. Just keep in mind that this might limit the AI's creativity.
-                            
-                            Start at **7.5** for a balanced approach where the AI follows your ideas but still adds some artistic flair.
-                            """
+                    negative_prompt = gr.Textbox(
+                        label="Elements to Avoid",
+                        placeholder="Describe what you don't want in the image",
+                        value="ugly, disfigured, low quality, blurry, nsfw, bad_pictures, (bad_prompt_version2:0.8), EasyNegative, 3d, cartoon, anime, sketches, (worst quality:2), (low quality:2), (normal quality:2), lowres, normal quality, ((monochrome)), ((grayscale)), poorly drawn, distorted, overexposed, flat shading, bad proportions, deformed, pixelated, messy details, lack of contrast, unrealistic textures, bad anatomy, rough edges, low resolution, text artifacts.",
+                        info="List elements or styles you want to avoid in your QR code art.",
                     )
                 
-                with gr.Row():
-                    sampler = gr.Dropdown(
-                        choices=list(SAMPLER_MAP.keys()), 
-                        value="DPM++ Karras SDE", 
-                        label="Art Style Used to Create the Image",
-
-                    )
-                    with gr.Accordion("Details on Art Style the AI Uses to Create the Image (Click For Explanation)", open=False):
-                        gr.Markdown(
-                            """
-                            **Art Style** changes how the AI creates the image, using different methods (or "samplers"). Each method has a different effect on how detailed or artistic the final QR code looks:
+                with gr.Column(scale=1):
+                    with gr.Accordion("QR Code Customization", open=True):
+                        bg_color = gr.ColorPicker(
+                            label="Background Color", 
+                            value="#FFFFFF",
+                            info="Choose the background color for the QR code"
+                        )
+                        qr_color = gr.ColorPicker(
+                            label="QR Code Color", 
+                            value="#000000",
+                            info="Choose the color for the QR code pattern"
+                        )
                     
-                            - **DPM++ Karras SDE**: This is a great all-around option for creating high-quality, detailed images. It's a good place to start if you want a balance of sharpness and creativity.
+                    with gr.Accordion("Use Your Own Image as a Reference", open=False):
+                        init_image = gr.Image(label="Reference Image", type="pil")
+                        use_qr_code_as_init_image = gr.Checkbox(
+                            label="Use QR code as base image", 
+                            value=True, 
+                            interactive=True,
+                            info="Uncheck to use your own image for generation"
+                        )
+                        invert_init_image_button = gr.Button("Invert Init Image")
+
+        with gr.TabItem("2. Advanced Settings"):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    with gr.Accordion("Art Generation Controls", open=True):
+                        controlnet_conditioning_scale = gr.Slider(
+                            minimum=0.0, maximum=5.0, step=0.01, value=2,
+                            label="QR Code Visibility in Image",
+                        )
+                        strength = gr.Slider(
+                            minimum=0.0, maximum=1.0, step=0.01, value=0.9,
+                            label="Artistic Freedom for the AI",
+                        )
+                        guidance_scale = gr.Slider(
+                            minimum=0.0, maximum=50.0, step=0.25, value=7.5,
+                            label="How closely the AI follows the Prompt",
+                        )
                     
-                            - **Euler**: This method creates very sharp, detailed images, making the QR code look crisp and clear. Choose this if you want a precise, well-defined design.
+                    with gr.Accordion("Model Selection", open=True):
+                        controlnet_model_dropdown = gr.Dropdown(
+                            choices=list(CONTROLNET_MODELS.keys()),
+                            value="QR Code Monster",
+                            label="ControlNet Model",
+                            info="Select the ControlNet model for QR code generation"
+                        )
+                        diffusion_model_dropdown = gr.Dropdown(
+                            choices=list(DIFFUSION_MODELS.keys()),
+                            value="GhostMix",
+                            label="Diffusion Model",
+                            info="Select the main diffusion model for image generation"
+                        )
+
+                with gr.Column(scale=1):
+                    with gr.Accordion("Generation Settings", open=True):
+                        sampler = gr.Dropdown(
+                            choices=list(SAMPLER_MAP.keys()), 
+                            value="DPM++ Karras SDE", 
+                            label="Art Style the AI uses to create the image",
+                        )
+                        seed = gr.Slider(
+                            minimum=-1, maximum=9999999999, step=1, value=-1,
+                            label="Creative Seed for the Image Generation",
+                            randomize=False,                    
+                        )
                     
-                            - **DDIM**: This method is better if you want the QR code to have a more artistic, abstract style. It's great for when you want the QR code to look like a piece of modern art.
-                            
-                            Feel free to experiment with different samplers to see what works best for the look you're going for!
-                            """
+                    with gr.Accordion("Additional Options", open=False):
+                        invert_final_image = gr.Checkbox(
+                            label="Invert Final Image", 
+                            value=False,
+                            info="Check this to invert the colors of the final image",
                         )
+
+        with gr.TabItem("3. Generate & Refine"):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    run_btn = gr.Button("🎨 Create Your QR Art", variant="primary")
+                    result_image = gr.Image(label="Your Artistic QR Code")
+                    used_seed = gr.Number(label="Seed Used", interactive=False)
                 
-                with gr.Row():
-                    seed = gr.Slider(
-                        minimum=-1,
-                        maximum=9999999999,
-                        step=1,
-                        value=-1,
-                        label="Creative Seed for the Image Generation",
-                        randomize=False,                    
-                    )
-                    with gr.Accordion("How Creative Seed Works for Generating New and Unique Images (Click For Explanation)", open=False):
-                        gr.Markdown(
-                            """
-                            **Creative Seed** controls whether the AI creates a completely new design each time or sticks to a specific design. Think of it like a recipe: with the same seed number, you get the same "recipe" for your QR code every time.
+                with gr.Column(scale=1):
+                    with gr.Accordion("Image Adjustment", open=True):
+                        brightness = gr.Slider(minimum=0.1, maximum=2.0, step=0.1, value=1.0, label="Brightness")
+                        contrast = gr.Slider(minimum=0.1, maximum=2.0, step=0.1, value=1.0, label="Contrast")
+                        saturation = gr.Slider(minimum=0.1, maximum=2.0, step=0.1, value=1.0, label="Saturation")
+                        invert_button = gr.Button("Invert Image")
                     
-                            - **-1**: This setting makes the AI create something completely new every time you run it. Use this if you want to explore different design ideas with each attempt.
-                    
-                            - **Any other number**: If you set a specific number, the AI will always create the same image based on that number. This is useful if you find a design you like and want to recreate it exactly.
-                    
-                            Try **-1** if you want to explore and generate different designs. If you find something you really love, write down the seed number and use it again to recreate the same design.
-                            """
-                        )
+                    with gr.Accordion("QR Code Verification", open=True):
+                        scan_button = gr.Button("Verify QR Code Works")
+                        scan_result = gr.Textbox(label="Validation Result of QR Code", interactive=False)
+
+    gr.Markdown(
+        """
+        ### 🔍 Tips for Optimizing Your QR Art
+        - If the QR code isn't scannable, try adjusting Brightness, Contrast, and Saturation.
+        - For more artistic flair, increase 'Artistic Freedom' in Advanced Settings.
+        - To make the QR code clearer, raise 'QR Code Visibility' in Advanced Settings.
+        - Experiment with different prompts and settings to find your perfect style!
+        """
+    )
 
     def scan_and_display(image):
         if image is None:
@@ -581,7 +469,6 @@ with gr.Blocks(theme='Hev832/Applio') as blocks:
             strength,
             seed,
             init_image,
-            qr_code_image,
             use_qr_code_as_init_image,
             sampler,
             bg_color,