Skip to content
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

Validation of User Configuration #28

Merged
8 commits merged into from
Sep 20, 2024
Merged

Validation of User Configuration #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
804b50d
feat: validation for pipeline dictionary
pgierz Aug 7, 2024
79c0c68
fixes tests
pgierz Aug 7, 2024
8abd771
feat: hooks up pipeline validator
pgierz Aug 7, 2024
b61e7b9
feat: rules validator
pgierz Aug 8, 2024
6dee697
fixes last tests for cerberus
pgierz Aug 8, 2024
06270e1
Merge branch 'main' into feat/cerberus
pgierz Sep 9, 2024
f424a25
fix: allowed input_source and input_type is handled by cerberus
pgierz Sep 9, 2024
ce92a48
proper docs for cerberus
pgierz Sep 9, 2024
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
10 changes: 10 additions & 0 deletions src/pymorize/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ def _validate(self, document):
"schema": {"type": "string"},
"required": True,
},
"enabled": {"type": "boolean", "required": False},
"description": {"type": "string", "required": False},
"pipelines": {
"type": "list",
# FIXME(PG): Should cross-check with pipelines.
"schema": {"type": "string"},
},
"cmor_units": {"type": "string", "required": False},
# FIXME(PS): How is it currently defined?
"model_units": {"type": "string", "required": False},
Comment on lines +104 to +105
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@siligam: This still needs to be added correctly for units.py. I wasn't sure how you had designed it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pgierz "model_units" is referred as "source_units" in units.py. It is a optional parameter. If it is not provided, it reads the model units from xarray dataset. At times, user prefers to use some other unit instead of units from xarray dataset. In this case, "source_units" takes precedence if provided.
The setting "model_units" : {"required": False} is apt.

},
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/configs/test_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ rules:
- name: test_rule3
enabled: false
input_patterns: ["/a/b/c"]
cmor_variable: null
cmor_variable: "so"
- name: test_rule4
cmor_variable: null
cmor_variable: "thetao"
pipelines: ["sleeper_pipeline"]
input_patterns: ["/a/b/c"]
Loading