portacode 1.4.15.dev11__py3-none-any.whl → 1.4.15.dev13__py3-none-any.whl

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/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.dist-info → portacode-1.4.15.dev13.dist-info}/METADATA

@@ -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.dist-info → portacode-1.4.15.dev13.dist-info}/RECORD

@@ -1,7 +1,7 @@
 portacode/README.md,sha256=4dKtpvR8LNgZPVz37GmkQCMWIr_u25Ao63iW56s7Ke4,775
 portacode/__init__.py,sha256=oB3sV1wXr-um-RXio73UG8E5Xx6cF2ZVJveqjNmC-vQ,1086
 portacode/__main__.py,sha256=jmHTGC1hzmo9iKJLv-SSYe9BSIbPPZ2IOpecI03PlTs,296
-portacode/_version.py,sha256=xmWnbzztE5Rc80b-QMEet19V4hm80qIDp1evukvT-mY,721
+portacode/_version.py,sha256=FcKIi3ar9MBpxd5ZXOee5GCUDMFfUL8Remra4zRx4uo,721
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -22,7 +22,7 @@ portacode/connection/handlers/diff_handlers.py,sha256=iYTIRCcpEQ03vIPKZCsMTE5aZb
 portacode/connection/handlers/file_handlers.py,sha256=nAJH8nXnX07xxD28ngLpgIUzcTuRwZBNpEGEKdRqohw,39507
 portacode/connection/handlers/project_aware_file_handlers.py,sha256=AqgMnDqX2893T2NsrvUSCwjN5VKj4Pb2TN0S_SuboOE,9803
 portacode/connection/handlers/project_state_handlers.py,sha256=v6ZefGW9i7n1aZLq2jOGumJIjYb6aHlPI4m1jkYewm8,1686
-portacode/connection/handlers/proxmox_infra.py,sha256=GX2IE1J0YX5GHnqqn__e_wpag_Lsa-cWVRQ82MZnbjU,67267
+portacode/connection/handlers/proxmox_infra.py,sha256=nkOuMT1vNKhGs7sHYrqDBju7qGAVC7PWasgd-QNqDUI,69529
 portacode/connection/handlers/registry.py,sha256=qXGE60sYEWg6ZtVQzFcZ5YI2XWR6lMgw4hAL9x5qR1I,6181
 portacode/connection/handlers/session.py,sha256=uNGfiO_1B9-_yjJKkpvmbiJhIl6b-UXlT86UTfd6WYE,42219
 portacode/connection/handlers/system_handlers.py,sha256=fr12QpOr_Z8KYGUU-AYrTQwRPAcrLK85hvj3SEq1Kw8,14757
@@ -65,7 +65,7 @@ portacode/utils/__init__.py,sha256=NgBlWTuNJESfIYJzP_3adI1yJQJR0XJLRpSdVNaBAN0,3
 portacode/utils/diff_apply.py,sha256=4Oi7ft3VUCKmiUE4VM-OeqO7Gk6H7PF3WnN4WHXtjxI,15157
 portacode/utils/diff_renderer.py,sha256=S76StnQ2DLfsz4Gg0m07UwPfRp8270PuzbNaQq-rmYk,13850
 portacode/utils/ntp_clock.py,sha256=VqCnWCTehCufE43W23oB-WUdAZGeCcLxkmIOPwInYHc,2499
-portacode-1.4.15.dev11.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.15.dev13.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
 test_modules/README.md,sha256=Do_agkm9WhSzueXjRAkV_xEj6Emy5zB3N3VKY5Roce8,9274
 test_modules/__init__.py,sha256=1LcbHodIHsB0g-g4NGjSn6AMuCoGbymvXPYLOb6Z7F0,53
 test_modules/test_device_online.py,sha256=QtYq0Dq9vME8Gp2O4fGSheqVf8LUtpsSKosXXk56gGM,1654
@@ -91,8 +91,8 @@ testing_framework/core/playwright_manager.py,sha256=Tw46qwxIhOFkS48C2IWIQHHNpEe-
 testing_framework/core/runner.py,sha256=j2QwNJmAxVBmJvcbVS7DgPJUKPNzqfLmt_4NNdaKmZU,19297
 testing_framework/core/shared_cli_manager.py,sha256=BESSNtyQb7BOlaOvZmm04T8Uezjms4KCBs2MzTxvzYQ,8790
 testing_framework/core/test_discovery.py,sha256=2FZ9fJ8Dp5dloA-fkgXoJ_gCMC_nYPBnA3Hs2xlagzM,4928
-portacode-1.4.15.dev11.dist-info/METADATA,sha256=YjU_cRf0I5P6zz-KmGOslg3APj4CL8IgOHbP13Z6T1U,13052
-portacode-1.4.15.dev11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-portacode-1.4.15.dev11.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.15.dev11.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.15.dev11.dist-info/RECORD,,
+portacode-1.4.15.dev13.dist-info/METADATA,sha256=Hz8hOfUj5NBoq6aU7rG1ceRGPkwPlbqnD9of5XRWgQw,13052
+portacode-1.4.15.dev13.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+portacode-1.4.15.dev13.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.15.dev13.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.15.dev13.dist-info/RECORD,,