portacode 1.4.17.dev7__tar.gz → 1.4.17.dev9__tar.gz

{portacode-1.4.17.dev7 → portacode-1.4.17.dev9}/PKG-INFO

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

{portacode-1.4.17.dev7 → portacode-1.4.17.dev9}/portacode/_version.py

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

{portacode-1.4.17.dev7 → portacode-1.4.17.dev9}/portacode/connection/handlers/proxmox_infra.py

@@ -2058,266 +2058,278 @@ class CreateProxmoxContainerHandler(SyncHandler):
             _validate_environment,
         )
 
-        reservation_id: Optional[str] = None
-        provisioning_id: Optional[str] = None
-        created_record = False
-        proxmox: Any = None
-        node: Optional[str] = None
-        vmid: Optional[int] = None
-
-        def _create_container():
-            nonlocal reservation_id, provisioning_id, created_record, proxmox, node, vmid
-            proxmox = _connect_proxmox(config)
-            node = config.get("node") or DEFAULT_NODE_NAME
-            payload = _build_container_payload(message, config)
-            payload["cpulimit"] = float(payload["cpus"])
-            payload["cores"] = int(max(math.ceil(payload["cpus"]), 1))
-            payload["memory"] = int(payload["ram_mib"])
-            payload["node"] = node
-            reservation_id = _reserve_container_resources(
-                payload, device_id=device_id, request_id=request_id
-            )
-            _emit_host_event(
-                self,
-                {
-                    "event": "proxmox_container_accepted",
-                    "success": True,
-                    "message": "Provisioning accepted; resources reserved.",
-                    "device_id": device_id,
-                    "request_id": request_id,
-                },
-            )
-            provisioning_id = secrets.token_hex(6)
-            payload["description"] = f"{payload.get('description', MANAGED_MARKER)};provisioning_id={provisioning_id}"
-            logger.debug(
-                "Provisioning container node=%s template=%s ram=%s cpu=%s storage=%s",
-                node,
-                payload["template"],
-                payload["ram_mib"],
-                payload["cpus"],
-                payload["storage"],
-            )
-            try:
-                vmid = _allocate_vmid(proxmox)
-                vmid, _ = _instantiate_container(proxmox, node, payload, vmid=vmid)
-            except Exception:
-                _release_container_reservation(reservation_id)
-                if vmid is not None:
-                    _cleanup_failed_container(proxmox, node, vmid, provisioning_id)
-                raise
-            payload["vmid"] = vmid
-            payload["created_at"] = datetime.utcnow().isoformat() + "Z"
-            payload["status"] = "creating"
-            payload["device_id"] = device_id
-            try:
-                _write_container_record(vmid, payload, reservation_id=reservation_id)
-                created_record = True
-            except Exception:
-                _release_container_reservation(reservation_id)
-                _cleanup_failed_container(proxmox, node, vmid, provisioning_id)
-                raise
-            return proxmox, node, vmid, payload
-
-        try:
-            proxmox, node, vmid, payload = _run_lifecycle_step(
-                "create_container",
-                "Creating container",
-                "Provisioning the LXC container…",
-                "Container created.",
-                _create_container,
-            )
-
-            def _start_container_step():
-                _start_container(proxmox, node, vmid)
+        node = config.get("node") or DEFAULT_NODE_NAME
+        payload = _build_container_payload(message, config)
+        payload["cpulimit"] = float(payload["cpus"])
+        payload["cores"] = int(max(math.ceil(payload["cpus"]), 1))
+        payload["memory"] = int(payload["ram_mib"])
+        payload["node"] = node
+
+        reservation_id = _reserve_container_resources(
+            payload, device_id=device_id, request_id=request_id
+        )
+        provisioning_id = secrets.token_hex(6)
+        payload["description"] = f"{payload.get('description', MANAGED_MARKER)};provisioning_id={provisioning_id}"
 
-            _run_lifecycle_step(
-                "start_container",
-                "Starting container",
-                "Booting the container…",
-                "Container startup completed.",
-                _start_container_step,
-            )
-            _update_container_record(vmid, {"status": "running"})
-
-            def _bootstrap_progress_callback(
-                step_index: int,
-                total: int,
-                step: Dict[str, Any],
-                status: str,
-                result: Optional[Dict[str, Any]],
-            ):
-                label = step.get("display_name") or _friendly_step_label(step.get("name", "bootstrap"))
-                error_summary = (result or {}).get("error_summary") or (result or {}).get("error")
-                attempt = (result or {}).get("attempt")
-                if status == "in_progress":
-                    message_text = f"{label} is running…"
-                elif status == "completed":
-                    message_text = f"{label} completed."
-                elif status == "retrying":
-                    attempt_desc = f" (attempt {attempt})" if attempt else ""
-                    message_text = f"{label} failed{attempt_desc}; retrying…"
-                else:
-                    message_text = f"{label} failed"
-                    if error_summary:
-                        message_text += f": {error_summary}"
-                details: Dict[str, Any] = {}
-                if attempt:
-                    details["attempt"] = attempt
-                if error_summary:
-                    details["error_summary"] = error_summary
-                _emit_progress_event(
-                    self,
-                    step_index=step_index,
-                    total_steps=total,
-                    step_name=step.get("name", "bootstrap"),
-                    step_label=label,
-                    status=status,
-                    message=message_text,
-                    phase="bootstrap",
-                    request_id=request_id,
-                    details=details or None,
-                    on_behalf_of_device=device_id,
+        def _provision_background() -> None:
+            nonlocal current_step_index
+            proxmox: Any = None
+            vmid: Optional[int] = None
+            created_record = False
+            try:
+                def _create_container():
+                    nonlocal proxmox, vmid, created_record
+                    proxmox = _connect_proxmox(config)
+                    logger.debug(
+                        "Provisioning container node=%s template=%s ram=%s cpu=%s storage=%s",
+                        node,
+                        payload["template"],
+                        payload["ram_mib"],
+                        payload["cpus"],
+                        payload["storage"],
+                    )
+                    try:
+                        vmid = _allocate_vmid(proxmox)
+                        vmid, _ = _instantiate_container(proxmox, node, payload, vmid=vmid)
+                    except Exception:
+                        _release_container_reservation(reservation_id)
+                        if vmid is not None:
+                            _cleanup_failed_container(proxmox, node, vmid, provisioning_id)
+                        raise
+                    payload["vmid"] = vmid
+                    payload["created_at"] = datetime.utcnow().isoformat() + "Z"
+                    payload["status"] = "creating"
+                    payload["device_id"] = device_id
+                    try:
+                        _write_container_record(vmid, payload, reservation_id=reservation_id)
+                        created_record = True
+                    except Exception:
+                        _release_container_reservation(reservation_id)
+                        _cleanup_failed_container(proxmox, node, vmid, provisioning_id)
+                        raise
+                    return proxmox, node, vmid, payload
+
+                proxmox, _, vmid, payload_local = _run_lifecycle_step(
+                    "create_container",
+                    "Creating container",
+                    "Provisioning the LXC container…",
+                    "Container created.",
+                    _create_container,
                 )
 
-            public_key, steps = _bootstrap_portacode(
-                vmid,
-                payload["username"],
-                payload["password"],
-                payload["ssh_public_key"],
-                steps=bootstrap_steps,
-                progress_callback=_bootstrap_progress_callback,
-                start_index=current_step_index,
-                total_steps=total_steps,
-                default_public_key=device_public_key if has_device_keypair else None,
-            )
-            current_step_index += len(bootstrap_steps)
+                def _start_container_step():
+                    _start_container(proxmox, node, vmid)
 
-            service_installed = False
-            if has_device_keypair:
-                logger.info(
-                    "deploying dashboard-provided Portacode keypair (device_id=%s) into container %s",
-                    device_id,
-                    vmid,
+                _run_lifecycle_step(
+                    "start_container",
+                    "Starting container",
+                    "Booting the container…",
+                    "Container startup completed.",
+                    _start_container_step,
                 )
-                _deploy_device_keypair(
-                    vmid,
-                    payload["username"],
-                    device_private_key,
-                    device_public_key,
-                )
-                service_installed = True
-                service_start_index = current_step_index
+                _update_container_record(vmid, {"status": "running"})
+
+                def _bootstrap_progress_callback(
+                    step_index: int,
+                    total: int,
+                    step: Dict[str, Any],
+                    status: str,
+                    result: Optional[Dict[str, Any]],
+                ):
+                    label = step.get("display_name") or _friendly_step_label(step.get("name", "bootstrap"))
+                    error_summary = (result or {}).get("error_summary") or (result or {}).get("error")
+                    attempt = (result or {}).get("attempt")
+                    if status == "in_progress":
+                        message_text = f"{label} is running…"
+                    elif status == "completed":
+                        message_text = f"{label} completed."
+                    elif status == "retrying":
+                        attempt_desc = f" (attempt {attempt})" if attempt else ""
+                        message_text = f"{label} failed{attempt_desc}; retrying…"
+                    else:
+                        message_text = f"{label} failed"
+                        if error_summary:
+                            message_text += f": {error_summary}"
+                    details: Dict[str, Any] = {}
+                    if attempt:
+                        details["attempt"] = attempt
+                    if error_summary:
+                        details["error_summary"] = error_summary
+                    _emit_progress_event(
+                        self,
+                        step_index=step_index,
+                        total_steps=total,
+                        step_name=step.get("name", "bootstrap"),
+                        step_label=label,
+                        status=status,
+                        message=message_text,
+                        phase="bootstrap",
+                        request_id=request_id,
+                        details=details or None,
+                        on_behalf_of_device=device_id,
+                    )
 
-                auth_step_name = "setup_device_authentication"
-                auth_label = "Setting up device authentication"
-                _emit_progress_event(
-                    self,
-                    step_index=service_start_index,
+                public_key, steps = _bootstrap_portacode(
+                    vmid,
+                    payload_local["username"],
+                    payload_local["password"],
+                    payload_local["ssh_public_key"],
+                    steps=bootstrap_steps,
+                    progress_callback=_bootstrap_progress_callback,
+                    start_index=current_step_index,
                     total_steps=total_steps,
-                    step_name=auth_step_name,
-                    step_label=auth_label,
-                    status="in_progress",
-                    message="Notifying the server of the new device…",
-                    phase="service",
-                    request_id=request_id,
-                    on_behalf_of_device=device_id,
-                )
-                _emit_progress_event(
-                    self,
-                    step_index=service_start_index,
-                    total_steps=total_steps,
-                    step_name=auth_step_name,
-                    step_label=auth_label,
-                    status="completed",
-                    message="Authentication metadata recorded.",
-                    phase="service",
-                    request_id=request_id,
-                    on_behalf_of_device=device_id,
+                    default_public_key=device_public_key if has_device_keypair else None,
                 )
+                current_step_index += len(bootstrap_steps)
+
+                service_installed = False
+                if has_device_keypair:
+                    logger.info(
+                        "deploying dashboard-provided Portacode keypair (device_id=%s) into container %s",
+                        device_id,
+                        vmid,
+                    )
+                    _deploy_device_keypair(
+                        vmid,
+                        payload_local["username"],
+                        device_private_key,
+                        device_public_key,
+                    )
+                    service_installed = True
+                    service_start_index = current_step_index
 
-                install_step = service_start_index + 1
-                install_label = "Launching Portacode service"
-                _emit_progress_event(
-                    self,
-                    step_index=install_step,
-                    total_steps=total_steps,
-                    step_name="launch_portacode_service",
-                    step_label=install_label,
-                    status="in_progress",
-                    message="Running sudo portacode service install…",
-                    phase="service",
-                    request_id=request_id,
-                    on_behalf_of_device=device_id,
-                )
+                    auth_step_name = "setup_device_authentication"
+                    auth_label = "Setting up device authentication"
+                    _emit_progress_event(
+                        self,
+                        step_index=service_start_index,
+                        total_steps=total_steps,
+                        step_name=auth_step_name,
+                        step_label=auth_label,
+                        status="in_progress",
+                        message="Notifying the server of the new device…",
+                        phase="service",
+                        request_id=request_id,
+                        on_behalf_of_device=device_id,
+                    )
+                    _emit_progress_event(
+                        self,
+                        step_index=service_start_index,
+                        total_steps=total_steps,
+                        step_name=auth_step_name,
+                        step_label=auth_label,
+                        status="completed",
+                        message="Authentication metadata recorded.",
+                        phase="service",
+                        request_id=request_id,
+                        on_behalf_of_device=device_id,
+                    )
 
-                cmd = _su_command(payload["username"], "sudo -S portacode service install")
-                res = _run_pct(vmid, cmd, input_text=payload["password"] + "\n")
+                    install_step = service_start_index + 1
+                    install_label = "Launching Portacode service"
+                    _emit_progress_event(
+                        self,
+                        step_index=install_step,
+                        total_steps=total_steps,
+                        step_name="launch_portacode_service",
+                        step_label=install_label,
+                        status="in_progress",
+                        message="Running sudo portacode service install…",
+                        phase="service",
+                        request_id=request_id,
+                        on_behalf_of_device=device_id,
+                    )
+
+                    cmd = _su_command(payload_local["username"], "sudo -S portacode service install")
+                    res = _run_pct(vmid, cmd, input_text=payload_local["password"] + "\n")
+
+                    if res["returncode"] != 0:
+                        _emit_progress_event(
+                            self,
+                            step_index=install_step,
+                            total_steps=total_steps,
+                            step_name="launch_portacode_service",
+                            step_label=install_label,
+                            status="failed",
+                            message=f"{install_label} failed: {res.get('stderr') or res.get('stdout')}",
+                            phase="service",
+                            request_id=request_id,
+                            details={
+                                "stderr": res.get("stderr"),
+                                "stdout": res.get("stdout"),
+                            },
+                            on_behalf_of_device=device_id,
+                        )
+                        raise RuntimeError(res.get("stderr") or res.get("stdout") or "Service install failed")
 
-                if res["returncode"] != 0:
                     _emit_progress_event(
                         self,
                         step_index=install_step,
                         total_steps=total_steps,
                         step_name="launch_portacode_service",
                         step_label=install_label,
-                        status="failed",
-                        message=f"{install_label} failed: {res.get('stderr') or res.get('stdout')}",
+                        status="completed",
+                        message="Portacode service install finished.",
                         phase="service",
                         request_id=request_id,
-                        details={
-                            "stderr": res.get("stderr"),
-                            "stdout": res.get("stdout"),
-                        },
                         on_behalf_of_device=device_id,
                     )
-                    raise RuntimeError(res.get("stderr") or res.get("stdout") or "Service install failed")
 
-                _emit_progress_event(
+                    logger.info(
+                        "create_proxmox_container: portacode service install completed inside ct %s", vmid
+                    )
+
+                    current_step_index += 2
+
+                _emit_host_event(
                     self,
-                    step_index=install_step,
-                    total_steps=total_steps,
-                    step_name="launch_portacode_service",
-                    step_label=install_label,
-                    status="completed",
-                    message="Portacode service install finished.",
-                    phase="service",
-                    request_id=request_id,
-                    on_behalf_of_device=device_id,
+                    {
+                        "event": "proxmox_container_created",
+                        "success": True,
+                        "message": f"Container {vmid} is ready and Portacode key captured.",
+                        "ctid": str(vmid),
+                        "public_key": public_key,
+                        "container": {
+                            "vmid": vmid,
+                            "hostname": payload_local["hostname"],
+                            "template": payload_local["template"],
+                            "storage": payload_local["storage"],
+                            "disk_gib": payload_local["disk_gib"],
+                            "ram_mib": payload_local["ram_mib"],
+                            "cpus": payload_local["cpus"],
+                        },
+                        "setup_steps": steps,
+                        "device_id": device_id,
+                        "on_behalf_of_device": device_id,
+                        "service_installed": service_installed,
+                        "request_id": request_id,
+                    },
                 )
-
-                logger.info(
-                    "create_proxmox_container: portacode service install completed inside ct %s", vmid
+            except Exception as exc:
+                if reservation_id and not created_record:
+                    _release_container_reservation(reservation_id)
+                if vmid is not None and proxmox and node:
+                    _cleanup_failed_container(proxmox, node, vmid, provisioning_id)
+                    _remove_container_record(vmid)
+                _emit_host_event(
+                    self,
+                    {
+                        "event": "error",
+                        "message": str(exc),
+                        "device_id": device_id,
+                        "request_id": request_id,
+                    },
                 )
 
-                current_step_index += 2
-
-            return {
-                "event": "proxmox_container_created",
-                "success": True,
-                "message": f"Container {vmid} is ready and Portacode key captured.",
-                "ctid": str(vmid),
-                "public_key": public_key,
-                "container": {
-                    "vmid": vmid,
-                    "hostname": payload["hostname"],
-                    "template": payload["template"],
-                    "storage": payload["storage"],
-                    "disk_gib": payload["disk_gib"],
-                    "ram_mib": payload["ram_mib"],
-                    "cpus": payload["cpus"],
-                },
-                "setup_steps": steps,
-                "device_id": device_id,
-                "on_behalf_of_device": device_id,
-                "service_installed": service_installed,
-            }
-        except Exception:
-            if reservation_id and not created_record:
-                _release_container_reservation(reservation_id)
-            if vmid is not None and proxmox and node:
-                _cleanup_failed_container(proxmox, node, vmid, provisioning_id)
-                _remove_container_record(vmid)
-            raise
+        threading.Thread(target=_provision_background, daemon=True).start()
+
+        return {
+            "event": "proxmox_container_accepted",
+            "success": True,
+            "message": "Provisioning accepted; resources reserved.",
+            "device_id": device_id,
+            "request_id": request_id,
+        }
 
 
 class StartPortacodeServiceHandler(SyncHandler):