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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: airthings_cloud
-Version: 0.2.0
+Version: 0.3.0
 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.0}/airthings/__init__.py

@@ -7,7 +7,6 @@ import json
 import logging
 
 from aiohttp import ClientError
-import async_timeout
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -84,14 +83,20 @@ class Airthings:
         self._locations = []
         self._devices = {}
 
+    async def _fetch_locations(self):
+        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))
+
     async def update_devices(self):
         """Update data."""
+        locations_fetched = False
+
         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))
+            await self._fetch_locations()
+            locations_fetched = True
         if not self._devices:
             response = await self._request(API_URL + "devices")
             json_data = await response.json()
@@ -112,11 +117,16 @@ class Airthings:
                 continue
             if devices := json_data.get("devices"):
                 for device in devices:
-                    id = device.get('id')
-                    res[id] = AirthingsDevice.init_from_response(
+                    if not isinstance(device, dict) or 'id' not in device:
+                        if not locations_fetched:
+                            _LOGGER.debug("Device has no id, fetching locations again")
+                            await self._fetch_locations()
+                            locations_fetched = True
+                    device_id = device.get('id')
+                    res[device_id] = AirthingsDevice.init_from_response(
                         device,
                         location.name,
-                        self._devices.get(id)
+                        self._devices.get(device_id)
                     )
             else:
                 _LOGGER.debug("No devices in location '%s'", location.name)
@@ -133,7 +143,7 @@ class Airthings:
 
         headers = {"Authorization": self._access_token}
         try:
-            async with async_timeout.timeout(TIMEOUT):
+            async with asyncio.timeout(TIMEOUT):
                 if json_data:
                     response = await self._websession.post(
                         url, json=json_data, headers=headers
@@ -168,7 +178,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={

{airthings_cloud-0.2.0 → airthings_cloud-0.3.0}/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.0
 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.3.0/airthings_cloud.egg-info/requires.txt

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

{airthings_cloud-0.2.0 → airthings_cloud-0.3.0}/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.0",
     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.2.0/airthings_cloud.egg-info/requires.txt

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