Skip to content

Commit

Permalink
fix: Fixed issue when str error reported if config of target rate sen…
Browse files Browse the repository at this point in the history
…sor fails first time
  • Loading branch information
BottlecapDave committed May 9, 2024
1 parent 80bbb52 commit c5cfd83
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions custom_components/octopus_energy/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ async def __async_setup_target_rate_schema__(self, account_id: str):
vol.Optional(CONFIG_TARGET_ROLLING_TARGET, default=False): bool,
vol.Optional(CONFIG_TARGET_LAST_RATES, default=False): bool,
vol.Optional(CONFIG_TARGET_INVERT_TARGET_RATES, default=False): bool,
vol.Optional(CONFIG_TARGET_MIN_RATE): float,
vol.Optional(CONFIG_TARGET_MAX_RATE): float,
vol.Optional(CONFIG_TARGET_MIN_RATE): str,
vol.Optional(CONFIG_TARGET_MAX_RATE): str,
vol.Optional(CONFIG_TARGET_WEIGHTING): str,
})

Expand Down Expand Up @@ -231,15 +231,16 @@ async def async_step_target_rate(self, user_input):
return self.async_abort(reason="account_not_found")

now = utcnow()
errors = validate_target_rate_config(user_input, account_info.account, now) if user_input is not None else {}
config = dict(user_input) if user_input is not None else None
errors = validate_target_rate_config(config, account_info.account, now) if config is not None else {}

if len(errors) < 1 and user_input is not None:
user_input[CONFIG_KIND] = CONFIG_KIND_TARGET_RATE
user_input[CONFIG_ACCOUNT_ID] = self._account_id
config[CONFIG_KIND] = CONFIG_KIND_TARGET_RATE
config[CONFIG_ACCOUNT_ID] = self._account_id
# Setup our targets sensor
return self.async_create_entry(
title=f"{user_input[CONFIG_TARGET_NAME]} (target)",
data=user_input
title=f"{config[CONFIG_TARGET_NAME]} (target)",
data=config
)

# Reshow our form with raised logins
Expand Down Expand Up @@ -407,8 +408,8 @@ async def __async_setup_target_rate_schema__(self, config, errors):
vol.Optional(CONFIG_TARGET_ROLLING_TARGET): bool,
vol.Optional(CONFIG_TARGET_LAST_RATES): bool,
vol.Optional(CONFIG_TARGET_INVERT_TARGET_RATES): bool,
vol.Optional(CONFIG_TARGET_MIN_RATE): float,
vol.Optional(CONFIG_TARGET_MAX_RATE): float,
vol.Optional(CONFIG_TARGET_MIN_RATE): str,
vol.Optional(CONFIG_TARGET_MAX_RATE): str,
vol.Optional(CONFIG_TARGET_WEIGHTING): str,
}),
{
Expand Down

0 comments on commit c5cfd83

Please sign in to comment.