Skip to content

Fix open dss gql for fixed time #37

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
zarakay merged 2 commits into from
Jul 18, 2025
Merged

Fix open dss gql for fixed time #37

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
e2c1391
fix open dss gql for fixed time.
clydeu Jul 14, 2025
4e04c17
formatting.
clydeu Jul 17, 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
22 changes: 11 additions & 11 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 @@ -986,17 +986,17 @@ async def async_run_opendss_export(self, config: OpenDssConfig):
},
"modulesConfiguration": {
"common": {
**({ "loadTime": config.load_time.time.isoformat(),
"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 {}),
**({"fixedTime": {"loadTime": config.load_time.time.isoformat(),
"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 {}),
**({"timePeriod": {
"startTime": config.load_time.start_time.isoformat(),
"endTime": config.load_time.end_time.isoformat(),
Expand Down
15 changes: 13 additions & 2 deletions test/test_eas_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,17 @@ def run_opendss_export_request_handler(request):
},
"modulesConfiguration": {
"common": {
"timePeriod": {
**({"fixedTime": {
"loadTime": "2022-04-01T00:00:00",
"overrides": [{
'loadId': 'meter1',
'loadWattsOverride': [1.0],
'genWattsOverride': [2.0],
'loadVarOverride': [3.0],
'genVarOverride': [4.0]
}]
}} if isinstance(OPENDSS_CONFIG.load_time, FixedTime) else
{"timePeriod": {
"startTime": "2022-04-01T00:00:00",
"endTime": "2023-04-01T00:00:00",
"overrides": [{
Expand All @@ -790,7 +800,7 @@ def run_opendss_export_request_handler(request):
'loadVarOverride': [3.0],
'genVarOverride': [4.0]
}]
}
}})
},
"generator": {
"model": {
Expand Down Expand Up @@ -1005,6 +1015,7 @@ def test_run_opendss_export_valid_certificate_success(ca: trustme.CA, httpserver
ca_filename=ca_filename
)

OPENDSS_CONFIG.load_time = FixedTime(datetime(2022, 4, 1), {"meter1": FixedTimeLoadOverride([1.0], [2.0], [3.0], [4.0])})
httpserver.expect_oneshot_request("/api/graphql").respond_with_handler(
run_opendss_export_request_handler)
res = eas_client.run_opendss_export(OPENDSS_CONFIG)
Expand Down