Refactor data load script with recent updates

codequeries.py

@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""The CodeQueries benchmark."""
+"""CodeQueries: The CodeQueries benchmark dataset."""
 
 
 import json
-import os
-
 import datasets
 
 logger = datasets.logging.get_logger(__name__)
@@ -58,6 +56,8 @@ class CodequeriesConfig(datasets.BuilderConfig):
           features: `list[string]`, list of the features that will appear in the
             feature dict. Should not include "label".
           citation: `string`, citation for the data set.
+          data_url: `string`, relative data path in repo
+          url: `string`, link to dataset info page
           **kwargs: keyword arguments forwarded to super.
         """
         # Version history:
@@ -76,8 +76,9 @@ class Codequeries(datasets.GeneratorBasedBuilder):
         CodequeriesConfig(
             name="ideal",
             description=_IDEAL_DESCRIPTION,
-            features=["query_name", "context_blocks", "answer_spans",
-                      "supporting_fact_spans", "code_file_path", "example_type",
+            features=["query_name", "code_file_path", "context_blocks",
+                      "answer_spans", "supporting_fact_spans",
+                      "example_type", "single_hop",
                       "subtokenized_input_sequence", "label_sequence"],
             citation=_CODEQUERIES_CITATION,
             data_url={
@@ -85,43 +86,47 @@ class Codequeries(datasets.GeneratorBasedBuilder):
                 "dev": "ideal_val.json",
                 "test": "ideal_test.json"
             },
-            url="",
+            url="https://huggingface.co/datasets/thepurpleowl/codequeries",
         ),
         CodequeriesConfig(
             name="prefix",
             description=_PREFIX_DESCRIPTION,
-            features=["query_name", "answer_spans",
-                      "supporting_fact_spans", "code_file_path", "example_type",
+            features=["query_name", "code_file_path",
+                      "answer_spans", "supporting_fact_spans",
+                      "example_type", "single_hop",
                       "subtokenized_input_sequence", "label_sequence"],
             citation=_CODEQUERIES_CITATION,
             data_url={
                 "test": "prefix_test.json"
             },
-            url="",
+            url="https://huggingface.co/datasets/thepurpleowl/codequeries",
         ),
         CodequeriesConfig(
             name="file_ideal",
             description=_FILE_IDEAL_DESCRIPTION,
-            features=["query_name", "context_blocks", "answer_spans",
-                      "supporting_fact_spans", "code_file_path", "example_type",
+            features=["query_name", "code_file_path", "context_blocks",
+                      "answer_spans", "supporting_fact_spans",
+                      "example_type", "single_hop",
                       "subtokenized_input_sequence", "label_sequence"],
             citation=_CODEQUERIES_CITATION,
             data_url={
                 "test": "file_ideal_test.json"
             },
-            url="",
+            url="https://huggingface.co/datasets/thepurpleowl/codequeries",
         ),
         CodequeriesConfig(
             name="twostep",
             description=_TWOSTEP_DESCRIPTION,
-            features=["query_name", "context_blocks", "answer_spans",
-                      "supporting_fact_spans", "code_file_path", "example_type",
-                      "subtokenized_input_sequence", "label_sequence"],
+            features=["query_name", "code_file_path", "context_blocks",
+                      "answer_spans", "supporting_fact_spans",
+                      "example_type", "single_hop",
+                      "subtokenized_input_sequence", "label_sequence",
+                      "relevance_label"],
             citation=_CODEQUERIES_CITATION,
             data_url={
                 "test": ["twostep_relevance/" + "twostep_relevance_test_" + str(i) + ".json" for i in range(0,10)]
             },
-            url="",
+            url="https://huggingface.co/datasets/thepurpleowl/codequeries",
         ),
     ]
 
@@ -130,11 +135,13 @@ class Codequeries(datasets.GeneratorBasedBuilder):
     def _info(self):
         features = {}
         features["query_name"] = datasets.Value("string")
+        features["code_file_path"] = datasets.Value("string")
         features["context_blocks"] = [
             {
                 "content": datasets.Value("string"),
                 "metadata": datasets.Value("string"),
-                "header": datasets.Value("string")
+                "header": datasets.Value("string"),
+                "index": datasets.Value("int32")
             }
         ]
         features["answer_spans"] = [
@@ -155,11 +162,11 @@ class Codequeries(datasets.GeneratorBasedBuilder):
                 'end_column': datasets.Value("int32")
             }
         ]
-        features["code_file_path"] = datasets.Value("string")
-        features["example_type"] = datasets.Value("int32")
+        features["example_type"] = datasets.Value("int8")
+        features["single_hop"] = datasets.Value("bool")
         features["subtokenized_input_sequence"] = datasets.features.Sequence(datasets.Value("string"))
-        features["label_sequence"] = datasets.features.Sequence(datasets.Value("int32"))
-        features["relevance_label"] = datasets.Value("int32")
+        features["label_sequence"] = datasets.features.Sequence(datasets.Value("int8"))
+        features["relevance_label"] = datasets.Value("int8")
 
         return datasets.DatasetInfo(
             description=self.config.description,
@@ -170,7 +177,7 @@ class Codequeries(datasets.GeneratorBasedBuilder):
 
     def _split_generators(self, dl_manager):
         dl_dir = dl_manager.download_and_extract(self.config.data_url)
-        print(dl_dir)
+
         if self.config.name in ["prefix", "file_ideal", "twostep"]:
             return [
                 datasets.SplitGenerator(
@@ -209,7 +216,7 @@ class Codequeries(datasets.GeneratorBasedBuilder):
     def _generate_examples(self, filepath, split):
         if self.config.name in ["prefix", "file_ideal", "twostep"]:
             assert split == datasets.Split.TEST
-        logger.info("generating examples from = %s", filepath)
+        logger.info("Generating examples from = %s", filepath)
 
         if self.config.name == "twostep":
             key = 0
@@ -221,15 +228,35 @@ class Codequeries(datasets.GeneratorBasedBuilder):
                         instance_key = str(key) + "_" + row["query_name"] + "_" + row["code_file_path"]
                         yield instance_key, {
                             "query_name": row["query_name"],
+                            "code_file_path": row["code_file_path"],
                             "context_blocks": row["context_blocks"],
                             "answer_spans": row["answer_spans"],
                             "supporting_fact_spans": row["supporting_fact_spans"],
-                            "code_file_path": row["code_file_path"],
                             "example_type": row["example_type"],
+                            "single_hop": row["single_hop"],
                             "subtokenized_input_sequence": row["subtokenized_input_sequence"],
+                            "label_sequence": row["label_sequence"],
                             "relevance_label": row["relevance_label"],
                         }
                         key += 1
+        elif self.config.name == "prefix":
+            with open(filepath, encoding="utf-8") as f:
+                key = 0
+                for line in f:
+                    row = json.loads(line)
+
+                    instance_key = str(key) + "_" + row["query_name"] + "_" + row["code_file_path"]
+                    yield instance_key, {
+                        "query_name": row["query_name"],
+                        "code_file_path": row["code_file_path"],
+                        "answer_spans": row["answer_spans"],
+                        "supporting_fact_spans": row["supporting_fact_spans"],
+                        "example_type": row["example_type"],
+                        "single_hop": row["single_hop"],
+                        "subtokenized_input_sequence": row["subtokenized_input_sequence"],
+                        "label_sequence": row["label_sequence"],
+                    }
+                    key += 1
         else:
             with open(filepath, encoding="utf-8") as f:
                 key = 0
@@ -239,13 +266,13 @@ class Codequeries(datasets.GeneratorBasedBuilder):
                     instance_key = str(key) + "_" + row["query_name"] + "_" + row["code_file_path"]
                     yield instance_key, {
                         "query_name": row["query_name"],
+                        "code_file_path": row["code_file_path"],
                         "context_blocks": row["context_blocks"],
                         "answer_spans": row["answer_spans"],
                         "supporting_fact_spans": row["supporting_fact_spans"],
-                        "code_file_path": row["code_file_path"],
                         "example_type": row["example_type"],
+                        "single_hop": row["single_hop"],
                         "subtokenized_input_sequence": row["subtokenized_input_sequence"],
                         "label_sequence": row["label_sequence"],
                     }
                     key += 1
-