Skip to content

Take a copy of rates obtained via download_octopus_rates so saving sessions don't repeatedly increment them #3611

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
springfall2008 merged 2 commits into from
Mar 21, 2026
+6 −2
Merged

Take a copy of rates obtained via download_octopus_rates so saving sessions don't repeatedly increment them #3611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a960d
Take a copy of rates obtained via download_octopus_rates so saving se…
AndrewColes Mar 20, 2026
526b308
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 20, 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
8 changes: 6 additions & 2 deletions apps/predbat/fetch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
from futurerate import FutureRate
from axle import fetch_axle_sessions, load_axle_slot, fetch_axle_active

import copy


class Fetch:
"""Data fetching mixin for loading energy rates, consumption, and forecasts.
Expand Down Expand Up @@ -811,7 +813,8 @@ def fetch_sensor_data(self, save=True):
if "rates_import_octopus_url" in self.args:
# Fixed URL for rate import
self.log("Downloading import rates directly from URL {}".format(self.get_arg("rates_import_octopus_url", indirect=False)))
self.rate_import = self.download_octopus_rates(self.get_arg("rates_import_octopus_url", indirect=False))
# Need to take a copy, as saving sessions will repeatedly increment cached import rates
self.rate_import = copy.deepcopy(self.download_octopus_rates(self.get_arg("rates_import_octopus_url", indirect=False)))
elif "metric_octopus_import" in self.args:
# Octopus import rates
entity_id = self.get_arg("metric_octopus_import", None, indirect=False)
Expand Down Expand Up @@ -876,7 +879,8 @@ def fetch_sensor_data(self, save=True):
if "rates_export_octopus_url" in self.args:
# Fixed URL for rate export
self.log("Downloading export rates directly from URL {}".format(self.get_arg("rates_export_octopus_url", indirect=False)))
self.rate_export = self.download_octopus_rates(self.get_arg("rates_export_octopus_url", indirect=False))
# Need to take a copy, as saving sessions will repeatedly increment cached export rates
self.rate_export = copy.deepcopy(self.download_octopus_rates(self.get_arg("rates_export_octopus_url", indirect=False)))
elif "metric_octopus_export" in self.args:
# Octopus export rates
entity_id = self.get_arg("metric_octopus_export", None, indirect=False)
Expand Down
Loading