Update app.py

app.py

@@ -146,21 +146,57 @@ def upscale_image(
         if os.path.exists(temp_input_path):
             os.remove(temp_input_path)
 
+def process_and_download(
+    password, image, scale_factor, output_format, sd_model,
+    resemblance, creativity, dynamic, sharpen, seed
+):
+    # 1) 비밀번호 검증
+    if password != "1089":
+        raise ValueError("잘못된 비밀번호입니다.")
+    if image is None:
+        return None, None
+
+    # 2) 이미지 업스케일
+    result_img = upscale_image(
+        image=image,
+        scale_factor=scale_factor,
+        output_format=output_format,
+        sd_model=sd_model,
+        resemblance=resemblance,
+        creativity=creativity,
+        dynamic=dynamic,
+        sharpen=sharpen,
+        seed=int(seed)
+    )
+    if result_img is None:
+        return None, None
+
+    # 3) 파일로 저장
+    ext = "jpg" if output_format.lower() == "jpg" else "png"
+    # JPG로 저장할 땐 RGB 모드로 변환
+    if ext == "jpg" and result_img.mode == "RGBA":
+        result_img = result_img.convert("RGB")
+
+    filename = f"upscaled_{uuid.uuid4()}.{ext}"
+    filepath = os.path.join(TEMP_DIR, filename)
+    result_img.save(filepath, format="JPEG" if ext=="jpg" else "PNG")
+
+    # 4) 리턴: (이미지, 파일 경로)
+    return result_img, filepath
+
 def create_interface():
     with gr.Blocks(title="Clarity Upscaler") as demo:
         with gr.Row():
             with gr.Column():
                 password_input = gr.Textbox(
-                    label="비밀번호",
-                    type="password",
-                    placeholder="비밀번호를 입력하세요"
+                    label="비밀번호", type="password", placeholder="비밀번호를 입력하세요"
                 )
                 input_image = gr.Image(label="원본 이미지", type="pil")
 
                 with gr.Accordion("고급 설정", open=False):
-                    scale_factor = gr.Slider(1, 4, value=2, step=0.5, label="확대 비율")
-                    output_format = gr.Radio(["jpg", "png"], value="jpg", label="출력 형식")
-                    sd_model = gr.Dropdown(
+                    scale_factor  = gr.Slider(1, 4,  value=2, step=0.5, label="확대 비율")
+                    output_format = gr.Radio(["jpg","png"], value="jpg",    label="출력 형식")
+                    sd_model      = gr.Dropdown(
                         choices=[
                             "juggernaut_reborn.safetensors [338b85bc4f]",
                             "sd_xl_base_1.0.safetensors [39d4e625d]",
@@ -170,57 +206,27 @@ def create_interface():
                         value="juggernaut_reborn.safetensors [338b85bc4f]",
                         label="SD 모델"
                     )
-                    resemblance = gr.Slider(0.0, 1.0, value=0.6, step=0.05, label="원본 유사도")
-                    creativity  = gr.Slider(0.0, 1.0, value=0.35, step=0.05, label="창의성")
-                    dynamic     = gr.Slider(1, 10, value=6, step=1, label="다이나믹 임계값")
-                    sharpen     = gr.Slider(0, 2, value=0, step=0.1, label="선명도")
+                    resemblance = gr.Slider(0.0,1.0, value=0.6, step=0.05, label="원본 유사도")
+                    creativity  = gr.Slider(0.0,1.0, value=0.35,step=0.05, label="창의성")
+                    dynamic     = gr.Slider(1,10,  value=6, step=1,    label="다이나믹 임계값")
+                    sharpen     = gr.Slider(0,2,   value=0, step=0.1,   label="선명도")
                     seed        = gr.Number(value=1337, label="시드", precision=0)
-                
-                submit_btn = gr.Button("실행", variant="primary")
+
+                submit_btn  = gr.Button("실행", variant="primary")
 
             with gr.Column():
                 output_image = gr.Image(label="개선된 이미지")
-                download_btn  = gr.DownloadButton(
-                    label="다운로드", 
-                    file_name="upscaled.jpg", 
-                    mime="image/jpeg"
-                )
+                download_btn = gr.DownloadButton(label="이미지 다운로드")
 
-        def process_image(
-            password, image, scale_factor, output_format, sd_model,
-            resemblance, creativity, dynamic, sharpen, seed
-        ):
-            if password != "1089":
-                raise ValueError("잘못된 비밀번호입니다.")
-            if image is None:
-                return None
-
-            return upscale_image(
-                image=image,
-                scale_factor=scale_factor,
-                output_format=output_format,
-                sd_model=sd_model,
-                resemblance=resemblance,
-                creativity=creativity,
-                dynamic=dynamic,
-                sharpen=sharpen,
-                seed=int(seed)
-            )
-
-        # 1) 실행 버튼 → output_image
+        # 클릭 시 두 개의 출력(이미지, 파일 경로)을 반환
         submit_btn.click(
-            fn=process_image,
+            fn=process_and_download,
             inputs=[
-                password_input, input_image, scale_factor, output_format, sd_model,
+                password_input,
+                input_image, scale_factor, output_format, sd_model,
                 resemblance, creativity, dynamic, sharpen, seed
             ],
-            outputs=[output_image]
-        )
-        # 2) 다운로드 버튼 → output_image 그대로 받아서 파일로 제공
-        download_btn.click(
-            fn=lambda img: img,
-            inputs=[output_image],
-            outputs=[download_btn]
+            outputs=[output_image, download_btn]
         )
 
     return demo