Bump ZHA to 1.4.0 by puddly · Pull Request #172357 · home-assistant/core

puddly · 2026-05-27T14:09:54Z

Proposed change

This PR bumps ZHA from 1.3.1 to 1.4.0.

This is a major internal refactor of ZHA that more tightly couples entities to clusters. It should not result in any user-visible changes.

Type of change

Dependency upgrade
Bugfix (non-breaking change which fixes an issue)
New integration (thank you!)
New feature (which adds functionality to an existing integration)
Deprecation (breaking change to happen in the future)
Breaking change (fix/feature causing existing functionality to break)
Code quality improvements to existing code or addition of tests

Additional information

This PR fixes or closes issue: fixes #
This PR is related to issue:
Link to documentation pull request:
Link to developer documentation pull request:
Link to frontend pull request:

Checklist

I understand the code I am submitting and can explain how it works.
The code change is tested and works locally.
Local tests pass. Your PR cannot be merged unless tests pass
There is no commented out code in this PR.
I have followed the development checklist
I have followed the perfect PR recommendations
The code has been formatted using Ruff (ruff format homeassistant tests)
Tests have been added to verify that the new code works.
Any generated code has been carefully reviewed for correctness and compliance with project standards.

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated for www.home-assistant.io

If the code communicates with devices, web services, or third-party tools:

The manifest file has all fields filled out correctly.
Updated and included derived files by running: python3 -m script.hassfest.
New or updated dependencies have been added to requirements_all.txt.
Updated by running python3 -m script.gen_requirements_all.
For the updated dependencies a diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

To help with the load of incoming pull requests:

I have reviewed two other open pull requests in this repository.

home-assistant · 2026-05-27T14:10:12Z

Hey there @dmulcahey, @Adminiuga, @TheJulianJES, mind taking a look at this pull request as it has been labeled with an integration (zha) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of zha can trigger bot actions by commenting:

@home-assistant close Closes the pull request.
@home-assistant mark-draft Mark the pull request as draft.
@home-assistant ready-for-review Remove the draft status from the pull request.
@home-assistant rename Awesome new title Renames the pull request.
@home-assistant reopen Reopen the pull request.
@home-assistant unassign zha Removes the current integration label and assignees on the pull request, add the integration domain after the command.
@home-assistant update-branch Update the pull request branch with the base branch.
@home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) to the pull request.
@home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) on the pull request.

Copilot

Pull request overview

This pull request bumps the ZHA dependency to 1.4.0 and updates the Home Assistant ZHA integration and tests to align with ZHA’s refactored entity/cluster model.

Changes:

Bump zha from 1.3.1 to 1.4.0 across manifest and consolidated requirements.
Update ZHA siren/websocket reconfigure plumbing and device actions to match the new ZHA library APIs.
Refresh ZHA tests and diagnostics snapshots for the new library output/behavior.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
tests/components/zha/test_websocket_api.py	Updates test events and handler calls for the new device/cluster reconfigure events.
tests/components/zha/test_siren.py	Updates siren tests to use new ZHA siren enums and expected IAS WD request kwargs.
tests/components/zha/test_device_action.py	Adjusts action test to emit events via zigpy cluster listeners instead of cluster handlers.
tests/components/zha/test_cover.py	Updates cover test expectations for attribute reads under the new ZHA behavior.
tests/components/zha/snapshots/test_diagnostics.ambr	Updates diagnostics snapshot output/version for ZHA 1.4.0.
requirements_all.txt	Bumps pinned `zha` version to 1.4.0.
homeassistant/components/zha/websocket_api.py	Adapts websocket/admin services and schemas to new siren/platform APIs and reconfigure signal.
homeassistant/components/zha/siren.py	Switches siren tone constants to ZHA-provided enums.
homeassistant/components/zha/manifest.json	Bumps integration requirement to `zha==1.4.0`.
homeassistant/components/zha/helpers.py	Refactors reconfigure event forwarding and filters virtual platform entities; improves error translation.
homeassistant/components/zha/device_action.py	Reworks available actions and execution to use cluster IDs and zigpy/zhaquirks types.
homeassistant/components/zha/const.py	Adds dispatcher signal constant for device reconfigure progress events.

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 4 comments.

@@ -73,24 +65,18 @@
    DEFAULT_ACTION_SCHEMA,
 )

