Update lichess_sf.py

lichess_sf.py

@@ -2,7 +2,7 @@ import datasets
 import zstandard as zstd
 import io
 
-#%%
+
 class LichessConfig(datasets.BuilderConfig):
     def __init__(self, features, **kwargs):
         super(LichessConfig, self).__init__(**kwargs)
@@ -11,29 +11,18 @@ class LichessConfig(datasets.BuilderConfig):
 
 class Lichess(datasets.GeneratorBasedBuilder):
     BUILDER_CONFIG_CLASS = LichessConfig
-    BUILDER_CONFIGS = [LichessConfig(name="pgn",
-                                     features=["WhiteElo",
-                                               "BlackElo",
-                                               "pgn"]),
-
-                       LichessConfig(name="fen",
-                                     features=["WhiteElo",
+    BUILDER_CONFIGS = [LichessConfig(features=["WhiteElo",
                                                "BlackElo",
                                                "fens",
                                                "moves",
-                                               "scores"]),]
+                                               "scores"])]
 
     def _info(self):
         features_dict = {feature: datasets.Value("uint16") for feature in self.config.features}
 
-        if self.config.name == "pgn":
-            features_dict["pgn"] = datasets.Value("string")
-        
-        
-        if self.config.name == "fen":
-            features_dict["fens"] = datasets.Value("string")
-            features_dict["moves"] = datasets.Value("string")
-            features_dict["scores"] = datasets.Value("string")
+        features_dict["fens"] = datasets.Value("null")
+        features_dict["moves"] = datasets.Value("null")
+        features_dict["scores"] = datasets.Value("null")
 
         info = datasets.DatasetInfo(datasets.Features(features_dict))
         return info
@@ -42,18 +31,11 @@ class Lichess(datasets.GeneratorBasedBuilder):
         months = ["01", "02", "03", "04", "05", "06",
                   "07", "08", "09", "10", "11", "12"]
         shards = ["0", "1", "2", "3"]
-        filepaths = [self.config.name + "/2023/" + m for m in months]
-
-        if self.config.name == "pgn":
-            paths = []
-            for shard in shards:
-                paths.extend([filepath + "/" + shard + ".zst" for filepath in filepaths])
-        
-        if self.config.name == "fen":
-            paths = []
-            for shard in shards:
-                paths.extend([filepath + "/" + shard + "_fen.zst" for filepath in filepaths])
+        filepaths = ["fen/2023/" + m for m in months]
         
+        paths = []
+        for shard in shards:
+            paths.extend([filepath + "/" + shard + "_fen.zst" for filepath in filepaths])
         return paths
 
     def _split_generators(self, dl_manager: datasets.DownloadManager):
@@ -83,34 +65,18 @@ class Lichess(datasets.GeneratorBasedBuilder):
             # cycle through the different shards
             pgn = pgns[n % n_files]
 
-            if self.config.name == "pgn":
-                elos = pgn.readline()
-                game_pgn = pgn.readline()
-                next_line = pgn.readline()
-
-                if game_pgn:
-                    white_elo, black_elo = elos.split(" ")
-                    _id = n
-                    n += 1
-                    yield _id, {"WhiteElo": int(white_elo),
-                                "BlackElo": int(black_elo),
-                                "pgn": game_pgn}
-                else:
-                    break
-        
-            elif self.config.name == "fen":
-                elos = pgn.readline()
-                game = pgn.readline()
+            elos = pgn.readline()
+            game = pgn.readline()
 
-                if game:
-                    white_elo, black_elo = elos.split(" ")
-                    fens, moves, scores = game.split(";")
-                    _id = n
-                    n += 1
-                    yield _id, {"WhiteElo": int(white_elo),
-                                "BlackElo": int(black_elo),
-                                "fens": fens.split(","),
-                                "moves": moves.split(","),
-                                "scores": scores.rstrip("\n").split(",")}
-                else:
-                    break
+            if game:
+                white_elo, black_elo = elos.split(" ")
+                fens, moves, scores = game.split(";")
+                _id = n
+                n += 1
+                yield _id, {"WhiteElo": int(white_elo),
+                            "BlackElo": int(black_elo),
+                            "fens": fens.split(","),
+                            "moves": moves.split(","),
+                            "scores": scores.rstrip("\n").split(",")}
+            else:
+                break