Skip to content

Address pending review comments: taxonomy field-group validation + model-declared properties#231

Merged
aoustry merged 3 commits into
models-taxonomy-checkfrom
claude/confident-faraday-kkidzz
Jun 10, 2026
Merged

Address pending review comments: taxonomy field-group validation + model-declared properties#231
aoustry merged 3 commits into
models-taxonomy-checkfrom
claude/confident-faraday-kkidzz

Conversation

@aoustry

@aoustry aoustry commented Jun 10, 2026

Copy link
Copy Markdown
Collaborator

Addresses the pending review threads from @aoustry and @tbittar on #214, in two groups.

1. Taxonomy validation

check_library_against_taxonomy previously validated ports only. It now validates every field group declared in a taxonomy category: variables, parameters, ports, port-field-definitions, constraints, binding-constraints, extra-outputs and properties. The error message names the model, category, field group, and the missing identifiers. Port-field-definitions are matched on (port, field); the rest on id.

2. Model-declared properties

  • Added an optional properties list (entries with id) to ModelSchema and a properties: List[str] to the runtime Model, wired through _resolve_model.
  • When resolving a component, every property key declared by its model must be present in the component's properties, otherwise a ValueError is raised. Extra/undeclared component properties remain allowed.

Tests & cleanup

  • Per-field-group taxonomy tests (missing-raises for each group + an all-fields-present passing case).
  • Component model-property tests (required present / missing raises / extra allowed, plus schema + resolution exposure).
  • Removed the redundant tests in test_systemschema_from_file.py (covered by test_components_parsing.py), per @tbittar / @aoustry.
  • CHANGELOG entry added.

Verification

  • Full unit suite: 388 passed, 1 xfailed.
  • black/isort applied; mypy clean.
  • CI green on the head commit.

https://claude.ai/code/session_014gf1DB7zMKwddW2K6HkU8a


Generated by Claude Code

claude added 3 commits June 10, 2026 16:22
…eclared properties

Address pending review comments on PR #214:

- check_library_against_taxonomy now validates every field group declared
  in a taxonomy category (variables, parameters, ports, port-field-definitions,
  constraints, binding-constraints, extra-outputs, properties) instead of ports only.
- Add an optional `properties` list to ModelSchema and Model (declared keys).
  When resolving a component, every property key declared by its model must be
  present in the component's properties; extra undeclared properties are allowed.
- Add per-field-group taxonomy tests and component model-property tests.
- Remove redundant tests in test_systemschema_from_file.py (covered by
  test_components_parsing.py).

https://claude.ai/code/session_014gf1DB7zMKwddW2K6HkU8a
Integrate the model-properties and taxonomy field-group changes into the
upcoming 0.1.2 section instead of a separate Unreleased block, merging with
the existing close entries to avoid redundancy.

https://claude.ai/code/session_014gf1DB7zMKwddW2K6HkU8a
All taxonomy category fields now use List[TaxonomyItem] (id only), including
port_field_definitions and binding_constraints which previously used
PortFieldDefinitionSchema and ConstraintSchema. The library check matches a
port-field-definition taxonomy id against the model's composite "port.field"
identifier; binding-constraints match by id. Tests updated accordingly.

https://claude.ai/code/session_014gf1DB7zMKwddW2K6HkU8a
@aoustry aoustry merged commit ceb411d into models-taxonomy-check Jun 10, 2026
3 checks passed
@aoustry aoustry deleted the claude/confident-faraday-kkidzz branch June 10, 2026 20:51
aoustry added a commit that referenced this pull request Jun 11, 2026
* feat(properties):  add properties field to support system parsing

* fix(tests): remove unnecessary blank line in test_systemschema_from_file.py

* refactor: remove unused import PortsConnection from resolve_components.py

* feat(schema): add optional taxonomy_category field to ModelSchema and implement corresponding unit test for YAML parsing

* Apply suggestion from @dusanparipovic

* Update gemspy version to 0.1.0 and clean up whitespace in ModelSchema taxonomy_category field

* feat(changelog): add new features for component properties and taxonomy category

- Introduced optional `properties` for components in `system.yml`, allowing key/value pairs that are normalized into a dictionary.
- Added optional `taxonomy-category` field for models in library YAML files, accessible via `ModelSchema.taxonomy_category`.
- Updated documentation to reflect these changes and provided examples in the user guide.

* fix(docs): clarify properties key naming in documentation and tests

- Updated documentation to replace "key" with "id" in the context of component properties in `system.yml`.
- Adjusted test assertions to reflect the change from "key" to "id" for consistency with the updated documentation.
- Ensured that error messages for duplicate properties also refer to "id" instead of "key".

* feat(study): introduce Study class to encapsulate System and DataBase

- Added a new `Study` dataclass that combines `System` and `DataBase`, centralizing consistency checks.
- Updated `build_problem()` and `build_decomposed_problems()` to accept `Study` directly.
- Refactored related functions and tests to utilize the new `Study` structure, ensuring seamless integration.
- Removed redundant parameters and streamlined the API for better clarity and usability.

* feat(changelog): add changelog

* fix(ruff): fix ruff format on new files

* Apply suggestion from @tbittar

Co-authored-by: tbittar <[email protected]>

* Apply suggestion from @tbittar

Co-authored-by: tbittar <[email protected]>

* Apply suggestion from @tbittar

Co-authored-by: tbittar <[email protected]>

* Apply suggestion from @aoustry

* Apply suggestion from @aoustry

* Update CHANGELOG.md

* Update input documentation on duplicate id handling

Clarified that duplicate ids for properties are rejected.

* fix(taxonomy): import ConstraintSchema and PortFieldDefinitionSchema (#230)

Fixes mypy [name-defined] errors on TaxonomyCategory fields.

Co-authored-by: Claude <[email protected]>

* Address pending review comments: taxonomy field-group validation + model-declared properties (#231)

* feat(taxonomy/models): validate all taxonomy field groups and model-declared properties

Address pending review comments on PR #214:

- check_library_against_taxonomy now validates every field group declared
  in a taxonomy category (variables, parameters, ports, port-field-definitions,
  constraints, binding-constraints, extra-outputs, properties) instead of ports only.
- Add an optional `properties` list to ModelSchema and Model (declared keys).
  When resolving a component, every property key declared by its model must be
  present in the component's properties; extra undeclared properties are allowed.
- Add per-field-group taxonomy tests and component model-property tests.
- Remove redundant tests in test_systemschema_from_file.py (covered by
  test_components_parsing.py).


* docs(changelog): fold property/taxonomy notes into 0.1.2

Integrate the model-properties and taxonomy field-group changes into the
upcoming 0.1.2 section instead of a separate Unreleased block, merging with
the existing close entries to avoid redundancy.

* test: move model-property library tests to lib_parsing (#232)

The tests asserting that a library exposes model-declared properties
(parse + resolve) only exercise library parsing/resolution and do not
involve system/component resolution, so they belong in the lib_parsing
test file rather than test_components_parsing.py.

---------

Co-authored-by: Antoine Oustry, PhD <[email protected]>
Co-authored-by: tbittar <[email protected]>
tbittar added a commit that referenced this pull request Jun 11, 2026
* feat/ add operators abs & round (#217)

* Add abs and round unary operators (#216)

Two new unary operators that mirror the floor/ceil pattern:
- abs(x): absolute value
- round(x): banker's rounding (round-half-to-even), matching np.round
  and Python 3's built-in round.

Like floor/ceil, both operators have degree 0 when their argument has
degree 0, so they are usable inside constraints, binding-constraints,
objective contributions, and variable lower/upper bounds whenever the
argument is constant (parameters and literals). Inside extra-outputs
they may wrap any expression — including ones depending on decision
variables — since extra-outputs are evaluated as numeric xr.DataArrays
post-solve.

* feat(readme): modernize the design of the readme file (#223)

* Restyle README with modern layout

* Add GEMS favicon next to 'The GEMS framework' heading

* Remove top logo image from README header

* Replace 'no-code' with 'low-code' in README

* Use GEMS favicon in quick-link nav

* Vendor GEMS favicon under docs/images and reference it locally

* Add uv install instructions to README

* Prepare develop/ for release v0.1.2 (#225)

* Prepare release v0.1.2

Bump version from 0.1.1 to 0.1.2 in pyproject.toml and uv.lock, and
finalize the CHANGELOG with the abs/round operators and the README
modernization that landed since 0.1.1.

https://claude.ai/code/session_01AfUVdznMY9SayUVt5f3K4T

* Update v0.1.2 release date to 2026-06-11

https://claude.ai/code/session_01AfUVdznMY9SayUVt5f3K4T

---------

Co-authored-by: Claude <[email protected]>

* Fix imports in doc (#227)

* Update agents.md (#228)

* Handle dual and reduced cost (#221)

* Initial commit

* delete unnecessary issue templae

* exclude compatibility file

* remove compatibility file from issue templates

* delete changelog file

* fix step 9 in issue templates

* add notify workflow

* add token for antares legacy converter

* add issue creation for GemsViewsBuilder repo

* fix/Update links to GEMS repo (#219)

* update links to GEMS repo

* transparent pictures

* fix png image link

* scheme -> schema

* remove duplicate ci (#222)

* Add tests

* WIP

* Use visitor pattern

* Use visitor pattern

* Support xpress, gurobi

* Fix solver specific test and mypy

* Formatting

* Pre-commit consistency

* Reorganize tests

* Update docs

* Update xhangelog

* Formatting

* Complete new visitor implementation following rebase

* Fix usage in ports

* Update tests

* Apply suggestion from @aoustry

* update docstring

---------

Co-authored-by: nikolaredstork <[email protected]>
Co-authored-by: Guillaume_RTEi <[email protected]>
Co-authored-by: Antoine Oustry, PhD <[email protected]>

* feat(library <-> taxonomy check) (#214)

* feat(properties):  add properties field to support system parsing

* fix(tests): remove unnecessary blank line in test_systemschema_from_file.py

* refactor: remove unused import PortsConnection from resolve_components.py

* feat(schema): add optional taxonomy_category field to ModelSchema and implement corresponding unit test for YAML parsing

* Apply suggestion from @dusanparipovic

* Update gemspy version to 0.1.0 and clean up whitespace in ModelSchema taxonomy_category field

* feat(changelog): add new features for component properties and taxonomy category

- Introduced optional `properties` for components in `system.yml`, allowing key/value pairs that are normalized into a dictionary.
- Added optional `taxonomy-category` field for models in library YAML files, accessible via `ModelSchema.taxonomy_category`.
- Updated documentation to reflect these changes and provided examples in the user guide.

* fix(docs): clarify properties key naming in documentation and tests

- Updated documentation to replace "key" with "id" in the context of component properties in `system.yml`.
- Adjusted test assertions to reflect the change from "key" to "id" for consistency with the updated documentation.
- Ensured that error messages for duplicate properties also refer to "id" instead of "key".

* feat(study): introduce Study class to encapsulate System and DataBase

- Added a new `Study` dataclass that combines `System` and `DataBase`, centralizing consistency checks.
- Updated `build_problem()` and `build_decomposed_problems()` to accept `Study` directly.
- Refactored related functions and tests to utilize the new `Study` structure, ensuring seamless integration.
- Removed redundant parameters and streamlined the API for better clarity and usability.

* feat(changelog): add changelog

* fix(ruff): fix ruff format on new files

* Apply suggestion from @tbittar

Co-authored-by: tbittar <[email protected]>

* Apply suggestion from @tbittar

Co-authored-by: tbittar <[email protected]>

* Apply suggestion from @tbittar

Co-authored-by: tbittar <[email protected]>

* Apply suggestion from @aoustry

* Apply suggestion from @aoustry

* Update CHANGELOG.md

* Update input documentation on duplicate id handling

Clarified that duplicate ids for properties are rejected.

* fix(taxonomy): import ConstraintSchema and PortFieldDefinitionSchema (#230)

Fixes mypy [name-defined] errors on TaxonomyCategory fields.

Co-authored-by: Claude <[email protected]>

* Address pending review comments: taxonomy field-group validation + model-declared properties (#231)

* feat(taxonomy/models): validate all taxonomy field groups and model-declared properties

Address pending review comments on PR #214:

- check_library_against_taxonomy now validates every field group declared
  in a taxonomy category (variables, parameters, ports, port-field-definitions,
  constraints, binding-constraints, extra-outputs, properties) instead of ports only.
- Add an optional `properties` list to ModelSchema and Model (declared keys).
  When resolving a component, every property key declared by its model must be
  present in the component's properties; extra undeclared properties are allowed.
- Add per-field-group taxonomy tests and component model-property tests.
- Remove redundant tests in test_systemschema_from_file.py (covered by
  test_components_parsing.py).


* docs(changelog): fold property/taxonomy notes into 0.1.2

Integrate the model-properties and taxonomy field-group changes into the
upcoming 0.1.2 section instead of a separate Unreleased block, merging with
the existing close entries to avoid redundancy.

* test: move model-property library tests to lib_parsing (#232)

The tests asserting that a library exposes model-declared properties
(parse + resolve) only exercise library parsing/resolution and do not
involve system/component resolution, so they belong in the lib_parsing
test file rather than test_components_parsing.py.

---------

Co-authored-by: Antoine Oustry, PhD <[email protected]>
Co-authored-by: tbittar <[email protected]>

* Feature/robust checks (#229)

---------

Co-authored-by: Claude <[email protected]>
Co-authored-by: Juliette-Gerbaux <[email protected]>
Co-authored-by: tbittar <[email protected]>
Co-authored-by: nikolaredstork <[email protected]>
Co-authored-by: Guillaume_RTEi <[email protected]>
Co-authored-by: Dušan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants