Update app.py

app.py

@@ -363,7 +363,8 @@ def trim_image_whitespace(image, threshold=250, padding=10):
     logger.info(f"画像をトリミングしました: 元サイズ {width}x{height} → トリミング後 {trimmed.width}x{trimmed.height}")
     return trimmed
 
-# --- Core Screenshot Logic ---
+# 非同期スクリプトを使わず、同期的なスクリプトのみ使用する改善版
+
 def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0, 
                               trim_whitespace: bool = True) -> Image.Image:
     """
@@ -371,102 +372,14 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
 
     Args:
         html_code: The HTML source code string.
-        extension_percentage: Percentage of extra space to add vertically (e.g., 4 means 4% total).
+        extension_percentage: Percentage of extra space to add vertically.
         trim_whitespace: Whether to trim excess whitespace from the image.
 
     Returns:
-        A PIL Image object of the screenshot. Returns a 1x1 black image on error.
-    """
-    tmp_path = None # 初期化
-    driver = None # 初期化
-
-    # JavaScript関数を定義 - 古い構文を使用して互換性を確保
-    resource_check_script = """
-    return (function() {
-        var callback = arguments[arguments.length - 1];
-        
-        // Font Awesomeの読み込み確認
-        function checkFontAwesome() {
-            var icons = document.querySelectorAll('.fa, .fas, .far, .fab, [class*="fa-"]');
-            if (icons.length > 0) {
-                console.log('Font Awesome icons found:', icons.length);
-                // タイムアウトベースの簡易アプローチ
-                setTimeout(function() { callback(true); }, 1500);
-            } else {
-                // アイコンがない場合
-                setTimeout(function() { callback(true); }, 800);
-            }
-        }
-        
-        // DOMContentLoadedまたはloadイベント後にチェック
-        if (document.readyState === 'complete') {
-            checkFontAwesome();
-        } else {
-            window.addEventListener('load', checkFontAwesome);
-        }
-    })();
-    """
-    
-    scroll_script = """
-    return (function() {
-        var callback = arguments[arguments.length - 1];
-        
-        var height = Math.max(
-            document.documentElement.scrollHeight,
-            document.body.scrollHeight
-        );
-        var viewportHeight = window.innerHeight;
-        
-        // ページを少しずつスクロールして全体を描画させる
-        var scrollStep = Math.floor(viewportHeight * 0.8);
-        var currentPos = 0;
-        
-        function scrollDown() {
-            if (currentPos < height) {
-                window.scrollTo(0, currentPos);
-                currentPos += scrollStep;
-                setTimeout(scrollDown, 100);
-            } else {
-                // 最後にトップに戻す
-                window.scrollTo(0, 0);
-                setTimeout(function() { callback(true); }, 300);
-            }
-        }
-        
-        scrollDown();
-    })();
-    """
-    
-    stability_script = """
-    return (function() {
-        var callback = arguments[arguments.length - 1];
-        
-        var lastHeight = document.body.offsetHeight;
-        var lastWidth = document.body.offsetWidth;
-        var stableCount = 0;
-        
-        function checkStability() {
-            var currentHeight = document.body.offsetHeight;
-            var currentWidth = document.body.offsetWidth;
-            
-            if (currentHeight === lastHeight && currentWidth === lastWidth) {
-                stableCount++;
-                if (stableCount >= 3) {  // 3回連続で同じなら安定と判断
-                    callback(true);
-                    return;
-                }
-            } else {
-                stableCount = 0;
-                lastHeight = currentHeight;
-                lastWidth = currentWidth;
-            }
-            
-            setTimeout(checkStability, 200);  // 200ms間隔でチェック
-        }
-        
-        checkStability();
-    })();
+        A PIL Image object of the screenshot.
     """
+    tmp_path = None
+    driver = None
 
     # 1) Save HTML code to a temporary file
     try:
@@ -476,7 +389,7 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
         logger.info(f"HTML saved to temporary file: {tmp_path}")
     except Exception as e:
         logger.error(f"Error writing temporary HTML file: {e}")
-        return Image.new('RGB', (1, 1), color=(0, 0, 0)) # エラー時は黒画像
+        return Image.new('RGB', (1, 1), color=(0, 0, 0))
 
     # 2) Headless Chrome(Chromium) options
     options = Options()
