Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make WS command backup/generate send events #130524

Merged
merged 3 commits into from
Nov 13, 2024

Conversation

emontnemery
Copy link
Contributor

Proposed change

Make WS command backup/generate send events

Rationale:
Creating a backup may need a very long time to finish. To allow frontend to show progress, we let the command immediately return the backup slug, and then fire off events as the backup job progresses

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:

Checklist

  • 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.

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

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 link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link

Hey there @home-assistant/core, mind taking a look at this pull request as it has been labeled with an integration (backup) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of backup can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign backup Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

Comment on lines +56 to +62
@dataclass(slots=True)
class BackupProgress:
"""Backup progress class."""

done: bool
stage: str | None
success: bool | None
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is inspired by backup job progress fired by supervisor:

event_type: supervisor_event
data:
  event: job
  data:
    name: backup_manager_partial_backup
    reference: a945ac38
    uuid: 6a6ab1807ed64ca18ab1d03fb2fd2282
    progress: 0
    stage: finishing_file
    done: true
    parent_id: null
    errors: []

@@ -127,7 +132,6 @@ async def handle_backup_start(
) -> None:
"""Backup start notification."""
manager = hass.data[DATA_MANAGER]
manager.backing_up = True
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This did not seem to be needed.

Comment on lines -136 to -139
with patch(
"homeassistant.components.backup.manager.BackupManager.async_create_backup",
return_value=TEST_BACKUP,
):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patching is replaced by mocking the backup file creation to better test the cooperation between the WS handler and the backup manager

) -> None:
"""Test generating a backup."""
await setup_backup_integration(hass, with_hassio=with_hassio)

client = await hass_ws_client(hass)
freezer.move_to("2024-11-13 12:01:00+01:00")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Time frozen to make the backup slug stable

Copy link
Member

@MartinHjelmare MartinHjelmare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Some code (the backup service) needs updating.

@emontnemery emontnemery merged commit 093b16c into dev Nov 13, 2024
64 checks passed
@emontnemery emontnemery deleted the backup_generate_backup_events branch November 13, 2024 15:16
@github-actions github-actions bot locked and limited conversation to collaborators Nov 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants