Skip to content

Fix bug with Octopus direct after re-factor #2854

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 5 commits into from
Nov 2, 2025
Merged

Fix bug with Octopus direct after re-factor #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
601b431
Fix issue with octopus auto-config
springfall2008 Nov 2, 2025
a5f2e12
Fix rate units
springfall2008 Nov 2, 2025
e9014ca
Update apps/predbat/octopus.py
springfall2008 Nov 2, 2025
72663e6
Dp4 for rates
springfall2008 Nov 2, 2025
d241170
Missing import
springfall2008 Nov 2, 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
13 changes: 9 additions & 4 deletions apps/predbat/octopus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import re
from datetime import datetime, timedelta, timezone
from config import TIME_FORMAT, TIME_FORMAT_OCTOPUS
from utils import str2time, minutes_to_time, dp1, dp2, minute_data
from utils import str2time, minutes_to_time, dp1, dp2, dp4, minute_data
import aiohttp
import asyncio
import json
Expand Down Expand Up @@ -789,8 +789,9 @@ def automatic_config(self, tariffs):
self.base.args["octopus_saving_session"] = self.get_entity_name("binary_sensor", "saving_session")
self.base.args["octopus_saving_session_join"] = self.get_entity_name("select", "saving_session_join")
for tariff in tariffs:
self.base.args["metric_octopus_{}_rates".format(tariff)] = self.get_entity_name("sensor", tariff + "_rates")
self.base.args["metric_octopus_{}_standing".format(tariff)] = self.get_entity_name("sensor", tariff + "_standing")
self.base.args["metric_octopus_{}".format(tariff)] = self.get_entity_name("sensor", tariff + "_rates")
if tariff == "import":
self.base.args["metric_standing_charge"] = self.get_entity_name("sensor", tariff + "_standing")
device = self.get_intelligent_device()
if device:
self.base.args["octopus_intelligent_slot"] = self.get_entity_name("binary_sensor", "intelligent_dispatch")
Expand Down Expand Up @@ -961,9 +962,13 @@ async def fetch_tariffs(self, tariffs):
if rate_value is not None:
start_time = time_now.strftime(TIME_FORMAT)
end_time = (time_now + timedelta(minutes=30)).strftime(TIME_FORMAT)
rates_stamp.append({"start": start_time, "end": end_time, "value_inc_vat": rate_value})
rates_stamp.append({"start": start_time, "end": end_time, "value_inc_vat": dp4(rate_value / 100)})
rate_now = rates.get(self.now_utc.minute + self.now_utc.hour * 60, None)
if rate_now:
rate_now = dp4(rate_now / 100)
standing_now = standing.get(self.now_utc.minute + self.now_utc.hour * 60, None)
if standing_now:
standing_now = dp4(standing_now / 100)

self.base.dashboard_item(
self.get_entity_name("sensor", tariff + "_rates"),
Expand Down
2 changes: 1 addition & 1 deletion apps/predbat/predbat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import requests
import asyncio

THIS_VERSION = "v8.27.2"
THIS_VERSION = "v8.27.3"

# fmt: off
PREDBAT_FILES = ["predbat.py", "config.py", "prediction.py", "gecloud.py","utils.py", "inverter.py", "ha.py", "download.py", "unit_test.py", "web.py", "web_helper.py", "predheat.py", "futurerate.py", "octopus.py", "solcast.py","execute.py", "plan.py", "fetch.py", "output.py", "userinterface.py", "energydataservice.py", "alertfeed.py", "compare.py", "db_manager.py", "db_engine.py", "plugin_system.py", "ohme.py", "components.py", "fox.py", "carbon.py", "web_mcp.py"]
Expand Down