Update app.py

app.py

@@ -268,7 +268,7 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                 while not operation.done:
                     if time.time() - start_time > timeout_seconds:
                         raise TimeoutError("Video generation timed out")
-                    time.sleep(5)  # Reduced polling interval
+                    time.sleep(5)
                     operation = client.operations.get(operation)
                 if operation.error:
                     raise ValueError(f"Video generation failed: {operation.error.message}")
@@ -376,22 +376,28 @@ def start_feed(user_input, generate_video, current_index, feed_items):
     current_user_input = user_input
     is_loading = True
     share_links = ""
+    timeout_seconds = 120  # Timeout for entire generation process
     
     html_content = generate_html([], False, 0, user_input, is_loading, "initializing", random.choice(PROGRESS_STAGES["initializing"]), 10)
     yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
 
     try:
+        start_time = time.time()
         html_content = generate_html([], False, 0, user_input, is_loading, "generating_ideas", random.choice(PROGRESS_STAGES["generating_ideas"]), 20)
         yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
         ideas = generate_ideas(user_input)
         
         item_generator = generate_item(user_input, ideas, generate_video=generate_video)
         for progress in item_generator:
+            if time.time() - start_time > timeout_seconds:
+                logging.error("Generation timed out")
+                raise TimeoutError("Feed generation timed out")
             logging.debug(f"Progress update: {progress}")
             if isinstance(progress, dict) and "stage" in progress:
                 html_content = generate_html([], False, 0, user_input, is_loading, progress["stage"], progress["message"], progress["progress"])
                 yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
             else:
+                logging.debug("Received final item from generator")
                 item = progress
                 feed_items = [item]
                 current_index = 0
@@ -401,6 +407,29 @@ def start_feed(user_input, generate_video, current_index, feed_items):
                 logging.debug("Feed generation complete")
                 yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
                 return
+        logging.warning("Generator exhausted without returning final item")
+        # Fallback if generator doesn't return
+        html_content = """
+        <div style="
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            max-width: 360px;
+            margin: 0 auto;
+            background-color: #000;
+            height: 640px;
+            border: 1px solid #333;
+            border-radius: 10px;
+            color: white;
+            font-family: Arial, sans-serif;
+        ">
+            <p>Generation incomplete. Please try again!</p>
+        </div>
+        """
+        is_loading = False
+        yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
+        return
     except Exception as e:
         logging.error(f"Error in start_feed: {e}")
         html_content = """
@@ -418,7 +447,7 @@ def start_feed(user_input, generate_video, current_index, feed_items):
             color: white;
             font-family: Arial, sans-serif;
         ">
-            <p>Error generating content. Please try again!</p>
+            <p>Error generating content: {str(e)}. Please try again!</p>
         </div>
         """
         is_loading = False
@@ -434,6 +463,7 @@ def load_next(user_input, generate_video, current_index, feed_items):
     user_input = current_user_input
     is_loading = True
     share_links = ""
+    timeout_seconds = 120  # Timeout for entire generation process
     
     html_content = generate_html(feed_items, False, current_index, user_input, is_loading, "initializing", random.choice(PROGRESS_STAGES["initializing"]), 10)
     yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
@@ -452,17 +482,22 @@ def load_next(user_input, generate_video, current_index, feed_items):
             yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
             return
         else:
+            start_time = time.time()
             ideas = feed_items[-1]['ideas'] if feed_items else generate_ideas(user_input)
             html_content = generate_html(feed_items, False, current_index, user_input, is_loading, "generating_ideas", random.choice(PROGRESS_STAGES["generating_ideas"]), 20)
             yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
             
             item_generator = generate_item(user_input, ideas, generate_video=generate_video)
             for progress in item_generator:
+                if time.time() - start_time > timeout_seconds:
+                    logging.error("Generation timed out")
+                    raise TimeoutError("Feed generation timed out")
                 logging.debug(f"Progress update: {progress}")
                 if isinstance(progress, dict) and "stage" in progress:
                     html_content = generate_html(feed_items, False, current_index, user_input, is_loading, progress["stage"], progress["message"], progress["progress"])
                     yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
                 else:
+                    logging.debug("Received final item from generator")
                     new_item = progress
                     feed_items.append(new_item)
                     current_index = len(feed_items) - 1
@@ -476,6 +511,29 @@ def load_next(user_input, generate_video, current_index, feed_items):
                     logging.debug("New feed item generated")
                     yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
                     return
+            logging.warning("Generator exhausted without returning final item")
+            # Fallback if generator doesn't return
+            html_content = """
+            <div style="
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                max-width: 360px;
+                margin: 0 auto;
+                background-color: #000;
+                height: 640px;
+                border: 1px solid #333;
+                border-radius: 10px;
+                color: white;
+                font-family: Arial, sans-serif;
+            ">
+                <p>Generation incomplete. Please try again!</p>
+            </div>
+            """
+            is_loading = False
+            yield current_user_input, current_index, feed_items, html_content, share_links, is_loading
+            return
     except Exception as e:
         logging.error(f"Error in load_next: {e}")
         html_content = """
@@ -493,7 +551,7 @@ def load_next(user_input, generate_video, current_index, feed_items):
             color: white;
             font-family: Arial, sans-serif;
         ">
-            <p>Error generating content. Please try again!</p>
+            <p>Error generating content: {str(e)}. Please try again!</p>
         </div>
         """
         is_loading = False
@@ -544,15 +602,15 @@ def generate_share_links(image_base64, video_base64, caption):
         video_data_url = f"data:video/mp4;base64,{video_base64}"
         download_links += f"""
             <a href="{video_data_url}" download="feed_video.mp4" style="
-                background-color: #4CAF50;
-                color: white;
-                padding: 8px 16px;
-                border-radius: 5px;
-                text-decoration: none;
-                font-size: 14px;
-                font-weight: bold;
-                transition: background-color 0.3s;
-            " onmouseover="this.style.backgroundColor='#45a049'" onmouseout="this.style.backgroundColor='#4CAF50'">Download Video</a>
+            background-color: #4CAF50;
+            color: white;
+            padding: 8px 16px;
+            border-radius: 5px;
+            text-decoration: none;
+            font-size: 14px;
+            font-weight: bold;
+            transition: background-color 0.3s;
+        " onmouseover="this.style.backgroundColor='#45a049'" onmouseout="this.style.backgroundColor='#4CAF50'">Download Video</a>
         """
     download_links += "</div>"