Update data with commits

.gitattributes

@@ -1 +1,2 @@
 *.jsonl.gz filter=lfs diff=lfs merge=lfs -text
+commits.json filter=lfs diff=lfs merge=lfs -text

README.md

@@ -15,13 +15,21 @@ This is somewhat restrictive, but still manages to find a large number of schema
 
     pipenv run python slurp.py --outfile repos.csv
 
-# Step 2: Download the JSON Schema files
+# Step 2: Fetch the history information for each file
+
+We fetch every revision of each JSON Schema file.
+Before downloading the files, we use the GitHub API to get the list of commit hashes.
+The resulting data is saved to `commits.json`.
+
+    pipenv run python fetch_history.py
+
+# Step 3: Download the JSON Schema files
 
 This script will download each schema which comes from GitHub and save it into subfolders in the `data` directory.
 
     ./fetch_files.sh
 
-# Step 3: Validate each JSON Schema
+# Step 4: Validate each JSON Schema
 
 The following script will read each schema in the `data` directory and confirm that it is a valid JSON Schema.
 A copy of all valid schemas will be placed in the `valid_data` directory.
@@ -29,7 +37,7 @@ Note that schemas are parsed as [JSON5](https://json5.org/) to be more permissiv
 
     pipenv run python validate_schemas.py
 
-# Step 4: Split into train, test, and validation
+# Step 5: Split into train, test, and validation
 
 Finally data is split into training, test, and validation sets.
 Schemas are always grouped together in the same set based on the GitHub organization they are from.

commits.json

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c08a61a38b65249b8f81d93321acf191cc71a7d1c7737d04114eddb4b470b83
+size 14605432

fetch_files.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-pv repos.csv | tail -n +2 | \
-    while IFS=, read -r repo stars fetched commit path; do
-        path=$(echo "$path" | tr -d '\r')
-        source=$(echo "$repo" | cut -d/ -f1)
-        if [ "$source" == "github.com" ]; then
-            repo_name=$(echo "$repo" | cut -d/ -f2-)
-            curl "https://raw.githubusercontent.com/$repo_name/$commit/$path" --silent --create-dirs -o "data/$repo/$path"
+pv commits.json |
+    jq -r '("https://raw.githubusercontent.com/" + .repository) as $url | .path as $path | .commits[] | $url + "/" + .sha + "/" + $path' |
+    while read url; do
+        # Strip the url prefix to get the path
+        path=$(echo "$url" | cut -d/ -f4-)
+        if ! [ -f "data/$path" ]; then
+            curl "$url" --silent --create-dirs -o "data/$path"
             sleep 1
         fi
     done

fetch_history.py

@@ -28,10 +28,22 @@ def get_commits(session, repo, path):
         requests.exceptions.ReadTimeout,
     ):
         # Skip on request error
-        return set()
+        return None
     else:
         # Get the commit hashes
-        return set(c["sha"] for c in r.json())
+        obj = r.json()
+        if isinstance(obj, list):
+            commits = []
+            for c in obj:
+                try:
+                    commits.append(
+                        {"sha": c["sha"], "date": c["commit"]["committer"]["date"]}
+                    )
+                except KeyError:
+                    pass
+            return commits
+        else:
+            return None
 
 
 def main():
@@ -54,9 +66,16 @@ def main():
             commits = get_commits(session, repo, row["path"])
 
             # Write the collected commits
-            obj = {"repository": repo, "path": row["path"], "commits": list(commits)}
-            json.dump(obj, sys.stdout)
-            sys.stdout.write("\n")
+            if commits:
+                obj = {
+                    "repository": repo,
+                    "path": row["path"],
+                    "repoStars": row["repoStars"],
+                    "repoLastFetched": row["repoLastFetched"],
+                    "commits": list(commits),
+                }
+                json.dump(obj, sys.stdout)
+                sys.stdout.write("\n")
 
 
 if __name__ == "__main__":

test.jsonl.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5248fb1d00b834b10313bc391e7b0a6d22993b3c130c3dcf6335eb3819ede53
-size 771540
+oid sha256:9a60e9e12cc5c73a66b9c14b8fdd368b534dc7235bb12165043f658cccc7f5b1
+size 1074453

train.jsonl.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:293f05cf668011d6d58ffc68f2fa0ac05f04b47e7b2b2d778e506c0c30a01153
-size 23484213
+oid sha256:4cf2c9605a9cbd1cb8ecfb1bdaafd52c337ed47489588256c45a487c9058aff7
+size 38163445

train_split.py

@@ -1,5 +1,5 @@
 import argparse
-import csv
+import copy
 import gzip
 import json
 import os
@@ -27,11 +27,19 @@ def write_schemas(filename, schema_list, schema_data):
             filename = str(os.path.join(*Path(schema).parts[1:]))
             data = schema_data[filename]
             schema = open(schema).read()
+
+            # Get stars or null if missing
+            try:
+                repoStars = int(data["repoStars"])
+            except (KeyError, ValueError):
+                repoStars = None
+
             obj = {
                 "repository": data["repository"],
                 "commit": data["commit"],
+                "commitDate": data["commitDate"],
                 "path": data["path"],
-                "repoStars": int(data["repoStars"]),
+                "repoStars": repoStars,
                 "repoLastFetched": data["repoLastFetched"],
                 "content": schema,
             }
@@ -39,7 +47,7 @@ def write_schemas(filename, schema_list, schema_data):
             f.write("\n")
 
 
-def main(similarity, split, seed, repo_file):
+def main(similarity, split, seed, commits_file):
     files = files_list()
 
     # Prepare a BK Tree if we're doing similarity grouping
@@ -106,11 +114,15 @@ def main(similarity, split, seed, repo_file):
     (test_indexes, val_indexes) = next(gss.split(test_schemas, groups=test_groups))
 
     schema_data = {}
-    with open(repo_file) as csvfile:
-        reader = csv.DictReader(csvfile)
-        for row in reader:
-            filename = os.path.join(row["repository"], row["path"])
-            schema_data[filename] = row
+    with open(commits_file) as f:
+        for line in f:
+            obj = json.loads(line)
+            for commit in obj["commits"]:
+                obj = copy.deepcopy(obj)
+                filename = os.path.join(obj["repository"], commit["sha"], obj["path"])
+                obj["commit"] = commit["sha"]
+                obj["commitDate"] = commit["date"]
+                schema_data[filename] = obj
 
     # Write the train and test sets
     write_schemas("train.jsonl.gz", all_schemas[train_indexes], schema_data)
@@ -123,6 +135,6 @@ if __name__ == "__main__":
     parser.add_argument("--similarity", default=None, type=float)
     parser.add_argument("--seed", default=94, type=int)
     parser.add_argument("--split", default=0.8, type=float)
-    parser.add_argument("--repo_file", default="repos.csv")
+    parser.add_argument("--commits_file", default="commits.json")
     args = parser.parse_args()
-    main(args.similarity, args.split, args.seed, args.repo_file)
+    main(args.similarity, args.split, args.seed, args.commits_file)

validation.jsonl.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99d35c67ed0c473c07571ab60360df1c932e8fa345ba6a0d2b937de404788d69
-size 560261
+oid sha256:ab8a6ee8067de1eae9582f7cff274b5aab9f9719460471fe45283832ae8e3abd
+size 5578087