Skip to content

Fix inconsistency between python and GQL for load overrides. #31

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
roberto-marquez merged 2 commits into from
Jun 26, 2025
Merged

Fix inconsistency between python and GQL for load overrides. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f04020
Fix inconsistency between python and GQL for load overrides.
Esaotuelr Jun 26, 2025
888d557
add to changelog
Esaotuelr Jun 26, 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
2 changes: 1 addition & 1 deletion changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* Added work package config documentation.

### Fixes
* None.
* Fix inconsistency between GQL and python load override assignment.

### Notes
* None.
Expand Down
48 changes: 36 additions & 12 deletions src/zepben/eas/client/eas_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,27 @@ async def async_get_work_package_cost_estimation(self, work_package: WorkPackage
"timePeriod": {
"startTime": config.load_time.start_time.isoformat(),
"endTime": config.load_time.end_time.isoformat(),
"overrides": config.load_time.load_overrides and {
key: value.__dict__
for key, value in config.load_time.load_overrides.items()}
"overrides": config.load_time.load_overrides and [
{
"loadId": key,
"loadWattsOverride": value.load_watts,
"genWattsOverride": value.gen_watts,
"loadVarOverride": value.load_var,
"genVarOverride": value.gen_var,
} for key, value in config.load_time.load_overrides.items()
]
} if isinstance(config.load_time, TimePeriod) else None,
"fixedTime": config.load_time and {
"loadTime": config.load_time.time.isoformat(),
"overrides": config.load_time.load_overrides and {
key: value.__dict__
for key, value in config.load_time.load_overrides.items()}
"overrides": config.load_time.load_overrides and [
{
"loadId": key,
"loadWattsOverride": value.load_watts,
"genWattsOverride": value.gen_watts,
"loadVarOverride": value.load_var,
"genVarOverride": value.gen_var,
} for key, value in config.load_time.load_overrides.items()
]
} if isinstance(config.load_time, FixedTime) else None,
} for config in work_package.syf_config.configs
]
Expand Down Expand Up @@ -441,15 +453,27 @@ async def async_run_hosting_capacity_work_package(self, work_package: WorkPackag
"timePeriod": {
"startTime": config.load_time.start_time.isoformat(),
"endTime": config.load_time.end_time.isoformat(),
"overrides": config.load_time.load_overrides and {
key: value.__dict__
for key, value in config.load_time.load_overrides.items()}
"overrides": config.load_time.load_overrides and [
{
"loadId": key,
"loadWattsOverride": value.load_watts,
"genWattsOverride": value.gen_watts,
"loadVarOverride": value.load_var,
"genVarOverride": value.gen_var,
} for key, value in config.load_time.load_overrides.items()
]
} if isinstance(config.load_time, TimePeriod) else None,
"fixedTime": config.load_time and {
"loadTime": config.load_time.time.isoformat(),
"overrides": config.load_time.load_overrides and {
key: value.__dict__
for key, value in config.load_time.load_overrides.items()}
"overrides": config.load_time.load_overrides and [
{
"loadId": key,
"loadWattsOverride": value.load_watts,
"genWattsOverride": value.gen_watts,
"loadVarOverride": value.load_var,
"genVarOverride": value.gen_var,
} for key, value in config.load_time.load_overrides.items()
]
} if isinstance(config.load_time, FixedTime) else None,
} for config in work_package.syf_config.configs
]
Expand Down