portacode 1.4.14__py3-none-any.whl → 1.4.15.dev0__py3-none-any.whl

portacode/_version.py

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

portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -326,9 +326,10 @@ Configures a Proxmox node for Portacode infrastructure usage (API token validati
 
 **Payload Fields:**
 
-*   `token_identifier` (string, required): API token identifier in the form `user@realm!tokenid`.
-*   `token_value` (string, required): Secret value associated with the token.
-*   `verify_ssl` (boolean, optional): When true, the handler verifies SSL certificates; defaults to `false`.
+*   `token_identifier` (string, optional when reconfiguring): API token identifier in the form `user@realm!tokenid`. Required on first configuration or when replacing the stored token.
+*   `token_value` (string, optional when reconfiguring): Secret value associated with the token. Required when `token_identifier` is supplied.
+*   `verify_ssl` (boolean, optional): When true, the handler verifies SSL certificates; defaults to `false`. When omitted, the last configured value is preserved.
+*   `cloudflare_api_token` (string, optional): Cloudflare API token the host can reuse later to provision tunnels.
 
 **Responses:**
 
@@ -1126,6 +1127,8 @@ Provides system information in response to a `system_info` action. Handled by [`
                     *   `message` (string|null): Informational text about the network setup attempt.
                     *   `bridge` (string): The bridge interface configured (typically `vmbr1`).
                     *   `health` (string|null): `"healthy"` when the connectivity verification succeeded.
+                *   `cloudflare` (object): Optional Cloudflare metadata collected for future tunnels:
+                    *   `configured` (boolean): True when a Cloudflare API token is stored.
                 *   `node_status` (object|null): Status response returned by the Proxmox API when validating the token.
                 *   `managed_containers` (object): Cached summary of the Portacode-managed containers:
                     *   `updated_at` (string): ISO timestamp when this snapshot was last refreshed.

portacode/connection/handlers/proxmox_infra.py

@@ -1005,6 +1005,12 @@ def _bootstrap_portacode(
     return public_key, results
 
 
+def _build_cloudflare_snapshot(cloudflare_config: Dict[str, Any] | None) -> Dict[str, Any]:
+    if not cloudflare_config:
+        return {"configured": False}
+    return {"configured": bool(cloudflare_config.get("api_token"))}
+
+
 def build_snapshot(config: Dict[str, Any]) -> Dict[str, Any]:
     network = config.get("network", {})
     base_network = {
@@ -1012,8 +1018,13 @@ def build_snapshot(config: Dict[str, Any]) -> Dict[str, Any]:
         "message": network.get("message"),
         "bridge": network.get("bridge", DEFAULT_BRIDGE),
     }
+    cloudflare_snapshot = _build_cloudflare_snapshot(config.get("cloudflare"))
     if not config:
-        return {"configured": False, "network": base_network}
+        return {
+            "configured": False,
+            "network": base_network,
+            "cloudflare": cloudflare_snapshot,
+        }
     return {
         "configured": True,
         "host": config.get("host"),
@@ -1024,18 +1035,54 @@ def build_snapshot(config: Dict[str, Any]) -> Dict[str, Any]:
         "templates": config.get("templates") or [],
         "last_verified": config.get("last_verified"),
         "network": base_network,
+        "cloudflare": cloudflare_snapshot,
     }
 
 
-def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl: bool = False) -> Dict[str, Any]:
+def _resolve_proxmox_credentials(
+    token_identifier: Optional[str],
+    token_value: Optional[str],
+    existing: Dict[str, Any],
+) -> Tuple[str, str, str]:
+    if token_identifier:
+        if not token_value:
+            raise ValueError("token_value is required when providing a new token_identifier")
+        user, token_name = _parse_token(token_identifier)
+        return user, token_name, token_value
+    if existing and existing.get("user") and existing.get("token_name") and existing.get("token_value"):
+        return existing["user"], existing["token_name"], existing["token_value"]
+    raise ValueError("Proxmox token identifier and value are required when no existing configuration is available")
+
+
+def _build_cloudflare_config(existing: Dict[str, Any], api_token: Optional[str]) -> Dict[str, Any]:
+    cloudflare: Dict[str, Any] = dict(existing.get("cloudflare", {}) or {})
+    if api_token:
+        cloudflare["api_token"] = api_token
+    if cloudflare.get("api_token"):
+        cloudflare["configured"] = True
+    elif "configured" in cloudflare:
+        cloudflare.pop("configured", None)
+    return cloudflare
+
+
+def configure_infrastructure(
+    token_identifier: Optional[str] = None,
+    token_value: Optional[str] = None,
+    verify_ssl: Optional[bool] = None,
+    cloudflare_api_token: Optional[str] = None,
+) -> Dict[str, Any]:
     ProxmoxAPI = _ensure_proxmoxer()
-    user, token_name = _parse_token(token_identifier)
+    existing = _load_config()
+    user, token_name, resolved_token_value = _resolve_proxmox_credentials(
+        token_identifier, token_value, existing
+    )
+    actual_verify_ssl = verify_ssl if verify_ssl is not None else existing.get("verify_ssl", False)
     client = ProxmoxAPI(
         DEFAULT_HOST,
         user=user,
         token_name=token_name,
-        token_value=token_value,
-        verify_ssl=verify_ssl,
+        token_value=resolved_token_value,
+        verify_ssl=actual_verify_ssl,
         timeout=30,
     )
     node = _pick_node(client)
@@ -1043,31 +1090,35 @@ def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl
     storages = client.nodes(node).storage.get()
     default_storage = _pick_storage(storages)
     templates = _list_templates(client, node, storages)
-    network: Dict[str, Any] = {}
-    try:
-        network = _ensure_bridge()
-        # Wait for network convergence before validating connectivity
-        time.sleep(2)
-        if not _verify_connectivity():
-            raise RuntimeError("Connectivity check failed; bridge reverted")
-        network["health"] = "healthy"
-    except Exception as exc:
-        logger.warning("Bridge setup failed; reverting previous changes: %s", exc)
-        _revert_bridge()
-        raise
+    network = dict(existing.get("network", {}) or {})
+    if not network.get("applied"):
+        try:
+            network = _ensure_bridge()
+            # Wait for network convergence before validating connectivity
+            time.sleep(2)
+            if not _verify_connectivity():
+                raise RuntimeError("Connectivity check failed; bridge reverted")
+            network["health"] = "healthy"
+        except Exception as exc:
+            logger.warning("Bridge setup failed; reverting previous changes: %s", exc)
+            _revert_bridge()
+            raise
     config = {
         "host": DEFAULT_HOST,
         "node": node,
         "user": user,
         "token_name": token_name,
-        "token_value": token_value,
-        "verify_ssl": verify_ssl,
+        "token_value": resolved_token_value,
+        "verify_ssl": actual_verify_ssl,
         "default_storage": default_storage,
         "templates": templates,
         "last_verified": datetime.utcnow().isoformat() + "Z",
         "network": network,
         "node_status": status,
     }
+    cloudflare = _build_cloudflare_config(existing, cloudflare_api_token)
+    if cloudflare:
+        config["cloudflare"] = cloudflare
     _save_config(config)
     snapshot = build_snapshot(config)
     snapshot["node_status"] = status
@@ -1643,10 +1694,13 @@ class ConfigureProxmoxInfraHandler(SyncHandler):
     def execute(self, message: Dict[str, Any]) -> Dict[str, Any]:
         token_identifier = message.get("token_identifier")
         token_value = message.get("token_value")
-        verify_ssl = bool(message.get("verify_ssl"))
-        if not token_identifier or not token_value:
-            raise ValueError("token_identifier and token_value are required")
-        snapshot = configure_infrastructure(token_identifier, token_value, verify_ssl=verify_ssl)
+        verify_ssl = message.get("verify_ssl")
+        snapshot = configure_infrastructure(
+            token_identifier=token_identifier,
+            token_value=token_value,
+            verify_ssl=verify_ssl,
+            cloudflare_api_token=message.get("cloudflare_api_token"),
+        )
         return {
             "event": "proxmox_infra_configured",
             "success": True,

{portacode-1.4.14.dist-info → portacode-1.4.15.dev0.dist-info}/METADATA

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

{portacode-1.4.14.dist-info → portacode-1.4.15.dev0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 portacode/README.md,sha256=4dKtpvR8LNgZPVz37GmkQCMWIr_u25Ao63iW56s7Ke4,775
 portacode/__init__.py,sha256=oB3sV1wXr-um-RXio73UG8E5Xx6cF2ZVJveqjNmC-vQ,1086
 portacode/__main__.py,sha256=jmHTGC1hzmo9iKJLv-SSYe9BSIbPPZ2IOpecI03PlTs,296
-portacode/_version.py,sha256=kpfD1bHnQkFa0-DFuQayl0P6Mvgylvye8ENBeTdr_CY,706
+portacode/_version.py,sha256=ZC_kn1NEQ9Aet-DPiqGe5ZTNbDk0ZOpeb6OhHRUx77M,719
 portacode/cli.py,sha256=mGLKoZ-T2FBF7IA9wUq0zyG0X9__-A1ao7gajjcVRH8,21828
 portacode/data.py,sha256=5-s291bv8J354myaHm1Y7CQZTZyRzMU3TGe5U4hb-FA,1591
 portacode/keypair.py,sha256=0OO4vHDcF1XMxCDqce61xFTlFwlTcmqe5HyGsXFEt7s,5838
@@ -14,7 +14,7 @@ portacode/connection/client.py,sha256=jtLb9_YufqPkzi9t8VQH3iz_JEMisbtY6a8L9U5wei
 portacode/connection/multiplex.py,sha256=L-TxqJ_ZEbfNEfu1cwxgJ5vUdyRzZjsMy2Kx1diiZys,5237
 portacode/connection/terminal.py,sha256=oyLPOVLPlUuN_eRvHPGazB51yi8W8JEF3oOEYxucGTE,45069
 portacode/connection/handlers/README.md,sha256=HsLZG1QK1JNm67HsgL6WoDg9nxzKXxwkc5fJPFJdX5g,12169
-portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=--NNK-qrqQhZ9O4RHuAQfDQb6QxKtl_No101c1Sy_cQ,98994
+portacode/connection/handlers/WEBSOCKET_PROTOCOL.md,sha256=bW3coRPyolXX8GIFQXfOyonxg2ad7UOfmMenN23_5FQ,99509
 portacode/connection/handlers/__init__.py,sha256=WSeBmi65GWFQPYt9M3E10rn0uZ_EPCJzNJOzSf2HZyw,2921
 portacode/connection/handlers/base.py,sha256=oENFb-Fcfzwk99Qx8gJQriEMiwSxwygwjOiuCH36hM4,10231
 portacode/connection/handlers/chunked_content.py,sha256=h6hXRmxSeOgnIxoU8CkmvEf2Odv-ajPrpHIe_W3GKcA,9251
@@ -22,7 +22,7 @@ portacode/connection/handlers/diff_handlers.py,sha256=iYTIRCcpEQ03vIPKZCsMTE5aZb
 portacode/connection/handlers/file_handlers.py,sha256=nAJH8nXnX07xxD28ngLpgIUzcTuRwZBNpEGEKdRqohw,39507
 portacode/connection/handlers/project_aware_file_handlers.py,sha256=AqgMnDqX2893T2NsrvUSCwjN5VKj4Pb2TN0S_SuboOE,9803
 portacode/connection/handlers/project_state_handlers.py,sha256=v6ZefGW9i7n1aZLq2jOGumJIjYb6aHlPI4m1jkYewm8,1686
-portacode/connection/handlers/proxmox_infra.py,sha256=v2IftCXnNO8ta8dWfdXf_eRBAeFO6YxkFTCSuTrp5ss,61134
+portacode/connection/handlers/proxmox_infra.py,sha256=K9s0e9lb97I9_kNmnpoJMpoO1uTrl2ef9KTUwIbiF-g,63287
 portacode/connection/handlers/registry.py,sha256=qXGE60sYEWg6ZtVQzFcZ5YI2XWR6lMgw4hAL9x5qR1I,6181
 portacode/connection/handlers/session.py,sha256=uNGfiO_1B9-_yjJKkpvmbiJhIl6b-UXlT86UTfd6WYE,42219
 portacode/connection/handlers/system_handlers.py,sha256=fr12QpOr_Z8KYGUU-AYrTQwRPAcrLK85hvj3SEq1Kw8,14757
@@ -65,7 +65,7 @@ portacode/utils/__init__.py,sha256=NgBlWTuNJESfIYJzP_3adI1yJQJR0XJLRpSdVNaBAN0,3
 portacode/utils/diff_apply.py,sha256=4Oi7ft3VUCKmiUE4VM-OeqO7Gk6H7PF3WnN4WHXtjxI,15157
 portacode/utils/diff_renderer.py,sha256=S76StnQ2DLfsz4Gg0m07UwPfRp8270PuzbNaQq-rmYk,13850
 portacode/utils/ntp_clock.py,sha256=VqCnWCTehCufE43W23oB-WUdAZGeCcLxkmIOPwInYHc,2499
-portacode-1.4.14.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
+portacode-1.4.15.dev0.dist-info/licenses/LICENSE,sha256=2FGbCnUDgRYuQTkB1O1dUUpu5CVAjK1j4_p6ack9Z54,1066
 test_modules/README.md,sha256=Do_agkm9WhSzueXjRAkV_xEj6Emy5zB3N3VKY5Roce8,9274
 test_modules/__init__.py,sha256=1LcbHodIHsB0g-g4NGjSn6AMuCoGbymvXPYLOb6Z7F0,53
 test_modules/test_device_online.py,sha256=QtYq0Dq9vME8Gp2O4fGSheqVf8LUtpsSKosXXk56gGM,1654
@@ -91,8 +91,8 @@ testing_framework/core/playwright_manager.py,sha256=Tw46qwxIhOFkS48C2IWIQHHNpEe-
 testing_framework/core/runner.py,sha256=j2QwNJmAxVBmJvcbVS7DgPJUKPNzqfLmt_4NNdaKmZU,19297
 testing_framework/core/shared_cli_manager.py,sha256=BESSNtyQb7BOlaOvZmm04T8Uezjms4KCBs2MzTxvzYQ,8790
 testing_framework/core/test_discovery.py,sha256=2FZ9fJ8Dp5dloA-fkgXoJ_gCMC_nYPBnA3Hs2xlagzM,4928
-portacode-1.4.14.dist-info/METADATA,sha256=NfhCGg_ZISg6wvISMe9SRNlRcIqfKoUvDZt2ac0Dg8c,13046
-portacode-1.4.14.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-portacode-1.4.14.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
-portacode-1.4.14.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
-portacode-1.4.14.dist-info/RECORD,,
+portacode-1.4.15.dev0.dist-info/METADATA,sha256=R7FEzw07kw5YY1i3Sj0-W88K5pOVHVwMYGPE1kVDduA,13051
+portacode-1.4.15.dev0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+portacode-1.4.15.dev0.dist-info/entry_points.txt,sha256=lLUUL-BM6_wwe44Xv0__5NQ1BnAz6jWjSMFvZdWW3zU,48
+portacode-1.4.15.dev0.dist-info/top_level.txt,sha256=TGhTYUxfW8SyVZc_zGgzjzc24gGT7nSw8Qf73liVRKM,41
+portacode-1.4.15.dev0.dist-info/RECORD,,