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"  # Default ordering
+        "order": "relevance"
     }
 
     if upload_date:
@@ -63,47 +63,41 @@ def youtube_search(query, upload_date, video_type, duration, max_results=50):
         params["videoDuration"] = duration_mapping.get(duration, "any")
 
     try:
-        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...")
+        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#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
-            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)
-
-            if 'nextPageToken' not in response.json() or len(all_results) >= max_results:
-                break
-
-            params['pageToken'] = response.json()['nextPageToken']
+            
+            all_results.append(video_info)
 
         return all_results
 
@@ -111,6 +105,33 @@ def youtube_search(query, upload_date, video_type, duration, max_results=50):
         print(f"Error during YouTube API request: {e}")
         return []
 
+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 []
+
 def show_video(video_id, video_type):
     if video_type == "video":
         embed_url = f"https://www.youtube.com/embed/{video_id}"
@@ -180,6 +201,7 @@ with gr.Blocks(css="""
             duration_input = gr.Dropdown(label="Duration", choices=["", "Short (<4 mins)", "Medium (4-20 mins)", "Long (>20 mins)"])
             search_button = gr.Button("Search")
             search_output = gr.Gallery(label="Search Results", columns=1, height="800px", elem_id="search_output")
+            channel_videos_output = gr.Gallery(label="Channel Videos", columns=1, height="800px", visible=False)
 
     def update_search_results(query, upload_date, video_type, duration):
         search_results = youtube_search(query, upload_date, video_type, duration)
@@ -199,7 +221,13 @@ with gr.Blocks(css="""
         index = evt.index
         selected_video_id = video_ids[index]
         selected_video_type = video_types[index]
-        return f"https://www.youtube.com/watch?v={selected_video_id}", selected_video_type
+        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, gr.update(visible=True)
+        else:
+            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)
@@ -212,7 +240,7 @@ with gr.Blocks(css="""
     search_output.select(
         on_video_select,
         inputs=[video_ids_state, video_types_state],
-        outputs=[selected_video_link, selected_video_type]
+        outputs=[channel_videos_output, channel_videos_output]
     )
     play_video_button.click(
         play_video,