Merge pull request #8 from volcengine/fix/fix-some-bug-and-0.1.10

fix/ some bugfix add a2a and enio template and 0.1.10

Author: YumengBao

agentkit/toolkit/builders/ve_pipeline.py

@@ -26,7 +26,7 @@
 from agentkit.toolkit.models import BuildResult, ImageInfo
 from agentkit.toolkit.reporter import Reporter
 from agentkit.toolkit.errors import ErrorCode
-from agentkit.utils.misc import generate_random_id
+from agentkit.utils.misc import generate_random_id, calculate_nonlinear_progress
 from agentkit.toolkit.volcengine.services import CRServiceConfig
 from .base import Builder
 
@@ -1056,8 +1056,9 @@ def download_and_show_logs(run_id: str):
             self.reporter.info("Waiting for build completion...")
 
             # Wait for build completion using reporter's long task interface
-            max_wait_time = 600  # 10 minutes
+            max_wait_time = 900  # 15 minutes
             check_interval = 3  # Check every 3 seconds
+            expected_time = 30  # Controls progress curve speed (smaller = faster initial progress)
             import time
             start_time = time.time()
 
@@ -1098,8 +1099,7 @@ def download_and_show_logs(run_id: str):
                                 download_and_show_logs(run_id)
                                 raise Exception(error_msg)
 
-                            # Update progress (time-based)
-                            task.update(completed=min(elapsed_time, max_wait_time))
+                            task.update(completed=calculate_nonlinear_progress(elapsed_time, max_wait_time, expected_time))
                             time.sleep(check_interval)
                         else:
                             # Unknown status
@@ -1111,8 +1111,7 @@ def download_and_show_logs(run_id: str):
                                 download_and_show_logs(run_id)
                                 raise Exception(error_msg)
 
-                            # Update progress
-                            task.update(completed=min(elapsed_time, max_wait_time))
+                            task.update(completed=calculate_nonlinear_progress(elapsed_time, max_wait_time, expected_time))
                             time.sleep(check_interval)
 
                     except Exception:

agentkit/toolkit/cli/cli_config.py

