Update app.py

app.py

@@ -43,7 +43,7 @@ def youtube_search(query, upload_date, video_type, duration, max_results=50):
         "part": "snippet",
         "q": query,
         "maxResults": 50,
-        "order": "relevance"
+        "order": "relevance"  # Default ordering
     }
 
     if upload_date:
@@ -63,62 +63,50 @@ def youtube_search(query, upload_date, video_type, duration, max_results=50):
         params["videoDuration"] = duration_mapping.get(duration, "any")
 
     try:
-        params["key"] = get_api_key()
-        response = requests.get(search_url, params=params)
-
-        if response.status_code in [403, 429]:
-            print(f"Quota exceeded or forbidden for API key. Trying next key...")
-            return []
-        response.raise_for_status()
-
-        results = response.json().get("items", [])
-        for result in results:
-            if result["id"]["kind"] == "youtube#channel":
-                # Return only the first channel result
-                return [{
-                    'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
-                    'id': result["id"]["channelId"],
-                    'title': result["snippet"]["title"],
-                    'type': "channel"
-                }]
-            elif result["id"]["kind"] == "youtube#video":
-                video_info = {
-                    'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
-                    'id': result["id"]["videoId"],
-                    'title': result["snippet"]["title"],
-                    'type': "video"
-                }
+        while len(all_results) < max_results:
+            params["key"] = get_api_key()
+            response = requests.get(search_url, params=params)
+
+            if response.status_code in [403, 429]:
+                print(f"Quota exceeded or forbidden for API key. Trying next key...")
+                continue
+            response.raise_for_status()
+
+            results = response.json().get("items", [])
+            for result in results:
+                if result["id"]["kind"] == "youtube#video":
+                    video_info = {
+                        'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
+                        'id': result["id"]["videoId"],
+                        'title': result["snippet"]["title"],
+                        'type': "video"
+                    }
+                elif result["id"]["kind"] == "youtube#channel":
+                    video_info = {
+                        'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
+                        'id': result["id"]["channelId"],
+                        'title': result["snippet"]["title"],
+                        'type': "channel"
+                    }
+                elif result["id"]["kind"] == "youtube#playlist":
+                    video_info = {
+                        'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
+                        'id': result["id"]["playlistId"],
+                        'title': result["snippet"]["title"],
+                        'type': "playlist"
+                    }
+                else:
+                    continue
+                
                 all_results.append(video_info)
 
-        return all_results
+            if 'nextPageToken' not in response.json() or len(all_results) >= max_results:
+                break
 
-    except requests.exceptions.RequestException as e:
-        print(f"Error during YouTube API request: {e}")
-        return []
+            params['pageToken'] = response.json()['nextPageToken']
+
+        return all_results
 
-def get_channel_videos(channel_id, max_results=10):
-    search_url = "https://www.googleapis.com/youtube/v3/search"
-    params = {
-        "part": "snippet",
-        "channelId": channel_id,
-        "maxResults": max_results,
-        "order": "date",
-        "type": "video",
-        "key": get_api_key()
-    }
-    try:
-        response = requests.get(search_url, params=params)
-        response.raise_for_status()
-        results = response.json().get("items", [])
-        channel_videos = []
-        for result in results:
-            channel_videos.append({
-                'thumbnail_url': result["snippet"]["thumbnails"]["high"]["url"],
-                'id': result["id"]["videoId"],
-                'title': result["snippet"]["title"],
-                'type': "video"
-            })
-        return channel_videos
     except requests.exceptions.RequestException as e:
         print(f"Error during YouTube API request: {e}")
         return []
@@ -173,7 +161,6 @@ with gr.Blocks(css="""
     gr.Markdown("## YouTube Video Search, Selection, and Playback")
     video_ids_state = gr.State()
     video_types_state = gr.State()
-    channel_mode_state = gr.State(False)
 
     with gr.Row(elem_id="video_container"):
         video_output = gr.HTML(label="Video Player", elem_id="video_output")
@@ -212,13 +199,7 @@ with gr.Blocks(css="""
         index = evt.index
         selected_video_id = video_ids[index]
         selected_video_type = video_types[index]
-        if selected_video_type == "channel":
-            # Fetch videos from the channel
-            channel_videos = get_channel_videos(selected_video_id)
-            gallery_items = [(video['thumbnail_url'], video['title']) for video in channel_videos]
-            return gallery_items, video_ids, video_types
-        else:
-            return f"https://www.youtube.com/watch?v={selected_video_id}", selected_video_type
+        return f"https://www.youtube.com/watch?v={selected_video_id}", selected_video_type
 
     def play_video(video_id, video_type):
         return show_video(video_id.split("=")[-1], video_type)
@@ -231,7 +212,7 @@ with gr.Blocks(css="""
     search_output.select(
         on_video_select,
         inputs=[video_ids_state, video_types_state],
-        outputs=[search_output, video_ids_state, video_types_state]
+        outputs=[selected_video_link, selected_video_type]
     )
     play_video_button.click(
         play_video,