repatch

vox_celeb.py

@@ -18,6 +18,7 @@
 
 import json
 import os
+from urllib.parse import urlparse, parse_qs
 from getpass import getpass
 from hashlib import sha256
 from itertools import repeat
@@ -59,46 +60,47 @@ VoxCeleb is an audio-visual dataset consisting of short clips of human speech, e
 """
 
 _URL = "https://mm.kaist.ac.kr/datasets/voxceleb"
+_REQ_URL = "https://cn01.mmai.io/keyreq/voxceleb"
 
 _URLS = {
     "video": {
-        "placeholder": "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_parta",
+        "placeholder": "https://cn01.mmai.io/download/voxceleb?file=vox2_dev_mp4",
         "dev": (
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partaa",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partab",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partac",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partad",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partae",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partaf",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partag",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partah",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_mp4_partai",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partaa",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partab",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partac",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partad",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partae",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partaf",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partag",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partah",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_mp4_partai",
         ),
-        "test": "http://143.248.230.30/voxceleb/vox1a/vox2_test_mp4.zip",
+        "test": "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_test_mp4.zip",
     },
     "audio1": {
-        "placeholder": "http://143.248.230.30/voxceleb/vox1a/vox1_dev_wav_parta",
+        "placeholder": "https://cn01.mmai.io/download/voxceleb?file=vox1_dev_wav",
         "dev": (
-            "http://143.248.230.30/voxceleb/vox1a/vox1_dev_wav_partaa",
-            "http://143.248.230.30/voxceleb/vox1a/vox1_dev_wav_partab",
-            "http://143.248.230.30/voxceleb/vox1a/vox1_dev_wav_partac",
-            "http://143.248.230.30/voxceleb/vox1a/vox1_dev_wav_partad",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox1_dev_wav_partaa",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox1_dev_wav_partab",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox1_dev_wav_partac",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox1_dev_wav_partad",
         ),
-        "test": "http://143.248.230.30/voxceleb/vox1a/vox1_test_wav.zip",
+        "test": "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox1_test_wav.zip",
     },
     "audio2": {
-        "placeholder": "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_parta",
+        "placeholder": "https://cn01.mmai.io/download/voxceleb?file=vox2_dev_aac",
         "dev": (
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partaa",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partab",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partac",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partad",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partae",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partaf",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partag",
-            "http://143.248.230.30/voxceleb/vox1a/vox2_dev_aac_partah",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partaa",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partab",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partac",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partad",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partae",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partaf",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partag",
+            "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_dev_aac_partah",
         ),
-        "test": "http://143.248.230.30/voxceleb/vox1a/vox2_test_aac.zip",
+        "test": "https://cn01.mmai.io/download/voxceleb?key={key}&file=vox2_test_aac.zip",
     },
 }
 
@@ -114,8 +116,7 @@ _PLACEHOLDER_MAPS = dict(
 def _mp_download(
     url,
     tmp_path,
-    cred_user,
-    cred_pass,
+    cred_key,
     resume_pos,
     length,
     queue,
@@ -127,7 +128,7 @@ def _mp_download(
         if resume_pos != 0:
             headers["Range"] = f"bytes={resume_pos}-"
         response = requests.get(
-            url, auth=(cred_user, cred_pass), headers=headers, stream=True
+            url.format(key=cred_key), headers=headers, verify=False, stream=True
         )
         if response.status_code >= 200 and response.status_code < 300:
             for chunk in response.iter_content(chunk_size=65536):
@@ -140,7 +141,7 @@ def _mp_download(
 class VoxCeleb(datasets.GeneratorBasedBuilder):
     """VoxCeleb is an unlabled dataset consisting of short clips of human speech from interviews on YouTube"""
 
-    VERSION = datasets.Version("1.0.0")
+    VERSION = datasets.Version("1.1.0")
 
     BUILDER_CONFIGS = [
         datasets.BuilderConfig(
@@ -191,45 +192,50 @@ class VoxCeleb(datasets.GeneratorBasedBuilder):
         targets = (
             ["audio1", "audio2"] if self.config.name == "audio" else [self.config.name]
         )
-        cred_user = os.environ.get("HUGGING_FACE_VOX_CELEB_USER")
-        cred_pass = os.environ.get("HUGGING_FACE_VOX_CELEB_PASS")
+        cred_key = os.environ.get("HUGGING_FACE_VOX_CELEB_KEY")
         creds_path = Path(
             f"~/.huggingface/voxceleb_{self.VERSION}_credentials"
         ).expanduser()
 
-        if cred_user is None and cred_pass is None:
+        if cred_key is None:
             if creds_path.exists():
                 with open(creds_path, "r") as creds:
-                    cred_user, cred_pass = json.load(creds)
+                    cred_key = json.load(creds)
             else:
                 print(
-                    "You need a temporary username and password to access VoxCeleb.",
-                    f"Go to the project homepage ({_URL}) and fill out the form to request credentials.",
+                    "You need a key to access VoxCeleb directly.",
+                    f"Fill out the form ({_REQ_URL}) and paste in any of the download links you receive in your email.",
                 )
-                cred_user = input("VoxCeleb username: ")
-                cred_pass = getpass("VoxCeleb password: ")
-
-        if not cred_user or not cred_pass:
-            raise ValueError("could not find username and password to log in")
+                cred_url = getpass("Paste any VoxCeleb download URL here: ")
+                cred_url_parsed = urlparse(cred_url)
+                if cred_url_parsed.scheme != 'https' or cred_url_parsed.hostname != 'cn01.mmai.io' or cred_url_parsed.path != '/download/voxceleb':
+                    raise ValueError("couldn't parse as VoxCeleb download URL")
+                cred_url_query = parse_qs(cred_url_parsed.query)
+                if 'key' not in cred_url_query or len(cred_url_query['key']) != 1:
+                    raise ValueError("couldn't find key in URL")
+                cred_key = cred_url_query['key'][0]
+
+        if not cred_key:
+            raise ValueError("could not find key to log in")
 
         saved_credentials = False
 
         def save_credentials():
-            nonlocal saved_credentials, cred_user, cred_pass, creds_path
+            nonlocal saved_credentials, cred_key, creds_path
             if not saved_credentials:
                 creds_path.parent.mkdir(exist_ok=True)
                 with open(creds_path, "w") as creds:
-                    json.dump((cred_user, cred_pass), creds)
+                    json.dump(cred_key, creds)
                 saved_credentials = True
 
         def download_custom(placeholder_url, path):
-            nonlocal dl_manager, cred_user, cred_pass
+            nonlocal dl_manager, cred_key
             sources = _PLACEHOLDER_MAPS[placeholder_url]
             tmp_paths = []
             lengths = []
             start_positions = []
             for url in sources:
-                head = requests.head(url, auth=(cred_user, cred_pass))
+                head = requests.head(url.format(key=cred_key), verify=False, timeout=5)
                 if head.status_code == 401:
                     raise ValueError("failed to authenticate with VoxCeleb host")
                 if head.status_code < 200 or head.status_code >= 300:
@@ -279,8 +285,7 @@ class VoxCeleb(datasets.GeneratorBasedBuilder):
                     zip(
                         sources,
                         tmp_paths,
-                        repeat(cred_user),
-                        repeat(cred_pass),
+                        repeat(cred_key),
                         start_positions,
                         lengths,
                         repeat(q),