@@ -102,7 +102,7 @@ def config_command(
         --agent_name myGoAgent \\
         --entry_point main.go \\
         --language Golang \\
-        --language_version 1.23
+        --language_version 1.24
     
     \b
     # App-level vs Strategy-level environment variables
@@ -204,16 +204,16 @@ def _interactive_config(config_file: Optional[str] = None):
     # Use CLI-layer interactive config generation
     from agentkit.toolkit.cli.interactive_config import generate_config_from_dataclass
     from agentkit.toolkit.config.strategy_configs import (
-        LocalDockerConfig,
-        VeAgentkitConfig,
-        HybridVeAgentkitConfig
+        LocalStrategyConfig,
+        CloudStrategyConfig,
+        HybridStrategyConfig
     )
 
     # Map strategy_name to config class
     strategy_config_classes = {
-        "local": LocalDockerConfig,
-        "cloud": VeAgentkitConfig,
-        "hybrid": HybridVeAgentkitConfig,
+        "local": LocalStrategyConfig,
+        "cloud": CloudStrategyConfig,
+        "hybrid": HybridStrategyConfig,
     }
 
     # Get current strategy config data

agentkit/toolkit/config/__init__.py

@@ -20,9 +20,9 @@
 )
 
 from .strategy_configs import (
-    LocalDockerConfig,
-    HybridVeAgentkitConfig,
-    VeAgentkitConfig,
+    LocalStrategyConfig,
+    HybridStrategyConfig,
+    CloudStrategyConfig,
 )
 
 from .docker_build_config import (
@@ -45,14 +45,12 @@
 from .constants import *
 
 __all__ = [
-    # 项目配置相关
     "AgentkitConfigManager",
     "CommonConfig",
     "ConfigUpdateResult",
     "get_config",
     "create_config_update_result",
 
-    # 全局配置相关
     "GlobalConfig",
     "GlobalConfigManager",
     "get_global_config",
@@ -63,7 +61,6 @@
     "CRGlobalConfig",
     "TOSGlobalConfig",
 
-    # 常量
     "AUTO_CREATE_VE",
     "DEFAULT_WORKSPACE_NAME",
     "DEFAULT_CR_NAMESPACE",
@@ -72,16 +69,13 @@
     "GLOBAL_CONFIG_FILE",
     "GLOBAL_CONFIG_FILE_PERMISSIONS",
 
-    # 工具函数
     "is_valid_config",
     "is_invalid_config",
     "merge_runtime_envs",
 
-    # Strongly 配置类
-    "LocalDockerConfig",
-    "HybridVeAgentkitConfig",
-    "VeAgentkitConfig",
+    "LocalStrategyConfig",
+    "HybridStrategyConfig",
+    "CloudStrategyConfig",
 
-    # Docker构建配置
     "DockerBuildConfig",
 ]

agentkit/toolkit/config/config.py

@@ -42,13 +42,13 @@ class CommonConfig(AutoSerializableMixin):
     entry_point: str = field(
         default="", 
         metadata={
-            "description": "Agent application entry file (path allowed), e.g. simple_agent.py", 
+            "description": "Agent application entry file (path allowed), e.g. simple_agent.py or main.go or build.sh", 
             "icon": "📝",
             "validation": {
                 "required": True,
                 # allow relative paths with directories and either .py or .go endings
-                "pattern": r"^[\w\-/\.]+?\.(py)$",
-                "message": "Must be a Python (.py), containing only letters, numbers, underscore(_), hyphen(-), dot(.) and '/' for directories"
+                "pattern": r"^[\w\-/\.]+?\.(py|go|sh)$",
+                "message": "Must be a Python (.py) or Go (.go) file path or shell script (.sh), containing only letters, numbers, underscore(_), hyphen(-), dot(.) and '/' for directories"
             }
         }
     )
@@ -58,7 +58,7 @@ class CommonConfig(AutoSerializableMixin):
         "icon": "✏️",
         "choices": [
             {"value": "Python", "description": "Python"},
-            # {"value": "Golang", "description": "Go (Golang)"}
+            {"value": "Golang", "description": "Go (Golang)"}
         ]
     })
     language_version: str = field(
@@ -74,17 +74,16 @@ class CommonConfig(AutoSerializableMixin):
                         "choices": ["3.10", "3.11", "3.12", "3.13"],
                         "message": "Python version must be 3.10, 3.11, 3.12, or 3.13"
                     },
-                    # "Golang": {
-                    #     "pattern": r"^1\.\d+$",
-                    #     "message": "Go 版本格式应为 '1.x' (如 1.21, 1.23)",
-                    #     "hint": "[格式: 1.x]"
-                    # }
+                    "Golang": {
+                        "choices": ["1.24"],
+                        "message": "Golang version must be '1.24'",
+                    }
                 }
             }
         }
     )
     agent_type: str = field(default="Basic App", metadata={"description" : "Agent application Type", "icon": "📩", "hidden": True})
