refactor: centralize default template names for CR instance and TOS bucket to constants

- Move default template names from service classes to constants.py for better maintainability
- Replace hardcoded "agentkit-cli-{{account_id}}" with DEFAULT_CR_INSTANCE_TEMPLATE_NAME constant
- Replace hardcoded "agentkit-cli-{{account_id}}" with DEFAULT_TOS_BUCKET_TEMPLATE_NAME constant
- Update template names from "agentkit-cli-{{account_id}}" to "agentkit-platform-{{account_id}}"
- Remove CRService.default_cr_instance

(cherry picked from commit 93aed2c5b75c81cf5eda44e1c2bdc263b0d5c887)

Author: innsd

agentkit/toolkit/config/__init__.py

@@ -64,6 +64,8 @@
     "AUTO_CREATE_VE",
     "DEFAULT_WORKSPACE_NAME",
     "DEFAULT_CR_NAMESPACE",
+    "DEFAULT_CR_INSTANCE_TEMPLATE_NAME",
+    "DEFAULT_TOS_BUCKET_TEMPLATE_NAME",
     "DEFAULT_IMAGE_TAG",
     "GLOBAL_CONFIG_DIR",
     "GLOBAL_CONFIG_FILE",

agentkit/toolkit/config/constants.py

@@ -25,6 +25,8 @@
 AUTO_CREATE_VE = "Auto"
 DEFAULT_WORKSPACE_NAME = "agentkit-cli-workspace"
 DEFAULT_CR_NAMESPACE = "agentkit"
+DEFAULT_CR_INSTANCE_TEMPLATE_NAME = "agentkit-platform-{{account_id}}"
+DEFAULT_TOS_BUCKET_TEMPLATE_NAME = "agentkit-platform-{{account_id}}"
 
 # Default image tag placeholder for timestamped builds
 DEFAULT_IMAGE_TAG = "{{timestamp}}"

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
+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
 
 
 @dataclass
@@ -55,7 +55,7 @@ class HybridStrategyConfig(AutoSerializableMixin):
     region: str = field(default="cn-beijing", metadata={"description": "Volcano Engine service region", "icon": "🌏", "aliases": ["ve_region"]})
 
     # Container Registry (CR) configuration
-    cr_instance_name: str = field(default=AUTO_CREATE_VE, metadata={"description": "Container Registry instance name", "icon": "📦", "render_template": True, "default_template": "agentkit-cli-{{account_id}}", "aliases": ["ve_cr_instance_name"]})
+    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", "icon": "📋", "aliases": ["ve_cr_repo_name"]})
     cr_image_full_url: str = field(default="", metadata={"system": True, "description": "Full Container Registry image URL", "aliases": ["ve_cr_image_full_url"]})
@@ -101,15 +101,15 @@ class CloudStrategyConfig(AutoSerializableMixin):
     )
 
     # Tencent Object Storage (TOS) configuration for build artifacts
-    tos_bucket: str = field(default=AUTO_CREATE_VE, metadata={"system": True, "description": "TOS bucket name for storing build artifacts", "icon": "🗂️", "render_template": True, "default_template": "agentkit-cli-{{account_id}}"})
+    tos_bucket: str = field(default=AUTO_CREATE_VE, metadata={"system": True, "description": "TOS bucket name for storing build artifacts", "icon": "🗂️", "render_template": True, "default_template": DEFAULT_TOS_BUCKET_TEMPLATE_NAME})
     tos_prefix: str = field(default="agentkit-builds", metadata={"system": True, "description": "TOS object prefix for build artifacts"})
     tos_region: str = field(default="cn-beijing", metadata={"system": True, "description": "TOS service region"})
     tos_object_key: str = field(default="", metadata={"system": True, "description": "TOS object key for uploaded build artifact"})
     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})
-    cr_instance_name: str = field(default=AUTO_CREATE_VE, metadata={"description": "Container Registry instance name", "icon": "📦", "render_template": True, "default_template": "agentkit-cli-{{account_id}}", "aliases": ["ve_cr_instance_name"]})
+    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"]})
     cr_region: str = field(default="cn-beijing", metadata={"system": True, "description": "Container Registry service region", "aliases": ["ve_cr_region"]})

agentkit/toolkit/executors/init_executor.py

@@ -46,6 +46,7 @@
     global_config_exists,
     get_global_config,
 )
+from agentkit.toolkit.config.constants import DEFAULT_CR_INSTANCE_TEMPLATE_NAME, DEFAULT_TOS_BUCKET_TEMPLATE_NAME
 
 
 TEMPLATES = {
@@ -444,7 +445,7 @@ def _setup_config_launch_type(self, config_manager, common_config):
                 cloud_config.cr_instance_name = ""
                 self.logger.debug("Using global CR instance config")
             else:
-                cloud_config.cr_instance_name = CRService.default_cr_instance_name_template()
+                cloud_config.cr_instance_name = DEFAULT_CR_INSTANCE_TEMPLATE_NAME
 
             if global_config and global_config.cr.namespace_name:
                 cloud_config.cr_namespace_name = ""
@@ -456,7 +457,7 @@ def _setup_config_launch_type(self, config_manager, common_config):
                 cloud_config.tos_bucket = ""
                 self.logger.debug("Using global TOS bucket config")
             else:
-                cloud_config.tos_bucket = TOSService.default_bucket_name_template()
+                cloud_config.tos_bucket = DEFAULT_TOS_BUCKET_TEMPLATE_NAME
 
             if global_config and global_config.tos.prefix:
                 cloud_config.tos_prefix = ""
@@ -485,7 +486,7 @@ def _setup_config_launch_type(self, config_manager, common_config):
                 hybrid_config.cr_instance_name = ""
                 self.logger.debug("Using global CR instance config")
             else:
-                hybrid_config.cr_instance_name = CRService.default_cr_instance_name_template()
+                hybrid_config.cr_instance_name = DEFAULT_CR_INSTANCE_TEMPLATE_NAME
 
             if global_config and global_config.cr.namespace_name:
                 hybrid_config.cr_namespace_name = ""

agentkit/toolkit/volcengine/services/cr_service.py

@@ -19,7 +19,7 @@
 from agentkit.utils.ve_sign import get_volc_ak_sk_region
 import agentkit.toolkit.volcengine.cr as ve_cr
 import agentkit.toolkit.config as config
-from agentkit.toolkit.config import AUTO_CREATE_VE
+from agentkit.toolkit.config import AUTO_CREATE_VE, DEFAULT_CR_INSTANCE_TEMPLATE_NAME
 from agentkit.toolkit.config.dataclass_utils import AutoSerializableMixin
 from agentkit.toolkit.reporter import Reporter
 from agentkit.toolkit.context import ExecutionContext
@@ -429,16 +429,12 @@ def get_cr_config(self) -> Dict[str, Any]:
         except Exception as e:
             logger.warning(f"Failed to retrieve CR configuration: {str(e)}")
             return {}
-    
-    @staticmethod
-    def default_cr_instance_name_template():
-        return "agentkit-cli-{{account_id}}"
 
     @staticmethod
     def generate_cr_instance_name() -> str:
         """Generate a CR instance name from the default template."""
         from agentkit.utils.template_utils import render_template
-        cr_instance_name_template = CRService.default_cr_instance_name_template()
+        cr_instance_name_template = DEFAULT_CR_INSTANCE_TEMPLATE_NAME
         rendered = render_template(cr_instance_name_template)
         return rendered
 

agentkit/toolkit/volcengine/services/tos_service.py

@@ -16,6 +16,7 @@
 import logging
 from dataclasses import dataclass, field
 from agentkit.toolkit.config.dataclass_utils import AutoSerializableMixin
+from agentkit.toolkit.config.constants import DEFAULT_TOS_BUCKET_TEMPLATE_NAME
 
 try:
     import tos
@@ -286,7 +287,7 @@ def generate_bucket_name(prefix: str = "agentkit") -> str:
         """
         import re
         from agentkit.utils.template_utils import render_template
-        bucket_name = TOSService.default_bucket_name_template()
+        bucket_name = DEFAULT_TOS_BUCKET_TEMPLATE_NAME
         bucket_name = render_template(bucket_name)
 
         # Verify template was fully rendered (no unresolved variables remain)
@@ -303,8 +304,3 @@ def generate_bucket_name(prefix: str = "agentkit") -> str:
             bucket_name = f"{prefix}-bucket-{generate_random_id(4)}".lower()
 
         return bucket_name
-    
-    @staticmethod
-    def default_bucket_name_template() -> str:
-        """Return the default template for generating bucket names."""
-        return "agentkit-cli-{{account_id}}"

agentkit/utils/template_utils.py

@@ -22,7 +22,7 @@
 
 Example:
     >>> from agentkit.utils.template_utils import render_template
-    >>> result = render_template("agentkit-cli-{{account_id}}")
+    >>> result = render_template("agentkit-platform-{{account_id}}")
 """
 
 import re