Fix consumption update for live sensor of second zaehlpunkt #233

tschoerk · 2024-05-21T19:36:42Z

When updating the consumption data for the second zaehlerpunkt, the base meter readings don't have the information for this zaehlerpunkt, since it's not the "default" zaehlerpunkt. So the live sensor tries to get the information by checking the consumption data for yesterday to update the sensor with this value. This second method has several bugs though, which this pull request aims to fix.

This should resolve #227

codecov · 2024-08-04T06:21:58Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.06%. Comparing base (02015a3) to head (5f6e847).

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #233      +/-   ##
==========================================
+ Coverage   81.25%   85.06%   +3.81%     
==========================================
  Files           5        5              
  Lines         288      288              
==========================================
+ Hits          234      245      +11     
+ Misses         54       43      -11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

tschoerk · 2024-08-06T07:57:58Z

Both live sensors receive the meter readings the same way now by calling the historical data API with the value type METER_READ which returns the meter reading for each day. The latest value is then used to update the live sensor. This can be done with one or more zaehlpunkte and all return the same value type now, which is the total usage/feeding since implementation of the zaehlpunkt. This fixes the problems with the live sensor on a second zaehlpunkt as well as makes the output uniform.

custom_components/wnsm/base_sensor.py

custom_components/wnsm/live_sensor.py

DarwinsBuddy

could you rebase onto master?
This project follows the pattern of a linear history. 🙃

DarwinsBuddy · 2024-09-27T10:32:29Z

custom_components/wnsm/live_sensor.py

                        )
                        return
            self._available = True
            self._updatets = datetime.now().strftime("%d.%m.%Y %H:%M:%S")
        except TimeoutError as e:
            self._available = False
-            _LOGGER.warning("Error retrieving data from smart meter api - Timeout: %s" % e)
+            _LOGGER.warning(


are these line breaks coming from your setup, or is this a too strict reformatting config?

Which line breaks do you mean? I tried to kept the formatting mostly as it was before, let me know if I missed something. So in this case the multiline warning was kept in the same style as before.

DarwinsBuddy · 2024-09-27T10:32:38Z

custom_components/wnsm/live_sensor.py

-                        )
-                        if yesterdays_sum > 0:
-                            self._state = yesterdays_sum
-                    else:
                        _LOGGER.error("Unable to load consumption")
                        _LOGGER.error(


are these line breaks coming from your setup, or is this a too strict reformatting config?

Same as above

DarwinsBuddy · 2024-09-27T10:33:14Z

tests/it/test_api.py

@@ -301,7 +343,7 @@ def test_verbrauch_raw(requests_mock: Mocker):
    customer_id = "123456789"
    valid_verbrauch_raw_response = verbrauch_raw_response()
    expect_login(requests_mock)
-    expect_history(requests_mock, enabled(zaehlpunkt())['zaehlpunktnummer'])
+    expect_history(requests_mock, customer_id, enabled(zaehlpunkt())['zaehlpunktnummer'])


are these line breaks coming from your setup, or is this a too strict reformatting config?

Which line breaks do you mean here? I have some auto formatting in my setup, but it's fairly limited.

DarwinsBuddy · 2024-10-04T12:03:59Z

@tschoerk I fear you've created another merge commit instead of rebasing the branch onto master. 😬

tschoerk · 2024-10-04T15:06:37Z

@tschoerk I fear you've created another merge commit instead of rebasing the branch onto master. 😬

Sorry not too experienced with git. What to do, to fix this?

DarwinsBuddy · 2024-10-04T19:38:19Z

git checkout DarwinsBuddy main
git pull
git checkout tschoerk bugfix/loadConsumption
git rebase --onto main
resolve all conflicts one commit at a time by
5.1. resolving
5.2. git rebase --continue
5.3. repeat 5.1. until all conflicts are resolved
git push --force-with-lease

!Be careful! Do point 6 after you've successfully confirmed, that this branch is working as you'd expect it, otherwise throw away the branch, check it out anew and rebase again.

This should resolve all conflicts and remove all merge commits that you've introduced

s00500 · 2024-10-06T19:20:29Z

Just tested this PR and it seems to work! I was bothered by this issue forever now... 😅

tschoerk · 2024-10-07T08:12:23Z

Sorry, I probably did something wrong here. I rebased following your instructions and now all my commits in my branch are gone and it's just like main, because I am stupid and did not check properly.
I will create a new branch with the changes, just so it's kept for future reference. Let me know how to best proceed. Sorry for the inconvenience.

DarwinsBuddy · 2024-10-07T09:06:08Z

@tschoerk no worries. when I did my first rebase I also messed it up. :) So that's part of the journey

Maybe something that helps
https://saraford.net/2017/04/21/how-to-visualize-a-rebase-in-the-git-visualization-tool-111/

Just file a new PR with the changes applied. :)

s00500 · 2024-10-07T09:11:02Z

