drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Optimize our jsonschema by using refs (#13271)

Browse source 
* fix some broken info.json files

* optimize our jsonschema using refs

* fix formatting after vscode broke it

* make flake8 happy

* cleanup

* make our schema validation more compact and flexible
This commit is contained in:
Zach White 2021-06-24 20:48:53 -07:00 • committed by GitHub
parent 9d4412cb8b
commit b908275354
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 351 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/python/qmk/json_schema.py
View file

@ -24,9 +24,10 @@ def json_load(json_file):
def load_jsonschema(schema_name):
"""Read a jsonschema file from disk.
FIXME(skullydazed/anyone): Refactor to make this a public function.
"""
if Path(schema_name).exists():
return json_load(schema_name)
schema_path = Path(f'data/schemas/{schema_name}.jsonschema')
if not schema_path.exists():
@ -35,28 +36,33 @@ def load_jsonschema(schema_name):
return json_load(schema_path)
def keyboard_validate(data):
"""Validates data against the keyboard jsonschema.
def create_validator(schema):
"""Creates a validator for the given schema id.
"""
schema = load_jsonschema('keyboard')
validator = jsonschema.Draft7Validator(schema).validate
schema_store = {}
return validator(data)
for schema_file in Path('data/schemas').glob('*.jsonschema'):
schema_data = load_jsonschema(schema_file)
if not isinstance(schema_data, dict):
cli.log.debug('Skipping schema file %s', schema_file)
continue
schema_store[schema_data['$id']] = schema_data
resolver = jsonschema.RefResolver.from_schema(schema_store['qmk.keyboard.v1'], store=schema_store)
return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
def keyboard_api_validate(data):
"""Validates data against the api_keyboard jsonschema.
def validate(data, schema):
"""Validates data against a schema.
"""
base = load_jsonschema('keyboard')
relative = load_jsonschema('api_keyboard')
resolver = jsonschema.RefResolver.from_schema(base)
validator = jsonschema.Draft7Validator(relative, resolver=resolver).validate
validator = create_validator(schema)
return validator(data)
def deep_update(origdict, newdict):
"""Update a dictionary in place, recursing to do a deep copy.
"""Update a dictionary in place, recursing to do a depth-first deep copy.
"""
for key, value in newdict.items():
if isinstance(value, Mapping):