portacode 1.4.19__tar.gz → 1.4.19.dev0__tar.gz

{portacode-1.4.19 → portacode-1.4.19.dev0}/PKG-INFO

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

{portacode-1.4.19 → portacode-1.4.19.dev0}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.19'
-__version_tuple__ = version_tuple = (1, 4, 19)
+__version__ = version = '1.4.19.dev0'
+__version_tuple__ = version_tuple = (1, 4, 19, 'dev0')
 
 __commit_id__ = commit_id = None

{portacode-1.4.19 → portacode-1.4.19.dev0}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -380,7 +380,7 @@ Starts a previously provisioned, Portacode-managed LXC container. Handled by [`S
 
 **Payload Fields:**
 
-*   `ctid` (string, optional): Identifier of the container to start. If omitted, the handler resolves the CTID from the managed container records using `child_device_id`.
+*   `ctid` (string, required): Identifier of the container to start.
 *   `child_device_id` (string, required): Dashboard `Device.id` of the container that triggered the request; the handler validates the CT belongs to that device before issuing the start.
 
 **Responses:**
@@ -394,7 +394,7 @@ Stops a running Portacode-managed container. Handled by [`StopProxmoxContainerHa
 
 **Payload Fields:**
 
-*   `ctid` (string, optional): Identifier of the container to stop. If omitted, the handler resolves the CTID from managed container records and, if needed, by scanning managed container descriptions for the matching `device_id` marker.
+*   `ctid` (string, required): Identifier of the container to stop.
 *   `child_device_id` (string, required): Dashboard `Device.id` that owns the container; the handler rejects the request if the CT is mapped to another device.
 
 **Responses:**
@@ -408,13 +408,12 @@ Deletes a managed container from Proxmox (stopping it first if necessary) and re
 
 **Payload Fields:**
 
-*   `ctid` (string, optional): Identifier of the container to delete. If omitted, the handler resolves the CTID from managed container records and, if needed, by scanning managed container descriptions for the matching `device_id` marker.
+*   `ctid` (string, optional): Identifier of the container to delete. If omitted, the handler resolves the CTID from the managed container records using `child_device_id`.
 *   `child_device_id` (string, required): Dashboard `Device.id` that should own the container metadata being purged.
 
 **Responses:**
 
 *   Emits a [`proxmox_container_action`](#proxmox_container_action-event) event with `action="remove"` and the refreshed infra snapshot after deletion.
-*   If no managed container matches the requested `child_device_id`, emits a `proxmox_container_action` event with `success=false`, `status="not_found"`, and a human-readable message (no error event).
 *   Emits an [`error`](#error) event on failure.
 
 ### `proxmox_container_created`

{portacode-1.4.19 → portacode-1.4.19.dev0}/portacode/connection/handlers/proxmox_infra.py

@@ -17,7 +17,6 @@ import sys
 import tempfile
 import time
 import threading
-import random
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple
@@ -34,44 +33,6 @@ REPO_ROOT = Path(__file__).resolve().parents[3]
 NET_SETUP_SCRIPT = REPO_ROOT / "proxmox_management" / "net_setup.py"
 CONTAINERS_DIR = CONFIG_DIR / "containers"
 MANAGED_MARKER = "portacode-managed:true"
-DEVICE_ID_MARKER = "device_id="
-PROVISIONING_ID_MARKER = "provisioning_id="
-
-
-def _sanitize_description_value(value: Any) -> str:
-    return str(value).strip().replace(";", "_")
-
-
-def _build_managed_description(
-    base: Optional[str],
-    *,
-    device_id: Optional[str] = None,
-    provisioning_id: Optional[str] = None,
-) -> str:
-    parts = [part for part in (base or "").split(";") if part]
-    if MANAGED_MARKER not in parts:
-        parts.insert(0, MANAGED_MARKER)
-    if device_id:
-        device_id_value = _sanitize_description_value(device_id)
-        if not any(part.startswith(DEVICE_ID_MARKER) for part in parts):
-            parts.append(f"{DEVICE_ID_MARKER}{device_id_value}")
-    if provisioning_id:
-        provisioning_value = _sanitize_description_value(provisioning_id)
-        if not any(part.startswith(PROVISIONING_ID_MARKER) for part in parts):
-            parts.append(f"{PROVISIONING_ID_MARKER}{provisioning_value}")
-    return ";".join(parts)
-
-
-def _extract_marker_value(description: str, prefix: str) -> Optional[str]:
-    for part in description.split(";"):
-        part = part.strip()
-        if part.startswith(prefix):
-            return part[len(prefix) :].strip()
-    return None
-
-
-def _parse_device_id_from_description(description: str) -> Optional[str]:
-    return _extract_marker_value(description, DEVICE_ID_MARKER)
 
 DEFAULT_HOST = "localhost"
 DEFAULT_NODE_NAME = os.uname().nodename.split(".", 1)[0]
@@ -1296,21 +1257,12 @@ def _validate_positive_number(value: Any, default: float) -> float:
 
 
 def _wait_for_task(proxmox: Any, node: str, upid: str) -> Tuple[Dict[str, Any], float]:
-    from proxmoxer.core import ResourceException
     start = time.time()
-    poll = 2.0 
     while True:
-        try:
-            status = proxmox.nodes(node).tasks(upid).status.get()
-        except ResourceException as e:
-            if str(e).startswith("599 "):
-                # transient proxy glitch; task may still be running
-                time.sleep(poll + random.random() * 0.5)  # small jitter
-                continue
-            raise
+        status = proxmox.nodes(node).tasks(upid).status.get()
         if status.get("status") == "stopped":
             return status, time.time() - start
-        time.sleep(poll)
+        time.sleep(1)
 
 
 def _list_running_managed(proxmox: Any, node: str) -> List[Tuple[str, Dict[str, Any]]]:
@@ -1448,10 +1400,6 @@ def _parse_ctid(message: Dict[str, Any]) -> int:
     raise ValueError("ctid is required")
 
 
-class _DeviceLookupError(ValueError):
-    pass
-
-
 def _resolve_vmid_for_device(device_id: str) -> int:
     _initialize_managed_containers_state()
     records = list(_MANAGED_CONTAINERS_STATE.get("records", {}).values())
@@ -1468,77 +1416,21 @@ def _resolve_vmid_for_device(device_id: str) -> int:
             return int(str(vmid).strip())
         except ValueError:
             raise ValueError("ctid must be an integer") from None
-    raise _DeviceLookupError(
-        f"No managed container record found for device_id {device_id!r}."
-    )
-
-
-def _resolve_vmid_for_device_in_proxmox(
-    proxmox: Any, node: str, device_id: str
-) -> int:
-    device_id_value = str(device_id).strip()
-    matches: List[int] = []
-    try:
-        containers = proxmox.nodes(node).lxc.get()
-    except Exception as exc:  # pragma: no cover - proxmox failure
-        raise _DeviceLookupError(
-            f"Unable to query Proxmox containers for device_id {device_id_value!r}: {exc}"
-        ) from exc
-    for entry in containers or []:
-        vmid = entry.get("vmid")
-        if vmid is None:
-            continue
-        try:
-            cfg = proxmox.nodes(node).lxc(str(vmid)).config.get()
-        except Exception:
-            continue
-        description = (cfg or {}).get("description") or ""
-        if MANAGED_MARKER not in description:
-            continue
-        desc_device_id = _parse_device_id_from_description(description)
-        if desc_device_id is None:
-            continue
-        if str(desc_device_id) != device_id_value:
-            continue
-        matches.append(int(str(vmid).strip()))
-    if not matches:
-        raise _DeviceLookupError(
-            f"No managed container found for device_id {device_id_value!r}. It may already be deleted."
-        )
-    if len(matches) > 1:
-        raise _DeviceLookupError(
-            f"Multiple managed containers found for device_id {device_id_value!r}: {matches}."
-        )
-    return matches[0]
+    raise ValueError("ctid is required for remove_proxmox_container")
 
 
 def _ensure_container_managed(
     proxmox: Any, node: str, vmid: int, *, device_id: Optional[str] = None
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
-    try:
-        record = _read_container_record(vmid)
-    except FileNotFoundError:
-        record = {}
+    record = _read_container_record(vmid)
     ct_cfg = proxmox.nodes(node).lxc(str(vmid)).config.get()
-    description = (ct_cfg or {}).get("description") or ""
-    if not ct_cfg or MANAGED_MARKER not in description:
+    if not ct_cfg or MANAGED_MARKER not in (ct_cfg.get("description") or ""):
         raise RuntimeError(f"Container {vmid} is not managed by Portacode.")
     record_device_id = record.get("device_id")
-    description_device_id = _parse_device_id_from_description(description)
-    if device_id:
-        device_id_value = str(device_id)
-        if description_device_id and str(description_device_id) != device_id_value:
-            raise RuntimeError(
-                f"Container {vmid} is managed for device {description_device_id!r}, not {device_id_value!r}."
-            )
-        if record_device_id and str(record_device_id) != device_id_value:
-            raise RuntimeError(
-                f"Container {vmid} is managed for device {record_device_id!r}, not {device_id_value!r}."
-            )
-        if not description_device_id and not record_device_id:
-            raise RuntimeError(
-                f"Container {vmid} is missing a device_id marker; refusing to operate without ctid."
-            )
+    if device_id and str(record_device_id or "") != str(device_id):
+        raise RuntimeError(
+            f"Container {vmid} is managed for device {record_device_id!r}, not {device_id!r}."
+        )
     return record, ct_cfg
 
 
@@ -2223,11 +2115,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
             payload, device_id=device_id, request_id=request_id
         )
         provisioning_id = secrets.token_hex(6)
-        payload["description"] = _build_managed_description(
-            payload.get("description"),
-            device_id=device_id,
-            provisioning_id=provisioning_id,
-        )
+        payload["description"] = f"{payload.get('description', MANAGED_MARKER)};provisioning_id={provisioning_id}"
 
         def _provision_background() -> None:
             nonlocal current_step_index
@@ -2617,19 +2505,13 @@ class StartProxmoxContainerHandler(SyncHandler):
         return "start_proxmox_container"
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
+        vmid = _parse_ctid(message)
         child_device_id = (message.get("child_device_id") or "").strip()
         if not child_device_id:
             raise ValueError("child_device_id is required for start_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        try:
-            vmid = _parse_ctid(message)
-        except ValueError:
-            try:
-                vmid = _resolve_vmid_for_device(child_device_id)
-            except _DeviceLookupError:
-                vmid = _resolve_vmid_for_device_in_proxmox(proxmox, node, child_device_id)
         _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         status, elapsed = _start_container(proxmox, node, vmid)
@@ -2656,19 +2538,13 @@ class StopProxmoxContainerHandler(SyncHandler):
         return "stop_proxmox_container"
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
+        vmid = _parse_ctid(message)
         child_device_id = (message.get("child_device_id") or "").strip()
         if not child_device_id:
             raise ValueError("child_device_id is required for stop_proxmox_container")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        try:
-            vmid = _parse_ctid(message)
-        except ValueError:
-            try:
-                vmid = _resolve_vmid_for_device(child_device_id)
-            except _DeviceLookupError:
-                vmid = _resolve_vmid_for_device_in_proxmox(proxmox, node, child_device_id)
         _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         status, elapsed = _stop_container(proxmox, node, vmid)
@@ -2704,30 +2580,14 @@ class RemoveProxmoxContainerHandler(SyncHandler):
         child_device_id = (message.get("child_device_id") or "").strip()
         if not child_device_id:
             raise ValueError("child_device_id is required for remove_proxmox_container")
+        try:
+            vmid = _parse_ctid(message)
+        except ValueError:
+            vmid = _resolve_vmid_for_device(child_device_id)
         request_id = message.get("request_id")
         config = _ensure_infra_configured()
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
-        try:
-            vmid = _parse_ctid(message)
-        except ValueError:
-            try:
-                vmid = _resolve_vmid_for_device(child_device_id)
-            except _DeviceLookupError:
-                try:
-                    vmid = _resolve_vmid_for_device_in_proxmox(proxmox, node, child_device_id)
-                except _DeviceLookupError as exc:
-                    infra = get_infra_snapshot()
-                    return {
-                        "event": "proxmox_container_action",
-                        "action": "remove",
-                        "success": False,
-                        "message": str(exc),
-                        "status": "not_found",
-                        "child_device_id": child_device_id,
-                        "request_id": request_id,
-                        "infra": infra,
-                    }
         _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
 
         stop_status, stop_elapsed = _stop_container(proxmox, node, vmid)
@@ -2747,6 +2607,7 @@ class RemoveProxmoxContainerHandler(SyncHandler):
             },
             "status": "deleted",
             "child_device_id": child_device_id,
+            "on_behalf_of_device": child_device_id,
             "request_id": request_id,
             "infra": infra,
         }

{portacode-1.4.19 → portacode-1.4.19.dev0}/portacode.egg-info/PKG-INFO

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