Merge pull request #216 from dvd-dev/issue457

Fix attempt pour issue 457

Author: ic-dev21

.pre-commit-config.yaml

@@ -52,7 +52,7 @@ repos:
           - types-aiofiles==23.2.0
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
+    rev: v5.0.0
     hooks:
       - id: check-json
       - id: no-commit-to-branch

pyhilo/api.py

@@ -367,6 +367,7 @@ async def post_devicehub_negociate(self) -> tuple[str, str]:
         resp = await self.async_request("post", url)
         ws_url = resp.get("url")
         ws_token = resp.get("accessToken")
+        LOG.debug("Calling set_state")
         await set_state(
             self._state_yaml,
             "websocket",
@@ -398,6 +399,7 @@ async def get_websocket_params(self) -> None:
             "available_transports": transport_dict,
             "full_ws_url": self.full_ws_url,
         }
+        LOG.debug("Calling set_state")
         await set_state(self._state_yaml, "websocket", websocket_dict)
 
     async def fb_install(self, fb_id: str) -> None:
@@ -423,6 +425,7 @@ async def fb_install(self, fb_id: str) -> None:
             raise RequestError(err) from err
         LOG.debug(f"FB Install data: {resp}")
         auth_token = resp.get("authToken", {})
+        LOG.debug("Calling set_state")
         await set_state(
             self._state_yaml,
             "firebase",
@@ -464,6 +467,7 @@ async def android_register(self) -> None:
             LOG.error(f"Android registration error: {msg}")
             raise RequestError
         token = msg.split("=")[-1]
+        LOG.debug("Calling set_state")
         await set_state(
             self._state_yaml,
             "android",

pyhilo/const.py

@@ -8,7 +8,7 @@
 LOG: Final = logging.getLogger(__package__)
 DEFAULT_STATE_FILE: Final = "hilo_state.yaml"
 REQUEST_RETRY: Final = 9
-PYHILO_VERSION: Final = "2024.06.01"
+PYHILO_VERSION: Final = "2024.10.02"
 # TODO: Find a way to keep previous line in sync with pyproject.toml automatically
 
 CONTENT_TYPE_FORM: Final = "application/x-www-form-urlencoded"

pyhilo/util/state.py

@@ -1,3 +1,4 @@
+import asyncio
 from datetime import datetime
 from os.path import isfile
 from typing import Any, Optional, Type, TypedDict, TypeVar, Union
@@ -7,6 +8,8 @@
 
 from pyhilo.const import LOG
 
+lock = asyncio.Lock()
+
 
 class TokenDict(TypedDict):
     access: Optional[str]
@@ -103,10 +106,11 @@ async def set_state(
     :type state: ``StateDict``
     :rtype: ``StateDict``
     """
-    current_state = await get_state(state_yaml) or {}
-    merged_state: dict[str, Any] = {key: {**current_state.get(key, {}), **state}}  # type: ignore
-    new_state: dict[str, Any] = {**current_state, **merged_state}
-    async with aiofiles.open(state_yaml, mode="w") as yaml_file:
-        LOG.debug("Saving state to yaml file")
-        content = yaml.dump(new_state)
-        await yaml_file.write(content)
+    async with lock:  # note ic-dev21: on lock le fichier pour être sûr de finir la job
+        current_state = await get_state(state_yaml) or {}
+        merged_state: dict[str, Any] = {key: {**current_state.get(key, {}), **state}}  # type: ignore
+        new_state: dict[str, Any] = {**current_state, **merged_state}
+        async with aiofiles.open(state_yaml, mode="w") as yaml_file:
+            LOG.debug("Saving state to yaml file")
+            content = yaml.dump(new_state)
+            await yaml_file.write(content)

pyproject.toml

@@ -40,7 +40,7 @@ exclude = ".venv/.*"
 
 [tool.poetry]
 name = "python-hilo"
-version = "2024.10.1"
+version = "2024.10.2"
 description = "A Python3, async interface to the Hilo API"
 readme = "README.md"
 authors = ["David Vallee Delisle <me@dvd.dev>"]