Update loading script

generics_kb.py

@@ -17,7 +17,6 @@
 
 import ast
 import csv
-import os
 
 import datasets
 
@@ -41,13 +40,13 @@ _HOMEPAGE = "https://allenai.org/data/genericskb"
 
 _LICENSE = "cc-by-4.0"
 
-_URL = "https://drive.google.com/u/0/uc?id={0}&export=download"
+_BASE_URL = "data/{0}"
 
-_FILEPATHS = {
-    "generics_kb_best": _URL.format("12DfIzoWyHIQqssgUgDvz3VG8_ScSh6ng"),
-    "generics_kb": _URL.format("1UOIEzQTid7SzKx2tbwSSPxl7g-CjpoZa"),
-    "generics_kb_simplewiki": _URL.format("1SpN9Qc7XRy5xs4tIfXkcLOEAP2IVaK15"),
-    "generics_kb_waterloo": "cskb-waterloo-06-21-with-bert-scores.jsonl",
+_URLS = {
+    "generics_kb_best": _BASE_URL.format("GenericsKB-Best.tsv.gz"),
+    "generics_kb": _BASE_URL.format("GenericsKB.tsv.gz"),
+    "generics_kb_simplewiki": _BASE_URL.format("GenericsKB-SimpleWiki-With-Context.jsonl.gz"),
+    "generics_kb_waterloo": _BASE_URL.format("GenericsKB-Waterloo-With-Context.jsonl.gz"),
 }
 
 
@@ -60,7 +59,7 @@ class GenericsKb(datasets.GeneratorBasedBuilder):
         datasets.BuilderConfig(
             name="generics_kb_best",
             version=VERSION,
-            description="This is the default and recommended config.Comprises of GENERICSKB generics with a score > 0.234 ",
+            description="This is the default and recommended config. Comprises of GENERICSKB generics with a score > 0.234 ",
         ),
         datasets.BuilderConfig(
             name="generics_kb", version=VERSION, description="This GENERICSKB that contains 3,433,000 sentences."
@@ -77,30 +76,10 @@ class GenericsKb(datasets.GeneratorBasedBuilder):
         ),
     ]
 
-    @property
-    def manual_download_instructions(self):
-        return """\
-      You need to manually download the files needed for the dataset config generics_kb_waterloo. The other configs like generics_kb_best don't need manual downloads.
-      The <path/to/folder> can e.g. be `~/Downloads/GenericsKB`. Download the following required files from https://drive.google.com/drive/folders/1vqfVXhJXJWuiiXbUa4rZjOgQoJvwZUoT
-      For working on "generics_kb_waterloo" data,
-        1. Manually download 'GenericsKB-Waterloo-WithContext.jsonl.zip' into your <path/to/folder>.Please ensure the filename is as is.
-           The Waterloo is also generics from GenericsKB.tsv, but expanded to also include their surrounding context (before/after sentences). The Waterloo generics are the majority of GenericsKB. This zip file is 1.4GB expanding to 5.5GB.
-        2. Extract the GenericsKB-Waterloo-WithContext.jsonl.zip; It will create a file of 5.5 GB called cskb-waterloo-06-21-with-bert-scores.jsonl.
-           Ensure you move this file into your <path/to/folder>.
-
-      generics_kb can then be loaded using the following commands based on which data you want to work on. Data files must be present in the <path/to/folder> if using "generics_kb_waterloo" config.
-      1. `datasets.load_dataset("generics_kb","generics_kb_best")`.
-      2. `datasets.load_dataset("generics_kb","generics_kb")`
-      3. `datasets.load_dataset("generics_kb","generics_kb_simplewiki")`
-      4. `datasets.load_dataset("generics_kb","generics_kb_waterloo", data_dir="<path/to/folder>")`
-
-      """
-
     DEFAULT_CONFIG_NAME = "generics_kb_best"
 
     def _info(self):
         if self.config.name == "generics_kb_waterloo" or self.config.name == "generics_kb_simplewiki":
-
             featuredict = {
                 "source_name": datasets.Value("string"),
                 "sentence": datasets.Value("string"),
@@ -118,7 +97,6 @@ class GenericsKb(datasets.GeneratorBasedBuilder):
             features = datasets.Features(featuredict)
 
         else:
-
             features = datasets.Features(
                 {
                     "source": datasets.Value("string"),
@@ -148,24 +126,7 @@ class GenericsKb(datasets.GeneratorBasedBuilder):
         )
 
     def _split_generators(self, dl_manager):
-
-        if self.config.name == "generics_kb_waterloo":
-            data_dir = os.path.abspath(os.path.expanduser(dl_manager.manual_dir))
-            # check if manual folder exists
-            if not os.path.exists(data_dir):
-                raise FileNotFoundError(
-                    f"{data_dir} does not exist. Make sure you insert a manual dir via `datasets.load_dataset('generics_kb', data_dir=...)`. Manual download instructions: {self.manual_download_instructions})"
-                )
-
-            # Check if required files exist in the folder
-            filepath = os.path.join(data_dir, _FILEPATHS[self.config.name])
-
-            if not os.path.exists(filepath):
-                raise FileNotFoundError(
-                    f"{filepath} does not exist. Make sure you required files are present in {data_dir} `. Manual download instructions: {self.manual_download_instructions})"
-                )
-        else:
-            filepath = dl_manager.download(_FILEPATHS[self.config.name])
+        filepath = dl_manager.download_and_extract(_URLS[self.config.name])
 
         return [
             datasets.SplitGenerator(
@@ -181,7 +142,6 @@ class GenericsKb(datasets.GeneratorBasedBuilder):
         """Yields examples."""
 
         if self.config.name == "generics_kb_waterloo" or self.config.name == "generics_kb_simplewiki":
-
             with open(filepath, encoding="utf-8") as f:
                 for id_, row in enumerate(f):
                     data = ast.literal_eval(row)
@@ -202,7 +162,6 @@ class GenericsKb(datasets.GeneratorBasedBuilder):
 
                     yield id_, result
         else:
-
             with open(filepath, encoding="utf-8") as f:
                 # Skip the header
                 next(f)
@@ -210,7 +169,6 @@ class GenericsKb(datasets.GeneratorBasedBuilder):
                 read_tsv = csv.reader(f, delimiter="\t")
 
                 for id_, row in enumerate(read_tsv):
-
                     quantifier = row[2]
                     quantifier_frequency = ""
                     quantifier_number = ""