Skip to content

Handle array data types with elements that meet oneOf criteria #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 6, 2025
Merged

Handle array data types with elements that meet oneOf criteria #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4453895
correct handling array data types with elements that meet oneOf criteria
JacksonJ-KC Jan 17, 2025
35fbf28
remove _extra
JacksonJ-KC Jan 17, 2025
389fe10
correct handling of min/max within arrays and reformat
JacksonJ-KC Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 87 additions & 77 deletions dodo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,107 +1,117 @@
import schema229.validate
import schema229.markdown
import schema229.json_translate
import schema229.util_229
import os
from doit.tools import create_folder

BUILD_PATH = "build"
SOURCE_PATH = 'schema-source'
DOCS_PATH = os.path.join(BUILD_PATH,"docs")
SCHEMA_PATH = os.path.join(BUILD_PATH,"schema")
DOCS_PATH = os.path.join(BUILD_PATH, "docs")
SCHEMA_PATH = os.path.join(BUILD_PATH, "schema")


def collect_source_files():
file_list = []
for file_name in sorted(os.listdir('schema-source')):
if '.schema.yaml' in file_name:
file_list.append(os.path.join(SOURCE_PATH,file_name))
return file_list
file_list = []
for file_name in sorted(os.listdir('schema-source')):
if '.schema.yaml' in file_name:
file_list.append(os.path.join(SOURCE_PATH, file_name))
return file_list


def collect_target_files(target_dir, extension):
file_list = []
for file_name in sorted(os.listdir('schema-source')):
if '.schema.yaml' in file_name:
file_name_root = os.path.splitext(os.path.splitext(file_name)[0])[0]
file_list.append(os.path.join(target_dir,f'{file_name_root}.schema.{extension}'))
return file_list
file_list = []
for file_name in sorted(os.listdir('schema-source')):
if '.schema.yaml' in file_name:
file_name_root = os.path.splitext(os.path.splitext(file_name)[0])[0]
file_list.append(os.path.join(target_dir, f'{file_name_root}.schema.{extension}'))
return file_list


# Start 229-specific code ------------------------------------
import schema229.util_229


def task_strip_extra_data_element_fields():
'''Strips specified data element fields'''
"""Strips specified data element fields"""
return {
'actions': [
(
schema229.util_229.strip_extra_data_element_fields_from_yaml,
[
[
"RMD Test",
"AppG Used By TCDs",
"AppG P_RMD Equals U_RMD",
"AppG B_RMD Equals P_RMD"
],
os.path.join(SOURCE_PATH, 'ASHRAE229_extra.schema.yaml'),
os.path.join(SOURCE_PATH, 'ASHRAE229.schema.yaml')
]
)
],
# Run this task only if either ASHRAE229_extra.schema.yaml has changed or
# ASHRAE229.schema.yaml does not exist
'file_dep': [os.path.join(SOURCE_PATH, 'ASHRAE229_extra.schema.yaml')],
'targets': [os.path.join(SOURCE_PATH, 'ASHRAE229.schema.yaml')]
'actions': [
(
schema229.util_229.strip_extra_data_element_fields_from_yaml,
[
[
"RMD Test",
"AppG Used By TCDs",
"AppG P_RMD Equals U_RMD",
"AppG B_RMD Equals P_RMD"
],
os.path.join(SOURCE_PATH, 'ASHRAE229_extra.schema.yaml'),
os.path.join(SOURCE_PATH, 'ASHRAE229.schema.yaml')
]
)
],
# Run this task only if either ASHRAE229_extra.schema.yaml has changed or
# ASHRAE229.schema.yaml does not exist
'file_dep': [os.path.join(SOURCE_PATH, 'ASHRAE229_extra.schema.yaml')],
'targets': [os.path.join(SOURCE_PATH, 'ASHRAE229.schema.yaml')]
}


# ------------------------------- End 229-specific code

def task_validate():
'''Validates source-schema against meta-schema'''
return {
'file_dep': [os.path.join("meta-schema","meta.schema.json")] + collect_source_files(),
'actions': [(schema229.validate.validate_dir,[SOURCE_PATH])]
}
"""Validates source-schema against meta-schema"""
return {
'file_dep': [os.path.join("meta-schema", "meta.schema.json")] + collect_source_files(),
'actions': [(schema229.validate.validate_dir, [SOURCE_PATH])]
}


def task_doc():
'''Generates Markdown tables from source-schema'''
return {
'file_dep': collect_source_files() + [os.path.join('schema229','markdown.py')],
'targets': collect_target_files(DOCS_PATH,'md'),
'task_dep': ['validate'],
'actions': [
(create_folder, [DOCS_PATH]),
(schema229.markdown.write_dir,[SOURCE_PATH, DOCS_PATH])
],
'clean': True
}
"""Generates Markdown tables from source-schema"""
return {
'file_dep': collect_source_files() + [os.path.join('schema229', 'markdown.py')],
'targets': collect_target_files(DOCS_PATH, 'md'),
'task_dep': ['validate'],
'actions': [
(create_folder, [DOCS_PATH]),
(schema229.markdown.write_dir, [SOURCE_PATH, DOCS_PATH])
],
'clean': True
}


def task_schema():
'''Generates JSON schema from source-schema'''
return {
'file_dep': collect_source_files(),
'targets': collect_target_files(SCHEMA_PATH,'json'),
'task_dep': ['validate'],
'actions': [
(create_folder, [SCHEMA_PATH]),
(schema229.json_translate.translate_dir,[SOURCE_PATH, SCHEMA_PATH])
],
'clean': True
}
"""Generates JSON schema from source-schema"""
return {
'file_dep': collect_source_files(),
'targets': collect_target_files(SCHEMA_PATH, 'json'),
'task_dep': ['validate'],
'actions': [
(create_folder, [SCHEMA_PATH]),
(schema229.json_translate.translate_dir, [SOURCE_PATH, SCHEMA_PATH])
],
'clean': True
}


# Start 229-Specific Code --------------------------------------
def task_remove_ASHRAE229_schema_yaml():
'''Removes schema-source/ASHRAE229.schema.yaml'''
return {
'actions': [
(
# There is no harm in running this task every time
schema229.util_229.remove_file,
[os.path.join('schema-source', 'ASHRAE229.schema.yaml')]
)
]
}
def task_remove_ashrae229_schema_yaml():
"""Removes schema-source/ASHRAE229.schema.yaml"""
return {
'actions': [
(
# There is no harm in running this task every time
schema229.util_229.remove_file,
[os.path.join('schema-source', 'ASHRAE229.schema.yaml')]
)
]
}
# ----------------------------- End 229-Specific Code


def task_test():
'''Performs unit tests and example file validation tests'''
return {
'task_dep': ['schema'],
'actions': ['pytest -v test']
}
"""Performs unit tests and example file validation tests"""
return {
'task_dep': ['schema'],
'actions': ['pytest -v test']
}
Loading