Update markushgrapher-datasets.py

markushgrapher-datasets.py

@@ -1,3 +1,4 @@
+import os
 from datasets import (
     DatasetInfo,
     GeneratorBasedBuilder,
@@ -10,9 +11,9 @@ from datasets import (
     Image,
     Dataset
 )
-import os
 import datasets
 
+
 class MarkushGrapherConfig(BuilderConfig):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -20,10 +21,10 @@ class MarkushGrapherConfig(BuilderConfig):
 
 class MarkushGrapherDataset(GeneratorBasedBuilder):
     BUILDER_CONFIGS = [
-        MarkushGrapherConfig(name="markushgrapher-synthetic-training", description="Synthetic training set"),
-        MarkushGrapherConfig(name="m2s", description="Multi-modal real-world benchmark set"),        
-        MarkushGrapherConfig(name="markushgrapher-synthetic", description="Synthetic benchmark set"),
-        MarkushGrapherConfig(name="uspto-markush", description="Image-only real-world benchmark set"),
+        MarkushGrapherConfig(name="m2s", description="Molecule-to-SMILES synthetic subset"),
+        MarkushGrapherConfig(name="uspto-markush", description="Real Markush structures from USPTO patents"),
+        MarkushGrapherConfig(name="markushgrapher-synthetic", description="Synthetic Markush subset"),
+        MarkushGrapherConfig(name="markushgrapher-synthetic-training", description="Training set with synthetic Markush structures"),
     ]
 
     def _info(self):
@@ -45,7 +46,6 @@ class MarkushGrapherDataset(GeneratorBasedBuilder):
                         "text": Value("string"),
                     }),
                 }),
-                supervised_keys=None,
             )
 
         elif self.config.name in ["markushgrapher-synthetic", "markushgrapher-synthetic-training"]:
@@ -66,15 +66,14 @@ class MarkushGrapherDataset(GeneratorBasedBuilder):
                     }),
                     "page_image": Image(decode=True),
                 }),
-                supervised_keys=None,
             )
 
         else:
             raise ValueError(f"Unsupported config: {self.config.name}")
 
     def _split_generators(self, dl_manager):
-        base_dir = dl_manager.download_and_extract("")  # Download the full repo root
-        config_path = os.path.join(base_dir, self.config.name)
+        # Point directly to the config subfolder
+        config_path = dl_manager.download_and_extract(self.config.name)
 
         splits = []
         for split in ["train", "test"]:
@@ -88,13 +87,10 @@ class MarkushGrapherDataset(GeneratorBasedBuilder):
         return splits
 
     def _generate_examples(self, data_dir):
-        arrow_files = []
         for root, _, files in os.walk(data_dir):
-            for f in files:
-                if f.endswith(".arrow"):
-                    arrow_files.append(os.path.join(root, f))
-
-        for file in arrow_files:
-            dataset = datasets.Dataset.from_file(file)
-            for i, row in enumerate(dataset):
-                yield f"{file}_{i}", row
+            for fname in files:
+                if fname.endswith(".arrow"):
+                    fpath = os.path.join(root, fname)
+                    dataset = Dataset.from_file(fpath)
+                    for i, row in enumerate(dataset):
+                        yield f"{fpath}_{i}", row