portacode 1.4.15.dev10__py3-none-any.whl → 1.4.15.dev12__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.dev10'
-__version_tuple__ = version_tuple = (1, 4, 15, 'dev10')
+__version__ = version = '1.4.15.dev12'
+__version_tuple__ = version_tuple = (1, 4, 15, 'dev12')
 
 __commit_id__ = commit_id = None

portacode/connection/handlers/proxmox_infra.py

@@ -473,48 +473,119 @@ def _friendly_step_label(step_name: str) -> str:
     return normalized.capitalize()
 
 
+_PACKAGE_MANAGER_PROFILES: Dict[str, Dict[str, Any]] = {
+    "apt": {
+        "update_cmd": "apt-get update -y",
+        "update_step_name": "apt_update",
+        "install_cmd": "apt-get install -y python3 python3-pip sudo --fix-missing",
+        "install_step_name": "install_deps",
+        "update_retries": 4,
+        "install_retries": 5,
+    },
+    "dnf": {
+        "update_cmd": "dnf check-update || true",
+        "update_step_name": "dnf_update",
+        "install_cmd": "dnf install -y python3 python3-pip sudo",
+        "install_step_name": "install_deps",
+        "update_retries": 3,
+        "install_retries": 5,
+    },
+    "yum": {
+        "update_cmd": "yum makecache",
+        "update_step_name": "yum_update",
+        "install_cmd": "yum install -y python3 python3-pip sudo",
+        "install_step_name": "install_deps",
+        "update_retries": 3,
+        "install_retries": 5,
+    },
+    "apk": {
+        "update_cmd": "apk update",
+        "update_step_name": "apk_update",
+        "install_cmd": "apk add --no-cache python3 py3-pip sudo",
+        "install_step_name": "install_deps",
+        "update_retries": 3,
+        "install_retries": 5,
+    },
+    "pacman": {
+        "update_cmd": "pacman -Sy --noconfirm",
+        "update_step_name": "pacman_update",
+        "install_cmd": "pacman -S --noconfirm python python-pip sudo",
+        "install_step_name": "install_deps",
+        "update_retries": 3,
+        "install_retries": 5,
+    },
+    "zypper": {
+        "update_cmd": "zypper refresh",
+        "update_step_name": "zypper_update",
+        "install_cmd": "zypper install -y python3 python3-pip sudo",
+        "install_step_name": "install_deps",
+        "update_retries": 3,
+        "install_retries": 5,
+    },
+}
+
+_UPDATE_RETRY_ON = [
+    "Temporary failure resolving",
+    "Could not resolve",
+    "Failed to fetch",
+]
+
+_INSTALL_RETRY_ON = [
+    "lock-frontend",
+    "Unable to acquire the dpkg frontend lock",
+    "Temporary failure resolving",
+    "Could not resolve",
+    "Failed to fetch",
+]
+
+
 def _build_bootstrap_steps(
     user: str,
     password: str,
     ssh_key: str,
     include_portacode_connect: bool = True,
+    package_manager: str = "apt",
 ) -> List[Dict[str, Any]]:
-    steps = [
-        {
-            "name": "apt_update",
-            "cmd": "apt-get update -y",
-            "retries": 4,
-            "retry_delay_s": 5,
-            "retry_on": [
-                "Temporary failure resolving",
-                "Could not resolve",
-                "Failed to fetch",
-            ],
-        },
-        {
-            "name": "install_deps",
-            "cmd": "apt-get install -y python3 python3-pip sudo --fix-missing",
-            "retries": 5,
-            "retry_delay_s": 5,
-            "retry_on": [
-                "lock-frontend",
-                "Unable to acquire the dpkg frontend lock",
-                "Temporary failure resolving",
-                "Could not resolve",
-                "Failed to fetch",
-            ],
-        },
-        {"name": "user_exists", "cmd": f"id -u {user} >/dev/null 2>&1 || adduser --disabled-password --gecos '' {user}", "retries": 0},
-        {"name": "add_sudo", "cmd": f"usermod -aG sudo {user}", "retries": 0},
-    ]
+    profile = _PACKAGE_MANAGER_PROFILES.get(package_manager, _PACKAGE_MANAGER_PROFILES["apt"])
+    steps: List[Dict[str, Any]] = []
+    update_cmd = profile.get("update_cmd")
+    if update_cmd:
+        steps.append(
+            {
+                "name": profile.get("update_step_name", "package_update"),
+                "cmd": update_cmd,
+                "retries": profile.get("update_retries", 3),
+                "retry_delay_s": 5,
+                "retry_on": _UPDATE_RETRY_ON,
+            }
+        )
+    install_cmd = profile.get("install_cmd")
+    if install_cmd:
+        steps.append(
+            {
+                "name": profile.get("install_step_name", "install_deps"),
+                "cmd": install_cmd,
+                "retries": profile.get("install_retries", 5),
+                "retry_delay_s": 5,
+                "retry_on": _INSTALL_RETRY_ON,
+            }
+        )
+    steps.extend(
+        [
+            {"name": "user_exists", "cmd": f"id -u {user} >/dev/null 2>&1 || adduser --disabled-password --gecos '' {user}", "retries": 0},
+            {"name": "add_sudo", "cmd": f"usermod -aG sudo {user}", "retries": 0},
+        ]
+    )
     if password:
         steps.append({"name": "set_password", "cmd": f"echo '{user}:{password}' | chpasswd", "retries": 0})
     if ssh_key:
