boneio 1.5.0.dev23__tar.gz → 1.5.0.dev24__tar.gz

{boneio-1.5.0.dev23/boneio.egg-info → boneio-1.5.0.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.5.0.dev23
+Version: 1.5.0.dev24
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.5.0.dev23 → boneio-1.5.0.dev24}/boneio/core/cloud/registration.py

@@ -7,18 +7,19 @@ for PWA support with custom subdomains.
 
 import asyncio
 import base64
+from datetime import datetime, timezone
 import hashlib
 import hmac
+from importlib.resources import files
 import logging
 import os
+import re
 import shutil
 import subprocess
 from contextlib import suppress
 from pathlib import Path
-from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
-    import aiohttp
+import aiohttp
 
 from boneio.core.cloud.secrets import MASTER_SECRET as DEFAULT_MASTER_SECRET
 from boneio.core.system.monitor import get_network_info
@@ -152,10 +153,8 @@ class CloudRegistration:
         """
         return {"Authorization": f"Bearer {self._compute_token()}"}
 
-    async def _get_session(self) -> "aiohttp.ClientSession":
+    async def _get_session(self) -> aiohttp.ClientSession:
         """Get or create aiohttp session."""
-        import aiohttp
-
         if self._session is None or self._session.closed:
             self._session = aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=30))
         return self._session
@@ -205,8 +204,6 @@ class CloudRegistration:
         Returns:
             True if registration was successful
         """
-        import aiohttp
-
         try:
             session = await self._get_session()
 
@@ -250,8 +247,6 @@ class CloudRegistration:
         Returns:
             True if certificate was fetched successfully
         """
-        import aiohttp
-
         try:
             session = await self._get_session()
 
@@ -327,8 +322,7 @@ class CloudRegistration:
             # Output format: "notAfter=Jun  3 12:00:00 2026 GMT"
             line = result.stdout.strip()
             date_str = line.split("=", 1)[1]
-
-            from datetime import datetime, timezone
+            date_str = re.sub(r"\s+", " ", date_str.strip())
 
             expiry = datetime.strptime(date_str, "%b %d %H:%M:%S %Y %Z").replace(
                 tzinfo=timezone.utc
@@ -373,8 +367,6 @@ class CloudRegistration:
         """
         dest = CADDY_CONFIG_DIR / "init-certs-cloud.sh"
         try:
-            from importlib.resources import files
-
             src = files("boneio.core.cloud.data").joinpath("init-certs-cloud.sh")
             src_bytes = src.read_bytes()
 
@@ -445,8 +437,6 @@ class CloudRegistration:
                 _LOGGER.info("Backed up docker-compose.yaml to %s", backup)
 
             # Replace with bundled cloud template
-            from importlib.resources import files
-
             cloud_src = files("boneio.core.cloud.data").joinpath("docker-compose-cloud.yaml")
             cloud_content = cloud_src.read_text(encoding="utf-8")
             compose_file.write_text(cloud_content)
@@ -484,8 +474,6 @@ class CloudRegistration:
             if not self._check_compose_writable():
                 return False
 
-            from importlib.resources import files
-
             src = files("boneio.core.cloud.data").joinpath("docker-compose.yaml")
             original_content = src.read_text(encoding="utf-8")
 
