airthings-cloud 0.2.0__tar.gz → 0.3.1__tar.gz

{airthings_cloud-0.2.0 → airthings_cloud-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: airthings_cloud
-Version: 0.2.0
+Version: 0.3.1
 Summary: A python3 library to communicate with Airthings devices
 Home-page: https://github.com/Danielhiversen/pyAirthings
 Author: Daniel Hjelseth Høyer
@@ -11,7 +11,15 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7.0
+Requires-Python: >=3.13.0
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.0.6
-Requires-Dist: async_timeout>=3.0.0
+Requires-Dist: aiohttp>=3.13.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{airthings_cloud-0.2.0 → airthings_cloud-0.3.1}/airthings/__init__.py

@@ -5,14 +5,15 @@ import asyncio
 from dataclasses import dataclass
 import json
 import logging
+import time
 
 from aiohttp import ClientError
-import async_timeout
 
 _LOGGER = logging.getLogger(__name__)
 
 API_URL = "https://ext-api.airthings.com/v1/"
 TIMEOUT = 10
+CACHE_TTL = 3600
 
 
 @dataclass
@@ -72,6 +73,10 @@ class AirthingsAuthError(AirthingsError):
     """AirthingsAuthError Airthings occurred."""
 
 
+class AirthingsNotFoundError(AirthingsError):
+    """Requested resource does not exist or is no longer accessible."""
+
+
 class Airthings:
     """Airthings data handler."""
 
@@ -83,67 +88,126 @@ class Airthings:
         self._access_token = None
         self._locations = []
         self._devices = {}
+        self._cache_updated = None
+        self._unresolved = set()
+
+    async def _fetch_locations(self):
+        return [
+            AirthingsLocation.init_from_response(location)
+            for location in await self._fetch_list("locations")
+        ]
+
+    async def _fetch_devices(self):
+        devices = {}
+        for device in await self._fetch_list("devices"):
+            if not isinstance(device, dict) or "id" not in device:
+                _LOGGER.debug("Skipping device metadata entry without id")
+                continue
+            devices[device["id"]] = device
+        return devices
+
+    async def _fetch_list(self, key):
+        response = await self._request(API_URL + key)
+        json_data = await response.json()
+        items = json_data.get(key) if isinstance(json_data, dict) else None
+        if not isinstance(items, list):
+            raise AirthingsError(f"Invalid {key} response from Airthings")
+        return items
+
+    async def _refresh_cache(self):
+        locations = await self._fetch_locations()
+        devices = await self._fetch_devices()
+        self._locations = locations
+        self._devices = devices
+        self._unresolved = set()
+        self._cache_updated = time.monotonic()
+
+    def _cache_expired(self):
+        return (
+            self._cache_updated is None
+            or time.monotonic() - self._cache_updated > CACHE_TTL
+        )
 
     async def update_devices(self):
         """Update data."""
-        if not self._locations:
-            response = await self._request(API_URL + "locations")
-            json_data = await response.json()
-            self._locations = []
-            for location in json_data.get("locations"):
-                self._locations.append(AirthingsLocation.init_from_response(location))
-        if not self._devices:
-            response = await self._request(API_URL + "devices")
-            json_data = await response.json()
-            self._devices = {}
-            for device in json_data.get("devices"):
-                self._devices[device['id']] = device
+        refreshed = self._cache_expired()
+        if refreshed:
+            await self._refresh_cache()
+        res = await self._fetch_latest_samples(skip_stale=refreshed)
+        if res is None:
+            await self._refresh_cache()
+            res = await self._fetch_latest_samples(skip_stale=True)
+        return res
+
+    async def _fetch_latest_samples(self, skip_stale):
+        """Return None on a new unknown location or device unless skip_stale."""
         res = {}
         for location in self._locations:
             if not location.location_id:
                 continue
-            response = await self._request(
-                API_URL + f"/locations/{location.location_id}/latest-samples"
-            )
-            if response is None:
-                continue
-            json_data = await response.json()
-            if json_data is None:
-                continue
-            if devices := json_data.get("devices"):
-                for device in devices:
-                    id = device.get('id')
-                    res[id] = AirthingsDevice.init_from_response(
-                        device,
+            try:
+                response = await self._request(
+                    API_URL + f"/locations/{location.location_id}/latest-samples"
+                )
+            except AirthingsNotFoundError as err:
+                if not skip_stale and location.location_id not in self._unresolved:
+                    _LOGGER.debug(
+                        "Location '%s' is not accessible (%s), refreshing cache",
                         location.name,
-                        self._devices.get(id)
+                        err,
                     )
-            else:
+                    return None
+                self._unresolved.add(location.location_id)
+                _LOGGER.debug("Skipping inaccessible location '%s'", location.name)
+                continue
+            json_data = await response.json()
+            devices = json_data.get("devices") if isinstance(json_data, dict) else None
+            if not devices:
                 _LOGGER.debug("No devices in location '%s'", location.name)
+                continue
+            for device in devices:
+                if not isinstance(device, dict) or "id" not in device:
+                    _LOGGER.debug("Skipping device without id in location '%s'", location.name)
+                    continue
+                device_id = device["id"]
+                if device_id not in self._devices:
+                    if not skip_stale and device_id not in self._unresolved:
+                        _LOGGER.debug(
+                            "Unknown device '%s' in location '%s', refreshing cache",
+                            device_id,
+                            location.name,
+                        )
+                        return None
+                    self._unresolved.add(device_id)
+                    _LOGGER.debug("Device '%s' missing from cached metadata", device_id)
+                res[device_id] = AirthingsDevice.init_from_response(
+                    device,
+                    location.name,
+                    self._devices.get(device_id, {}),
+                )
         return res
 
-    async def _request(self, url, json_data=None, retry=3):
-        _LOGGER.debug("Request %s %s, %s", url, retry, json_data)
+    async def _request(self, url, retry=3):
+        _LOGGER.debug("Request %s %s", url, retry)
         if self._access_token is None:
             self._access_token = await get_token(
                 self._websession, self._client_id, self._secret
             )
-            if self._access_token is None:
-                return None
 
         headers = {"Authorization": self._access_token}
         try:
-            async with async_timeout.timeout(TIMEOUT):
-                if json_data:
-                    response = await self._websession.post(
-                        url, json=json_data, headers=headers
-                    )
-                else:
-                    response = await self._websession.get(url, headers=headers)
+            async with asyncio.timeout(TIMEOUT):
+                response = await self._websession.get(url, headers=headers)
+            if response.status != 200:
+                response.release()
+            if response.status in (403, 404):
+                raise AirthingsNotFoundError(
+                    f"No access to {url}, response: {response.status} {response.reason}"
+                )
             if response.status != 200:
                 if retry > 0 and response.status != 429:
                     self._access_token = None
-                    return await self._request(url, json_data, retry=retry - 1)
+                    return await self._request(url, retry=retry - 1)
                 _LOGGER.error(
                     "Error connecting to Airthings, response: %s %s",
                     response.status,
@@ -159,7 +223,7 @@ class Airthings:
         except asyncio.TimeoutError as err:
             self._access_token = None
             if retry > 0:
-                return await self._request(url, json_data, retry=retry - 1)
+                return await self._request(url, retry=retry - 1)
             _LOGGER.error("Timed out when connecting to Airthings")
             raise AirthingsError from err
         return response
@@ -168,7 +232,7 @@ class Airthings:
 async def get_token(websession, client_id, secret, retry=3, timeout=10):
     """Get token for Airthings."""
     try:
-        async with async_timeout.timeout(timeout):
+        async with asyncio.timeout(timeout):
             response = await websession.post(
                 "https://accounts-api.airthings.com/v1/token",
                 headers={
@@ -199,4 +263,8 @@ async def get_token(websession, client_id, secret, retry=3, timeout=10):
         )
         raise AirthingsAuthError(f"Failed to login to retrieve token {response.reason}")
     token_data = json.loads(await response.text())
-    return token_data.get("access_token")
+    access_token = token_data.get("access_token")
+    if not access_token:
+        _LOGGER.error("Airthings: Token response did not contain an access token")
+        raise AirthingsAuthError("Token response did not contain an access token")
+    return access_token

{airthings_cloud-0.2.0 → airthings_cloud-0.3.1}/airthings_cloud.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: airthings_cloud
-Version: 0.2.0
+Version: 0.3.1
 Summary: A python3 library to communicate with Airthings devices
 Home-page: https://github.com/Danielhiversen/pyAirthings
 Author: Daniel Hjelseth Høyer
@@ -11,7 +11,15 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7.0
+Requires-Python: >=3.13.0
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.0.6
-Requires-Dist: async_timeout>=3.0.0
+Requires-Dist: aiohttp>=3.13.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{airthings_cloud-0.2.0 → airthings_cloud-0.3.1}/airthings_cloud.egg-info/SOURCES.txt

@@ -6,4 +6,5 @@ airthings_cloud.egg-info/PKG-INFO
 airthings_cloud.egg-info/SOURCES.txt
 airthings_cloud.egg-info/dependency_links.txt
 airthings_cloud.egg-info/requires.txt
-airthings_cloud.egg-info/top_level.txt
+airthings_cloud.egg-info/top_level.txt
+tests/test_airthings.py

airthings_cloud-0.3.1/airthings_cloud.egg-info/requires.txt

@@ -0,0 +1 @@
+aiohttp>=3.13.0

{airthings_cloud-0.2.0 → airthings_cloud-0.3.1}/setup.py

@@ -3,10 +3,10 @@ from setuptools import setup
 setup(
     name="airthings_cloud",
     packages=["airthings"],
-    install_requires=["aiohttp>=3.0.6", "async_timeout>=3.0.0"],
-    version="0.2.0",
+    install_requires=["aiohttp>=3.13.0"],
+    version="0.3.1",
     description="A python3 library to communicate with Airthings devices",
-    python_requires=">=3.7.0",
+    python_requires=">=3.13.0",
     author="Daniel Hjelseth Høyer",
     author_email="github@dahoiv.net",
     url="https://github.com/Danielhiversen/pyAirthings",

airthings_cloud-0.3.1/tests/test_airthings.py

@@ -0,0 +1,512 @@
+from __future__ import annotations
+
+import asyncio
+import json
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from aiohttp import ClientError
+import pytest
+
+from airthings import (
+    API_URL,
+    CACHE_TTL,
+    Airthings,
+    AirthingsAuthError,
+    AirthingsConnectionError,
+    AirthingsError,
+    AirthingsNotFoundError,
+    get_token,
+)
+
+
+class MockResponse:
+    def __init__(
+        self,
+        *,
+        json_data: dict | None = None,
+        text_data: str | None = None,
+        status: int = 200,
+        reason: str = "OK",
+    ) -> None:
+        self._json_data = json_data
+        self._text_data = text_data
+        self.status = status
+        self.reason = reason
+        self.released = False
+
+    async def json(self) -> dict | None:
+        return self._json_data
+
+    async def text(self) -> str:
+        return self._text_data or ""
+
+    def release(self) -> None:
+        self.released = True
+
+
+def token_response(token: str = "token") -> MockResponse:
+    return MockResponse(text_data=json.dumps({"access_token": token}))
+
+
+PRODUCT_NAMES = {"WAVE_PLUS": "Wave Plus", "VIEW_PLUS": "View Plus"}
+
+
+class FakeCloud:
+    """In-memory ext-api account that routes GET requests by URL."""
+
+    def __init__(self) -> None:
+        self.locations = {"loc1": "Home"}
+        self.devices = {"dev1": {"location": "loc1", "name": "Kitchen", "type": "WAVE_PLUS"}}
+        self.extra_samples: dict[str, list] = {}
+        self.forbidden: set[str] = set()
+        self.urls: list[str] = []
+
+    async def get(self, url: str, headers: dict) -> MockResponse:
+        self.urls.append(url)
+        if url == API_URL + "locations":
+            return MockResponse(
+                json_data={"locations": [{"id": i, "name": n} for i, n in self.locations.items()]}
+            )
+        if url == API_URL + "devices":
+            return MockResponse(
+                json_data={
+                    "devices": [
+                        {"id": i, "deviceType": d["type"], "productName": PRODUCT_NAMES[d["type"]]}
+                        for i, d in self.devices.items()
+                    ]
+                }
+            )
+        location_id = url.split("/locations/")[1].split("/")[0]
+        if location_id not in self.locations or location_id in self.forbidden:
+            return MockResponse(status=403, reason="Forbidden")
+        samples = [
+            {
+                "id": i,
+                "segment": {"name": d["name"], "isActive": True},
+                "data": {"temp": 20.0},
+            }
+            for i, d in self.devices.items()
+            if d["location"] == location_id
+        ]
+        return MockResponse(json_data={"devices": samples + self.extra_samples.get(location_id, [])})
+
+    def count(self, suffix: str) -> int:
+        return sum(url.endswith(suffix) for url in self.urls)
+
+
+def make_airthings(cloud: FakeCloud | None = None) -> tuple[Airthings, MagicMock]:
+    websession = MagicMock()
+    websession.post = AsyncMock(return_value=token_response())
+    if cloud is not None:
+        websession.get = AsyncMock(side_effect=cloud.get)
+    return Airthings("client_id", "secret", websession), websession
+
+
+@pytest.fixture
+def clock():
+    now = [1000.0]
+    with patch("airthings.time.monotonic", side_effect=lambda: now[0]):
+        yield now
+
+
+@pytest.mark.asyncio
+async def test_update_devices_returns_device_data() -> None:
+    cloud = FakeCloud()
+    airthings, websession = make_airthings(cloud)
+
+    result = await airthings.update_devices()
+
+    device = result["dev1"]
+    assert device.device_id == "dev1"
+    assert device.name == "Kitchen"
+    assert device.sensors == {"temp": 20.0}
+    assert list(device.sensor_types) == ["temp"]
+    assert device.is_active is True
+    assert device.location_name == "Home"
+    assert device.device_type == "WAVE_PLUS"
+    assert device.product_name == "Wave Plus"
+    websession.get.assert_any_call(API_URL + "locations", headers={"Authorization": "token"})
+
+
+@pytest.mark.asyncio
+async def test_update_devices_reuses_cache_and_token(clock) -> None:
+    cloud = FakeCloud()
+    airthings, websession = make_airthings(cloud)
+
+    await airthings.update_devices()
+    await airthings.update_devices()
+
+    assert cloud.count("/locations") == 1
+    assert cloud.count("/devices") == 1
+    assert cloud.count("/latest-samples") == 2
+    assert websession.post.await_count == 1
+
+
+@pytest.mark.asyncio
+async def test_update_devices_refreshes_cache_after_ttl(clock) -> None:
+    cloud = FakeCloud()
+    airthings, _ = make_airthings(cloud)
+    await airthings.update_devices()
+
+    cloud.locations["loc1"] = "Renamed"
+    cloud.locations["loc2"] = "Cabin"
+    cloud.devices["dev2"] = {"location": "loc2", "name": "Office", "type": "VIEW_PLUS"}
+    clock[0] += CACHE_TTL
+    result = await airthings.update_devices()
+    assert "dev2" not in result
+    assert result["dev1"].location_name == "Home"
+
+    clock[0] += 1
+    result = await airthings.update_devices()
+    assert result["dev1"].location_name == "Renamed"
+    assert result["dev2"].location_name == "Cabin"
+    assert cloud.count("/locations") == 2
+
+
+@pytest.mark.asyncio
+async def test_update_devices_refreshes_when_device_is_added(clock, caplog) -> None:
+    cloud = FakeCloud()
+    airthings, _ = make_airthings(cloud)
+    await airthings.update_devices()
+
+    cloud.devices["dev2"] = {"location": "loc1", "name": "Office", "type": "VIEW_PLUS"}
+    with caplog.at_level("DEBUG", logger="airthings"):
+        result = await airthings.update_devices()
+
+    assert "Unknown device 'dev2' in location 'Home', refreshing cache" in caplog.text
+    assert set(result) == {"dev1", "dev2"}
+    assert result["dev2"].product_name == "View Plus"
+    assert cloud.count("/devices") == 2
+
+    await airthings.update_devices()
+    assert cloud.count("/devices") == 2
+
+
+@pytest.mark.asyncio
+async def test_update_devices_refreshes_when_location_is_deleted(clock, caplog) -> None:
+    cloud = FakeCloud()
+    cloud.locations["loc2"] = "Cabin"
+    cloud.devices["dev2"] = {"location": "loc2", "name": "Office", "type": "VIEW_PLUS"}
+    airthings, _ = make_airthings(cloud)
+    await airthings.update_devices()
+
+    del cloud.locations["loc1"]
+    del cloud.devices["dev1"]
+    with caplog.at_level("DEBUG", logger="airthings"):
+        result = await airthings.update_devices()
+
+    assert "Location 'Home' is not accessible (No access to" in caplog.text
+    assert "403 Forbidden), refreshing cache" in caplog.text
+
+    assert set(result) == {"dev2"}
+    assert cloud.count("/locations") == 2
+    assert cloud.count("/loc1/latest-samples") == 2
+
+    await airthings.update_devices()
+    assert cloud.count("/loc1/latest-samples") == 2
+
+
+@pytest.mark.asyncio
+async def test_update_devices_removes_deleted_device(clock) -> None:
+    cloud = FakeCloud()
+    cloud.devices["dev2"] = {"location": "loc1", "name": "Office", "type": "VIEW_PLUS"}
+    airthings, _ = make_airthings(cloud)
+    await airthings.update_devices()
+
+    del cloud.devices["dev2"]
+    result = await airthings.update_devices()
+
+    assert set(result) == {"dev1"}
+    assert cloud.count("/locations") == 1
+
+
+@pytest.mark.asyncio
+async def test_update_devices_skips_location_still_inaccessible_after_refresh(clock) -> None:
+    cloud = FakeCloud()
+    cloud.locations["loc2"] = "Cabin"
+    cloud.devices["dev2"] = {"location": "loc2", "name": "Office", "type": "VIEW_PLUS"}
+    airthings, _ = make_airthings(cloud)
+    await airthings.update_devices()
+
+    cloud.forbidden.add("loc1")
+    result = await airthings.update_devices()
+
+    assert set(result) == {"dev2"}
+    assert cloud.count("/locations") == 2
+
+    result = await airthings.update_devices()
+
+    assert set(result) == {"dev2"}
+    assert cloud.count("/locations") == 2
+
+    clock[0] += CACHE_TTL + 1
+    await airthings.update_devices()
+    assert cloud.count("/locations") == 3
+
+
+@pytest.mark.asyncio
+async def test_update_devices_skips_inaccessible_location_on_fresh_cache(clock) -> None:
+    cloud = FakeCloud()
+    cloud.forbidden.add("loc1")
+    airthings, _ = make_airthings(cloud)
+
+    result = await airthings.update_devices()
+
+    assert result == {}
+    assert cloud.count("/locations") == 1
+
+
+@pytest.mark.asyncio
+async def test_update_devices_returns_device_missing_from_metadata(clock) -> None:
+    cloud = FakeCloud()
+    airthings, _ = make_airthings(cloud)
+    await airthings.update_devices()
+
+    cloud.extra_samples["loc1"] = [{"id": "dev2", "segment": {"name": "Office"}, "data": {"co2": 500}}]
+    result = await airthings.update_devices()
+
+    assert result["dev2"].name == "Office"
+    assert result["dev2"].sensors == {"co2": 500}
+    assert result["dev2"].product_name is None
+    assert cloud.count("/devices") == 2
+
+    result = await airthings.update_devices()
+
+    assert set(result) == {"dev1", "dev2"}
+    assert cloud.count("/devices") == 2
+
+    cloud.extra_samples.clear()
+    cloud.devices["dev2"] = {"location": "loc1", "name": "Office", "type": "VIEW_PLUS"}
+    clock[0] += CACHE_TTL + 1
+    result = await airthings.update_devices()
+
+    assert result["dev2"].product_name == "View Plus"
+
+
+@pytest.mark.asyncio
+async def test_update_devices_skips_device_without_id_without_refreshing(clock) -> None:
+    cloud = FakeCloud()
+    cloud.extra_samples["loc1"] = [{"segment": {"name": "No id"}, "data": {}}, "not a dict"]
+    airthings, _ = make_airthings(cloud)
+    await airthings.update_devices()
+
+    result = await airthings.update_devices()
+
+    assert set(result) == {"dev1"}
+    assert cloud.count("/locations") == 1
+
+
+@pytest.mark.asyncio
+async def test_update_devices_skips_locations_without_id_or_devices() -> None:
+    airthings, websession = make_airthings()
+    websession.get = AsyncMock(
+        side_effect=[
+            MockResponse(
+                json_data={
+                    "locations": [
+                        {"name": "No id"},
+                        {"id": "empty", "name": "Empty"},
+                        {"id": "null", "name": "Null"},
+                        {"id": "list", "name": "List"},
+                    ]
+                }
+            ),
+            MockResponse(json_data={"devices": []}),
+            MockResponse(json_data={"devices": []}),
+            MockResponse(json_data=None),
+            MockResponse(json_data=["not", "a", "dict"]),
+        ]
+    )
+
+    assert await airthings.update_devices() == {}
+    assert websession.get.await_count == 5
+
+
+@pytest.mark.asyncio
+async def test_fetch_skips_device_metadata_without_id() -> None:
+    airthings, websession = make_airthings()
+    websession.get = AsyncMock(
+        return_value=MockResponse(
+            json_data={"devices": [{"deviceType": "WAVE_PLUS"}, "not a dict", {"id": "dev1"}]}
+        )
+    )
+
+    assert set(await airthings._fetch_devices()) == {"dev1"}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("endpoint", ["locations", "devices"])
+@pytest.mark.parametrize(
+    "payload",
+    [None, {}, {"locations": None, "devices": None}, {"locations": {}, "devices": {}}, ["x"], "text"],
+)
+async def test_update_devices_keeps_cache_on_malformed_metadata(clock, endpoint, payload) -> None:
+    cloud = FakeCloud()
+    airthings, websession = make_airthings(cloud)
+    await airthings.update_devices()
+
+    async def malformed(url: str, headers: dict) -> MockResponse:
+        if url == API_URL + endpoint:
+            return MockResponse(json_data=payload)
+        return await cloud.get(url, headers)
+
+    websession.get.side_effect = malformed
+    clock[0] += CACHE_TTL + 1
+
+    with pytest.raises(AirthingsError, match=f"Invalid {endpoint}"):
+        await airthings.update_devices()
+
+    websession.get.side_effect = cloud.get
+    result = await airthings.update_devices()
+
+    assert set(result) == {"dev1"}
+
+
+@pytest.mark.asyncio
+async def test_update_devices_keeps_whole_cache_when_refresh_fails(clock) -> None:
+    cloud = FakeCloud()
+    airthings, websession = make_airthings(cloud)
+    await airthings.update_devices()
+    cached_locations = airthings._locations
+
+    cloud.locations["loc2"] = "Cabin"
+    cloud.devices["dev2"] = {"location": "loc1", "name": "Office", "type": "VIEW_PLUS"}
+
+    async def broken_devices(url: str, headers: dict) -> MockResponse:
+        if url == API_URL + "devices":
+            return MockResponse(json_data={"devices": None})
+        return await cloud.get(url, headers)
+
+    websession.get.side_effect = broken_devices
+    with pytest.raises(AirthingsError, match="Invalid devices"):
+        await airthings.update_devices()
+
+    assert airthings._locations is cached_locations
+
+    websession.get.side_effect = cloud.get
+    result = await airthings.update_devices()
+
+    assert set(result) == {"dev1", "dev2"}
+    assert {location.name for location in airthings._locations} == {"Home", "Cabin"}
+
+
+@pytest.mark.asyncio
+async def test_request_refreshes_token_and_retries_on_unauthorized() -> None:
+    airthings, websession = make_airthings()
+    websession.post = AsyncMock(side_effect=[token_response("old"), token_response("new")])
+    ok = MockResponse(json_data={})
+    websession.get = AsyncMock(side_effect=[MockResponse(status=401, reason="Unauthorized"), ok])
+
+    assert await airthings._request("url") is ok
+    assert websession.get.await_args_list[-1].kwargs["headers"] == {"Authorization": "new"}
+
+
+@pytest.mark.asyncio
+async def test_request_raises_after_retries_are_exhausted() -> None:
+    airthings, websession = make_airthings()
+    response = MockResponse(status=500, reason="Server Error")
+    response.release = MagicMock()
+    websession.get = AsyncMock(return_value=response)
+
+    with pytest.raises(AirthingsError, match="Server Error"):
+        await airthings._request("url")
+    assert websession.get.await_count == 4
+    assert response.release.call_count == 4
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("status", "error"),
+    [(403, AirthingsNotFoundError), (404, AirthingsNotFoundError), (429, AirthingsError)],
+)
+async def test_request_does_not_retry(status: int, error: type[Exception]) -> None:
+    airthings, websession = make_airthings()
+    response = MockResponse(status=status, reason="Nope")
+    websession.get = AsyncMock(return_value=response)
+
+    with pytest.raises(error):
+        await airthings._request("url")
+    assert websession.get.await_count == 1
+    assert websession.post.await_count == 1
+    assert response.released
+
+
+@pytest.mark.asyncio
+async def test_request_raises_on_client_error() -> None:
+    airthings, websession = make_airthings()
+    websession.get = AsyncMock(side_effect=ClientError("boom"))
+
+    with pytest.raises(AirthingsError):
+        await airthings._request("url")
+    assert airthings._access_token is None
+
+
+@pytest.mark.asyncio
+async def test_request_retries_on_timeout() -> None:
+    airthings, websession = make_airthings()
+    ok = MockResponse(json_data={})
+    websession.get = AsyncMock(side_effect=[asyncio.TimeoutError, ok])
+
+    assert await airthings._request("url") is ok
+    assert websession.post.await_count == 2
+
+
+@pytest.mark.asyncio
+async def test_request_raises_when_timeouts_are_exhausted() -> None:
+    airthings, websession = make_airthings()
+    websession.get = AsyncMock(side_effect=asyncio.TimeoutError)
+
+    with pytest.raises(AirthingsError):
+        await airthings._request("url", retry=1)
+    assert websession.get.await_count == 2
+
+
+@pytest.mark.asyncio
+async def test_get_token_returns_access_token() -> None:
+    websession = MagicMock()
+    websession.post = AsyncMock(return_value=token_response("abc"))
+
+    assert await get_token(websession, "id", "secret") == "abc"
+    assert websession.post.await_args.kwargs["data"] == {
+        "grant_type": "client_credentials",
+        "client_id": "id",
+        "client_secret": "secret",
+    }
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("error", [ClientError("boom"), asyncio.TimeoutError()])
+async def test_get_token_retries_then_succeeds(error: Exception) -> None:
+    websession = MagicMock()
+    websession.post = AsyncMock(side_effect=[error, token_response("abc")])
+
+    assert await get_token(websession, "id", "secret") == "abc"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("error", [ClientError("boom"), asyncio.TimeoutError()])
+async def test_get_token_raises_connection_error_when_retries_are_exhausted(
+    error: Exception,
+) -> None:
+    websession = MagicMock()
+    websession.post = AsyncMock(side_effect=error)
+
+    with pytest.raises(AirthingsConnectionError):
+        await get_token(websession, "id", "secret", retry=1)
+    assert websession.post.await_count == 2
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "response",
+    [
+        MockResponse(status=401, reason="Unauthorized"),
+        MockResponse(text_data=json.dumps({"error": "invalid_client"})),
+    ],
+)
+async def test_get_token_raises_auth_error(response: MockResponse) -> None:
+    websession = MagicMock()
+    websession.post = AsyncMock(return_value=response)
+
+    with pytest.raises(AirthingsAuthError):
+        await get_token(websession, "id", "secret")

airthings_cloud-0.2.0/airthings_cloud.egg-info/requires.txt

@@ -1,2 +0,0 @@
-aiohttp>=3.0.6
-async_timeout>=3.0.0