better categories and classes

TeTIm-Eval.py

@@ -19,7 +19,7 @@ _URLS = {
     "full": "https://huggingface.co/datasets/galatolo/TeTIm-Eval/resolve/main/data/TeTIm-Eval.zip"
 }
 
-_CATEGORIES = [
+_CLASSES = [
     "digital_art",
     "sketch_art",
     "traditional_art",
@@ -32,31 +32,51 @@ _CATEGORIES = [
     "person_photo"
 ]
 
+_CATEGORIES = [
+    "art",
+    "painting",
+    "photo"
+]
+
+_MAP_CATEGORY = {
+    _CLASSES[0]: _CATEGORIES[0],
+    _CLASSES[1]: _CATEGORIES[0],
+    _CLASSES[2]: _CATEGORIES[0],
+
+    _CLASSES[3]: _CATEGORIES[1],
+    _CLASSES[4]: _CATEGORIES[1],
+    _CLASSES[5]: _CATEGORIES[1],
+
+    _CLASSES[6]: _CATEGORIES[2],
+    _CLASSES[7]: _CATEGORIES[2],
+    _CLASSES[8]: _CATEGORIES[2],
+    _CLASSES[9]: _CATEGORIES[2],
+}
 
 _FOLDERS = {
     "mini": {
-        _CATEGORIES[0]: "TeTIm-Eval-Mini/sampled_art_digital",
-        _CATEGORIES[1]: "TeTIm-Eval-Mini/sampled_art_sketch",
-        _CATEGORIES[2]: "TeTIm-Eval-Mini/sampled_art_traditional",
-        _CATEGORIES[3]: "TeTIm-Eval-Mini/sampled_painting_baroque",
-        _CATEGORIES[4]: "TeTIm-Eval-Mini/sampled_painting_high-renaissance",
-        _CATEGORIES[5]: "TeTIm-Eval-Mini/sampled_painting_neoclassicism",
-        _CATEGORIES[6]: "TeTIm-Eval-Mini/sampled_photo_animal",
-        _CATEGORIES[7]: "TeTIm-Eval-Mini/sampled_photo_food",
-        _CATEGORIES[8]: "TeTIm-Eval-Mini/sampled_photo_landscape",
-        _CATEGORIES[9]: "TeTIm-Eval-Mini/sampled_photo_person",
+        _CLASSES[0]: "TeTIm-Eval-Mini/sampled_art_digital",
+        _CLASSES[1]: "TeTIm-Eval-Mini/sampled_art_sketch",
+        _CLASSES[2]: "TeTIm-Eval-Mini/sampled_art_traditional",
+        _CLASSES[3]: "TeTIm-Eval-Mini/sampled_painting_baroque",
+        _CLASSES[4]: "TeTIm-Eval-Mini/sampled_painting_high-renaissance",
+        _CLASSES[5]: "TeTIm-Eval-Mini/sampled_painting_neoclassicism",
+        _CLASSES[6]: "TeTIm-Eval-Mini/sampled_photo_animal",
+        _CLASSES[7]: "TeTIm-Eval-Mini/sampled_photo_food",
+        _CLASSES[8]: "TeTIm-Eval-Mini/sampled_photo_landscape",
+        _CLASSES[9]: "TeTIm-Eval-Mini/sampled_photo_person",
     },
     "full": {
-        _CATEGORIES[0]: "TeTIm-Eval/sampled_art_digital",
-        _CATEGORIES[1]: "TeTIm-Eval/sampled_art_sketch",
-        _CATEGORIES[2]: "TeTIm-Eval/sampled_art_traditional",
-        _CATEGORIES[3]: "TeTIm-Eval/sampled_painting_baroque",
-        _CATEGORIES[4]: "TeTIm-Eval/sampled_painting_high-renaissance",
-        _CATEGORIES[5]: "TeTIm-Eval/sampled_painting_neoclassicism",
-        _CATEGORIES[6]: "TeTIm-Eval/sampled_photo_animal",
-        _CATEGORIES[7]: "TeTIm-Eval/sampled_photo_food",
-        _CATEGORIES[8]: "TeTIm-Eval/sampled_photo_landscape",
-        _CATEGORIES[9]: "TeTIm-Eval/sampled_photo_person",
+        _CLASSES[0]: "TeTIm-Eval/sampled_art_digital",
+        _CLASSES[1]: "TeTIm-Eval/sampled_art_sketch",
+        _CLASSES[2]: "TeTIm-Eval/sampled_art_traditional",
+        _CLASSES[3]: "TeTIm-Eval/sampled_painting_baroque",
+        _CLASSES[4]: "TeTIm-Eval/sampled_painting_high-renaissance",
+        _CLASSES[5]: "TeTIm-Eval/sampled_painting_neoclassicism",
+        _CLASSES[6]: "TeTIm-Eval/sampled_photo_animal",
+        _CLASSES[7]: "TeTIm-Eval/sampled_photo_food",
+        _CLASSES[8]: "TeTIm-Eval/sampled_photo_landscape",
+        _CLASSES[9]: "TeTIm-Eval/sampled_photo_person",
     }
 }
 
@@ -87,7 +107,8 @@ class TeTIm(datasets.GeneratorBasedBuilder):
                     "id": datasets.Value("int32"),
                     "image": datasets.Image(),
                     "caption": datasets.Value("string"),
-                    "category": datasets.Value("string"),
+                    "category": datasets.ClassLabel(num_classes=len(_CATEGORIES), names=_CATEGORIES),
+                    "class": datasets.ClassLabel(num_classes=len(_CLASSES), names=_CLASSES)
                 }
             ),
             supervised_keys=None,
@@ -106,7 +127,7 @@ class TeTIm(datasets.GeneratorBasedBuilder):
     
     def _generate_examples(self, path):
         id = 0
-        for category, folder in _FOLDERS[self.config.name].items():
+        for _class, folder in _FOLDERS[self.config.name].items():
             images_folder = os.path.join(path, folder, "images")
             annotations_folder = os.path.join(path, folder, "annotations")
 
@@ -120,7 +141,8 @@ class TeTIm(datasets.GeneratorBasedBuilder):
                     "id": id,
                     "image": os.path.join(images_folder, image),
                     "caption": annotation["caption"],
-                    "category": category
+                    "category": _CATEGORIES.index(_MAP_CATEGORY[_class]),
+                    "class": _CLASSES.index(_class)
                 }
                 id += 1
 
@@ -129,10 +151,13 @@ if __name__ == "__main__":
     from datasets import load_dataset
     dataset_config = {
         "LOADING_SCRIPT_FILES": os.path.join(os.getcwd(), "TeTIm-Eval.py"),
-        "CONFIG_NAME": "full",
+        "CONFIG_NAME": "mini",
     }
     ds = load_dataset(
         dataset_config["LOADING_SCRIPT_FILES"],
         dataset_config["CONFIG_NAME"],
     )
-    print(ds)
+    print(ds)
+
+    for i, e in zip(range(0, 10), ds["test"]):
+        print(i, e)