portacode 1.4.15.dev9__tar.gz → 1.4.15.dev11__tar.gz

{portacode-1.4.15.dev9 → portacode-1.4.15.dev11}/PKG-INFO

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

{portacode-1.4.15.dev9 → portacode-1.4.15.dev11}/portacode/_version.py

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

{portacode-1.4.15.dev9 → portacode-1.4.15.dev11}/portacode/connection/handlers/proxmox_infra.py

@@ -47,9 +47,7 @@ UNIT_DIR = Path("/etc/systemd/system")
 _MANAGED_CONTAINERS_CACHE_TTL_S = 30.0
 _MANAGED_CONTAINERS_CACHE: Dict[str, Any] = {"timestamp": 0.0, "summary": None}
 _MANAGED_CONTAINERS_CACHE_LOCK = threading.Lock()
-_STARTUP_TEMPLATES: List[str] | None = None
-_STARTUP_TEMPLATE_KEY: tuple[Any, ...] | None = None
-_STARTUP_TEMPLATES_LOCK = threading.Lock()
+_STARTUP_TEMPLATES_REFRESHED = False
 
 ProgressCallback = Callable[[int, int, Dict[str, Any], str, Optional[Dict[str, Any]]], None]
 
@@ -182,16 +180,6 @@ def _list_templates(client: Any, node: str, storages: Iterable[Dict[str, Any]])
     return templates
 
 
-def _template_key(config: Dict[str, Any]) -> tuple[Any, ...]:
-    return (
-        config.get("host"),
-        config.get("node"),
-        config.get("user"),
-        config.get("token_name"),
-        config.get("verify_ssl"),
-    )
-
-
 def _build_proxmox_client_from_config(config: Dict[str, Any]):
     user = config.get("user")
     token_name = config.get("token_name")
@@ -209,41 +197,22 @@ def _build_proxmox_client_from_config(config: Dict[str, Any]):
     )
 
 
-def _ensure_startup_templates(config: Dict[str, Any]) -> None:
-    global _STARTUP_TEMPLATES, _STARTUP_TEMPLATE_KEY
-    if not config:
-        with _STARTUP_TEMPLATES_LOCK:
-            _STARTUP_TEMPLATES = []
-            _STARTUP_TEMPLATE_KEY = None
+def _ensure_templates_refreshed_on_startup(config: Dict[str, Any]) -> None:
+    global _STARTUP_TEMPLATES_REFRESHED
+    if _STARTUP_TEMPLATES_REFRESHED or not config or not config.get("token_value"):
+        _STARTUP_TEMPLATES_REFRESHED = True
         return
-    with _STARTUP_TEMPLATES_LOCK:
-        if _STARTUP_TEMPLATE_KEY == _template_key(config) and _STARTUP_TEMPLATES is not None:
-            return
-    key = _template_key(config)
-    templates: List[str] = []
     try:
         client = _build_proxmox_client_from_config(config)
         node = config.get("node") or _pick_node(client)
         storages = client.nodes(node).storage.get()
         templates = _list_templates(client, node, storages)
+        if templates:
+            config["templates"] = templates
     except Exception as exc:
-        logger.warning("Unable to refresh Proxmox templates: %s", exc)
-    with _STARTUP_TEMPLATES_LOCK:
-        _STARTUP_TEMPLATES = list(templates)
-        _STARTUP_TEMPLATE_KEY = key
-
-
-def _get_startup_templates(config: Dict[str, Any]) -> List[str]:
-    _ensure_startup_templates(config)
-    with _STARTUP_TEMPLATES_LOCK:
-        return list(_STARTUP_TEMPLATES or [])
-
-
-def _clear_startup_templates() -> None:
-    global _STARTUP_TEMPLATES, _STARTUP_TEMPLATE_KEY
-    with _STARTUP_TEMPLATES_LOCK:
-        _STARTUP_TEMPLATES = None
-        _STARTUP_TEMPLATE_KEY = None
+        logger.warning("Unable to refresh Proxmox templates on startup: %s", exc)
+    finally:
+        _STARTUP_TEMPLATES_REFRESHED = True
 
 
 def _pick_storage(storages: Iterable[Dict[str, Any]]) -> str:
@@ -756,7 +725,7 @@ def _remove_container_record(vmid: int) -> None:
 
 
 def _build_container_payload(message: Dict[str, Any], config: Dict[str, Any]) -> Dict[str, Any]:
-    templates = _get_startup_templates(config)
+    templates = config.get("templates") or []
     default_template = templates[0] if templates else ""
     template = message.get("template") or default_template
     if not template:
@@ -1177,6 +1146,7 @@ def build_snapshot(config: Dict[str, Any]) -> Dict[str, Any]:
     }
     if not config:
         return {"configured": False, "network": base_network}
+    _ensure_templates_refreshed_on_startup(config)
     return {
         "configured": True,
         "host": config.get("host"),
@@ -1184,14 +1154,13 @@ def build_snapshot(config: Dict[str, Any]) -> Dict[str, Any]:
         "user": config.get("user"),
         "token_name": config.get("token_name"),
         "default_storage": config.get("default_storage"),
-        "templates": _get_startup_templates(config),
+        "templates": config.get("templates") or [],
         "last_verified": config.get("last_verified"),
         "network": base_network,
     }
 
 
 def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl: bool = False) -> Dict[str, Any]:
-    _clear_startup_templates()
     ProxmoxAPI = _ensure_proxmoxer()
     user, token_name = _parse_token(token_identifier)
     client = ProxmoxAPI(
@@ -1227,12 +1196,12 @@ def configure_infrastructure(token_identifier: str, token_value: str, verify_ssl
         "token_value": token_value,
         "verify_ssl": verify_ssl,
         "default_storage": default_storage,
+        "templates": templates,
         "last_verified": datetime.utcnow().isoformat() + "Z",
         "network": network,
         "node_status": status,
     }
     _save_config(config)
-    _ensure_startup_templates(config)
     snapshot = build_snapshot(config)
     snapshot["node_status"] = status
     snapshot["managed_containers"] = _get_managed_containers_summary(force=True)
@@ -1252,7 +1221,6 @@ def revert_infrastructure() -> Dict[str, Any]:
     _revert_bridge()
     if CONFIG_PATH.exists():
         CONFIG_PATH.unlink()
-    _clear_startup_templates()
     snapshot = build_snapshot({})
     snapshot["network"] = snapshot.get("network", {})
     snapshot["network"]["applied"] = False
@@ -1314,7 +1282,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
         device_private_key = (message.get("device_private_key") or "").strip()
         has_device_keypair = bool(device_public_key and device_private_key)
         config_guess = _load_config()
-        template_candidates = _get_startup_templates(config_guess)
+        template_candidates = config_guess.get("templates") or []
         template_hint = (message.get("template") or (template_candidates[0] if template_candidates else "")).strip()
         package_manager = _guess_package_manager_from_template(template_hint)
         bootstrap_user, bootstrap_password, bootstrap_ssh_key = _get_provisioning_user_info(message)

{portacode-1.4.15.dev9 → portacode-1.4.15.dev11}/portacode.egg-info/PKG-INFO

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