Merge pull request #7 from IoTLabs-pl/v0.18.0-beta.1

v0.18.0-beta.1

Author: kubasaw

pyhon/connection/auth.py

@@ -307,16 +307,23 @@ async def _retrieve_iot_core_token(self) -> None:
             self._tokens.iot_core_token = iot_core_token
 
     async def _refresh(self) -> None:
-        async with self._session.post(
-            f"{const.AUTH_API_URL}/services/oauth2/token",
-            params={
-                "client_id": const.CLIENT_ID,
-                "refresh_token": self._tokens.refresh_token,
-                "grant_type": "refresh_token",
-            },
-        ) as response:
-            data = await response.json()
-            self._tokens = _Tokens.from_dict(data)
+        try:
+            async with self._session.post(
+                f"{const.AUTH_API_URL}/services/oauth2/token",
+                params={
+                    "client_id": const.CLIENT_ID,
+                    "refresh_token": self._tokens.refresh_token,
+                    "grant_type": "refresh_token",
+                },
+            ) as response:
+                data = await response.json()
+                self._tokens = _Tokens.from_dict(data)
+        except aiohttp.ClientResponseError as e:
+            _LOGGER.warning(
+                "Failed to obtain access token with refresh token: [%s] %s",
+                e.status,
+                e.message,
+            )
 
     async def __aenter__(self) -> "HonAuth":
         await self._resources.enter_async_context(self._session)

pyhon/connection/handler/base.py

@@ -14,7 +14,7 @@
 from aiohttp import ClientSession, ClientResponse
 
 
-# from pyhon import const
+from pyhon import const
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,13 +33,13 @@ def __str__(self) -> str:
 
 class SessionWrapper:
     __MAX_HISTORY_LEN = 15
-    _HEADERS = {"User-Agent": "const.USER_AGENT"}
+    _HEADERS = {"User-Agent": const.USER_AGENT}
 
     def __init__(self, session: ClientSession | None = None) -> None:
 
         self._resources = AsyncExitStack()
         self._history: deque[ResponseWrapper] = deque(maxlen=self.__MAX_HISTORY_LEN)
-        self._history_tracking_requests = 0
+        self._history_tracking = False
         self._session = session
 
     async def _extra_headers(self) -> dict[str, str]:
@@ -48,16 +48,17 @@ async def _extra_headers(self) -> dict[str, str]:
     @property
     @contextmanager
     def session_history_tracker(self) -> Generator[None, None, None]:
-        self._history_tracking_requests += 1
-        try:
+        if self._history_tracking:
             yield
-        except Exception as e:
-            self._history_tracking_requests -= 1
-            if self._history_tracking_requests == 1:
-                self._log_history(str(e), flush=True)
-            raise
-
-        self._history_tracking_requests -= 1
+        else:
+            self._history_tracking = True
+            try:
+                yield
+            except Exception as e:
+                self._log_history(str(e))
+                raise
+            finally:
+                self._history_tracking = False
 
     @asynccontextmanager
     async def _request(