Refine CSV glob in validation

validation.py

@@ -1,28 +0,0 @@
-from pathlib import Path
-
-from datasets import load_dataset
-
-
-def main():
-    tasks = ["safety_or_not"]
-
-    # check that all the expected files exist
-    prediction_files = list(Path(".").glob("*.csv"))
-    mismatched_files = set(tasks).symmetric_difference(set([f.stem for f in prediction_files]))
-    if mismatched_files:
-        raise ValueError(f"Incorrect number of files! Expected {len(tasks)} files, but got {len(prediction_files)}.")
-
-    # check we can load the dataset for each task
-    load_errors = []
-    for task in tasks:
-        try:
-            dset = load_dataset("../raft_submission", task)
-        except Exception as e:
-            load_errors.append(e)
-
-    if load_errors:
-        raise ValueError(f"Could not load predictions! Errors: {load_errors}")
-
-
-if __name__ == "__main__":
-    main()

{{cookiecutter.repo_name}}/cli.py

@@ -25,16 +25,17 @@ app = typer.Typer()
 
 @app.command()
 def validate():
+    # TODO(lewtun): Consider using great_expectations for the data validation
     tasks = get_dataset_config_names("ought/raft")
 
     # Check that all the expected files exist
-    prediction_files = list(Path("data").rglob("*.csv"))
+    prediction_files = list(Path("data").rglob("predictions.csv"))
     mismatched_files = set(tasks).symmetric_difference(set([f.parent.name for f in prediction_files]))
     if mismatched_files:
         raise ValueError(f"Incorrect number of files! Expected {len(tasks)} files, but got {len(prediction_files)}.")
 
     # Check all files have the expected shape (number of rows, number of columns)
-    # TODO(lewtun): Add a check for the IDs per file
+    # TODO(lewtun): Add a check for the specific IDs per file
     shape_errors = []
     column_errors = []
     for prediction_file in prediction_files:
@@ -69,8 +70,9 @@ def validate():
 
 @app.command()
 def submit():
+    # TODO(lewtun): Replace with subprocess.run and only add the exact files we need for evaluation
     subprocess.call("git pull origin main".split())
-    subprocess.call(["git", "add", "."])
+    subprocess.call(["git", "add", "data"])
     subprocess.call(["git", "commit", "-m", "Submission"])
     subprocess.call(["git", "push"])