Small cleanup in Trafikverket Camera (#131424)

homeassistant/components/trafikverket_camera/__init__.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from pytrafikverket.trafikverket_camera import TrafikverketCamera
+from pytrafikverket import TrafikverketCamera
 
 from homeassistant.config_entries import ConfigEntry
 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:
     """Set up Trafikverket Camera from a config entry."""
 
-    coordinator = TVDataUpdateCoordinator(hass)
+    coordinator = TVDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 

homeassistant/components/trafikverket_camera/config_flow.py

@@ -5,9 +5,13 @@ from __future__ import annotations
 from collections.abc import Mapping
 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
 
 from homeassistant.config_entries import (

homeassistant/components/trafikverket_camera/coordinator.py

@@ -9,14 +9,14 @@ import logging
 from typing import TYPE_CHECKING
 
 import aiohttp
-from pytrafikverket.exceptions import (
+from pytrafikverket import (
+    CameraInfoModel,
     InvalidAuthentication,
     MultipleCamerasFound,
     NoCameraFound,
+    TrafikverketCamera,
     UnknownError,
 )
-from pytrafikverket.models import CameraInfoModel
-from pytrafikverket.trafikverket_camera import TrafikverketCamera
 
 from homeassistant.const import CONF_API_KEY, CONF_ID
 from homeassistant.core import HomeAssistant
@@ -44,21 +44,20 @@ class CameraData:
 class TVDataUpdateCoordinator(DataUpdateCoordinator[CameraData]):
     """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."""
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=config_entry,
             name=DOMAIN,
             update_interval=TIME_BETWEEN_UPDATES,
         )
         self.session = async_get_clientsession(hass)
         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:
         """Fetch data from Trafikverket."""

tests/components/trafikverket_camera/conftest.py

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

tests/components/trafikverket_camera/test_binary_sensor.py

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

tests/components/trafikverket_camera/test_camera.py

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

tests/components/trafikverket_camera/test_config_flow.py

@@ -5,8 +5,12 @@ from __future__ import annotations
 from unittest.mock import patch
 
 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.components.trafikverket_camera.const import DOMAIN

tests/components/trafikverket_camera/test_coordinator.py

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

tests/components/trafikverket_camera/test_init.py

@@ -6,8 +6,7 @@ from datetime import datetime
 from unittest.mock import patch
 
 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.const import DOMAIN

tests/components/trafikverket_camera/test_recorder.py

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

tests/components/trafikverket_camera/test_sensor.py

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