Enable data streaming

AmericanStories.py

@@ -1,11 +1,6 @@
 import json
-import tarfile
 from datasets import DatasetInfo, DatasetBuilder, DownloadManager, BuilderConfig, SplitGenerator, Split, Version
 import datasets
-import os
-import requests
-import re
-from tqdm import tqdm
 
 SUPPORTED_YEARS = ["1774"]
 # Add years from 1798 to 1964 to the supported years
@@ -19,14 +14,12 @@ def make_year_file_splits():
         dict: A dictionary mapping each year to its corresponding file URL.
         list: A list of years.
     """
-    base_url = "https://huggingface.co/datasets/dell-research-harvard/AmericanStories/resolve/main/"
 
     # Make a list of years from 1774 to 1960
     year_list = [str(year) for year in range(1774, 1960)]
     data_files = [f"faro_{year}.tar.gz" for year in year_list]
-    url_list = [base_url + file for file in data_files]
     
-    splits = {year: file for year, file in zip(year_list, url_list)}
+    splits = {year: file for year, file in zip(year_list, data_files)}
     years = year_list
 
     return splits, years
@@ -46,7 +39,7 @@ _FILE_DICT, _YEARS = make_year_file_splits()
 class CustomBuilderConfig(datasets.BuilderConfig):
     """BuilderConfig for AmericanStories dataset with different configurations."""
 
-    def __init__(self, year_list=None,features=["article_id", "newspaper_name", "edition", "date", "page", "headline", "byline", "article"], **kwargs):
+    def __init__(self, year_list=None, **kwargs):
         """
         BuilderConfig for AmericanStories dataset.
 
@@ -56,7 +49,6 @@ class CustomBuilderConfig(datasets.BuilderConfig):
         """
         super(CustomBuilderConfig, self).__init__(**kwargs)
         self.year_list = year_list
-        self.features = features
 
 
 class AmericanStories(datasets.GeneratorBasedBuilder):
@@ -92,6 +84,8 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
     ]
     DEFAULT_CONFIG_NAME = "subset_years"
 
+    BUILDER_CONFIG_CLASS = CustomBuilderConfig
+
     def _info(self):
         """
         Specifies the DatasetInfo object for the AmericanStories dataset.
@@ -152,21 +146,22 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
             urls = {year: urls[year] for year in self.config.year_list}
             year_list = self.config.year_list
 
-        data_dir = dl_manager.download_and_extract(urls)
+        archive = dl_manager.download(urls)
 
         # Return a list of splits, where each split corresponds to a year
         return [
             datasets.SplitGenerator(
                 name=year,
                 gen_kwargs={
-                    "year_dir": os.path.join(data_dir[year], "mnt", "122a7683-fa4b-45dd-9f13-b18cc4f4a187", "ca_rule_based_fa_clean", "faro_" + year),
+                    "files": dl_manager.iter_archive(archive[year]),
+                    "year_dir": "/".join(["mnt", "122a7683-fa4b-45dd-9f13-b18cc4f4a187", "ca_rule_based_fa_clean", "faro_" + year]),
                     "split": year,
                     "associated": True if not self.config.name.endswith("content_regions") else False,
                 },
             ) for year in year_list
         ]
 
-    def _generate_examples(self, year_dir,split, associated):
+    def _generate_examples(self, files, year_dir, split, associated):
         """
         Generates examples for the specified year and split.
 
@@ -177,12 +172,11 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
         Yields:
             tuple: The key-value pair containing the example ID and the example data.
         """
-        print("Associated: " + str(associated))
         if associated:
-            for filepath in os.listdir(year_dir):
-                with open(os.path.join(year_dir, filepath), encoding="utf-8") as f:
+            for filepath, f in files:
+                if filepath.startswith(year_dir):
                     try :
-                        data = json.load(f)
+                        data = json.loads(f.read().decode("utf-8"))
                     except:
                         print("Error loading file: " + filepath)
                         continue
@@ -206,18 +200,15 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
                                 "article": article["article"],
                             }
         else:
-            print("Returning a json as a string, feel free to parse it yourself!")
-            for filepath in os.listdir(year_dir):
-                with open(os.path.join(year_dir, filepath), encoding="utf-8") as f:
+            for filepath, f in files:
+                if filepath.startswith(year_dir):
                     try :
-                        data = json.load(f)
+                        data = json.loads(f.read().decode("utf-8"))
                     except:
                         # print("Error loading file: " + filepath)
                         continue
                     ###Convert json to strng
                     data=json.dumps(data)
-                    print((data))
-                    print(type(data))
                     scan_id=filepath.split('.')[0]
                     ##Yield the scan id and the raw data string
                     yield scan_id, {