Small cleanup in Trafikverket Camera (#131424)

This commit is contained in:
G Johansson 2024-11-24 11:09:46 +01:00 committed by GitHub
parent 60cf797650
commit d65d5ceac7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 30 additions and 24 deletions

View File

@ -4,7 +4,7 @@ from __future__ import annotations
import logging import logging
from pytrafikverket.trafikverket_camera import TrafikverketCamera from pytrafikverket import TrafikverketCamera
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION
@ -25,7 +25,7 @@ TVCameraConfigEntry = ConfigEntry[TVDataUpdateCoordinator]
async def async_setup_entry(hass: HomeAssistant, entry: TVCameraConfigEntry) -> bool: async def async_setup_entry(hass: HomeAssistant, entry: TVCameraConfigEntry) -> bool:
"""Set up Trafikverket Camera from a config entry.""" """Set up Trafikverket Camera from a config entry."""
coordinator = TVDataUpdateCoordinator(hass) coordinator = TVDataUpdateCoordinator(hass, entry)
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
entry.runtime_data = coordinator entry.runtime_data = coordinator

View File

@ -5,9 +5,13 @@ from __future__ import annotations
from collections.abc import Mapping from collections.abc import Mapping
from typing import Any from typing import Any
from pytrafikverket.exceptions import InvalidAuthentication, NoCameraFound, UnknownError from pytrafikverket import (
from pytrafikverket.models import CameraInfoModel CameraInfoModel,
from pytrafikverket.trafikverket_camera import TrafikverketCamera InvalidAuthentication,
NoCameraFound,
TrafikverketCamera,
UnknownError,
)
import voluptuous as vol import voluptuous as vol
from homeassistant.config_entries import ( from homeassistant.config_entries import (

View File

@ -9,14 +9,14 @@ import logging
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
import aiohttp import aiohttp
from pytrafikverket.exceptions import ( from pytrafikverket import (
CameraInfoModel,
InvalidAuthentication, InvalidAuthentication,
MultipleCamerasFound, MultipleCamerasFound,
NoCameraFound, NoCameraFound,
TrafikverketCamera,
UnknownError, UnknownError,
) )
from pytrafikverket.models import CameraInfoModel
from pytrafikverket.trafikverket_camera import TrafikverketCamera
from homeassistant.const import CONF_API_KEY, CONF_ID from homeassistant.const import CONF_API_KEY, CONF_ID
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
@ -44,21 +44,20 @@ class CameraData:
class TVDataUpdateCoordinator(DataUpdateCoordinator[CameraData]): class TVDataUpdateCoordinator(DataUpdateCoordinator[CameraData]):
"""A Trafikverket Data Update Coordinator.""" """A Trafikverket Data Update Coordinator."""
config_entry: TVCameraConfigEntry def __init__(self, hass: HomeAssistant, config_entry: TVCameraConfigEntry) -> None:
def __init__(self, hass: HomeAssistant) -> None:
"""Initialize the Trafikverket coordinator.""" """Initialize the Trafikverket coordinator."""
super().__init__( super().__init__(
hass, hass,
_LOGGER, _LOGGER,
config_entry=config_entry,
name=DOMAIN, name=DOMAIN,
update_interval=TIME_BETWEEN_UPDATES, update_interval=TIME_BETWEEN_UPDATES,
) )
self.session = async_get_clientsession(hass) self.session = async_get_clientsession(hass)
self._camera_api = TrafikverketCamera( self._camera_api = TrafikverketCamera(
self.session, self.config_entry.data[CONF_API_KEY] self.session, config_entry.data[CONF_API_KEY]
) )
self._id = self.config_entry.data[CONF_ID] self._id = config_entry.data[CONF_ID]
async def _async_update_data(self) -> CameraData: async def _async_update_data(self) -> CameraData:
"""Fetch data from Trafikverket.""" """Fetch data from Trafikverket."""

View File

@ -6,7 +6,7 @@ from datetime import datetime
from unittest.mock import patch from unittest.mock import patch
import pytest import pytest
from pytrafikverket.models import CameraInfoModel from pytrafikverket import CameraInfoModel
from homeassistant.components.trafikverket_camera.const import DOMAIN from homeassistant.components.trafikverket_camera.const import DOMAIN
from homeassistant.config_entries import SOURCE_USER from homeassistant.config_entries import SOURCE_USER

View File

@ -3,7 +3,7 @@
from __future__ import annotations from __future__ import annotations
import pytest import pytest
from pytrafikverket.models import CameraInfoModel from pytrafikverket import CameraInfoModel
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import STATE_ON from homeassistant.const import STATE_ON

View File

@ -7,7 +7,7 @@ from unittest.mock import patch
from freezegun.api import FrozenDateTimeFactory from freezegun.api import FrozenDateTimeFactory
import pytest import pytest
from pytrafikverket.models import CameraInfoModel from pytrafikverket import CameraInfoModel
from homeassistant.components.camera import async_get_image from homeassistant.components.camera import async_get_image
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry

View File

@ -5,8 +5,12 @@ from __future__ import annotations
from unittest.mock import patch from unittest.mock import patch
import pytest import pytest
from pytrafikverket.exceptions import InvalidAuthentication, NoCameraFound, UnknownError from pytrafikverket import (
from pytrafikverket.models import CameraInfoModel CameraInfoModel,
InvalidAuthentication,
NoCameraFound,
UnknownError,
)
from homeassistant import config_entries from homeassistant import config_entries
from homeassistant.components.trafikverket_camera.const import DOMAIN from homeassistant.components.trafikverket_camera.const import DOMAIN

View File

@ -5,13 +5,13 @@ from __future__ import annotations
from unittest.mock import patch from unittest.mock import patch
import pytest import pytest
from pytrafikverket.exceptions import ( from pytrafikverket import (
CameraInfoModel,
InvalidAuthentication, InvalidAuthentication,
MultipleCamerasFound, MultipleCamerasFound,
NoCameraFound, NoCameraFound,
UnknownError, UnknownError,
) )
from pytrafikverket.models import CameraInfoModel
from homeassistant.components.trafikverket_camera.const import DOMAIN from homeassistant.components.trafikverket_camera.const import DOMAIN
from homeassistant.config_entries import SOURCE_USER, ConfigEntryState from homeassistant.config_entries import SOURCE_USER, ConfigEntryState

View File

@ -6,8 +6,7 @@ from datetime import datetime
from unittest.mock import patch from unittest.mock import patch
import pytest import pytest
from pytrafikverket.exceptions import UnknownError from pytrafikverket import CameraInfoModel, UnknownError
from pytrafikverket.models import CameraInfoModel
from homeassistant.components.trafikverket_camera import async_migrate_entry from homeassistant.components.trafikverket_camera import async_migrate_entry
from homeassistant.components.trafikverket_camera.const import DOMAIN from homeassistant.components.trafikverket_camera.const import DOMAIN

View File

@ -3,7 +3,7 @@
from __future__ import annotations from __future__ import annotations
import pytest import pytest
from pytrafikverket.models import CameraInfoModel from pytrafikverket import CameraInfoModel
from homeassistant.components.recorder import Recorder from homeassistant.components.recorder import Recorder
from homeassistant.components.recorder.history import get_significant_states from homeassistant.components.recorder.history import get_significant_states

View File

@ -3,7 +3,7 @@
from __future__ import annotations from __future__ import annotations
import pytest import pytest
from pytrafikverket.models import CameraInfoModel from pytrafikverket import CameraInfoModel
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant