Update app.py

app.py

@@ -1,16 +1,10 @@
 # ===============================================================
-# app.py  ―  Gradio 5.x + FastAPI + Gemini + Selenium
-# ・Gradio 5.29.0 以上を前提に最適化
-# ・UI/API を維持したまま 307 ループを解消
-# ・/gradio にサブマウントし / はリダイレクトのみ
+# app.py — Gradio 5.x + FastAPI + Gemini + Selenium
+#   • FastAPI(redirect_slashes=False) で 307 ループを根絶
+#   • サブアプリを /gradio にマウントし、自前でリダイレクト制御
 # ===============================================================
 
-import os
-import time
-import tempfile
-import logging
-import threading
-import queue
+import os, time, tempfile, logging, threading, queue
 from io import BytesIO
 from concurrent.futures import ThreadPoolExecutor
 
@@ -32,97 +26,54 @@ from selenium.webdriver.support import expected_conditions as EC
 import google.generativeai as genai
 from huggingface_hub import hf_hub_download
 
-
-# ===============================================================
-# ロガー
-# ===============================================================
+# ---------- ログ ----------
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-
-# ===============================================================
-# WebDriver プール
-# ===============================================================
+# ---------- WebDriver プール（前回と同じ） ----------
 class WebDriverPool:
-    """複数の WebDriver を使い回すシンプルなプール"""
     def __init__(self, max_drivers: int = 3):
-        self.driver_queue: "queue.Queue[webdriver.Chrome]" = queue.Queue()
+        self.driver_queue = queue.Queue()
         self.max_drivers = max_drivers
         self.lock = threading.Lock()
         self.count = 0
         logger.info(f"WebDriver プール初期化: 最大 {max_drivers}")
 
-    def _create_driver(self) -> webdriver.Chrome:
-        options = Options()
-        options.add_argument("--headless")
-        options.add_argument("--no-sandbox")
-        options.add_argument("--disable-dev-shm-usage")
-        options.add_argument("--force-device-scale-factor=1")
-        options.add_argument("--disable-features=NetworkService")
-        options.add_argument("--dns-prefetch-disable")
-
-        chromedriver_path = os.environ.get("CHROMEDRIVER_PATH")
-        if chromedriver_path and os.path.exists(chromedriver_path):
-            logger.info(f"環境変数 CHROMEDRIVER_PATH を使用: {chromedriver_path}")
-            service = webdriver.ChromeService(executable_path=chromedriver_path)
-            return webdriver.Chrome(service=service, options=options)
-        return webdriver.Chrome(options=options)
-
-    def get_driver(self) -> webdriver.Chrome:
+    def _create_driver(self):
+        opts = Options()
+        opts.add_argument("--headless"); opts.add_argument("--no-sandbox")
+        opts.add_argument("--disable-dev-shm-usage")
+        drv_path = os.getenv("CHROMEDRIVER_PATH")
+        if drv_path and os.path.exists(drv_path):
+            return webdriver.Chrome(service=webdriver.ChromeService(executable_path=drv_path), options=opts)
+        return webdriver.Chrome(options=opts)
+
+    def get_driver(self):
         if not self.driver_queue.empty():
-            logger.info("プールから既存 WebDriver を取得")
             return self.driver_queue.get()
-
         with self.lock:
             if self.count < self.max_drivers:
                 self.count += 1
-                logger.info(f"新規 WebDriver 作成 ({self.count}/{self.max_drivers})")
                 return self._create_driver()
-
-        # ここに来るのはプール満杯時
-        logger.info("WebDriver プール満杯。空きを待機")
         return self.driver_queue.get()
 
-    def release_driver(self, driver: webdriver.Chrome):
-        if driver:
-            try:
-                driver.get("about:blank")
-                driver.execute_script("""
-                    document.documentElement.style.overflow='';
-                    document.body.style.overflow='';
-                """)
-                self.driver_queue.put(driver)
-                logger.info("WebDriver をプールに返却")
-            except Exception as e:
-                logger.error(f"返却エラー: {e}")
-                driver.quit()
-                with self.lock:
-                    self.count -= 1
+    def release_driver(self, driver):
+        try:
+            driver.get("about:blank")
+            self.driver_queue.put(driver)
+        except Exception:
+            driver.quit()
+            with self.lock: self.count -= 1
 
     def close_all(self):
-        logger.info("WebDriver 全終了")
-        closed = 0
         while not self.driver_queue.empty():
