Update app.py

app.py

@@ -163,15 +163,20 @@ def gd_detect(img: Image.Image, prompt: str) -> BoundingBox | None:
     return bbox_union(bboxes.numpy().tolist())
 
 def apply_mask(img: Image.Image, mask_img: Image.Image, defringe: bool = True) -> Image.Image:
+    """마스크 적용 함수"""
     assert img.size == mask_img.size
     img = img.convert("RGB")
     mask_img = mask_img.convert("L")
+    
     if defringe:
         rgb, alpha = np.asarray(img) / 255.0, np.asarray(mask_img) / 255.0
         foreground = cast(np.ndarray[Any, np.dtype[np.uint8]], estimate_foreground_ml(rgb, alpha))
         img = Image.fromarray((foreground * 255).astype("uint8"))
-    result = Image.new("RGBA", img.size)
+    
+    # 투명한 배경으로 결과 생성
+    result = Image.new("RGBA", img.size, (0, 0, 0, 0))
     result.paste(img, (0, 0), mask_img)
+    
     return result
 
 
@@ -270,13 +275,27 @@ def combine_with_background(foreground: Image.Image, background: Image.Image,
     """전경과 배경 합성 함수"""
     print(f"Combining with position: {position}, scale: {scale_percent}")
     
+    # 배경 이미지를 RGBA 모드로 변환
     result = background.convert('RGBA')
+    
+    # 전경 이미지가 RGBA가 아니면 변환
+    if foreground.mode != 'RGBA':
+        foreground = foreground.convert('RGBA')
+    
+    # 스케일 조정
     scaled_foreground = resize_object(foreground, scale_percent)
     
+    # 위치 계산
     x, y = calculate_object_position(position, result.size, scaled_foreground.size)
     print(f"Calculated position coordinates: ({x}, {y})")
     
-    result.paste(scaled_foreground, (x, y), scaled_foreground)
+    # 투명한 배경의 새 이미지 생성
+    temp = Image.new('RGBA', result.size, (0, 0, 0, 0))
+    temp.paste(scaled_foreground, (x, y), scaled_foreground)
+    
+    # 최종 합성
+    result = Image.alpha_composite(result, temp)
+    
     return result
 
 @spaces.GPU(duration=30)  # 120초에서 30초로 감소
@@ -346,7 +365,7 @@ def on_change_prompt(img: Image.Image | None, prompt: str | None, bg_prompt: str
     return gr.update(interactive=bool(img and prompt))
 
 
-def process_prompt(img: Image.Image, prompt: str, bg_prompt: str | None = None, 
+ddef process_prompt(img: Image.Image, prompt: str, bg_prompt: str | None = None, 
                   aspect_ratio: str = "1:1", position: str = "bottom-center", 
                   scale_percent: float = 100) -> tuple[Image.Image, Image.Image]:
     try:
@@ -364,6 +383,9 @@ def process_prompt(img: Image.Image, prompt: str, bg_prompt: str | None = None,
         
         results, _ = _process(img, prompt, bg_prompt, aspect_ratio)
         
+        # 추출된 이미지를 RGBA로 유지
+        extracted = results[2].convert('RGBA')
+        
         if bg_prompt:
             try:
                 print(f"Using position: {position}")
@@ -375,18 +397,23 @@ def process_prompt(img: Image.Image, prompt: str, bg_prompt: str | None = None,
                     print(f"Invalid position, using default: {position}")
                 
                 combined = combine_with_background(
-                    foreground=results[2],
+                    foreground=extracted,
                     background=results[1],
                     position=position,
                     scale_percent=scale_percent
                 )
-                # 이미지를 RGB 모드로 변환하여 반환
-                return combined.convert('RGB'), results[2].convert('RGB')
+                
+                # 최종 출력을 위해 RGB로 변환
+                return combined.convert('RGB'), extracted.convert('RGB')
             except Exception as e:
                 print(f"Combination error: {str(e)}")
-                return results[1].convert('RGB'), results[2].convert('RGB')
+                return results[1].convert('RGB'), extracted.convert('RGB')
         
-        return results[1].convert('RGB'), results[2].convert('RGB')
+        # 배경이 없는 경우
+        white_bg = Image.new('RGBA', extracted.size, (255, 255, 255, 255))
+        combined = Image.alpha_composite(white_bg, extracted)
+        return combined.convert('RGB'), extracted.convert('RGB')
+    
     except Exception as e:
         print(f"Error in process_prompt: {str(e)}")
         raise gr.Error(str(e))
@@ -888,20 +915,6 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css) as demo:
             outputs=position
         )
 
-    process_btn.click(
-        fn=process_prompt,
-        inputs=[
-            input_image,
-            text_prompt,
-            bg_prompt,
-            aspect_ratio,
-            position,
-            scale_slider
-        ],
-        outputs=[combined_image, extracted_image],
-        queue=True,
-        show_progress=True
-    )
 
     add_text_btn.click(
         fn=add_text_to_image,
@@ -931,9 +944,6 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css) as demo:
     )
 
 
-
-    
-# 이벤트 바인딩
     bg_prompt.change(
         fn=update_controls,
         inputs=bg_prompt,
@@ -956,13 +966,35 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css) as demo:
     )
 
 
+    process_btn.click(
+        fn=process_prompt,
+        inputs=[
+            input_image,
+            text_prompt,
+            bg_prompt,
+            aspect_ratio,
+            position,
+            scale_slider
+        ],
+        outputs=[combined_image, extracted_image],
+        queue=True,
+        show_progress=True
+    ).success(
+        fn=None,
+        _js="""
+        function() {
+            document.querySelector('.output-panel').scrollIntoView({behavior: 'smooth'});
+        }
+        """
+    )
 
-
-    
-demo.queue(max_size=5)
+demo.queue(max_size=10, concurrency_count=2)
 demo.launch(
     server_name="0.0.0.0",
     server_port=7860,
     share=False,
-    max_threads=2
-)
+    max_threads=4,
+    show_error=True,
+    prevent_thread_lock=True
+)
+