Update app.py

app.py

@@ -608,7 +608,6 @@ def add_text_to_image(
                 "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 error: {str(e)}, using default")
@@ -625,9 +624,8 @@ def add_text_to_image(
             'Purple': (128, 0, 128)
         }.get(color, (255, 255, 255))
 
-        # 임시 드로잉 컨텍스트로 텍스트 크기 계산
-        temp_img = Image.new('RGBA', (1, 1), (0, 0, 0, 0))
-        temp_draw = ImageDraw.Draw(temp_img)
+        # 텍스트 크기 계산
+        temp_draw = ImageDraw.Draw(Image.new('RGBA', (1, 1)))
         text_bbox = temp_draw.textbbox((0, 0), text, font=font)
         text_width = text_bbox[2] - text_bbox[0]
         text_height = text_bbox[3] - text_bbox[1]
@@ -636,65 +634,178 @@ def add_text_to_image(
         actual_x = int((width - text_width) * (x_position / 100))
         actual_y = int((height - text_height) * (y_position / 100))
 
-        # 텍스트 색상 설정 (투명도 포함)
+        # 텍스트 색상 설정
         text_color = (*rgb_color, int(opacity))
 
+        print(f"Processing {text_position_type}")  # 디버깅
+
         if text_position_type == "Text Behind Image":
-            try:
-                # 1. 배경 레이어 (흰색)
-                background = Image.new('RGBA', (width, height), (255, 255, 255, 255))
-                
-                # 2. 텍스트 레이어
-                text_layer = Image.new('RGBA', (width, height), (0, 0, 0, 0))
-                text_draw = ImageDraw.Draw(text_layer)
-                
-                # 텍스트 그리기 (외곽선 포함)
-                for dx in range(-thickness, thickness + 1):
-                    for dy in range(-thickness, thickness + 1):
-                        text_draw.text(
-                            (actual_x + dx, actual_y + dy),
-                            text,
-                            font=font,
-                            fill=text_color
-                        )
-                
-                # 3. 레이어 합성
-                result = Image.alpha_composite(background, text_layer)
-                result = Image.alpha_composite(result, image)
-                
-                print("Text Behind Image processing completed")  # 디버깅용
-                return result.convert('RGB')
-                
-            except Exception as e:
-                print(f"Text Behind Image error: {str(e)}")
-                traceback.print_exc()
-                return input_image
+            print("Starting Text Behind Image process")  # 디버깅
+            
+            # 1. 흰색 배경 생성
+            background = Image.new('RGBA', (width, height), (255, 255, 255, 255))
+            
+            # 2. 텍스트 레이어 생성
+            text_layer = Image.new('RGBA', (width, height), (0, 0, 0, 0))
+            text_draw = ImageDraw.Draw(text_layer)
+            
+            # 3. 텍스트 그리기
+            text_draw.text(
+                (actual_x, actual_y),
+                text,
+                font=font,
+                fill=text_color
+            )
+            
+            # 4. 레이어 합성
+            result = Image.alpha_composite(background, text_layer)
+            result = Image.alpha_composite(result, image)
+            
+            print("Text Behind Image process completed")  # 디버깅
+            return result.convert('RGB')
+            
+        else:  # Text Over Image
+            print("Starting Text Over Image process")  # 디버깅
+            
+            # 텍스트 오버레이 생성
+            overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
+            draw = ImageDraw.Draw(overlay)
+            
+            # 텍스트 그리기
+            draw.text(
+                (actual_x, actual_y),
+                text,
+                font=font,
+                fill=text_color
+            )
+            
+            # 이미지 합성
+            result = Image.alpha_composite(image, overlay)
+            
+            print("Text Over Image process completed")  # 디버깅
+            return result.convert('RGB')
+
+    except Exception as e:
+        print(f"Error in add_text_to_image: {str(e)}")
+        traceback.print_exc()
+        return input_imagedef add_text_to_image(
+    input_image,
+    text,
+    font_size,
+    color,
+    opacity,
+    x_position,
+    y_position,
+    thickness,
+    text_position_type,
+    font_choice
+):
+    """
+    Add text to an image with customizable properties
+    """
+    try:
+        if input_image is None or text.strip() == "":
+            return input_image
+
+        # PIL Image 객체로 변환
+        if isinstance(input_image, np.ndarray):
+            image = Image.fromarray(input_image)
+        elif isinstance(input_image, Image.Image):
+            image = input_image.copy()
         else:
-            # Text Over Image
-            try:
-                overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
-                draw = ImageDraw.Draw(overlay)
-                
-                # 텍스트 그리기
-                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
-                        )
-                
-                result = Image.alpha_composite(image, overlay)
-                return result.convert('RGB')
-                
-            except Exception as e:
-                print(f"Text Over Image error: {str(e)}")
-                traceback.print_exc()
-                return input_image
+            print(f"Unexpected image type: {type(input_image)}")
+            return input_image
+
+        # 이미지를 RGBA 모드로 변환
+        image = image.convert('RGBA')
+        width, height = image.size
+
+        # 폰트 설정
+        try:
+            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 error: {str(e)}, using default")
+            font = ImageFont.load_default()
+
+        # 색상 설정
+        rgb_color = {
+            'White': (255, 255, 255),
+            'Black': (0, 0, 0),
+            'Red': (255, 0, 0),
+            'Green': (0, 255, 0),
+            'Blue': (0, 0, 255),
+            'Yellow': (255, 255, 0),
+            'Purple': (128, 0, 128)
+        }.get(color, (255, 255, 255))
+
+        # 텍스트 크기 계산
+        temp_draw = ImageDraw.Draw(Image.new('RGBA', (1, 1)))
+        text_bbox = temp_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((width - text_width) * (x_position / 100))
+        actual_y = int((height - text_height) * (y_position / 100))
+
+        # 텍스트 색상 설정
+        text_color = (*rgb_color, int(opacity))
+
+        print(f"Processing {text_position_type}")  # 디버깅
+
+        if text_position_type == "Text Behind Image":
+            print("Starting Text Behind Image process")  # 디버깅
+            
+            # 1. 흰색 배경 생성
+            background = Image.new('RGBA', (width, height), (255, 255, 255, 255))
+            
+            # 2. 텍스트 레이어 생성
+            text_layer = Image.new('RGBA', (width, height), (0, 0, 0, 0))
+            text_draw = ImageDraw.Draw(text_layer)
+            
+            # 3. 텍스트 그리기
+            text_draw.text(
+                (actual_x, actual_y),
+                text,
+                font=font,
+                fill=text_color
+            )
+            
+            # 4. 레이어 합성
+            result = Image.alpha_composite(background, text_layer)
+            result = Image.alpha_composite(result, image)
+            
+            print("Text Behind Image process completed")  # 디버깅
+            return result.convert('RGB')
+            
+        else:  # Text Over Image
+            print("Starting Text Over Image process")  # 디버깅
+            
+            # 텍스트 오버레이 생성
+            overlay = Image.new('RGBA', (width, height), (0, 0, 0, 0))
+            draw = ImageDraw.Draw(overlay)
+            
+            # 텍스트 그리기
+            draw.text(
+                (actual_x, actual_y),
+                text,
+                font=font,
+                fill=text_color
+            )
+            
+            # 이미지 합성
+            result = Image.alpha_composite(image, overlay)
+            
+            print("Text Over Image process completed")  # 디버깅
+            return result.convert('RGB')
 
     except Exception as e:
