Update app.py

app.py

@@ -1,8 +1,8 @@
-# --- START OF FILE app.py ---
-
 import gradio as gr
 from fastapi import FastAPI, HTTPException, Body
 from fastapi.responses import StreamingResponse
+from fastapi.staticfiles import StaticFiles
+from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options
@@ -14,7 +14,7 @@ from io import BytesIO
 import tempfile
 import time
 import os
-import logging # loggingを追加
+import logging
 
 # ロギング設定
 logging.basicConfig(level=logging.INFO)
@@ -84,7 +84,6 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float) -> I
         except Exception as e:
             logger.warning(f"Could not hide scrollbars via JS: {e}")
 
-
         # 6) Get full page dimensions accurately
         try:
             scroll_width = driver.execute_script(
@@ -105,14 +104,12 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float) -> I
             scroll_height = 800
             logger.warning(f"Falling back to dimensions: width={scroll_width}, height={scroll_height}")
 
-
         # 7) Calculate adjusted height with user-specified margin
         adjusted_height = int(scroll_height * (1 + extension_percentage / 100.0))
         # Ensure adjusted height is not excessively large or small
         adjusted_height = max(adjusted_height, scroll_height, 100) # 最小高さを確保
         logger.info(f"Adjusted height calculated: {adjusted_height} (extension: {extension_percentage}%)")
 
-
         # 8) Set window size to full page dimensions (width) and adjusted height
         logger.info(f"Resizing window to: width={scroll_width}, height={adjusted_height}")
         driver.set_window_size(scroll_width, adjusted_height)
@@ -134,27 +131,10 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float) -> I
 
         # Convert to PIL Image
         img = Image.open(BytesIO(png))
-        # Crop the image back to the original scroll_height plus margin
-        # This removes extra blank space at the bottom if window resize was much larger
-        # The screenshot captures the viewport, which we set to adjusted_height
-        # We only need scroll_height + (scroll_height * extension_percentage / 200) top/bottom margin
-        # However, simple approach: use adjusted_height directly or crop if needed.
-        # Let's return the full adjusted_height capture for now.
-        # If cropping is needed:
-        # final_height = int(scroll_height * (1 + extension_percentage / 100.0))
-        # if img.height > final_height:
-        #    img = img.crop((0, 0, img.width, final_height))
-        #    logger.info(f"Cropped image to final height: {final_height}")
-
         return img
 
     except Exception as e:
         logger.error(f"An error occurred during screenshot generation: {e}", exc_info=True)
-        # Optionally capture a screenshot even on error for debugging
-        # try:
-        #     if driver: driver.save_screenshot("error_screenshot.png")
-        # except Exception as screen_err:
-        #     logger.error(f"Could not save error screenshot: {screen_err}")
         return Image.new('RGB', (1, 1), color=(0, 0, 0)) # Return black 1x1 image on error
     finally:
         logger.info("Cleaning up...")
@@ -174,6 +154,45 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float) -> I
 # --- FastAPI Setup ---
 app = FastAPI()
 
+# CORS設定を追加
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+# 静的ファイルのサービング設定
+# Gradioのディレクトリを探索してアセットを見つける
+gradio_dir = os.path.dirname(gr.__file__)
+logger.info(f"Gradio version: {gr.__version__}")
+logger.info(f"Gradio directory: {gradio_dir}")
+
+# 基本的な静的ファイルディレクトリをマウント
+static_dir = os.path.join(gradio_dir, "templates", "frontend", "static")
+if os.path.exists(static_dir):
+    logger.info(f"Mounting static directory: {static_dir}")
+    app.mount("/static", StaticFiles(directory=static_dir), name="static")
+
+# _appディレクトリを探す（新しいSvelteKitベースのフロントエンド用）
+app_dir = os.path.join(gradio_dir, "templates", "frontend", "_app")
+if os.path.exists(app_dir):
+    logger.info(f"Mounting _app directory: {app_dir}")
+    app.mount("/_app", StaticFiles(directory=app_dir), name="_app")
+
+# assetsディレクトリを探す
+assets_dir = os.path.join(gradio_dir, "templates", "frontend", "assets")
+if os.path.exists(assets_dir):
+    logger.info(f"Mounting assets directory: {assets_dir}")
+    app.mount("/assets", StaticFiles(directory=assets_dir), name="assets")
+
+# cdnディレクトリがあれば追加
+cdn_dir = os.path.join(gradio_dir, "templates", "cdn")
+if os.path.exists(cdn_dir):
+    logger.info(f"Mounting cdn directory: {cdn_dir}")
+    app.mount("/cdn", StaticFiles(directory=cdn_dir), name="cdn")
+
 # Pydantic model for API request body validation
 class ScreenshotRequest(BaseModel):
     html_code: str
@@ -202,7 +221,6 @@ async def api_render_screenshot(request: ScreenshotRequest):
              # Optionally return a proper error response instead of 1x1 image
              # raise HTTPException(status_code=500, detail="Failed to generate screenshot")
 
-
         # Convert PIL Image to PNG bytes
         img_byte_arr = BytesIO()
         pil_image.save(img_byte_arr, format='PNG')
@@ -216,7 +234,6 @@ async def api_render_screenshot(request: ScreenshotRequest):
         raise HTTPException(status_code=500, detail=f"Internal Server Error: {e}")
 
 # --- Gradio Interface Definition ---
-# Note: We reuse the same core function 'render_fullpage_screenshot'
 iface = gr.Interface(
     fn=render_fullpage_screenshot,
     inputs=[
@@ -224,23 +241,17 @@ iface = gr.Interface(
         gr.Slider(minimum=0, maximum=20, step=1.0, value=8, label="上下高さ拡張率（%）")
     ],
     outputs=gr.Image(type="pil", label="ページ全体のスクリーンショット"),
-    title="Full Page Screenshot (高さ拡張調整可能)", # APIを削除
+    title="Full Page Screenshot (高さ拡張調整可能)",
     description="HTMLをヘッドレスブラウザでレンダリングし、ページ全体を1枚の画像として取得します。上下のみユーザー指定の余裕(%)を追加します。APIエンドポイントは /api/screenshot で利用可能です。",
-    allow_flagging="never" # Hugging Face Spacesでのフラグ付けを無効化 (任意)
+    allow_flagging="never",
+    theme=gr.themes.Base()  # 明示的にテーマを指定
 )
 
 # --- Mount Gradio App onto FastAPI ---
-# Mount the Gradio interface at the root path "/"
 app = gr.mount_gradio_app(app, iface, path="/")
 
 # --- Run with Uvicorn (for local testing) ---
-# This part is mainly for local development.
-# When deploying on Hugging Face Spaces, the Spaces runtime handles launching the app.
 if __name__ == "__main__":
     import uvicorn
     logger.info("Starting Uvicorn server for local development...")
-    # Host '0.0.0.0' makes it accessible on the network
-    # Port 7860 is a common default for Gradio, but 8000 is common for FastAPI
-    uvicorn.run(app, host="0.0.0.0", port=7860)
-
-# --- END OF FILE app.py ---
+    uvicorn.run(app, host="0.0.0.0", port=7860)