final testing

AmericanStories.py

@@ -7,26 +7,6 @@ import requests
 import re
 
 
-###GEt list of files 
-DATASET_URL="https://huggingface.co/datasets/dell-research-harvard/AmericanStories/blob/main/"
-def get_list_of_files(url):
-    page = requests.get(url).text
-    links=re.findall(r'href=[\'"]?([^\'" >]+)', page)
-    ###Get only links containing faro_
-    links=[link for link in links if link.startswith('faro_')]
-    return links
-
-###Arrange into splits by year - files follow the format faro_YYYY.tar.gz
-def get_splits(links):
-    splits={}
-    years=[]
-    for link in links:
-        year=link.split('_')[1].split('.')[0]
-        if year not in splits:
-            splits[year]=[]
-        splits[year].append(link)
-        years.append(year)
-    return splits,years
 
 ####data dir
 DATA_DIR="."
@@ -36,9 +16,9 @@ def make_year_file_splits(data_dir):
     data_files=os.listdir(data_dir)
     ###Get only files containing faro_
     data_files=[file for file in data_files if file.startswith('faro_')]
-    ###Test case : starts with 17
-    data_files=[file for file in data_files if file.startswith('faro_17')]
 
+    ###Get only files for 17__ years
+    # data_files=[file for file in data_files if file.split('_')[1].startswith('17')]
     ###Arrange into splits by year - files follow the format faro_YYYY.tar.gz
     splits={}
     years=[]
@@ -64,13 +44,25 @@ American Stories offers high-quality structured data from historical newspapers
 _FILE_DICT,_YEARS=make_year_file_splits(DATA_DIR)
 
 
+###Make a class of builderconfig that supports an year_list attribute
+class MyBuilderConfig(datasets.BuilderConfig):
+    """BuilderConfig for MyDataset for different configurations."""
 
+    def __init__(self, year_list=None, **kwargs):
+        """BuilderConfig for MyDataset.
+        Args:
+        **kwargs: keyword arguments forwarded to super.
+        """
+        super(MyBuilderConfig, self).__init__(**kwargs)
+        self.year_list = year_list
 
 class AmericanStories(datasets.GeneratorBasedBuilder):
     """TODO: Short description of my dataset."""
 
     VERSION = datasets.Version("0.0.1")
 
+
+
     # This is an example of a dataset with multiple configurations.
     # If you don't want/need to define several sub-sets in your dataset,
     # just remove the BUILDER_CONFIG_CLASS and the BUILDER_CONFIGS attributes.
@@ -82,7 +74,21 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
     # You will be able to load one or the other configurations in the following list with
     # data = datasets.load_dataset('my_dataset', 'first_domain')
     # data = datasets.load_dataset('my_dataset', 'second_domain')
-
+    ##Now use the custom builder config class
+    BUILDER_CONFIGS = [
+        MyBuilderConfig(
+            name="all_years",
+            version=VERSION,
+            description="All years in the dataset",
+        ),
+        MyBuilderConfig(
+            name="subset_years",
+            version=VERSION,
+            description="Subset of years in the dataset",
+            year_list=["1774"],
+        )]
+    
+    DEFAULT_CONFIG_NAME = "all_years"  # It's not mandatory to have a default configuration. Just use one if it make sense.
 
     def _info(self):
         # TODO: This method specifies the datasets.DatasetInfo object which contains informations and typings for the dataset
@@ -112,19 +118,21 @@ class AmericanStories(datasets.GeneratorBasedBuilder):
             citation=_CITATION,
         )
 
-    def _split_generators(self, dl_manager,online=False):
+    def _split_generators(self, dl_manager):
         # TODO: This method is tasked with downloading/extracting the data and defining the splits depending on the configuration
         # If several configurations are possible (listed in BUILDER_CONFIGS), the configuration selected by the user is in self.config.name
 
         # dl_manager is a datasets.download.DownloadManager that can be used to download and extract URLS
         # It can accept any type or nested list/dict and will give back the same structure with the url replaced with path to local files.
         # By default the archives will be extracted and a path to a cached folder where they are extracted is returned instead of the archive
-        if not online:
-            urls = _FILE_DICT
-        else:
-            _URL_DICT,year_list=get_splits(get_list_of_files(DATASET_URL))
-            urls = _URL_DICT
+        urls = _FILE_DICT
         year_list=_YEARS
+
+        ##Subset _FILE_DICT and year_list to only years in the config.year_list
+        if self.config.year_list:
+            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)
 
         ###REturn a list of splits - but each split is for a year!