Feature: flex-context per commodity as list by Flix6x · Pull Request #2235 · FlexMeasures/flexmeasures

Flix6x · 2026-06-12T14:37:48Z

Description

The flex-context is now preferred to be defined as a list, with one entry per commodity
The new fields aggregate-consumption and aggregate-production are the per-commodity replacements of aggregate-power
Added changelog item in documentation/changelog.rst

Look & Feel

...

How to test

...

Further Improvements

...

Related Items

...

…mmodity) Signed-off-by: F.N. Claessen <claessen@seita.nl>

Signed-off-by: F.N. Claessen <claessen@seita.nl>

…odity Signed-off-by: F.N. Claessen <claessen@seita.nl>

Signed-off-by: F.N. Claessen <claessen@seita.nl>

…ty' into dev/flex-context-as-list Signed-off-by: F.N. Claessen <claessen@seita.nl> # Conflicts: # flexmeasures/ui/static/openapi-specs.json

Signed-off-by: F.N. Claessen <claessen@seita.nl>

- Add SensorReferenceSchema import - Override relax_constraints default to True in CommodityFlexContextSchema - Remove duplicate breach price and relax fields from FlexContextSchema - Remove duplicate set_default_breach_prices method from FlexContextSchema Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

- Add SensorReferenceSchema import - Override relax_constraints default to True in CommodityFlexContextSchema - Remove duplicate breach price and relax fields from FlexContextSchema - Remove duplicate set_default_breach_prices method from FlexContextSchema Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com> Signed-off-by: F.N. Claessen <claessen@seita.nl>

- Test aggregate-consumption and aggregate-production fields - Test SharedSchema fields accessible in FlexContextSchema - Test CommodityFlexContextSchema relax_constraints defaults to True - Test shared currency logic for flex-context listings - Test breach prices in both schemas - Add noqa comment for existing unused variable Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

- Add validator to check prices share same currency across all commodity contexts - Fix test data to use actual fixture sensor names - All new tests now passing Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

- Add aggregate-consumption and aggregate-production to scheduling.rst - Exclude COMMODITY_FLEX_CONTEXT and COMMODITY_FLEX_MODEL from doc test (already documented as "commodity") - Exclude aggregate fields from UI test (not yet supported in UI) Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

Signed-off-by: F.N. Claessen <claessen@seita.nl>

…g validators in place to forbid that, we actually stop having those fields in the schemas of those fields Signed-off-by: F.N. Claessen <claessen@seita.nl>

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Flix6x · 2026-06-12T23:19:08Z

