Add text conditions

.gitattributes

@@ -16,7 +16,6 @@ Dockerfile.dev linguist-language=Dockerfile
 CODEOWNERS linguist-generated=true
 Dockerfile linguist-generated=true
 homeassistant/generated/*.py linguist-generated=true
-machine/* linguist-generated=true
 mypy.ini linguist-generated=true
 requirements.txt linguist-generated=true
 requirements_all.txt linguist-generated=true

.github/workflows/builder.yml

@@ -35,7 +35,6 @@ jobs:
       channel: ${{ steps.version.outputs.channel }}
       publish: ${{ steps.version.outputs.publish }}
       architectures: ${{ env.ARCHITECTURES }}
-      base_image_version: ${{ env.BASE_IMAGE_VERSION }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -101,7 +100,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
         include:
           - arch: amd64
-            os: ubuntu-24.04
+            os: ubuntu-latest
           - arch: aarch64
             os: ubuntu-24.04-arm
     steps:
@@ -196,20 +195,77 @@ jobs:
         run: |
           echo "${GITHUB_SHA};${GITHUB_REF};${GITHUB_EVENT_NAME};${GITHUB_ACTOR}" > rootfs/OFFICIAL_IMAGE
 
-      - name: Build base image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          cosign-base-identity: "https://github.com/home-assistant/docker/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          image: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant
-          image-tags: ${{ needs.init.outputs.version }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
+        with:
+          cosign-release: "v2.5.3"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+
+      - name: Build variables
+        id: vars
+        shell: bash
+        env:
+          ARCH: ${{ matrix.arch }}
+        run: |
+          echo "base_image=ghcr.io/home-assistant/${ARCH}-homeassistant-base:${BASE_IMAGE_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "cache_image=ghcr.io/home-assistant/${ARCH}-homeassistant:latest" >> "$GITHUB_OUTPUT"
+          echo "created=$(date --rfc-3339=seconds --utc)" >> "$GITHUB_OUTPUT"
+
+      - name: Verify base image signature
+        env:
+          BASE_IMAGE: ${{ steps.vars.outputs.base_image }}
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/docker/.*" \
+            "${BASE_IMAGE}"
+
+      - name: Verify cache image signature
+        id: cache
+        continue-on-error: true
+        env:
+          CACHE_IMAGE: ${{ steps.vars.outputs.cache_image }}
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/core/.*" \
+            "${CACHE_IMAGE}"
+
+      - name: Build base image
+        id: build
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: ${{ steps.vars.outputs.platform }}
           push: true
-          version: ${{ needs.init.outputs.version }}
+          cache-from: ${{ steps.cache.outcome == 'success' && steps.vars.outputs.cache_image || '' }}
+          build-args: |
+            BUILD_FROM=${{ steps.vars.outputs.base_image }}
+          tags: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
+          outputs: type=image,push=true,compression=zstd,compression-level=9,force-compression=true,oci-mediatypes=true
+          labels: |
+            io.hass.arch=${{ matrix.arch }}
+            io.hass.version=${{ needs.init.outputs.version }}
+            org.opencontainers.image.created=${{ steps.vars.outputs.created }}
+            org.opencontainers.image.version=${{ needs.init.outputs.version }}
+
+      - name: Sign image
+        env:
+          ARCH: ${{ matrix.arch }}
+          VERSION: ${{ needs.init.outputs.version }}
+          DIGEST: ${{ steps.build.outputs.digest }}
+        run: |
+          cosign sign --yes "ghcr.io/home-assistant/${ARCH}-homeassistant:${VERSION}@${DIGEST}"
 
   build_machine:
     name: Build ${{ matrix.machine }} machine core image
@@ -258,38 +314,35 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Compute extra tags
-        id: tags
-        shell: bash
+      - name: Set build additional args
         env:
           VERSION: ${{ needs.init.outputs.version }}
         run: |
+          # Create general tags
           if [[ "${VERSION}" =~ d ]]; then
-            echo "extra_tags=dev" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag dev" >> $GITHUB_ENV
           elif [[ "${VERSION}" =~ b ]]; then
-            echo "extra_tags=beta" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag beta" >> $GITHUB_ENV
           else
-            echo "extra_tags=stable" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
           fi
 
-      - name: Build machine image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          context: machine/
-          cosign-base-identity: "https://github.com/home-assistant/core/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          file: machine/${{ matrix.machine }}
-          image: ghcr.io/home-assistant/${{ matrix.machine }}-homeassistant
-          image-tags: |
-            ${{ needs.init.outputs.version }}
-            ${{ steps.tags.outputs.extra_tags }}
-          push: true
-          version: ${{ needs.init.outputs.version }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build base image
+        uses: home-assistant/builder@6cb4fd3d1338b6e22d0958a4bcb53e0965ea63b4 # 2026.02.1
+        with:
+          image: ${{ matrix.arch }}
+          args: |
+            $BUILD_ARGS \
+            --target /data/machine \
+            --cosign \
+            --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
 
   publish_ha:
     name: Publish version files

CODEOWNERS

@@ -1616,6 +1616,8 @@ build.json @home-assistant/supervisor
 /tests/components/srp_energy/ @briglx
 /homeassistant/components/starline/ @anonym-tsk
 /tests/components/starline/ @anonym-tsk
+/homeassistant/components/starlink/ @boswelja
+/tests/components/starlink/ @boswelja
 /homeassistant/components/statistics/ @ThomDietrich @gjohansson-ST
 /tests/components/statistics/ @ThomDietrich @gjohansson-ST
 /homeassistant/components/steam_online/ @tkdrob

Dockerfile

@@ -10,6 +10,7 @@ LABEL \
     org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
     org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
     org.opencontainers.image.licenses="Apache-2.0" \
+    org.opencontainers.image.source="https://github.com/home-assistant/core" \
     org.opencontainers.image.title="Home Assistant" \
     org.opencontainers.image.url="https://www.home-assistant.io/"
 

homeassistant/components/automation/__init__.py

@@ -123,22 +123,17 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "climate",
     "cover",
     "device_tracker",
-    "door",
     "fan",
-    "garage_door",
-    "gate",
     "humidifier",
     "lawn_mower",
     "light",
     "lock",
     "media_player",
-    "motion",
-    "occupancy",
     "person",
     "siren",
     "switch",
+    "text",
     "vacuum",
-    "window",
 }
 
 _EXPERIMENTAL_TRIGGER_PLATFORMS = {
@@ -165,7 +160,6 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "remote",
     "scene",
     "schedule",
-    "select",
     "siren",
     "switch",
     "text",

homeassistant/components/axis/manifest.json

@@ -29,7 +29,7 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["axis"],
-  "requirements": ["axis==67"],
+  "requirements": ["axis==66"],
   "ssdp": [
     {
       "manufacturer": "AXIS"

homeassistant/components/backup/util.py

@@ -246,8 +246,6 @@ def decrypt_backup(
         except (DecryptError, SecureTarError, tarfile.TarError) as err:
             LOGGER.warning("Error decrypting backup: %s", err)
             error = err
-        except Abort:
-            raise
         except Exception as err:  # noqa: BLE001
             LOGGER.exception("Unexpected error when decrypting backup: %s", err)
             error = err
@@ -334,10 +332,8 @@ def encrypt_backup(
         except (EncryptError, SecureTarError, tarfile.TarError) as err:
             LOGGER.warning("Error encrypting backup: %s", err)
             error = err
-        except Abort:
-            raise
         except Exception as err:  # noqa: BLE001
-            LOGGER.exception("Unexpected error when encrypting backup: %s", err)
+            LOGGER.exception("Unexpected error when decrypting backup: %s", err)
             error = err
         else:
             # Pad the output stream to the requested minimum size

homeassistant/components/clementine/media_player.py

@@ -66,7 +66,6 @@ class ClementineDevice(MediaPlayerEntity):
         | MediaPlayerEntityFeature.SELECT_SOURCE
         | MediaPlayerEntityFeature.PLAY
     )
-    _attr_volume_step = 0.04
 
     def __init__(self, client, name):
         """Initialize the Clementine device."""
@@ -125,6 +124,16 @@ class ClementineDevice(MediaPlayerEntity):
 
         return None, None
 
+    def volume_up(self) -> None:
+        """Volume up the media player."""
+        newvolume = min(self._client.volume + 4, 100)
+        self._client.set_volume(newvolume)
+
+    def volume_down(self) -> None:
+        """Volume down media player."""
+        newvolume = max(self._client.volume - 4, 0)
+        self._client.set_volume(newvolume)
+
     def mute_volume(self, mute: bool) -> None:
         """Send mute command."""
         self._client.set_volume(0)

homeassistant/components/cover/__init__.py

@@ -32,7 +32,6 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 from homeassistant.util.hass_dict import HassKey
 
-from .condition import make_cover_is_closed_condition, make_cover_is_open_condition
 from .const import (
     ATTR_CURRENT_POSITION,
     ATTR_CURRENT_TILT_POSITION,
@@ -81,8 +80,6 @@ __all__ = [
     "CoverEntityFeature",
     "CoverState",
     "make_cover_closed_trigger",
-    "make_cover_is_closed_condition",
-    "make_cover_is_open_condition",
     "make_cover_opened_trigger",
 ]
 

homeassistant/components/door/condition.py

@@ -1,29 +0,0 @@
-"""Provides conditions for doors."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.cover import (
-    DOMAIN as COVER_DOMAIN,
-    CoverDeviceClass,
-    make_cover_is_closed_condition,
-    make_cover_is_open_condition,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.condition import Condition
-
-DEVICE_CLASSES_DOOR: dict[str, str] = {
-    BINARY_SENSOR_DOMAIN: BinarySensorDeviceClass.DOOR,
-    COVER_DOMAIN: CoverDeviceClass.DOOR,
-}
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_closed": make_cover_is_closed_condition(device_classes=DEVICE_CLASSES_DOOR),
-    "is_open": make_cover_is_open_condition(device_classes=DEVICE_CLASSES_DOOR),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for doors."""
-    return CONDITIONS

homeassistant/components/door/conditions.yaml

@@ -1,28 +0,0 @@
-.condition_common_fields: &condition_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
-
-is_closed:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: door
-      - domain: cover
-        device_class: door
-
-is_open:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: door
-      - domain: cover
-        device_class: door

homeassistant/components/door/icons.json

@@ -1,12 +1,4 @@
 {
-  "conditions": {
-    "is_closed": {
-      "condition": "mdi:door-closed"
-    },
-    "is_open": {
-      "condition": "mdi:door-open"
-    }
-  },
   "triggers": {
     "closed": {
       "trigger": "mdi:door-closed"

homeassistant/components/door/strings.json

@@ -1,39 +1,9 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted doors.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted doors to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_closed": {
-      "description": "Tests if one or more doors are closed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
-          "name": "[%key:component::door::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Door is closed"
-    },
-    "is_open": {
-      "description": "Tests if one or more doors are open.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
-          "name": "[%key:component::door::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Door is open"
-    }
-  },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/fully_kiosk/sensor.py

@@ -12,12 +12,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    PERCENTAGE,
-    EntityCategory,
-    UnitOfInformation,
-    UnitOfTemperature,
-)
+from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfInformation
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
@@ -61,14 +56,6 @@ SENSORS: tuple[FullySensorEntityDescription, ...] = (
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
-    FullySensorEntityDescription(
-        key="batteryTemperature",
-        translation_key="battery_temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
     FullySensorEntityDescription(
         key="currentPage",
         translation_key="current_page",

homeassistant/components/fully_kiosk/strings.json

@@ -118,9 +118,6 @@
       }
     },
     "sensor": {
-      "battery_temperature": {
-        "name": "Battery temperature"
-      },
       "current_page": {
         "name": "Current page"
       },

homeassistant/components/garage_door/condition.py

@@ -1,31 +0,0 @@
-"""Provides conditions for garage doors."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.cover import (
-    DOMAIN as COVER_DOMAIN,
-    CoverDeviceClass,
-    make_cover_is_closed_condition,
-    make_cover_is_open_condition,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.condition import Condition
-
-DEVICE_CLASSES_GARAGE_DOOR: dict[str, str] = {
-    BINARY_SENSOR_DOMAIN: BinarySensorDeviceClass.GARAGE_DOOR,
-    COVER_DOMAIN: CoverDeviceClass.GARAGE,
-}
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_closed": make_cover_is_closed_condition(
-        device_classes=DEVICE_CLASSES_GARAGE_DOOR
-    ),
-    "is_open": make_cover_is_open_condition(device_classes=DEVICE_CLASSES_GARAGE_DOOR),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for garage doors."""
-    return CONDITIONS

homeassistant/components/garage_door/conditions.yaml

@@ -1,28 +0,0 @@
-.condition_common_fields: &condition_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
-
-is_closed:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: garage_door
-      - domain: cover
-        device_class: garage
-
-is_open:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: garage_door
-      - domain: cover
-        device_class: garage

homeassistant/components/garage_door/icons.json

@@ -1,12 +1,4 @@
 {
-  "conditions": {
-    "is_closed": {
-      "condition": "mdi:garage"
-    },
-    "is_open": {
-      "condition": "mdi:garage-open"
-    }
-  },
   "triggers": {
     "closed": {
       "trigger": "mdi:garage"

homeassistant/components/garage_door/strings.json

@@ -1,39 +1,9 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted garage doors.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted garage doors to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_closed": {
-      "description": "Tests if one or more garage doors are closed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
-          "name": "[%key:component::garage_door::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Garage door is closed"
-    },
-    "is_open": {
-      "description": "Tests if one or more garage doors are open.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
-          "name": "[%key:component::garage_door::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Garage door is open"
-    }
-  },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/gate/condition.py

@@ -1,24 +0,0 @@
-"""Provides conditions for gates."""
-
-from homeassistant.components.cover import (
-    DOMAIN as COVER_DOMAIN,
-    CoverDeviceClass,
-    make_cover_is_closed_condition,
-    make_cover_is_open_condition,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.condition import Condition
-
-DEVICE_CLASSES_GATE: dict[str, str] = {
-    COVER_DOMAIN: CoverDeviceClass.GATE,
-}
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_closed": make_cover_is_closed_condition(device_classes=DEVICE_CLASSES_GATE),
-    "is_open": make_cover_is_open_condition(device_classes=DEVICE_CLASSES_GATE),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for gates."""
-    return CONDITIONS

homeassistant/components/gate/conditions.yaml

@@ -1,24 +0,0 @@
-.condition_common_fields: &condition_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
-
-is_closed:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: cover
-        device_class: gate
-
-is_open:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: cover
-        device_class: gate

homeassistant/components/gate/icons.json

@@ -1,12 +1,4 @@
 {
-  "conditions": {
-    "is_closed": {
-      "condition": "mdi:gate"
-    },
-    "is_open": {
-      "condition": "mdi:gate-open"
-    }
-  },
   "triggers": {
     "closed": {
       "trigger": "mdi:gate"

homeassistant/components/gate/strings.json

@@ -1,39 +1,9 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted gates.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted gates to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_closed": {
-      "description": "Tests if one or more gates are closed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
-          "name": "[%key:component::gate::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Gate is closed"
-    },
-    "is_open": {
-      "description": "Tests if one or more gates are open.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
-          "name": "[%key:component::gate::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Gate is open"
-    }
-  },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/growatt_server/coordinator.py

@@ -251,7 +251,7 @@ class GrowattCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
     def get_data(
         self, entity_description: GrowattSensorEntityDescription
-    ) -> str | int | float | datetime.datetime | datetime.date | None:
+    ) -> str | int | float | None:
         """Get the data."""
         variable = entity_description.api_key
         api_value = self.data.get(variable)

homeassistant/components/growatt_server/icons.json

@@ -1,17 +1,4 @@
 {
-  "entity": {
-    "sensor": {
-      "storage_load_consumption_solar_storage": {
-        "default": "mdi:lightning-bolt"
-      },
-      "total_money_today": {
-        "default": "mdi:cash"
-      },
-      "total_money_total": {
-        "default": "mdi:cash"
-      }
-    }
-  },
   "services": {
     "read_ac_charge_times": {
       "service": "mdi:battery-clock-outline"

homeassistant/components/growatt_server/number.py

@@ -17,6 +17,7 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import GrowattConfigEntry, GrowattCoordinator
+from .sensor.sensor_entity_description import GrowattRequiredKeysMixin
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,10 +27,9 @@ PARALLEL_UPDATES = (
 
 
 @dataclass(frozen=True, kw_only=True)
-class GrowattNumberEntityDescription(NumberEntityDescription):
+class GrowattNumberEntityDescription(NumberEntityDescription, GrowattRequiredKeysMixin):
     """Describes Growatt number entity."""
 
-    api_key: str
     write_key: str | None = None  # Parameter ID for writing (if different from api_key)
 
 
@@ -130,7 +130,6 @@ class GrowattNumber(CoordinatorEntity[GrowattCoordinator], NumberEntity):
             identifiers={(DOMAIN, coordinator.device_id)},
             manufacturer="Growatt",
             name=coordinator.device_id,
-            serial_number=coordinator.device_id,
         )
 
     @property

homeassistant/components/growatt_server/quality_scale.yaml

@@ -32,7 +32,9 @@ rules:
   test-coverage: done
 
   # Gold
-  devices: done
+  devices:
+    status: todo
+    comment: Add serial_number field to DeviceInfo in sensor, number, and switch platforms using device_id/serial_id.
   diagnostics: todo
   discovery-update-info: todo
   discovery: todo
@@ -44,12 +46,16 @@ rules:
   docs-troubleshooting: todo
   docs-use-cases: todo
   dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default: done
+  entity-category:
+    status: todo
+    comment: Add EntityCategory.DIAGNOSTIC to temperature and other diagnostic sensors. Merge GrowattRequiredKeysMixin into GrowattSensorEntityDescription using kw_only=True.
+  entity-device-class:
+    status: todo
+    comment: Replace custom precision field with suggested_display_precision to preserve full data granularity.
+  entity-disabled-by-default: todo
   entity-translations: done
   exception-translations: todo
-  icon-translations: done
+  icon-translations: todo
   reconfiguration-flow: todo
   repair-issues:
     status: exempt

homeassistant/components/growatt_server/sensor/__init__.py

@@ -2,14 +2,12 @@
 
 from __future__ import annotations
 
-from datetime import date, datetime
 import logging
 
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from ..const import DOMAIN
@@ -101,18 +99,24 @@ class GrowattSensor(CoordinatorEntity[GrowattCoordinator], SensorEntity):
         self.entity_description = description
 
         self._attr_unique_id = unique_id
+        self._attr_icon = "mdi:solar-power"
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, serial_id)},
             manufacturer="Growatt",
             name=name,
-            serial_number=serial_id,
         )
 
     @property
-    def native_value(self) -> StateType | date | datetime:
+    def native_value(self) -> str | int | float | None:
         """Return the state of the sensor."""
-        return self.coordinator.get_data(self.entity_description)
+        result = self.coordinator.get_data(self.entity_description)
+        if (
+            isinstance(result, (int, float))
+            and self.entity_description.precision is not None
+        ):
+            result = round(result, self.entity_description.precision)
+        return result
 
     @property
     def native_unit_of_measurement(self) -> str | None:

homeassistant/components/growatt_server/sensor/inverter.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import (
-    EntityCategory,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -23,7 +22,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_energy_total",
@@ -31,7 +30,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="powerTotal",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
-        suggested_display_precision=1,
+        precision=1,
         state_class=SensorStateClass.TOTAL,
     ),
     GrowattSensorEntityDescription(
@@ -41,7 +40,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_1",
@@ -50,7 +49,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_1",
@@ -59,7 +58,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_2",
@@ -68,7 +67,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_2",
@@ -77,7 +76,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_2",
@@ -86,7 +85,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_voltage_input_3",
@@ -95,7 +94,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_amperage_input_3",
@@ -104,7 +103,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_wattage_input_3",
@@ -113,7 +112,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_internal_wattage",
@@ -122,7 +121,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_reactive_voltage",
@@ -131,9 +130,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_inverter_reactive_amperage",
@@ -142,9 +139,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_frequency",
@@ -153,9 +148,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_current_wattage",
@@ -164,7 +157,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_current_reactive_wattage",
@@ -173,9 +166,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_ipm_temperature",
@@ -184,9 +175,7 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="inverter_temperature",
@@ -195,8 +184,6 @@ INVERTER_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
 )

homeassistant/components/growatt_server/sensor/sensor_entity_description.py

@@ -7,11 +7,18 @@ from dataclasses import dataclass
 from homeassistant.components.sensor import SensorEntityDescription
 
 
-@dataclass(frozen=True, kw_only=True)
-class GrowattSensorEntityDescription(SensorEntityDescription):
-    """Describes Growatt sensor entity."""
+@dataclass(frozen=True)
+class GrowattRequiredKeysMixin:
+    """Mixin for required keys."""
 
     api_key: str
+
+
+@dataclass(frozen=True)
+class GrowattSensorEntityDescription(SensorEntityDescription, GrowattRequiredKeysMixin):
+    """Describes Growatt sensor entity."""
+
+    precision: int | None = None
     currency: bool = False
     previous_value_drop_threshold: float | None = None
     never_resets: bool = False

homeassistant/components/growatt_server/sensor/sph.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import (
     PERCENTAGE,
-    EntityCategory,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfFrequency,
@@ -91,8 +90,6 @@ SPH_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
     ),
     GrowattSensorEntityDescription(
         key="sph_temperature_1",
@@ -101,8 +98,6 @@ SPH_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
     ),
     GrowattSensorEntityDescription(
         key="sph_temperature_2",
@@ -111,8 +106,6 @@ SPH_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
     ),
     GrowattSensorEntityDescription(
         key="sph_temperature_3",
@@ -121,8 +114,6 @@ SPH_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
     ),
     GrowattSensorEntityDescription(
         key="sph_temperature_4",
@@ -131,8 +122,6 @@ SPH_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
     ),
     GrowattSensorEntityDescription(
         key="sph_temperature_5",
@@ -141,8 +130,6 @@ SPH_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
     ),
     # Values from 'sph_energy' API call
     GrowattSensorEntityDescription(

homeassistant/components/growatt_server/sensor/storage.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import (
     PERCENTAGE,
-    EntityCategory,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -190,7 +189,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_pv_charging_voltage",
@@ -199,7 +198,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_pv_charging_voltage_2",
@@ -208,7 +207,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_ac_input_frequency_out",
@@ -217,9 +216,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_output_voltage",
@@ -228,7 +225,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_ac_output_frequency",
@@ -237,9 +234,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_current_PV",
@@ -248,7 +243,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_current_1",
@@ -257,7 +252,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_current_2",
@@ -266,7 +261,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_amperage_input",
@@ -275,7 +270,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_grid_out_current",
@@ -284,7 +279,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_battery_voltage",
@@ -293,7 +288,7 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
     GrowattSensorEntityDescription(
         key="storage_load_percentage",
@@ -302,6 +297,6 @@ STORAGE_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=2,
+        precision=2,
     ),
 )

homeassistant/components/growatt_server/sensor/tlx.py

@@ -8,7 +8,6 @@ from __future__ import annotations
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.const import (
     PERCENTAGE,
-    EntityCategory,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -27,7 +26,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total",
@@ -36,7 +35,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
         never_resets=True,
     ),
     GrowattSensorEntityDescription(
@@ -46,7 +45,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
         never_resets=True,
     ),
     GrowattSensorEntityDescription(
@@ -56,7 +55,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_1",
@@ -64,7 +63,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="vpv1",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_1",
@@ -72,7 +71,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="ipv1",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_1",
@@ -81,7 +80,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_2",
@@ -90,7 +89,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
         never_resets=True,
     ),
     GrowattSensorEntityDescription(
@@ -100,7 +99,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_2",
@@ -108,7 +107,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="vpv2",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_2",
@@ -116,7 +115,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="ipv2",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_2",
@@ -125,7 +124,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_3",
@@ -134,7 +133,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
         never_resets=True,
     ),
     GrowattSensorEntityDescription(
@@ -144,7 +143,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_3",
@@ -152,7 +151,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="vpv3",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_3",
@@ -160,7 +159,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="ipv3",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_3",
@@ -169,7 +168,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_energy_total_input_4",
@@ -178,7 +177,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
         never_resets=True,
     ),
     GrowattSensorEntityDescription(
@@ -188,7 +187,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_voltage_input_4",
@@ -196,7 +195,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="vpv4",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_amperage_input_4",
@@ -204,7 +203,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="ipv4",
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         device_class=SensorDeviceClass.CURRENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_wattage_input_4",
@@ -213,7 +212,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_solar_generation_today",
@@ -222,7 +221,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_solar_generation_total",
@@ -240,7 +239,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_reactive_voltage",
@@ -248,9 +247,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="vacrs",
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_frequency",
@@ -258,9 +255,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="fac",
         native_unit_of_measurement=UnitOfFrequency.HERTZ,
         device_class=SensorDeviceClass.FREQUENCY,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_current_wattage",
@@ -269,7 +264,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_1",
@@ -277,9 +272,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="temp1",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_2",
@@ -287,9 +280,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="temp2",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_3",
@@ -297,9 +288,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="temp3",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_4",
@@ -307,9 +296,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="temp4",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_temperature_5",
@@ -317,9 +304,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         api_key="temp5",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
-        suggested_display_precision=1,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_all_batteries_discharge_today",
@@ -471,7 +456,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_pac_to_user_total",
@@ -480,7 +465,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_pac_to_grid_total",
@@ -489,7 +474,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_system_production_today",
@@ -498,7 +483,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_system_production_total",
@@ -508,7 +493,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         never_resets=True,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_self_consumption_today",
@@ -517,7 +502,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_self_consumption_total",
@@ -527,7 +512,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         never_resets=True,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_import_from_grid_today",
@@ -536,7 +521,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_import_from_grid_total",
@@ -546,7 +531,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         never_resets=True,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_batteries_charged_from_grid_today",
@@ -555,7 +540,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_batteries_charged_from_grid_total",
@@ -565,7 +550,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
         never_resets=True,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_p_system",
@@ -574,7 +559,7 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
     GrowattSensorEntityDescription(
         key="tlx_p_self",
@@ -583,6 +568,6 @@ TLX_SENSOR_TYPES: tuple[GrowattSensorEntityDescription, ...] = (
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=1,
+        precision=1,
     ),
 )

homeassistant/components/growatt_server/switch.py

@@ -18,6 +18,7 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import GrowattConfigEntry, GrowattCoordinator
+from .sensor.sensor_entity_description import GrowattRequiredKeysMixin
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,10 +28,9 @@ PARALLEL_UPDATES = (
 
 
 @dataclass(frozen=True, kw_only=True)
-class GrowattSwitchEntityDescription(SwitchEntityDescription):
+class GrowattSwitchEntityDescription(SwitchEntityDescription, GrowattRequiredKeysMixin):
     """Describes Growatt switch entity."""
 
-    api_key: str
     write_key: str | None = None  # Parameter ID for writing (if different from api_key)
 
 
@@ -87,7 +87,6 @@ class GrowattSwitch(CoordinatorEntity[GrowattCoordinator], SwitchEntity):
             identifiers={(DOMAIN, coordinator.device_id)},
             manufacturer="Growatt",
             name=coordinator.device_id,
-            serial_number=coordinator.device_id,
         )
 
     @property

homeassistant/components/hassio/const.py

@@ -132,7 +132,6 @@ ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED = "issue_addon_detached_addon_removed"
 ISSUE_KEY_ADDON_PWNED = "issue_addon_pwned"
 ISSUE_KEY_SYSTEM_FREE_SPACE = "issue_system_free_space"
 ISSUE_KEY_ADDON_DEPRECATED = "issue_addon_deprecated_addon"
-ISSUE_KEY_ADDON_DEPRECATED_ARCH = "issue_addon_deprecated_arch_addon"
 
 ISSUE_MOUNT_MOUNT_FAILED = "issue_mount_mount_failed"
 
@@ -173,7 +172,6 @@ EXTRA_PLACEHOLDERS = {
         "more_info_pwned": "https://www.home-assistant.io/more-info/pwned-passwords",
     },
     ISSUE_KEY_ADDON_DEPRECATED: HELP_URLS,
-    ISSUE_KEY_ADDON_DEPRECATED_ARCH: HELP_URLS,
 }
 
 

homeassistant/components/hassio/issues.py

@@ -47,7 +47,6 @@ from .const import (
     EVENT_SUPPORTED_CHANGED,
     EXTRA_PLACEHOLDERS,
     ISSUE_KEY_ADDON_BOOT_FAIL,
-    ISSUE_KEY_ADDON_DEPRECATED_ARCH,
     ISSUE_KEY_ADDON_DETACHED_ADDON_MISSING,
     ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED,
     ISSUE_KEY_ADDON_PWNED,
@@ -91,7 +90,6 @@ ISSUE_KEYS_FOR_REPAIRS = {
     "issue_system_disk_lifetime",
     ISSUE_KEY_SYSTEM_FREE_SPACE,
     ISSUE_KEY_ADDON_PWNED,
-    ISSUE_KEY_ADDON_DEPRECATED_ARCH,
 }
 
 _LOGGER = logging.getLogger(__name__)
@@ -255,10 +253,9 @@ class SupervisorIssues:
     def add_issue(self, issue: Issue) -> None:
         """Add or update an issue in the list. Create or update a repair if necessary."""
         if issue.key in ISSUE_KEYS_FOR_REPAIRS:
+            placeholders: dict[str, str] = {}
             if not issue.suggestions and issue.key in EXTRA_PLACEHOLDERS:
-                placeholders: dict[str, str] = EXTRA_PLACEHOLDERS[issue.key].copy()
-            else:
-                placeholders = {}
+                placeholders |= EXTRA_PLACEHOLDERS[issue.key]
 
             if issue.reference:
                 placeholders[PLACEHOLDER_KEY_REFERENCE] = issue.reference

homeassistant/components/hassio/repairs.py

@@ -21,7 +21,6 @@ from .const import (
     EXTRA_PLACEHOLDERS,
     ISSUE_KEY_ADDON_BOOT_FAIL,
     ISSUE_KEY_ADDON_DEPRECATED,
-    ISSUE_KEY_ADDON_DEPRECATED_ARCH,
     ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED,
     ISSUE_KEY_ADDON_PWNED,
     ISSUE_KEY_SYSTEM_DOCKER_CONFIG,
@@ -65,16 +64,11 @@ class SupervisorIssueRepairFlow(RepairsFlow):
     @property
     def description_placeholders(self) -> dict[str, str] | None:
         """Get description placeholders for steps."""
-        if not self.issue:
-            return None
-
-        if self.issue.key in EXTRA_PLACEHOLDERS:
-            placeholders: dict[str, str] = EXTRA_PLACEHOLDERS[self.issue.key].copy()
-        else:
-            placeholders = {}
-
-        if self.issue.reference:
-            placeholders |= {PLACEHOLDER_KEY_REFERENCE: self.issue.reference}
+        placeholders = {}
+        if self.issue:
+            placeholders = EXTRA_PLACEHOLDERS.get(self.issue.key, {})
+            if self.issue.reference:
+                placeholders |= {PLACEHOLDER_KEY_REFERENCE: self.issue.reference}
 
         return placeholders or None
 
@@ -238,7 +232,6 @@ async def async_create_fix_flow(
         ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED,
         ISSUE_KEY_ADDON_BOOT_FAIL,
         ISSUE_KEY_ADDON_PWNED,
-        ISSUE_KEY_ADDON_DEPRECATED_ARCH,
     }:
         return AddonIssueRepairFlow(hass, issue_id)
 

homeassistant/components/hassio/strings.json

@@ -85,19 +85,6 @@
       },
       "title": "Installed app is deprecated"
     },
-    "issue_addon_deprecated_arch_addon": {
-      "fix_flow": {
-        "abort": {
-          "apply_suggestion_fail": "Could not uninstall the app. Check the Supervisor logs for more details."
-        },
-        "step": {
-          "addon_execute_remove": {
-            "description": "App {addon} only supports architectures and/or machines which are no longer supported by Home Assistant. It will stop working in a future release.\n\nSelecting **Submit** will uninstall this deprecated app. Alternatively, you can check [Home Assistant help]({help_url}) and the [community forum]({community_url}) for alternatives to migrate to."
-          }
-        }
-      },
-      "title": "Installed app is built for unsupported architectures and/or machines"
-    },
     "issue_addon_detached_addon_missing": {
       "description": "Repository for app {addon} is missing. This means it will not get updates, and backups may not be restored correctly as the Home Assistant Supervisor may not be able to build/download the resources required.\n\nPlease check the [app's documentation]({addon_url}) for installation instructions and add the repository to the store.",
       "title": "Missing repository for an installed app"

homeassistant/components/huum/climate.py

@@ -72,6 +72,13 @@ class HuumDevice(HuumBaseEntity, ClimateEntity):
             return HVACMode.HEAT
         return HVACMode.OFF
 
+    @property
+    def icon(self) -> str:
+        """Return nice icon for heater."""
+        if self.hvac_mode == HVACMode.HEAT:
+            return "mdi:radiator"
+        return "mdi:radiator-off"
+
     @property
     def current_temperature(self) -> int | None:
         """Return the current temperature."""

homeassistant/components/huum/config_flow.py

@@ -45,6 +45,8 @@ class HuumConfigFlow(ConfigFlow, domain=DOMAIN):
                 )
                 await huum.status()
             except Forbidden, NotAuthenticated:
+                # Most likely Forbidden as that is what is returned from `.status()` with bad creds
+                _LOGGER.error("Could not log in to Huum with given credentials")
                 errors["base"] = "invalid_auth"
             except Exception:
                 _LOGGER.exception("Unknown error")

homeassistant/components/huum/coordinator.py

@@ -54,6 +54,7 @@ class HuumDataUpdateCoordinator(DataUpdateCoordinator[HuumStatusResponse]):
         try:
             return await self.huum.status()
         except (Forbidden, NotAuthenticated) as err:
+            _LOGGER.error("Could not log in to Huum with given credentials")
             raise UpdateFailed(
                 "Could not log in to Huum with given credentials"
             ) from err

homeassistant/components/huum/quality_scale.yaml

@@ -7,7 +7,11 @@ rules:
   brands: done
   common-modules: done
   config-flow-test-coverage: done
-  config-flow: done
+  config-flow:
+    status: done
+    comment: |
+      PLANNED: Remove _LOGGER.error call from config_flow.py — the error
+      message is redundant with the errors dict entry.
   dependency-transparency: done
   docs-actions:
     status: exempt
@@ -36,7 +40,11 @@ rules:
   docs-installation-parameters: done
   entity-unavailable: done
   integration-owner: done
-  log-when-unavailable: done
+  log-when-unavailable:
+    status: done
+    comment: |
+      PLANNED: Remove _LOGGER.error from coordinator.py — the message is already
+      passed to UpdateFailed, so logging it separately is redundant.
   parallel-updates: done
   reauthentication-flow: todo
   test-coverage:
@@ -66,7 +74,11 @@ rules:
     comment: All entities are core functionality.
   entity-translations: done
   exception-translations: todo
-  icon-translations: done
+  icon-translations:
+    status: done
+    comment: |
+      PLANNED: Remove the icon property from climate.py — entities should not set
+      custom icons. Use HA defaults or icon translations instead.
   reconfiguration-flow: todo
   repair-issues:
     status: exempt

homeassistant/components/intellifire/strings.json

@@ -22,13 +22,7 @@
         "description": "Authenticate against IntelliFire cloud"
       },
       "pick_cloud_device": {
-        "data": {
-          "serial": "Fireplace serial number"
-        },
-        "data_description": {
-          "serial": "Serial number of the fireplace to configure"
-        },
-        "description": "Select fireplace by serial number.",
+        "description": "Select fireplace by serial number:",
         "title": "Configure fireplace"
       }
     }
@@ -165,10 +159,6 @@
           "control_mode": "Send commands to",
           "read_mode": "Read data from"
         },
-        "data_description": {
-          "control_mode": "Whether to send fireplace commands via the `Local` or `Cloud` API",
-          "read_mode": "Whether to read fireplace state via the `Local` or `Cloud` API"
-        },
         "description": "Some users find that their fireplace hardware prioritizes `Cloud` communication and may experience timeouts with `Local` control. If you encounter connectivity issues, try switching to `Cloud` for the affected endpoint.",
         "title": "Endpoint selection"
       }

homeassistant/components/jvc_projector/coordinator.py

@@ -151,9 +151,7 @@ class JvcProjectorDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str]]):
 
         return value
 
-    def get_options_map(
-        self, command: str, *, snake_case: bool = False
-    ) -> dict[str, str]:
+    def get_options_map(self, command: str) -> dict[str, str]:
         """Get the available options for a command."""
         capabilities = self.capabilities.get(command, {})
 
@@ -164,10 +162,7 @@ class JvcProjectorDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str]]):
 
         values = list(capabilities.get("parameter", {}).get("read", {}).values())
 
-        options = {v: v.translate(TRANSLATIONS) for v in values}
-        if snake_case:
-            return {k: v.replace("-", "_") for k, v in options.items()}
-        return options
+        return {v: v.translate(TRANSLATIONS) for v in values}
 
     def supports(self, command: type[Command]) -> bool:
         """Check if the device supports a command."""

homeassistant/components/jvc_projector/icons.json

@@ -18,9 +18,6 @@
       "dynamic_control": {
         "default": "mdi:lightbulb-on-outline"
       },
-      "hdr_processing": {
-        "default": "mdi:image-filter-hdr-outline"
-      },
       "input": {
         "default": "mdi:hdmi-port"
       },
@@ -29,9 +26,6 @@
       },
       "light_power": {
         "default": "mdi:lightbulb-on-outline"
-      },
-      "picture_mode": {
-        "default": "mdi:movie-roll"
       }
     },
     "sensor": {

homeassistant/components/jvc_projector/select.py

@@ -20,7 +20,6 @@ class JvcProjectorSelectDescription(SelectEntityDescription):
     """Describes JVC Projector select entities."""
 
     command: type[Command]
-    snake_case_states: bool = False
 
 
 SELECTS: Final[tuple[JvcProjectorSelectDescription, ...]] = (
@@ -50,18 +49,6 @@ SELECTS: Final[tuple[JvcProjectorSelectDescription, ...]] = (
         command=cmd.Anamorphic,
         entity_registry_enabled_default=False,
     ),
-    JvcProjectorSelectDescription(
-        key="hdr_processing",
-        command=cmd.HdrProcessing,
-        entity_registry_enabled_default=False,
-        snake_case_states=True,
-    ),
-    JvcProjectorSelectDescription(
-        key="picture_mode",
-        command=cmd.PictureMode,
-        entity_registry_enabled_default=False,
-        snake_case_states=True,
-    ),
 )
 
 
@@ -97,8 +84,7 @@ class JvcProjectorSelectEntity(JvcProjectorEntity, SelectEntity):
         self._attr_unique_id = f"{self._attr_unique_id}_{description.key}"
 
         self._options_map: dict[str, str] = coordinator.get_options_map(
-            self.command.name,
-            snake_case=description.snake_case_states,
+            self.command.name
         )
 
     @property

homeassistant/components/jvc_projector/sensor.py

@@ -7,19 +7,16 @@ from dataclasses import dataclass
 from jvcprojector import Command, command as cmd
 
 from homeassistant.components.sensor import (
-    DOMAIN as SENSOR_DOMAIN,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
 )
 from homeassistant.const import EntityCategory, UnitOfTime
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 from .entity import JvcProjectorEntity
-from .util import deprecate_entity
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -87,29 +84,12 @@ async def async_setup_entry(
 ) -> None:
     """Set up the JVC Projector platform from a config entry."""
     coordinator = entry.runtime_data
-    entity_registry = er.async_get(hass)
 
-    entities: list[JvcProjectorSensorEntity] = []
-    for description in SENSORS:
-        if not coordinator.supports(description.command):
-            continue
-        if description.key in (
-            "hdr_processing",
-            "picture_mode",
-        ) and not deprecate_entity(
-            hass,
-            entity_registry,
-            SENSOR_DOMAIN,
-            f"{coordinator.unique_id}_{description.key}",
-            f"deprecated_sensor_{entry.entry_id}_{description.key}",
-            "deprecated_sensor",
-            f"{coordinator.unique_id}_{description.key}",
-            f"select.jvc_projector_{description.key}",
-        ):
-            continue
-        entities.append(JvcProjectorSensorEntity(coordinator, description))
-
-    async_add_entities(entities)
+    async_add_entities(
+        JvcProjectorSensorEntity(coordinator, description)
+        for description in SENSORS
+        if coordinator.supports(description.command)
+    )
 
 
 class JvcProjectorSensorEntity(JvcProjectorEntity, SensorEntity):

homeassistant/components/jvc_projector/strings.json

@@ -71,15 +71,6 @@
           "off": "[%key:common::state::off%]"
         }
       },
-      "hdr_processing": {
-        "name": "HDR Processing",
-        "state": {
-          "frame_by_frame": "Frame-by-Frame",
-          "hdr10p": "HDR10+",
-          "scene_by_scene": "Scene-by-Scene",
-          "static": "Static"
-        }
-      },
       "input": {
         "name": "Input",
         "state": {
@@ -110,23 +101,6 @@
           "mid": "[%key:common::state::medium%]",
           "normal": "[%key:common::state::normal%]"
         }
-      },
-      "picture_mode": {
-        "name": "Picture Mode",
-        "state": {
-          "frame_adapt_hdr": "Frame Adapt HDR",
-          "frame_adapt_hdr2": "Frame Adapt HDR2",
-          "frame_adapt_hdr3": "Frame Adapt HDR3",
-          "hdr1": "HDR1",
-          "hdr10": "HDR10",
-          "hdr10_ll": "HDR10 LL",
-          "hdr2": "HDR2",
-          "last_setting": "Last setting",
-          "pana_pq": "Pana PQ",
-          "user_4": "User 4",
-          "user_5": "User 5",
-          "user_6": "User 6"
-        }
       }
     },
     "sensor": {
@@ -182,7 +156,7 @@
           "hdr10": "HDR10",
           "hdr10-ll": "HDR10 LL",
           "hdr2": "HDR2",
-          "last-setting": "Last setting",
+          "last-setting": "Last Setting",
           "pana-pq": "Pana PQ",
           "user-4": "User 4",
           "user-5": "User 5",
@@ -208,15 +182,5 @@
         "name": "Low latency mode"
       }
     }
-  },
-  "issues": {
-    "deprecated_sensor": {
-      "description": "The sensor {entity_name} (`{entity_id}`) is deprecated because it has been replaced with `{replacement_entity_id}`.\n\nUpdate your dashboards, templates, automations and scripts to use the replacement entity, then disable the deprecated sensor to have it removed after the next restart.",
-      "title": "Deprecated sensor detected"
-    },
-    "deprecated_sensor_scripts": {
-      "description": "The sensor {entity_name} (`{entity_id}`) is deprecated because it has been replaced with `{replacement_entity_id}`.\n\nThe sensor was used in the following automations or scripts:\n{items}\n\nUpdate the above automations or scripts to use the replacement entity, then disable the deprecated sensor to have it removed after the next restart.",
-      "title": "[%key:component::jvc_projector::issues::deprecated_sensor::title%]"
-    }
   }
 }

homeassistant/components/jvc_projector/util.py

@@ -1,104 +0,0 @@
-"""Utility helpers for the jvc_projector integration."""
-
-from __future__ import annotations
-
-from homeassistant.components.automation import automations_with_entity
-from homeassistant.components.script import scripts_with_entity
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.issue_registry import (
-    IssueSeverity,
-    async_create_issue,
-    async_delete_issue,
-)
-
-from .const import DOMAIN
-
-
-def deprecate_entity(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    platform_domain: str,
-    entity_unique_id: str,
-    issue_id: str,
-    issue_string: str,
-    replacement_entity_unique_id: str,
-    replacement_entity_id: str,
-    version: str = "2026.9.0",
-) -> bool:
-    """Create an issue for deprecated entities."""
-    if entity_id := entity_registry.async_get_entity_id(
-        platform_domain, DOMAIN, entity_unique_id
-    ):
-        entity_entry = entity_registry.async_get(entity_id)
-        if not entity_entry:
-            async_delete_issue(hass, DOMAIN, issue_id)
-            return False
-
-        items = get_automations_and_scripts_using_entity(hass, entity_id)
-        if entity_entry.disabled and not items:
-            entity_registry.async_remove(entity_id)
-            async_delete_issue(hass, DOMAIN, issue_id)
-            return False
-
-        translation_key = issue_string
-        placeholders = {
-            "entity_id": entity_id,
-            "entity_name": entity_entry.name or entity_entry.original_name or "Unknown",
-            "replacement_entity_id": (
-                entity_registry.async_get_entity_id(
-                    Platform.SELECT, DOMAIN, replacement_entity_unique_id
-                )
-                or replacement_entity_id
-            ),
-        }
-        if items:
-            translation_key = f"{translation_key}_scripts"
-            placeholders["items"] = "\n".join(items)
-
-        async_create_issue(
-            hass,
-            DOMAIN,
-            issue_id,
-            breaks_in_ha_version=version,
-            is_fixable=False,
-            severity=IssueSeverity.WARNING,
-            translation_key=translation_key,
-            translation_placeholders=placeholders,
-        )
-        return True
-
-    async_delete_issue(hass, DOMAIN, issue_id)
-    return False
-
-
-def get_automations_and_scripts_using_entity(
-    hass: HomeAssistant,
-    entity_id: str,
-) -> list[str]:
-    """Get automations and scripts using an entity."""
-    # These helpers return referencing automation/script entity IDs.
-    automations = automations_with_entity(hass, entity_id)
-    scripts = scripts_with_entity(hass, entity_id)
-    if not automations and not scripts:
-        return []
-
-    entity_registry = er.async_get(hass)
-    items: list[str] = []
-
-    for integration, entities in (
-        ("automation", automations),
-        ("script", scripts),
-    ):
-        for used_entity_id in entities:
-            # Prefer entity-registry metadata so we can render edit links.
-            if item := entity_registry.async_get(used_entity_id):
-                items.append(
-                    f"- [{item.original_name}](/config/{integration}/edit/{item.unique_id})"
-                )
-            else:
-                # Keep unresolved references as plain text so they still count as usage.
-                items.append(f"- `{used_entity_id}`")
-
-    return items

homeassistant/components/motion/condition.py

@@ -1,25 +0,0 @@
-"""Provides conditions for motion."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
-
-_MOTION_DOMAIN_SPECS = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.MOTION)
-}
-
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_detected": make_entity_state_condition(_MOTION_DOMAIN_SPECS, STATE_ON),
-    "is_not_detected": make_entity_state_condition(_MOTION_DOMAIN_SPECS, STATE_OFF),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for motion."""
-    return CONDITIONS

homeassistant/components/motion/conditions.yaml

@@ -1,24 +0,0 @@
-.condition_common_fields: &condition_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
-
-is_detected:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: motion
-
-is_not_detected:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: motion

homeassistant/components/motion/icons.json

@@ -1,12 +1,4 @@
 {
-  "conditions": {
-    "is_detected": {
-      "condition": "mdi:motion-sensor"
-    },
-    "is_not_detected": {
-      "condition": "mdi:motion-sensor-off"
-    }
-  },
   "triggers": {
     "cleared": {
       "trigger": "mdi:motion-sensor-off"

homeassistant/components/motion/strings.json

@@ -1,39 +1,9 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted motion sensors.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted motion sensors to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_detected": {
-      "description": "Tests if one or more motion sensors are detecting motion.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::motion::common::condition_behavior_description%]",
-          "name": "[%key:component::motion::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Motion is detected"
-    },
-    "is_not_detected": {
-      "description": "Tests if one or more motion sensors are not detecting motion.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::motion::common::condition_behavior_description%]",
-          "name": "[%key:component::motion::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Motion is not detected"
-    }
-  },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/occupancy/condition.py

@@ -1,25 +0,0 @@
-"""Provides conditions for occupancy."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
-
-_OCCUPANCY_DOMAIN_SPECS = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.OCCUPANCY)
-}
-
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_detected": make_entity_state_condition(_OCCUPANCY_DOMAIN_SPECS, STATE_ON),
-    "is_not_detected": make_entity_state_condition(_OCCUPANCY_DOMAIN_SPECS, STATE_OFF),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for occupancy."""
-    return CONDITIONS

homeassistant/components/occupancy/conditions.yaml

@@ -1,24 +0,0 @@
-.condition_common_fields: &condition_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
-
-is_detected:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: occupancy
-
-is_not_detected:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: occupancy

homeassistant/components/occupancy/icons.json

@@ -1,12 +1,4 @@
 {
-  "conditions": {
-    "is_detected": {
-      "condition": "mdi:home-account"
-    },
-    "is_not_detected": {
-      "condition": "mdi:home-outline"
-    }
-  },
   "triggers": {
     "cleared": {
       "trigger": "mdi:home-outline"

homeassistant/components/occupancy/strings.json

@@ -1,39 +1,9 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted occupancy sensors.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted occupancy sensors to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_detected": {
-      "description": "Tests if one or more occupancy sensors are detecting occupancy.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::occupancy::common::condition_behavior_description%]",
-          "name": "[%key:component::occupancy::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Occupancy is detected"
-    },
-    "is_not_detected": {
-      "description": "Tests if one or more occupancy sensors are not detecting occupancy.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::occupancy::common::condition_behavior_description%]",
-          "name": "[%key:component::occupancy::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Occupancy is not detected"
-    }
-  },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/proxmoxve/button.py

@@ -104,7 +104,7 @@ VM_BUTTONS: tuple[ProxmoxVMButtonEntityDescription, ...] = (
     ProxmoxVMButtonEntityDescription(
         key="restart",
         press_action=lambda coordinator, node, vmid: (
-            coordinator.proxmox.nodes(node).qemu(vmid).status.reboot.post()
+            coordinator.proxmox.nodes(node).qemu(vmid).status.restart.post()
         ),
         entity_category=EntityCategory.CONFIG,
         device_class=ButtonDeviceClass.RESTART,
@@ -147,7 +147,7 @@ CONTAINER_BUTTONS: tuple[ProxmoxContainerButtonEntityDescription, ...] = (
     ProxmoxContainerButtonEntityDescription(
         key="restart",
         press_action=lambda coordinator, node, vmid: (
-            coordinator.proxmox.nodes(node).lxc(vmid).status.reboot.post()
+            coordinator.proxmox.nodes(node).lxc(vmid).status.restart.post()
         ),
         entity_category=EntityCategory.CONFIG,
         device_class=ButtonDeviceClass.RESTART,

homeassistant/components/renault/const.py

@@ -18,7 +18,6 @@ PLATFORMS = [
     Platform.BINARY_SENSOR,
     Platform.BUTTON,
     Platform.DEVICE_TRACKER,
-    Platform.NUMBER,
     Platform.SELECT,
     Platform.SENSOR,
 ]

homeassistant/components/renault/number.py

@@ -1,144 +0,0 @@
-"""Support for Renault number entities."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from typing import Any, cast
-
-from renault_api.kamereon.models import KamereonVehicleBatterySocData
-
-from homeassistant.components.number import (
-    NumberDeviceClass,
-    NumberEntity,
-    NumberEntityDescription,
-    NumberMode,
-)
-from homeassistant.const import PERCENTAGE
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import RenaultConfigEntry
-from .const import DOMAIN
-from .entity import RenaultDataEntity, RenaultDataEntityDescription
-
-# Coordinator is used to centralize the data updates
-# but renault servers are unreliable and it's safer to queue action calls
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class RenaultNumberEntityDescription(
-    NumberEntityDescription, RenaultDataEntityDescription
-):
-    """Class describing Renault number entities."""
-
-    data_key: str
-    update_fn: Callable[[RenaultNumberEntity, float], Coroutine[Any, Any, None]]
-
-
-async def _set_charge_limit_min(entity: RenaultNumberEntity, value: float) -> None:
-    """Set the minimum SOC.
-
-    The target SOC is required to set the minimum SOC, so we need to fetch it first.
-    """
-    if (data := entity.coordinator.data) is None or (
-        target_soc := data.socTarget
-    ) is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="battery_soc_unavailable",
-        )
-    await _set_charge_limits(entity, min_soc=round(value), target_soc=target_soc)
-
-
-async def _set_charge_limit_target(entity: RenaultNumberEntity, value: float) -> None:
-    """Set the target SOC.
-
-    The minimum SOC is required to set the target SOC, so we need to fetch it first.
-    """
-    if (data := entity.coordinator.data) is None or (min_soc := data.socMin) is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="battery_soc_unavailable",
-        )
-    await _set_charge_limits(entity, min_soc=min_soc, target_soc=round(value))
-
-
-async def _set_charge_limits(
-    entity: RenaultNumberEntity, min_soc: int, target_soc: int
-) -> None:
-    """Set the minimum and target SOC.
-
-    Optimistically update local coordinator data so the new
-    limits are reflected immediately without a remote refresh,
-    as Renault servers may still cache old values.
-    """
-    await entity.vehicle.set_battery_soc(min_soc=min_soc, target_soc=target_soc)
-
-    entity.coordinator.data.socMin = min_soc
-    entity.coordinator.data.socTarget = target_soc
-    entity.coordinator.async_set_updated_data(entity.coordinator.data)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: RenaultConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the Renault entities from config entry."""
-    entities: list[RenaultNumberEntity] = [
-        RenaultNumberEntity(vehicle, description)
-        for vehicle in config_entry.runtime_data.vehicles.values()
-        for description in NUMBER_TYPES
-        if description.coordinator in vehicle.coordinators
-    ]
-    async_add_entities(entities)
-
-
-class RenaultNumberEntity(
-    RenaultDataEntity[KamereonVehicleBatterySocData], NumberEntity
-):
-    """Mixin for number specific attributes."""
-
-    entity_description: RenaultNumberEntityDescription
-
-    @property
-    def native_value(self) -> float | None:
-        """Return the entity value to represent the entity state."""
-        return cast(float | None, self._get_data_attr(self.entity_description.data_key))
-
-    async def async_set_native_value(self, value: float) -> None:
-        """Update the current value."""
-        await self.entity_description.update_fn(self, value)
-
-
-NUMBER_TYPES: tuple[RenaultNumberEntityDescription, ...] = (
-    RenaultNumberEntityDescription(
-        key="charge_limit_min",
-        coordinator="battery_soc",
-        data_key="socMin",
-        update_fn=_set_charge_limit_min,
-        device_class=NumberDeviceClass.BATTERY,
-        native_min_value=15,
-        native_max_value=45,
-        native_step=5,
-        native_unit_of_measurement=PERCENTAGE,
-        mode=NumberMode.SLIDER,
-        translation_key="charge_limit_min",
-    ),
-    RenaultNumberEntityDescription(
-        key="charge_limit_target",
-        coordinator="battery_soc",
-        data_key="socTarget",
-        update_fn=_set_charge_limit_target,
-        device_class=NumberDeviceClass.BATTERY,
-        native_min_value=55,
-        native_max_value=100,
-        native_step=5,
-        native_unit_of_measurement=PERCENTAGE,
-        mode=NumberMode.SLIDER,
-        translation_key="charge_limit_target",
-    ),
-)

homeassistant/components/renault/renault_vehicle.py

@@ -174,13 +174,6 @@ class RenaultVehicleProxy:
         """Stop vehicle charge."""
         return await self._vehicle.set_charge_stop()
 
-    @with_error_wrapping
-    async def set_battery_soc(
-        self, min_soc: int, target_soc: int
-    ) -> models.KamereonVehicleBatterySocActionData:
-        """Set vehicle battery SoC levels."""
-        return await self._vehicle.set_battery_soc(min=min_soc, target=target_soc)
-
     @with_error_wrapping
     async def set_ac_stop(self) -> models.KamereonVehicleHvacStartActionData:
         """Stop vehicle ac."""
@@ -277,10 +270,4 @@ COORDINATORS: tuple[RenaultCoordinatorDescription, ...] = (
         key="pressure",
         update_method=lambda x: x.get_tyre_pressure,
     ),
-    RenaultCoordinatorDescription(
-        endpoint="soc-levels",
-        key="battery_soc",
-        requires_electricity=True,
-        update_method=lambda x: x.get_battery_soc,
-    ),
 )

homeassistant/components/renault/strings.json

@@ -94,14 +94,6 @@
         "name": "[%key:common::config_flow::data::location%]"
       }
     },
-    "number": {
-      "charge_limit_min": {
-        "name": "Minimum charge level"
-      },
-      "charge_limit_target": {
-        "name": "Target charge level"
-      }
-    },
     "select": {
       "charge_mode": {
         "name": "Charge mode",
@@ -207,9 +199,6 @@
     }
   },
   "exceptions": {
-    "battery_soc_unavailable": {
-      "message": "Battery state of charge data is currently unavailable"
-    },
     "invalid_device_id": {
       "message": "No device with ID {device_id} was found"
     },

homeassistant/components/select/icons.json

@@ -20,10 +20,5 @@
     "select_previous": {
       "service": "mdi:format-list-bulleted"
     }
-  },
-  "triggers": {
-    "selection_changed": {
-      "trigger": "mdi:format-list-bulleted"
-    }
   }
 }

homeassistant/components/select/strings.json

@@ -76,11 +76,5 @@
       "name": "Previous"
     }
   },
-  "title": "Select",
-  "triggers": {
-    "selection_changed": {
-      "description": "Triggers after the selected option of one or more dropdowns changes.",
-      "name": "Selection changed"
-    }
-  }
+  "title": "Select"
 }

homeassistant/components/select/trigger.py

@@ -1,40 +0,0 @@
-"""Provides triggers for selects."""
-
-from homeassistant.components.input_select import DOMAIN as INPUT_SELECT_DOMAIN
-from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
-from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.trigger import (
-    ENTITY_STATE_TRIGGER_SCHEMA,
-    EntityTriggerBase,
-    Trigger,
-)
-
-from .const import DOMAIN
-
-
-class SelectionChangedTrigger(EntityTriggerBase):
-    """Trigger for select entity when its selection changes."""
-
-    _domain_specs = {DOMAIN: DomainSpec(), INPUT_SELECT_DOMAIN: DomainSpec()}
-    _schema = ENTITY_STATE_TRIGGER_SCHEMA
-
-    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
-        """Check if the origin state is valid and the state has changed."""
-        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
-            return False
-        return from_state.state != to_state.state
-
-    def is_valid_state(self, state: State) -> bool:
-        """Check if the new state is not invalid."""
-        return state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN)
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "selection_changed": SelectionChangedTrigger,
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for selects."""
-    return TRIGGERS

homeassistant/components/select/triggers.yaml

@@ -1,5 +0,0 @@
-selection_changed:
-  target:
-    entity:
-      - domain: select
-      - domain: input_select

homeassistant/components/smartthings/binary_sensor.py

@@ -208,15 +208,6 @@ CAPABILITY_TO_SENSORS: dict[
             supported_states_attributes=Attribute.SUPPORTED_COOKTOP_OPERATING_STATE,
         )
     },
-    Capability.SAMSUNG_CE_MICROFIBER_FILTER_STATUS: {
-        Attribute.STATUS: SmartThingsBinarySensorEntityDescription(
-            key=Attribute.STATUS,
-            translation_key="microfiber_filter_blockage",
-            is_on_key="blockage",
-            device_class=BinarySensorDeviceClass.PROBLEM,
-            entity_category=EntityCategory.DIAGNOSTIC,
-        )
-    },
 }
 
 

homeassistant/components/smartthings/strings.json

@@ -73,9 +73,6 @@
       "keep_fresh_mode_active": {
         "name": "Keep fresh mode active"
       },
-      "microfiber_filter_blockage": {
-        "name": "Filter blockage"
-      },
       "oven_cavity_status": {
         "name": "Second cavity status"
       },

homeassistant/components/songpal/media_player.py

@@ -288,8 +288,6 @@ class SongpalEntity(MediaPlayerEntity):
             self._volume_min = volume.minVolume
             self._volume = volume.volume
             self._volume_control = volume
-            if self._volume_max:
-                self._attr_volume_step = 1 / self._volume_max
             self._attr_is_volume_muted = self._volume_control.is_muted
 
             status = await self._dev.get_power()
@@ -383,6 +381,14 @@ class SongpalEntity(MediaPlayerEntity):
         _LOGGER.debug("Setting volume to %s", volume)
         return await self._volume_control.set_volume(volume)
 
+    async def async_volume_up(self) -> None:
+        """Set volume up."""
+        return await self._volume_control.set_volume(self._volume + 1)
+
+    async def async_volume_down(self) -> None:
+        """Set volume down."""
+        return await self._volume_control.set_volume(self._volume - 1)
+
     async def async_turn_on(self) -> None:
         """Turn the device on."""
         try:

homeassistant/components/starlink/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "starlink",
   "name": "Starlink",
-  "codeowners": [],
+  "codeowners": ["@boswelja"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/starlink",
   "integration_type": "device",

homeassistant/components/startca/sensor.py

@@ -8,7 +8,6 @@ from http import HTTPStatus
 import logging
 from xml.parsers.expat import ExpatError
 
-from aiohttp import ClientSession
 import voluptuous as vol
 import xmltodict
 
@@ -151,7 +150,7 @@ async def async_setup_platform(
     apikey = config[CONF_API_KEY]
     bandwidthcap = config[CONF_TOTAL_BANDWIDTH]
 
-    ts_data = StartcaData(websession, apikey, bandwidthcap)
+    ts_data = StartcaData(hass.loop, websession, apikey, bandwidthcap)
     ret = await ts_data.async_update()
     if ret is False:
         _LOGGER.error("Invalid Start.ca API key: %s", apikey)
@@ -177,9 +176,7 @@ async def async_setup_platform(
 class StartcaSensor(SensorEntity):
     """Representation of Start.ca Bandwidth sensor."""
 
-    def __init__(
-        self, startcadata: StartcaData, name: str, description: SensorEntityDescription
-    ) -> None:
+    def __init__(self, startcadata, name, description: SensorEntityDescription) -> None:
         """Initialize the sensor."""
         self.entity_description = description
         self.startcadata = startcadata
@@ -197,10 +194,9 @@ class StartcaSensor(SensorEntity):
 class StartcaData:
     """Get data from Start.ca API."""
 
-    def __init__(
-        self, websession: ClientSession, api_key: str, bandwidth_cap: int
-    ) -> None:
+    def __init__(self, loop, websession, api_key, bandwidth_cap):
         """Initialize the data object."""
+        self.loop = loop
         self.websession = websession
         self.api_key = api_key
         self.bandwidth_cap = bandwidth_cap
@@ -219,7 +215,7 @@ class StartcaData:
         return float(value) * 10**-9
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    async def async_update(self) -> bool:
+    async def async_update(self):
         """Get the Start.ca bandwidth data from the web service."""
         _LOGGER.debug("Updating Start.ca usage data")
         url = f"https://www.start.ca/support/usage/api?key={self.api_key}"

homeassistant/components/text/condition.py

@@ -0,0 +1,63 @@
+"""Provides conditions for texts."""
+
+import voluptuous as vol
+
+from homeassistant.components.input_text import DOMAIN as INPUT_TEXT_DOMAIN
+from homeassistant.const import CONF_OPTIONS, CONF_TARGET
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.condition import (
+    ATTR_BEHAVIOR,
+    BEHAVIOR_ALL,
+    BEHAVIOR_ANY,
+    Condition,
+    ConditionConfig,
+    EntityConditionBase,
+)
+
+from .const import DOMAIN
+
+CONF_VALUE = "value"
+
+_TEXT_CONDITION_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_TARGET): cv.TARGET_FIELDS,
+        vol.Required(CONF_OPTIONS): {
+            vol.Required(ATTR_BEHAVIOR, default=BEHAVIOR_ANY): vol.In(
+                [BEHAVIOR_ANY, BEHAVIOR_ALL]
+            ),
+            vol.Required(CONF_VALUE): cv.string,
+        },
+    }
+)
+
+
+class TextIsEqualToCondition(EntityConditionBase):
+    """Condition for text entity value matching."""
+
+    _domain_specs = {
+        DOMAIN: DomainSpec(),
+        INPUT_TEXT_DOMAIN: DomainSpec(),
+    }
+    _schema = _TEXT_CONDITION_SCHEMA
+
+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize condition."""
+        super().__init__(hass, config)
+        assert config.options
+        self._value: str = config.options[CONF_VALUE]
+
+    def is_valid_state(self, entity_state: State) -> bool:
+        """Check if the state matches the expected value."""
+        return entity_state.state == self._value
+
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_equal_to": TextIsEqualToCondition,
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the text conditions."""
+    return CONDITIONS

homeassistant/components/text/conditions.yaml

@@ -0,0 +1,19 @@
+is_equal_to:
+  target:
+    entity:
+      - domain: text
+      - domain: input_text
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+    value:
+      required: true
+      selector:
+        text:

homeassistant/components/text/icons.json

@@ -1,4 +1,9 @@
 {
+  "conditions": {
+    "is_equal_to": {
+      "condition": "mdi:form-textbox"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:form-textbox"

homeassistant/components/text/strings.json

@@ -1,4 +1,24 @@
 {
+  "common": {
+    "condition_behavior_description": "The behavior of the targeted texts to check.",
+    "condition_behavior_name": "Behavior"
+  },
+  "conditions": {
+    "is_equal_to": {
+      "description": "Tests if one or more texts are equal to a specified value.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::text::common::condition_behavior_description%]",
+          "name": "[%key:component::text::common::condition_behavior_name%]"
+        },
+        "value": {
+          "description": "The value to compare the text to.",
+          "name": "Value"
+        }
+      },
+      "name": "Text is equal to"
+    }
+  },
   "device_automation": {
     "action_type": {
       "set_value": "Set value for {entity_name}"
@@ -30,6 +50,14 @@
       }
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    }
+  },
   "services": {
     "set_value": {
       "description": "Sets the value.",

homeassistant/components/victron_ble/config_flow.py

@@ -66,7 +66,6 @@ class VictronBLEConfigFlow(ConfigFlow, domain=DOMAIN):
         discovery_info = self._discovered_devices_info[self._discovered_device]
         title = discovery_info.name
 
-        errors: dict[str, str] = {}
         if user_input is not None:
             # see if we can create a device with the access token
             device = VictronBluetoothDeviceData(user_input[CONF_ACCESS_TOKEN])
@@ -77,13 +76,12 @@ class VictronBLEConfigFlow(ConfigFlow, domain=DOMAIN):
                     title=title,
                     data=user_input,
                 )
-            errors["base"] = "invalid_access_token"
+            return self.async_abort(reason="invalid_access_token")
 
         return self.async_show_form(
             step_id="access_token",
             data_schema=STEP_ACCESS_TOKEN_DATA_SCHEMA,
             description_placeholders={"title": title},
-            errors=errors,
         )
 
     async def async_step_user(

homeassistant/components/victron_ble/manifest.json

@@ -15,5 +15,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "quality_scale": "bronze",
-  "requirements": ["victron-ble-ha-parser==0.6.2"]
+  "requirements": ["victron-ble-ha-parser==0.6.1"]
 }

homeassistant/components/victron_ble/strings.json

@@ -8,11 +8,9 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "invalid_access_token": "Invalid encryption key for instant readout",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     },
-    "error": {
-      "invalid_access_token": "Invalid encryption key for instant readout"
-    },
     "flow_title": "{title}",
     "step": {
       "access_token": {

homeassistant/components/volvo/coordinator.py

@@ -186,7 +186,7 @@ class VolvoBaseCoordinator(DataUpdateCoordinator[CoordinatorData]):
     async def _async_determine_api_calls(
         self,
     ) -> list[Callable[[], Coroutine[Any, Any, Any]]]:
-        """Determine which API calls to make for this coordinator."""
+        raise NotImplementedError
 
 
 class VolvoVerySlowIntervalCoordinator(VolvoBaseCoordinator):

homeassistant/components/weatherflow/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["pyweatherflowudp"],
-  "requirements": ["pyweatherflowudp==1.5.2"]
+  "requirements": ["pyweatherflowudp==1.5.0"]
 }

homeassistant/components/window/condition.py

@@ -1,29 +0,0 @@
-"""Provides conditions for windows."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.cover import (
-    DOMAIN as COVER_DOMAIN,
-    CoverDeviceClass,
-    make_cover_is_closed_condition,
-    make_cover_is_open_condition,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.condition import Condition
-
-DEVICE_CLASSES_WINDOW: dict[str, str] = {
-    BINARY_SENSOR_DOMAIN: BinarySensorDeviceClass.WINDOW,
-    COVER_DOMAIN: CoverDeviceClass.WINDOW,
-}
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_closed": make_cover_is_closed_condition(device_classes=DEVICE_CLASSES_WINDOW),
-    "is_open": make_cover_is_open_condition(device_classes=DEVICE_CLASSES_WINDOW),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for windows."""
-    return CONDITIONS

homeassistant/components/window/conditions.yaml

@@ -1,28 +0,0 @@
-.condition_common_fields: &condition_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
-
-is_closed:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: window
-      - domain: cover
-        device_class: window
-
-is_open:
-  fields: *condition_common_fields
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: window
-      - domain: cover
-        device_class: window

homeassistant/components/window/icons.json

@@ -1,12 +1,4 @@
 {
-  "conditions": {
-    "is_closed": {
-      "condition": "mdi:window-closed"
-    },
-    "is_open": {
-      "condition": "mdi:window-open"
-    }
-  },
   "triggers": {
     "closed": {
       "trigger": "mdi:window-closed"

homeassistant/components/window/strings.json

@@ -1,39 +1,9 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted windows.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted windows to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_closed": {
-      "description": "Tests if one or more windows are closed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::window::common::condition_behavior_description%]",
-          "name": "[%key:component::window::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Window is closed"
-    },
-    "is_open": {
-      "description": "Tests if one or more windows are open.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::window::common::condition_behavior_description%]",
-          "name": "[%key:component::window::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Window is open"
-    }
-  },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/ws66i/media_player.py

@@ -55,7 +55,6 @@ class Ws66iZone(CoordinatorEntity[Ws66iDataUpdateCoordinator], MediaPlayerEntity
         | MediaPlayerEntityFeature.TURN_OFF
         | MediaPlayerEntityFeature.SELECT_SOURCE
     )
-    _attr_volume_step = 1 / MAX_VOL
 
     def __init__(
         self,
@@ -148,6 +147,20 @@ class Ws66iZone(CoordinatorEntity[Ws66iDataUpdateCoordinator], MediaPlayerEntity
         await self.hass.async_add_executor_job(self._set_volume, int(volume * MAX_VOL))
         self._async_update_attrs_write_ha_state()
 
+    async def async_volume_up(self) -> None:
+        """Volume up the media player."""
+        await self.hass.async_add_executor_job(
+            self._set_volume, min(self._status.volume + 1, MAX_VOL)
+        )
+        self._async_update_attrs_write_ha_state()
+
+    async def async_volume_down(self) -> None:
+        """Volume down media player."""
+        await self.hass.async_add_executor_job(
+            self._set_volume, max(self._status.volume - 1, 0)
+        )
+        self._async_update_attrs_write_ha_state()
+
     def _set_volume(self, volume: int) -> None:
         """Set the volume of the media player."""
         # Can't set a new volume level when this zone is muted.

homeassistant/components/zinvolt/binary_sensor.py

@@ -3,6 +3,8 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
+from zinvolt.models import BatteryState
+
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -12,25 +14,15 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import ZinvoltConfigEntry, ZinvoltData, ZinvoltDeviceCoordinator
+from .coordinator import ZinvoltConfigEntry, ZinvoltDeviceCoordinator
 from .entity import ZinvoltEntity
 
-POINT_ENTITIES = {
-    "communication": BinarySensorDeviceClass.PROBLEM,
-    "voltage": BinarySensorDeviceClass.PROBLEM,
-    "current": BinarySensorDeviceClass.PROBLEM,
-    "temperature": BinarySensorDeviceClass.HEAT,
-    "charge": BinarySensorDeviceClass.PROBLEM,
-    "discharge": BinarySensorDeviceClass.PROBLEM,
-    "other": BinarySensorDeviceClass.PROBLEM,
-}
-
 
 @dataclass(kw_only=True, frozen=True)
 class ZinvoltBatteryStateDescription(BinarySensorEntityDescription):
     """Binary sensor description for Zinvolt battery state."""
 
-    is_on_fn: Callable[[ZinvoltData], bool]
+    is_on_fn: Callable[[BatteryState], bool]
 
 
 SENSORS: tuple[ZinvoltBatteryStateDescription, ...] = (
@@ -39,7 +31,7 @@ SENSORS: tuple[ZinvoltBatteryStateDescription, ...] = (
         translation_key="on_grid",
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=BinarySensorDeviceClass.CONNECTIVITY,
-        is_on_fn=lambda state: state.battery.current_power.on_grid,
+        is_on_fn=lambda state: state.current_power.on_grid,
     ),
 )
 
@@ -51,18 +43,11 @@ async def async_setup_entry(
 ) -> None:
     """Initialize the entries."""
 
-    entities: list[BinarySensorEntity] = [
+    async_add_entities(
         ZinvoltBatteryStateBinarySensor(coordinator, description)
         for description in SENSORS
         for coordinator in entry.runtime_data.values()
-    ]
-    entities.extend(
-        ZinvoltPointBinarySensor(coordinator, point)
-        for coordinator in entry.runtime_data.values()
-        for point in coordinator.data.points
-        if point in POINT_ENTITIES
     )
-    async_add_entities(entities)
 
 
 class ZinvoltBatteryStateBinarySensor(ZinvoltEntity, BinarySensorEntity):
@@ -78,35 +63,9 @@ class ZinvoltBatteryStateBinarySensor(ZinvoltEntity, BinarySensorEntity):
         """Initialize the binary sensor."""
         super().__init__(coordinator)
         self.entity_description = description
-        self._attr_unique_id = (
-            f"{coordinator.data.battery.serial_number}.{description.key}"
-        )
+        self._attr_unique_id = f"{coordinator.data.serial_number}.{description.key}"
 
     @property
     def is_on(self) -> bool:
         """Return the state of the binary sensor."""
         return self.entity_description.is_on_fn(self.coordinator.data)
-
-
-class ZinvoltPointBinarySensor(ZinvoltEntity, BinarySensorEntity):
-    """Zinvolt battery state binary sensor."""
-
-    _attr_entity_category = EntityCategory.DIAGNOSTIC
-
-    def __init__(self, coordinator: ZinvoltDeviceCoordinator, point: str) -> None:
-        """Initialize the binary sensor."""
-        super().__init__(coordinator)
-        self.point = point
-        self._attr_translation_key = point
-        self._attr_device_class = POINT_ENTITIES[point]
-        self._attr_unique_id = f"{coordinator.data.battery.serial_number}.{point}"
-
-    @property
-    def available(self) -> bool:
-        """Return the availability of the binary sensor."""
-        return super().available and self.point in self.coordinator.data.points
-
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the binary sensor."""
-        return not self.coordinator.data.points[self.point]

homeassistant/components/zinvolt/coordinator.py

@@ -1,6 +1,5 @@
 """Coordinator for Zinvolt."""
 
-from dataclasses import dataclass
 from datetime import timedelta
 import logging
 
@@ -19,17 +18,7 @@ _LOGGER = logging.getLogger(__name__)
 type ZinvoltConfigEntry = ConfigEntry[dict[str, ZinvoltDeviceCoordinator]]
 
 
-@dataclass
-class ZinvoltData:
-    """Data for the Zinvolt integration."""
-
-    battery: BatteryState
-    sw_version: str
-    model: str
-    points: dict[str, bool]
-
-
-class ZinvoltDeviceCoordinator(DataUpdateCoordinator[ZinvoltData]):
+class ZinvoltDeviceCoordinator(DataUpdateCoordinator[BatteryState]):
     """Class for Zinvolt devices."""
 
     def __init__(
@@ -50,23 +39,12 @@ class ZinvoltDeviceCoordinator(DataUpdateCoordinator[ZinvoltData]):
         self.battery = battery
         self.client = client
 
-    async def _async_update_data(self) -> ZinvoltData:
+    async def _async_update_data(self) -> BatteryState:
         """Update data from Zinvolt."""
         try:
-            battery_state = await self.client.get_battery_status(
-                self.battery.identifier
-            )
-            battery_unit = await self.client.get_battery_unit(
-                self.battery.identifier, self.battery.serial_number
-            )
+            return await self.client.get_battery_status(self.battery.identifier)
         except ZinvoltError as err:
             raise UpdateFailed(
                 translation_key="update_failed",
                 translation_domain=DOMAIN,
             ) from err
-        return ZinvoltData(
-            battery_state,
-            battery_unit.version.current_version,
-            battery_unit.battery_model,
-            {point.point.lower(): point.normal for point in battery_unit.points},
-        )

homeassistant/components/zinvolt/diagnostics.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from dataclasses import asdict
 from typing import Any
 
 from homeassistant.core import HomeAssistant
@@ -17,7 +16,7 @@ async def async_get_config_entry_diagnostics(
     return {
         "coordinators": [
             {
-                coordinator.battery.identifier: asdict(coordinator.data),
+                coordinator.battery.identifier: coordinator.data.to_dict(),
             }
             for coordinator in entry.runtime_data.values()
         ],

homeassistant/components/zinvolt/entity.py

@@ -16,10 +16,8 @@ class ZinvoltEntity(CoordinatorEntity[ZinvoltDeviceCoordinator]):
         """Initialize the entity."""
         super().__init__(coordinator)
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, coordinator.data.battery.serial_number)},
+            identifiers={(DOMAIN, coordinator.data.serial_number)},
             manufacturer="Zinvolt",
             name=coordinator.battery.name,
-            serial_number=coordinator.data.battery.serial_number,
-            model_id=coordinator.data.model,
-            sw_version=coordinator.data.sw_version,
+            serial_number=coordinator.data.serial_number,
         )

homeassistant/components/zinvolt/number.py

@@ -4,6 +4,7 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 
 from zinvolt import ZinvoltClient
+from zinvolt.models import BatteryState
 
 from homeassistant.components.number import (
     NumberDeviceClass,
@@ -14,7 +15,7 @@ from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfPower, UnitOfT
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import ZinvoltConfigEntry, ZinvoltData, ZinvoltDeviceCoordinator
+from .coordinator import ZinvoltConfigEntry, ZinvoltDeviceCoordinator
 from .entity import ZinvoltEntity
 
 
@@ -22,8 +23,8 @@ from .entity import ZinvoltEntity
 class ZinvoltBatteryStateDescription(NumberEntityDescription):
     """Number description for Zinvolt battery state."""
 
-    max_fn: Callable[[ZinvoltData], int] | None = None
-    value_fn: Callable[[ZinvoltData], int]
+    max_fn: Callable[[BatteryState], int] | None = None
+    value_fn: Callable[[BatteryState], int]
     set_value_fn: Callable[[ZinvoltClient, str, int], Awaitable[None]]
 
 
@@ -34,19 +35,19 @@ NUMBERS: tuple[ZinvoltBatteryStateDescription, ...] = (
         entity_category=EntityCategory.CONFIG,
         device_class=NumberDeviceClass.POWER,
         native_unit_of_measurement=UnitOfPower.WATT,
-        value_fn=lambda state: state.battery.global_settings.max_output,
+        value_fn=lambda state: state.global_settings.max_output,
         set_value_fn=lambda client, battery_id, value: client.set_max_output(
             battery_id, value
         ),
         native_min_value=0,
-        max_fn=lambda state: state.battery.global_settings.max_output_limit,
+        max_fn=lambda state: state.global_settings.max_output_limit,
     ),
     ZinvoltBatteryStateDescription(
         key="upper_threshold",
         translation_key="upper_threshold",
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda state: state.battery.global_settings.battery_upper_threshold,
+        value_fn=lambda state: state.global_settings.battery_upper_threshold,
         set_value_fn=lambda client, battery_id, value: client.set_upper_threshold(
             battery_id, value
         ),
@@ -58,7 +59,7 @@ NUMBERS: tuple[ZinvoltBatteryStateDescription, ...] = (
         translation_key="lower_threshold",
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda state: state.battery.global_settings.battery_lower_threshold,
+        value_fn=lambda state: state.global_settings.battery_lower_threshold,
         set_value_fn=lambda client, battery_id, value: client.set_lower_threshold(
             battery_id, value
         ),
@@ -71,7 +72,7 @@ NUMBERS: tuple[ZinvoltBatteryStateDescription, ...] = (
         entity_category=EntityCategory.CONFIG,
         native_unit_of_measurement=UnitOfTime.MINUTES,
         device_class=NumberDeviceClass.DURATION,
-        value_fn=lambda state: state.battery.global_settings.standby_time,
+        value_fn=lambda state: state.global_settings.standby_time,
         set_value_fn=lambda client, battery_id, value: client.set_standby_time(
             battery_id, value
         ),
@@ -108,9 +109,7 @@ class ZinvoltBatteryStateNumber(ZinvoltEntity, NumberEntity):
         """Initialize the number."""
         super().__init__(coordinator)
         self.entity_description = description
-        self._attr_unique_id = (
-            f"{coordinator.data.battery.serial_number}.{description.key}"
-        )
+        self._attr_unique_id = f"{coordinator.data.serial_number}.{description.key}"
 
     @property
     def native_max_value(self) -> float:

homeassistant/components/zinvolt/sensor.py

@@ -3,6 +3,8 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
+from zinvolt.models import BatteryState
+
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
@@ -13,7 +15,7 @@ from homeassistant.const import PERCENTAGE, UnitOfPower
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import ZinvoltConfigEntry, ZinvoltData, ZinvoltDeviceCoordinator
+from .coordinator import ZinvoltConfigEntry, ZinvoltDeviceCoordinator
 from .entity import ZinvoltEntity
 
 
@@ -21,7 +23,7 @@ from .entity import ZinvoltEntity
 class ZinvoltBatteryStateDescription(SensorEntityDescription):
     """Sensor description for Zinvolt battery state."""
 
-    value_fn: Callable[[ZinvoltData], float]
+    value_fn: Callable[[BatteryState], float]
 
 
 SENSORS: tuple[ZinvoltBatteryStateDescription, ...] = (
@@ -30,14 +32,14 @@ SENSORS: tuple[ZinvoltBatteryStateDescription, ...] = (
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda state: state.battery.current_power.state_of_charge,
+        value_fn=lambda state: state.current_power.state_of_charge,
     ),
     ZinvoltBatteryStateDescription(
         key="power",
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfPower.WATT,
-        value_fn=lambda state: 0 - state.battery.current_power.power_socket_output,
+        value_fn=lambda state: 0 - state.current_power.power_socket_output,
     ),
 )
 
@@ -69,9 +71,7 @@ class ZinvoltBatteryStateSensor(ZinvoltEntity, SensorEntity):
         """Initialize the sensor."""
         super().__init__(coordinator)
         self.entity_description = description
-        self._attr_unique_id = (
-            f"{coordinator.data.battery.serial_number}.{description.key}"
-        )
+        self._attr_unique_id = f"{coordinator.data.serial_number}.{description.key}"
 
     @property
     def native_value(self) -> float:

homeassistant/components/zinvolt/strings.json

@@ -26,26 +26,8 @@
   },
   "entity": {
     "binary_sensor": {
-      "charge": {
-        "name": "Charge"
-      },
-      "communication": {
-        "name": "Communication"
-      },
-      "current": {
-        "name": "Current"
-      },
-      "discharge": {
-        "name": "Discharge"
-      },
       "on_grid": {
         "name": "Grid connection"
-      },
-      "other": {
-        "name": "Other problems"
-      },
-      "voltage": {
-        "name": "Voltage"
       }
     },
     "number": {

homeassistant/helpers/selector.py

@@ -1508,7 +1508,6 @@ class StateSelectorConfig(BaseSelectorConfig, total=False):
 
     entity_id: str
     hide_states: list[str]
-    attribute: str
     multiple: bool
 
 
@@ -1531,7 +1530,11 @@ class StateSelector(Selector[StateSelectorConfig]):
         {
             vol.Optional("entity_id"): cv.entity_id,
             vol.Optional("hide_states"): [str],
-            vol.Optional("attribute"): str,
+            # The attribute to filter on, is currently deliberately not
+            # configurable/exposed. We are considering separating state
+            # selectors into two types: one for state and one for attribute.
+            # Limiting the public use, prevents breaking changes in the future.
+            # vol.Optional("attribute"): str,
             vol.Optional("multiple", default=False): cv.boolean,
         }
     )

machine/build.yaml

@@ -0,0 +1,10 @@
+image: ghcr.io/home-assistant/{machine}-homeassistant
+build_from:
+  aarch64: "ghcr.io/home-assistant/aarch64-homeassistant:"
+  amd64: "ghcr.io/home-assistant/amd64-homeassistant:"
+cosign:
+  base_identity: https://github.com/home-assistant/core/.*
+  identity: https://github.com/home-assistant/core/.*
+labels:
+  io.hass.type: core
+  org.opencontainers.image.source: https://github.com/home-assistant/core

machine/generic-x86-64

@@ -1,10 +1,7 @@
-# Automatically generated by hassfest.
-#
-# To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM=ghcr.io/home-assistant/amd64-homeassistant:latest
-FROM ${BUILD_FROM}
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
 
 RUN apk --no-cache add \
     libva-intel-driver
-
-LABEL io.hass.machine="generic-x86-64"

machine/green

@@ -1,7 +1,4 @@
-# Automatically generated by hassfest.
-#
-# To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
-FROM ${BUILD_FROM}
+ARG \
+    BUILD_FROM
 
-LABEL io.hass.machine="green"
+FROM $BUILD_FROM

machine/intel-nuc

@@ -1,10 +1,10 @@
-# Automatically generated by hassfest.
-#
-# To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM=ghcr.io/home-assistant/amd64-homeassistant:latest
-FROM ${BUILD_FROM}
+ARG \
+    BUILD_FROM
+
+FROM $BUILD_FROM
+
+# NOTE: intel-nuc will be replaced by generic-x86-64. Make sure to apply
+# changes in generic-x86-64 as well.
 
 RUN apk --no-cache add \
     libva-intel-driver
-
-LABEL io.hass.machine="intel-nuc"

machine/khadas-vim3

@@ -1,7 +1,4 @@
-# Automatically generated by hassfest.
-#
-# To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
-FROM ${BUILD_FROM}
+ARG \
+    BUILD_FROM
 
-LABEL io.hass.machine="khadas-vim3"
+FROM $BUILD_FROM

machine/odroid-c2

@@ -1,7 +1,4 @@
-# Automatically generated by hassfest.
-#
-# To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
-FROM ${BUILD_FROM}
+ARG \
+    BUILD_FROM
 
-LABEL io.hass.machine="odroid-c2"
+FROM $BUILD_FROM

machine/odroid-c4

@@ -1,7 +1,4 @@
-# Automatically generated by hassfest.
-#
-# To update, run python3 -m script.hassfest -p docker
-ARG BUILD_FROM=ghcr.io/home-assistant/aarch64-homeassistant:latest
-FROM ${BUILD_FROM}
+ARG \
+    BUILD_FROM
 
-LABEL io.hass.machine="odroid-c4"
+FROM $BUILD_FROM