redeploy 0.2.40__tar.gz → 0.2.41__tar.gz

{redeploy-0.2.40 → redeploy-0.2.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.40
+Version: 0.2.41
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -27,17 +27,17 @@ Requires-Dist: pfix>=0.1.60; extra == "dev"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.40-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-19.7h-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.41-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-20.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (61 commits)
-- 👤 **Human dev:** ~$1974 (19.7h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (62 commits)
+- 👤 **Human dev:** ~$2044 (20.4h @ $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.40-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.41-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.40 → redeploy-0.2.41}/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.40-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-19.7h-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.41-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-20.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (61 commits)
-- 👤 **Human dev:** ~$1974 (19.7h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (62 commits)
+- 👤 **Human dev:** ~$2044 (20.4h @ $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.40-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.41-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.40 → redeploy-0.2.41}/pyproject.toml

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

{redeploy-0.2.40 → redeploy-0.2.41}/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.40"
+__version__ = "0.2.41"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401

{redeploy-0.2.40 → redeploy-0.2.41}/redeploy/cli/commands/blueprint.py

@@ -53,7 +53,7 @@ def blueprint_cmd():
 @click.option("--save", is_flag=True, help="Save to ~/.config/redeploy/blueprints/")
 @click.option("--out", "out_path", default=None, type=click.Path(),
               help="Save to specific file instead")
-@click.option("--format", "fmt", default="yaml", type=click.Choice(["rich", "yaml", "json"]))
+@click.option("--format", "fmt", default="yaml", type=click.Choice(["yaml", "json"]))
 @click.option("--tag", "tags", multiple=True)
 def capture(host, name, compose_files, migration_file, device_map_file,
             live, save, out_path, fmt, tags):
@@ -83,7 +83,11 @@ def capture(host, name, compose_files, migration_file, device_map_file,
             host=host,
         )
 
-    _print_blueprint(console, bp, fmt)
+    if fmt == "json":
+        import json as _json
+        click.echo(_json.dumps(bp.model_dump(mode="json"), indent=2))
+    else:
+        click.echo(bp.to_yaml())
 
     if save or out_path:
         path = Path(out_path) if out_path else None
@@ -91,6 +95,68 @@ def capture(host, name, compose_files, migration_file, device_map_file,
         console.print(f"\n[green]✓ saved:[/green] {saved}")
 
 
+def _apply_blueprint_config(bp, config_path):
+    """Apply blueprint settings from YAML config file to the remote host.
+
+    Reads blueprint YAML/JSON and applies hardware settings (transforms, backlight, etc.).
+    """
+    import yaml
+    import json as _json
+
+    from ...remote import Remote
+
+    with open(config_path) as f:
+        raw = f.read()
+
+    try:
+        cfg = yaml.safe_load(raw)
+    except Exception:
+        cfg = _json.loads(raw)
+
+    host = cfg.get("host") or getattr(bp, "host", None)
+    if not host:
+        print("[red]✗ No 'host' field in config file[/red]")
+        return
+
+    print(f"[cyan]→ Applying blueprint config from {config_path} to {host}[/cyan]")
+
+    p = Remote(host)
+
+    # Apply hardware settings (reuse logic from device-map)
+    hardware = cfg.get("hardware", {})
+    applied = 0
+
+    for output in hardware.get("drm_outputs", []):
+        connector = output.get("connector", "")
+        transform = output.get("transform", "normal")
+        if not connector or not ("DSI" in connector or "HDMI" in connector):
+            continue
+
+        if transform != "normal":
+            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:
+                print(f"[green]  ✓ {connector}: transform={transform}[/green]")
+                applied += 1
+
+    for bl in hardware.get("backlights", []):
+        name = bl.get("name", "")
+        brightness = bl.get("brightness")
+        if name and brightness is not None:
+            r = p.run(f"echo {brightness} | sudo tee /sys/class/backlight/{name}/brightness > /dev/null")
+            if r.ok:
+                print(f"[green]  ✓ backlight {name}: brightness={brightness}[/green]")
+                applied += 1
+
+    if applied > 0:
+        print(f"[bold green]✓ Blueprint config applied from {config_path}[/bold green]")
+    else:
+        print("[yellow]Nothing to apply[/yellow]")
+
+
 # ── twin ──────────────────────────────────────────────────────────────────────
 
 @blueprint_cmd.command("twin")
@@ -180,13 +246,30 @@ def deploy(blueprint_file, target_host, out_path, remote_dir, no_transfer,
 
 @blueprint_cmd.command("show")
 @click.argument("blueprint_file", type=click.Path(exists=True))
-@click.option("--format", "fmt", default="yaml", type=click.Choice(["rich", "yaml", "json"]))
-def show(blueprint_file, fmt):
-    """Display a saved DeviceBlueprint."""
+@click.option("--format", "fmt", default="yaml", type=click.Choice(["yaml", "json"]))
+@click.option("--apply-config", "apply_config", default=None,
+              type=click.Path(exists=True, dir_okay=False),
+              help="Apply blueprint settings from YAML config file to the remote host")
+def show(blueprint_file, fmt, apply_config):
+    """Display a saved DeviceBlueprint.
+
+    \b
+    Config-file workflow (scan → edit → apply):
+        redeploy blueprint capture pi@192.168.188.109 > blueprint.yaml
+        # edit blueprint.yaml: set hardware.drm_outputs[0].transform: '270'
+        redeploy blueprint show blueprint.yaml --apply-config blueprint.yaml
+    """
     from ...models import DeviceBlueprint
 
     bp = DeviceBlueprint.load(Path(blueprint_file))
-    _print_blueprint(Console(), bp, fmt)
+    if fmt == "json":
+        import json as _json
+        click.echo(_json.dumps(bp.model_dump(mode="json"), indent=2))
+    else:
+        click.echo(bp.to_yaml())
+
+    if apply_config:
+        _apply_blueprint_config(bp, apply_config)
 
 
 # ── list ──────────────────────────────────────────────────────────────────────

{redeploy-0.2.40 → redeploy-0.2.41}/redeploy/cli/commands/device_map.py

@@ -39,22 +39,21 @@ from rich.table import Table
 @click.option("--tag", "tags", multiple=True, help="Tag(s) to attach (repeatable)")
 @click.option("--save", is_flag=True, help="Persist map to ~/.config/redeploy/device-maps/")
 @click.option("--out", "out_path", default=None, type=click.Path(), help="Save to specific file")
-@click.option(
-    "--format", "output_fmt",
-    default="yaml",
-    type=click.Choice(["rich", "yaml", "json"]),
-    help="Output format",
-)
+@click.option("--format", "output_fmt", default="yaml",
+              type=click.Choice(["yaml", "json"]), help="Output format (default: yaml)")
 @click.option("--no-infra", is_flag=True, help="Skip infra probe (faster — hardware only)")
 @click.option("--list", "list_saved", is_flag=True, help="List saved device maps")
 @click.option("--show", "show_file", default=None, type=click.Path(exists=True),
               help="Load and display a saved device-map file")
 @click.option("--diff", "diff_files", nargs=2, type=click.Path(exists=True),
               help="Diff two saved device-map files")
+@click.option("--apply-config", "apply_config", default=None,
+              type=click.Path(exists=True, dir_okay=False),
+              help="Apply hardware/infra settings from YAML config file to the remote host")
 @click.option("--ssh-key", default=None, type=click.Path(), help="SSH private key path")
 def device_map_cmd(
     host, name, tags, save, out_path, output_fmt,
-    no_infra, list_saved, show_file, diff_files, ssh_key,
+    no_infra, list_saved, show_file, diff_files, ssh_key, apply_config,
 ):
     """Generate a full standardized device snapshot (hardware + infra + diagnostics).
 
@@ -65,9 +64,14 @@ def device_map_cmd(
     Examples:
         redeploy device-map pi@192.168.188.109
         redeploy device-map pi@192.168.188.109 --save --name "kiosk-lab"
-        redeploy device-map pi@192.168.188.109 --format yaml > rpi5.yaml
         redeploy device-map --list
         redeploy device-map --show ~/.config/redeploy/device-maps/pi_at_192.168.188.109.yaml
+
+    \b
+    Config-file workflow (scan → edit → apply):
+        redeploy device-map pi@192.168.188.109 > device-map.yaml
+        # edit device-map.yaml: set hardware.drm_outputs[0].transform: '270'
+        redeploy device-map pi@192.168.188.109 --apply-config device-map.yaml
     """
     from ...models import DeviceMap
 
@@ -81,7 +85,7 @@ def device_map_cmd(
     # ── --show ────────────────────────────────────────────────────────────────
     if show_file:
         dm = DeviceMap.load(Path(show_file))
-        _render(console, dm, output_fmt)
+        click.echo(dm.to_yaml())
         return
 
     # ── --diff ────────────────────────────────────────────────────────────────
@@ -153,14 +157,11 @@ def device_map_cmd(
     )
 
     # ── output ────────────────────────────────────────────────────────────────
-    if output_fmt in ("yaml", "json"):
-        if output_fmt == "yaml":
-            click.echo(dm.to_yaml())
-        else:
-            import json as _json
-            click.echo(_json.dumps(dm.model_dump(mode="json"), indent=2))
+    if output_fmt == "json":
+        import json as _json
+        click.echo(_json.dumps(dm.model_dump(mode="json"), indent=2))
     else:
-        _render(console, dm, "rich")
+        click.echo(dm.to_yaml())
 
     # ── save ──────────────────────────────────────────────────────────────────
     if save or out_path:
@@ -172,6 +173,143 @@ def device_map_cmd(
         sys.exit(1)
 
 
+def _apply_config_from_file(console, config_path, ssh_key):
+    """Apply hardware/infra settings from YAML/JSON config file to the remote host.
+
+    Reads DeviceMap YAML/JSON and applies:
+    - Display transforms via wlr-randr + kanshi
+    - Backlight settings
+    - Other configurable hardware parameters
+    """
+    import yaml
+    import json as _json
+
+    from ...remote import Remote
+
+    with open(config_path) as f:
+        raw = f.read()
+
+    try:
+        cfg = yaml.safe_load(raw)
+    except Exception:
+        cfg = _json.loads(raw)
+
+    # Extract host from config or prompt
+    host = cfg.get("host")
+    if not host:
+        console.print("[red]✗ No 'host' field in config file[/red]")
+        sys.exit(1)
+
+    console.print(f"[cyan]→ Applying config from {config_path} to {host}[/cyan]")
+
+    # Connect to remote
+    p = Remote(host, ssh_key=ssh_key)
+
+    applied = 0
+
+    # ── display transforms ────────────────────────────────────────────────────
+    hardware = cfg.get("hardware", {})
+    for output in hardware.get("drm_outputs", []):
+        connector = output.get("connector", "")
+        transform = output.get("transform", "normal")
+        if not connector or not ("DSI" in connector or "HDMI" in connector):
+            continue
+
+        if transform == "normal":
+            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]")
+            applied += 1
+        else:
+            console.print(f"[yellow]  ⚠ wlr-randr: {r.out.strip() or 'no output'}[/yellow]")
+
+    # ── persist DSI transforms in kanshi ─────────────────────────────────────────
+    dsi_outputs = [
+        o for o in hardware.get("drm_outputs", [])
+        if "DSI" in o.get("connector", "")
+    ]
+    if dsi_outputs:
+        _update_kanshi_from_cfg(console, p, dsi_outputs)
+
+    # ── backlight ─────────────────────────────────────────────────────────────
+    for bl in hardware.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]")
+                applied += 1
+
+        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":
+                current = _re.sub(output_line_pat, r'\1', current)
+            else:
+                current = _re.sub(output_line_pat, rf'\1 transform {transform}', current)
+        elif current.strip():
+            current = _re.sub(
+                rf'(\s*output\s+{_re.escape(connector)}\b)',
+                rf'\1 transform {transform}' if transform != "normal" else r'\1',
+                current,
+            )
+        else:
+            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")
+
+
 # ── rendering helpers ─────────────────────────────────────────────────────────
 
 

redeploy-0.2.41/redeploy/cli/commands/diagnose.py

@@ -0,0 +1,47 @@
+"""diagnose command — Compare a migration spec against the live target host."""
+from __future__ import annotations
+
+import sys
+
+import click
+import yaml
+
+
+@click.command()
+@click.argument("spec", type=click.Path(exists=True, dir_okay=False))
+@click.option("--host", default=None, help="Override target host (default: spec.target.host)")
+@click.option("--ssh-key", default=None, type=click.Path(), help="Path to SSH private key")
+@click.option("--format", "output_fmt", default="yaml", type=click.Choice(["yaml", "json"]), help="Output format (default: yaml)")
+@click.option("--exit-on-fail", is_flag=True, help="Exit with non-zero status if any check fails")
+@click.pass_context
+def diagnose(ctx, spec, host, ssh_key, output_fmt, exit_on_fail):
+    """Compare a migration spec against the live target host.
+
+    Walks the spec (YAML or markpact .md), derives all expected facts
+    (binaries, directories, ports, container images, systemd units,
+    apt packages, env files, free disk) and probes the target read-only
+    via SSH. Reports what is missing or out of spec — without applying
+    any change.
+
+    \b
+    Examples:
+        redeploy diagnose migration.podman-rpi5-resume.md
+        redeploy diagnose migration.yaml --host pi@192.168.188.108
+        redeploy diagnose migration.yaml --format json
+    """
+    from ...audit import audit_spec
+
+    try:
+        report = audit_spec(spec, host=host, ssh_key=ssh_key)
+    except Exception as exc:
+        click.echo(f"audit failed: {exc}", err=True)
+        sys.exit(2)
+
+    if output_fmt == "json":
+        import json as _json
+        click.echo(_json.dumps(report.to_dict(), indent=2))
+    else:
+        click.echo(yaml.safe_dump(report.to_dict(), sort_keys=False))
+
+    if exit_on_fail and not report.ok:
+        sys.exit(1)

{redeploy-0.2.40 → redeploy-0.2.41}/redeploy/cli/commands/diff.py

@@ -19,11 +19,7 @@ from rich.console import Console
     "--to", "to_src", default=None,
     help="Right side: IaC file/directory or SSH host"
 )
-@click.option(
-    "--format", "out_format", default="json",
-    type=click.Choice(["text", "json"]), show_default=True
-)
-def diff(ci_file, host, from_src, to_src, out_format):
+def diff(ci_file, host, from_src, to_src):
     """Compare IaC file vs live host (drift detection).  [Phase 3 — coming soon]
 
     \b

{redeploy-0.2.40 → redeploy-0.2.41}/redeploy/cli/commands/export.py

@@ -9,10 +9,6 @@ from rich.console import Console
 
 
 @click.command("export")
-@click.option(
-    "--format", "fmt", default="yaml", type=click.Choice(["css", "yaml"]),
-    help="Output format (css or yaml)"
-)
 @click.option(
     "-o", "--output", default=None, type=click.Path(),
     help="Output file (default: print to stdout)"
@@ -21,19 +17,23 @@ from rich.console import Console
     "--file", "src_file", default=None, type=click.Path(),
     help="Source file to convert (auto-detected if omitted)"
 )
+@click.option(
+    "--format", "fmt", default="yaml", type=click.Choice(["yaml", "css"]),
+    help="Output format (default: yaml)"
+)
 @click.pass_context
-def export_cmd(ctx, fmt, output, src_file):
+def export_cmd(ctx, output, src_file, fmt):
     """Convert between redeploy.css and redeploy.yaml formats.
 
-    Reads the nearest redeploy.css or redeploy.yaml and exports to the
-    requested format. Useful for migration, sharing, and LLM inspection.
+    Reads the nearest redeploy.css or redeploy.yaml and exports to YAML.
+    Useful for migration, sharing, and LLM inspection.
 
     \b
     Examples:
+        redeploy export                          # auto-detect source → yaml (stdout)
+        redeploy export -o redeploy.yaml        # auto-detect source → yaml (file)
+        redeploy export --file redeploy.css     # css → yaml
         redeploy export --format css            # yaml → css (stdout)
-        redeploy export --format css -o redeploy.css
-        redeploy export --format yaml -o redeploy.yaml
-        redeploy export --format yaml --file redeploy.css
     """
     console = Console(stderr=True)