portacode 1.4.15.dev6__tar.gz → 1.4.15.dev7__tar.gz

{portacode-1.4.15.dev6 → portacode-1.4.15.dev7}/PKG-INFO

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

{portacode-1.4.15.dev6 → portacode-1.4.15.dev7}/portacode/_version.py

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

{portacode-1.4.15.dev6 → portacode-1.4.15.dev7}/portacode/connection/handlers/proxmox_infra.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 import json
 import logging
+import math
 import os
 import secrets
 import shlex
@@ -436,48 +437,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},
@@ -489,6 +561,24 @@ def _build_bootstrap_steps(
     return steps
 
 
+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:
@@ -966,7 +1056,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:
+        package_manager = _detect_package_manager(vmid)
+        actual_steps = _build_bootstrap_steps(
+            user,
+            password,
+            ssh_key,
+            package_manager=package_manager,
+        )
     results, ok = _run_setup_steps(
         vmid,
         actual_steps,
@@ -1121,7 +1220,7 @@ def _instantiate_container(proxmox: Any, node: str, payload: Dict[str, Any]) ->
             memory=int(payload["ram_mib"]),
             swap=int(payload.get("swap_mb", 0)),
             cores=max(int(payload.get("cores", 1)), 1),
-            cpuunits=int(payload.get("cpuunits", 256)),
+            cpulimit=float(payload.get("cpulimit", payload.get("cpus", 1))),
             net0=payload["net0"],
             unprivileged=int(payload.get("unprivileged", 1)),
             description=payload.get("description", MANAGED_MARKER),
@@ -1235,7 +1334,8 @@ class CreateProxmoxContainerHandler(SyncHandler):
             proxmox = _connect_proxmox(config)
             node = config.get("node") or DEFAULT_NODE_NAME
             payload = _build_container_payload(message, config)
-            payload["cpuunits"] = max(int(payload["cpus"] * 1024), 10)
+            payload["cpulimit"] = float(payload["cpus"])
+            payload["cores"] = int(max(math.ceil(payload["cpus"]), 1))
             payload["memory"] = int(payload["ram_mib"])
             payload["node"] = node
             logger.debug(

{portacode-1.4.15.dev6 → portacode-1.4.15.dev7}/portacode.egg-info/PKG-INFO

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