-DEVICE_ACTIONS = {
-    CLUSTER_HANDLER_IAS_WD: [
+# Maps a cluster_id the device must expose to the available actions.
+DEVICE_ACTIONS_BY_CLUSTER_ID: dict[int, list[dict[str, str]]] = {
+    IasWd.cluster_id: [
        {CONF_TYPE: ACTION_SQUAWK, CONF_DOMAIN: DOMAIN},
        {CONF_TYPE: ACTION_WARN, CONF_DOMAIN: DOMAIN},
    ],
-    CLUSTER_HANDLER_INOVELLI: [
+    INOVELLI_CLUSTER_ID: [
        {CONF_TYPE: INOVELLI_ALL_LED_EFFECT, CONF_DOMAIN: DOMAIN},
        {CONF_TYPE: INOVELLI_INDIVIDUAL_LED_EFFECT, CONF_DOMAIN: DOMAIN},
    ],
 }


Copilot

Pull request overview

Copilot reviewed 24 out of 24 changed files in this pull request and generated 1 comment.

TheJulianJES

Everything still seems to work fine. Changes look good. The hassfest icon regeneratiron test failure is unrelated and also fails on dev

puddly · 2026-05-27T16:12:51Z

@frenck Can we get this PR into the beta as well? Or do you want it in b1? I just merged dev for the hassfest fix.

Copilot

Pull request overview

Copilot reviewed 24 out of 24 changed files in this pull request and generated 1 comment.

frenck · 2026-05-27T20:55:02Z

@frenck Can we get this PR into the beta as well? Or do you want it in b1? I just merged dev for the hassfest fix.

Sorry, didn't notice that one. B1, as B0 was not possible for me to wait any longer.

../Frenck

puddly added 8 commits May 27, 2026 09:20

Account for virtual entities

7f06531

WIP

3d14481

Use ZHA entity methods instead of helper functions for siren extensions

d1cb9d0

Clean up device actions

ab789c9

Get tests passing and compatibility with frontend

b9be9d7

Convert zigpy exceptions into Core exceptions

68234b5

Bump ZHA to 1.4.0

b424758

Fix up after rebase

85491f0

puddly added this to the 2026.6.0b0 milestone May 27, 2026

Copilot AI review requested due to automatic review settings May 27, 2026 14:09

home-assistant Bot assigned dmulcahey, Adminiuga and TheJulianJES May 27, 2026

home-assistant Bot added by-code-owner Quality Scale: No score labels May 27, 2026

Copilot started reviewing on behalf of puddly May 27, 2026 14:10 View session

Copilot AI reviewed May 27, 2026

View reviewed changes

Avoid mutating global actions, per review

ca6b49e

puddly marked this pull request as ready for review May 27, 2026 14:54

Copilot AI review requested due to automatic review settings May 27, 2026 14:54

puddly requested review from Adminiuga and dmulcahey as code owners May 27, 2026 14:54

puddly requested a review from TheJulianJES as a code owner May 27, 2026 14:54

Copilot started reviewing on behalf of puddly May 27, 2026 14:54 View session

Copilot AI reviewed May 27, 2026

View reviewed changes

puddly added 3 commits May 27, 2026 11:13

Make convert_zha_error_to_ha_error a context manager

e5a98ce

Use convert_zha_error_to_ha_error as a context manager

f29f63e

Make it an async context manager

417274a

TheJulianJES approved these changes May 27, 2026

View reviewed changes

Use as an async context manager...

b174d03

Copilot AI review requested due to automatic review settings May 27, 2026 15:22

Copilot started reviewing on behalf of puddly May 27, 2026 15:23 View session

Copilot AI reviewed May 27, 2026

View reviewed changes

Comment thread homeassistant/components/zha/helpers.py

Merge branch 'dev' into puddly/zha-cluster-handler-removal

df99dd6

TheJulianJES approved these changes May 27, 2026

View reviewed changes

frenck modified the milestones: 2026.6.0b0, 2026.6.0 May 27, 2026

Merge branch 'dev' into puddly/zha-cluster-handler-removal

092f121

Copilot AI review requested due to automatic review settings May 27, 2026 16:10

Copilot started reviewing on behalf of puddly May 27, 2026 16:10 View session

Copilot AI reviewed May 27, 2026

View reviewed changes

Comment thread homeassistant/components/zha/device_action.py Outdated

Remove duplicate decorator

77d1db9

frenck approved these changes May 27, 2026

View reviewed changes

frenck merged commit 8cbd358 into home-assistant:dev May 27, 2026
46 of 48 checks passed

TheJulianJES mentioned this pull request May 31, 2026

Bump ZHA to 1.4.1 #172640

Merged

21 tasks

frenck added the cherry-picked label Jun 1, 2026

frenck pushed a commit that referenced this pull request Jun 1, 2026

Bump ZHA to 1.4.0 (#172357)

38f25c4

github-actions Bot locked and limited conversation to collaborators Jun 2, 2026

Uh oh!

Uh oh!

Conversation

puddly commented May 27, 2026

Proposed change

Type of change

Additional information

Checklist

Uh oh!

home-assistant Bot commented May 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

TheJulianJES left a comment

Choose a reason for hiding this comment

Uh oh!

puddly commented May 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

frenck commented May 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants