data

cvbn.py

@@ -178,27 +178,27 @@ class CommonVoice(datasets.GeneratorBasedBuilder):
                 gen_kwargs={
                     "local_extracted_archive": local_extracted_archive,
                     "archive_iterator": dl_manager.iter_archive(archive_path),
-                    "metadata_filepath": os.path.join(train_tsv,"train.tsv"),
+                    "metadata_filepath": dl_manager.iter_archive(train_tsv),
                     "path_to_clips": path_to_clips,
                     "mode":"train",
                 },
             ),
-            datasets.SplitGenerator(
-                name=datasets.Split.TEST,
-                gen_kwargs={
-                    "local_extracted_archive": local_extracted_archive,
-                    "archive_iterator": dl_manager.iter_archive(archive_path),
-                    "metadata_filepath": "/".join([path_to_data, "test.tsv"]) if path_to_data else "test.tsv",
-                    "path_to_clips": path_to_clips,
-                    "mode":"test",
-                },
-            ),
+            # datasets.SplitGenerator(
+            #     name=datasets.Split.TEST,
+            #     gen_kwargs={
+            #         "local_extracted_archive": local_extracted_archive,
+            #         "archive_iterator": dl_manager.iter_archive(archive_path),
+            #         "metadata_filepath": "/".join([path_to_data, "test.tsv"]) if path_to_data else "test.tsv",
+            #         "path_to_clips": path_to_clips,
+            #         "mode":"test",
+            #     },
+            # ),
             datasets.SplitGenerator(
                 name=datasets.Split.VALIDATION,
                 gen_kwargs={
                     "local_extracted_archive": local_extracted_archive,
                     "archive_iterator": dl_manager.iter_archive(archive_path),
-                    "metadata_filepath": os.path.join(dev_tsv,"dev.tsv"),
+                    "metadata_filepath": dl_manager.iter_archive(dev_tsv),
                     "path_to_clips": path_to_clips,
                     "mode":"dev",
                 },
@@ -216,44 +216,10 @@ class CommonVoice(datasets.GeneratorBasedBuilder):
         """Yields examples."""
         data_fields = list(self._info().features.keys())
         metadata = {}
-        metadata_found = False
-        if mode in ["test"]:
-            for path, f in archive_iterator:
-                if path == metadata_filepath:
-                    metadata_found = True
-                    lines = (line.decode("utf-8") for line in f)
-                    reader = csv.DictReader(lines, delimiter="\t", quoting=csv.QUOTE_NONE)
-                    for row in reader:
-                        # set absolute path for mp3 audio file
-                        if not row["path"].endswith(".mp3"):
-                            row["path"] += ".mp3"
-                        row["path"] = os.path.join(path_to_clips, row["path"])
-                        # accent -> accents in CV 8.0
-                        if "accents" in row:
-                            row["accent"] = row["accents"]
-                            del row["accents"]
-                        # if data is incomplete, fill with empty values
-                        for field in data_fields:
-                            if field not in row:
-                                row[field] = ""
-                        metadata[row["path"]] = row
-                elif path.startswith(path_to_clips):
-                    assert metadata_found, "Found audio clips before the metadata TSV file."
-                    if not metadata:
-                        break
-                    if path in metadata:
-                        result = metadata[path]
-                        # set the audio feature and the path to the extracted file
-                        path = os.path.join(local_extracted_archive, path) if local_extracted_archive else path
-                        result["audio"] = {"path": path, "bytes": f.read()}
-                        # set path to None if the audio file doesn't exist locally (i.e. in streaming mode)
-                        result["path"] = path if local_extracted_archive else None
-
-                        yield path, result
-        else:
-            metadata_found = True
-            with open(metadata_filepath, "rb") as file_obj:
-                lines = (line.decode("utf-8") for line in file_obj)
+        metadata_found = True
+        for path, f in metadata_filepath:
+            if f"{mode}.tsv" in path:
+                lines = (line.decode("utf-8") for line in f)
                 reader = csv.DictReader(lines, delimiter="\t", quoting=csv.QUOTE_NONE)
                 for row in reader:
                     # set absolute path for mp3 audio file
@@ -269,17 +235,17 @@ class CommonVoice(datasets.GeneratorBasedBuilder):
                         if field not in row:
                             row[field] = ""
                     metadata[row["path"]] = row
-            for path, f in archive_iterator:
-                if path.startswith(path_to_clips):
-                    assert metadata_found, "Found audio clips before the metadata TSV file."
-                    if not metadata:
-                        break
-                    if path in metadata:
-                        result = metadata[path]
-                        # set the audio feature and the path to the extracted file
-                        path = os.path.join(local_extracted_archive, path) if local_extracted_archive else path
-                        result["audio"] = {"path": path, "bytes": f.read()}
-                        # set path to None if the audio file doesn't exist locally (i.e. in streaming mode)
-                        result["path"] = path if local_extracted_archive else None
-
-                        yield path, result
+        for path, f in archive_iterator:
+            if path.startswith(path_to_clips):
+                assert metadata_found, "Found audio clips before the metadata TSV file."
+                if not metadata:
+                    break
+                if path in metadata:
+                    result = metadata[path]
+                    # set the audio feature and the path to the extracted file
+                    path = os.path.join(local_extracted_archive, path) if local_extracted_archive else path
+                    result["audio"] = {"path": path, "bytes": f.read()}
+                    # set path to None if the audio file doesn't exist locally (i.e. in streaming mode)
+                    result["path"] = path if local_extracted_archive else None
+
+                    yield path, result