@@ -515,9 +503,10 @@ class CloudRegistration:
 
     async def _recreate_caddy(self) -> bool:
         """
-        Recreate Caddy container to apply new docker-compose config.
+        Recreate and restart Caddy container to apply new certs or docker-compose config.
 
-        Uses 'docker compose up -d caddy' to pick up volume and entrypoint changes.
+        Uses 'docker compose up -d caddy' and 'docker compose restart caddy' to ensure
+        Caddy reloads updated SSL certificates from disk.
 
         Returns:
             True if recreate was successful
@@ -534,8 +523,19 @@ class CloudRegistration:
                 ),
             )
 
+            # Also restart caddy to ensure mounted TLS certs are reloaded from disk
+            await asyncio.get_event_loop().run_in_executor(
+                None,
+                lambda: subprocess.run(
+                    ["docker", "compose", "restart", "caddy"],
+                    cwd=compose_dir,
+                    capture_output=True,
+                    timeout=60,
+                ),
+            )
+
             if result.returncode == 0:
-                _LOGGER.info("Caddy container recreated successfully")
+                _LOGGER.info("Caddy container recreated and restarted successfully")
                 return True
             else:
                 _LOGGER.error(

{boneio-1.5.0.dev23 → boneio-1.5.0.dev24}/boneio/migrations/bootstrap/boneio-migrate

@@ -589,13 +589,18 @@ def main() -> int:
 
     _LOGGER.info("Applying migration version=%s (%d actions)", version, len(actions))
 
+    succeeded_count = 0
+    optional_failed_count = 0
+
     for i, action in enumerate(actions, start=1):
         action_type = action.get("action", "?")
         _LOGGER.info("[%d/%d] %s", i, len(actions), action_type)
         try:
             dispatch_action(action, assets_base)
+            succeeded_count += 1
         except Exception as exc:
             if action.get("optional"):
+                optional_failed_count += 1
                 _LOGGER.warning(
                     "[%d/%d] Optional action %s failed, continuing: %s",
                     i, len(actions), action_type, exc,
@@ -604,6 +609,16 @@ def main() -> int:
             _LOGGER.error("[%d/%d] Action %s failed: %s", i, len(actions), action_type, exc)
             return 1
 
+    # If every action was optional and every one failed, the migration
+    # achieved nothing — do NOT mark it as applied so it will be retried.
+    if actions and succeeded_count == 0:
+        _LOGGER.error(
+            "Migration %s: all %d action(s) failed (optional_failed=%d). "
+            "NOT marking as applied — will retry on next startup.",
+            version, len(actions), optional_failed_count,
+        )
+        return 2
+
     write_applied_flag(version)
     _LOGGER.info("Migration %s completed successfully.", version)
     return 0

boneio-1.5.0.dev24/boneio/migrations/versions/v1_5_3_libyaml_retry.py

@@ -0,0 +1,102 @@
+"""Retry libyaml installation for devices with a false v1.5.2 applied flag.
+
+v1.5.2 could be falsely marked as applied when all optional actions
+failed (bug fixed in the boneio-migrate helper).  This migration
+repeats the same libyaml install so that affected devices get a
+second attempt automatically.
+
+See also: ``v1_5_2_libyaml.py`` for the original migration.
+"""
+
+from __future__ import annotations
+
+import getpass
+import logging
+import sys
+import sysconfig
+from pathlib import Path
+
+from boneio.migrations.actions import AptInstall, MigrationAction, PipInstallWheel
+
+_LOGGER = logging.getLogger(__name__)
+
+VERSION = "1.5.3"
+DESCRIPTION = "Retry libyaml install (fix false v1.5.2 applied flag)"
+REQUIRES_ROOT = True
+
+ASSETS_DIR = Path(__file__).parent.parent / "assets"
+WHEELS_SUBDIR = "wheels"
+
+# Expression evaluated by the target interpreter to detect the C backend
+_LIBYAML_CHECK = "__import__('yaml').__with_libyaml__"
+
+
+def _wheel_glob() -> str:
+    """Build the wheel filename pattern for the running interpreter.
+
+    Uses a case-insensitive prefix because pip normalises the project
+    name to lowercase (``pyyaml-*``) while the canonical PyPI name is
+    ``PyYAML``.
+
+    Returns:
+        A glob pattern such as ``[Pp][Yy][Yy][Aa][Mm][Ll]-*-cp313-*linux_armv7l*.whl``.
+    """
+    py_tag = f"cp{sys.version_info.major}{sys.version_info.minor}"
+    platform_tag = sysconfig.get_platform().replace("-", "_").replace(".", "_")
+    # Case-insensitive prefix: matches both "PyYAML" and "pyyaml"
+    ci_prefix = "[Pp][Yy][Yy][Aa][Mm][Ll]"
+    return f"{ci_prefix}-*-{py_tag}-*{platform_tag}*.whl"
+
+
+def _find_wheel() -> str | None:
+    """Locate a bundled PyYAML wheel matching this interpreter.
+
+    Returns:
+        Path of the wheel relative to the assets directory, or None when no
+        matching wheel is shipped for this Python version / architecture.
+    """
+    wheels_dir = ASSETS_DIR / WHEELS_SUBDIR
+    if not wheels_dir.is_dir():
+        return None
+    matches = sorted(wheels_dir.glob(_wheel_glob()))
+    if not matches:
+        return None
+    return f"{WHEELS_SUBDIR}/{matches[0].name}"
+
+
+def plan() -> list[MigrationAction]:
+    """Return the ordered list of migration actions.
+
+    Returns:
+        List of :class:`MigrationAction` to apply in order. Empty when the
+        C backend is already active or no matching wheel is bundled.
+    """
+    try:
+        import yaml
+
+        if yaml.__with_libyaml__:
+            _LOGGER.debug("PyYAML already uses libyaml, nothing to do.")
+            return []
+    except ImportError:
+        return []
+
+    wheel = _find_wheel()
+    if wheel is None:
+        _LOGGER.warning(
+            "No bundled PyYAML wheel matching %s — keeping the pure-Python parser.",
+            _wheel_glob(),
+        )
+        return []
+
+    return [
+        # Runtime library the wheel links against; usually already present.
+        AptInstall(packages=["libyaml-0-2"], optional=True),
+        PipInstallWheel(
+            wheel=wheel,
+            python=sys.executable,
+            run_as=getpass.getuser(),
+            skip_if=_LIBYAML_CHECK,
+            verify=_LIBYAML_CHECK,
+            optional=True,
+        ),
+    ]

boneio-1.5.0.dev24/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "1.5.0.dev24"

{boneio-1.5.0.dev23 → boneio-1.5.0.dev24/boneio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.5.0.dev23
+Version: 1.5.0.dev24
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.5.0.dev23 → boneio-1.5.0.dev24}/boneio.egg-info/SOURCES.txt

@@ -288,6 +288,7 @@ boneio/migrations/versions/v1_4_4_caddy.py
 boneio/migrations/versions/v1_5_0_fix_oled_fifo_permissions.py
 boneio/migrations/versions/v1_5_1_ufw_lox_udp.py
 boneio/migrations/versions/v1_5_2_libyaml.py
+boneio/migrations/versions/v1_5_3_libyaml_retry.py
 boneio/modbus/__init__.py
 boneio/modbus/cli.py
 boneio/modbus/client.py

boneio-1.5.0.dev23/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "1.5.0.dev23"