portacode 1.4.15.dev11__tar.gz → 1.4.15.dev13__tar.gz

{portacode-1.4.15.dev11 → portacode-1.4.15.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.15.dev11
+Version: 1.4.15.dev13
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.15.dev11 → portacode-1.4.15.dev13}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.15.dev11'
-__version_tuple__ = version_tuple = (1, 4, 15, 'dev11')
+__version__ = version = '1.4.15.dev13'
+__version_tuple__ = version_tuple = (1, 4, 15, 'dev13')
 
 __commit_id__ = commit_id = None

{portacode-1.4.15.dev11 → portacode-1.4.15.dev13}/portacode/connection/handlers/proxmox_infra.py

@@ -47,7 +47,7 @@ UNIT_DIR = Path("/etc/systemd/system")
 _MANAGED_CONTAINERS_CACHE_TTL_S = 30.0
 _MANAGED_CONTAINERS_CACHE: Dict[str, Any] = {"timestamp": 0.0, "summary": None}
 _MANAGED_CONTAINERS_CACHE_LOCK = threading.Lock()
-_STARTUP_TEMPLATES_REFRESHED = False
+TEMPLATES_REFRESH_INTERVAL_S = 300
 
 ProgressCallback = Callable[[int, int, Dict[str, Any], str, Optional[Dict[str, Any]]], None]
 
@@ -197,10 +197,33 @@ def _build_proxmox_client_from_config(config: Dict[str, Any]):
     )
 
 
+def _current_time_iso() -> str:
+    return datetime.utcnow().isoformat() + "Z"
+
+
+def _parse_iso_timestamp(value: str) -> Optional[datetime]:
+    if not value:
+        return None
+    text = value
+    if text.endswith("Z"):
+        text = text[:-1] + "+00:00"
+    try:
+        return datetime.fromisoformat(text)
+    except ValueError:
+        return None
+
+
+def _templates_need_refresh(config: Dict[str, Any]) -> bool:
+    if not config or not config.get("token_value"):
+        return False
+    last = _parse_iso_timestamp(config.get("templates_last_refreshed") or "")
+    if not last:
+        return True
+    return (datetime.utcnow() - last).total_seconds() >= TEMPLATES_REFRESH_INTERVAL_S
+
+
 def _ensure_templates_refreshed_on_startup(config: Dict[str, Any]) -> None:
-    global _STARTUP_TEMPLATES_REFRESHED
-    if _STARTUP_TEMPLATES_REFRESHED or not config or not config.get("token_value"):
-        _STARTUP_TEMPLATES_REFRESHED = True
+    if not _templates_need_refresh(config):
         return
     try:
         client = _build_proxmox_client_from_config(config)
@@ -209,10 +232,10 @@ def _ensure_templates_refreshed_on_startup(config: Dict[str, Any]) -> None:
         templates = _list_templates(client, node, storages)
         if templates:
             config["templates"] = templates
+            config["templates_last_refreshed"] = _current_time_iso()
+            _save_config(config)
     except Exception as exc:
         logger.warning("Unable to refresh Proxmox templates on startup: %s", exc)
-    finally:
-        _STARTUP_TEMPLATES_REFRESHED = True
 
 
 def _pick_storage(storages: Iterable[Dict[str, Any]]) -> str:
@@ -618,6 +641,24 @@ def _guess_package_manager_from_template(template: str) -> str:
     return "apt"
 
 
+def _detect_package_manager(vmid: int) -> str:
+    candidates = [
+        ("apt", "apt-get"),
+        ("dnf", "dnf"),
+        ("yum", "yum"),
+        ("apk", "apk"),
+        ("pacman", "pacman"),
+        ("zypper", "zypper"),
+    ]
+    for name, binary in candidates:
+        res = _run_pct(vmid, f"command -v {binary} >/dev/null 2>&1")
+        if res.get("returncode") == 0:
+            logger.debug("Detected package manager %s inside container %s", name, vmid)
+            return name
+    logger.warning("Unable to detect package manager inside container %s; defaulting to apt", vmid)
+    return "apt"
+
+
 def _get_storage_type(storages: Iterable[Dict[str, Any]], storage_name: str) -> str:
     for entry in storages:
         if entry.get("storage") == storage_name:
