redeploy 0.2.47__tar.gz → 0.2.48__tar.gz

{redeploy-0.2.47 → redeploy-0.2.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.47
+Version: 0.2.48
 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.8; extra == "op3"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.47-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-24.0h-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.48-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-24.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (68 commits)
-- 👤 **Human dev:** ~$2398 (24.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (69 commits)
+- 👤 **Human dev:** ~$2440 (24.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.47-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.48-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.47 → redeploy-0.2.48}/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.47-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-24.0h-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.48-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-24.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (68 commits)
-- 👤 **Human dev:** ~$2398 (24.0h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (69 commits)
+- 👤 **Human dev:** ~$2440 (24.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.47-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.48-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.47 → redeploy-0.2.48}/pyproject.toml

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

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

{redeploy-0.2.47 → redeploy-0.2.48}/redeploy/cli/__init__.py

@@ -54,6 +54,7 @@ from .commands.device_map import device_map_cmd
 from .commands.blueprint import blueprint_cmd
 from .commands.init import init
 from .commands.status import status
+from .commands.bump_fix import bump_cmd, fix_cmd
 
 # Register commands
 cli.add_command(audit)
@@ -86,6 +87,8 @@ cli.add_command(status)
 cli.add_command(target)
 cli.add_command(version_cmd)
 cli.add_command(workflow_cmd)
+cli.add_command(bump_cmd, name="bump")
+cli.add_command(fix_cmd, name="fix")
 
 
 # Backward compatibility: _resolve_device for tests

{redeploy-0.2.47 → redeploy-0.2.48}/redeploy/cli/commands/blueprint.py

@@ -97,26 +97,8 @@ def capture(host, name, compose_files, migration_file, device_map_file,
 
 def _execute_query_blueprint(bp, query_expr, output_fmt):
     """Execute JMESPath query on DeviceBlueprint model and output result."""
-    import jmespath
-    import json as _json
-
-    data = bp.model_dump(mode="json")
-
-    try:
-        result = jmespath.search(query_expr, data)
-    except jmespath.exceptions.JMESPathError as e:
-        print(f"[red]✗ JMESPath error:[/red] {e}")
-        sys.exit(1)
-
-    if result is None:
-        print("[dim]No match found for query[/dim]")
-        return
-
-    if output_fmt == "json":
-        click.echo(_json.dumps(result, indent=2, default=str))
-    else:
-        import yaml
-        click.echo(yaml.safe_dump(result, sort_keys=False, default_flow_style=False))
+    from ...cli.query import execute_query
+    execute_query(bp, query_expr, output_fmt, echo=click.echo)
 
 
 # ── twin ──────────────────────────────────────────────────────────────────────

redeploy-0.2.48/redeploy/cli/commands/bump_fix.py

@@ -0,0 +1,245 @@
+"""bump and fix commands — version bumping and self-healing deploy."""
+from __future__ import annotations
+
+import re
+import sys
+from pathlib import Path
+
+import click
+from rich.console import Console
+
+
+# ── helpers ──────────────────────────────────────────────────────────────────
+
+def _find_spec(spec_arg: str) -> Path:
+    """Resolve spec path from '.' (use migration.yaml/migration.md) or explicit path."""
+    p = Path(spec_arg)
+    if p.is_dir():
+        for candidate in ["migration.md", "migration.yaml", "migration.yml"]:
+            c = p / candidate
+            if c.exists():
+                return c
+        # also check one level up for c2004 project pattern
+        for sub in sorted(p.rglob("migration.md"), key=lambda x: len(x.parts)):
+            return sub
+        for sub in sorted(p.rglob("migration.yaml"), key=lambda x: len(x.parts)):
+            return sub
+        raise click.ClickException(f"No migration spec found under {spec_arg!r}")
+    if not p.exists():
+        raise click.ClickException(f"Spec not found: {spec_arg!r}")
+    return p
+
+
+def _find_version_file(spec_path: Path) -> Path | None:
+    """Walk up from spec to find VERSION file."""
+    for parent in [spec_path.parent, spec_path.parent.parent,
+                   spec_path.parent.parent.parent, Path.cwd()]:
+        v = parent / "VERSION"
+        if v.exists():
+            return v
+    return None
+
+
+def _bump_patch(version: str) -> str:
+    """Bump the patch component: 1.0.30 → 1.0.31."""
+    m = re.match(r"^(\d+\.\d+\.)(\d+)(.*)", version.strip())
+    if not m:
+        raise click.ClickException(f"Cannot parse version: {version!r}")
+    return f"{m.group(1)}{int(m.group(2)) + 1}{m.group(3)}"
+
+
+def _bump_version_file(version_file: Path, console: Console) -> str:
+    """Read, increment patch, write back. Returns new version."""
+    old = version_file.read_text().strip()
+    new = _bump_patch(old)
+    version_file.write_text(new + "\n")
+    console.print(f"[green]bump[/green] {old} → [bold]{new}[/bold]  ({version_file})")
+    return new
+
+
+def _update_migration_header(spec_path: Path, new_version: str) -> None:
+    """Update 'version:' line in spec file header if present."""
+    text = spec_path.read_text()
+    updated = re.sub(
+        r"^(version:\s*)[\w\.\-]+",
+        lambda m: f"{m.group(1)}{new_version}",
+        text, flags=re.MULTILINE
+    )
+    if updated != text:
+        spec_path.write_text(updated)
+
+
+def _load_dotenv() -> None:
+    try:
+        from dotenv import load_dotenv
+        for candidate in [Path(".env"), Path.home() / ".redeploy" / ".env"]:
+            if candidate.exists():
+                load_dotenv(candidate, override=False)
+                break
+    except ImportError:
+        pass
+
+
+# ── bump command ──────────────────────────────────────────────────────────────
+
+@click.command("bump")
+@click.argument("spec_or_dir", default=".", metavar="PATH")
+@click.option(
+    "--minor", is_flag=True, help="Bump minor instead of patch (1.0.x → 1.1.0)"
+)
+@click.option(
+    "--major", is_flag=True, help="Bump major instead of patch (1.x.y → 2.0.0)"
+)
+def bump_cmd(spec_or_dir, minor, major):
+    """Bump the project version (patch by default).
+
+    \b
+    PATH is a spec file or directory containing migration.yaml / migration.md.
+    '.' uses the current directory.
+
+    \b
+    Examples:
+        redeploy bump .
+        redeploy bump redeploy/pi109/migration.md
+        redeploy bump . --minor
+    """
+    console = Console()
+    spec_path = _find_spec(spec_or_dir)
+    version_file = _find_version_file(spec_path)
+
+    if version_file is None:
+        console.print(
+            "[yellow]No VERSION file found — creating one alongside spec[/yellow]"
+        )
+        version_file = spec_path.parent / "VERSION"
+        version_file.write_text("1.0.0\n")
+
+    old = version_file.read_text().strip()
+
+    if major:
+        m = re.match(r"^(\d+)(.*)", old)
+        new = f"{int(m.group(1)) + 1}.0.0" if m else old
+    elif minor:
+        m = re.match(r"^(\d+)\.(\d+)(.*)", old)
+        new = f"{m.group(1)}.{int(m.group(2)) + 1}.0" if m else old
+    else:
+        new = _bump_patch(old)
+
+    version_file.write_text(new + "\n")
+    console.print(f"[green]bump[/green] {old} → [bold]{new}[/bold]  ({version_file})")
+    _update_migration_header(spec_path, new)
+    console.print(f"[dim]updated spec header: {spec_path}[/dim]")
+
+
+# ── fix command ───────────────────────────────────────────────────────────────
+
+@click.command("fix")
+@click.argument("spec_or_dir", default=".", metavar="PATH")
+@click.option(
+    "--hint", "-m", default=None, metavar="TEXT",
+    help='Describe the problem, e.g. --hint "brak ikon SVG w menu"'
+)
+@click.option(
+    "--bump/--no-bump", default=True,
+    help="Bump version before deploying (default: on)"
+)
+@click.option(
+    "--retries", default=3, show_default=True,
+    help="Max LLM self-healing attempts"
+)
+@click.option("--dry-run", is_flag=True, help="Plan only, no apply")
+@click.option(
+    "--env", "env_name", default="",
+    help="Named environment from redeploy.yaml"
+)
+def fix_cmd(spec_or_dir, hint, bump, retries, dry_run, env_name):
+    """Self-healing deploy: bump version, then run with LLM auto-fix on failure.
+
+    \b
+    PATH is a spec file or directory containing migration.yaml / migration.md.
+    '.' uses the current directory.
+
+    \b
+    Examples:
+        redeploy fix .
+        redeploy fix . --hint "brak ikon SVG w menu"
+        redeploy fix redeploy/pi109/migration.md --no-bump
+        redeploy fix . --hint "chromium nie startuje" --retries 5
+    """
+    console = Console()
+    _load_dotenv()
+
+    spec_path = _find_spec(spec_or_dir)
+
+    # Bump version first
+    version = ""
+    if bump and not dry_run:
+        version_file = _find_version_file(spec_path)
+        if version_file is None:
+            version_file = spec_path.parent / "VERSION"
+            version_file.write_text("1.0.0\n")
+        version = _bump_version_file(version_file, console)
+        _update_migration_header(spec_path, version)
+
+    if hint:
+        console.print(f"[cyan]hint:[/cyan] {hint}")
+
+    # Load spec + plan (reuse plan_apply helpers)
+    from ..core import load_spec_or_exit
+    from ...plan import Planner
+    from ...plugins import load_user_plugins
+    from ...models import ProjectManifest
+
+    manifest = ProjectManifest.find_and_load(Path.cwd())
+    spec = load_spec_or_exit(console, str(spec_path))
+
+    # Apply manifest overlays if any
+    if manifest and env_name:
+        env = manifest.environments.get(env_name)
+        if env:
+            if env.host:
+                spec.target.host = env.host
+
+    console.print(
+        f"\n[bold]plan[/bold]  [dim]({spec_path})[/dim]"
+    )
+    planner = Planner.from_spec(spec)
+    migration = planner.run()
+
+    from ..display import print_plan_table
+    print_plan_table(console, migration)
+
+    if dry_run:
+        console.print("\n[dim]--dry-run: stopping before apply[/dim]")
+        return
+
+    load_user_plugins()
+
+    _print_banner(console, hint)
+    version = version or _detect_version(spec_path)
+
+    from ...heal import HealRunner
+    runner = HealRunner(
+        migration=migration,
+        spec_path=spec_path,
+        host=migration.host,
+        fix_hint=hint or "",
+        max_retries=retries,
+        dry_run=dry_run,
+        console=console,
+        version=version,
+    )
+    ok = runner.run()
+    if not ok:
+        sys.exit(1)
+
+
+def _print_banner(console: Console, hint: str | None) -> None:
+    console.print("\n[bold green]fix[/bold green] [dim]heal mode: on[/dim]")
+    if hint:
+        console.print(f"[cyan]user hint:[/cyan] {hint}")
+
+
+def _detect_version(spec_path: Path) -> str:
+    vf = _find_version_file(spec_path)
+    return vf.read_text().strip() if vf else ""

{redeploy-0.2.47 → redeploy-0.2.48}/redeploy/cli/commands/device_map.py

@@ -197,26 +197,8 @@ def device_map_cmd(
 
 def _execute_query_device_map(console, dm, query_expr, output_fmt):
     """Execute JMESPath query on DeviceMap model and output result."""
-    import jmespath
-    import json as _json
-
-    data = dm.model_dump(mode="json")
-
-    try:
-        result = jmespath.search(query_expr, data)
-    except jmespath.exceptions.JMESPathError as e:
-        console.print(f"[red]✗ JMESPath error:[/red] {e}")
-        sys.exit(1)
-
-    if result is None:
-        console.print("[dim]No match found for query[/dim]")
-        return
-
-    if output_fmt == "json":
-        click.echo(_json.dumps(result, indent=2, default=str))
-    else:
-        import yaml
-        click.echo(yaml.safe_dump(result, sort_keys=False, default_flow_style=False))
+    from ...cli.query import execute_query
+    execute_query(dm, query_expr, output_fmt, echo=console.print)
 
 
 # ── rendering helpers ─────────────────────────────────────────────────────────

redeploy-0.2.48/redeploy/steps/__init__.py

@@ -0,0 +1,76 @@
+"""Step library — pre-defined, reusable named MigrationSteps.
+
+Usage in a MigrationSpec::
+
+    extra_steps:
+      - id: flush_k3s_iptables   # references a library step by id
+      - id: stop_nginx
+      - id: http_health_check
+        url: https://myapp.example.com/health
+
+Usage from Python::
+
+    from redeploy.steps import StepLibrary
+    steps = StepLibrary.get("flush_k3s_iptables")
+"""
+from __future__ import annotations
+
+from typing import Any, Optional
+
+from ..models import MigrationStep
+
+from . import builtins, kiosk
+
+# Merge domain modules into a single flat registry.
+_LIBRARY: dict[str, MigrationStep] = {
+    s.id: s for s in (builtins.ALL + kiosk.ALL)
+}
+
+
+class StepLibrary:
+    """Registry of pre-defined named MigrationSteps.
+
+    Steps are returned as copies so callers can override individual fields::
+
+        step = StepLibrary.get("http_health_check")
+        step.url = "https://myapp.example.com/health"
+        step.expect = "1.0.20"
+    """
+
+    @staticmethod
+    def get(step_id: str, **overrides: Any) -> Optional[MigrationStep]:
+        """Return a copy of a named step, optionally with field overrides.
+
+        Returns ``None`` if the step_id is not in the library.
+        """
+        template = _LIBRARY.get(step_id)
+        if template is None:
+            return None
+        data = template.model_dump()
+        data.update(overrides)
+        return MigrationStep(**data)
+
+    @staticmethod
+    def list() -> list[str]:
+        """Return sorted list of available step IDs."""
+        return sorted(_LIBRARY.keys())
+
+    @staticmethod
+    def all() -> dict[str, MigrationStep]:
+        """Return full registry (copies)."""
+        return {k: v.model_copy() for k, v in _LIBRARY.items()}
+
+    @staticmethod
+    def resolve_from_spec(raw: dict[str, Any]) -> MigrationStep:
+        """Resolve a raw dict (from migration YAML extra_steps) to a MigrationStep.
+
+        If ``id`` matches a library entry and no ``action`` is given, use the
+        library template as base and merge the raw dict on top.
+        """
+        step_id = raw.get("id", "")
+        template = _LIBRARY.get(step_id)
+        if template:
+            data = template.model_dump()
+            data.update({k: v for k, v in raw.items() if v is not None})
+            return MigrationStep(**data)
+        return MigrationStep(**raw)