Update app.py

app.py

@@ -162,22 +162,6 @@ def gd_detect(img: Image.Image, prompt: str) -> BoundingBox | None:
     bboxes = corners_to_pixels_format(results["boxes"].cpu(), width, height)
     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, (0, 0, 0, 0))
-    result.paste(img, (0, 0), mask_img)
-    
-    return result
 
 
 def adjust_size_to_multiple_of_8(width: int, height: int) -> tuple[int, int]:
@@ -270,33 +254,7 @@ def resize_object(image: Image.Image, scale_percent: float) -> Image.Image:
     height = int(image.height * scale_percent / 100)
     return image.resize((width, height), Image.Resampling.LANCZOS)
 
-def combine_with_background(foreground: Image.Image, background: Image.Image, 
-                          position: str = "bottom-center", scale_percent: float = 100) -> 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})")
-    
-    # 투명한 배경의 새 이미지 생성
-    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초로 감소
 def _gpu_process(img: Image.Image, prompt: str | BoundingBox | None) -> tuple[Image.Image, BoundingBox | None, list[str]]:
@@ -365,7 +323,35 @@ def on_change_prompt(img: Image.Image | None, prompt: str | None, bg_prompt: str
     return gr.update(interactive=bool(img and prompt))
 
 
-ddef process_prompt(img: Image.Image, prompt: str, bg_prompt: str | None = None, 
+def combine_with_background(foreground: Image.Image, background: Image.Image, 
+                          position: str = "bottom-center", scale_percent: float = 100) -> 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})")
+    
+    # 투명한 배경의 새 이미지 생성
+    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
+
+def 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:
@@ -420,6 +406,23 @@ ddef process_prompt(img: Image.Image, prompt: str, bg_prompt: str | None = None,
     finally:
         clear_memory()
 
+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, (0, 0, 0, 0))
+    result.paste(img, (0, 0), mask_img)
+    
+    return result
+
     
 def process_bbox(img: Image.Image, box_input: str) -> tuple[Image.Image, Image.Image]:
     try: