Fix HuggingFace Download

MultilingualSimplification.py

@@ -17,6 +17,8 @@
 import pandas as pd
 import os
 from collections import defaultdict
+import urllib.parse
+
 
 import datasets
 
@@ -70,116 +72,124 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE."""
 
 _SUBCORPORA = {
-    "NewselaEN": {
-        "path": "./data/English/Newsela EN",
-        "language": "en"
-    },
+    # "NewselaEN": {
+    #     "path": "data/English/Newsela EN",
+    #     "language": "en"
+    # },
     "WikiAutoEN": {
-        "path": "./data/English/WikiAuto",
+        "path": "data/English/WikiAuto",
         "language": "en"
     },
     "ASSET": {
-        "path": "./data/English/ASSET",
+        "path": "data/English/ASSET",
         "language": "en"
     },
-    "Simplext": {
-        "path": "./data/Spanish/Simplext",
-        "language": "es"
-    },
-    "NewselaES": {
-        "path": "./data/Spanish/Newsela ES",
-        "language": "es"
-    },
+    # "Simplext": {
+    #     "path": "data/Spanish/Simplext",
+    #     "language": "es"
+    # },
+    # "NewselaES": {
+    #     "path": "data/Spanish/Newsela ES",
+    #     "language": "es"
+    # },
     "Terence": {
-        "path" : "./data/Italian/Terence",
+        "path" : "data/Italian/Terence",
         "language": "it"
     },
     "Teacher": {
-        "path": "./data/Italian/Teacher",
+        "path": "data/Italian/Teacher",
         "language": "it"
     },
     "SimpitikiWiki": {
-        "path": "./data/Italian/Simpitiki Italian Wikipedia",
+        "path": "data/Italian/Simpitiki Italian Wikipedia",
         "language": "it"
     },
     "AdminIt": {
-        "path": "./data/Italian/AdminIT",
+        "path": "data/Italian/AdminIT",
         "language": "it"
     },
     "PaCCSS-IT": {
-        "path": "./data/Italian/PaCCSS-IT Corpus",
+        "path": "data/Italian/PaCCSS-IT Corpus",
         "language": "it"
     },
     "CLEAR" : {
-        "path" : "./data/French/CLEAR Corpus",
+        "path" : "data/French/CLEAR Corpus",
         "language": "fr"
     },
     "WikiLargeFR": {
-        "path" : "./data/French/WikiLargeFR Corpus",
+        "path" : "data/French/WikiLargeFR Corpus",
         "language": "fr"
     },
     "EasyJapanese": {
-        "path": "./data/Japanese/Easy Japanese Corpus",
+        "path": "data/Japanese/Easy Japanese Corpus",
         "language": "ja"
     },
     "EasyJapaneseExtended": {
-        "path": "./data/Japanese/Easy Japanese Extended",
+        "path": "data/Japanese/Easy Japanese Extended",
         "language": "ja"
     },
     "PorSimples" : {
-        "path": "./data/Brazilian Portuguese/PorSimples",
+        "path": "data/Brazilian Portuguese/PorSimples",
         "language": "pt-br"
     },
     "TextComplexityDE" : {
-        "path": "./data/German/TextComplexityDE Parallel Corpus",
+        "path": "data/German/TextComplexityDE Parallel Corpus",
         "language": "de"
     },
     "GEOLinoTest" : {
-        "path" : "./data/German/GEOLino Corpus",
+        "path" : "data/German/GEOLino Corpus",
         "language": "de"
     },
-    "GermanNews" : {
-        "path" : "./data/German/German News",
-        "language": "de"
-    },
-    "CBST": {
-        "path" : "./data/Basque/CBST",
-        "language": "eu"
-    },
-    "DSim": {
-        "path": "./data/Danish/DSim Corpus",
-        "language": "da"
-    },
-    "SimplifyUR": {
-        "path": "./data/Urdu/SimplifyUR",
-        "language": "ur"
-    },
+    # "GermanNews" : {
+    #     "path" : "data/German/German News",
+    #     "language": "de"
+    # },
+    # "CBST": {
+    #     "path" : "data/Basque/CBST",
+    #     "language": "eu"
+    # },
+    # "DSim": {
+    #     "path": "data/Danish/DSim Corpus",
+    #     "language": "da"
+    # },
+    # "SimplifyUR": {
+    #     "path": "data/Urdu/SimplifyUR",
+    #     "language": "ur"
+    # },
     "RuWikiLarge": {
-        "path" : "./data/Russian/RuWikiLarge",
+        "path" : "data/Russian/RuWikiLarge",
         "language": "ru"
     },
     "RSSE" : {
-        "path": "./data/Russian/RSSE Corpus",
-        "language": "ru"
-    },
-    "RuAdaptLit" : {
-        "path": "./data/Russian/RuAdapt Literature",
+        "path": "data/Russian/RSSE Corpus",
         "language": "ru"
     },
+    # "RuAdaptLit" : {
+    #     "path": "data/Russian/RuAdapt Literature",
+    #     "language": "ru"
+    # },
     "RuAdaptFairytales" : {
-        "path": "./data/Russian/RuAdapt Fairytales",
+        "path": "data/Russian/RuAdapt Fairytales",
         "language": "ru"
     },
     "RuAdaptEncy" : {
-        "path" : "./data/Russian/RuAdapt Ency",
+        "path" : "data/Russian/RuAdapt Ency",
         "language": "ru"
     },
     "TSSlovene" : {
-        "path" : "./data/Slovene/Text Simplification Slovene",
+        "path" : "data/Slovene/Text Simplification Slovene",
         "language": "sl"
     }
 }
 
+_URL = "https://huggingface.co/datasets/MichaelR207/MultiSim/raw/main"
+
+_URLS = {
+    dataset+"-"+split: urllib.parse.quote(os.path.join(_URL, _SUBCORPORA[dataset]["path"] + "_" + split + ".csv"), safe=':/') 
+    for split in ["train", "val", "test"] 
+    for dataset in _SUBCORPORA.keys()
+}
+
 _LANGUAGES = {
     "English":'en',
     "Spanish":'es', 
@@ -290,25 +300,34 @@ class MultilingualSimplification(datasets.GeneratorBasedBuilder):
         # 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
-        filepaths = []
+        download_urls = {}
         if (self.config.name == 'all'):
             for subcorpus in _SUBCORPORA:
-                filepaths.append(_SUBCORPORA[subcorpus]['path'])
+                download_urls[subcorpus + "-train"] = _URLS[subcorpus+"-train"]
+                download_urls[subcorpus + "-test"] = _URLS[subcorpus+"-test"]
+                download_urls[subcorpus + "-val"] = _URLS[subcorpus+"-val"]
         elif (self.config.name in _LANGUAGES):
             lang_code = _LANGUAGES[self.config.name]
             for subcorpus in _SUBCORPORA:
                 if _SUBCORPORA[subcorpus]['language'] == lang_code:
-                    filepaths.append(_SUBCORPORA[subcorpus]['path'])
+                    download_urls[subcorpus + "-train"] = _URLS[subcorpus+"-train"]
+                    download_urls[subcorpus + "-test"] = _URLS[subcorpus+"-test"]
+                    download_urls[subcorpus + "-val"] = _URLS[subcorpus+"-val"]
         elif (self.config.name in _SUBCORPORA):
-            filepaths = [_SUBCORPORA[self.config.name]['path']]
+            download_urls[self.config.name + "-train"] = _URLS[self.config.name+"-train"]
+            download_urls[self.config.name + "-test"] = _URLS[self.config.name+"-test"]
+            download_urls[self.config.name + "-val"] = _URLS[self.config.name+"-val"]
         else:
             print("Invalid configuration name: " + self.config.name + ".  Try 'all', 'English', 'ASSET', etc.")
+
+        downloaded_files = dl_manager.download_and_extract(download_urls)
+
         return [
             datasets.SplitGenerator(
                 name=datasets.Split.TRAIN,
                 # These kwargs will be passed to _generate_examples
                 gen_kwargs={
-                    "filepaths": filepaths,
+                    "filepaths": downloaded_files,
                     "split": "train",
                 },
             ),
@@ -316,7 +335,7 @@ class MultilingualSimplification(datasets.GeneratorBasedBuilder):
                 name=datasets.Split.VALIDATION,
                 # These kwargs will be passed to _generate_examples
                 gen_kwargs={
-                    "filepaths": filepaths,
+                    "filepaths": downloaded_files,
                     "split": "val",
                 },
             ),
@@ -324,7 +343,7 @@ class MultilingualSimplification(datasets.GeneratorBasedBuilder):
                 name=datasets.Split.TEST,
                 # These kwargs will be passed to _generate_examples
                 gen_kwargs={
-                    "filepaths": filepaths,
+                    "filepaths": downloaded_files,
                     "split": "test"
                 },
             ),
@@ -336,16 +355,18 @@ class MultilingualSimplification(datasets.GeneratorBasedBuilder):
         # The `key` is for legacy reasons (tfds) and is not important in itself, but must be unique for each example.
         df = pd.DataFrame()
 
-        if (len(filepaths) > 1):
-            for filepath in filepaths:
-                if os.path.exists(filepath + "_" + split + ".csv"):
-                    df = pd.concat([df, pd.read_csv(filepath + "_" + split + ".csv")])
+        if (len(filepaths.keys()) > 1):
+            for dataset, path in filepaths.items():
+                if os.path.exists(path):
+                    if dataset.endswith("-"+split):
+                        df = pd.concat([df, pd.read_csv(path)])
 
             # shuffle the combined dataset
             df = df.sample(frac=1, random_state=3600).reset_index(drop=True)
         else:
-            if os.path.exists(filepaths[0] + "_" + split + ".csv"):
-                df = pd.read_csv(filepaths[0] + "_" + split + ".csv")
+            dataset = list(filepaths.keys())[0]
+            if os.path.exists(filepaths[dataset]):
+                df = pd.read_csv(filepaths[dataset])
 
         if len(df) > 0:
             for key, row in df.iterrows():