-        steps.append({
-            "name": "add_ssh_key",
-            "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:{user} /home/{user}/.ssh",
-            "retries": 0,
-        })
+        steps.append(
+            {
+                "name": "add_ssh_key",
+                "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:{user} /home/{user}/.ssh",
+                "retries": 0,
+            }
+        )
     steps.extend(
         [
             {"name": "pip_upgrade", "cmd": "python3 -m pip install --upgrade pip", "retries": 0},
@@ -526,6 +597,45 @@ def _build_bootstrap_steps(
     return steps
 
 
+def _guess_package_manager_from_template(template: str) -> str:
+    normalized = (template or "").lower()
+    if "alpine" in normalized:
+        return "apk"
+    if "archlinux" in normalized:
+        return "pacman"
+    if "centos-7" in normalized:
+        return "yum"
+    if any(keyword in normalized for keyword in ("centos-8", "centos-9", "centos-9-stream", "centos-8-stream")):
+        return "dnf"
+    if any(keyword in normalized for keyword in ("rockylinux", "almalinux", "fedora")):
+        return "dnf"
+    if "opensuse" in normalized or "suse" in normalized:
+        return "zypper"
+    if any(keyword in normalized for keyword in ("debian", "ubuntu", "devuan", "turnkeylinux")):
+        return "apt"
+    if normalized.startswith("system/") and "linux" in normalized:
+        return "apt"
+    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:
@@ -1003,7 +1113,16 @@ 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)
+    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,
@@ -1189,12 +1308,17 @@ class CreateProxmoxContainerHandler(SyncHandler):
         device_public_key = (message.get("device_public_key") or "").strip()
         device_private_key = (message.get("device_private_key") or "").strip()
         has_device_keypair = bool(device_public_key and device_private_key)
+        config_guess = _load_config()
+        template_candidates = config_guess.get("templates") or []
+        template_hint = (message.get("template") or (template_candidates[0] if template_candidates else "")).strip()
+        package_manager = _guess_package_manager_from_template(template_hint)
         bootstrap_user, bootstrap_password, bootstrap_ssh_key = _get_provisioning_user_info(message)
         bootstrap_steps = _build_bootstrap_steps(
             bootstrap_user,
             bootstrap_password,
             bootstrap_ssh_key,
             include_portacode_connect=not has_device_keypair,
+            package_manager=package_manager,
         )
         total_steps = 3 + len(bootstrap_steps) + 2
         current_step_index = 1

{portacode-1.4.15.dev10.dist-info → portacode-1.4.15.dev12.dist-info}/METADATA

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

{portacode-1.4.15.dev10.dist-info → portacode-1.4.15.dev12.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=OsU3LmSVwSb16YuRZZoOGhx4fmAppA2W-vOQo60j6hQ,721
+portacode/_version.py,sha256=Onnf1SIY68AMKoWtMkpxq_B6Sw_RYyZQ86CKs_MVF84,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=5DAHhzbegCI0fKdekP8Or6jrGZptmthLdq-RMtOPZDc,63843
+portacode/connection/handlers/proxmox_infra.py,sha256=aPVc55P8b0EqK4JGCw68EDZSscaBmYzH1DaxgRi3W0s,68061
 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.dev10.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.15.dev12.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.dev10.dist-info/METADATA,sha256=FZkeltpJrx27P2fnujDDrYsinIFjnm1VsnnqTSVBk1g,13052
-portacode-1.4.15.dev10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-portacode-1.4.15.dev10.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.15.dev10.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.15.dev10.dist-info/RECORD,,
+portacode-1.4.15.dev12.dist-info/METADATA,sha256=dwNd_5apDmi-D2oDUKfEzBfEWsG7tzgjMSK0VwczFnE,13052
+portacode-1.4.15.dev12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+portacode-1.4.15.dev12.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.15.dev12.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.15.dev12.dist-info/RECORD,,