redeploy 0.2.55__tar.gz → 0.2.57__tar.gz

{redeploy-0.2.55 → redeploy-0.2.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.55
+Version: 0.2.57
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -32,17 +32,17 @@ Requires-Dist: mcp>=1.0; extra == "mcp"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.55-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-28.5h-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.57-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-28.9h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (75 commits)
-- 👤 **Human dev:** ~$2853 (28.5h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (77 commits)
+- 👤 **Human dev:** ~$2886 (28.9h @ $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.55-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.57-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.55 → redeploy-0.2.57}/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.55-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-28.5h-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.57-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-28.9h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $7.5000 (75 commits)
-- 👤 **Human dev:** ~$2853 (28.5h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $7.5000 (77 commits)
+- 👤 **Human dev:** ~$2886 (28.9h @ $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.55-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.57-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.55 → redeploy-0.2.57}/pyproject.toml

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

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

{redeploy-0.2.55 → redeploy-0.2.57}/redeploy/iac/docker_compose.py

@@ -291,14 +291,12 @@ class DockerComposeParser:
                 pass
         return env
 
-    def _parse_service(self, name: str, cfg: dict,
-                       env_context: dict[str, str],
-                       spec: ParsedSpec) -> ServiceInfo:
-        def resolve(v: object) -> str:
-            return _resolve_var(str(v), env_context) if v is not None else ""
-
-        # image / build
-        image = resolve(cfg.get("image")) or None
+    def _resolve_image_and_build(
+        self,
+        cfg: dict,
+        env_context: dict[str, str],
+    ) -> tuple[Optional[str], Optional[str]]:
+        image = _resolve_var(str(cfg.get("image")), env_context) if cfg.get("image") is not None else None
         build = cfg.get("build")
         build_context: Optional[str] = None
         if build:
@@ -308,8 +306,15 @@ class DockerComposeParser:
                 build_context = build.get("context", ".")
             if not image:
                 image = f"<build:{build_context or '.'}>"
-
-        # ports
+        return image, build_context
+
+    def _parse_service_ports(
+        self,
+        name: str,
+        cfg: dict,
+        env_context: dict[str, str],
+        spec: ParsedSpec,
+    ) -> list[PortInfo]:
         ports: list[PortInfo] = []
         for raw in (cfg.get("ports") or []):
             if isinstance(raw, str):
@@ -318,75 +323,95 @@ class DockerComposeParser:
             if p:
                 ports.append(p)
             else:
-                spec.add_warning(f"[{name}] Could not parse port: {raw!r}",
-                                 severity="warn")
+                spec.add_warning(f"[{name}] Could not parse port: {raw!r}", severity="warn")
+        return ports
 
-        # volumes
+    def _parse_service_volumes(self, cfg: dict) -> list[VolumeInfo]:
         volumes: list[VolumeInfo] = []
         for raw in (cfg.get("volumes") or []):
             v = _parse_volume(raw)
             if v:
                 volumes.append(v)
+        return volumes
 
-        # environment
+    def _parse_service_env(
+        self,
+        cfg: dict,
+        env_context: dict[str, str],
+    ) -> dict[str, str]:
         env = _env_dict(cfg.get("environment"))
-        # resolve variables
-        env = {k: _resolve_var(v, env_context) for k, v in env.items()}
+        return {k: _resolve_var(v, env_context) for k, v in env.items()}
 
-        # env_file
-        env_files: list[str] = []
+    def _parse_service_env_files(self, cfg: dict) -> list[str]:
         ef = cfg.get("env_file")
-        if ef:
-            if isinstance(ef, str):
-                env_files = [ef]
-            elif isinstance(ef, list):
-                env_files = [str(x) for x in ef]
-
-        # networks
+        if not ef:
+            return []
+        if isinstance(ef, str):
+            return [ef]
+        if isinstance(ef, list):
+            return [str(x) for x in ef]
+        return []
+
+    def _parse_service_networks(self, cfg: dict) -> list[str]:
         svc_nets = cfg.get("networks")
         if isinstance(svc_nets, dict):
-            svc_networks = list(svc_nets.keys())
-        elif isinstance(svc_nets, list):
-            svc_networks = [str(n) for n in svc_nets]
-        else:
-            svc_networks = []
+            return list(svc_nets.keys())
+        if isinstance(svc_nets, list):
+            return [str(n) for n in svc_nets]
+        return []
 
-        # depends_on
+    def _parse_service_depends_on(self, cfg: dict) -> list[str]:
         dep = cfg.get("depends_on")
         if isinstance(dep, list):
-            depends_on = [str(d) for d in dep]
-        elif isinstance(dep, dict):
-            depends_on = list(dep.keys())
-        else:
-            depends_on = []
+            return [str(d) for d in dep]
+        if isinstance(dep, dict):
+            return list(dep.keys())
+        return []
 
-        # healthcheck
+    def _parse_service_healthcheck(self, cfg: dict) -> Optional[str]:
         hc = cfg.get("healthcheck")
-        healthcheck: Optional[str] = None
         if isinstance(hc, dict):
             test = hc.get("test")
             if isinstance(test, list):
                 test = " ".join(str(t) for t in test)
-            healthcheck = str(test) if test else None
+            return str(test) if test else None
+        return None
 
-        # deploy.replicas
+    def _parse_service_replicas(self, cfg: dict) -> int:
         deploy = cfg.get("deploy") or {}
-        replicas = 1
         if isinstance(deploy, dict):
-            replicas = int(deploy.get("replicas", 1))
+            return int(deploy.get("replicas", 1))
+        return 1
 
-        # labels
+    def _parse_service_labels(self, cfg: dict) -> dict[str, str]:
         labels_raw = cfg.get("labels")
         if isinstance(labels_raw, dict):
-            labels = {str(k): str(v) for k, v in labels_raw.items()}
-        elif isinstance(labels_raw, list):
-            labels = {}
+            return {str(k): str(v) for k, v in labels_raw.items()}
+        if isinstance(labels_raw, list):
+            labels: dict[str, str] = {}
             for item in labels_raw:
                 if "=" in str(item):
                     k, v = str(item).split("=", 1)
                     labels[k] = v
-        else:
-            labels = {}
+            return labels
+        return {}
+
+    def _parse_service_command(self, cfg: dict) -> Optional[str]:
+        return str(cfg["command"]) if cfg.get("command") else None
+
+    def _parse_service(self, name: str, cfg: dict,
+                       env_context: dict[str, str],
+                       spec: ParsedSpec) -> ServiceInfo:
+        image, build_context = self._resolve_image_and_build(cfg, env_context)
+        ports = self._parse_service_ports(name, cfg, env_context, spec)
+        volumes = self._parse_service_volumes(cfg)
+        env = self._parse_service_env(cfg, env_context)
+        env_files = self._parse_service_env_files(cfg)
+        svc_networks = self._parse_service_networks(cfg)
+        depends_on = self._parse_service_depends_on(cfg)
+        healthcheck = self._parse_service_healthcheck(cfg)
+        replicas = self._parse_service_replicas(cfg)
+        labels = self._parse_service_labels(cfg)
 
         return ServiceInfo(
             name=name,
@@ -399,7 +424,7 @@ class DockerComposeParser:
             depends_on=depends_on,
             healthcheck=healthcheck,
             restart=cfg.get("restart"),
-            command=str(cfg["command"]) if cfg.get("command") else None,
+            command=self._parse_service_command(cfg),
             build_context=build_context,
             replicas=replicas,
             labels=labels,

{redeploy-0.2.55 → redeploy-0.2.57}/redeploy/iac/parsers/compose.py

@@ -20,7 +20,6 @@ from typing import Any, Optional
 import yaml
 
 from ..base import (
-    ConversionWarning,
     ParsedSpec,
     PortInfo,
     ServiceInfo,
@@ -91,8 +90,7 @@ class DockerComposeParser:
                 spec.networks.append(net_name)
 
         # top-level volumes
-        for vol_name, vol_def in (raw.get("volumes") or {}).items():
-            vol_def = vol_def or {}
+        for vol_name, _ in (raw.get("volumes") or {}).items():
             spec.volumes.append(VolumeInfo(
                 target="",
                 source=vol_name,
@@ -113,40 +111,54 @@ class DockerComposeParser:
 
     # ── service parsing ───────────────────────────────────────────────────────
 
+    def _collect_service_secrets(self, d: dict, spec: ParsedSpec) -> None:
+        for secret in (d.get("secrets") or []):
+            secret_name = secret if isinstance(secret, str) else secret.get("source", "")
+            if secret_name and secret_name not in spec.secrets_referenced:
+                spec.secrets_referenced.append(secret_name)
+
+    def _merge_service_env_files(self, d: dict, svc: ServiceInfo, spec: ParsedSpec) -> None:
+        for ef in (d.get("env_file") or []):
+            ef = ef if isinstance(ef, str) else ef.get("path", "")
+            if ef and ef not in spec.env_files:
+                spec.env_files.append(ef)
+            if ef and ef not in svc.env_files:
+                svc.env_files.append(ef)
+
+    def _collect_service_image(self, svc: ServiceInfo, spec: ParsedSpec) -> None:
+        if svc.image and svc.image not in spec.images:
+            spec.images.append(svc.image)
+
+    def _parse_service_networks(self, d: dict) -> list[str]:
+        return list(d.get("networks") or [])
+
+    def _parse_service_replicas(self, d: dict) -> int:
+        return int((d.get("deploy") or {}).get("replicas", 1))
+
     def _parse_service(self, name: str, d: dict, spec: ParsedSpec) -> ServiceInfo:
         svc = ServiceInfo(name=name)
 
         svc.image = d.get("image") or None
-        if svc.image:
-            if svc.image not in spec.images:
-                spec.images.append(svc.image)
+        self._collect_service_image(svc, spec)
 
         svc.build_context = self._parse_build(d.get("build"))
         svc.command = self._parse_command(d.get("command"))
         svc.restart = d.get("restart") or None
-        svc.replicas = int((d.get("deploy") or {}).get("replicas", 1))
+        svc.replicas = self._parse_service_replicas(d)
 
         svc.ports = self._parse_ports(d.get("ports") or [], spec)
         svc.volumes = self._parse_volumes(d.get("volumes") or [], spec)
-        svc.networks = list(d.get("networks") or [])
+        svc.networks = self._parse_service_networks(d)
         svc.env, svc.env_files = self._parse_env(d, spec)
         svc.depends_on = self._parse_depends_on(d.get("depends_on"))
         svc.labels = self._parse_labels(d.get("labels"))
         svc.healthcheck = self._parse_healthcheck(d.get("healthcheck"))
 
         # secrets referenced by service
-        for secret in (d.get("secrets") or []):
-            secret_name = secret if isinstance(secret, str) else secret.get("source", "")
-            if secret_name and secret_name not in spec.secrets_referenced:
-                spec.secrets_referenced.append(secret_name)
+        self._collect_service_secrets(d, spec)
 
         # env_files at service level
-        for ef in (d.get("env_file") or []):
-            ef = ef if isinstance(ef, str) else ef.get("path", "")
-            if ef and ef not in spec.env_files:
-                spec.env_files.append(ef)
-            if ef and ef not in svc.env_files:
-                svc.env_files.append(ef)
+        self._merge_service_env_files(d, svc, spec)
 
         return svc
 

redeploy-0.2.57/redeploy/models/enums.py

@@ -0,0 +1,69 @@
+"""Shared enums and type aliases for redeploy models."""
+from __future__ import annotations
+
+from enum import Enum
+
+
+class ConflictSeverity(str, Enum):
+    LOW = "low"
+    MEDIUM = "medium"
+    HIGH = "high"
+    CRITICAL = "critical"
+
+
+class StepAction(str, Enum):
+    SYSTEMCTL_STOP = "systemctl_stop"
+    SYSTEMCTL_DISABLE = "systemctl_disable"
+    SYSTEMCTL_START = "systemctl_start"
+    KUBECTL_DELETE = "kubectl_delete"
+    DOCKER_COMPOSE_UP = "docker_compose_up"
+    DOCKER_COMPOSE_DOWN = "docker_compose_down"
+    DOCKER_BUILD = "docker_build"
+    DOCKER_HEALTH_WAIT = "docker_health_wait"
+    CONTAINER_LOG_TAIL = "container_log_tail"
+    PODMAN_BUILD = "podman_build"
+    RSYNC = "rsync"
+    SCP = "scp"
+    SSH_CMD = "ssh_cmd"
+    HTTP_CHECK = "http_check"
+    VERSION_CHECK = "version_check"
+    WAIT = "wait"
+    PLUGIN = "plugin"
+    INLINE_SCRIPT = "inline_script"
+    ENSURE_CONFIG_LINE = "ensure_config_line"
+    RASPI_CONFIG = "raspi_config"
+    ENSURE_KANSHI_PROFILE = "ensure_kanshi_profile"
+    ENSURE_AUTOSTART_ENTRY = "ensure_autostart_entry"
+    ENSURE_BROWSER_KIOSK_SCRIPT = "ensure_browser_kiosk_script"
+
+
+class StepStatus(str, Enum):
+    PENDING = "pending"
+    RUNNING = "running"
+    DONE = "done"
+    FAILED = "failed"
+    SKIPPED = "skipped"
+
+
+class DeployStrategy(str, Enum):
+    DOCKER_FULL = "docker_full"
+    NATIVE_KIOSK = "native_kiosk"
+    DOCKER_KIOSK = "docker_kiosk"
+    KIOSK_APPLIANCE = "kiosk_appliance"
+    PODMAN_QUADLET = "podman_quadlet"
+    K3S = "k3s"
+    SYSTEMD = "systemd"
+    UNKNOWN = "unknown"
+
+
+# doql / external tool aliases → canonical DeployStrategy values
+_STRATEGY_ALIASES: dict[str, str] = {
+    "docker-compose":  "docker_full",
+    "quadlet":         "podman_quadlet",
+    "kiosk-appliance": "kiosk_appliance",
+    "kiosk_appliance": "kiosk_appliance",
+    "kubernetes":      "k3s",
+    "k8s":             "k3s",
+    "native-kiosk":    "native_kiosk",
+    "docker-kiosk":    "docker_kiosk",
+}

redeploy-0.2.57/redeploy/models/persisted.py

@@ -0,0 +1,27 @@
+"""PersistedModel mixin — YAML serialization for BaseModel subclasses."""
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Optional
+
+import yaml
+from pydantic import BaseModel
+
+
+class PersistedModel(BaseModel):
+    """Mixin for models that can be persisted to/from YAML files."""
+
+    def to_yaml(self) -> str:
+        """Serialize model to YAML string."""
+        return yaml.dump(
+            self.model_dump(mode="json"),
+            allow_unicode=True,
+            sort_keys=False,
+            default_flow_style=False,
+        )
+
+    @classmethod
+    def load(cls, path: Path) -> Self:
+        """Load model from YAML file."""
+        raw = yaml.safe_load(path.read_text())
+        return cls(**raw)

redeploy-0.2.57/redeploy/tests/test_heal_decider.py

@@ -0,0 +1,91 @@
+from redeploy.heal.decider import Action, Decision, decide_after_failure, format_decision_message
+
+
+def test_decide_abort_on_loop_detected():
+    decision = decide_after_failure(
+        attempt=1,
+        max_retries=3,
+        failed_step="sync_env",
+        loop_detected=True,
+        llm_error=False,
+        spec_patched=False,
+    )
+    assert decision == Decision(Action.ABORT, "Loop detected: same hint for 'sync_env' ≥ 3 times in a row")
+
+
+def test_decide_abort_when_failed_step_unknown():
+    decision = decide_after_failure(
+        attempt=1,
+        max_retries=3,
+        failed_step=None,
+        loop_detected=False,
+        llm_error=False,
+        spec_patched=False,
+    )
+    assert decision == Decision(Action.ABORT, "Cannot identify failed step — giving up")
+
+
+def test_decide_retry_on_transient_llm_error_before_limit():
+    decision = decide_after_failure(
+        attempt=1,
+        max_retries=3,
+        failed_step="sync_env",
+        loop_detected=False,
+        llm_error=True,
+        spec_patched=False,
+    )
+    assert decision == Decision(Action.RETRY, "LLM error — retrying may help if transient")
+
+
+def test_decide_abort_on_llm_error_at_retry_limit():
+    decision = decide_after_failure(
+        attempt=3,
+        max_retries=3,
+        failed_step="sync_env",
+        loop_detected=False,
+        llm_error=True,
+        spec_patched=False,
+    )
+    assert decision == Decision(Action.ABORT, "LLM error — retrying may help if transient")
+
+
+def test_decide_abort_when_retry_budget_exhausted():
+    decision = decide_after_failure(
+        attempt=3,
+        max_retries=3,
+        failed_step="sync_env",
+        loop_detected=False,
+        llm_error=False,
+        spec_patched=False,
+    )
+    assert decision == Decision(Action.ABORT, "Max retries (3) exhausted for 'sync_env'")
+
+
+def test_decide_retry_when_spec_was_patched():
+    decision = decide_after_failure(
+        attempt=1,
+        max_retries=3,
+        failed_step="sync_env",
+        loop_detected=False,
+        llm_error=False,
+        spec_patched=True,
+    )
+    assert decision == Decision(Action.RETRY, "Spec patched — re-running migration")
+
+
+def test_decide_skip_when_patch_not_applicable():
+    decision = decide_after_failure(
+        attempt=1,
+        max_retries=3,
+        failed_step="sync_env",
+        loop_detected=False,
+        llm_error=False,
+        spec_patched=False,
+    )
+    assert decision == Decision(Action.SKIP, "LLM did not produce an applicable patch — skipping step")
+
+
+def test_format_decision_message_uses_action_and_reason():
+    msg = format_decision_message(Decision(Action.RETRY, "Spec patched"), "sync_env")
+    assert "RETRY" in msg
+    assert "Spec patched" in msg