Update app.py

app.py

@@ -137,26 +137,34 @@ def split_wav_or_mp3_file(audiofileuploader, mindur2, maxdur2, name_for_split_fi
 
 def download_video_as_audio_only(yt_video, audio_output_format):      
     try:
-        yt = YouTube(yt_video)
+        ydl_opts = {
+            'format': f"{audio_output_format}/bestaudio/best",
+            'postprocessors': [{
+                'key': 'FFmpegExtractAudio',
+                'preferredcodec': "mp3"
+            }]
+        }
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            ydl.download(yt_video)
     except pytube.exceptions.RegexMatchError:
         raise gr.Error("URL not valid or is empty! Please fix the link or enter one!")
     except urllib.error.HTTPError as not_ok:
         raise gr.Error(f"Recieved {not_ok}")
     except pytube.exceptions.AgeRestrictedError:
         raise gr.Error("The video you inputted is age-restricted! Please try another link.")
-    video = yt.streams.get_highest_resolution()
-    video.download()
-    video_path = f"{video.default_filename}"
-    video_clip = VideoFileClip(video_path)
-    audio_clip = video_clip.audio
-    if audio_output_format == "wav":
-        audio_clip.write_audiofile("output.wav")
-    elif audio_output_format == "mp3":
-        audio_clip.write_audiofile("output.mp3")
-    audio_clip.close()
-    video_clip.close()
-    for mp4remove in glob.glob("*.mp4"):
-        os.remove(mp4remove)
+    #video = yt.streams.get_audio_only()
+    #video.download()
+    #video_path = f"{video.default_filename}"
+    #video_clip = VideoFileClip(video_path)
+    #audio_clip = video_clip.audio
+    #if audio_output_format == "wav":
+    #    audio_clip.write_audiofile("output.wav")
+    #elif audio_output_format == "mp3":
+    #    audio_clip.write_audiofile("output.mp3")
+    #audio_clip.close()
+    #video_clip.close()
+    #for mp4remove in glob.glob("*.mp4"):
+    #    os.remove(mp4remove)
     single_zip_name = "only_audio.zip"
     audio_files = glob.glob("*.wav") if audio_output_format == "wav" else glob.glob("*.mp3")
     with zipfile.ZipFile(single_zip_name, 'w') as zip_file:
@@ -168,7 +176,7 @@ def download_video_as_audio_only(yt_video, audio_output_format):
     for outputmp3removal in glob.glob("*.mp3"):
         if os.path.exists(outputmp3removal):
             os.remove(outputmp3removal)
-    return f"Done! Download the zip file below! This only contains the audio file.\n\nYou have downloaded {yt.title} by {yt.author}.", single_zip_name
+    return f"Done! Download the zip file below! This only contains the audio file.\n\nYou have downloaded a video.", single_zip_name
 
 def mp4_to_wav_or_mp3(mp4fileuploader, file_format):
     if mp4fileuploader == None:
@@ -230,7 +238,7 @@ def mvsep_check_request(hash_textbox):
         rjson = r.json()
         success = rjson['success']
         status = rjson['status']
-        return f"Was successful? {str(success)}.\n Status: {status}."
+        return f"Was successful? {str(success)}.\nStatus: {status}."
     except requests.exceptions.JSONDecodeError:
         return gr.Info("Status not available or request not sent.")
 
@@ -253,21 +261,32 @@ def mvsep_download_separated_audio(hash_textbox):
     
 def mvsep_yt_link_request(mvsep_key2, sep_dropdown2, yt_link):
         try:
-            yt = YouTube(yt_link)
+            ydl_opts = {
+            'format': "mp3/bestaudio/best",
+            'postprocessors': [{
+                'key': 'FFmpegExtractAudio',
+                'preferredcodec': "mp3"
+            }]
+            }
+            with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+                ydl.download(yt_link)
         except pytube.exceptions.RegexMatchError:
             raise gr.Error("URL not valid or is empty! Please fix the link or enter one!")
         except urllib.error.HTTPError as not_ok:
             raise gr.Error(f"Recieved {not_ok}")
         except pytube.exceptions.AgeRestrictedError:
             raise gr.Error("The video you inputted is age-restricted! Please try another link.")
-        video = yt.streams.get_highest_resolution()
-        video.download()
-        video_path = f"{video.default_filename}"
-        video_clip = VideoFileClip(video_path)
-        audio_clip = video_clip.audio
-        audio_clip.write_audiofile("output.mp3")
-        audio_clip.close()
-        video_clip.close()
+        #video = yt.streams.get_highest_resolution()
+        #video.download()
+        #video_path = f"{video.default_filename}"
+        #video_clip = VideoFileClip(video_path)
+        #audio_clip = video_clip.audio
+        #audio_clip.write_audiofile("output.mp3")
+        #audio_clip.close()
+        #video_clip.close()
+        for rename in glob.glob("*.mp3"):
+            if os.path.exists(rename):
+                os.rename(rename, "output.mp3")
         for removalmp4 in glob.glob("*.mp4"):
             os.remove(removalmp4)
 
@@ -285,7 +304,6 @@ def mvsep_yt_link_request(mvsep_key2, sep_dropdown2, yt_link):
         return f"Request sent successfully! Your hash is: {hash_val}\n\nUse the next tab to check the status of your request."
         
 
-
 with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") as app:
     gr.HTML(
         "<h1> Welcome to the Cafeteria (formally GDMGS)!</h1>"
@@ -523,6 +541,7 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                             )
 
         with gr.TabItem("Changelog"):
+            gr.Markdown("v0.99.7 - Temporarily fixed an issue causing a 400 error to happen whenever a youtube url was placed.")
             gr.Markdown("v0.99.6 - Added a yt link request method for MVSEP.")
             gr.Markdown("v0.99.5 - Added bug fixes and Dropdown instead of button for MVSEP.")
             gr.Markdown("v0.99.4 - Added a button to display the available models for MVSEP.")