Merge pull request fronzbot#1131 from fronzbot/dev

v0.24.1

Author: fronzbot

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         platform:
           - ubuntu-latest
-        python-version: ['3.11']
+        python-version: ['3.12']
     steps:
     - name: Check out code from GitHub
       uses: actions/checkout@v3

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
     - uses: actions/checkout@v4

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: '3.12'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         platform:
           - ubuntu-latest
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     steps:
     - name: Check out code from GitHub
       uses: actions/checkout@v3

README.rst

@@ -6,9 +6,6 @@ Like the library? Consider buying me a cup of coffee!
 
 `Buy me a Coffee! <https://buymeacoffee.com/kevinfronczak>`__
 
-**BREAKING CHANGE WARNING:**
-As of ``0.22.0`` the library uses asyncio which will break any user scripts used prior to this version. Please see the updated examples below and the ``blinkapp.py`` or ``blinksync.py`` examples in the ``blinkapp/`` directory for examples on how to migrate.
-
 **Disclaimer:**
 Published under the MIT license - See LICENSE file for more details.
 

blinkpy/auth.py

@@ -114,6 +114,12 @@ async def login(self, login_url=LOGIN_ENDPOINT, refresh=False):
         try:
             if response.status == 200:
                 return await response.json()
+            if response.status == 401:
+                _LOGGER.error(
+                    "Unable to refresh token. "
+                    "Invalid refresh token or invalid credentials."
+                )
+                raise UnauthorizedError
             if response.status == 412:
                 raise BlinkTwoFARequiredError
             raise LoginError
@@ -263,23 +269,6 @@ async def query(
                 code,
                 reason,
             )
-        except UnauthorizedError:
-            try:
-                if not is_retry:
-                    await self.refresh_tokens()
-                    return await self.query(
-                        url=url,
-                        data=data,
-                        headers=self.header,
-                        reqtype=reqtype,
-                        stream=stream,
-                        json_resp=json_resp,
-                        is_retry=True,
-                        timeout=timeout,
-                    )
-                _LOGGER.error("Unable to access %s after token refresh.", url)
-            except TokenRefreshFailed:
-                _LOGGER.error("Unable to refresh token.")
         return None
 
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "blinkpy"
-version = "0.24.0"
+version = "0.24.1"
 license = {text = "MIT"}
 description = "A Blink camera Python Library."
 readme = "README.rst"
@@ -19,6 +19,8 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Home Automation",
 ]
 requires-python = ">=3.9.0"

requirements_test.txt

@@ -1,10 +1,10 @@
-ruff==0.11.13
-black==24.4.2
-build==1.2.1
-coverage==7.8.2
-pytest==8.4.0
-pytest-cov==6.1.1
-pytest-sugar==1.0.0
+ruff==0.14.1
+black==25.9.0
+build==1.3.0
+coverage==7.10.7
+pytest==8.4.2
+pytest-cov==7.0.0
+pytest-sugar==1.1.1
 pytest-timeout==2.4.0
 restructuredtext-lint==1.4.0
 pygments==2.18.0

tests/test_auth.py

@@ -225,16 +225,16 @@ async def test_query_retry(self):  # , mock_refresh, mock_validate):
     @mock.patch("blinkpy.auth.Auth.validate_response")
     @mock.patch("blinkpy.auth.Auth.refresh_tokens")
     async def test_query_retry_failed(self, mock_refresh, mock_validate):
-        """Check handling of failed retry request."""
+        """Check authorization failure is thrown."""
         self.auth.session = MockSession()
         mock_validate.side_effect = [
             BlinkBadResponse,
             UnauthorizedError,
-            TokenRefreshFailed,
         ]
         mock_refresh.return_value = True
         self.assertEqual(await self.auth.query(url="http://example.com"), None)
-        self.assertEqual(await self.auth.query(url="http://example.com"), None)
+        with self.assertRaises(UnauthorizedError):
+            await self.auth.query(url="http://example.com")
 
     @mock.patch("blinkpy.auth.Auth.validate_response")
     async def test_query(self, mock_validate):
@@ -250,8 +250,8 @@ async def test_query(self, mock_validate):
         self.assertIsNone(await self.auth.query("URL", "data", "headers", "post"))
 
         mock_validate.side_effect = UnauthorizedError
-        self.auth.refresh_tokens = mock.AsyncMock()
-        self.assertIsNone(await self.auth.query("URL", "data", "headers", "post"))
+        with self.assertRaises(UnauthorizedError):
+            await self.auth.query("URL", "data", "headers", "post")
 
     @mock.patch("blinkpy.auth.Auth.validate_response")
     @mock.patch("blinkpy.auth.Auth.validate_login")