diff --git a/bob/bio/base/database/csv_dataset.py b/bob/bio/base/database/csv_dataset.py index 9e22d238d908fed2af894434b62156cf07f620a1..7600f856acd1e6f37c1f81b963fc1aa027afcbac 100644 --- a/bob/bio/base/database/csv_dataset.py +++ b/bob/bio/base/database/csv_dataset.py @@ -31,7 +31,7 @@ class AnnotationsLoader: self, annotation_directory=None, annotation_extension=".json", - annotation_type="eyecenter", + annotation_type="json", ): self.annotation_directory = annotation_directory self.annotation_extension = annotation_extension @@ -172,7 +172,7 @@ class CSVToSampleLoader(CSVBaseSampleLoader): kwargs = dict([[str(h).lower(), r] for h, r in zip(header[2:], row[2:])]) if self.metadata_loader is not None: - metadata = self.metadata_loader(row) + metadata = self.metadata_loader(row, header=header) kwargs.update(metadata) return DelayedSample( @@ -220,7 +220,7 @@ class LSTToSampleLoader(CSVBaseSampleLoader): kwargs = {"subject": str(subject)} if self.metadata_loader is not None: - metadata = self.metadata_loader(row) + metadata = self.metadata_loader(row, header=header) kwargs.update(metadata) return DelayedSample( diff --git a/bob/bio/base/test/test_filelist.py b/bob/bio/base/test/test_filelist.py index 07871637625a2e1250d83bcf14d9a9c14b024edc..69f0c99dbd638189f5f69b00525489154780db5a 100644 --- a/bob/bio/base/test/test_filelist.py +++ b/bob/bio/base/test/test_filelist.py @@ -111,7 +111,9 @@ def test_csv_file_list_dev_eval(): csv_to_sample_loader=CSVToSampleLoader( data_loader=bob.io.base.load, metadata_loader=AnnotationsLoader( - annotation_directory=annotation_directory, annotation_extension=".pos" + annotation_directory=annotation_directory, + annotation_extension=".pos", + annotation_type="eyecenter", ), dataset_original_directory="", extension="", @@ -159,7 +161,9 @@ def test_csv_file_list_dev_eval_sparse(): csv_to_sample_loader=CSVToSampleLoader( data_loader=bob.io.base.load, metadata_loader=AnnotationsLoader( - annotation_directory=annotation_directory, annotation_extension=".pos" + annotation_directory=annotation_directory, + annotation_extension=".pos", + annotation_type="eyecenter", ), dataset_original_directory="", extension="",