del

app.py

@@ -19,22 +19,22 @@ def process_image(input_image, mode, weight1=None, weight2=None):
     elif mode == "refine":
         sotai_image, sketch_image = process_image_as_base64(input_image, mode, weight1, weight2)
 
-    # テスト用に、Base64データを返す
-    sotai_image = image_to_base64(input_image)
-    sketch_image = image_to_base64(input_image)
-
-    return sotai_image, sketch_image
+    return sotai_image, sketch_image, None
 
 def mix_images(sotai_image_data, sketch_image_data, opacity1, opacity2):
-    # Base64からPILイメージに変換
-    sotai_image = Image.open(io.BytesIO(base64.b64decode(sotai_image_data)))
-    sketch_image = Image.open(io.BytesIO(base64.b64decode(sketch_image_data)))
-    # 画像を合成
-    mixed_image = Image.new('RGBA', sotai_image.size, (0, 0, 0, 0))
-    opacity_mask1 = Image.new('L', sotai_image.size, int(opacity1 * 255))
-    opacity_mask2 = Image.new('L', sotai_image.size, int(opacity2 * 255))
-    mixed_image.paste(sotai_image, (0, 0), mask=opacity_mask1)
-    mixed_image.paste(sketch_image, (0, 0), mask=opacity_mask2)
+    sotai_image = Image.open(io.BytesIO(base64.b64decode(sotai_image_data))).convert('RGBA')
+    sketch_image = Image.open(io.BytesIO(base64.b64decode(sketch_image_data))).convert('RGBA')
+
+    if sotai_image.size != sketch_image.size:
+        sketch_image = sketch_image.resize(sotai_image.size, Image.Resampling.LANCZOS)
+
+    mixed_image = Image.new('RGBA', sotai_image.size, (255, 255, 255, 255))
+
+    sotai_alpha = sotai_image.getchannel('A').point(lambda x: int(x * opacity1))
+    sketch_alpha = sketch_image.getchannel('A').point(lambda x: int(x * opacity2))
+
+    mixed_image.paste(sketch_image, (0, 0), mask=sketch_alpha)
+    mixed_image.paste(sotai_image, (0, 0), mask=sotai_alpha)
 
     return mixed_image
 
@@ -47,20 +47,21 @@ with gr.Blocks() as demo:
     submit = None
     with gr.Row():
         with gr.Column() as input_col:
+            input_image = gr.Image(type="pil", label="Input Image")
             with gr.Tab("original"):
-                original_input = [
-                    gr.Image(type="pil", label="Input Image"),
-                    gr.Text("original", label="Mode", visible=False),
-                ]
+                original_mode = gr.Text("original", label="Mode", visible=False)
                 original_submit = gr.Button("Submit", variant="primary")
             with gr.Tab("refine"):
                 refine_input = [
-                    gr.Image(type="pil", label="Input Image"),
                     gr.Text("refine", label="Mode", visible=False),
                     gr.Slider(0, 2, value=0.6, step=0.05, label="Weight 1 (Sketch)"),
                     gr.Slider(0, 1, value=0.05, step=0.025, label="Weight 2 (Body)")
                 ]
                 refine_submit = gr.Button("Submit", variant="primary")
+            gr.Examples(
+                examples=[f"images/sample{i}.png" for i in [1, 2, 4, 5, 6, 7, 10, 16, 18, 19]],
+                inputs=[input_image]
+            )
         with gr.Column() as output_col:
             sotai_image_data = gr.Text(label="Sotai Image data", visible=False)
             sketch_image_data = gr.Text(label="Sketch Image data", visible=False)
@@ -70,13 +71,13 @@ with gr.Blocks() as demo:
 
     original_submit.click(
         process_image,
-        inputs=original_input,
-        outputs=[sotai_image_data, sketch_image_data]
+        inputs=[input_image, original_mode],
+        outputs=[sotai_image_data, sketch_image_data, mixed_image]
     )
     refine_submit.click(
         process_image,
-        inputs=refine_input,
-        outputs=[sotai_image_data, sketch_image_data]
+        inputs=[input_image, refine_input[0], refine_input[1], refine_input[2]],
+        outputs=[sotai_image_data, sketch_image_data, mixed_image]
     )
     sotai_image_data.change(
         mix_images,
@@ -94,25 +95,4 @@ with gr.Blocks() as demo:
         outputs=mixed_image
     )
 
-    demo.launch()
-
-
-# # Gradio インターフェースの定義
-# iface = gr.Interface(
-#     fn=process_image,
-#     inputs=[
-#         gr.Image(type="pil", label="Input Image"),
-#         gr.Radio(["original", "refine"], label="Mode", value="original"),
-#         gr.Slider(0, 2, value=0.6, step=0.05, label="Weight 1 (Sketch)"),
-#         gr.Slider(0, 1, value=0.05, step=0.025, label="Weight 2 (Body)")
-#     ],
-#     outputs=[
-#         gr.Text(label="Sotai Image URL"),
-#         gr.Text(label="Sketch Image URL")
-#     ],
-#     title="Image2Body API",
-#     description="Upload an image and select processing options to generate body and sketch images."
-# )
-
-# # Hugging Face Spacesでデプロイする場合
-# iface.queue().launch()
+    demo.launch()

