Skip to content

Migrate Opower data reads from REST to GraphQL #177

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

Open
loganrosen wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Migrate Opower data reads from REST to GraphQL #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1312e2
Add GraphQL bill-level cost data for utilities where REST returns $0
loganrosen Mar 1, 2026
18f8c8e
Migrate interval reads from REST to GraphQL
loganrosen Mar 2, 2026
094d3fb
Wire monetaryAmount through interval reads pipeline
loganrosen Mar 2, 2026
150b202
Fix PG&E issues: null reads, DST gaps, bill cost fallback, CLI columns
loganrosen Mar 29, 2026
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
113 changes: 58 additions & 55 deletions src/opower/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import csv
import json
import logging
from collections.abc import Sequence
from datetime import datetime, timedelta
from getpass import getpass

Expand All @@ -21,6 +22,61 @@
get_supported_utilities,
select_utility,
)
from opower.opower import CostRead, UsageRead


def _output_usage_reads(usage_data: Sequence[UsageRead], csv_file_path: str | None) -> None:
"""Write usage reads to CSV or stdout."""
if csv_file_path:
with open(csv_file_path, "w", newline="") as csv_file:
writer = csv.writer(csv_file)
writer.writerow(["start_time", "end_time", "consumption"])
for read in usage_data:
writer.writerow([read.start_time, read.end_time, read.consumption])
else:
print("start_time\tend_time\tconsumption\tstart_minus_prev_end\tend_minus_prev_end")
prev_end: datetime | None = None
for read in usage_data:
start_minus_prev_end = None if prev_end is None else read.start_time - prev_end
end_minus_prev_end = None if prev_end is None else read.end_time - prev_end
prev_end = read.end_time
print(f"{read.start_time}\t{read.end_time}\t{read.consumption}\t{start_minus_prev_end}\t{end_minus_prev_end}")
print()


def _output_cost_reads(cost_data: Sequence[CostRead], csv_file_path: str | None, is_bill: bool) -> None:
"""Write cost reads to CSV or stdout."""
if csv_file_path:
with open(csv_file_path, "w", newline="") as csv_file:
writer = csv.writer(csv_file)
if is_bill:
writer.writerow(["start_time", "end_time", "consumption", "provided_cost", "usage_charges", "current_amount"])
else:
writer.writerow(["start_time", "end_time", "consumption", "provided_cost"])
for read in cost_data:
row = [read.start_time, read.end_time, read.consumption, read.provided_cost]
if is_bill:
row.extend([read.usage_charges, read.current_amount])
writer.writerow(row)
else:
if is_bill:
print(
"start_time\tend_time\tconsumption\tprovided_cost"
"\tusage_charges\tcurrent_amount\tstart_minus_prev_end\tend_minus_prev_end"
)
else:
print("start_time\tend_time\tconsumption\tprovided_cost\tstart_minus_prev_end\tend_minus_prev_end")
prev_end: datetime | None = None
for read in cost_data:
start_minus_prev_end = None if prev_end is None else read.start_time - prev_end
end_minus_prev_end = None if prev_end is None else read.end_time - prev_end
prev_end = read.end_time
line = f"{read.start_time}\t{read.end_time}\t{read.consumption}\t{read.provided_cost}"
if is_bill:
line += f"\t{read.usage_charges}\t{read.current_amount}"
line += f"\t{start_minus_prev_end}\t{end_minus_prev_end}"
print(line)
print()


async def _main() -> None:
Expand Down Expand Up @@ -159,7 +215,6 @@ async def _main() -> None:
"end_date=",
args.end_date,
)
prev_end: datetime | None = None
# Realtime data does not include cost data, so effectively --realtime implies --usage_only.
if args.usage_only or args.realtime:
if args.realtime:
Expand All @@ -171,67 +226,15 @@ async def _main() -> None:
args.start_date,
args.end_date,
)
if args.csv:
with open(args.csv, "w", newline="") as csv_file:
writer = csv.writer(csv_file)
writer.writerow(["start_time", "end_time", "consumption"])
for usage_read in usage_data:
writer.writerow(
[
usage_read.start_time,
usage_read.end_time,
usage_read.consumption,
]
)
else:
print("start_time\tend_time\tconsumption\tstart_minus_prev_end\tend_minus_prev_end")
for usage_read in usage_data:
start_minus_prev_end = None if prev_end is None else usage_read.start_time - prev_end
end_minus_prev_end = None if prev_end is None else usage_read.end_time - prev_end
prev_end = usage_read.end_time
print(
f"{usage_read.start_time}"
f"\t{usage_read.end_time}"
f"\t{usage_read.consumption}"
f"\t{start_minus_prev_end}"
f"\t{end_minus_prev_end}"
)
print()
_output_usage_reads(usage_data, args.csv)
else:
cost_data = await opower.async_get_cost_reads(
account,
aggregate_type,
args.start_date,
args.end_date,
)
if args.csv:
with open(args.csv, "w", newline="") as csv_file:
writer = csv.writer(csv_file)
writer.writerow(["start_time", "end_time", "consumption", "provided_cost"])
for cost_read in cost_data:
writer.writerow(
[
cost_read.start_time,
cost_read.end_time,
cost_read.consumption,
cost_read.provided_cost,
]
)
else:
print("start_time\tend_time\tconsumption\tprovided_cost\tstart_minus_prev_end\tend_minus_prev_end")
for cost_read in cost_data:
start_minus_prev_end = None if prev_end is None else cost_read.start_time - prev_end
end_minus_prev_end = None if prev_end is None else cost_read.end_time - prev_end
prev_end = cost_read.end_time
print(
f"{cost_read.start_time}"
f"\t{cost_read.end_time}"
f"\t{cost_read.consumption}"
f"\t{cost_read.provided_cost}"
f"\t{start_minus_prev_end}"
f"\t{end_minus_prev_end}"
)
print()
_output_cost_reads(cost_data, args.csv, aggregate_type == AggregateType.BILL)


if __name__ == "__main__":
Expand Down
Loading