Update app.py

app.py

@@ -98,7 +98,7 @@ def generate_ideas(user_input):
 
 def generate_item(user_input, ideas, generate_video=False, max_retries=3):
     """
-    Generate a single feed item (image and optionally video) using one of the ideas.
+    Generate a single feed item (image and optionally one video) using one of the ideas.
     
     Args:
         user_input (str): The user's input concept or idea.
@@ -107,9 +107,9 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
         max_retries (int): Maximum number of retries if image generation fails.
     
     Returns:
-        dict: A dictionary with 'text' (str), 'image_base64' (str), 'video_base64_list' (list of str), and 'ideas' (list).
+        dict: A dictionary with 'text' (str), 'image_base64' (str), 'video_base64' (str or None), and 'ideas' (list).
     """
-    video_base64_list = []
+    video_base64 = None  # Changed from a list to a single value (string or None)
     
     for attempt in range(max_retries):
         selected_idea = random.choice(ideas)
@@ -149,7 +149,7 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                 prompt=image_prompt,
                 config=types.GenerateImagesConfig(
                     aspect_ratio="9:16",
-                    number_of_images=1
+                    number_of_images=1  # Already set to 1 image
                 )
             )
             if imagen.generated_images and len(imagen.generated_images) > 0:
@@ -164,7 +164,7 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                 image.save(buffered, format="PNG")
                 img_str = base64.b64encode(buffered.getvalue()).decode()
 
-                # Generate video if enabled
+                # Generate video if enabled (only 1 video)
                 if generate_video:
                     try:
                         # Enhance the image prompt for video generation
@@ -179,12 +179,12 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                             image=generated_image.image,
                             config=types.GenerateVideosConfig(
                                 aspect_ratio="9:16",
-                                number_of_videos=2,
+                                number_of_videos=1,  # Changed to 1 video
                                 duration_seconds=8,
                                 negative_prompt="blurry, low quality, text, letters"
                             )
                         )
-                        # Wait for videos to generate
+                        # Wait for video to generate
                         while not operation.done:
                             time.sleep(20)
                             operation = client.operations.get(operation)
@@ -197,11 +197,12 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                         if not hasattr(operation.response, 'generated_videos') or operation.response.generated_videos is None:
                             raise ValueError("Video generation operation failed: No generated_videos in response")
                         
-                        # Iterate over generated videos
-                        for n, video in enumerate(operation.response.generated_videos, start=1):
+                        # Process the single generated video
+                        if len(operation.response.generated_videos) > 0:
+                            video = operation.response.generated_videos[0]
                             if video is None or not hasattr(video, 'video'):
-                                raise ValueError(f"Video {n} is invalid or missing video data")
-                            fname = f'with_image_input{n}.mp4'
+                                raise ValueError("Video is invalid or missing video data")
+                            fname = 'with_image_input.mp4'  # Removed numbering since only 1 video
                             print(f"Generated video: {fname}")
                             # Download the video and get the raw bytes
                             video_data = client.files.download(file=video.video)
@@ -216,15 +217,16 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                                 video_bytes = video_buffer.getvalue()
                             # Encode the video bytes as base64
                             video_base64 = base64.b64encode(video_bytes).decode()
-                            video_base64_list.append(video_base64)
+                        else:
+                            raise ValueError("No video was generated")
                     except Exception as e:
                         print(f"Error generating video: {e}")
-                        video_base64_list = []  # Proceed without video if generation fails
+                        video_base64 = None  # Proceed without video if generation fails
 
                 return {
                     'text': text,
                     'image_base64': img_str,
-                    'video_base64_list': video_base64_list,
+                    'video_base64': video_base64,  # Now a single string or None
                     'ideas': ideas
                 }
             else:
@@ -238,7 +240,7 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                     return {
                         'text': text,
                         'image_base64': img_str,
-                        'video_base64_list': [],
+                        'video_base64': None,
                         'ideas': ideas
                     }
                 # Retry with new ideas
@@ -255,7 +257,7 @@ def generate_item(user_input, ideas, generate_video=False, max_retries=3):
                 return {
                     'text': text,
                     'image_base64': img_str,
-                    'video_base64_list': [],
+                    'video_base64': None,
                     'ideas': ideas
                 }
             # Retry with new ideas
@@ -290,7 +292,7 @@ def start_feed(user_input, generate_video, current_index, feed_items):
         current_index = 0
         share_links = generate_share_links(
             item['image_base64'],
-            item['video_base64_list'],
+            item['video_base64'],
             item['text']
         )
     except Exception as e:
