redeploy 0.2.46__tar.gz → 0.2.47__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.46
+Version: 0.2.47
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -23,24 +23,24 @@ Requires-Dist: goal>=2.1.0; extra == "dev"
 Requires-Dist: costs>=0.1.20; extra == "dev"
 Requires-Dist: pfix>=0.1.60; extra == "dev"
 Provides-Extra: op3
-Requires-Dist: op3>=0.1.4; extra == "op3"
+Requires-Dist: op3>=0.1.8; extra == "op3"
 
 # redeploy
 
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.46-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.6h-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.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)
 
-- 🤖 **LLM usage:** $7.5000 (67 commits)
-- 👤 **Human dev:** ~$2360 (23.6h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (68 commits)
+- 👤 **Human dev:** ~$2398 (24.0h @ $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.46-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.47-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.46 → redeploy-0.2.47}/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.46-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.6h-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.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)
 
-- 🤖 **LLM usage:** $7.5000 (67 commits)
-- 👤 **Human dev:** ~$2360 (23.6h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (68 commits)
+- 👤 **Human dev:** ~$2398 (24.0h @ $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.46-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.47-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.46 → redeploy-0.2.47}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redeploy"
-version = "0.2.46"
+version = "0.2.47"
 description = "Infrastructure migration toolkit: detect → plan → apply"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -32,7 +32,7 @@ dev = ["pytest>=8.0", "ruff>=0.4",
     "costs>=0.1.20",
     "pfix>=0.1.60",
 ]
-op3 = ["op3>=0.1.4"]
+op3 = ["op3>=0.1.8"]
 
 [tool.ruff]
 line-length = 100

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

redeploy-0.2.47/redeploy/blueprint/extractor.py

@@ -0,0 +1,117 @@
+"""Blueprint extractor — derive a DeviceBlueprint from multiple sources.
+
+Sources (in order of priority):
+1. Running InfraState (podman ps / docker inspect on live device)
+2. DeviceMap hardware snapshot
+3. docker-compose YAML files
+4. markpact / migration YAML definitions
+
+The extractor reconciles all available information into a single
+DeviceBlueprint that is self-contained and portable.
+"""
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Optional
+
+from ..models import (
+    BlueprintSource,
+    DeviceBlueprint,
+    DeviceMap,
+    InfraState,
+    ServiceSpec,
+)
+
+
+def extract_blueprint(
+    *,
+    name: str,
+    device_map: Optional[DeviceMap] = None,
+    infra: Optional[InfraState] = None,
+    compose_files: Optional[list[Path]] = None,
+    migration_file: Optional[Path] = None,
+    markpact_files: Optional[list[Path]] = None,
+    version: str = "0.0.0",
+    description: str = "",
+    tags: Optional[list[str]] = None,
+    detect_live: bool = False,
+    host: Optional[str] = None,
+) -> DeviceBlueprint:
+    """Build a DeviceBlueprint by reconciling all available sources.
+
+    Parameters
+    ----------
+    name:
+        Human-readable blueprint name, e.g. ``"c2004-kiosk"``.
+    device_map:
+        Previously saved DeviceMap (hardware + infra snapshot).
+    infra:
+        InfraState if already probed (skips live detection).
+    compose_files:
+        Local docker-compose YAML files to parse service specs from.
+    migration_file:
+        Local migration.yaml to extract app version and strategy from.
+    markpact_files:
+        Local markdown files with markpact fenced blocks.
+    detect_live:
+        If True and *host* is given, probe the host via SSH for a fresh
+        InfraState even if *device_map* already has one.
+    host:
+        SSH target used when ``detect_live=True``.
+    """
+    if detect_live and host and not infra:
+        from ..detect import Detector
+        infra = infra or Detector(host).run()
+
+    from .sources.compose import merge_compose_files
+    from .sources.hardware import build_hw_requirements
+    from .sources.infra import extract_services_from_infra, infer_app_url
+    from .sources.migration import parse_migration_meta
+
+    # Prefer freshly probed infra, fall back to device_map.infra
+    _infra: Optional[InfraState] = infra or (device_map.infra if device_map else None)
+    _hw = device_map.hardware if device_map else None
+
+    services: list[ServiceSpec] = []
+    seen: set[str] = set()
+
+    # ── 1. Live InfraState ────────────────────────────────────────────────────
+    if _infra:
+        services.extend(extract_services_from_infra(_infra, seen))
+
+    # ── 2. docker-compose files ───────────────────────────────────────────────
+    merge_compose_files(list(compose_files or []), services, seen)
+
+    # ── 3. migration.yaml ─────────────────────────────────────────────────────
+    app_version = version
+    deploy_strategy = "podman_quadlet"
+    if migration_file and migration_file.exists():
+        meta = parse_migration_meta(migration_file)
+        app_version = meta.get("version", version)
+        deploy_strategy = meta.get("strategy", deploy_strategy)
+
+    # ── 4. Hardware requirements ────────────────────────────────────────────
+    hw_req = build_hw_requirements(_hw)
+
+    # ── 5. App URL ────────────────────────────────────────────────────────────
+    app_url = infer_app_url(_infra)
+
+    source = BlueprintSource(
+        device_id=device_map.id if device_map else host,
+        device_name=device_map.name if device_map else "",
+        migration_file=str(migration_file) if migration_file else None,
+        markpact_files=[str(p) for p in (markpact_files or [])],
+        compose_files=[str(p) for p in (compose_files or [])],
+    )
+
+    return DeviceBlueprint(
+        name=name,
+        version=app_version,
+        description=description,
+        tags=tags or (device_map.tags if device_map else []),
+        services=services,
+        hardware=hw_req,
+        app_url=app_url,
+        deploy_strategy=deploy_strategy,
+        source=source,
+    )

redeploy-0.2.47/redeploy/blueprint/sources/__init__.py

@@ -0,0 +1,8 @@
+"""Blueprint source adapters — extract partial blueprints from multiple inputs.
+
+Each module in this package exposes a narrow, single-responsibility function
+that reads one kind of source (live infra, docker-compose, migration.yaml,
+DeviceMap hardware, …) and returns structured data for the orchestrator in
+:mod:`redeploy.blueprint.extractor` to merge into a ``DeviceBlueprint``.
+"""
+from __future__ import annotations

redeploy-0.2.47/redeploy/blueprint/sources/compose.py

@@ -0,0 +1,146 @@
+"""Parse docker-compose YAML files into :class:`ServiceSpec` objects."""
+from __future__ import annotations
+
+import re
+from pathlib import Path
+from typing import Optional
+
+import yaml
+
+from ...models import ServicePort, ServiceSpec, VolumeMount
+
+
+def merge_compose_files(
+    compose_files: list[Path],
+    services: list[ServiceSpec],
+    seen: set[str],
+) -> None:
+    """Parse each docker-compose file and merge specs into *services* / *seen*."""
+    for cf in compose_files:
+        _merge_compose(cf, services, seen)
+
+
+def _merge_compose(path: Path, services: list[ServiceSpec], seen: set[str]) -> None:
+    """Parse a single docker-compose YAML and merge service specs."""
+    try:
+        raw = yaml.safe_load(path.read_text())
+    except Exception:
+        return
+    if not isinstance(raw, dict) or "services" not in raw:
+        return
+
+    for svc_name, svc_def in raw["services"].items():
+        if not isinstance(svc_def, dict):
+            continue
+
+        existing = next((s for s in services if s.name == svc_name), None)
+        image = svc_def.get("image", "")
+        platform = svc_def.get("platform", "")
+        ports = _parse_compose_ports(svc_def.get("ports", []))
+        volumes = _parse_compose_volumes(svc_def.get("volumes", []))
+        env = _parse_compose_env(svc_def.get("environment", {}))
+        healthcheck = _parse_compose_healthcheck(svc_def.get("healthcheck", {}))
+        depends = svc_def.get("depends_on", [])
+        if isinstance(depends, dict):
+            depends = list(depends.keys())
+        command = svc_def.get("command", None)
+        if isinstance(command, list):
+            command = " ".join(str(c) for c in command)
+        restart = svc_def.get("restart", "unless-stopped")
+        privileged = bool(svc_def.get("privileged", False))
+
+        if existing:
+            if not existing.image and image:
+                existing.image = image
+            if not existing.platform and platform:
+                existing.platform = platform
+            if not existing.ports:
+                existing.ports = ports
+            if not existing.volumes:
+                existing.volumes = volumes
+            existing.env.update(env)
+            if not existing.healthcheck and healthcheck:
+                existing.healthcheck = healthcheck
+            if not existing.depends_on:
+                existing.depends_on = depends
+            existing.source_ref = str(path)
+        else:
+            seen.add(svc_name)
+            services.append(ServiceSpec(
+                name=svc_name,
+                image=image,
+                platform=platform,
+                ports=ports,
+                volumes=volumes,
+                env=env,
+                command=command,
+                healthcheck=healthcheck,
+                depends_on=depends,
+                restart=restart,
+                privileged=privileged,
+                source_ref=str(path),
+            ))
+
+
+def _parse_compose_ports(raw: list) -> list[ServicePort]:
+    result = []
+    for entry in raw:
+        if isinstance(entry, int):
+            result.append(ServicePort(host=entry, container=entry))
+        elif isinstance(entry, str):
+            m = re.match(r"(?:[\d.]+:)?(\d+):(\d+)(?:/(tcp|udp))?", entry)
+            if m:
+                result.append(ServicePort(
+                    host=int(m.group(1)),
+                    container=int(m.group(2)),
+                    protocol=m.group(3) or "tcp",
+                ))
+        elif isinstance(entry, dict):
+            result.append(ServicePort(
+                host=int(entry.get("published", entry.get("target", 0))),
+                container=int(entry.get("target", 0)),
+                protocol=entry.get("protocol", "tcp"),
+            ))
+    return result
+
+
+def _parse_compose_volumes(raw: list | dict) -> list[VolumeMount]:
+    result = []
+    items = raw if isinstance(raw, list) else [f"{k}:{v}" for k, v in raw.items()]
+    for entry in items:
+        if isinstance(entry, str) and ":" in entry:
+            parts = entry.split(":")
+            result.append(VolumeMount(
+                host=parts[0],
+                container=parts[1],
+                read_only=len(parts) > 2 and "ro" in parts[2],
+            ))
+        elif isinstance(entry, dict):
+            result.append(VolumeMount(
+                host=entry.get("source", ""),
+                container=entry.get("target", ""),
+                read_only=entry.get("read_only", False),
+            ))
+    return result
+
+
+def _parse_compose_env(raw: dict | list) -> dict[str, str]:
+    if isinstance(raw, dict):
+        return {str(k): str(v) for k, v in raw.items() if v is not None}
+    result = {}
+    for entry in raw:
+        if isinstance(entry, str) and "=" in entry:
+            k, _, v = entry.partition("=")
+            result[k.strip()] = v.strip()
+    return result
+
+
+def _parse_compose_healthcheck(raw: dict) -> Optional[str]:
+    if not raw:
+        return None
+    test = raw.get("test", [])
+    if isinstance(test, list) and len(test) > 1:
+        return " ".join(str(t) for t in test[1:])
+    if isinstance(test, str):
+        return test
+    return None

redeploy-0.2.47/redeploy/blueprint/sources/hardware.py

@@ -0,0 +1,45 @@
+"""Build ``HardwareRequirements`` from a DeviceMap hardware snapshot."""
+from __future__ import annotations
+
+from typing import Optional
+
+from ...models import HardwareRequirements
+
+
+def build_hw_requirements(hw) -> HardwareRequirements:
+    """Derive hardware requirements from a probed *hw* object."""
+    if hw is None:
+        return HardwareRequirements()
+
+    display_type = None
+    display_res = None
+    features: list[str] = []
+
+    # DRM / DSI
+    for output in getattr(hw, "drm_outputs", []):
+        if "DSI" in (output.connector or ""):
+            display_type = "DSI"
+            if output.modes:
+                display_res = output.modes[0]
+
+    if getattr(hw, "backlights", []):
+        features.append("backlight")
+    if getattr(hw, "i2c_buses", []):
+        features.append("i2c")
+
+    # Infer arch from board name
+    board = getattr(hw, "board", "") or ""
+    arch = "linux/arm64" if any(x in board.lower() for x in ("rpi", "raspberry", "aarch64", "pi")) else ""
+
+    # Overlays → wayland / kiosk hints
+    for overlay in getattr(hw, "dsi_overlays", []):
+        if "dsi" in overlay.lower():
+            features.append("wayland")
+
+    return HardwareRequirements(
+        arch=arch,
+        display_type=display_type,
+        display_resolution=display_res,
+        i2c_required=bool(getattr(hw, "i2c_buses", [])),
+        features=features,
+    )

redeploy-0.2.47/redeploy/blueprint/sources/infra.py

@@ -0,0 +1,43 @@
+"""Extract service specs and app URL from a live or cached ``InfraState``."""
+from __future__ import annotations
+
+from typing import Optional
+
+from ...models import InfraState, ServiceSpec
+
+
+def extract_services_from_infra(infra: InfraState, seen: set[str]) -> list[ServiceSpec]:
+    """Return :class:`ServiceSpec` objects for every service found in *infra*.
+
+    Skips entries whose ``name`` is already in *seen* and adds the new names.
+    """
+    result: list[ServiceSpec] = []
+    for svcs in infra.services.values():
+        for svc in svcs:
+            if svc.name in seen:
+                continue
+            seen.add(svc.name)
+            result.append(ServiceSpec(
+                name=svc.name,
+                image=getattr(svc, "image", ""),
+                platform="",                # unknown at this point
+                source_ref="infra:live",
+            ))
+    return result
+
+
+def infer_app_url(infra: Optional[InfraState]) -> str | None:
+    """Guess the application URL from open ports on *infra*.
+
+    Prefers ports ``80 → http://host``, ``443 → https://host``, then
+    ``8100``, ``8080`` with explicit port numbers.
+    """
+    if not infra or not infra.host:
+        return None
+    host = infra.host.split("@")[-1]
+    for port in (80, 8100, 8080, 443):
+        if port in (infra.ports or {}):
+            if port in (80, 443):
+                return f"http://{host}" if port == 80 else f"https://{host}"
+            return f"http://{host}:{port}"
+    return None

redeploy-0.2.47/redeploy/blueprint/sources/migration.py

@@ -0,0 +1,34 @@
+"""Parse migration.yaml metadata (version, strategy hints)."""
+from __future__ import annotations
+
+from pathlib import Path
+
+import yaml
+
+
+def parse_migration_meta(path: Path) -> dict:
+    """Read *path* and return ``{"version": "…", "strategy": "…"}`` if found."""
+    try:
+        raw = yaml.safe_load(path.read_text())
+    except Exception:
+        return {}
+    if not isinstance(raw, dict):
+        return {}
+
+    result = {}
+    if "version" in raw:
+        result["version"] = str(raw["version"])
+    if "strategy" in raw:
+        result["strategy"] = raw["strategy"]
+
+    # Walk steps looking for deploy action to infer strategy
+    for step in raw.get("steps", []):
+        action = step.get("action", "")
+        if "podman" in action or "quadlet" in action:
+            result["strategy"] = "podman_quadlet"
+            break
+        if "docker" in action:
+            result["strategy"] = "docker_compose"
+            break
+
+    return result

{redeploy-0.2.46 → redeploy-0.2.47}/redeploy/cli/commands/hardware.py

@@ -57,36 +57,28 @@ def _probe_hardware(host, ssh_key, console):
 
 
 def _probe_hardware_op3(host: str, ssh_key: str | None, console):
-    """Probe hardware via op3 scanner (new path)."""
-    from opstree.probes.context import SSHContext
-    from opstree.layers.builtin import PhysicalLayer, OsLayer
-    from opstree.layers.tree import LayerTree
-    from opstree.scanner.linear import LinearScanner
-    from opstree.probes.builtin.physical_rpi import RpiPhysicalDisplayProbe
-    from opstree.probes.builtin.os_linux import OsKernelProbe, OsConfigProbe
-    from opstree.probes.registry import ProbeRegistry
-    from ...integrations.op3_bridge import snapshot_to_hardware_info
-
-    ctx = SSHContext(target=host, ssh_key_path=ssh_key)
-
-    tree = LayerTree()
-    tree.register(PhysicalLayer.display)
-    tree.register(OsLayer.kernel)
-    tree.register(OsLayer.config)
-
-    registry = ProbeRegistry()
-    registry.register(RpiPhysicalDisplayProbe())
-    registry.register(OsKernelProbe())
-    registry.register(OsConfigProbe())
-
-    scanner = LinearScanner(tree)
-    scanner.probe_registry = registry
+    """Probe hardware via op3 scanner (new path).
+
+    Delegates all the layer/probe plumbing to
+    :mod:`redeploy.integrations.op3_bridge`, which in turn calls
+    :func:`opstree.build_scanner` (0.1.8+). That upstream helper handles
+    transitive dependency resolution (e.g. ``os.kernel`` requires
+    ``physical.compute``) and guarantees probe-registry isolation so
+    repeated calls in the same process don't accumulate state.
+    """
+    from ...integrations.op3_bridge import (
+        make_scanner,
+        make_ssh_context,
+        snapshot_to_hardware_info,
+    )
+
+    ctx = make_ssh_context(target=host, ssh_key=ssh_key)
+    scanner = make_scanner(["physical.display", "os.kernel", "os.config"])
 
     with console.status(f"[cyan]Probing hardware on {host} via op3…[/cyan]"):
         snapshot = scanner.scan(host, ctx.execute)
 
-    hw = snapshot_to_hardware_info(snapshot)
-    return hw
+    return snapshot_to_hardware_info(snapshot)
 
 
 def _format_output(hw, output_fmt):
@@ -289,26 +281,8 @@ def _apply_transform(console, p, hw, transform):
 
 def _execute_query(hw, query_expr, output_fmt):
     """Execute JMESPath query on hardware model and output result."""
-    import jmespath
-    import json as _json
-
-    data = hw.model_dump(mode="json")
-
-    try:
-        result = jmespath.search(query_expr, data)
-    except jmespath.exceptions.JMESPathError as e:
-        click.echo(f"[red]✗ JMESPath error:[/red] {e}", err=True)
-        sys.exit(1)
-
-    if result is None:
-        click.echo("[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(hw, query_expr, output_fmt, echo=lambda msg: click.echo(msg, err=True))
 
 
 def _apply_fix(console, p, hw, apply_fix_component, panel_id=None):