-    dependencies_file: str = field(default="requirements.txt", metadata={"description": "Agent application Dependencies file", "icon": "📦"})
+    dependencies_file: str = field(default="", metadata={"description": "Agent application Dependencies file", "icon": "📦"})
     runtime_envs: Dict[str, str] = field(
         default_factory=dict,
         metadata={
@@ -119,7 +118,7 @@ def _recommended_for_language(language: str) -> Dict[str, str]:
         """Return recommended language_version and dependencies_file for supported languages."""
         mapping = {
             "python": {"language_version": "3.12", "dependencies_file": "requirements.txt"},
-            "golang": {"language_version": "1.23", "dependencies_file": "go.mod"},
+            "golang": {"language_version": "1.24", "dependencies_file": "go.mod"},
         }
         return mapping.get((language or "python").lower(), mapping["python"])
 
@@ -153,7 +152,7 @@ def set_language(self, language: str):
         lv = (self.language_version or "").strip()
         df = (self.dependencies_file or "").strip()
 
-        if not lv or lv in ("3.12", "1.23") or lv.startswith("3.") and language.lower() == "go":
+        if not lv or lv in ("3.12", "1.24") or lv.startswith("3.") and language.lower() == "go":
             self.language_version = rec["language_version"]
         if not df or df in ("requirements.txt", "go.mod"):
             self.dependencies_file = rec["dependencies_file"]
@@ -355,14 +354,14 @@ def _reorder_by_dataclass_fields(self, strategy_name: str, config: Dict[str, Any
 
         config_class = None
         if strategy_name == "local":
-            from agentkit.toolkit.config import LocalDockerConfig
-            config_class = LocalDockerConfig
+            from agentkit.toolkit.config import LocalStrategyConfig
+            config_class = LocalStrategyConfig
         elif strategy_name == "cloud":
-            from agentkit.toolkit.config import VeAgentkitConfig
-            config_class = VeAgentkitConfig
+            from agentkit.toolkit.config import CloudStrategyConfig
+            config_class = CloudStrategyConfig
         elif strategy_name == "hybrid":
-            from agentkit.toolkit.config import HybridVeAgentkitConfig
-            config_class = HybridVeAgentkitConfig
+            from agentkit.toolkit.config import HybridStrategyConfig
+            config_class = HybridStrategyConfig
         else:
             return config
 

agentkit/toolkit/config/docker_build_config.py

@@ -36,7 +36,7 @@ class DockerBuildConfig(AutoSerializableMixin):
         Go project with multi-stage build:
         >>> docker_build:
         >>>   base_image:
-        >>>     builder: "golang:1.23-alpine"
+        >>>     builder: "golang:1.24-alpine"
         >>>     runtime: "alpine:latest"
         >>>   build_script: "scripts/install_certs.sh"
     """
@@ -48,7 +48,7 @@ class DockerBuildConfig(AutoSerializableMixin):
             "detail": (
                 "For Python projects, use a string like 'python:3.12-alpine'. "
                 "For Go projects, use a dict with 'builder' and 'runtime' keys, "
-                "e.g., {'builder': 'golang:1.23-alpine', 'runtime': 'alpine:latest'}"
+                "e.g., {'builder': 'golang:1.24-alpine', 'runtime': 'alpine:latest'}"
             )
         }
     )

agentkit/toolkit/config/global_config.py

@@ -301,19 +301,19 @@ def apply_global_config_defaults(
 
     Example:
         >>> # project config has empty cr_instance_name
-        >>> config = HybridVeAgentkitConfig.from_dict({"cr_instance_name": ""})
+        >>> config = HybridStrategyConfig.from_dict({"cr_instance_name": ""})
         >>> # apply_global_config_defaults will fill from global config if set
         >>> # config.cr_instance_name = "my-team-cr-instance" (from global config)
     """
     # Lazy imports to avoid circular dependencies
     try:
-        from .strategy_configs import HybridVeAgentkitConfig, VeAgentkitConfig
+        from .strategy_configs import HybridStrategyConfig, CloudStrategyConfig
     except ImportError as e:
         logger.debug(f"Failed to import strategy config classes, skip applying global config defaults: {e}")
         return config_obj
 
     # Only handle strategy config classes
-    if not isinstance(config_obj, (HybridVeAgentkitConfig, VeAgentkitConfig)):
+    if not isinstance(config_obj, (HybridStrategyConfig, CloudStrategyConfig)):
         return config_obj
 
     try:
@@ -327,7 +327,7 @@ def apply_global_config_defaults(
         }
 
         # For VeAgentkitConfig, also apply TOS-related settings
-        if isinstance(config_obj, VeAgentkitConfig):
+        if isinstance(config_obj, CloudStrategyConfig):
             field_mappings.update({
                 'tos_bucket': ('tos', 'bucket'),
                 'tos_prefix': ('tos', 'prefix'),

agentkit/toolkit/config/strategy_configs.py

@@ -5,7 +5,7 @@
 
 
 @dataclass
-class LocalDockerConfig(AutoSerializableMixin):
+class LocalStrategyConfig(AutoSerializableMixin):
     """Local Docker strategy configuration for running agents in Docker containers."""
     # User-configurable fields
     image_tag: str = field(default="latest", metadata={"description": "Docker image tag", "icon": "🏷️"})
@@ -33,7 +33,7 @@ class LocalDockerConfig(AutoSerializableMixin):
         }
     )
     _config_metadata = {
-        'name': 'Local Docker Configuration',
+        'name': 'Local Strategy Configuration',
         'welcome_message': 'Welcome to AgentKit Local Docker Mode Configuration Wizard',
         'next_step_hint': 'This wizard will help you configure your agent for local Docker deployment. Please provide the required information or press Enter to use default values.',
         'completion_message': 'Great! Local Docker configuration is complete!',
@@ -42,7 +42,7 @@ class LocalDockerConfig(AutoSerializableMixin):
 
 
 @dataclass
-class HybridVeAgentkitConfig(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})
@@ -77,7 +77,7 @@ class HybridVeAgentkitConfig(AutoSerializableMixin):
         }
     )
     _config_metadata = {
-        'name': 'Hybrid Deployment Configuration',
+        'name': 'Hybrid Strategy Configuration',
         'welcome_message': 'Welcome to AgentKit Hybrid Deployment Mode Configuration Wizard',
         'next_step_hint': 'This wizard will help you configure your agent for hybrid deployment combining local Docker and Volcano Engine services. Please provide the required information or press Enter to use default values.',
         'completion_message': 'Great! Hybrid deployment configuration is complete!',
@@ -87,7 +87,7 @@ class HybridVeAgentkitConfig(AutoSerializableMixin):
 
 
 @dataclass
-class VeAgentkitConfig(AutoSerializableMixin):
+class CloudStrategyConfig(AutoSerializableMixin):
     """Cloud build and deployment strategy configuration for Volcano Engine."""
     region: str = field(
         default="cn-beijing", 

agentkit/toolkit/config/utils.py

@@ -49,4 +49,4 @@ def merge_runtime_envs(common_config: Any, strategy_config: Dict[str, Any]) -> D
     if isinstance(strategy_level_envs, dict):
         merged_envs.update(strategy_level_envs)
 
-    return merged_envs
+    return merged_envs

agentkit/toolkit/executors/base_executor.py

@@ -243,14 +243,14 @@ def _get_strategy_config_object(self, config, launch_type: str, skip_render: boo
         strategy_config_dict = config.get_strategy_config(launch_type)
 
         if launch_type == "local":
-            from agentkit.toolkit.config import LocalDockerConfig
-            return LocalDockerConfig.from_dict(strategy_config_dict, skip_render=skip_render)
+            from agentkit.toolkit.config import LocalStrategyConfig
+            return LocalStrategyConfig.from_dict(strategy_config_dict, skip_render=skip_render)
         elif launch_type == "cloud":
-            from agentkit.toolkit.config import VeAgentkitConfig
-            return VeAgentkitConfig.from_dict(strategy_config_dict, skip_render=skip_render)
+            from agentkit.toolkit.config import CloudStrategyConfig
+            return CloudStrategyConfig.from_dict(strategy_config_dict, skip_render=skip_render)
         elif launch_type == "hybrid":
-            from agentkit.toolkit.config import HybridVeAgentkitConfig
-            return HybridVeAgentkitConfig.from_dict(strategy_config_dict, skip_render=skip_render)
+            from agentkit.toolkit.config import HybridStrategyConfig
+            return HybridStrategyConfig.from_dict(strategy_config_dict, skip_render=skip_render)
         else:
             raise ValueError(f"Unknown launch_type: {launch_type}")