Merge branch 'main' into dependabot/pip/pytest-asyncio-gte-0.18.3-and…

…-lt-0.21.0

.github/workflows/auto-approve.yml

@@ -0,0 +1,14 @@
+name: Auto approve
+
+on: pull_request_target
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    if: github.actor == 'dependabot[bot]' || github.actor == 'mjmeli'
+    steps:
+      - uses: hmarr/auto-approve-action@v3
+        with:
+          review-message: "Auto approved automated PR"

README.md

@@ -86,7 +86,7 @@ If you want to run the examples, you will need to install extra dependencies.
 
 ```bash
 pip install .[example]
-python example.py
+python examples/example_rest.py
 ```
 
 ## Development
@@ -150,7 +150,7 @@ If you want to debug requests via the Android app, the following general approac
 [maintenance-shield]: https://img.shields.io/badge/maintainer-%40mjmeli-blue.svg?style=for-the-badge
 [pypi-shield]: https://img.shields.io/pypi/v/pyduke-energy?style=for-the-badge
 [pypi]: https://pypi.org/project/pyduke-energy/
-[build-shield]: https://img.shields.io/github/workflow/status/mjmeli/pyduke-energy/Tests?style=for-the-badge
+[build-shield]: https://img.shields.io/github/actions/workflow/status/mjmeli/pyduke-energy/tests.yml?branch=main&style=for-the-badge
 [build]: https://github.com/mjmeli/pyduke-energy/actions/workflows/tests.yaml
 [language-shield]: https://img.shields.io/github/languages/top/mjmeli/pyduke-energy?style=for-the-badge
 [language]: https://github.com/mjmeli/ha-duke-energy-gateway/search?l=python

release.sh

@@ -1,3 +1,4 @@
 rm -rf dist
+pip install -e .[release]
 python3 -m build
 python3 -m twine upload dist/*

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pyduke-energy
-version = 1.0.2
+version = 1.0.3
 author = Michael Meli
 author_email = [email protected]
 description = Python Wrapper for unofficial Duke Energy REST API
@@ -31,15 +31,17 @@ example =
     kafka-python
 test =
     tox
-    pytest~=7.1.1
+    pytest>=7.1.1,<7.3.0
     pytest-asyncio>=0.18.3,<0.21.0
-    pytest-cov~=3.0.0
+    pytest-cov>=3.0,<4.1
     pytest-timeout~=2.1.0
-    black==22.8.0
+    black==22.12.0
     flake8==5.0.4
-    pylint==2.15.0
+    pylint==2.15.9
     pydocstyle==6.1.1
     isort~=5.10.1
+release =
+    twine
 
 [options.packages.find]
 where = src

src/pyduke_energy/const.py

@@ -5,13 +5,17 @@
 IOT_API_BASE_URL = "https://app-core1.de-iot.io/rest/cloud/"
 FASTPOLL_ENDPOINT = "smartmeter/fastpoll/start"
 OAUTH_ENDPOINT = "auth/oauth2/token"
-BASIC_AUTH = "Basic NEdtR3J1M085TEFIV3BMNjVjbWpyZDhtQ1VKZU5XTVo6OWFyZVZoZlM3R2N4UmgzWA=="  # hard-coded from Android app
 SMARTMETER_AUTH_ENDPOINT = "smartmeter/v1/auth"
 ACCT_ENDPOINT = "auth/account-list"
 ACCT_DET_ENDPOINT = "auth/account-details"
 GW_STATUS_ENDPOINT = "gw/gateways/status"
 GW_USAGE_ENDPOINT = "smartmeter/usageByHour"
 
+# hard-coded from Android app
+BASIC_AUTH = (
+    "Basic NEdtR3J1M085TEFIV3BMNjVjbWpyZDhtQ1VKZU5XTVo6OWFyZVZoZlM3R2N4UmgzWA=="
+)
+
 DEFAULT_TIMEOUT = 10  # seconds
 
 MQTT_HOST = "app-core1.de-iot.io"
@@ -28,6 +32,9 @@
 # number of times a message timeout can occur before just reconnecting
 MESSAGE_TIMEOUT_RETRY_COUNT = 3
 
+# number of times a message timeout can occur before we totally give up
+MESSAGE_TIMEOUT_GIVE_UP_COUNT = 10
+
 # in minutes, minimum amount of time to wait before retrying connection on forever loop
 FOREVER_RETRY_MIN_MINUTES = 1
 

src/pyduke_energy/realtime.py

@@ -17,6 +17,7 @@
     FASTPOLL_TIMEOUT_SEC,
     FOREVER_RETRY_MAX_MINUTES,
     FOREVER_RETRY_MIN_MINUTES,
+    MESSAGE_TIMEOUT_GIVE_UP_COUNT,
     MESSAGE_TIMEOUT_RETRY_COUNT,
     MESSAGE_TIMEOUT_SEC,
     MQTT_ENDPOINT,
@@ -291,13 +292,18 @@ async def connect_and_subscribe(self):
                     await asyncio.wait_for(self._rx_msg, MESSAGE_TIMEOUT_SEC)
                     self._msg_retry_count = 0
                     self._forever_retry_count = 0
-                except asyncio.TimeoutError:
+                except asyncio.TimeoutError as toex:
                     self._msg_retry_count += 1
                     if self._disconnected.done():
                         _LOGGER.debug(
                             "Unexpected disconnect detected, attemping reconnect"
                         )
                         await self._reconnect()
+                    elif self._msg_retry_count > MESSAGE_TIMEOUT_GIVE_UP_COUNT:
+                        _LOGGER.error("Too many msg timeouts, giving up")
+                        raise MqttError(
+                            "Reached timeout limit for reconnecting to MQTT"
+                        ) from toex
                     elif self._msg_retry_count > MESSAGE_TIMEOUT_RETRY_COUNT:
                         _LOGGER.debug("Multiple msg timeout, attempting reconnect")
                         await self._reconnect()