fix: fixed the issue of rendering templates being discarded when saving configurations

(cherry picked from commit 1e11102497a7bf22f056e7f6986db87dd15b2451)

Author: innsd

agentkit/toolkit/config/constants.py

@@ -30,6 +30,7 @@
 
 # Default image tag placeholder for timestamped builds
 DEFAULT_IMAGE_TAG = "{{timestamp}}"
+DEFAULT_IMAGE_TAG_TEMPLATE = "{{timestamp}}"
 
 # Global configuration constants
 GLOBAL_CONFIG_DIR = Path.home() / ".agentkit"

agentkit/toolkit/config/dataclass_utils.py

@@ -133,16 +133,13 @@ def from_dict(cls: Type[T], data: Dict[str, Any], skip_render: bool = False) ->
             instance = apply_global_config_defaults(instance, data)
             after = instance.to_dict()
             if before != after:
-                # Compute diff of updated fields
                 diff = {k: (before.get(k), after.get(k)) for k in after.keys() if before.get(k) != after.get(k)}
                 logger.debug("from_dict: applied global defaults for %s; changes=%r", cls.__name__, diff)
             else:
                 logger.debug("from_dict: applied global defaults for %s; no changes", cls.__name__)
         except ImportError:
-            # Global config module unavailable
             logger.debug("from_dict: global_config not available; skipped applying globals for %s", cls.__name__)
         except Exception:
-            # Global defaults application should not break overall flow
             logger.debug("from_dict: apply_global_config_defaults raised; ignored for %s", cls.__name__)
 
         # Render template fields after globals/defaults. Skipped if skip_render is True.
@@ -213,19 +210,15 @@ def _render_template_fields(self):
                                 default_template,
                             )
                             field_value = default_template
-                            # Save original template string
                             self._template_originals[field_info.name] = default_template
-                            # Mark value source
                             try:
                                 if not hasattr(self, '_value_sources'):
                                     self._value_sources = {}
                                 self._value_sources[field_info.name] = 'default_template'
                             except Exception:
                                 pass
-                            # Set template value first so there is a visible value even if rendering fails
                             setattr(self, field_info.name, default_template)
                         else:
-                            # No default_template; skip
                             logger.debug("[%s] [template] field %s is Auto/empty and has no default_template -> skip", cfg_name, field_info.name)
                             continue
 
@@ -239,13 +232,7 @@ def _render_template_fields(self):
 
                         try:
                             rendered = render_template(field_value)
-                            logger.debug(
-                                "[%s] [template] rendered field %s: %r -> %r",
-                                cfg_name,
-                                field_info.name,
-                                field_value,
-                                rendered,
-                            )
+                            logger.debug("[%s] [template] rendered field %s: %r -> %r", cfg_name, field_info.name, field_value, rendered)
                             # Fail if unresolved placeholders remain
                             if '{{' in str(rendered) and '}}' in str(rendered):
                                 error_msg = (
@@ -258,9 +245,6 @@ def _render_template_fields(self):
                             if rendered != field_value:
                                 logger.debug("[%s] [template] apply rendered value for %s", cfg_name, field_info.name)
                                 setattr(self, field_info.name, rendered)
-                            # Extra logging for image_tag
-                            if field_info.name == "image_tag":
-                                logger.info("[%s] [template] image_tag final value: %r", cfg_name, getattr(self, field_info.name))
                         except Exception as e:
                             # Do not silently fallback on render failures; surface details
                             error_type = type(e).__name__
@@ -320,18 +304,12 @@ def to_persist_dict(self) -> Dict[str, Any]:
                 chosen = original_tpl if original_tpl is not None else current_value
                 result[name] = chosen
                 logger.debug("[persist] field=%s source=default_template original=%r current=%r -> write=%r", name, original_tpl, current_value, chosen)
-            elif source == 'default':
-                # Default source: persist current value
-                result[name] = current_value
-                logger.debug("[persist] field=%s source=default -> write=%r", name, current_value)
-            elif source == 'local':
-                # Local source: if it was a template input, prefer original template
+            elif source == 'default' or source == 'local':
                 if original_tpl is not None:
                     result[name] = original_tpl
-                    logger.debug("[persist] field=%s source=local original_tpl exists -> write original=%r", name, original_tpl)
                 else:
                     result[name] = current_value
-                    logger.debug("[persist] field=%s source=local no original_tpl -> write current=%r", name, current_value)
+                logger.debug("[persist] field=%s source=%s original=%r current=%r -> write=%r", name, source, original_tpl, current_value, result[name])
             else:
                 # Unknown source: keep current value
                 result[name] = current_value

agentkit/toolkit/config/strategy_configs.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import Dict, List
 from .dataclass_utils import AutoSerializableMixin
-from .constants import AUTO_CREATE_VE, DEFAULT_CR_NAMESPACE, DEFAULT_IMAGE_TAG, DEFAULT_WORKSPACE_NAME, DEFAULT_CR_INSTANCE_TEMPLATE_NAME, DEFAULT_TOS_BUCKET_TEMPLATE_NAME
+from .constants import AUTO_CREATE_VE, DEFAULT_CR_NAMESPACE, DEFAULT_IMAGE_TAG, DEFAULT_IMAGE_TAG_TEMPLATE, DEFAULT_WORKSPACE_NAME, DEFAULT_CR_INSTANCE_TEMPLATE_NAME, DEFAULT_TOS_BUCKET_TEMPLATE_NAME
 
 
 @dataclass
@@ -45,7 +45,7 @@ class LocalStrategyConfig(AutoSerializableMixin):
 class HybridStrategyConfig(AutoSerializableMixin):
     """Hybrid deployment strategy configuration combining local Docker and Volcano Engine services."""
     # User-configurable fields
-    image_tag: str = field(default=DEFAULT_IMAGE_TAG, metadata={"system": True, "description": "Docker image tag", "icon": "🏷️", "render_template": True})
+    image_tag: str = field(default=DEFAULT_IMAGE_TAG, metadata={"system": True, "description": "Docker image tag", "icon": "🏷️", "render_template": True, "default_template": DEFAULT_IMAGE_TAG_TEMPLATE})
 
     # System internal fields (not visible to users during configuration)
     image_id: str = field(default="", metadata={"system": True, "description": "Docker image ID"})
@@ -108,7 +108,7 @@ class CloudStrategyConfig(AutoSerializableMixin):
     tos_object_url: str = field(default="", metadata={"system": True, "description": "TOS object URL for build artifact"})
 
     # Container Registry (CR) configuration for Docker images
-    image_tag: str = field(default=DEFAULT_IMAGE_TAG, metadata={"system": True, "description": "Docker image tag", "icon": "🏷️", "render_template": True})
+    image_tag: str = field(default=DEFAULT_IMAGE_TAG, metadata={"system": True, "description": "Docker image tag", "icon": "🏷️", "render_template": True, "default_template": DEFAULT_IMAGE_TAG_TEMPLATE})
     cr_instance_name: str = field(default=AUTO_CREATE_VE, metadata={"description": "Container Registry instance name", "icon": "📦", "render_template": True, "default_template": DEFAULT_CR_INSTANCE_TEMPLATE_NAME, "aliases": ["ve_cr_instance_name"]})
     cr_namespace_name: str = field(default=DEFAULT_CR_NAMESPACE, metadata={"description": "Container Registry namespace", "icon": "📁", "render_template": True, "aliases": ["ve_cr_namespace_name"]})
     cr_repo_name: str = field(default="", metadata={"description": "Container Registry repository name (defaults to AgentKit project name)", "icon": "📋", "aliases": ["ve_cr_repo_name"]})