Fix TOD incorrectly determining the state between sunrise and sunset

[nvx]

Proposed change

The changes made in PR #30199 which contains fixes for #24577 and #21974 were accidentally reverted in #48573 which has caused the time of day component to show an incorrect state after home assistant restarts in some situations, for example as per #50315

This PR is just a cherry-pick of the commit from #30199 to re-apply the same fix.

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)
• 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 Times of the Day broken #50315
• This PR is related to issue: Fix TOD component incorrectly determining the state between sunrise and sunset #30199 Home Assistant loses TOD sensors state after restart. #24577 tod time of day incorrectly state between sunset and sunrise #21974 Upgrade Astral to 2.2 #48573
• 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
• The code has been formatted using Black (black --fast homeassistant tests)
• Tests have been added to verify that the new code works.

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

The integration reached or maintains the following Integration Quality Scale:

• No score or internal
• 🥈 Silver
• 🥇 Gold
• 🏆 Platinum

To help with the load of incoming pull requests:

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

[nvx]

Looks like I'll need to update the previous patch a little. Was hoping it'd be a simple cherry-pick only.

[homeassistant]

Hi @nvx,

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

[nvx]

Seems to run fine now with the trivial edit on the original cherry-picked commit and confirmed locally the issue is resolved.

Is it fine to be merged as-is, otherwise I can squash the two commits into one if that's preferred.

[nvx]

Strangely running black locally didn't complain, but the CI workflow didn't like it. Guessing I'm not running black with the right config locally? https://developers.home-assistant.io/blog/2019/07/31/black/ didn't indicate much

[nvx]

Finally sorted out my environment, turns out I was on the wrong branch running black and unit tests hence thinking it was working.

I've also added a unit test now that fails without this fix, but succeeds with the fix enabled.

I squashed all of my commits into a single commit, but I left the original cherry-picked commit to retain author information.

[MartinHjelmare]

Thanks!