portacode 1.4.34.dev2__tar.gz → 1.4.34.dev3__tar.gz

{portacode-1.4.34.dev2 → portacode-1.4.34.dev3}/PKG-INFO

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

{portacode-1.4.34.dev2 → portacode-1.4.34.dev3}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.34.dev2'
-__version_tuple__ = version_tuple = (1, 4, 34, 'dev2')
+__version__ = version = '1.4.34.dev3'
+__version_tuple__ = version_tuple = (1, 4, 34, 'dev3')
 
 __commit_id__ = commit_id = None

{portacode-1.4.34.dev2 → portacode-1.4.34.dev3}/portacode/connection/handlers/proxmox_infra.py

@@ -2064,6 +2064,15 @@ class _DeviceLookupError(ValueError):
     pass
 
 
+def _is_proxmox_missing_container_error(exc: Exception) -> bool:
+    message = str(exc).lower()
+    return (
+        "does not exist" in message
+        or "not found" in message
+        or "no such file or directory" in message
+    )
+
+
 def _resolve_vmid_for_device(device_id: str) -> int:
     _initialize_managed_containers_state()
     records = list(_MANAGED_CONTAINERS_STATE.get("records", {}).values())
@@ -3528,7 +3537,16 @@ class RemoveProxmoxContainerHandler(SyncHandler):
                         "request_id": request_id,
                         "infra": infra,
                     }
-        _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
+
+        try:
+            record = _read_container_record(vmid)
+        except FileNotFoundError:
+            record = {}
+        record_device_id = record.get("device_id")
+        if record_device_id and str(record_device_id) != child_device_id:
+            raise RuntimeError(
+                f"Container {vmid} is managed for device {record_device_id!r}, not {child_device_id!r}."
+            )
 
         # Clear Cloudflare forwarding rules for this container before deletion so
         # stale routes cannot remain after the managed record is removed.
@@ -3541,6 +3559,29 @@ class RemoveProxmoxContainerHandler(SyncHandler):
             if "cloudflare tunnel is not configured yet" not in msg and "domain or tunnel name missing" not in msg:
                 raise
 
+        try:
+            _ensure_container_managed(proxmox, node, vmid, device_id=child_device_id)
+        except Exception as exc:
+            if not _is_proxmox_missing_container_error(exc):
+                raise
+            _remove_container_record(vmid)
+            infra = get_infra_snapshot()
+            return {
+                "event": "proxmox_container_action",
+                "action": "remove",
+                "success": True,
+                "ctid": str(vmid),
+                "message": f"Container {vmid} was already deleted; cleaned up local metadata.",
+                "details": {
+                    "stop_exitstatus": None,
+                    "delete_exitstatus": None,
+                },
+                "status": "deleted",
+                "child_device_id": child_device_id,
+                "request_id": request_id,
+                "infra": infra,
+            }
+
         stop_status, stop_elapsed = _stop_container(proxmox, node, vmid)
         delete_status, delete_elapsed = _delete_container(proxmox, node, vmid)
         _remove_container_record(vmid)

portacode-1.4.34.dev3/portacode/connection/handlers/test_proxmox_infra.py

@@ -0,0 +1,51 @@
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from portacode.connection.handlers.proxmox_infra import (
+    RemoveProxmoxContainerHandler,
+    _build_bootstrap_steps,
+)
+
+
+class ProxmoxInfraHandlerTests(TestCase):
+    def test_build_bootstrap_steps_includes_portacode_connect_by_default(self):
+        steps = _build_bootstrap_steps("svcuser", "pass", "", include_portacode_connect=True)
+        self.assertTrue(any(step.get("name") == "portacode_connect" for step in steps))
+
+    def test_build_bootstrap_steps_skips_portacode_connect_when_requested(self):
+        steps = _build_bootstrap_steps("svcuser", "pass", "", include_portacode_connect=False)
+        self.assertFalse(any(step.get("name") == "portacode_connect" for step in steps))
+
+    @patch("portacode.connection.handlers.proxmox_infra.get_infra_snapshot", return_value={})
+    @patch("portacode.connection.handlers.proxmox_infra._remove_container_record")
+    @patch("portacode.connection.handlers.proxmox_infra._ensure_container_managed")
+    @patch("portacode.connection.handlers.proxmox_infra._read_container_record")
+    @patch("portacode.connection.handlers.proxmox_infra._get_node_from_config", return_value="pve2")
+    @patch("portacode.connection.handlers.proxmox_infra._connect_proxmox", return_value=object())
+    @patch("portacode.connection.handlers.proxmox_infra._ensure_infra_configured", return_value={"token_value": "x"})
+    @patch("portacode.connection.handlers.cloudflare_forwarding.set_container_forwarding_rules")
+    def test_remove_container_succeeds_when_proxmox_container_already_missing(
+        self,
+        mock_clear_forwarding,
+        _mock_configured,
+        _mock_connect,
+        _mock_get_node,
+        mock_read_record,
+        mock_ensure_managed,
+        mock_remove_record,
+        _mock_snapshot,
+    ):
+        mock_read_record.return_value = {"vmid": 134, "device_id": "42"}
+        mock_ensure_managed.side_effect = RuntimeError(
+            "500 Internal Server Error: Configuration file 'nodes/pve2/lxc/134.conf' does not exist"
+        )
+
+        handler = RemoveProxmoxContainerHandler(control_channel=MagicMock(), context={})
+        response = handler.execute({"child_device_id": "42", "ctid": "134"})
+
+        self.assertTrue(response["success"])
+        self.assertEqual(response["status"], "deleted")
+        self.assertEqual(response["ctid"], "134")
+        self.assertIn("already deleted", response["message"])
+        mock_clear_forwarding.assert_called_once_with("42", [])
+        mock_remove_record.assert_called_once_with(134)

{portacode-1.4.34.dev2 → portacode-1.4.34.dev3}/portacode.egg-info/PKG-INFO

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

portacode-1.4.34.dev2/portacode/connection/handlers/test_proxmox_infra.py

@@ -1,28 +0,0 @@
-from unittest import TestCase
-
-from portacode.connection.handlers.proxmox_infra import (
-    _build_bootstrap_steps,
-    _normalize_template_family_requests,
-)
-
-
-class ProxmoxInfraHandlerTests(TestCase):
-    def test_build_bootstrap_steps_includes_portacode_connect_by_default(self):
-        steps = _build_bootstrap_steps("svcuser", "pass", "", include_portacode_connect=True)
-        self.assertTrue(any(step.get("name") == "portacode_connect" for step in steps))
-
-    def test_build_bootstrap_steps_skips_portacode_connect_when_requested(self):
-        steps = _build_bootstrap_steps("svcuser", "pass", "", include_portacode_connect=False)
-        self.assertFalse(any(step.get("name") == "portacode_connect" for step in steps))
-
-    def test_normalize_template_families_defaults_to_basic_four(self):
-        self.assertEqual(
-            _normalize_template_family_requests(None),
-            ["ubuntu", "alpine", "opensuse", "centos"],
-        )
-
-    def test_normalize_template_families_applies_aliases_and_dedupes(self):
-        self.assertEqual(
-            _normalize_template_family_requests(["Ubuntu", "suse", "centos-stream", "ubuntu"]),
-            ["ubuntu", "opensuse", "centos"],
-        )