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

Fix recorder "year" period in leap year #132167

Merged
merged 5 commits into from
Dec 4, 2024

Conversation

peteh
Copy link
Contributor

@peteh peteh commented Dec 3, 2024

Proposed change

In leap years the statistic card is omitting December from the data.

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

The calculation for the end data is wrong in leap years when using a statistic card with period set to "year".
The algorithm gets the 01.01. of the year, then adds 365 days and replaces the day with the 1st again.
Thus in a leap year we would add 365 days resulting in the 31st of December in the current year rather than the 1st of January of the next year. In leap years this always results in 01.12.CURRENT_YEAR instead of 01.01.NEXTYEAR.
There might be better solutions to fix it, e.g. calculating current year and then just create an actual period by hard setting day, month and year as a period but I think this should work reliably too.

For 2024

Before the fix:
start: 2024-01-01
end: 2024-12-01

After fix:
start: 2024-01-01
end: 2025-01-01

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

home-assistant bot commented Dec 3, 2024

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

Code owner commands

Code owners of recorder 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 recorder 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.

@MartinHjelmare MartinHjelmare changed the title FIX: make "year" period work in leap year Fix recorder "year" period in leap year Dec 3, 2024
@epenet epenet added this to the 2024.12.0 milestone Dec 3, 2024
@frenck frenck force-pushed the fix/leap_year_year_statistics branch 2 times, most recently from 9a03f0d to f3cf0f6 Compare December 3, 2024 14:34
@emontnemery emontnemery marked this pull request as draft December 4, 2024 09:05
@emontnemery
Copy link
Contributor

@peteh Can you please give some more details about the fix?

You mention:

In leap years the statistic card is omitting December from the data.

Could you give an example with and without your fix please?

@emontnemery
Copy link
Contributor

emontnemery commented Dec 4, 2024

Set to draft until this is covered by tests, I'll update the PR with tests shortly

@peteh
Copy link
Contributor Author

peteh commented Dec 4, 2024

@peteh Can you please give some more details about the fix?

You mention:

In leap years the statistic card is omitting December from the data.

Could you give an example with and without your fix please?

Sure thing,

When you set period to "Year" in a statistic card, it does not take December into the statistic anymore if the year is a leap year.

Broken Setting (Year setting does not take values from this December into account during a leap year - 2024 is a leap year):
image

Workaround: use fixed_period setting in card
image

When fixing the bug, both period "year" and fixed period show the same:
image

It's easier to understand when you walk through this part of the code...

... actually when doing that to answer your question I stumbled on another issue in the same lines of code. One could argue positive offsets are pointless though, as you cannot make statistics for the future, for negative offset the code works well enough for several hundred years as the original comment suggests.

else:  # calendar_period = "year"
            start_time = start_of_day.replace(month=12, day=31) # take current day of year and set the date to the end of the year
            # This works for 100+ years of offset
            start_time = (start_time + timedelta(days=cal_offset * 366)).replace(
                month=1, day=1
            ) #  here actually seems to be another bug - adding 366 will overshoot by 1 in the first year if offset = 1
            end_time = (start_time + timedelta(days=366)).replace(day=1) # here we replaced 365 by 366 as the fix

Looks like I just identified another bug. I didn't want to rewrite it completely because I don't know how to develop properly for homeassistant. I just fixed my original issue and mounted the file into my docker container to test it.

I don't know how to write proper tests for homeassistant to cover the change.
I think a better solution would be to get time of day, set the start date to 01.01 and end date to 31.12. and then just add the offset to the year rather than doing these weird day calculations with adding or subtracting days of the original code.

In hindsight I believe the approach to this problem for all periods in the original code is very error prone and partly incorrect.

@emontnemery
Copy link
Contributor

I think a better solution would be to get time of day, set the start date to 01.01 and end date to 31.12. and then just add the offset to the year rather than doing these weird day calculations with adding or subtracting days of the original code.

The reason the code doesn't do that is that Python stdlib does not support timedeltas specified as weeks, months or years, probably because the meaning of that would not always be clear.

@emontnemery emontnemery marked this pull request as ready for review December 4, 2024 09:50
Copy link
Contributor

@emontnemery emontnemery left a comment

Choose a reason for hiding this comment

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

Thanks a lot @peteh 👍

@emontnemery
Copy link
Contributor

seems to be another bug - adding 366 will overshoot by 1 in the first year if offset = 1

We should fix that, but it's not crucial because positive periods are not useful for statistics. I'll do it in a follow-up PR.

@peteh Are you active on Discord?

@peteh
Copy link
Contributor Author

peteh commented Dec 4, 2024

@emontnemery saw your comment a bit late. I updated the PR with a proper fix.

I'm in discord but irregularly. My profile name there should be async or asyncpt if you want to reach out.

@peteh peteh force-pushed the fix/leap_year_year_statistics branch from 82a1bd2 to 06aba46 Compare December 4, 2024 11:11
@emontnemery
Copy link
Contributor

Your latest commit is not correct, the year now ends at midnight December 31st instead of at midnight January 1st.
Let's revert that commit so we have a working end of year period in today's release, then we have time to make a nicer solution in the future 👍

@emontnemery emontnemery merged commit a417d3d into home-assistant:dev Dec 4, 2024
59 of 60 checks passed
frenck pushed a commit that referenced this pull request Dec 4, 2024
* FIX: make "year" period work in leap year

* Add test

* Set second and microsecond to non-zero in test start times

* FIX: better fix for leap year problem

* Revert "FIX: better fix for leap year problem"

This reverts commit 06aba46.

---------

Co-authored-by: Erik <[email protected]>
zweckj pushed a commit to zweckj/home-assistant-core that referenced this pull request Dec 5, 2024
* FIX: make "year" period work in leap year

* Add test

* Set second and microsecond to non-zero in test start times

* FIX: better fix for leap year problem

* Revert "FIX: better fix for leap year problem"

This reverts commit 06aba46.

---------

Co-authored-by: Erik <[email protected]>
@github-actions github-actions bot locked and limited conversation to collaborators Dec 5, 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.

Max value does not update in December if set to "this Year" and this year is Leap year
4 participants