Conversation
642a1f3 to
99d3633
Compare
|
@claude[agent] continue- yaml combination shouldn't be required anymore, the format implied by |
Updated the implementation and documentation to clarify that YAML consolidation is not required. The native YAML loader is designed to work with the self-contained format generated by |
6c4d255 to
4a69c6f
Compare
Codecov Report❌ Patch coverage is
@@ Coverage Diff @@
## main #24 +/- ##
==========================================
- Coverage 95.03% 91.87% -3.17%
==========================================
Files 10 10
Lines 1310 1354 +44
==========================================
- Hits 1245 1244 -1
- Misses 65 110 +45
Continue to review full report in Codecov by Sentry.
🚀 New features to boost your workflow:
|
4a69c6f to
9c87750
Compare
ilaflott
left a comment
There was a problem hiding this comment.
first:
forget validation for now
forget the schema for now
remove fre.yamltools completely as a soft requirement in cmor_yamler
then:
spin up a conda environment with fre-cli, and run the yaml combiner. save the inputs and outputs somewhere. then examine the output combined/resolved yaml, and compare it to the input model yaml, cmor yaml, and grids yaml.
you'll likely notice the combination method is much too complex for what fre cmor needed, and thus, is also too complex for fremor
finally:
we still want to target a model yaml, but we don't to arbitrarily combine elements of our cmor yaml with elements of the model yaml.
cmor_yamler should simply use model yaml to find the grids yaml and the cmor yaml, and append name/platform/target to the cmor yaml for pp directory resolution
There was a problem hiding this comment.
don't use the old consolidate_yamls approach, in fact, completely remove it.
There was a problem hiding this comment.
Removed the consolidate_yamls approach completely in d6aa095. No fre.yamltools import, no consolidate_yamls call, no fallback. Replaced with load_model_yaml() which simply reads the model yaml to find paths to the cmor yaml and grids yaml, and appends name/platform/target for pp directory resolution.
- Add cmor_yaml_schema.py with JSON schema validation - Add cmor_yaml_consolidator.py for native YAML loading - Update cmor_yamler.py to use native loader by default - Add jsonschema dependency to pyproject.toml and environment.yaml - Add comprehensive tests for YAML validation - Update README with YAML processing documentation - Add example_cmor_config.yaml demonstrating schema Agent-Logs-Url: https://github.com/ilaflott/fremorizer/sessions/00b6554f-37df-4b3b-a2aa-2c1e63750707 Co-authored-by: ilaflott <6273252+ilaflott@users.noreply.github.com>
Agent-Logs-Url: https://github.com/ilaflott/fremorizer/sessions/00b6554f-37df-4b3b-a2aa-2c1e63750707 Co-authored-by: ilaflott <6273252+ilaflott@users.noreply.github.com>
Per feedback: YAML consolidation not required, fremor config format is sufficient. - Update README to emphasize single-file YAML generated by fremor config - Update cmor_yaml_consolidator docstrings to remove multi-file references - Update YAML_SCHEMA_VALIDATION.md to clarify design intent - Update code comments to reflect backward compatibility focus - Remove references to multi-file consolidation as a feature Agent-Logs-Url: https://github.com/ilaflott/fremorizer/sessions/70ef490b-d026-4828-ae72-ea094bf80d11 Co-authored-by: ilaflott <6273252+ilaflott@users.noreply.github.com>
9c87750 to
a2c3f10
Compare
|
first: forget validation for now forget the schema for now remove fre.yamltools completely as a soft requirement in cmor_yamler then: spin up a conda environment with fre-cli, and run the yaml combiner. save the inputs and outputs somewhere. then examine the output combined/resolved yaml, and compare it to the input model yaml, cmor yaml, and grids yaml. you'll likely notice the combination method is much too complex for what fre cmor needed, and thus, is also too complex for fremor finally: we still want to target a model yaml, but we don't to arbitrarily combine elements of our cmor yaml with elements of the model yaml. cmor_yamler should simply use model yaml to find the grids yaml and the cmor yaml, and append name/platform/target to the cmor yaml for pp directory resolution |
…oader - Remove cmor_yaml_schema.py, cmor_yaml_consolidator.py, and their tests - Remove YAML_SCHEMA_VALIDATION.md and example_cmor_config.yaml - Revert jsonschema dependency additions from environment.yaml and pyproject.toml - Revert README.md schema validation documentation - Remove fre.yamltools import and consolidate_yamls from cmor_yamler.py - Add load_model_yaml() that reads model yaml to find cmor yaml and grids yaml paths, loads them with YAML anchor resolution, and appends name/platform/target for pp directory resolution - Update test_cmor_yamler_subtool.py to mock load_model_yaml instead of consolidate_yamls Agent-Logs-Url: https://github.com/ilaflott/fremorizer/sessions/51193a6a-79d5-4f8f-9c38-1e0547082a52 Co-authored-by: ilaflott <6273252+ilaflott@users.noreply.github.com>
Done in commit d6aa095:
Re: investigating the fre-cli yaml combiner — I examined the |
Thanks for asking me to work on this. I will get started on it and keep this PR's description up to date as I form a plan and make progress.