-            try:
-                drv = self.driver_queue.get(block=False)
-                drv.quit()
-                closed += 1
-            except queue.Empty:
-                break
-            except Exception as e:
-                logger.error(f"終了エラー: {e}")
-        with self.lock:
-            self.count = 0
-        logger.info(f"{closed} 個の WebDriver を終了")
-
+            try: self.driver_queue.get(block=False).quit()
+            except queue.Empty: break
+        with self.lock: self.count = 0
 
-# グローバルプール
-driver_pool = WebDriverPool(max_drivers=int(os.environ.get("MAX_WEBDRIVERS", "3")))
+driver_pool = WebDriverPool(max_drivers=int(os.getenv("MAX_WEBDRIVERS", "3")))
 
-
-# ===============================================================
-# Pydantic モデル
-# ===============================================================
+# ---------- Pydantic モデル ----------
 class GeminiRequest(BaseModel):
     text: str
     extension_percentage: float = 10.0
@@ -130,312 +81,153 @@ class GeminiRequest(BaseModel):
     trim_whitespace: bool = True
     style: str = "standard"
 
-
 class ScreenshotRequest(BaseModel):
     html_code: str
     extension_percentage: float = 10.0
     trim_whitespace: bool = True
     style: str = "standard"
 
-
-# ===============================================================
-# 補助関数
-# ===============================================================
+# ---------- 補助関数（前回と同じ：FontAwesome, prompt 取得, Gemini, トリミング） ----------
 def enhance_font_awesome_layout(html_code: str) -> str:
-    """Font Awesome をプリロード + レイアウト微調整 CSS を注入"""
-    fa_preload = """
+    preload = """
     <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/webfonts/fa-solid-900.woff2" as="font" type="font/woff2" crossorigin>
     <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/webfonts/fa-regular-400.woff2" as="font" type="font/woff2" crossorigin>
     <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/webfonts/fa-brands-400.woff2" as="font" type="font/woff2" crossorigin>
     """
-    fa_css = """
-    <style>
-      [class*="fa-"]{display:inline-block!important;margin-right:8px!important;vertical-align:middle!important;}
-      h1 [class*="fa-"],h2 [class*="fa-"],h3 [class*="fa-"],h4 [class*="fa-"],h5 [class*="fa-"],h6 [class*="fa-"]{vertical-align:middle!important;margin-right:10px!important;}
-      .fa+span,.fas+span,.far+span,.fab+span,span+.fa,span+.fas,span+.far+span{display:inline-block!important;margin-left:5px!important;}
-      .card [class*="fa-"],.card-body [class*="fa-"]{float:none!important;clear:none!important;position:relative!important;}
-      li [class*="fa-"],p [class*="fa-"]{margin-right:10px!important;}
-      .inline-icon{display:inline-flex!important;align-items:center!important;justify-content:flex-start!important;}
-      [class*="fa-"]+span{display:inline-block!important;vertical-align:middle!important;}
-    </style>
-    """
+    css = '<style>[class*="fa-"]{display:inline-block;margin-right:8px;vertical-align:middle}</style>'
     if '<head>' in html_code:
-        return html_code.replace('</head>', f'{fa_preload}{fa_css}</head>')
-    elif '<html' in html_code:
-        head_end = html_code.find('</head>')
-        if head_end > 0:
-            return html_code[:head_end] + fa_preload + fa_css + html_code[head_end:]
-        body_start = html_code.find('<body')
-        if body_start > 0:
-            return html_code[:body_start] + f'<head>{fa_preload}{fa_css}</head>' + html_code[body_start:]
-    return f'<html><head>{fa_preload}{fa_css}</head>{html_code}</html>'
-
-
-def load_system_instruction(style: str = "standard") -> str:
-    """スタイル別の prompt.txt をローカル or HF から読み込み"""
-    valid = ["standard", "cute", "resort", "cool", "dental", "school", "KOKUGO"]
-    if style not in valid:
-        logger.warning(f"無効 style '{style}' → 'standard'")
-        style = "standard"
-
-    local_path = os.path.join(os.path.dirname(__file__), style, "prompt.txt")
-    if os.path.exists(local_path):
-        with open(local_path, encoding="utf-8") as f:
-            return f.read()
+        return html_code.replace('</head>', f'{preload}{css}</head>')
+    return f'<html><head>{preload}{css}</head>{html_code}</html>'
 
+def load_system_instruction(style="standard"):
+    if style not in ["standard","cute","resort","cool","dental","school","KOKUGO"]:
+        style = "standard"
+    local = os.path.join(os.path.dirname(__file__), style, "prompt.txt")
+    if os.path.exists(local):
+        return open(local, encoding="utf-8").read()
     try:
-        file_path = hf_hub_download(
-            repo_id="tomo2chin2/GURAREKOstlyle",
-            filename=f"{style}/prompt.txt",
-            repo_type="dataset"
-        )
-        with open(file_path, encoding="utf-8") as f:
-            return f.read()
-    except Exception as e:
-        logger.warning(f"HF 取得失敗 ({e}) → デフォルト prompt.txt")
-        file_path = hf_hub_download(
-            repo_id="tomo2chin2/GURAREKOstlyle",
-            filename="prompt.txt",
-            repo_type="dataset"
-        )
-        with open(file_path, encoding="utf-8") as f:
-            return f.read()
-
-
-def generate_html_from_text(text: str, temperature: float = 0.5, style: str = "standard") -> str:
-    """Gemini で与えられたテキストを HTML に整形して返す"""
-    api_key = os.environ.get("GEMINI_API_KEY")
-    if not api_key:
-        raise ValueError("環境変数 GEMINI_API_KEY が未設定")
-    model_name = os.environ.get("GEMINI_MODEL", "gemini-1.5-pro")
-
-    genai.configure(api_key=api_key)
-    model = genai.GenerativeModel(model_name)
-
-    system_instruction = load_system_instruction(style)
-    prompt = f"{system_instruction}\n\n{text}"
-
-    generation_config = dict(
-        temperature=temperature, top_p=0.7, top_k=20,
-        max_output_tokens=8192, candidate_count=1
-    )
-    safety_settings = [
-        {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
-        {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
-        {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
-        {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"}
-    ]
-    resp = model.generate_content(prompt, generation_config=generation_config, safety_settings=safety_settings)
-    raw = resp.text
-
-    # ```html … ``` 抜き取り
-    start = raw.find("```html")
-    end = raw.rfind("```")
-    html_code = raw[start + 7:end].strip() if start != -1 and end != -1 else raw
-    return enhance_font_awesome_layout(html_code)
-
-
-def trim_image_whitespace(image: Image.Image, threshold: int = 250, padding: int = 10) -> Image.Image:
-    """白背景をトリミング"""
-    gray = image.convert("L")
-    arr = np.array(gray)
-    mask = arr < threshold
-    rows, cols = np.any(mask, axis=1), np.any(mask, axis=0)
-    if np.any(rows) and np.any(cols):
-        y_min, y_max = np.where(rows)[0][[0, -1]]
-        x_min, x_max = np.where(cols)[0][[0, -1]]
-        return image.crop((
-            max(0, x_min - padding), max(0, y_min - padding),
-            min(image.width - 1, x_max + padding), min(image.height - 1, y_max + padding)
-        ))
-    return image
-
+        path = hf_hub_download("tomo2chin2/GURAREKOstlyle", f"{style}/prompt.txt", repo_type="dataset")
+        return open(path, encoding="utf-8").read()
+    except Exception:
+        path = hf_hub_download("tomo2chin2/GURAREKOstlyle", "prompt.txt", repo_type="dataset")
+        return open(path, encoding="utf-8").read()
+
+def generate_html_from_text(text, temperature=0.5, style="standard"):
+    genai.configure(api_key=os.getenv("GEMINI_API_KEY"))
+    model = genai.GenerativeModel(os.getenv("GEMINI_MODEL","gemini-1.5-pro"))
+    prompt = f"{load_system_instruction(style)}\n\n{text}"
+    cfg=dict(temperature=temperature,top_p=0.7,top_k=20,max_output_tokens=8192,candidate_count=1)
+    raw=model.generate_content(prompt,generation_config=cfg).text
+    s,e=raw.find("```html"),raw.rfind("```")
+    html=raw[s+7:e].strip() if s!=-1 and e!=-1 else raw
+    return enhance_font_awesome_layout(html)
+
+def trim_image_whitespace(img:Image.Image,th=248,pad=20)->Image.Image:
+    arr=np.array(img.convert("L")); m=arr<th
+    if m.any():
+        y,x=np.where(m.any(1))[0],np.where(m.any(0))[0]
+        return img.crop((max(0,x[0]-pad),max(0,y[0]-pad),
+                         min(img.width-1,x[-1]+pad),min(img.height-1,y[-1]+pad)))
+    return img
 
-# ===============================================================
-# HTML → スクリーンショット
-# ===============================================================
-def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0,
-                               trim_whitespace: bool = True, driver=None) -> Image.Image:
-    tmp_path = None
-    driver_from_pool = False
+# ---------- HTML → PNG ----------
+def render_fullpage_screenshot(html, ext=6.0, trim_ws=True, driver=None):
+    tmp=None; from_pool=False
     try:
         if driver is None:
-            driver = driver_pool.get_driver()
-            driver_from_pool = True
-
-        # 一時 HTML 保存
-        with tempfile.NamedTemporaryFile(suffix=".html", delete=False, mode="w", encoding="utf-8") as tmp:
-            tmp_path = tmp.name
-            tmp.write(html_code)
-
-        driver.set_window_size(1200, 1000)
-        driver.get("file://" + tmp_path)
-
-        # body 待機
-        WebDriverWait(driver, 10).until(EC.presence_of_element_located((By.TAG_NAME, "body")))
-
-        total_height = driver.execute_script(
-            "return Math.max(document.body.scrollHeight, document.documentElement.scrollHeight)")
-        viewport_height = driver.execute_script("return window.innerHeight")
-        for i in range(max(1, min(5, total_height // viewport_height))):
-            driver.execute_script(f"window.scrollTo(0, {i * (viewport_height - 100)})")
-            time.sleep(0.1)
-        driver.execute_script("window.scrollTo(0,0)")
-        time.sleep(0.2)
-
-        dims = driver.execute_script("""
-            return {
-                width: Math.max(document.body.scrollWidth, document.documentElement.scrollWidth),
-                height: Math.max(document.body.scrollHeight, document.documentElement.scrollHeight)
-            }
-        """)
-        width = min(max(dims["width"], 100), 2000)
-        height = min(max(dims["height"], 100), 4000)
-        height = int(height * (1 + extension_percentage / 100.0))
-        driver.set_window_size(width, height)
-        time.sleep(0.5)
-
-        img = Image.open(BytesIO(driver.get_screenshot_as_png()))
-        return trim_image_whitespace(img, 248, 20) if trim_whitespace else img
+            driver=driver_pool.get_driver(); from_pool=True
+        with tempfile.NamedTemporaryFile(suffix=".html",delete=False,mode="w",encoding="utf-8") as f:
+            tmp=f.name; f.write(html)
+        driver.set_window_size(1200,1000)
+        driver.get("file://"+tmp)
+        WebDriverWait(driver,10).until(EC.presence_of_element_located((By.TAG_NAME,"body")))
+        h=driver.execute_script("return Math.max(document.body.scrollHeight, document.documentElement.scrollHeight)")
+        vh=driver.execute_script("return window.innerHeight")
+        for i in range(max(1,min(5,h//vh))):
+            driver.execute_script(f"window.scrollTo(0,{i*(vh-100)})"); time.sleep(0.1)
+        driver.execute_script("window.scrollTo(0,0)"); time.sleep(0.2)
+        dims=driver.execute_script("return {w:Math.max(document.body.scrollWidth,document.documentElement.scrollWidth),h:Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}")
+        w=min(max(dims['w'],100),2000); h=min(max(dims['h'],100),4000); h=int(h*(1+ext/100))
+        driver.set_window_size(w,h); time.sleep(0.4)
+        img=Image.open(BytesIO(driver.get_screenshot_as_png()))
+        return trim_image_whitespace(img,248,20) if trim_ws else img
     except Exception as e:
-        logger.error(f"Screenshot error: {e}", exc_info=True)
-        return Image.new("RGB", (1, 1), (0, 0, 0))
+        logger.error(f"Screenshot err: {e}",exc_info=True)
+        return Image.new("RGB",(1,1),(0,0,0))
     finally:
-        if driver_from_pool:
-            driver_pool.release_driver(driver)
-        if tmp_path and os.path.exists(tmp_path):
-            try:
-                os.remove(tmp_path)
-            except Exception:
-                pass
-
+        if from_pool: driver_pool.release_driver(driver)
+        if tmp and os.path.exists(tmp): os.remove(tmp)
 
-# ===============================================================
-# テキスト → スクリーンショット（並列）
-# ===============================================================
-def text_to_screenshot_parallel(text: str, extension_percentage: float, temperature: float = 0.5,
-                                trim_whitespace: bool = True, style: str = "standard") -> Image.Image:
-    start = time.time()
+# ---------- テキスト → PNG ----------
+def text_to_screenshot_parallel(text, ext, temp=0.5, trim_ws=True, style="standard"):
     with ThreadPoolExecutor(max_workers=2) as ex:
-        html_future = ex.submit(generate_html_from_text, text, temperature, style)
-        driver_future = ex.submit(driver_pool.get_driver)
-
-        html_code = html_future.result()
-        driver = driver_future.result()
-    img = render_fullpage_screenshot(html_code, extension_percentage, trim_whitespace, driver)
-    logger.info(f"並列生成完了: {time.time() - start:.2f}s")
-    return img
-
-
-def text_to_screenshot(*args, **kwargs):
-    """後方互換用エイリアス"""
-    return text_to_screenshot_parallel(*args, **kwargs)
-
+        html=ex.submit(generate_html_from_text,text,temp,style).result()
+        drv=ex.submit(driver_pool.get_driver).result()
+    return render_fullpage_screenshot(html,ext,trim_ws,drv)
 
 # ===============================================================
-# FastAPI
+# FastAPI （★ リダイレクト無効化）
 # ===============================================================
-app = FastAPI()
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=["*"], allow_credentials=True,
-    allow_methods=["*"], allow_headers=["*"]
-)
+app = FastAPI(redirect_slashes=False)
+app.add_middleware(CORSMiddleware,allow_origins=["*"],allow_credentials=True,
+                   allow_methods=["*"],allow_headers=["*"])
 
+@app.post("/api/screenshot",response_class=StreamingResponse,tags=["Screenshot"])
+async def api_screenshot(r:ScreenshotRequest):
+    img=render_fullpage_screenshot(r.html_code,r.extension_percentage,r.trim_whitespace)
+    buf=BytesIO(); img.save(buf,"PNG"); buf.seek(0); return StreamingResponse(buf,media_type="image/png")
 
-@app.post("/api/screenshot", response_class=StreamingResponse, tags=["Screenshot"])
-async def api_render_screenshot(req: ScreenshotRequest):
-    img = render_fullpage_screenshot(req.html_code, req.extension_percentage, req.trim_whitespace)
-    buf = BytesIO(); img.save(buf, "PNG"); buf.seek(0)
-    return StreamingResponse(buf, media_type="image/png")
-
-
-@app.post("/api/text-to-screenshot", response_class=StreamingResponse, tags=["Screenshot", "Gemini"])
-async def api_text_to_screenshot(req: GeminiRequest):
-    img = text_to_screenshot_parallel(
-        req.text, req.extension_percentage, req.temperature, req.trim_whitespace, req.style)
-    buf = BytesIO(); img.save(buf, "PNG"); buf.seek(0)
-    return StreamingResponse(buf, media_type="image/png")
-
+@app.post("/api/text-to-screenshot",response_class=StreamingResponse,tags=["Gemini","Screenshot"])
+async def api_text_to_screenshot(r:GeminiRequest):
+    img=text_to_screenshot_parallel(r.text,r.extension_percentage,r.temperature,r.trim_whitespace,r.style)
+    buf=BytesIO(); img.save(buf,"PNG"); buf.seek(0); return StreamingResponse(buf,media_type="image/png")
 
 # ===============================================================
 # Gradio UI
 # ===============================================================
-def process_input(mode, text, ext, temp, trim, style):
-    if mode == "HTML入力":
-        return render_fullpage_screenshot(text, ext, trim)
-    return text_to_screenshot_parallel(text, ext, temp, trim, style)
-
+def process(mode,txt,ext,temp,trim,style):
+    return render_fullpage_screenshot(txt,ext,trim) if mode=="HTML入力" else \
+           text_to_screenshot_parallel(txt,ext,temp,trim,style)
 
 with gr.Blocks(title="Full Page Screenshot (テキスト変換対応)",
-               theme=gr.themes.Origin()) as iface:
-    gr.Markdown("# HTMLビューア & テキスト→インフォグラフィック変換")
-    with gr.Row():
-        input_mode = gr.Radio(["HTML入力", "テキスト入力"], value="HTML入力", label="入力モード")
-
-    input_text = gr.Textbox(lines=15, label="入力")
-
+               theme=gr.themes.Origin()) as gui:
+    gr.Markdown("# HTMLビューア & テキスト→インフォグラフィック")
+    mode=gr.Radio(["HTML入力","テキスト入力"],value="HTML入力",label="入力モード")
+    txt=gr.Textbox(lines=15,label="入力")
     with gr.Row():
-        style_dropdown = gr.Dropdown(
-            ["standard", "cute", "resort", "cool", "dental", "school", "KOKUGO"],
-            value="standard", label="デザインスタイル", visible=False)
+        style=gr.Dropdown(["standard","cute","resort","cool","dental","school","KOKUGO"],
+                          value="standard",label="デザインスタイル",visible=False)
         with gr.Column(scale=2):
-            ext_slider = gr.Slider(0, 30, value=10, step=1, label="上下高さ拡張率（%）")
-            temp_slider = gr.Slider(0.0, 1.0, value=0.5, step=0.1,
-                                    label="生成時の温度", visible=False)
+            ext=gr.Slider(0,30,10,1,label="上下高さ拡張率（%）")
+            temp=gr.Slider(0.0,1.0,0.5,0.1,label="生成時の温度",visible=False)
+    trim=gr.Checkbox(True,label="余白を自動トリミング")
+    btn=gr.Button("生成")
+    out=gr.Image(type="pil",label="スクリーンショット")
 
-    trim_chk = gr.Checkbox(value=True, label="余白を自動トリミング")
+    mode.change(lambda m:[gr.update(visible=m=="テキスト入力")]*2,mode,[temp,style])
+    btn.click(process,[mode,txt,ext,temp,trim,style],out)
 
-    submit_btn = gr.Button("生成")
-    out_img = gr.Image(type="pil", label="スクリーンショット")
-
-    def toggle(mode):
-        is_text = mode == "テキスト入力"
-        return [gr.update(visible=is_text), gr.update(visible=is_text)]
-    input_mode.change(toggle, input_mode, [temp_slider, style_dropdown])
-
-    submit_btn.click(
-        process_input,
-        [input_mode, input_text, ext_slider, temp_slider, trim_chk, style_dropdown],
-        out_img)
-
-    model_name = os.environ.get("GEMINI_MODEL", "gemini-1.5-pro")
-    gr.Markdown(f"""
-**API**  
-- `/api/screenshot` – HTML → PNG  
-- `/api/text-to-screenshot` – テキスト → インフォグラフィック PNG  
-
-**設定**  
-- 使用モデル: `{model_name}`  
-- 対応スタイル: standard / cute / resort / cool / dental / school / KOKUGO  
-- WebDriver 最大数: {driver_pool.max_drivers}
-""")
-
-
-# ===============================================================
-# FastAPI へマウント & ルートリダイレクト
-# ===============================================================
-GRADIO_PATH = "/gradio"
-app = gr.mount_gradio_app(app, iface, path=GRADIO_PATH, ssr_mode=False)
+    gr.Markdown(f"**API**  `/api/screenshot`, `/api/text-to-screenshot`  \n使用モデル: `{os.getenv('GEMINI_MODEL','gemini-1.5-pro')}`")
 
+# ---------------------------------------------------------------
+# Gradio を /gradio にマウント
+# ---------------------------------------------------------------
+GRADIO_BASE="/gradio"
+app = gr.mount_gradio_app(app, gui, path=GRADIO_BASE, ssr_mode=False)
 
+# ルート → /gradio/ へワンショット転送
 @app.get("/")
-def _root():
-    """ルートに来たら /gradio へリダイレクト"""
-    return RedirectResponse(GRADIO_PATH)
+def _root(): return RedirectResponse(GRADIO_BASE+"/")
 
+# /gradio → /gradio/ にも転送して 307 を回避
+@app.get(GRADIO_BASE)
+def _no_slash(): return RedirectResponse(GRADIO_BASE+"/")
 
-# ===============================================================
-# ローカルデバッグ用
-# ===============================================================
-if __name__ == "__main__":
-    import uvicorn
+# ローカルデバッグ
+if __name__=="__main__":
+    import uvicorn, httpx
     logger.info("Uvicorn 起動 (ローカル)")
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    uvicorn.run(app,host="0.0.0.0",port=7860)
 
-
-# ===============================================================
-# 終了時 WebDriver 後始末
-# ===============================================================
-import atexit
-atexit.register(driver_pool.close_all)
+# 終了クリーンアップ
+import atexit; atexit.register(driver_pool.close_all)