Add Pterodactyl integration

homeassistant/components/pterodactyl/api.py

@@ -24,10 +24,6 @@
     """Raised when no data can be fechted from the server."""
 
 
-class PterodactylNotInitializedError(Exception):
-    """Raised when APIs are used although server instance is not initialized yet."""
-
-
 @dataclass
 class PterodactylData:
     """Data for the Pterodactyl server."""
@@ -74,9 +70,9 @@
             PterodactylApiError,
         ) as error:
             raise PterodactylConnectionError(error) from error
         except Exception as error:
             _LOGGER.exception("Unexpected exception occurred during initialization")
             raise PterodactylConnectionError(error) from error
         else:
             servers = paginated_response.collect()
             for server in servers:
@@ -86,23 +82,29 @@
 
     async def async_get_data(self) -> dict[str, PterodactylData]:
         """Update the data from all Pterodactyl servers."""
         data = {}
 
-        if self.pterodactyl is None:
-            raise PterodactylNotInitializedError(
-                "Pterodactyl API is not initialized yet"
-            )
-
-        try:
-            for identifier in self.identifiers:
+        for identifier in self.identifiers:
+            try:
                 server = await self.hass.async_add_executor_job(
-                    self.pterodactyl.client.servers.get_server, identifier
+                    self.pterodactyl.client.servers.get_server,  # type: ignore[union-attr]
+                    identifier,
                 )
                 utilization = await self.hass.async_add_executor_job(
-                    self.pterodactyl.client.servers.get_server_utilization, identifier
+                    self.pterodactyl.client.servers.get_server_utilization,  # type: ignore[union-attr]
+                    identifier,
                 )
-
+            except (
+                PydactylError,
+                BadRequestError,
+                PterodactylApiError,
+            ) as error:
+                raise PterodactylConnectionError(error) from error
+            except Exception as error:
+                _LOGGER.exception("Unexpected exception occurred during data update")
+                raise PterodactylConnectionError(error) from error
+            else:
                 data[identifier] = PterodactylData(
                     name=server["name"],
                     uuid=server["uuid"],
                     identifier=identifier,
@@ -115,15 +117,6 @@
                     uptime=utilization["resources"]["uptime"],
                 )
 
                 _LOGGER.debug("%s", data[identifier])
-        except (
-            PydactylError,
-            BadRequestError,
-            PterodactylApiError,
-        ) as error:
-            raise PterodactylConnectionError(error) from error
-        except Exception as error:
-            _LOGGER.exception("Unexpected exception occurred during data update")
-            raise PterodactylConnectionError(error) from error
-        else:
-            return data
+
+        return data

homeassistant/components/pterodactyl/binary_sensor.py

@@ -1,20 +1,20 @@
 """Binary sensor platform of the Pterodactyl integration."""
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import PterodactylConfigEntry, PterodactylCoordinator
 from .entity import PterodactylEntity
 
 KEY_STATUS = "status"
 
 
 BINARY_SENSOR_DESCRIPTIONS = [
     BinarySensorEntityDescription(
         key=KEY_STATUS,
         translation_key=KEY_STATUS,
@@ -23,32 +23,30 @@
 ]
 
 # Coordinator is used to centralize the data updates.
 PARALLEL_UPDATES = 0
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: PterodactylConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Pterodactyl binary sensor platform."""
     coordinator = config_entry.runtime_data
 
     async_add_entities(
-        [
-            PterodactylBinarySensorEntity(
-                coordinator, identifier, description, config_entry
-            )
-            for identifier in coordinator.api.identifiers
-            for description in BINARY_SENSOR_DESCRIPTIONS
-        ]
+        PterodactylBinarySensorEntity(
+            coordinator, identifier, description, config_entry
+        )
+        for identifier in coordinator.api.identifiers
+        for description in BINARY_SENSOR_DESCRIPTIONS
     )
 
 
 class PterodactylBinarySensorEntity(PterodactylEntity, BinarySensorEntity):
     """Representation of a Pterodactyl binary sensor base entity."""
 
     def __init__(
         self,
         coordinator: PterodactylCoordinator,
         identifier: str,
@@ -56,18 +54,13 @@
         config_entry: PterodactylConfigEntry,
     ) -> None:
         """Initialize binary sensor base entity."""
         super().__init__(coordinator, identifier, config_entry)
         self.entity_description = description
-        self.identifier = identifier
-        self._attr_unique_id = f"{config_entry.entry_id}-{identifier}-{description.key}"
-        self._attr_is_on = False
-
-    @property
-    def available(self) -> bool:
-        """Return binary sensor availability."""
-        return super().available and self.identifier in self.coordinator.data
+        self._attr_unique_id = (
+            f"{self.coordinator.data[self.identifier].uuid}-{description.key}"
+        )
 
     @property
     def is_on(self) -> bool:
         """Return binary sensor state."""
         return self.coordinator.data[self.identifier].state == "running"

homeassistant/components/pterodactyl/coordinator.py

@@ -16,7 +16,6 @@
     PterodactylConfigurationError,
     PterodactylConnectionError,
     PterodactylData,
-    PterodactylNotInitializedError,
 )
 
 SCAN_INTERVAL = timedelta(seconds=60)
@@ -49,19 +48,20 @@
 
     async def _async_setup(self) -> None:
         """Set up the Pterodactyl data coordinator."""
+        self.api = PterodactylAPI(
+            hass=self.hass,
+            host=self.config_entry.data[CONF_URL],
+            api_key=self.config_entry.data[CONF_API_KEY],
+        )
+
         try:
-            self.api = PterodactylAPI(
-                hass=self.hass,
-                host=self.config_entry.data[CONF_URL],
-                api_key=self.config_entry.data[CONF_API_KEY],
-            )
             await self.api.async_init()
         except PterodactylConfigurationError as error:
             raise ConfigEntryNotReady(error) from error
 
     async def _async_update_data(self) -> dict[str, PterodactylData]:
         """Get updated data from the Pterodactyl server."""
         try:
             return await self.api.async_get_data()
-        except (PterodactylNotInitializedError, PterodactylConnectionError) as error:
+        except PterodactylConnectionError as error:
             raise UpdateFailed(error) from error

homeassistant/components/pterodactyl/entity.py

@@ -1,31 +1,32 @@
 """Base entity for the Pterodactyl integration."""
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import PterodactylCoordinator
 
 MANUFACTURER = "Pterodactyl"
 
 
 class PterodactylEntity(CoordinatorEntity[PterodactylCoordinator]):
     """Representation of a Pterodactyl base entity."""
 
     _attr_has_entity_name = True
 
     def __init__(
         self,
         coordinator: PterodactylCoordinator,
         identifier: str,
         config_entry: ConfigEntry,
     ) -> None:
         """Initialize base entity."""
         super().__init__(coordinator)
 
+        self.identifier = identifier
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, identifier)},
             manufacturer=MANUFACTURER,
             name=coordinator.data[identifier].name,
@@ -33,3 +34,8 @@
             model_id=coordinator.data[identifier].uuid,
             configuration_url=f"{config_entry.data[CONF_URL]}/server/{identifier}",
         )
+
+    @property
+    def available(self) -> bool:
+        """Return binary sensor availability."""
+        return super().available and self.identifier in self.coordinator.data

homeassistant/components/pterodactyl/strings.json

@@ -8,15 +8,15 @@
         },
         "data_description": {
           "url": "The IP address or hostname of your Pterodactyl server, starting with either 'http://' or 'https://', optionally including the port at the end.",
-          "api_key": "The client (account) API key for accessing your Pterodactyl server."
+          "api_key": "The account API key for accessing your Pterodactyl server."
         }
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   },
   "entity": {