Update app.py

app.py

@@ -75,47 +75,47 @@ def download_audio(url):
         data = np.asarray(data * 32767, dtype=np.int16)
         return sr, data
 
-def downloadTubeUpload(searchQuery):
-    # 设置yt-dlp的选项，只搜索小于10分钟的视频
-    ydl_opts = {
-        
-        'format': 'bestaudio',
-        'match_filter': lambda x: x["duration"] < 600,
-        'postprocessors': [{
-            'key': 'FFmpegExtractAudio',
-            'preferredcodec': 'mp3',
-            'preferredquality': '192',
-        }],
+def downloadTubeUpload(query):
+    # Step 1: Search for videos with the given query
+    search_url = f"https://draw-8fj-staging.begin.app/api/search/{urlencode(query)}"
+    search_response = requests.get(search_url).json()
+
+    # Step 2: Find the first video with duration less than 10 minutes and extract its ID
+    video_id = None
+    for item in search_response:
+        duration = item.get("duration")
+        if duration and duration < "00:10:00":
+            video_id = item.get("id", {}).get("videoId")
+            break
+
+    # If no video with duration less than 10 minutes was found, return None
+    if not video_id:
+        return None
+
+    # Step 3: Get the formats for the video and find the URL for the best audio-only format
+    formats_url = f"https://draw-8fj-staging.begin.app/api/info/{video_id}"
+    formats_response = requests.get(formats_url).json()
+
+    best_audio_format = None
+    for fmt in formats_response.get("formats", []):
+        if fmt.get("hasVideo") is False and fmt.get("hasAudio") is True and fmt.get("container") == "mp4":
+            if not best_audio_format or fmt.get("audioBitrate") > best_audio_format.get("audioBitrate"):
+                best_audio_format = fmt
+
+    # If no suitable audio format was found, return None
+    if not best_audio_format:
+        return None
+
+    # Step 4: Upload the video file to lalal.ai and return the ID of the uploaded file
+    upload_url = "https://lalal.ai/api/upload/"
+    headers = {
+        "Content-Disposition": f"attachment; filename={video_id}.mp4"
     }
-    ydl_opts['overwrites'] = True
-    ydl_opts['verbose'] = True
-    ydl_opts['outtmpl'] = '/tmp/%(title)s.%(ext)s'
-    ydl_opts['postprocessors'][0]['preferredcodec'] = 'best'
-    ydl_opts['postprocessors'][0]['preferredquality'] = 'best'
-    ydl_opts['format'] = 'bestaudio/best'    
-    # 使用yt-dlp搜索并选择第一个符合条件的视频
-    with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-        info_dict = ydl.extract_info("ytsearch1:{}".format(searchQuery), download=False)['entries'][0]
-        
-        video_url = info_dict['webpage_url']
-        print('=====>'+video_url)
-        # 下载视频的最佳音频
-        
-#        ydl = yt_dlp.YoutubeDL(ydl_opts)
-        ydl.download([video_url])
-        
-        # 上传文件到lalal.ai
-        api_url = 'https://lalal.ai/api/upload/'
-        headers = {'Content-Disposition': 'attachment; filename={}.mp3'.format(info_dict['title'])}
-        data = {'file': open('/tmp/{}.mp3'.format(info_dict['title']), 'rb')}
-        r = requests.post(api_url, headers=headers, files=data)
-        
-        # 删除文件
-        os.remove('/tmp/{}.mp3'.format(info_dict['title']))
-        
-        # 返回上传成功与否的信息
-        return r.json()['id']
-        
+    with requests.get(best_audio_format["url"], stream=True) as r:
+        r.raise_for_status()
+        upload_response = requests.post(upload_url, headers=headers, data=r.raw).json()
+        return upload_response.get("result", {}).get("id")
+
 def split_file(file_id):
     url_for_split = "https://www.lalal.ai/api/preview/"