Improve avaliabilty

custom_components/teslemetry/binary_sensor.py

@@ -193,5 +193,5 @@ def is_on(self) -> bool:
     @property
     def available(self) -> bool:
         """Return if sensor is available."""
-        return super().available and self.get() is not None
+        return super().available and self.has()
 

custom_components/teslemetry/entity.py

@@ -77,6 +77,10 @@ def set(self, *args: Any) -> None:
             self.coordinator.data[key] = value
         self.async_write_ha_state()
 
+    def has(self, key: str | None = None):
+        """Checks if a key exists in the coordinator data."""
+        return (key or self.key) in self.coordinator.data
+
 
 class TeslemetryEnergyEntity(CoordinatorEntity[TeslemetryEnergyDataCoordinator]):
     """Parent class for Teslemetry Energy Entities."""
@@ -106,6 +110,10 @@ def get(self, key: str | None = None, default: Any | None = None) -> Any:
         """Return a specific value from coordinator data."""
         return self.coordinator.data.get(key or self.key, default)
 
+    def has(self, key: str | None = None):
+        """Checks if a key exists in the coordinator data."""
+        return (key or self.key) in self.coordinator.data
+
 
 class TeslemetryWallConnectorEntity(CoordinatorEntity[TeslemetryEnergyDataCoordinator]):
     """Parent class for Teslemetry Wall Connector Entities."""

custom_components/teslemetry/select.py

@@ -57,7 +57,7 @@ class TeslemetrySeatHeaterSelectEntity(TeslemetryVehicleEntity, SelectEntity):
     @property
     def available(self) -> bool:
         """Return if sensor is available."""
-        return super().available and self.get() is not None
+        return super().available and self.has()
 
     @property
     def current_option(self) -> str | None:

custom_components/teslemetry/sensor.py

@@ -27,7 +27,7 @@
     UnitOfTime,
 )
 from homeassistant.util.variance import ignore_variance
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
@@ -49,12 +49,16 @@
     "NoPower": "no_power",
 }
 
+ShiftStates = {
+    "P":"p", "D":"d", "R":"r", "N":"n"
+}
+
 @dataclass(frozen=True, kw_only=True)
 class TeslemetrySensorEntityDescription(SensorEntityDescription):
     """Describes Teslemetry Sensor entity."""
 
     value_fn: Callable[[StateType], StateType | datetime] = lambda x: x
-    available_fn: Callable[[StateType], bool] = lambda x: x is not None
+    available_fn: Callable[[StateType], bool] = lambda: True
 
 
 VEHICLE_DESCRIPTIONS: tuple[TeslemetrySensorEntityDescription, ...] = (
@@ -136,9 +140,9 @@ class TeslemetrySensorEntityDescription(SensorEntityDescription):
     TeslemetrySensorEntityDescription(
         key="drive_state_shift_state",
         icon="mdi:car-shift-pattern",
-        options=["p", "d", "r", "n"],
+        options=list(ShiftStates.values()),
         device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda x: cast(str, x).lower(),
+        value_fn=lambda x: ShiftStates.get(x,"p"),
     ),
     TeslemetrySensorEntityDescription(
         key="vehicle_state_odometer",
@@ -415,7 +419,7 @@ def native_value(self) -> StateType | datetime:
     @property
     def available(self) -> bool:
         """Return if sensor is available."""
-        return super().available and self.entity_description.available_fn(self.get())
+        return super().available and self.has() and self.entity_description.available_fn(self.get())
 
 
 class TeslemetryEnergySensorEntity(TeslemetryEnergyEntity, SensorEntity):
@@ -440,7 +444,7 @@ def native_value(self) -> StateType:
     @property
     def available(self) -> bool:
         """Return if sensor is available."""
-        return super().available and self.get() is not None
+        return super().available and self.has()
 
 
 class TeslemetryWallConnectorSensorEntity(TeslemetryWallConnectorEntity, SensorEntity):
@@ -470,4 +474,4 @@ def native_value(self) -> StateType:
     @property
     def available(self) -> bool:
         """Return if sensor is available."""
-        return super().available and self._value is not None
+        return super().available and self.din in self.coordinator.data.get("wall_connectors", {})

custom_components/teslemetry/switch.py

@@ -103,7 +103,7 @@ def __init__(
     @property
     def available(self) -> bool:
         """Return if sensor is available."""
-        return super().available and self.get() is not None
+        return super().available and self.has()
 
     @property
     def is_on(self) -> bool:

custom_components/teslemetry/update.py

@@ -44,7 +44,7 @@ def __init__(
     @property
     def available(self) -> bool:
         """Return if sensor is available."""
-        return super().available and self.get() is not None
+        return super().available and self.has()
 
     @property
     def supported_features(self) -> UpdateEntityFeature: