Update app.py

app.py

@@ -578,57 +578,54 @@ def add_text_to_image(
     y_position,
     thickness,
     text_position_type,
-    font_choice  # 새로운 파라미터 추가
+    font_choice
 ):
     """
     Add text to an image with customizable properties
     """
     try:
-        if input_image is None:
-            return None
-            
+        if input_image is None or text.strip() == "":
+            return input_image
+
         # PIL Image 객체로 변환
-        if not isinstance(input_image, Image.Image):
-            if isinstance(input_image, np.ndarray):
-                image = Image.fromarray(input_image)
-            else:
-                raise ValueError("Unsupported image type")
-        else:
+        if isinstance(input_image, np.ndarray):
+            image = Image.fromarray(input_image)
+        elif isinstance(input_image, Image.Image):
             image = input_image.copy()
+        else:
+            print(f"Unexpected image type: {type(input_image)}")
+            return input_image
 
         # 이미지를 RGBA 모드로 변환
-        if image.mode != 'RGBA':
-            image = image.convert('RGBA')
+        image = image.convert('RGBA')
 
         # Text Behind Image 처리
         if text_position_type == "Text Behind Image":
-            # 원본 이미지의 배경 제거
-            overlay_image = remove_background(image)
+            try:
+                overlay_image = remove_background(image)
+            except Exception as e:
+                print(f"Background removal failed: {str(e)}")
+                overlay_image = image
 
         # 텍스트 오버레이 생성
         txt_overlay = Image.new('RGBA', image.size, (255, 255, 255, 0))
         draw = ImageDraw.Draw(txt_overlay)
-        
+
         # 폰트 설정
-        font_files = {
-            "Default": "DejaVuSans.ttf",
-            "Korean Regular": "ko-Regular.ttf",
-            "Korean Son": "ko-son.ttf"
-        }
-        
         try:
-            font_file = font_files.get(font_choice, "DejaVuSans.ttf")
-            font = ImageFont.truetype(font_file, int(font_size))
+            font_path = {
+                "Default": "DejaVuSans.ttf",
+                "Korean Regular": "ko-Regular.ttf",
+                "Korean Son": "ko-son.ttf"
+            }.get(font_choice, "DejaVuSans.ttf")
+            
+            font = ImageFont.truetype(font_path, int(font_size))
         except Exception as e:
-            print(f"Font loading error ({font_choice}): {str(e)}")
-            try:
-                font = ImageFont.truetype("arial.ttf", int(font_size))
-            except:
-                print("Using default font")
-                font = ImageFont.load_default()
-        
+            print(f"Font error: {str(e)}, using default")
+            font = ImageFont.load_default()
+
         # 색상 설정
-        color_map = {
+        rgb_color = {
             'White': (255, 255, 255),
             'Black': (0, 0, 0),
             'Red': (255, 0, 0),
@@ -636,49 +633,48 @@ def add_text_to_image(
             'Blue': (0, 0, 255),
             'Yellow': (255, 255, 0),
             'Purple': (128, 0, 128)
-        }
-        rgb_color = color_map.get(color, (255, 255, 255))
-        
-        # 텍스트 크기 계산
+        }.get(color, (255, 255, 255))
+
+        # 텍스트 위치 계산
         text_bbox = draw.textbbox((0, 0), text, font=font)
         text_width = text_bbox[2] - text_bbox[0]
         text_height = text_bbox[3] - text_bbox[1]
 
-        # 위치 계산
         actual_x = int((image.width - text_width) * (x_position / 100))
         actual_y = int((image.height - text_height) * (y_position / 100))
 
-        # 텍스트 색상 설정
+        # 텍스트 색상 설정 (투명도 포함)
         text_color = (*rgb_color, int(opacity))
-        
-        # 텍스트 그리기
-        add_text_with_stroke(
-            draw, 
-            text, 
-            actual_x, 
-            actual_y, 
-            font, 
-            text_color, 
-            int(thickness)
-        )
 
+        # 텍스트 그리기 (외곽선 포함)
+        for dx in range(-thickness, thickness + 1):
+            for dy in range(-thickness, thickness + 1):
+                draw.text(
+                    (actual_x + dx, actual_y + dy),
+                    text,
+                    font=font,
+                    fill=text_color
+                )
+
+        # 최종 이미지 합성
         if text_position_type == "Text Behind Image":
-            # 텍스트를 먼저 그리고 그 위에 이미지 오버레이
-            output_image = Image.alpha_composite(image, txt_overlay)
-            output_image = superimpose(output_image, overlay_image)
+            # 텍스트 먼저 그리고 이미지 오버레이
+            base = Image.new('RGBA', image.size, (255, 255, 255, 0))
+            base = Image.alpha_composite(base, txt_overlay)
+            output_image = Image.alpha_composite(base, overlay_image)
         else:
-            # 기존 방식대로 텍스트를 이미지 위에 그리기
+            # 이���지 위에 텍스트 오버레이
             output_image = Image.alpha_composite(image, txt_overlay)
-        
-        # RGB로 변환
-        output_image = output_image.convert('RGB')
-        
-        return output_image
+
+        # RGB로 변환하여 반환
+        return output_image.convert('RGB')
 
     except Exception as e:
-        print(f"Error in add_text_to_image: {str(e)}")
+        print(f"Text addition error: {str(e)}")
         return input_image
 
+
+
     
 def update_position(new_position):
     """위치 업데이트 함수"""
@@ -914,10 +910,13 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css) as demo:
         queue=True
     )
 
+
+    
+# 이벤트 핸들러 수정
     add_text_btn.click(
         fn=add_text_to_image,
         inputs=[
-            combined_image,
+            combined_image,  # 현재 표시된 이미지
             text_input,
             font_size,
             color_dropdown,
@@ -928,7 +927,8 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css) as demo:
             text_position_type,
             font_choice
         ],
-        outputs=combined_image
+        outputs=combined_image,
+        show_progress=True
     )
 
 demo.queue(max_size=5)