@@ -307,7 +309,7 @@ def start_feed(user_input, generate_video, current_index, feed_items):
             margin: 0 auto;
             background-color: #000;
             height: 640px;
-            border: 1px solid #333;
+            border: 1px solidBundled #333;
             border-radius: 10px;
             color: white;
             font-family: Arial, sans-serif;
@@ -350,7 +352,7 @@ def load_next(user_input, generate_video, current_index, feed_items):
             current_index = len(feed_items) - 1
         share_links = generate_share_links(
             feed_items[current_index]['image_base64'],
-            feed_items[current_index]['video_base64_list'],
+            feed_items[current_index]['video_base64'],
             feed_items[current_index]['text']
         )
     except Exception as e:
@@ -398,18 +400,18 @@ def load_previous(user_input, generate_video, current_index, feed_items):
     html_content = generate_html(feed_items, False, current_index, user_input, False)
     share_links = generate_share_links(
         feed_items[current_index]['image_base64'],
-        feed_items[current_index]['video_base64_list'],
+        feed_items[current_index]['video_base64'],
         feed_items[current_index]['text']
     )
     return user_input, current_index, feed_items, html_content, share_links, False
 
-def generate_share_links(image_base64, video_base64_list, caption):
+def generate_share_links(image_base64, video_base64, caption):
     """
     Generate share links for social media platforms with download links for image and video.
     
     Args:
         image_base64 (str): The base64-encoded image data.
-        video_base64_list (list): List of base64-encoded video data.
+        video_base64 (str or None): The base64-encoded video data (single video).
         caption (str): The caption to share.
     
     Returns:
@@ -418,89 +420,136 @@ def generate_share_links(image_base64, video_base64_list, caption):
     image_data_url = f"data:image/png;base64,{image_base64}"
     encoded_caption = urllib.parse.quote(caption)
 
-    # Generate download links for image and videos
+    # Generate download links for image and video (if available)
     download_links = f"""
-        <p style="text-align: center;">Download and attach the image/video to share:</p>
-        <a href="{image_data_url}" download="feed_item.png" style="
-            background-color: #4CAF50;
-            color: white;
-            padding: 5px 10px;
-            border-radius: 5px;
-            text-decoration: none;
-            margin: 5px;
-        ">Download Image</a>
+        <p style="text-align: center; margin-bottom: 10px;">Download the media to share:</p>
+        <div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 8px; margin-bottom: 15px;">
+            <a href="{image_data_url}" download="feed_item.png" 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 Image</a>
     """
-    for i, video_base64 in enumerate(video_base64_list):
+    if video_base64:  # Only include video download link if a video exists
         video_data_url = f"data:video/mp4;base64,{video_base64}"
         download_links += f"""
-            <a href="{video_data_url}" download="feed_video_{i}.mp4" style="
+            <a href="{video_data_url}" download="feed_video.mp4" style="
                 background-color: #4CAF50;
                 color: white;
-                padding: 5px 10px;
+                padding: 8px 16px;
                 border-radius: 5px;
                 text-decoration: none;
-                margin: 5px;
-            ">Download Video {i+1}</a>
+                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>"
 
-    # Generate share links using only the caption
-    share_links = f"""
-    <div style="
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        gap: 10px;
-        margin-top: 10px;
-        color: white;
-        font-family: Arial, sans-serif;
-    ">
-        {download_links}
+    # Generate share links for social media platforms
+    share_links = """
         <div style="
             display: flex;
             flex-wrap: wrap;
             justify-content: center;
-            gap: 10px;
-            margin-top: 10px;
+            gap: 8px;
+            margin-bottom: 15px;
         ">
             <a href="https://www.tiktok.com/upload?caption={caption}" target="_blank" style="
                 background-color: #00f2ea;
                 color: #000;
-                padding: 5px 10px;
+                padding: 8px 16px;
                 border-radius: 5px;
                 text-decoration: none;
-            ">Share on TikTok</a>
+                font-size: 14px;
+                font-weight: bold;
+                transition: background-color 0.3s;
+            " onmouseover="this.style.backgroundColor='#00d9d1'" onmouseout="this.style.backgroundColor='#00f2ea'">Share on TikTok</a>
             <a href="https://www.instagram.com/?caption={caption}" target="_blank" style="
                 background-color: #e1306c;
                 color: white;
