Add multiple spacing options in schema search

Pipfile

@@ -13,6 +13,7 @@ pyunionfind = "*"
 scikit-learn = "*"
 pybktree = "*"
 python-levenshtein = "*"
+jsonsubschema = "*"
 
 [dev-packages]
 

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "dccc2972dd8a453d8b8ca4a9fe499ce549a349e205ea9a7048144011fb143c05"
+            "sha256": "f8514270cd134349fbc89229143c269b8c24175430257f94aa0ec663169958c2"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -128,6 +128,13 @@
             "markers": "python_full_version >= '3.7.0'",
             "version": "==3.3.2"
         },
+        "greenery": {
+            "hashes": [
+                "sha256:c489d3d111ab49fc522e4796f349994d953d20ec8289aef107f2e7f240534d85",
+                "sha256:fb5f9439401ba01f256c7aff0aef9ecb482a3468e489532cfd8590743463d7c3"
+            ],
+            "version": "==3.3.3"
+        },
         "idna": {
             "hashes": [
                 "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc",
@@ -160,6 +167,14 @@
             "index": "pypi",
             "version": "==0.9.25"
         },
+        "jsonref": {
+            "hashes": [
+                "sha256:32fe8e1d85af0fdefbebce950af85590b22b60f9e95443176adbde4e1ecea552",
+                "sha256:590dc7773df6c21cbf948b5dac07a72a251db28b0238ceecce0a2abfa8ec30a9"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==1.1.0"
+        },
         "jsonschema": {
             "hashes": [
                 "sha256:5b22d434a45935119af990552c862e5d6d564e8f6601206b305a61fdf661a2b7",
@@ -176,6 +191,14 @@
             "markers": "python_version >= '3.8'",
             "version": "==2023.12.1"
         },
+        "jsonsubschema": {
+            "hashes": [
+                "sha256:4133bd1f7a2529b28aa7150f71bbcd5d6acf3663f0b83dedd9e6df71c4585779",
+                "sha256:852e0878842122a046fce5b3db1bfb801a26de20a2dfaebd8df20f366a762d2c"
+            ],
+            "index": "pypi",
+            "version": "==0.0.7"
+        },
         "levenshtein": {
             "hashes": [
                 "sha256:01ad1eb09933a499a49923e74e05b1428ca4ef37fed32965fef23f1334a11563",
@@ -314,6 +337,14 @@
             "markers": "python_version < '3.9'",
             "version": "==1.3.10"
         },
+        "portion": {
+            "hashes": [
+                "sha256:17f0388d7df3488313ac527d8da9542d2c1329dfefb8793a77ad2dfc97596051",
+                "sha256:5289b40d98959b16b3f6927781678935d3df1b7c14947f5d7778e5e04dd9a065"
+            ],
+            "markers": "python_version ~= '3.7'",
+            "version": "==2.4.2"
+        },
         "pybktree": {
             "hashes": [
                 "sha256:eec0037cdd3d7553e6d72435a4379bede64be17c6712f149e485169638154d2b"
@@ -629,6 +660,13 @@
             "markers": "python_version < '3.12' and python_version >= '3.8'",
             "version": "==1.10.1"
         },
+        "sortedcontainers": {
+            "hashes": [
+                "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88",
+                "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"
+            ],
+            "version": "==2.4.0"
+        },
         "threadpoolctl": {
             "hashes": [
                 "sha256:082433502dd922bf738de0d8bcc4fdcbf0979ff44c42bd40f5af8a282f6fa107",
@@ -655,11 +693,11 @@
         },
         "zipp": {
             "hashes": [
-                "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b",
-                "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715"
+                "sha256:6278d9ddbcfb1f1089a88fde84481528b07b0e10474e09dcfe53dad4069fa059",
+                "sha256:dce197b859eb796242b0622af1b8beb0a722d52aa2f57133ead08edd5bf5374e"
             ],
             "markers": "python_version < '3.10'",
-            "version": "==3.18.1"
+            "version": "==3.18.2"
         }
     },
     "develop": {}

commits.json

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

fetch_history.py

@@ -53,7 +53,7 @@ def main():
     session.mount("http://", adapter)
     session.mount("https://", adapter)
 
-    with open("repos.csv", "r") as csvfile:
+    with open("repos2.csv", "r") as csvfile:
         # Count number of rows and reset
         reader = csv.DictReader(csvfile)
         rows = sum(1 for row in reader)

slurp.py

@@ -11,9 +11,7 @@ import tqdm
 
 
 def slurp(outfile):
-    query = (
-        'count:all file:\.json$ content:\'{\n  "$schema": "https://json-schema.org/\''
-    )
+    query = 'count:all file:\.json$ (content:\'{\n  "$schema": "https://json-schema.org/\' or content:\'{\n    "$schema": "https://json-schema.org/\')'
 
     session = requests.Session()
     adapter = requests_ratelimiter.LimiterAdapter(per_second=2)

validate_schemas.py

@@ -9,8 +9,11 @@ import tqdm
 
 data_path = Path("data")
 for schema_file in tqdm.tqdm(list(data_path.rglob("*.json"))):
+    # Calculate the path of the new file
+    new_schema_file = Path("valid_data", *schema_file.parts[1:])
+
     # Skip any directories named with .json at the end
-    if not schema_file.is_file():
+    if not schema_file.is_file() and not new_schema_file.is_file():
         continue
 
     try: