updating for data streaming

AmericanStories.py

@@ -1,11 +1,5 @@
 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,10 +13,11 @@ 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
-    # TODO: Can we fix the year list to pull directly from the repo instead of needing the hard-coded list?
+    # TODO: can we set up to check the actual files in the repo instead of relying on the offline list?
     year_list = SUPPORTED_YEARS
     data_files = [f"faro_{year}.tar.gz" for year in year_list]
     url_list = [base_url + file for file in data_files]
@@ -47,7 +42,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.
 
@@ -57,8 +52,6 @@ class CustomBuilderConfig(datasets.BuilderConfig):
         """
         super(CustomBuilderConfig, self).__init__(**kwargs)
         self.year_list = year_list
-        self.features = features
-
 
 class AmericanStories(datasets.GeneratorBasedBuilder):
     """Dataset builder class for AmericanStories dataset."""
@@ -76,7 +69,6 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
             version=VERSION,
             description="Subset of years in the dataset",
             year_list=["1774", "1804"]
-
         ),
         CustomBuilderConfig(
             name="all_years_content_regions",
@@ -88,10 +80,11 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
             version=VERSION,
             description="Subset of years in the dataset",
             year_list=["1774", "1804"],
-
         )
     ]
+    
     DEFAULT_CONFIG_NAME = "subset_years"
+    BUILDER_CONFIG_CLASS = CustomBuilderConfig
 
     def _info(self):
         """
@@ -111,8 +104,6 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
                     "headline": datasets.Value("string"),
                     "byline": datasets.Value("string"),
                     "article": datasets.Value("string"),
-
-
                 }
             )
         else:
@@ -150,24 +141,25 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
 
         # Subset _FILE_DICT and year_list to only include years in config.year_list
         if self.config.year_list:
-            urls = {year: urls[year] for year in self.config.year_list}
+            urls = {year: urls[year] for year in self.config.year_list if year in SUPPORTED_YEARS}
             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.
 
@@ -180,10 +172,10 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
         """
         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
@@ -208,20 +200,19 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
                             }
         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, {
                         "raw_data_string": str(data)
                     }
 
+