portacode 1.4.12.dev8__tar.gz → 1.4.13.dev0__tar.gz

{portacode-1.4.12.dev8 → portacode-1.4.13.dev0}/PKG-INFO

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

{portacode-1.4.12.dev8 → portacode-1.4.13.dev0}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.12.dev8'
-__version_tuple__ = version_tuple = (1, 4, 12, 'dev8')
+__version__ = version = '1.4.13.dev0'
+__version_tuple__ = version_tuple = (1, 4, 13, 'dev0')
 
 __commit_id__ = commit_id = None

{portacode-1.4.12.dev8 → portacode-1.4.13.dev0}/portacode/connection/handlers/proxmox_infra.py

@@ -59,6 +59,7 @@ def _emit_progress_event(
     message: str,
     phase: str,
     request_id: Optional[str],
+    client_sessions: Optional[List[str]] = None,
     details: Optional[Dict[str, Any]] = None,
 ) -> None:
     loop = handler.context.get("event_loop")
@@ -84,6 +85,8 @@ def _emit_progress_event(
         payload["request_id"] = request_id
     if details:
         payload["details"] = details
+    if client_sessions:
+        payload["client_sessions"] = client_sessions
 
     future = asyncio.run_coroutine_threadsafe(handler.send_response(payload), loop)
     future.add_done_callback(
@@ -704,9 +707,12 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
     stable = 0
     history: List[Dict[str, Any]] = []
 
+    process_exited = False
+    exit_out = exit_err = ""
     while time.time() - start < timeout_s:
         if proc.poll() is not None:
-            out, err = proc.communicate(timeout=1)
+            process_exited = True
+            exit_out, exit_err = proc.communicate(timeout=1)
             history.append(
                 {
                     "timestamp_s": round(time.time() - start, 2),
@@ -714,13 +720,7 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
                     "returncode": proc.returncode,
                 }
             )
-            return {
-                "ok": False,
-                "error": "portacode connect exited before keys were created",
-                "stdout": (out or "").strip(),
-                "stderr": (err or "").strip(),
-                "history": history,
-            }
+            break
         pub_size = file_size(pub_path)
         priv_size = file_size(priv_path)
         if pub_size and priv_size:
@@ -749,13 +749,29 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
         )
         time.sleep(1)
 
-    if stable < 1:
+    final_pub = file_size(pub_path)
+    final_priv = file_size(priv_path)
+    if final_pub and final_priv:
+        key_res = _run_pct(vmid, f"su - {user} -c 'cat {pub_path}'")
+        if not process_exited:
+            proc.terminate()
+            try:
+                proc.wait(timeout=3)
+            except subprocess.TimeoutExpired:
+                proc.kill()
+        return {
+            "ok": True,
+            "public_key": key_res["stdout"].strip(),
+            "history": history,
+        }
+
+    if not process_exited:
         proc.terminate()
         try:
             proc.wait(timeout=3)
         except subprocess.TimeoutExpired:
             proc.kill()
-        out, err = proc.communicate(timeout=1)
+        exit_out, exit_err = proc.communicate(timeout=1)
         history.append(
             {
                 "timestamp_s": round(time.time() - start, 2),
@@ -765,8 +781,8 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
         return {
             "ok": False,
             "error": "timed out waiting for portacode key files",
-            "stdout": (out or "").strip(),
-            "stderr": (err or "").strip(),
+            "stdout": (exit_out or "").strip(),
+            "stderr": (exit_err or "").strip(),
             "history": history,
         }
 
@@ -1037,8 +1053,14 @@ class CreateProxmoxContainerHandler(SyncHandler):
         return "create_proxmox_container"
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
-        logger.info("create_proxmox_container command received")
         request_id = message.get("request_id")
+        source_client_session = message.get("source_client_session")
+        logger.info(
+            "create_proxmox_container command received request_id=%s client_session=%s",
+            request_id,
+            source_client_session,
+        )
+        client_sessions = [source_client_session] if source_client_session else None
         bootstrap_user, bootstrap_password, bootstrap_ssh_key = _get_provisioning_user_info(message)
         bootstrap_steps = _build_bootstrap_steps(bootstrap_user, bootstrap_password, bootstrap_ssh_key)
         total_steps = 3 + len(bootstrap_steps) + 2
@@ -1062,6 +1084,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=start_message,
                 phase="lifecycle",
                 request_id=request_id,
+                client_sessions=client_sessions,
             )
             try:
                 result = action()
@@ -1076,6 +1099,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                     message=f"{step_label} failed: {exc}",
                     phase="lifecycle",
                     request_id=request_id,
+                    client_sessions=client_sessions,
                     details={"error": str(exc)},
                 )
                 raise
@@ -1089,6 +1113,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=success_message,
                 phase="lifecycle",
                 request_id=request_id,
+                client_sessions=client_sessions,
             )
             current_step_index += 1
             return result