@@ -1095,36 +1136,60 @@ def _bootstrap_portacode(
     total_steps: Optional[int] = None,
     default_public_key: Optional[str] = None,
 ) -> Tuple[str, List[Dict[str, Any]]]:
-    actual_steps = steps if steps is not None else _build_bootstrap_steps(user, password, ssh_key)
-    results, ok = _run_setup_steps(
-        vmid,
-        actual_steps,
-        user,
-        progress_callback=progress_callback,
-        start_index=start_index,
-        total_steps=total_steps,
-    )
-    if not ok:
-        details = results[-1] if results else {}
-        summary = details.get("error_summary") or details.get("stderr") or details.get("stdout") or details.get("name")
-        history = details.get("history")
-        history_snippet = ""
-        if isinstance(history, list) and history:
-            history_snippet = f" history={history[-3:]}"
-        command = details.get("cmd")
-        command_text = ""
-        if command:
-            if isinstance(command, (list, tuple)):
-                command_text = shlex.join(str(entry) for entry in command)
-            else:
-                command_text = str(command)
-        command_suffix = f" command={command_text}" if command_text else ""
-        if summary:
-            logger.warning(
-                "Portacode bootstrap failure summary=%s%s%s",
-                summary,
-                f" history_len={len(history)}" if history else "",
+    if steps is not None:
+        actual_steps = steps
+    else:
+        detected_manager = _detect_package_manager(vmid)
+        actual_steps = _build_bootstrap_steps(
+            user,
+            password,
+            ssh_key,
+            package_manager=detected_manager,
+        )
+        results, ok = _run_setup_steps(
+            vmid,
+            actual_steps,
+            user,
+            progress_callback=progress_callback,
+            start_index=start_index,
+            total_steps=total_steps,
+        )
+        if not ok:
+            details = results[-1] if results else {}
+            summary = details.get("error_summary") or details.get("stderr") or details.get("stdout") or details.get("name")
+            history = details.get("history")
+            history_snippet = ""
+            if isinstance(history, list) and history:
+                history_snippet = f" history={history[-3:]}"
+            command = details.get("cmd")
+            command_text = ""
+            if command:
+                if isinstance(command, (list, tuple)):
+                    command_text = shlex.join(str(entry) for entry in command)
+                else:
+                    command_text = str(command)
+            command_suffix = f" command={command_text}" if command_text else ""
+            stdout = details.get("stdout")
+            stderr = details.get("stderr")
+            if stdout or stderr:
+                logger.debug(
+                    "Bootstrap command output%s%s%s",
+                    f" stdout={stdout!r}" if stdout else "",
+                    " " if stdout and stderr else "",
+                    f"stderr={stderr!r}" if stderr else "",
+                )
+            if summary:
+                logger.warning(
+                    "Portacode bootstrap failure summary=%s%s%s",
+                    summary,
+                    f" history_len={len(history)}" if history else "",
+                    f" command={command_text}" if command_text else "",
+                )
+            logger.error(
+                "Portacode bootstrap command failed%s%s%s",
                 f" command={command_text}" if command_text else "",
+                f" stdout={stdout!r}" if stdout else "",
+                f" stderr={stderr!r}" if stderr else "",
             )
             raise RuntimeError(
                 f"Portacode bootstrap steps failed: {summary}{history_snippet}{command_suffix}"
@@ -1196,8 +1261,9 @@ def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl
         "token_value": token_value,
         "verify_ssl": verify_ssl,
         "default_storage": default_storage,
-        "templates": templates,
         "last_verified": datetime.utcnow().isoformat() + "Z",
+        "templates": templates,
+        "templates_last_refreshed": _current_time_iso(),
         "network": network,
         "node_status": status,
     }

{portacode-1.4.15.dev11 → portacode-1.4.15.dev13}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.15.dev11
+Version: 1.4.15.dev13
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian