Update app.py

app.py

@@ -1,6 +1,6 @@
 # img_bot.py
 import discord, os, io, re, random, asyncio, logging, requests, replicate, subprocess, base64
-from urllib.parse import urljoin
+from urllib.parse import urljoin, quote_plus
 from transformers import pipeline as transformers_pipeline
 from gradio_client import Client
 
@@ -30,6 +30,7 @@ translator = transformers_pipeline(
 )
 
 async def ko2en_async(text: str) -> str:
+    """한글 포함 시 비동기 영어 번역."""
     if not re.search(r"[가-힣]", text):
         return text
     loop = asyncio.get_running_loop()
@@ -44,8 +45,8 @@ async def ko2en_async(text: str) -> str:
 
 # ── 로깅 ────────────────────────────────────────────────────
 logging.basicConfig(level=logging.INFO,
-                    format="%(asctime)s [%(levelname)s] %(message)s",
-                    handlers=[logging.StreamHandler()])
+    format="%(asctime)s [%(levelname)s] %(message)s",
+    handlers=[logging.StreamHandler()])
 
 # ── Discord 인텐트 ──────────────────────────────────────────
 intents = discord.Intents.default()
@@ -82,54 +83,73 @@ class ImageBot(discord.Client):
                 prompt=prompt_en,
                 seed=random.randint(0, 2**32 - 1),
                 api_name=GRADIO_API
-            )[0]  # list → dict
+            )  # ❗ 리스트나 dict·str 그대로 반환
 
         try:
             img_info = await asyncio.get_running_loop().run_in_executor(None, generate_image)
-            logging.info(f"Gradio result: {img_info}")
+            logging.info(f"Gradio result type={type(img_info)} → {img_info}")
         except Exception as e:
             logging.error(f"Gradio API error: {e}")
             await message.reply("⚠️ 이미지 생성 실패!")
             return
 
-        # ── Discord 전송 ──────────────────────────────────
-        files = []
+        # ── Discord 파일 준비 ──────────────────────────────
         data = None
-
-        # 1️⃣ url 필드 우선
-        url = img_info.get("url")
-        if url:
-            if url.startswith("data:"):  # base64 data URI
-                b64 = re.sub(r"^data:image/[^;]+;base64,", "", url)
+        filename = "generated.webp"
+
+        def download(url: str) -> bytes | None:
+            try:
+                return requests.get(url, timeout=10).content
+            except Exception as err:
+                logging.warning(f"URL 다운로드 실패({url}): {err}")
+                return None
+
+        # ① `img_info` 가 리스트면 첫 요소 사용
+        if isinstance(img_info, list) and img_info:
+            img_info = img_info[0]
+
+        # ② dict
+        if isinstance(img_info, dict):
+            # url 우선
+            url = img_info.get("url")
+            if url:
+                if url.startswith("data:"):
+                    try:
+                        data = base64.b64decode(re.sub(r"^data:image/[^;]+;base64,", "", url))
+                    except Exception as e:
+                        logging.warning(f"base64 디코딩 실패: {e}")
+                else:
+                    if url.startswith("/"):
+                        url = urljoin(GRADIO_URL, url)
+                    data = download(url)
+            # path 보조
+            if data is None:
+                path = img_info.get("path")
+                if path:
+                    # 원격 Gradio 파일 end-point
+                    remote_url = urljoin(GRADIO_URL, f"/gradio_api/file={quote_plus(path)}")
+                    data = download(remote_url) or (open(path, "rb").read() if os.path.isfile(path) else None)
+
+        # ③ str (로컬 경로/URL/data URI)
+        elif isinstance(img_info, str):
+            s = img_info.strip()
+            if s.startswith("data:"):
                 try:
-                    data = base64.b64decode(b64)
+                    data = base64.b64decode(re.sub(r"^data:image/[^;]+;base64,", "", s))
                 except Exception as e:
                     logging.warning(f"base64 디코딩 실패: {e}")
+            elif s.startswith("http"):
+                data = download(s)
             else:
-                if url.startswith("/"):  # 상대 URL
-                    url = urljoin(GRADIO_URL, url)
-                try:
-                    data = requests.get(url, timeout=10).content
-                except Exception as e:
-                    logging.warning(f"URL 다운로드 실패: {e}")
-
-        # 2️⃣ path 필드 (파일 존재할 때만)
-        if data is None:
-            path = img_info.get("path")
-            if path and os.path.isfile(path):
-                try:
-                    with open(path, "rb") as f:
-                        data = f.read()
-                except Exception as e:
-                    logging.warning(f"파일 열기 실패: {e}")
+                # 원격 파일로 간주
+                remote_url = urljoin(GRADIO_URL, f"/gradio_api/file={quote_plus(s)}")
+                data = download(remote_url) or (open(s, "rb").read() if os.path.isfile(s) else None)
 
+        # ── Discord 전송 ──────────────────────────────────
         if data:
-            files.append(discord.File(io.BytesIO(data), filename="generated.webp"))
-
-        await message.reply(
-            files=files if files else None,
-            content=None if files else "⚠️ 이미지를 전송할 수 없습니다."
-        )
+            await message.reply(files=[discord.File(io.BytesIO(data), filename=filename)])
+        else:
+            await message.reply("⚠️ 이미지를 전송할 수 없습니다.")
 
 # ── 실행 ────────────────────────────────────────────────────
 if __name__ == "__main__":