@@ -1118,7 +1143,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
             payload["cpuunits"] = max(int(payload["cpus"] * 1024), 10)
             payload["memory"] = int(payload["ram_mib"])
             payload["node"] = node
-            logger.debug(
+            logger.info(
                 "Provisioning container node=%s template=%s ram=%s cpu=%s storage=%s",
                 node,
                 payload["template"],
@@ -1131,6 +1156,12 @@ class CreateProxmoxContainerHandler(SyncHandler):
             payload["created_at"] = datetime.utcnow().isoformat() + "Z"
             payload["status"] = "creating"
             _write_container_record(vmid, payload)
+            logger.info(
+                "Container record written vmid=%s hostname=%s client_session=%s",
+                vmid,
+                payload["hostname"],
+                source_client_session,
+            )
             return proxmox, node, vmid, payload
 
         proxmox, node, vmid, payload = _run_lifecycle_step(
@@ -1189,9 +1220,16 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 message=message_text,
                 phase="bootstrap",
                 request_id=request_id,
+                client_sessions=client_sessions,
                 details=details or None,
             )
 
+        logger.info(
+            "Bootstrapping Portacode in container vmid=%s user=%s client_session=%s",
+            vmid,
+            payload["username"],
+            source_client_session,
+        )
         public_key, steps = _bootstrap_portacode(
             vmid,
             payload["username"],
@@ -1204,7 +1242,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
         )
         current_step_index += len(bootstrap_steps)
 
-        return {
+        response = {
             "event": "proxmox_container_created",
             "success": True,
             "message": f"Container {vmid} is ready and Portacode key captured.",
@@ -1221,6 +1259,9 @@ class CreateProxmoxContainerHandler(SyncHandler):
             },
             "setup_steps": steps,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class StartPortacodeServiceHandler(SyncHandler):
@@ -1248,6 +1289,15 @@ class StartPortacodeServiceHandler(SyncHandler):
         start_index = int(message.get("step_index", 1))
         total_steps = int(message.get("total_steps", start_index + 2))
         request_id = message.get("request_id")
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
+
+        logger.info(
+            "start_portacode_service invoked vmid=%s user=%s client_session=%s",
+            vmid,
+            user,
+            source_client_session,
+        )
 
         auth_step_name = "setup_device_authentication"
         auth_label = "Setting up device authentication"
@@ -1261,6 +1311,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Notifying the server of the new device…",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
         _emit_progress_event(
             self,
@@ -1272,6 +1323,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Authentication metadata recorded.",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
 
         install_step = start_index + 1
@@ -1286,6 +1338,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Running sudo portacode service install…",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
 
         cmd = f"su - {user} -c 'sudo -S portacode service install'"
@@ -1302,6 +1355,7 @@ class StartPortacodeServiceHandler(SyncHandler):
                 message=f"{install_label} failed: {res.get('stderr') or res.get('stdout')}",
                 phase="service",
                 request_id=request_id,
+                client_sessions=client_sessions,
                 details={
                     "stderr": res.get("stderr"),
                     "stdout": res.get("stdout"),
@@ -1309,6 +1363,12 @@ class StartPortacodeServiceHandler(SyncHandler):
             )
             raise RuntimeError(res.get("stderr") or res.get("stdout") or "Service install failed")
 
+        logger.info(
+            "portacode service install command completed vmid=%s returncode=%s",
+            vmid,
+            res["returncode"],
+        )
+
         _emit_progress_event(
             self,
             step_index=install_step,
@@ -1319,14 +1379,18 @@ class StartPortacodeServiceHandler(SyncHandler):
             message="Portacode service install finished.",
             phase="service",
             request_id=request_id,
+            client_sessions=client_sessions,
         )
 
-        return {
+        response = {
             "event": "proxmox_service_started",
             "success": True,
             "message": "Portacode service install completed",
             "ctid": str(vmid),
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class StartProxmoxContainerHandler(SyncHandler):
@@ -1342,12 +1406,20 @@ class StartProxmoxContainerHandler(SyncHandler):
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
         _ensure_container_managed(proxmox, node, vmid)
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
+
+        logger.info(
+            "start_proxmox_container invoked vmid=%s client_session=%s",
+            vmid,
+            source_client_session,
+        )
 
         status, elapsed = _start_container(proxmox, node, vmid)
         _update_container_record(vmid, {"status": "running"})
 
         infra = get_infra_snapshot()
-        return {
+        response = {
             "event": "proxmox_container_action",
             "action": "start",
             "success": True,
@@ -1357,6 +1429,9 @@ class StartProxmoxContainerHandler(SyncHandler):
             "status": status.get("status"),
             "infra": infra,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class StopProxmoxContainerHandler(SyncHandler):
@@ -1372,6 +1447,14 @@ class StopProxmoxContainerHandler(SyncHandler):
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
         _ensure_container_managed(proxmox, node, vmid)
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
+
+        logger.info(
+            "stop_proxmox_container invoked vmid=%s client_session=%s",
+            vmid,
+            source_client_session,
+        )
 
         status, elapsed = _stop_container(proxmox, node, vmid)
         final_status = status.get("status") or "stopped"
@@ -1383,7 +1466,7 @@ class StopProxmoxContainerHandler(SyncHandler):
             if final_status != "running" and elapsed == 0.0
             else f"Stopped container {vmid} in {elapsed:.1f}s."
         )
-        return {
+        response = {
             "event": "proxmox_container_action",
             "action": "stop",
             "success": True,
@@ -1393,6 +1476,9 @@ class StopProxmoxContainerHandler(SyncHandler):
             "status": final_status,
             "infra": infra,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class RemoveProxmoxContainerHandler(SyncHandler):
@@ -1408,13 +1494,21 @@ class RemoveProxmoxContainerHandler(SyncHandler):
         proxmox = _connect_proxmox(config)
         node = _get_node_from_config(config)
         _ensure_container_managed(proxmox, node, vmid)
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
+
+        logger.info(
+            "remove_proxmox_container invoked vmid=%s client_session=%s",
+            vmid,
+            source_client_session,
+        )
 
         stop_status, stop_elapsed = _stop_container(proxmox, node, vmid)
         delete_status, delete_elapsed = _delete_container(proxmox, node, vmid)
         _remove_container_record(vmid)
 
         infra = get_infra_snapshot()
-        return {
+        response = {
             "event": "proxmox_container_action",
             "action": "remove",
             "success": True,
@@ -1427,6 +1521,9 @@ class RemoveProxmoxContainerHandler(SyncHandler):
             "status": "deleted",
             "infra": infra,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class ConfigureProxmoxInfraHandler(SyncHandler):
@@ -1440,13 +1537,18 @@ class ConfigureProxmoxInfraHandler(SyncHandler):
         verify_ssl = bool(message.get("verify_ssl"))
         if not token_identifier or not token_value:
             raise ValueError("token_identifier and token_value are required")
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
         snapshot = configure_infrastructure(token_identifier, token_value, verify_ssl=verify_ssl)
-        return {
+        response = {
             "event": "proxmox_infra_configured",
             "success": True,
             "message": "Proxmox infrastructure configured",
             "infra": snapshot,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response
 
 
 class RevertProxmoxInfraHandler(SyncHandler):
@@ -1455,10 +1557,15 @@ class RevertProxmoxInfraHandler(SyncHandler):
         return "revert_proxmox_infra"
 
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
+        source_client_session = message.get("source_client_session")
+        client_sessions = [source_client_session] if source_client_session else None
         snapshot = revert_infrastructure()
-        return {
+        response = {
             "event": "proxmox_infra_reverted",
             "success": True,
             "message": "Proxmox infrastructure configuration reverted",
             "infra": snapshot,
         }
+        if client_sessions:
+            response["client_sessions"] = client_sessions
+        return response

{portacode-1.4.12.dev8 → portacode-1.4.13.dev0}/portacode.egg-info/PKG-INFO

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