Skip to content

[PROJ-6325] remove timezone info from python EAS client and add load overrides to run open-dss export #32

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 1 commit into from
Jun 27, 2025
Merged

[PROJ-6325] remove timezone info from python EAS client and add load overrides to run open-dss export #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 41 additions & 7 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,12 +986,29 @@ async def async_run_opendss_export(self, config: OpenDssConfig):
},
"modulesConfiguration": {
"common": {
"timeZone": config.time_zone.__str__(),
**({"fixedTime": config.load_time.time.isoformat()}
if isinstance(config.load_time, FixedTime) else {}),
**({ "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": {
"start": config.load_time.start_time.isoformat(),
"end": config.load_time.end_time.isoformat(),
"startTime": config.load_time.start_time.isoformat(),
"endTime": config.load_time.end_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, TimePeriod) else {})
},
**({"generator": {
Expand Down Expand Up @@ -1145,9 +1162,26 @@ async def async_get_paged_opendss_models(
}
modulesConfiguration {
common {
fixedTime{
loadTime
overrides {
loadId
loadWattsOverride
genWattsOverride
loadVarOverride
genVarOverride
}
}
timePeriod {
start
end
startTime
endTime
overrides {
loadId
loadWattsOverride
genWattsOverride
loadVarOverride
genVarOverride
}
}
}
generator {
Expand Down
1 change: 0 additions & 1 deletion src/zepben/eas/client/opendss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class OpenDssConfig:
scenario: str
year: int
feeder: str
time_zone: tzinfo
load_time: Union[TimePeriod, FixedTime]
generator_config: Optional[GeneratorConfig] = None
model_name: Optional[str] = None
Expand Down
37 changes: 30 additions & 7 deletions test/test_eas_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,10 +780,16 @@ def run_opendss_export_request_handler(request):
},
"modulesConfiguration": {
"common": {
"timeZone": "UTC+10:00",
"timePeriod": {
"start": "2022-04-01T00:00:00",
"end": "2023-04-01T00:00:00",
"startTime": "2022-04-01T00:00:00",
"endTime": "2023-04-01T00:00:00",
"overrides": [{
'loadId': 'meter1',
'loadWattsOverride': [1.0],
'genWattsOverride': [2.0],
'loadVarOverride': [3.0],
'genVarOverride': [4.0]
}]
}
},
"generator": {
Expand Down Expand Up @@ -879,10 +885,10 @@ def run_opendss_export_request_handler(request):
scenario="scenario1",
year=2024,
feeder="feeder1",
time_zone=timezone(timedelta(hours=10)),
load_time=TimePeriod(
datetime(2022, 4, 1),
datetime(2023, 4, 1)
datetime(2023, 4, 1),
{"meter1": TimePeriodLoadOverride([1.0], [2.0], [3.0], [4.0])}
),
model_name="TEST OPENDSS MODEL 1",
generator_config=GeneratorConfig(
Expand Down Expand Up @@ -1028,9 +1034,26 @@ def test_run_opendss_export_valid_certificate_success(ca: trustme.CA, httpserver
}
modulesConfiguration {
common {
fixedTime{
loadTime
overrides {
loadId
loadWattsOverride
genWattsOverride
loadVarOverride
genVarOverride
}
}
timePeriod {
start
end
startTime
endTime
overrides {
loadId
loadWattsOverride
genWattsOverride
loadVarOverride
genVarOverride
}
}
}
generator {
Expand Down