Release 1.6.2 (#99)

Author: schizza

.github/CODEOWNERS

@@ -1 +1 @@
-main @schizza
+* @schizza

CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Changelog
 
+## 1.6.2
+
+## 🐛 Opravy chyb
+
+**Fix school year bounds (#97) @schizza**
+
+- Opravena chyba získávání počátečního data školního roku pro `Nástěnku` a `Zprávy`
+
+**Fixed issue when cached schools will hang initialization. (#98) @schizza**
+
+- Opravena chyba, kdy při inicializaci komponenty mohlo dojít k zasekuní na načítací obrazovce
+
 ## 1.6.1
 
 ## 🐛 Opravy chyb

bump-version.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "1.6.1"
+current_version = "1.6.2"
 commit = false
 tag = false
 

custom_components/bakalari/api.py

@@ -31,7 +31,7 @@
     RATE_LIMIT_EXCEEDED,
     ChildRecord,
 )
-from .utils import ensure_child_record, redact_child_info
+from .utils import ensure_child_record, redact_child_info, school_year_bounds
 
 _LOGGER = logging.getLogger(__name__)
 _fetch_lock: asyncio.Lock = asyncio.Lock()
@@ -394,8 +394,7 @@ async def async_get_messages(self, lib) -> list[MessageContainer]:
 
         today = datetime.today().date()
 
-        # TODO: change to actual year, while sensors are refactored!
-        start_of_school_year = datetime(year=today.year, month=10, day=1).date()
+        start_of_school_year, _ = school_year_bounds(today)
 
         _LOGGER.debug(
             "[class=%s module=%s] Fetching messages for child_id=%s",
@@ -432,7 +431,7 @@ async def async_fetch_noticeboard(self, lib) -> list[MessageContainer]:
         messages = await _noticeboard.fetch_noticeboard()
 
         today = datetime.today().date()
-        start_of_school_year = datetime(year=today.year, month=10, day=1).date()
+        start_of_school_year, _ = school_year_bounds(today)
 
         if messages.count_messages():
             return messages.get_messages_by_date(start_of_school_year, today)

custom_components/bakalari/config_flow.py

@@ -40,6 +40,7 @@ def __init__(self) -> None:
         self._schools: Schools | None = None
         self._loading_task = None
         self._reauth_data: dict | None = None
+        self._loading_error: str | None = None
 
     async def _load_schools(self) -> bool:
         """Load schools from cache or fetch new ones from server."""
@@ -63,6 +64,7 @@ async def _load_schools(self) -> bool:
                     self.__class__.__name__,
                     __name__,
                 )
+                self._loading_error = "cannot_connect"
                 return False
 
             await schools_storage.async_save(schools_cache.school_list)
@@ -71,17 +73,24 @@ async def _load_schools(self) -> bool:
                 self.__class__.__name__,
                 __name__,
             )
-        else:
-            _LOGGER.info(
-                "[class=%s module=%s] Schools loaded from cache.",
-                self.__class__.__name__,
-                __name__,
-            )
-        return False
+            return True
+
+        _LOGGER.info(
+            "[class=%s module=%s] Schools loaded from cache.",
+            self.__class__.__name__,
+            __name__,
+        )
+        return True
 
     async def async_step_user(self, user_input=None) -> config_entries.ConfigFlowResult:
         """Handle the initial step."""
 
+        # After progress finishes, HA will re-enter this step; at that point we can
+        # either continue or show an error with a retry button.
+        if user_input is not None and user_input.get("retry"):
+            self._loading_task = None
+            self._loading_error = None
+
         if self._loading_task is None:
             self._loading_task = self.hass.async_create_task(self._load_schools())
 
@@ -91,6 +100,34 @@ async def async_step_user(self, user_input=None) -> config_entries.ConfigFlowRes
                 progress_task=self._loading_task,
             )
 
+        # Task exists -> either still running or already finished.
+        if not self._loading_task.done():
+            return self.async_show_progress(
+                step_id="user",
+                progress_action="loading_schools",
+                progress_task=self._loading_task,
+            )
+
+        try:
+            ok = bool(self._loading_task.result())
+        except Exception:  # noqa: BLE001 - surface as HA form error
+            _LOGGER.exception(
+                "[class=%s module=%s] Unexpected error while loading schools",
+                self.__class__.__name__,
+                __name__,
+            )
+            ok = False
+            self._loading_error = "unknown"
+
+        if not ok:
+            # Reset task so user can retry.
+            self._loading_task = None
+            return self.async_show_form(
+                step_id="user",
+                data_schema=vol.Schema({vol.Optional("retry", default=True): bool}),
+                errors={"base": self._loading_error or "cannot_connect"},
+            )
+
         return self.async_show_progress_done(next_step_id="complete")
 
     async def async_step_complete(

custom_components/bakalari/const.py

@@ -8,7 +8,7 @@
 MANUFACTURER = "Bakaláři pro HomeAssistant"
 MODEL = "Bakaláři backend"
 
-LIB_VERSION: Final = "1.6.1"
+LIB_VERSION: Final = "1.6.2"
 API_VERSION: Final = "0.10.0"
 SW_VERSION: Final = f"API: {API_VERSION} Library: {LIB_VERSION}"
 CONF_CHILDREN: Final = "children"

custom_components/bakalari/manifest.json

@@ -16,5 +16,5 @@
   "requirements": [
     "async-bakalari-api==0.10.0"
   ],
-  "version": "1.6.1"
+  "version": "1.6.2"
 }

custom_components/bakalari/translations/cs.json

@@ -4,7 +4,8 @@
     "error": {
       "loading_failed": "Nepodařilo se načíst školy z serveru ani s cache!",
       "invalid_auth": "Neplatné přihlašovací údaje!",
-      "cannot_connect": "Nelze se připojit k serveru!"
+      "cannot_connect": "Nelze se připojit k serveru!",
+      "unknown": "Neznámá chyba."
     },
     "abort": {
       "reauth_entry_not_found": "Nepodařilo se najít dítě s daným přihlašovacím jménem.",

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bakalari-ha"
-version = "1.6.1"
+version = "1.6.2"
 description = "Home Assistant custom integration for Bakaláři API endpoints."
 readme = "README.md"
 requires-python = ">=3.13"