-                padding: 5px 10px;
+                padding: 8px 16px;
                 border-radius: 5px;
                 text-decoration: none;
-            ">Share on Instagram</a>
+                font-size: 14px;
+                font-weight: bold;
+                transition: background-color 0.3s;
+            " onmouseover="this.style.backgroundColor='#c72b5e'" onmouseout="this.style.backgroundColor='#e1306c'">Share on Instagram</a>
             <a href="https://www.facebook.com/sharer/sharer.php?quote={caption}" target="_blank" style="
                 background-color: #4267b2;
                 color: white;
-                padding: 5px 10px;
+                padding: 8px 16px;
                 border-radius: 5px;
                 text-decoration: none;
-            ">Share on Facebook</a>
+                font-size: 14px;
+                font-weight: bold;
+                transition: background-color 0.3s;
+            " onmouseover="this.style.backgroundColor='#395a9d'" onmouseout="this.style.backgroundColor='#4267b2'">Share on Facebook</a>
             <a href="https://twitter.com/intent/tweet?text={caption}" target="_blank" style="
                 background-color: #1da1f2;
                 color: white;
-                padding: 5px 10px;
+                padding: 8px 16px;
                 border-radius: 5px;
                 text-decoration: none;
-            ">Share on X</a>
+                font-size: 14px;
+                font-weight: bold;
+                transition: background-color 0.3s;
+            " onmouseover="this.style.backgroundColor='#1a91da'" onmouseout="this.style.backgroundColor='#1da1f2'">Share on X</a>
             <a href="https://pinterest.com/pin/create/button/?description={caption}" target="_blank" style="
                 background-color: #bd081c;
                 color: white;
-                padding: 5px 10px;
+                padding: 8px 16px;
                 border-radius: 5px;
                 text-decoration: none;
-            ">Share on Pinterest</a>
+                font-size: 14px;
+                font-weight: bold;
+                transition: background-color 0.3s;
+            " onmouseover="this.style.backgroundColor='#a30718'" onmouseout="this.style.backgroundColor='#bd081c'">Share on Pinterest</a>
         </div>
-    </div>
     """
-    return share_links
+
+    # Add YouTube Shorts share button if a video is available
+    youtube_share = ""
+    if video_base64:  # Only show YouTube Shorts share button if a video is generated
+        youtube_share = f"""
+            <div style="
+                display: flex;
+                justify-content: center;
+                margin-top: 10px;
+            ">
+                <a href="https://www.youtube.com/upload?description={caption}" target="_blank" style="
+                    background-color: #ff0000;
+                    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='#e60000'" onmouseout="this.style.backgroundColor='#ff0000'">Share to YouTube as a Short</a>
+            </div>
+        """
+
+    return f"""
+    <div style="
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 10px;
+        margin-top: 10px;
+        color: white;
+        font-family: Arial, sans-serif;
+    ">
+        {download_links}
+        {share_links}
+        {youtube_share}
+    </div>
+    """.format(caption=encoded_caption)
 
 def generate_html(feed_items, scroll_to_latest=False, current_index=0, user_input="", is_loading=False):
     """
@@ -508,7 +557,7 @@ def generate_html(feed_items, scroll_to_latest=False, current_index=0, user_inpu
     Displays a video if available, otherwise falls back to the image.
     
     Args:
-        feed_items (list): List of dictionaries containing 'text', 'image_base64', and 'video_base64_list'.
+        feed_items (list): List of dictionaries containing 'text', 'image_base64', and 'video_base64'.
         scroll_to_latest (bool): Whether to auto-scroll to the latest item (not used here).
         current_index (int): The index of the item to display.
         user_input (str): The user's input concept or idea for loading messages.
@@ -606,8 +655,8 @@ def generate_html(feed_items, scroll_to_latest=False, current_index=0, user_inpu
         """
 
     item = feed_items[current_index]
-    # Check if there are videos to display; if so, show the first video
-    if item['video_base64_list']:
+    # Check if there is a video to display
+    if item['video_base64']:
         media_element = f"""
             <video id="feed-video" controls style="
                 width: 100%;
@@ -618,7 +667,7 @@ def generate_html(feed_items, scroll_to_latest=False, current_index=0, user_inpu
                 left: 0;
                 z-index: 1;
             ">
-                <source src="data:video/mp4;base64,{item['video_base64_list'][0]}" type="video/mp4">
+                <source src="data:video/mp4;base64,{item['video_base64']}" type="video/mp4">
                 Your browser does not support the video tag.
             </video>
         """