Update app.py

app.py

@@ -12,6 +12,7 @@ import spaces
 import numpy as np
 import cv2
 from pyzxing import BarCodeReader
+import tempfile
 
 from diffusers import (
     StableDiffusionPipeline,
@@ -33,14 +34,14 @@ qrcode_generator = qrcode.QRCode(
 )
 
 controlnet = ControlNetModel.from_pretrained(
-    #"monster-labs/control_v1p_sd15_qrcode_monster",
-    "DionTimmer/controlnet_qrcode-control_v1p_sd15", 
+    "monster-labs/control_v1p_sd15_qrcode_monster",
+    #"DionTimmer/controlnet_qrcode-control_v1p_sd15", 
     torch_dtype=torch.float16
 ).to("cuda")
 
 pipe = StableDiffusionControlNetImg2ImgPipeline.from_pretrained(
-    "digiplay/GhostMixV1.2VAE",
-    #"benjamin-paine/stable-diffusion-v1-5",
+    #"digiplay/GhostMixV1.2VAE",
+    "benjamin-paine/stable-diffusion-v1-5",
     controlnet = controlnet,
     torch_dtype = torch.float16,
     safety_checker = None,
@@ -80,34 +81,59 @@ def scan_qr_code(image):
     # Convert to numpy array
     np_image = np.array(gray_image)
     
+    # Preprocess the image
+    _, binary_image = cv2.threshold(np_image, 128, 255, cv2.THRESH_BINARY | cv2.THRESH_OTSU)
+    
+    # List to store successful scans
+    successful_scans = []
+    
     # Method 1: Using qrcode library
     try:
         qr = qrcode.QRCode()
         qr.add_data('')
         qr.decode(gray_image)
-        return qr.data.decode('utf-8')
-    except Exception:
-        pass
+        successful_scans.append(qr.data.decode('utf-8'))
+    except Exception as e:
+        print(f"qrcode library failed: {str(e)}")
     
     # Method 2: Using OpenCV
     try:
         qr_detector = cv2.QRCodeDetector()
         retval, decoded_info, points, straight_qrcode = qr_detector.detectAndDecodeMulti(np_image)
         if retval:
-            return decoded_info[0]
-    except Exception:
-        pass
+            successful_scans.extend(decoded_info)
+    except Exception as e:
+        print(f"OpenCV failed: {str(e)}")
     
-    # Method 3: Fallback to zxing-cpp
+    # Method 3: Using zxing-cpp
     try:
         reader = BarCodeReader()
         results = reader.decode(np_image)
         if results:
-            return results[0].parsed
-    except Exception:
-        pass
+            successful_scans.extend([result.parsed for result in results])
+        
+        # If no results, try with the binary image
+        if not results:
+            results = reader.decode(binary_image)
+            if results:
+                successful_scans.extend([result.parsed for result in results])
+    except Exception as e:
+        print(f"zxing-cpp failed: {str(e)}")
+    
+    # If still no successful scans, try saving the image and scanning from file
+    if not successful_scans:
+        try:
+            with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as temp_file:
+                image.save(temp_file.name)
+                reader = BarCodeReader()
+                results = reader.decode(temp_file.name)
+                if results:
+                    successful_scans.extend([result.parsed for result in results])
+            os.unlink(temp_file.name)
+        except Exception as e:
+            print(f"Temporary file scanning failed: {str(e)}")
     
-    return None
+    return successful_scans[0] if successful_scans else None
 
 @spaces.GPU()
 def inference(
@@ -175,7 +201,7 @@ def inference(
 
 
 
-with gr.Blocks(theme='Hev832/Applio') as blocks:
+with gr.Blocks(theme=gr.themes.Monochrome()) as blocks:
     gr.Markdown(
         """
         ![Yamamoto Logo](https://cdn-uploads.huggingface.co/production/uploads/64740cf7485a7c8e1bd51ac9/_VyYxp5qE_nRZ_LJqBxmL.webp)
@@ -252,7 +278,7 @@ with gr.Blocks(theme='Hev832/Applio') as blocks:
                     minimum=0.0,
                     maximum=5.0,
                     step=0.01,
-                    value=1.3,
+                    value=1.5,
                     label="QR Code Visibility",
                 )
                 gr.Markdown(
@@ -261,9 +287,9 @@ with gr.Blocks(theme='Hev832/Applio') as blocks:
             
                     - **Low settings (0.0-0.5)**: 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 (0.6-1.5)**: 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.
+                    - **Medium settings (0.6-2)**: 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 (1.6-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.
+                    - **High settings (2-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.
                     """
@@ -292,7 +318,7 @@ with gr.Blocks(theme='Hev832/Applio') as blocks:
                     minimum=0.0,
                     maximum=50.0,
                     step=0.25,
-                    value=7.5,
+                    value=10,
                     label="Follow the Prompt",
                 )
                 gr.Markdown(
@@ -372,11 +398,14 @@ with gr.Blocks(theme='Hev832/Applio') as blocks:
         if image is None:
             return "No image to scan"
         
-        scanned_text = scan_qr_code(image)
-        if scanned_text:
-            return f"Scanned successfully: {scanned_text}"
-        else:
-            return "Failed to scan QR code. Try adjusting the settings for better visibility."
+        try:
+            scanned_text = scan_qr_code(image)
+            if scanned_text:
+                return f"Scanned successfully: {scanned_text}"
+            else:
+                return "Failed to scan QR code. The image might be too artistic or the QR code might not be clear enough. Try adjusting the 'QR Code Visibility' setting for better results."
+        except Exception as e:
+            return f"An error occurred while scanning: {str(e)}"
 
     scan_button.click(
         scan_and_display,
@@ -404,5 +433,65 @@ with gr.Blocks(theme='Hev832/Applio') as blocks:
         concurrency_limit=20
     )
 
+    gr.Examples(
+        examples=[
+            [
+                "https://huggingface.co/",
+                "A sky view of a colorful lakes and rivers flowing through the desert",
+                "ugly, disfigured, low quality, blurry, nsfw",
+                7.5,
+                1.3,
+                0.9,
+                5392011833,
+                None,
+                None,
+                True,
+                "DPM++ Karras SDE",
+            ],
+            [
+                "https://huggingface.co/",
+                "Bright sunshine coming through the cracks of a wet, cave wall of big rocks",
+                "ugly, disfigured, low quality, blurry, nsfw",
+                7.5,
+                1.11,
+                0.9,
+                2523992465,
+                None,
+                None,
+                True,
+                "DPM++ Karras SDE",
+            ],
+            [
+                "https://huggingface.co/",
+                "Sky view of highly aesthetic, ancient greek thermal baths  in beautiful nature",
+                "ugly, disfigured, low quality, blurry, nsfw",
+                7.5,
+                1.5,
+                0.9,
+                2523992465,
+                None,
+                None,
+                True,
+                "DPM++ Karras SDE",
+            ],
+        ],
+        fn=inference,
+        inputs=[
+            qr_code_content,
+            prompt,
+            negative_prompt,
+            guidance_scale,
+            controlnet_conditioning_scale,
+            strength,
+            seed,
+            init_image,
+            qr_code_image,
+            use_qr_code_as_init_image,
+            sampler,
+        ],
+        outputs=[result_image],
+        cache_examples=False,
+    )
+
 blocks.queue(max_size=20,api_open=False)
 blocks.launch(share=bool(os.environ.get("SHARE", False)), show_api=True)