Move prusalink base entity to separate module (#126510)

* Move prusalink base entity to separate module

* Fix tests
This commit is contained in:
epenet 2024-09-23 13:09:38 +02:00 committed by GitHub
parent 14bc65e8e7
commit ec311ecd2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 30 additions and 24 deletions

View File

@ -16,9 +16,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryError from homeassistant.exceptions import ConfigEntryError
from homeassistant.helpers import issue_registry as ir from homeassistant.helpers import issue_registry as ir
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.httpx_client import get_async_client from homeassistant.helpers.httpx_client import get_async_client
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .config_flow import ConfigFlow from .config_flow import ConfigFlow
from .const import DOMAIN from .const import DOMAIN
@ -26,7 +24,6 @@ from .coordinator import (
InfoUpdateCoordinator, InfoUpdateCoordinator,
JobUpdateCoordinator, JobUpdateCoordinator,
LegacyStatusCoordinator, LegacyStatusCoordinator,
PrusaLinkUpdateCoordinator,
StatusCoordinator, StatusCoordinator,
) )
@ -128,19 +125,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
hass.data[DOMAIN].pop(entry.entry_id) hass.data[DOMAIN].pop(entry.entry_id)
return unload_ok return unload_ok
class PrusaLinkEntity(CoordinatorEntity[PrusaLinkUpdateCoordinator]):
"""Defines a base PrusaLink entity."""
_attr_has_entity_name = True
@property
def device_info(self) -> DeviceInfo:
"""Return device information about this PrusaLink device."""
return DeviceInfo(
identifiers={(DOMAIN, self.coordinator.config_entry.entry_id)},
name=self.coordinator.config_entry.title,
manufacturer="Prusa",
configuration_url=self.coordinator.api.client.host,
)

View File

@ -17,9 +17,9 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import PrusaLinkEntity
from .const import DOMAIN from .const import DOMAIN
from .coordinator import PrusaLinkUpdateCoordinator from .coordinator import PrusaLinkUpdateCoordinator
from .entity import PrusaLinkEntity
T = TypeVar("T", PrinterStatus, LegacyPrinterStatus, JobInfo, PrinterInfo) T = TypeVar("T", PrinterStatus, LegacyPrinterStatus, JobInfo, PrinterInfo)

View File

@ -15,9 +15,9 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import PrusaLinkEntity
from .const import DOMAIN from .const import DOMAIN
from .coordinator import PrusaLinkUpdateCoordinator from .coordinator import PrusaLinkUpdateCoordinator
from .entity import PrusaLinkEntity
T = TypeVar("T", PrinterStatus, LegacyPrinterStatus, JobInfo) T = TypeVar("T", PrinterStatus, LegacyPrinterStatus, JobInfo)

View File

@ -9,9 +9,9 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import PrusaLinkEntity
from .const import DOMAIN from .const import DOMAIN
from .coordinator import JobUpdateCoordinator from .coordinator import JobUpdateCoordinator
from .entity import PrusaLinkEntity
async def async_setup_entry( async def async_setup_entry(

View File

@ -0,0 +1,25 @@
"""The PrusaLink integration."""
from __future__ import annotations
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DOMAIN
from .coordinator import PrusaLinkUpdateCoordinator
class PrusaLinkEntity(CoordinatorEntity[PrusaLinkUpdateCoordinator]):
"""Defines a base PrusaLink entity."""
_attr_has_entity_name = True
@property
def device_info(self) -> DeviceInfo:
"""Return device information about this PrusaLink device."""
return DeviceInfo(
identifiers={(DOMAIN, self.coordinator.config_entry.entry_id)},
name=self.coordinator.config_entry.title,
manufacturer="Prusa",
configuration_url=self.coordinator.api.client.host,
)

View File

@ -29,9 +29,9 @@ from homeassistant.helpers.typing import StateType
from homeassistant.util.dt import utcnow from homeassistant.util.dt import utcnow
from homeassistant.util.variance import ignore_variance from homeassistant.util.variance import ignore_variance
from . import PrusaLinkEntity
from .const import DOMAIN from .const import DOMAIN
from .coordinator import PrusaLinkUpdateCoordinator from .coordinator import PrusaLinkUpdateCoordinator
from .entity import PrusaLinkEntity
T = TypeVar("T", PrinterStatus, LegacyPrinterStatus, JobInfo, PrinterInfo) T = TypeVar("T", PrinterStatus, LegacyPrinterStatus, JobInfo, PrinterInfo)

View File

@ -93,7 +93,7 @@ async def test_button_resume_cancel(
with ( with (
patch(f"pyprusalink.PrusaLink.{method}") as mock_meth, patch(f"pyprusalink.PrusaLink.{method}") as mock_meth,
patch( patch(
"homeassistant.components.prusalink.PrusaLinkUpdateCoordinator._fetch_data" "homeassistant.components.prusalink.coordinator.PrusaLinkUpdateCoordinator._fetch_data"
), ),
): ):
await hass.services.async_call( await hass.services.async_call(