+@pytest.mark.parametrize(
+    ["flex_context", "fails"],
+    [
+        # Test aggregate-consumption field with sensor reference


These test cases are very weak still. They either under-specify or falsely claim what result/behaviour they actually test.

Also, we should verify that the aggregate-consumption/production sensors actually get filled with data, with the correct sign convention and with the expected data source type. I don't think they are, which points to missing logic in the StorageScheduler, where the aggregate power flows get computed from ems_schedule. This should be done per commodity, and ensuring backwards compatibility (in case flex-context has no commodity_contexts, all devices are electric).

…s possible that the entire flex-config is described in the db instead of the trigger message (this cherry-pick was adapted, because the flex-context moved from being documented as a dict to a list) Signed-off-by: F.N. Claessen <claessen@seita.nl>

Signed-off-by: F.N. Claessen <claessen@seita.nl>

sensor for aggregate-consumption sensor and/or aggregate-production Signed-off-by: F.N. Claessen <claessen@seita.nl>

…ty is defined in the html in 3 places Signed-off-by: F.N. Claessen <claessen@seita.nl>

…gate-production Signed-off-by: F.N. Claessen <claessen@seita.nl>

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

Signed-off-by: F.N. Claessen <claessen@seita.nl>

…ev/flex-context-as-list

Context: - PR #2235 tests were weak and under-specified - Need to verify aggregate sensors get filled with data - Need to verify correct sign conventions - Need to verify per-commodity logic and backwards compatibility Change: - New file test_scheduling_aggregate_sensors_fresh_db.py (465 lines) - 5 integration tests verifying aggregate sensor functionality: * Data filling and sign convention (3 parametrized cases) * Per-commodity aggregation (skipped - multi-device complexity) * Backwards compatibility (no commodity_contexts) * Data source type verification - Tests use fresh_db fixture for database modifications - All tests passing (5 passed, 1 skipped) Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

Context: - PR #2235 feedback: aggregate sensors not being filled with data - Missing per-commodity logic in StorageScheduler - Need backwards compatibility (no commodity_contexts = all electric) Change: - New method _compute_commodity_aggregate_schedules (lines 2082-2202) - Reconstructs commodity-to-devices mapping from device models - Computes per-commodity aggregates by summing ems_schedule - Supports aggregate-consumption and aggregate-production sensors - Applies split logic based on which sensors are defined - Maintains backwards compatibility with old format Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

Context: - PR #2235 tests were weak and under-specified - Test comments didn't accurately describe behavior - Need better schema validation coverage Change: - Renamed test_commodity_flex_context_defaults to test_commodity_flex_context_schema_validation - Enhanced docstring to clarify schema validation only - Added 3 new test cases for individual aggregate sensors - Added assertions to verify parsed sensor references - 6 parametrized test cases, all passing Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

Context: - PR #2235 required testing aggregate sensor data filling - Integration tests verify scheduler populates aggregate sensors - Schema validation tests are separate from integration tests Change: - Document integration test pattern for aggregate sensors - Add fresh_db requirement for scheduler integration tests - Document scheduler result format (list[dict] with sensor/data/unit/name) - Add lesson about sign convention verification pattern - Document backwards compatibility testing approach Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

Context: - PR #2235 added _compute_commodity_aggregate_schedules method - Implemented per-commodity aggregate power flow computation - Split logic for consumption vs production sensors Change: - Document aggregate schedule computation pattern - Add commodity_to_devices mapping to scheduler knowledge - Document sign convention handling for aggregate fields - Document integration point in scheduler flow - Add backwards compatibility handling pattern Co-authored-by: Flix6x <30658763+Flix6x@users.noreply.github.com>

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

Flix6x added 6 commits June 12, 2026 14:23

feat: support passing flex-context as a list (one flex-context per co…

a66334b

…mmodity) Signed-off-by: F.N. Claessen <claessen@seita.nl>

fix: set default flex-context commodity to electricity

d660d02

Signed-off-by: F.N. Claessen <claessen@seita.nl>

fix: preserve field order in case schema is made OpenAPI compatible

1667344

Signed-off-by: F.N. Claessen <claessen@seita.nl>

feat: reduce documented nesting when defining a flex-context per comm…

abdc440

…odity Signed-off-by: F.N. Claessen <claessen@seita.nl>

dev: add todos

f229b7e

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Merge remote-tracking branch 'origin/dev/split-flexcontext-by-commodi…

137ffa3

…ty' into dev/flex-context-as-list Signed-off-by: F.N. Claessen <claessen@seita.nl> # Conflicts: # flexmeasures/ui/static/openapi-specs.json

Flix6x self-assigned this Jun 12, 2026

style: flake8

cc033ba

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Copilot AI and others added 8 commits June 12, 2026 20:43

chore: upgrade openapi-specs.json

6a55aba

Signed-off-by: F.N. Claessen <claessen@seita.nl>

fix: move _try_to_convert_price_units to SharedSchema

a4b50e3

Signed-off-by: F.N. Claessen <claessen@seita.nl>

fix: some fields cannot use source filters; now instead of just havin…

fc5ba5b

…g validators in place to forbid that, we actually stop having those fields in the schemas of those fields Signed-off-by: F.N. Claessen <claessen@seita.nl>

chore: mypy

679eca2

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Flix6x changed the base branch from main to dev/split-flexcontext-by-commodity June 12, 2026 20:36

Flix6x added 2 commits June 12, 2026 22:49

delete: remove redundant tests

8852e99

Signed-off-by: F.N. Claessen <claessen@seita.nl>

fix: minimize diff

6ff2cf7

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Flix6x commented Jun 12, 2026

View reviewed changes

Flix6x requested a review from Ahmad-Wahid June 12, 2026 23:30

Flix6x added the Scheduling label Jun 12, 2026

Flix6x added 7 commits June 13, 2026 11:05

docs: prefer unique sensor IDs in examples

94bfecd

Signed-off-by: F.N. Claessen <claessen@seita.nl>

docs: clarify cross-reference

e3bd3b9

Signed-off-by: F.N. Claessen <claessen@seita.nl>

feat: UI support for picking a

7f2642d

sensor for aggregate-consumption sensor and/or aggregate-production Signed-off-by: F.N. Claessen <claessen@seita.nl>

fix: for some reason, for flex-context fields, the sensor-only proper…

6e6a36b

…ty is defined in the html in 3 places Signed-off-by: F.N. Claessen <claessen@seita.nl>

feat: test coverage for UI support of aggregate-consumption and aggre…

60def3a

…gate-production Signed-off-by: F.N. Claessen <claessen@seita.nl>

docs: add deprecation instructions for aggregate-power

5fec7c5

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Flix6x and others added 8 commits June 13, 2026 11:46

docs: move down the aggregate-power field documentation

74ce24e

Signed-off-by: F.N. Claessen <claessen@seita.nl>

use different compatible units.

be6399a

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

update comment

6970d0d

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

update comment

b9b35d6

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

update comment

ac2cc0f

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

update the comment

c4cafc9

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

chore: update openapi-specs.json again

7566792

Signed-off-by: F.N. Claessen <claessen@seita.nl>

Merge remote-tracking branch 'origin/dev/flex-context-as-list' into d…

1a59bcb

…ev/flex-context-as-list

Ahmad-Wahid added 3 commits June 17, 2026 12:38

update openapi specs

f6ff8b8

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

feat: add multi feed stock tutorial

44bd283

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

remove extra chart explanation

990896a

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

Flix6x commented Jun 17, 2026

View reviewed changes

Comment thread flexmeasures/ui/static/openapi-specs.json Outdated

Ahmad-Wahid and others added 2 commits June 17, 2026 19:14

fix: update flexmeasures version in openapi-specs

2b2112b

Co-authored-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Signed-off-by: Ahmad Wahid <59763365+Ahmad-Wahid@users.noreply.github.com>

feat: add multi commodity tutorial

95ea68f

Signed-off-by: Ahmad-Wahid <ahmedwahid16101@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: flex-context per commodity as list#2235

Feature: flex-context per commodity as list#2235
Flix6x wants to merge 37 commits into
dev/split-flexcontext-by-commodityfrom
dev/flex-context-as-list

Flix6x commented Jun 12, 2026 •

edited

Loading

Uh oh!

Flix6x Jun 12, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Flix6x commented Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Look & Feel

How to test

Further Improvements

Related Items

Uh oh!

Flix6x Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Flix6x commented Jun 12, 2026 •

edited

Loading

Flix6x Jun 12, 2026 •

edited

Loading