@@ -484,7 +397,6 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
     options.add_argument("--no-sandbox")
     options.add_argument("--disable-dev-shm-usage")
     options.add_argument("--force-device-scale-factor=1")
-    # Font Awesomeが読み込まれない場合があるため、読み込み待機時間を長く設定
     options.add_argument("--disable-features=NetworkService")
     options.add_argument("--dns-prefetch-disable")
 
@@ -493,7 +405,7 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
         driver = webdriver.Chrome(options=options)
         logger.info("WebDriver initialized.")
 
-        # 3) 初期ウィンドウサイズを設定（コンテンツの種類に関わらず同じサイズ）
+        # 3) 初期ウィンドウサイズを設定
         initial_width = 1200  
         initial_height = 1000
         driver.set_window_size(initial_width, initial_height)
@@ -501,63 +413,58 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
         logger.info(f"Navigating to {file_url}")
         driver.get(file_url)
 
-        # 4) Wait for page load with extended timeout
+        # 4) ページ読み込み待機
         logger.info("Waiting for body element...")
         WebDriverWait(driver, 15).until(
             EC.presence_of_element_located((By.TAG_NAME, "body"))
         )
-        logger.info("Body element found. Waiting for potential resource loading...")
+        logger.info("Body element found. Waiting for resource loading...")
         
-        # リソース読み込みの基本的な待機時間
-        time.sleep(2)
+        # 5) 基本的なリソース読み込み待機 - タイムアウト回避
+        time.sleep(3)
         
-        # 5) Font Awesomeと外部リソースの読み込み完了を確認 - エラーハンドリング改善
-        logger.info("Waiting for Font Awesome and other resources to load...")
-        try:
-            driver.set_script_timeout(10)  # タイムアウト時間を短縮
-            driver.execute_async_script(resource_check_script)
-            logger.info("Resources loading check completed")
-        except Exception as e:
-            if "not defined" in str(e):
-                # 定義エラーは発生しないはず - ログ出力のみ
-                logger.warning(f"スクリプト変数エラー: {e}")
-                time.sleep(3)
-            else:
-                # 他のエラーでも処理を続行（短いタイムアウト）
-                logger.info(f"リソースチェックをスキップ: {str(e).split('Stacktrace')[0]}")
-                time.sleep(4)
-        
-        # 6) コンテンツ全体を描画するためのスクロール処理
-        logger.info("Rendering full page content...")
-        try:
-            driver.execute_async_script(scroll_script)
-        except Exception as e:
-            # エラーログを簡素化
-            logger.info(f"スクロール処理をスキップ: {str(e).split('Stacktrace')[0]}")
-            # フォールバック: 単純なスクロール処理
-            try:
-                driver.execute_script("""
-                    window.scrollTo(0, document.body.scrollHeight);
-                    setTimeout(function() { window.scrollTo(0, 0); }, 500);
-                """)
-                time.sleep(1.5)
-            except:
-                pass
-
-        # 7) Hide scrollbars via CSS
-        try:
-            driver.execute_script(
-                "document.documentElement.style.overflow = 'hidden';"
-                "document.body.style.overflow = 'hidden';"
-            )
-            logger.info("Scrollbars hidden via JS.")
-        except Exception as e:
-            logger.info(f"Could not hide scrollbars: {str(e).split('Stacktrace')[0]}")
-
-        # 8) Get full page dimensions accurately with improved script
-        try:
-            # より正確なページ寸法を取得するためのJavaScriptコード
-            dimensions_script = """
+        # Font Awesome読み込み確認 - 非同期を使わない
+        logger.info("Checking for Font Awesome resources...")
+        fa_count = driver.execute_script("""
+            var icons = document.querySelectorAll('.fa, .fas, .far, .fab, [class*="fa-"]');
+            return icons.length;
+        """)
+        logger.info(f"Found {fa_count} Font Awesome elements")
+        
+        # リソース読み込み状態を確認
+        doc_ready = driver.execute_script("return document.readyState;")
+        logger.info(f"Document ready state: {doc_ready}")
+        
+        # Font Awesomeが多い場合は追加待機
+        if fa_count > 50:
+            logger.info("Many Font Awesome icons detected, waiting additional time")
+            time.sleep(2)
+        
+        # 6) コンテンツレンダリングのためのスクロール処理 - 同期的に実行
+        logger.info("Performing content rendering scroll...")
+        total_height = driver.execute_script("return Math.max(document.body.scrollHeight, document.documentElement.scrollHeight);")
+        viewport_height = driver.execute_script("return window.innerHeight;")
+        scrolls_needed = max(1, total_height // viewport_height)
+        
+        for i in range(scrolls_needed + 1):
+            scroll_pos = i * (viewport_height - 200)  # オーバーラップさせる
+            driver.execute_script(f"window.scrollTo(0, {scroll_pos});")
+            time.sleep(0.2)  # 短い待機
+        
+        # トップに戻る
+        driver.execute_script("window.scrollTo(0, 0);")
+        time.sleep(0.5)
+        logger.info("Scroll rendering completed")
+
+        # 7) スクロールバーを非表示に
+        driver.execute_script("""
+            document.documentElement.style.overflow = 'hidden';
+            document.body.style.overflow = 'hidden';
+        """)
+        logger.info("Scrollbars hidden")
+
+        # 8) ページの寸法を取得
+        dimensions = driver.execute_script("""
             return {
                 width: Math.max(
                     document.documentElement.scrollWidth,
@@ -576,114 +483,80 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
                     document.body ? document.body.clientHeight : 0
                 )
             };