The Rebase tools in VSCode are usually very good :-) (by now it will automatically allow you to continue and understand you are in a rebase) I usually tell all devs on my team to use autorebase+autostash on pull, once you get comfortable with it it is a great workflow ;-)

…

On 7. Oct 2024 at 11:06 +0200, Christoph Spörk ***@***.***>, wrote: @tschoerk no worries. when I did my first rebase I also messed it up. :) So that's part of the journey Maybe something that helps https://saraford.net/2017/04/21/how-to-visualize-a-rebase-in-the-git-visualization-tool-111/ Just file a new PR with the changes applied. :) — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you commented.Message ID: ***@***.***>

This was referenced May 21, 2024

Keine Verbindung seit neuem Einspeisepunkt #232

Closed

two Smartmeters under the same contract. consumption and production #230

Closed

tschoerk mentioned this pull request Jun 13, 2024

Unnamed error in wnsm/live_sensor.py:68 #237

Closed

DarwinsBuddy marked this pull request as draft July 12, 2024 07:27

DarwinsBuddy mentioned this pull request Jul 12, 2024

Protokollfehler - Please file an issue with this error immer um 22:00 #240

Closed

DarwinsBuddy force-pushed the main branch 4 times, most recently from d61df9b to fe27e83 Compare July 12, 2024 08:44

tschoerk mentioned this pull request Jul 12, 2024

Multiple contracts causes issue with live sensor #227

Closed

DarwinsBuddy force-pushed the main branch from fe27e83 to 9659125 Compare July 12, 2024 08:56

tschoerk marked this pull request as ready for review August 6, 2024 07:53

tschoerk mentioned this pull request Sep 18, 2024

"Please file an issue" -> looks like API is returning incomplete data? #259

Closed

DarwinsBuddy requested changes Sep 20, 2024

View reviewed changes

custom_components/wnsm/base_sensor.py Outdated Show resolved Hide resolved

custom_components/wnsm/live_sensor.py Outdated Show resolved Hide resolved

DarwinsBuddy requested changes Sep 27, 2024

View reviewed changes

tschoerk closed this Oct 7, 2024

tschoerk force-pushed the bugfix/loadConsumption branch from 5f6e847 to abb153e Compare October 7, 2024 08:01

tschoerk deleted the bugfix/loadConsumption branch October 7, 2024 08:16

tschoerk restored the bugfix/loadConsumption branch October 7, 2024 08:16

tschoerk mentioned this pull request Oct 7, 2024

Fix consumption update for live sensor of second zaehlpunkt #2 #264

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix consumption update for live sensor of second zaehlpunkt #233

Fix consumption update for live sensor of second zaehlpunkt #233

tschoerk commented May 21, 2024 •

edited

Loading

codecov bot commented Aug 4, 2024 •

edited

Loading

tschoerk commented Aug 6, 2024

DarwinsBuddy left a comment

DarwinsBuddy Sep 27, 2024

tschoerk Oct 1, 2024

DarwinsBuddy Sep 27, 2024

tschoerk Oct 1, 2024

DarwinsBuddy Sep 27, 2024

tschoerk Oct 1, 2024

DarwinsBuddy commented Oct 4, 2024

tschoerk commented Oct 4, 2024

DarwinsBuddy commented Oct 4, 2024 •

edited

Loading

s00500 commented Oct 6, 2024

tschoerk commented Oct 7, 2024 •

edited

Loading

DarwinsBuddy commented Oct 7, 2024

s00500 commented Oct 7, 2024 via email

Fix consumption update for live sensor of second zaehlpunkt #233

Fix consumption update for live sensor of second zaehlpunkt #233

Conversation

tschoerk commented May 21, 2024 • edited Loading

codecov bot commented Aug 4, 2024 • edited Loading

Codecov Report

tschoerk commented Aug 6, 2024

DarwinsBuddy left a comment

Choose a reason for hiding this comment

DarwinsBuddy Sep 27, 2024

Choose a reason for hiding this comment

tschoerk Oct 1, 2024

Choose a reason for hiding this comment

DarwinsBuddy Sep 27, 2024

Choose a reason for hiding this comment

tschoerk Oct 1, 2024

Choose a reason for hiding this comment

DarwinsBuddy Sep 27, 2024

Choose a reason for hiding this comment

tschoerk Oct 1, 2024

Choose a reason for hiding this comment

DarwinsBuddy commented Oct 4, 2024

tschoerk commented Oct 4, 2024

DarwinsBuddy commented Oct 4, 2024 • edited Loading

s00500 commented Oct 6, 2024

tschoerk commented Oct 7, 2024 • edited Loading

DarwinsBuddy commented Oct 7, 2024

s00500 commented Oct 7, 2024 via email

tschoerk commented May 21, 2024 •

edited

Loading

codecov bot commented Aug 4, 2024 •

edited

Loading

DarwinsBuddy commented Oct 4, 2024 •

edited

Loading

tschoerk commented Oct 7, 2024 •

edited

Loading