Expose every order component as its own entity and prepare for release
Each cost line is now an entity rather than an attribute: subtotal, box price, add-ons, tax and delivery fee, plus a total and free-delivery-remaining for the open order, a delivery-day sensor, and a binary sensor that turns off at the cutoff. Entities share a base class and declare a scope, so a description states only the field it reads. Also parses the driver tip, Bounty savings and the free-delivery threshold. The threshold is carried across orders because the progress bar only renders on carts that have not met it. Adds LICENSE, hacs.json, a CI workflow, a pre-publish audit script, and a test that cross-checks every entity's translation_key against both translation files. Manifest URLs now point at GitHub rather than a private forge.
This commit is contained in:
@@ -1,4 +1,9 @@
|
||||
"""Sensors for Fresh Harvest."""
|
||||
"""Sensors for Fresh Harvest.
|
||||
|
||||
Every part of an order is its own entity — box price, add-ons, tax, delivery
|
||||
fee, subtotal and total — so an automation or dashboard can read any one of
|
||||
them directly rather than digging through attributes.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -13,17 +18,17 @@ from homeassistant.components.sensor import (
|
||||
SensorStateClass,
|
||||
)
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
|
||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
||||
|
||||
from . import FreshHarvestConfigEntry
|
||||
from .api import AccountSnapshot, DeliveryOrder, OrderItem
|
||||
from .const import DOMAIN
|
||||
from .api import DeliveryOrder, OrderItem
|
||||
from .coordinator import FreshHarvestCoordinator
|
||||
from .entity import FreshHarvestEntity, Scope
|
||||
|
||||
CURRENCY = "USD"
|
||||
|
||||
|
||||
def _format_item(item: OrderItem, with_price: bool = False) -> str:
|
||||
def format_item(item: OrderItem, with_price: bool = False) -> str:
|
||||
"""Render one line, e.g. '4 Complete Recovery Smoothie 15.2 fl oz — $17.96'."""
|
||||
line = " ".join(
|
||||
part for part in (str(item.quantity or ""), item.name, item.unit) if part
|
||||
@@ -33,15 +38,21 @@ def _format_item(item: OrderItem, with_price: bool = False) -> str:
|
||||
return line
|
||||
|
||||
|
||||
def _items_attrs(order: DeliveryOrder | None) -> dict[str, Any] | None:
|
||||
if order is None:
|
||||
return None
|
||||
def _contents_attrs(order: DeliveryOrder) -> dict[str, Any]:
|
||||
return {
|
||||
"box": order.box_name,
|
||||
"box_price": order.box_price,
|
||||
"produce": [_format_item(i) for i in order.items],
|
||||
"add_ons": [_format_item(a, with_price=True) for a in order.addons],
|
||||
"add_ons_total": order.addons_total,
|
||||
"produce": [format_item(i) for i in order.items],
|
||||
"add_ons": [format_item(a, with_price=True) for a in order.addons],
|
||||
"produce_count": len(order.items),
|
||||
"add_ons_count": len(order.addons),
|
||||
}
|
||||
|
||||
|
||||
def _total_attrs(order: DeliveryOrder) -> dict[str, Any]:
|
||||
"""Charges that are not worth their own entity: optional or promotional."""
|
||||
return {
|
||||
"driver_tip": order.driver_tip,
|
||||
"bounty_savings": order.bounty_savings,
|
||||
}
|
||||
|
||||
|
||||
@@ -49,77 +60,116 @@ def _items_attrs(order: DeliveryOrder | None) -> dict[str, Any] | None:
|
||||
class FreshHarvestSensorDescription(SensorEntityDescription):
|
||||
"""Describes a Fresh Harvest sensor."""
|
||||
|
||||
value_fn: Callable[[AccountSnapshot], Any]
|
||||
attrs_fn: Callable[[AccountSnapshot], dict[str, Any] | None] | None = None
|
||||
scope: Scope = "next_order"
|
||||
value_fn: Callable[[Any], Any]
|
||||
attrs_fn: Callable[[Any], dict[str, Any]] | None = None
|
||||
|
||||
|
||||
def _money(**kwargs) -> FreshHarvestSensorDescription:
|
||||
"""A dollar amount. A helper because there are eight of them.
|
||||
|
||||
Callers pass `translation_key` explicitly rather than deriving it from
|
||||
`key`, so the name of every entity stays greppable in this file — which is
|
||||
what `tests/test_translations.py` checks.
|
||||
"""
|
||||
return FreshHarvestSensorDescription(
|
||||
device_class=SensorDeviceClass.MONETARY,
|
||||
state_class=SensorStateClass.TOTAL,
|
||||
native_unit_of_measurement=CURRENCY,
|
||||
**kwargs,
|
||||
)
|
||||
|
||||
|
||||
SENSORS: tuple[FreshHarvestSensorDescription, ...] = (
|
||||
# --- the account itself -------------------------------------------------
|
||||
FreshHarvestSensorDescription(
|
||||
key="next_delivery",
|
||||
translation_key="next_delivery",
|
||||
scope="account",
|
||||
device_class=SensorDeviceClass.DATE,
|
||||
value_fn=lambda s: s.next_delivery,
|
||||
attrs_fn=lambda s: {
|
||||
"delivery_day": s.delivery_day,
|
||||
"box": s.next_order.box_name if s.next_order else None,
|
||||
"free_delivery_threshold": s.free_delivery_threshold,
|
||||
},
|
||||
),
|
||||
FreshHarvestSensorDescription(
|
||||
key="delivery_day",
|
||||
translation_key="delivery_day",
|
||||
scope="account",
|
||||
icon="mdi:calendar-week",
|
||||
value_fn=lambda s: s.delivery_day,
|
||||
),
|
||||
# --- the order arriving next --------------------------------------------
|
||||
_money(
|
||||
key="next_delivery_total",
|
||||
translation_key="next_delivery_total",
|
||||
device_class=SensorDeviceClass.MONETARY,
|
||||
state_class=SensorStateClass.TOTAL,
|
||||
native_unit_of_measurement="USD",
|
||||
value_fn=lambda s: s.next_order.total if s.next_order else None,
|
||||
attrs_fn=lambda s: None
|
||||
if s.next_order is None
|
||||
else {
|
||||
"subtotal": s.next_order.subtotal,
|
||||
"tax": s.next_order.tax,
|
||||
"delivery_fee": s.next_order.delivery_fee,
|
||||
},
|
||||
value_fn=lambda o: o.total,
|
||||
attrs_fn=_total_attrs,
|
||||
),
|
||||
FreshHarvestSensorDescription(
|
||||
key="next_delivery_addons_total",
|
||||
translation_key="next_delivery_addons_total",
|
||||
device_class=SensorDeviceClass.MONETARY,
|
||||
state_class=SensorStateClass.TOTAL,
|
||||
native_unit_of_measurement="USD",
|
||||
value_fn=lambda s: s.next_order.addons_total if s.next_order else None,
|
||||
attrs_fn=lambda s: None
|
||||
if s.next_order is None
|
||||
else {
|
||||
"box_price": s.next_order.box_price,
|
||||
"add_ons": [
|
||||
_format_item(a, with_price=True) for a in s.next_order.addons
|
||||
],
|
||||
},
|
||||
_money(
|
||||
key="next_delivery_subtotal",
|
||||
translation_key="next_delivery_subtotal",
|
||||
value_fn=lambda o: o.subtotal,
|
||||
),
|
||||
_money(
|
||||
key="next_delivery_box_price",
|
||||
translation_key="next_delivery_box_price",
|
||||
value_fn=lambda o: o.box_price,
|
||||
),
|
||||
_money(
|
||||
key="next_delivery_add_ons",
|
||||
translation_key="next_delivery_add_ons",
|
||||
value_fn=lambda o: o.addons_total,
|
||||
),
|
||||
_money(
|
||||
key="next_delivery_tax",
|
||||
translation_key="next_delivery_tax",
|
||||
value_fn=lambda o: o.tax,
|
||||
),
|
||||
_money(
|
||||
key="next_delivery_delivery_fee",
|
||||
translation_key="next_delivery_delivery_fee",
|
||||
value_fn=lambda o: o.delivery_fee,
|
||||
),
|
||||
FreshHarvestSensorDescription(
|
||||
key="next_delivery_items",
|
||||
translation_key="next_delivery_items",
|
||||
state_class=SensorStateClass.MEASUREMENT,
|
||||
native_unit_of_measurement="items",
|
||||
value_fn=lambda s: len(s.next_order.all_items) if s.next_order else None,
|
||||
attrs_fn=lambda s: _items_attrs(s.next_order),
|
||||
icon="mdi:basket-check",
|
||||
value_fn=lambda o: len(o.all_items),
|
||||
attrs_fn=_contents_attrs,
|
||||
),
|
||||
# --- the order that can still be changed --------------------------------
|
||||
FreshHarvestSensorDescription(
|
||||
key="open_order_delivery",
|
||||
translation_key="open_order_delivery",
|
||||
scope="open_order",
|
||||
device_class=SensorDeviceClass.DATE,
|
||||
value_fn=lambda s: s.open_order.delivery_date if s.open_order else None,
|
||||
attrs_fn=lambda s: None
|
||||
if s.open_order is None
|
||||
else {
|
||||
"total": s.open_order.total,
|
||||
"box": s.open_order.box_name,
|
||||
},
|
||||
value_fn=lambda o: o.delivery_date,
|
||||
attrs_fn=lambda o: {"box": o.box_name},
|
||||
),
|
||||
_money(
|
||||
key="open_order_total",
|
||||
translation_key="open_order_total",
|
||||
scope="open_order",
|
||||
value_fn=lambda o: o.total,
|
||||
attrs_fn=_total_attrs,
|
||||
),
|
||||
_money(
|
||||
key="open_order_free_delivery_remaining",
|
||||
translation_key="open_order_free_delivery_remaining",
|
||||
scope="open_order",
|
||||
value_fn=lambda o: o.free_delivery_remaining,
|
||||
),
|
||||
FreshHarvestSensorDescription(
|
||||
key="shop_window",
|
||||
translation_key="shop_window",
|
||||
value_fn=lambda s: (s.open_order.shop_window if s.open_order else None)
|
||||
or "closed",
|
||||
scope="open_order",
|
||||
icon="mdi:clock-alert-outline",
|
||||
# Distinct from unknown: there genuinely is no changeable order.
|
||||
value_fn=lambda o: o.shop_window or "closed",
|
||||
),
|
||||
)
|
||||
|
||||
@@ -136,10 +186,9 @@ async def async_setup_entry(
|
||||
)
|
||||
|
||||
|
||||
class FreshHarvestSensor(CoordinatorEntity[FreshHarvestCoordinator], SensorEntity):
|
||||
class FreshHarvestSensor(FreshHarvestEntity, SensorEntity):
|
||||
"""A value read off the Fresh Harvest dashboard."""
|
||||
|
||||
_attr_has_entity_name = True
|
||||
entity_description: FreshHarvestSensorDescription
|
||||
|
||||
def __init__(
|
||||
@@ -148,25 +197,23 @@ class FreshHarvestSensor(CoordinatorEntity[FreshHarvestCoordinator], SensorEntit
|
||||
entry: FreshHarvestConfigEntry,
|
||||
description: FreshHarvestSensorDescription,
|
||||
) -> None:
|
||||
super().__init__(coordinator)
|
||||
super().__init__(coordinator, entry, description.key)
|
||||
self.entity_description = description
|
||||
self._attr_unique_id = f"{entry.entry_id}_{description.key}"
|
||||
self._attr_device_info = DeviceInfo(
|
||||
identifiers={(DOMAIN, entry.entry_id)},
|
||||
name="Fresh Harvest",
|
||||
manufacturer="Fresh Harvest",
|
||||
entry_type=DeviceEntryType.SERVICE,
|
||||
configuration_url="https://freshharvest.com/p/dashboard/details",
|
||||
)
|
||||
|
||||
@property
|
||||
def native_value(self) -> Any:
|
||||
"""Return the sensor value."""
|
||||
return self.entity_description.value_fn(self.coordinator.data)
|
||||
"""Return the sensor value, or None when its order does not exist."""
|
||||
target = self.target(self.entity_description.scope)
|
||||
if target is None:
|
||||
return None
|
||||
return self.entity_description.value_fn(target)
|
||||
|
||||
@property
|
||||
def extra_state_attributes(self) -> dict[str, Any] | None:
|
||||
"""Return the sensor's extra attributes."""
|
||||
if self.entity_description.attrs_fn is None:
|
||||
return None
|
||||
return self.entity_description.attrs_fn(self.coordinator.data)
|
||||
target = self.target(self.entity_description.scope)
|
||||
if target is None:
|
||||
return None
|
||||
return self.entity_description.attrs_fn(target)
|
||||
|
||||
Reference in New Issue
Block a user