-            """
-            dimensions = driver.execute_script(dimensions_script)
-            scroll_width = dimensions['width']
-            scroll_height = dimensions['height']
-            
-            logger.info(f"Detected dimensions: width={scroll_width}, height={scroll_height}")
-            
-            # スクロールして確認する追加の検証
-            driver.execute_script("window.scrollTo(0, document.body.scrollHeight);")
-            time.sleep(1)  # スクロール完了を待つ
-            driver.execute_script("window.scrollTo(0, 0);")
-            time.sleep(1)  # 元の位置に戻す
-            
-            # 再検証
-            dimensions_after_scroll = driver.execute_script(dimensions_script)
-            scroll_height = max(scroll_height, dimensions_after_scroll['height'])
-            
-            logger.info(f"After scroll check, height={scroll_height}")
-            
-            # 最小値と最大値の設定
-            scroll_width = max(scroll_width, 100)  # 最小幅
-            scroll_height = max(scroll_height, 100)  # 最小高さ
-            
-            scroll_width = min(scroll_width, 2000)  # 最大幅
-            scroll_height = min(scroll_height, 4000)  # 最大高さ
-
-        except Exception as e:
-            logger.error(f"Error getting page dimensions: {e}")
-            # フォールバックとしてデフォルト値を設定
-            scroll_width = 1200
-            scroll_height = 1000
-            logger.warning(f"Falling back to dimensions: width={scroll_width}, height={scroll_height}")
-        
-        # 9) レイアウト安定化の確認 - 簡素化
-        logger.info("Checking layout stability...")
-        try:
-            driver.set_script_timeout(5)  # 短いタイムアウト
-            driver.execute_async_script(stability_script)
-            logger.info("Layout stability verified")
-        except Exception as e:
-            # エラーログを簡素化
-            logger.info(f"安定性チェックをスキップ: {str(e).split('Stacktrace')[0]}")
-            # 代わりに固定待機
-            time.sleep(2)
-
-        # 10) Calculate adjusted height with user-specified margin
+        """)
+        scroll_width = dimensions['width']
+        scroll_height = dimensions['height']
+        logger.info(f"Detected dimensions: width={scroll_width}, height={scroll_height}")
+        
+        # 再検証 - 短いスクロールで再確認
+        driver.execute_script("window.scrollTo(0, document.body.scrollHeight);")
+        time.sleep(0.5)
+        driver.execute_script("window.scrollTo(0, 0);")
+        time.sleep(0.5)
+        
+        dimensions_after = driver.execute_script("return {height: Math.max(document.documentElement.scrollHeight, document.body.scrollHeight)};")
+        scroll_height = max(scroll_height, dimensions_after['height'])
+        logger.info(f"After scroll check, height={scroll_height}")
+        
+        # 最小/最大値の設定
+        scroll_width = max(scroll_width, 100)
+        scroll_height = max(scroll_height, 100)
+        scroll_width = min(scroll_width, 2000)
+        scroll_height = min(scroll_height, 4000)
+        
+        # 9) レイアウト安定化のための単純な待機 - タイムアウト回避
+        logger.info("Waiting for layout stabilization...")
+        time.sleep(2)
+        
+        # 10) 高さに余白を追加
         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)  # 最小高さを確保
