Bump pyTibber to 0.30.4 (#129844)

This commit is contained in:
Daniel Hjelseth Høyer 2024-11-06 11:44:54 +01:00 committed by Franck Nijhof
parent 48d9df89ac
commit f55e13bde4
No known key found for this signature in database
GPG Key ID: D62583BA8AB11CA3
5 changed files with 29 additions and 85 deletions

View File

@ -8,5 +8,5 @@
"iot_class": "cloud_polling", "iot_class": "cloud_polling",
"loggers": ["tibber"], "loggers": ["tibber"],
"quality_scale": "silver", "quality_scale": "silver",
"requirements": ["pyTibber==0.30.3"] "requirements": ["pyTibber==0.30.4"]
} }

View File

@ -47,17 +47,13 @@ async def __get_prices(call: ServiceCall, *, hass: HomeAssistant) -> ServiceResp
for tibber_home in tibber_connection.get_homes(only_active=True): for tibber_home in tibber_connection.get_homes(only_active=True):
home_nickname = tibber_home.name home_nickname = tibber_home.name
price_info = tibber_home.info["viewer"]["home"]["currentSubscription"][
"priceInfo"
]
price_data = [ price_data = [
{ {
"start_time": price["startsAt"], "start_time": starts_at,
"price": price["total"], "price": price,
"level": price["level"], "level": tibber_home.price_level.get(starts_at),
} }
for key in ("today", "tomorrow") for starts_at, price in tibber_home.price_total.items()
for price in price_info[key]
] ]
selected_data = [ selected_data = [

View File

@ -1735,7 +1735,7 @@ pyRFXtrx==0.31.1
pySDCP==1 pySDCP==1
# homeassistant.components.tibber # homeassistant.components.tibber
pyTibber==0.30.3 pyTibber==0.30.4
# homeassistant.components.dlink # homeassistant.components.dlink
pyW215==0.7.0 pyW215==0.7.0

View File

@ -1412,7 +1412,7 @@ pyElectra==1.2.4
pyRFXtrx==0.31.1 pyRFXtrx==0.31.1
# homeassistant.components.tibber # homeassistant.components.tibber
pyTibber==0.30.3 pyTibber==0.30.4
# homeassistant.components.dlink # homeassistant.components.dlink
pyW215==0.7.0 pyW215==0.7.0

View File

@ -20,84 +20,32 @@ def generate_mock_home_data():
mock_homes = [ mock_homes = [
MagicMock( MagicMock(
name="first_home", name="first_home",
info={ price_total={
"viewer": { START_TIME.isoformat(): 0.36914,
"home": { (START_TIME + dt.timedelta(hours=1)).isoformat(): 0.36914,
"currentSubscription": { tomorrow.isoformat(): 0.46914,
"priceInfo": { (tomorrow + dt.timedelta(hours=1)).isoformat(): 0.46914,
"today": [ },
{ price_level={
"startsAt": START_TIME.isoformat(), START_TIME.isoformat(): "VERY_EXPENSIVE",
"total": 0.36914, (START_TIME + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
"level": "VERY_EXPENSIVE", tomorrow.isoformat(): "VERY_EXPENSIVE",
}, (tomorrow + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
{
"startsAt": (
START_TIME + dt.timedelta(hours=1)
).isoformat(),
"total": 0.36914,
"level": "VERY_EXPENSIVE",
},
],
"tomorrow": [
{
"startsAt": tomorrow.isoformat(),
"total": 0.46914,
"level": "VERY_EXPENSIVE",
},
{
"startsAt": (
tomorrow + dt.timedelta(hours=1)
).isoformat(),
"total": 0.46914,
"level": "VERY_EXPENSIVE",
},
],
}
}
}
}
}, },
), ),
MagicMock( MagicMock(
name="second_home", name="second_home",
info={ price_total={
"viewer": { START_TIME.isoformat(): 0.36914,
"home": { (START_TIME + dt.timedelta(hours=1)).isoformat(): 0.36914,
"currentSubscription": { tomorrow.isoformat(): 0.46914,
"priceInfo": { (tomorrow + dt.timedelta(hours=1)).isoformat(): 0.46914,
"today": [ },
{ price_level={
"startsAt": START_TIME.isoformat(), START_TIME.isoformat(): "VERY_EXPENSIVE",
"total": 0.36914, (START_TIME + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
"level": "VERY_EXPENSIVE", tomorrow.isoformat(): "VERY_EXPENSIVE",
}, (tomorrow + dt.timedelta(hours=1)).isoformat(): "VERY_EXPENSIVE",
{
"startsAt": (
START_TIME + dt.timedelta(hours=1)
).isoformat(),
"total": 0.36914,
"level": "VERY_EXPENSIVE",
},
],
"tomorrow": [
{
"startsAt": tomorrow.isoformat(),
"total": 0.46914,
"level": "VERY_EXPENSIVE",
},
{
"startsAt": (
tomorrow + dt.timedelta(hours=1)
).isoformat(),
"total": 0.46914,
"level": "VERY_EXPENSIVE",
},
],
}
}
}
}
}, },
), ),
] ]