redeploy 0.2.44__tar.gz → 0.2.45__tar.gz

{redeploy-0.2.44 → redeploy-0.2.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.44
+Version: 0.2.45
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -30,17 +30,17 @@ Requires-Dist: op3>=0.1.4; extra == "op3"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.44-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-21.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.45-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-23.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (65 commits)
-- 👤 **Human dev:** ~$2136 (21.4h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (66 commits)
+- 👤 **Human dev:** ~$2318 (23.2h @ $100/h, 30min dedup)
 
 Generated on 2026-04-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.44-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.45-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.44 → redeploy-0.2.45}/README.md

@@ -3,17 +3,17 @@
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.44-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-21.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.45-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-23.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (65 commits)
-- 👤 **Human dev:** ~$2136 (21.4h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (66 commits)
+- 👤 **Human dev:** ~$2318 (23.2h @ $100/h, 30min dedup)
 
 Generated on 2026-04-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.44-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.45-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.44 → redeploy-0.2.45}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redeploy"
-version = "0.2.44"
+version = "0.2.45"
 description = "Infrastructure migration toolkit: detect → plan → apply"
 readme = "README.md"
 requires-python = ">=3.11"

{redeploy-0.2.44 → redeploy-0.2.45}/redeploy/__init__.py

@@ -7,7 +7,7 @@ Public API (stable from 0.2.0, semver guaranteed)::
 
 Everything not listed in ``__all__`` is internal and may change without notice.
 """
-__version__ = "0.2.44"
+__version__ = "0.2.45"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401

{redeploy-0.2.44 → redeploy-0.2.45}/redeploy/cli/commands/device_map.py

@@ -113,7 +113,8 @@ def device_map_cmd(
 
     # ── --apply-config ─────────────────────────────────────────────────────────
     if apply_config:
-        _apply_config_from_file(console, apply_config, ssh_key)
+        from ...config_apply import apply_config_file
+        apply_config_file(apply_config, ssh_key=ssh_key, console=console)
         return
 
     # ── probe ─────────────────────────────────────────────────────────────────

{redeploy-0.2.44 → redeploy-0.2.45}/redeploy/cli/commands/hardware.py

@@ -254,131 +254,6 @@ def _apply_transform(console, p, hw, transform):
     )
 
 
-def _apply_config(console, p, config_path):
-    """Apply hardware settings from a YAML/JSON config file to the remote host.
-
-    Reads drm_outputs[].transform entries and applies them via wlr-randr + kanshi.
-    Also reads backlights[].brightness / bl_power for backlight settings.
-    """
-    import yaml
-    import json as _json
-
-    with open(config_path) as f:
-        raw = f.read()
-
-    try:
-        cfg = yaml.safe_load(raw)
-    except Exception:
-        cfg = _json.loads(raw)
-
-    applied = 0
-
-    # ── display transforms ────────────────────────────────────────────────────
-    for output in cfg.get("drm_outputs", []):
-        connector = output.get("connector", "")
-        transform = output.get("transform", "normal")
-        if not connector:
-            continue
-        if "DSI" not in connector and "HDMI" not in connector:
-            continue
-
-        # skip defaults we don't need to touch
-        if transform == "normal" and output.get("enabled") in (None, "enabled"):
-            console.print(f"[dim]  skip {connector}: transform=normal (default)[/dim]")
-            continue
-
-        console.print(f"[cyan]→ {connector}: transform={transform}[/cyan]")
-
-        # Apply via wlr-randr
-        wlr_cmd = (
-            f"WAYLAND_DISPLAY=wayland-0 XDG_RUNTIME_DIR=/run/user/$(id -u) "
-            f"wlr-randr --output {connector} --transform {transform} 2>&1"
-        )
-        r = p.run(wlr_cmd)
-        if r.ok:
-            console.print(f"[green]  ✓ wlr-randr applied[/green]")
-        else:
-            console.print(f"[yellow]  ⚠ wlr-randr: {r.out.strip() or 'no output'}[/yellow]")
-
-        applied += 1
-
-    # ── persist all DSI transforms in kanshi ─────────────────────────────────
-    dsi_outputs = [
-        o for o in cfg.get("drm_outputs", [])
-        if "DSI" in o.get("connector", "")
-    ]
-    if dsi_outputs:
-        _update_kanshi_from_cfg(console, p, dsi_outputs)
-
-    # ── backlight ─────────────────────────────────────────────────────────────
-    for bl in cfg.get("backlights", []):
-        name = bl.get("name", "")
-        brightness = bl.get("brightness")
-        bl_power = bl.get("bl_power")
-        if not name:
-            continue
-        if brightness is not None:
-            r = p.run(f"echo {brightness} | sudo tee /sys/class/backlight/{name}/brightness > /dev/null")
-            if r.ok:
-                console.print(f"[green]  ✓ backlight {name}: brightness={brightness}[/green]")
-        if bl_power is not None:
-            r = p.run(f"echo {bl_power} | sudo tee /sys/class/backlight/{name}/bl_power > /dev/null")
-            if r.ok:
-                console.print(f"[green]  ✓ backlight {name}: bl_power={bl_power}[/green]")
-        applied += 1
-
-    if applied == 0:
-        console.print("[yellow]Nothing to apply — no relevant settings found in config[/yellow]")
-    else:
-        console.print(f"\n[bold green]✓ Config applied from {config_path}[/bold green]")
-
-
-def _update_kanshi_from_cfg(console, p, dsi_outputs: list):
-    """Rebuild kanshi profile from drm_outputs list and write to ~/.config/kanshi/config."""
-    import re as _re
-
-    kanshi_cfg_path = "~/.config/kanshi/config"
-    read_r = p.run(f"cat {kanshi_cfg_path} 2>/dev/null")
-    current = read_r.out if read_r.ok else ""
-
-    for output in dsi_outputs:
-        connector = output.get("connector", "")
-        transform = output.get("transform", "normal")
-
-        output_line_pat = _re.compile(
-            rf'(\s*output\s+{_re.escape(connector)}\s+enable)(\s+transform\s+\S+)?'
-        )
-        if _re.search(output_line_pat, current):
-            if transform == "normal":
-                # Remove transform clause
-                current = _re.sub(output_line_pat, r'\1', current)
-            else:
-                current = _re.sub(output_line_pat, rf'\1 transform {transform}', current)
-        elif current.strip():
-            # output line exists but without "enable"
-            current = _re.sub(
-                rf'(\s*output\s+{_re.escape(connector)}\b)',
-                rf'\1 transform {transform}' if transform != "normal" else r'\1',
-                current,
-            )
-        else:
-            # No config at all — create minimal profile
-            current = (
-                f"profile waveshare-only {{\n"
-                f"    output {connector} enable"
-                + (f" transform {transform}" if transform != "normal" else "")
-                + "\n"
-                + "    output HDMI-A-2 disable\n"
-                + "}\n"
-            )
-
-    escaped = current.replace("'", "'\\''")
-    write_r = p.run(f"mkdir -p ~/.config/kanshi && printf '%s' '{escaped}' > {kanshi_cfg_path}")
-    if write_r.ok:
-        console.print(f"[green]  ✓ kanshi config updated ({kanshi_cfg_path})[/green]")
-    p.run("pkill -SIGUSR1 kanshi 2>/dev/null || true")
-
-
 def _execute_query(hw, query_expr, output_fmt):
     """Execute JMESPath query on hardware model and output result."""
     import jmespath
@@ -551,7 +426,8 @@ def hardware(host, output_fmt, show_fix, apply_fix_component, panel_id, list_pan
 
     # --apply-config: load YAML/JSON file and push settings to device
     if apply_config is not None:
-        _apply_config(console, p, apply_config)
+        from ...config_apply import apply_config_file
+        apply_config_file(apply_config, host=host, ssh_key=ssh_key, console=console)
         return
 
     # --set-transform: apply rotation immediately and update kanshi config

redeploy-0.2.45/redeploy/config_apply/__init__.py

@@ -0,0 +1,15 @@
+"""Shared config-apply layer for ``--apply-config`` across CLI commands.
+
+Unifies the duplicated load-host-connect-apply logic found in
+``hardware``, ``device-map``, and ``blueprint`` commands.
+"""
+from __future__ import annotations
+
+from .applier import apply_config_dict, apply_config_file
+from .loader import load_config_file
+
+__all__ = [
+    "apply_config_dict",
+    "apply_config_file",
+    "load_config_file",
+]

redeploy-0.2.45/redeploy/config_apply/applier.py

@@ -0,0 +1,72 @@
+"""Apply a declarative config dict or file to a remote host."""
+from __future__ import annotations
+
+from pathlib import Path
+
+from rich.console import Console
+
+from ..apply.state_apply import apply_state, ApplyResult
+from ..detect.remote import RemoteProbe
+from .loader import load_config_file
+
+
+def _normalize_hardware(data: dict) -> dict:
+    """Flatten nested hardware configs for state_apply handlers.
+
+    DeviceMap and DeviceBlueprint nest hardware under a ``hardware`` key,
+    while ``redeploy hardware`` produces a flat file.  This helper makes
+    both shapes palatable for :func:`apply_state`.
+    """
+    if "drm_outputs" in data or "backlights" in data:
+        return data
+    hw = data.get("hardware")
+    if isinstance(hw, dict):
+        return hw
+    return data
+
+
+def apply_config_dict(data: dict, probe: RemoteProbe, console: Console) -> ApplyResult:
+    """Apply *data* to the host behind *probe*.
+
+    Delegates to :func:`redeploy.apply.state_apply.apply_state` after
+    normalising nested ``hardware`` sections.
+    """
+    normalized = _normalize_hardware(data)
+    return apply_state(normalized, probe, console)
+
+
+def apply_config_file(
+    path: str | Path,
+    *,
+    host: str | None = None,
+    ssh_key: str | None = None,
+    console: Console | None = None,
+) -> ApplyResult:
+    """Load *path* and apply its hardware/infra settings to the remote host.
+
+    Parameters
+    ----------
+    path:
+        Local YAML/JSON file (DeviceMap, DeviceBlueprint, or flat hardware dump).
+    host:
+        Optional SSH target.  Falls back to ``data["host"]``.
+    ssh_key:
+        Private-key path for the SSH connection.
+    console:
+        Rich console for progress output.  Created automatically when ``None``.
+
+    Raises
+    ------
+    ValueError
+        If no host can be determined (neither *host* nor ``data["host"]``).
+    """
+    data = load_config_file(path)
+    _host = host or data.get("host")
+    if not _host:
+        raise ValueError("No host specified and no 'host' field in config file")
+
+    if console is None:
+        console = Console()
+
+    probe = RemoteProbe(_host, ssh_key=ssh_key)
+    return apply_config_dict(data, probe, console)

redeploy-0.2.45/redeploy/config_apply/loader.py

@@ -0,0 +1,17 @@
+"""Load a declarative config file (YAML or JSON)."""
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+import yaml
+
+
+def load_config_file(path: str | Path) -> dict:
+    """Read *path* and return a dict (YAML or JSON auto-detected)."""
+    path = Path(path)
+    raw = path.read_text(encoding="utf-8")
+    try:
+        return yaml.safe_load(raw) or {}
+    except Exception:
+        return json.loads(raw)

{redeploy-0.2.44 → redeploy-0.2.45}/redeploy/integrations/op3_bridge.py

@@ -65,10 +65,52 @@ def snapshot_to_infra_state(snapshot: "Snapshot") -> "InfraState":
 
 def snapshot_to_hardware_info(snapshot: "Snapshot") -> "HardwareInfo":
     """Convert opstree.Snapshot -> redeploy.HardwareInfo."""
-    from redeploy.models import HardwareInfo
+    from redeploy.models import HardwareInfo, DrmOutput, BacklightInfo
 
     physical = snapshot.layer("physical.display")
-    # TODO: expand mapping as op3 layer schema grows
+    os_kernel = snapshot.layer("os.kernel")
+    os_config = snapshot.layer("os.config")
+
+    if physical is None:
+        return HardwareInfo()
+
+    # Map DRM outputs (op3 field names differ slightly from redeploy)
+    drm_raw = physical.data.get("drm_outputs", [])
+    drm_outputs = []
+    for d in drm_raw:
+        drm_outputs.append(DrmOutput(
+            name=d.get("name", ""),
+            connector=d.get("connector", ""),
+            status=d.get("status", "unknown"),
+            enabled=d.get("enabled", "unknown"),
+            modes=d.get("modes", []),
+            transform=d.get("transform", "normal"),
+            position=d.get("position", "0,0"),
+            scale=d.get("scale", "1.0"),
+            edid_bytes=d.get("edid_bytes", 0),
+            power_state=d.get("dpms"),
+            sysfs_path=f"/sys/class/drm/{d.get('name', '')}",
+        ))
+
+    # Map backlights
+    bl_raw = physical.data.get("backlights", [])
+    backlights = []
+    for b in bl_raw:
+        backlights.append(BacklightInfo(
+            name=b.get("name", ""),
+            brightness=b.get("brightness", 0),
+            max_brightness=b.get("max_brightness", 255),
+            bl_power=b.get("bl_power", 0),
+            display_name=b.get("display_name"),
+            sysfs_path=f"/sys/class/backlight/{b.get('name', '')}",
+        ))
+
     return HardwareInfo(
-        device_model=physical.data.get("model") if physical else None,
+        board=physical.data.get("board_model"),
+        kernel=os_kernel.data.get("version") if os_kernel else None,
+        config_txt=os_config.data.get("config_txt", "") if os_config else "",
+        config_txt_path=os_config.data.get("config_txt_path", "/boot/firmware/config.txt") if os_config else "/boot/firmware/config.txt",
+        drm_outputs=drm_outputs,
+        backlights=backlights,
+        framebuffers=physical.data.get("framebuffers", []),
     )

{redeploy-0.2.44 → redeploy-0.2.45}/redeploy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.44
+Version: 0.2.45
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -30,17 +30,17 @@ Requires-Dist: op3>=0.1.4; extra == "op3"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.44-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-21.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.45-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$7.50-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-23.2h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (65 commits)
-- 👤 **Human dev:** ~$2136 (21.4h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (66 commits)
+- 👤 **Human dev:** ~$2318 (23.2h @ $100/h, 30min dedup)
 
 Generated on 2026-04-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.44-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.45-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.44 → redeploy-0.2.45}/redeploy.egg-info/SOURCES.txt

@@ -68,6 +68,9 @@ redeploy/cli/commands/version/helpers.py
 redeploy/cli/commands/version/monorepo.py
 redeploy/cli/commands/version/release.py
 redeploy/cli/commands/version/scanner.py
+redeploy/config_apply/__init__.py
+redeploy/config_apply/applier.py
+redeploy/config_apply/loader.py
 redeploy/detect/__init__.py
 redeploy/detect/detector.py
 redeploy/detect/hardware.py