firebase/image2body-demo-firebase-adminsdk-ope1k-e19e1da82c.json

@@ -1,13 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "image2body-demo",
-  "private_key_id": "e19e1da82c39206ae07a42271eb6e9a067b501b6",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDp/N0pO3GUp5/k\nKvzNRBrmN8EgPwqDT+SeQYWn8po+xmtWUcrLlUH1ZgRTaJvkdgxxSsGfoOSj1mjw\nVSYudfT7763PTznqHWi7ShHvLwriuoEaJkwN4yhLyayTR42AQelPJUkl0FvE/DO7\neVjYtbReXH5+lSFjTYK7/Z0mS1D5Bc3ubEUDjJb0/ySc+i4Q/hmy+RiwDwkpTDPu\nufMUgcGHvv1ApMiwqXQMv2OuBigW1XS+IpNhwmTP5c7DlwnFm8qaVnwQcaj9NbPW\nNP2wrEjkzo2piY33GZ+dTV7wwAdJLjY30dKcEdkrcRU0dhDOZ++hwhGB4hecGnlR\nHbrS58AbAgMBAAECggEARC8g3WaKkwiDsdALCd+6PPLrTrPAIwKxeqJaSdYKt5dH\naQh9oXSVm2aGhS27G8iAmLTxlkwixFFzE/GkJi7OXGn8CqiqFjxKrCUJ89qQAADc\nJRwa1oMm12rl5KcZp1HNpHgXiDLewxjBFHTofIH6lPK8E7PuXksUeSaO2D1jU6Uc\nOLJJuHHkZ52Fn34N3XjUwPJ6dOLVyImUY1IBJ7cdwRuvfohmcinAlvEqtnqA7hOa\n0QZdTcFpkIHq0yahqMYulpLCG6B8hNaRcHeET+Kl14cSn5Y5ifmGKe8haucGN/Zb\nwA1RO/RaRbbYF93nL3KENpegtb0rMej2Acvl7q0nzQKBgQD1UbxgZaDrUPEIZZDs\nCmK8GLDDqUuVpVxPUi0aMoI0zE7Li1p9OFWSySvqeAmJnMRRGrbN46WfdbkRYIlD\no6+Gd5E0SJAsDwZqyx7Apg2Jrx7AdSXAdyZn83F3R6yi+L63zcr3ND6KDUXMCtwa\no7ISgdlR1RxG1K/9FXisSosdpwKBgQD0LNRt34k6GDWjWCS/VZzbdR7+I0Bt9D0K\nCFqSjRMYL9+93DFQqCkN+ueZvGUQhJUm7XJ0wpF7qO97TnwNR784iYO28UKtofvA\n0Mog31YTb+Dm1SnbvxzzpBPaLLgkommBc5qKqgtg8gniJJ8ddWZYAYCWsPMxJwSA\nf74uYbbgbQKBgQDZJOJTiWGpKVpRDmX7KS5ARLKiXoYzDc3pwFl/6NlsFrRgYxdT\n47uLVFp1Do+SqZr0F2tcT3bY8QFBqmuV3ZuOsONsnhZPiXUqrmSoLdOp3cKgpJEo\nDc+HD+uNo3niP7/BPn271xjMZfc0JyCwy9jhnOJaFwMSh0zH/mt0Rf9h3QKBgQC5\nMU8kzkfcQgRckTu9yocfg6MwCTiSrI2nEFLxmAIFdDn0XA8jJ4eLzOLfnR3h+0zM\nq4cFu5Rv/98y3IIF6IbFsLaviCiUXKj+wtyrNfio4U/og4At5LNmrulHrmczkeMH\nhdCOnw3mR2zrke8EfshSs0D+CdNJUlh9xWVO9FmpuQKBgAqCGUXvTKKrSTmQS3Cv\nwvndgkBrl21zeOkIpDKFdHhMYgVFSF5CS3FIoSnbZrakHrEDYItG+UjVepH9kvmn\nk4KPZJ4CzO3qwnKIdc28kSfT1tK3GDC3aufh9ucWuGSfHO7j6D7yM73Lb/FsRpju\nA8nojFAbWcfdKpCjh1xiRDTF\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-ope1k@image2body-demo.iam.gserviceaccount.com",
-  "client_id": "105880637239614588319",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-ope1k%40image2body-demo.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-}

templates/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ title }}</title>
-</head>
-<body>
-    <h1>Welcome to our website</h1>
-    <p>This is the home page rendered using a Flask template.</p>
-</body>
-</html>