+        adjusted_height = max(adjusted_height, scroll_height, 100)
         logger.info(f"Adjusted height calculated: {adjusted_height} (extension: {extension_percentage}%)")
 
-        # 11) Set window size to full page dimensions
+        # 11) ウィンドウサイズを調整
         adjusted_width = scroll_width
         logger.info(f"Resizing window to: width={adjusted_width}, height={adjusted_height}")
         driver.set_window_size(adjusted_width, adjusted_height)
-        logger.info("Waiting for layout stabilization after resize...")
+        time.sleep(1)
         
-        # レイアウト安定化のための待機
-        time.sleep(3)  # 統一した待機時間
-
-        # 外部リソースの読み込み状態を確認
-        try:
-            resource_state = driver.execute_script("""
+        # リソース状態を確認 - 同期的スクリプト
+        resource_state = driver.execute_script("""
             return {
                 readyState: document.readyState,
                 resourcesComplete: !document.querySelector('img:not([complete])') && 
-                                   !document.querySelector('link[rel="stylesheet"]:not([loaded])')
+                                  !document.querySelector('link[rel="stylesheet"]:not([loaded])')
             };
-            """)
-            logger.info(f"Resource state: {resource_state}")
-            
-            # ドキュメントの読み込みが完了していない場合、追加で待機
-            if resource_state['readyState'] != 'complete':
-                logger.info("Document still loading, waiting additional time...")
-                time.sleep(2)
-        except Exception as e:
-            logger.info(f"Resource state check skipped: {str(e).split('Stacktrace')[0]}")
-
-        # Scroll to top just in case
-        try:
-            driver.execute_script("window.scrollTo(0, 0)")
+        """)
+        logger.info(f"Resource state: {resource_state}")
+        
+        if resource_state['readyState'] != 'complete':
+            logger.info("Document still loading, waiting additional time...")
             time.sleep(1)
-            logger.info("Scrolled to top.")
-        except Exception as e:
-             logger.info(f"Could not scroll to top: {str(e).split('Stacktrace')[0]}")
+        
+        # トップにスクロール
+        driver.execute_script("window.scrollTo(0, 0);")
+        time.sleep(0.5)
+        logger.info("Scrolled to top.")
 
-        # 12) Take screenshot
+        # 12) スクリーンショット取得
         logger.info("Taking screenshot...")
         png = driver.get_screenshot_as_png()
         logger.info("Screenshot taken successfully.")
 
-        # Convert to PIL Image
+        # PIL画像に変換
         img = Image.open(BytesIO(png))
-        
-        # 画像サイズの確認とログ
         logger.info(f"Screenshot dimensions: {img.width}x{img.height}")
         
-        # 余白トリミングが有効な場合
+        # 余白トリミング
         if trim_whitespace:
-            # 余分な空白をトリミング
             img = trim_image_whitespace(img, threshold=248, padding=20)
             logger.info(f"Trimmed dimensions: {img.width}x{img.height}")
         
         return img
 
     except Exception as e:
-        logger.error(f"An error occurred during screenshot generation: {e}", exc_info=True)
-        return Image.new('RGB', (1, 1), color=(0, 0, 0)) # Return black 1x1 image on error
+        logger.error(f"Error during screenshot generation: {e}")
+        return Image.new('RGB', (1, 1), color=(0, 0, 0))
     finally:
         logger.info("Cleaning up...")
         if driver:
@@ -698,7 +571,7 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
                 logger.info(f"Temporary file {tmp_path} removed.")
             except Exception as e:
                 logger.error(f"Error removing temporary file {tmp_path}: {e}")
-
+                
 # --- Geminiを使った新しい関数 ---
 def text_to_screenshot(text: str, extension_percentage: float, temperature: float = 0.3, trim_whitespace: bool = True) -> Image.Image:
     """テキストをGemini APIでHTMLに変換し、スクリーンショットを生成する統合関数"""