-        print(f"General text addition error: {str(e)}")
+        print(f"Error in add_text_to_image: {str(e)}")
         traceback.print_exc()
         return input_image
 
@@ -896,6 +1007,29 @@ with gr.Blocks(theme=gr.themes.Soft(), css=css) as demo:
             outputs=position
         )
  
+    add_text_btn.click(
+        fn=add_text_to_image,
+        inputs=[
+            combined_image,
+            text_input,
+            font_size,
+            color_dropdown,
+            opacity_slider,
+            x_position,
+            y_position,
+            thickness,
+            text_position_type,
+            font_choice
+        ],
+        outputs=combined_image,
+        show_progress=True
+    ).then(
+        lambda: None,  # 추가 작업이 필요한 경우 여기에 함수를 넣을 수 있습니다
+        None,
+        None,
+        _js="() => {console.log('Text addition completed');}"  # 디버깅용 JavaScript
+    )
+
 
     # 이벤트 바인딩
     bg_prompt.change(
@@ -933,27 +1067,6 @@ 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,  # 현재 표시된 이미지
-            text_input,
-            font_size,
-            color_dropdown,
-            opacity_slider,
-            x_position,
-            y_position,
-            thickness,
-            text_position_type,
-            font_choice
-        ],
-        outputs=combined_image,
-        show_progress=True
-    )
-
 demo.queue(max_size=5)
 demo.launch(
     server_name="0.0.0.0",