agentkit-sdk-python 0.1.11__tar.gz → 0.1.13__tar.gz

{agentkit_sdk_python-0.1.11/agentkit_sdk_python.egg-info → agentkit_sdk_python-0.1.13}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: agentkit-sdk-python
-Version: 0.1.11
+Version: 0.1.13
 Summary: Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure.
-Author-email: Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>, Xiangrui Cheng <innsdcc@gmail.com>, Yumeng Bao <baoyumeng.123@gmail.com>
+Author-email: Xiangrui Cheng <innsdcc@gmail.com>, Yumeng Bao <baoyumeng.123@gmail.com>, Yaozheng Fang <fangyozheng@gmail.com>, Guodong Li <cu.eric.lee@gmail.com>
 License:                                  Apache License
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
@@ -205,6 +205,15 @@ License:                                  Apache License
            See the License for the specific language governing permissions and
            limitations under the License.
         
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -232,9 +241,68 @@ Provides-Extra: toolkit
 Provides-Extra: dev
 Dynamic: license-file
 
-# Agentkit Python SDK
+<div align="center">
+  <h1>
+    Agentkit Platform Python SDK and Starter Toolkit
+  </h1>
 
-Python SDK for transforming any AI agent into a production-ready application. Framework-agnostic primitives for runtime, memory, authentication, and tools with volcengine-managed infrastructure.
+  <h2>
+    Launch your local agent on Volcengine AgentKit Platform as a fully managed service.
+  </h2>
+
+  <div align="center">
+    <a href="https://github.com/volcengine/agentkit-sdk-python/graphs/commit-activity"><img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/volcengine/agentkit-sdk-python"/></a>
+    <a href="https://github.com/volcengine/agentkit-sdk-python/pulls"><img alt="GitHub open pull requests" src="https://img.shields.io/github/issues-pr/volcengine/agentkit-sdk-python"/></a>
+    <a href="https://github.com/volcengine/agentkit-sdk-python/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/volcengine/agentkit-sdk-python"/></a>
+    <a href="https://pypi.org/project/agentkit-sdk-python"><img alt="PyPI version" src="https://img.shields.io/pypi/v/agentkit-sdk-python"/></a>
+    <a href="https://python.org"><img alt="Python versions" src="https://img.shields.io/pypi/pyversions/agentkit-sdk-python"/></a>
+  </div>
+
+  <p>
+  <a href="https://console.volcengine.com/agentkit/"> Volcengine AgentKit</a>
+    ◆ <a href="https://volcengine.github.io/agentkit-sdk-python/">Documentation</a>
+    ◆ <a href="https://github.com/volcengine/agentkit-samples/tree/main">Samples</a>
+    ◆ <a href="https://pypi.org/project/agentkit-sdk-python/">PyPI Package</a>
+    ◆ <a href="https://github.com/volcengine/agentkit-sdk-python">GitHub Repository</a>
+
+  </p>
+</div>
+
+## Overview
+
+AgentKit is a developer platform by Volcengine that supports the building, deployment, and operation of AI Agents. It lowers the entry barrier for developers and enterprises by providing essential infrastructure beyond the model—including security, built-in tools, memory, knowledge, monitoring, and evaluation. This empowers enterprises to efficiently build, deploy, and operate complex, intelligent, enterprise-grade Agents. The platform also includes a Python SDK and a Starter Toolkit to help developers build, deploy, publish, and manage Agent applications through an SDK and CLI.
+
+AgentKit includes the following modular Services that you can use together or independently:
+
+## AgentKit Runtime
+
+AgentKit Runtime is a fully managed service that provides a secure, isolated environment for running AI Agents. It supports the deployment of Agents built with any framework and language, and provides a set of APIs for interacting with the Agents.
+
+**[Runtime Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/4.runtime/1.overview.html)**
+
+## AgentKit Tools
+
+AgentKit Tools is a service that provides a set of built-in tools for AI Agents. It supports the execution of common tasks, such as data retrieval, web search, and code execution, in a secure and scalable manner.
+
+**[Tools Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/5.tools/1.sandbox_quickstart.html)**
+
+## AgentKit Memory
+
+AgentKit Memory is a service that provides a persistent storage solution for AI Agents. It supports the storage of Agent states, memories, and other data in a secure and scalable manner.
+
+**[Memory Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/6.memory/1.memory_quickstart.html)**
+
+## AgentKit Knowledge
+
+AgentKit Knowledge is a service that provides a knowledge base solution for AI Agents. It supports the storage of Agent knowledge, facts, and other data in a secure and scalable manner.
+
+**[Knowledge Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/7.knowledge/1.knowledge_quickstart.html)**
+
+## AgentKit MCP
+
+AgentKit MCP is a service that provides a set of tools for managing AI Agents. It supports the deployment, configuration, and monitoring of Agents in a secure and scalable manner.
+
+**[MCP Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/8.mcp/2.mcp_quickstart.html)**
 
 ## Installation
 
@@ -259,3 +327,7 @@ pip install agentkit-sdk-python==1.0.0.dev1
 ```
 
 **Note**: Development versions may contain bugs and are not recommended for production use.
+
+## License
+
+This project is licensed under the [Apache 2.0 License](./LICENSE).

agentkit_sdk_python-0.1.13/README.md

@@ -0,0 +1,90 @@
+<div align="center">
+  <h1>
+    Agentkit Platform Python SDK and Starter Toolkit
+  </h1>
+
+  <h2>
+    Launch your local agent on Volcengine AgentKit Platform as a fully managed service.
+  </h2>
+
+  <div align="center">
+    <a href="https://github.com/volcengine/agentkit-sdk-python/graphs/commit-activity"><img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/volcengine/agentkit-sdk-python"/></a>
+    <a href="https://github.com/volcengine/agentkit-sdk-python/pulls"><img alt="GitHub open pull requests" src="https://img.shields.io/github/issues-pr/volcengine/agentkit-sdk-python"/></a>
+    <a href="https://github.com/volcengine/agentkit-sdk-python/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/volcengine/agentkit-sdk-python"/></a>
+    <a href="https://pypi.org/project/agentkit-sdk-python"><img alt="PyPI version" src="https://img.shields.io/pypi/v/agentkit-sdk-python"/></a>
+    <a href="https://python.org"><img alt="Python versions" src="https://img.shields.io/pypi/pyversions/agentkit-sdk-python"/></a>
+  </div>
+
+  <p>
+  <a href="https://console.volcengine.com/agentkit/"> Volcengine AgentKit</a>
+    ◆ <a href="https://volcengine.github.io/agentkit-sdk-python/">Documentation</a>
+    ◆ <a href="https://github.com/volcengine/agentkit-samples/tree/main">Samples</a>
+    ◆ <a href="https://pypi.org/project/agentkit-sdk-python/">PyPI Package</a>
+    ◆ <a href="https://github.com/volcengine/agentkit-sdk-python">GitHub Repository</a>
+
+  </p>
+</div>
+
+## Overview
+
+AgentKit is a developer platform by Volcengine that supports the building, deployment, and operation of AI Agents. It lowers the entry barrier for developers and enterprises by providing essential infrastructure beyond the model—including security, built-in tools, memory, knowledge, monitoring, and evaluation. This empowers enterprises to efficiently build, deploy, and operate complex, intelligent, enterprise-grade Agents. The platform also includes a Python SDK and a Starter Toolkit to help developers build, deploy, publish, and manage Agent applications through an SDK and CLI.
+
+AgentKit includes the following modular Services that you can use together or independently:
+
+## AgentKit Runtime
+
+AgentKit Runtime is a fully managed service that provides a secure, isolated environment for running AI Agents. It supports the deployment of Agents built with any framework and language, and provides a set of APIs for interacting with the Agents.
+
+**[Runtime Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/4.runtime/1.overview.html)**
+
+## AgentKit Tools
+
+AgentKit Tools is a service that provides a set of built-in tools for AI Agents. It supports the execution of common tasks, such as data retrieval, web search, and code execution, in a secure and scalable manner.
+
+**[Tools Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/5.tools/1.sandbox_quickstart.html)**
+
+## AgentKit Memory
+
+AgentKit Memory is a service that provides a persistent storage solution for AI Agents. It supports the storage of Agent states, memories, and other data in a secure and scalable manner.
+
+**[Memory Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/6.memory/1.memory_quickstart.html)**
+
+## AgentKit Knowledge
+
+AgentKit Knowledge is a service that provides a knowledge base solution for AI Agents. It supports the storage of Agent knowledge, facts, and other data in a secure and scalable manner.
+
+**[Knowledge Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/7.knowledge/1.knowledge_quickstart.html)**
+
+## AgentKit MCP
+
+AgentKit MCP is a service that provides a set of tools for managing AI Agents. It supports the deployment, configuration, and monitoring of Agents in a secure and scalable manner.
+
+**[MCP Quick Start](https://volcengine.github.io/agentkit-sdk-python/content/8.mcp/2.mcp_quickstart.html)**
+
+## Installation
+
+### Stable Release (Recommended)
+
+Install the latest stable version:
+
+```bash
+pip install agentkit-sdk-python
+```
+
+### Development/Pre-release Version
+
+For testing new features or bug fixes before they're officially released:
+
+```bash
+# Install the latest pre-release version
+pip install --pre agentkit-sdk-python
+
+# Or install a specific development version
+pip install agentkit-sdk-python==1.0.0.dev1
+```
+
+**Note**: Development versions may contain bugs and are not recommended for production use.
+
+## License
+
+This project is licensed under the [Apache 2.0 License](./LICENSE).

{agentkit_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/builders/ve_pipeline.py

@@ -224,7 +224,7 @@ class VeCPCRBuilder(Builder):
                 if 'pipeline_id' in resources:
                     builder_config.cp_pipeline_id = resources['pipeline_id']
             
-            error_msg = f"Build failed: {str(e)}"
+            error_msg = str(e)
 
             return BuildResult(
                 success=False,
@@ -681,6 +681,8 @@ class VeCPCRBuilder(Builder):
         except Exception as e:
             if "AccountDisable" in str(e):
                 raise Exception(f"Tos Service is not enabled, please enable it in the console. Enable services at: https://console.volcengine.com/agentkit/region:agentkit+cn-beijing/auth")
+            if "TooManyBuckets" in str(e):
+                raise Exception(f"You have reached the maximum number of buckets allowed. Please delete some buckets and try again.")
             raise Exception(f"Failed to upload to TOS: {str(e)}")
     
     def _prepare_cr_resources(self, config: VeCPCRBuilderConfig) -> CRServiceConfig:
@@ -939,10 +941,10 @@ class VeCPCRBuilder(Builder):
                         {"Key": "DOCKERFILE_PATH", "Value": "/workspace/agentkit-app/Dockerfile", "Dynamic": True, "Env": True},
                         {"Key": "DOWNLOAD_PATH", "Value": "/workspace", "Dynamic": True, "Env": True},
                         {"Key": "PROJECT_ROOT_DIR", "Value": "/workspace/agentkit-app", "Dynamic": True, "Env": True},
-                        {"Key": "TOS_BUCKET_NAME", "Value": "", "Dynamic": True, "Env": True},
+                        {"Key": "TOS_BUCKET_NAME", "Value": "", "Dynamic": True},
+                        {"Key": "TOS_REGION", "Value": "", "Dynamic": True},
                         {"Key": "TOS_PROJECT_FILE_NAME", "Value": "", "Dynamic": True, "Env": True},
                         {"Key": "TOS_PROJECT_FILE_PATH", "Value": "", "Dynamic": True, "Env": True},
-                        {"Key": "TOS_REGION", "Value": "", "Dynamic": True, "Env": True},
                         {"Key": "CR_NAMESPACE", "Value": "", "Dynamic": True, "Env": True},
                         {"Key": "CR_INSTANCE", "Value": "", "Dynamic": True, "Env": True},
                         {"Key": "CR_DOMAIN", "Value": "", "Dynamic": True, "Env": True},
@@ -1032,9 +1034,9 @@ class VeCPCRBuilder(Builder):
             # Prepare build parameters for pipeline execution
             build_parameters = [
                 {"Key": "TOS_BUCKET_NAME", "Value": config.tos_bucket},
+                {"Key": "TOS_REGION", "Value": config.tos_region},
                 {"Key": "TOS_PROJECT_FILE_NAME", "Value": os.path.basename(config.tos_object_key)},
                 {"Key": "TOS_PROJECT_FILE_PATH", "Value": config.tos_object_key},
-                {"Key": "TOS_REGION", "Value": config.tos_region},
                 {"Key": "PROJECT_ROOT_DIR", "Value": f"/workspace/{agent_name}"},
                 {"Key": "DOWNLOAD_PATH", "Value": "/workspace"},
                 {"Key": "DOCKERFILE_PATH", "Value": f"/workspace/{agent_name}/Dockerfile"},

{agentkit_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/cli/cli_status.py

@@ -122,7 +122,7 @@ def status_command(
             if result.endpoint_url:
                 table.add_row("🌐 Endpoint", result.endpoint_url)
             if result.service_id:
-                table.add_row("☁️  Service ID", result.service_id)
+                table.add_row("☁️ Service ID", result.service_id)
             if result.uptime_seconds:
                 # Format uptime to human-readable format
                 uptime = result.uptime_seconds
@@ -130,7 +130,7 @@ def status_command(
                 minutes = (uptime % 3600) // 60
                 seconds = uptime % 60
                 uptime_str = f"{hours}h {minutes}m {seconds}s" if hours > 0 else f"{minutes}m {seconds}s"
-                table.add_row("⏱️  Uptime", uptime_str)
+                table.add_row("⏱️ Uptime", uptime_str)
             
             # Extract other information from metadata
             details = result.metadata or {}

{agentkit_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/config/__init__.py

@@ -64,6 +64,8 @@ __all__ = [
     "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_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/config/constants.py

@@ -25,6 +25,8 @@ from pathlib import Path
 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_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/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,7 +101,7 @@ 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"})
@@ -109,7 +109,7 @@ class CloudStrategyConfig(AutoSerializableMixin):
     
     # 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_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/executors/base_executor.py

@@ -428,6 +428,9 @@ class BaseExecutor:
             strategy_config['runtime_apikey'] = ""
             strategy_config['runtime_apikey_name'] = AUTO_CREATE_VE
             strategy_config['runtime_role_name'] = AUTO_CREATE_VE
+        if launch_type == 'cloud':
+            strategy_config['cp_pipeline_id'] = ""
+            strategy_config['cp_pipeline_name'] = ""
         
         config.update_strategy_config(launch_type, strategy_config)
         self.logger.debug(f"Cleared deploy config for {launch_type}")

{agentkit_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/executors/init_executor.py

@@ -46,6 +46,7 @@ from agentkit.toolkit.config import (
     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 @@ class InitExecutor(BaseExecutor):
                 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 @@ class InitExecutor(BaseExecutor):
                 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 @@ class InitExecutor(BaseExecutor):
                 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_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/resources/templates/code-pipeline-tos-cr-step.j2

@@ -12,8 +12,8 @@ stages:
               displayName: TOS 下载
               component: artifact@1.0.0/tos-download
               inputs:
-                bucketName: {{ bucket_name }}
-                bucketRegion: {{ bucket_region }}
+                bucketName: $(parameters.TOS_BUCKET_NAME)
+                bucketRegion: $(parameters.TOS_REGION)
                 path: $TOS_PROJECT_FILE_PATH
                 targetPath: $DOWNLOAD_PATH
             - step: step-c6

{agentkit_sdk_python-0.1.11 → agentkit_sdk_python-0.1.13}/agentkit/toolkit/strategies/hybrid_strategy.py

@@ -120,14 +120,22 @@ class HybridStrategy(Strategy):
         cr_repo_name = self._prepare_cr_config(strategy_config.cr_repo_name, common_config.agent_name)
         if cr_repo_name != strategy_config.cr_repo_name:
             config_updates.add('cr_repo_name', cr_repo_name)
-        
+
         should_push, reason = self._should_push_to_cr(strategy_config, cr_repo_name)
         if should_push:
-            cr_updates = self._handle_cr_push(result, strategy_config, cr_repo_name)
+            cr_updates = self._handle_cr_push(common_config, result, strategy_config, cr_repo_name)
             config_updates.merge(cr_updates)
         else:
             self._report_cr_skip_reason(reason, strategy_config)
-        
+
+        # Persist local build metadata
+        if result.build_timestamp:
+            config_updates.add('build_timestamp', result.build_timestamp.isoformat())
+        if result.image:
+            config_updates.add('full_image_name', result.image.full_name)
+            if getattr(result.image, 'digest', None):
+                config_updates.add('image_id', result.image.digest)
+
         result.config_updates = config_updates if config_updates.has_updates() else None
         return result
     
@@ -235,21 +243,28 @@ class HybridStrategy(Strategy):
         Returns:
             Tuple of (should_push: bool, reason: str).
         """
+        # Validate instance name
         if not strategy_config.cr_instance_name:
             return False, "CR instance name is empty"
-        
         if strategy_config.cr_instance_name == AUTO_CREATE_VE:
             return False, "CR instance name is 'Auto'"
-        
-        if '{{' in strategy_config.cr_instance_name:
+        if '{{' in (strategy_config.cr_instance_name or ''):
             return False, "CR instance name contains unrendered template variables"
-        
+
+        # Validate namespace name
+        if not strategy_config.cr_namespace_name:
+            return False, "CR namespace name is empty"
+        if strategy_config.cr_namespace_name == AUTO_CREATE_VE:
+            return False, "CR namespace name is 'Auto'"
+        if '{{' in (strategy_config.cr_namespace_name or ''):
+            return False, "CR namespace name contains unrendered template variables"
+
         if not cr_repo_name:
             return False, "CR repository name is empty"
         
         return True, ""
     
-    def _handle_cr_push(self, result: BuildResult, strategy_config: HybridStrategyConfig,
+    def _handle_cr_push(self, common_config: CommonConfig, result: BuildResult, strategy_config: HybridStrategyConfig,
                         cr_repo_name: str) -> 'ConfigUpdates':
         """
         Handle pushing image to Container Registry.
@@ -272,17 +287,48 @@ class HybridStrategy(Strategy):
         
         config_updates = ConfigUpdates()
         
-        local_image = result.image.full_name if result.image else None
-        if not local_image:
+        # Use image_id (SHA) from build result for pushing
+        image_id = result.image.digest if result.image else None
+        if not image_id:
             return config_updates
-        
-        cr_image_url = self._push_to_cr(
-            local_image,
-            strategy_config.cr_instance_name,
-            strategy_config.cr_namespace_name,
-            cr_repo_name,
-            strategy_config.image_tag
+
+        # Ensure CR resources exist (instance/namespace/repo)
+        cr_cfg = CRServiceConfig(
+            instance_name=strategy_config.cr_instance_name,
+            namespace_name=strategy_config.cr_namespace_name,
+            repo_name=cr_repo_name
+        )
+        cr_service = CRService(reporter=self.reporter)
+        ensure_result = cr_service.ensure_cr_resources(cr_cfg, common_config=common_config)
+        if not ensure_result.success:
+            raise Exception(ensure_result.error or "Failed to ensure CR resources")
+
+        # Ensure public endpoint is enabled for CR instance
+        public_result = cr_service.ensure_public_endpoint(cr_cfg)
+        if not public_result.success:
+            raise Exception(public_result.error or "Failed to enable CR public endpoint")
+
+        # Write back any auto-created names to config
+        if ensure_result.instance_name and ensure_result.instance_name != strategy_config.cr_instance_name:
+            config_updates.add('cr_instance_name', ensure_result.instance_name)
+        if ensure_result.namespace_name and ensure_result.namespace_name != strategy_config.cr_namespace_name:
+            config_updates.add('cr_namespace_name', ensure_result.namespace_name)
+        if ensure_result.repo_name and ensure_result.repo_name != cr_repo_name:
+            config_updates.add('cr_repo_name', ensure_result.repo_name)
+
+        # Push image (inline call to CRService.login_and_push_image)
+        self.reporter.info(
+            f"Pushing image to CR: {cr_cfg.instance_name}/{cr_cfg.namespace_name}/{cr_cfg.repo_name}:{strategy_config.image_tag}"
         )
+        success, push_result = cr_service.login_and_push_image(
+            cr_config=cr_cfg,
+            image_id=image_id,
+            image_tag=strategy_config.image_tag,
+            namespace=cr_cfg.namespace_name
+        )
+        if not success:
+            raise Exception(f"Image push failed: {push_result}")
+        cr_image_url = push_result
         
         config_updates.add('cr_image_full_url', cr_image_url)
         
@@ -296,14 +342,14 @@ class HybridStrategy(Strategy):
     
     def _report_cr_skip_reason(self, reason: str, strategy_config: HybridStrategyConfig) -> None:
         """Report reason for skipping CR push."""
-        if '{{' in strategy_config.cr_instance_name:
-            self.reporter.warning(f"⚠️  CR instance name contains unrendered template variables: {strategy_config.cr_instance_name}")
-            self.reporter.warning("⚠️  Ensure volcenginesdkcore is installed to render template variables")
+        if '{{' in (strategy_config.cr_instance_name or '') or '{{' in (strategy_config.cr_namespace_name or ''):
+            self.reporter.warning("CR names contain unrendered template variables")
+            self.reporter.warning("Ensure Volcengine AK/SK are configured and STS can fetch account_id for template rendering.")
         elif strategy_config.cr_instance_name == AUTO_CREATE_VE:
-            self.reporter.warning("⚠️  CR instance name is 'Auto', skipping push to CR")
-            self.reporter.warning("⚠️  Use 'agentkit config' to configure a valid CR instance name")
+            self.reporter.warning("CR instance name is 'Auto', skipping push to CR")
+            self.reporter.warning("Use 'agentkit config' to configure a valid CR instance name")
         else:
-            self.reporter.warning(f"⚠️  Invalid CR configuration, skipping push to CR: {reason}")
+            self.reporter.warning(f"Invalid CR configuration, skipping push to CR: {reason}")
     
     def _validate_cr_image_url(self, strategy_config: HybridStrategyConfig) -> DeployResult:
         """
@@ -316,42 +362,54 @@ class HybridStrategy(Strategy):
         if image_url:
             return DeployResult(success=True)
         
-        if '{{' in strategy_config.cr_instance_name:
+        from agentkit.toolkit.errors import ErrorCode
+
+        if '{{' in (strategy_config.cr_instance_name or '') or '{{' in (strategy_config.cr_namespace_name or ''):
             error_msg = (
-                f"CR instance name contains unrendered template variables: {strategy_config.cr_instance_name}\n"
-                f"Ensure volcenginesdkcore is installed to render template variables."
+                "CR names contain unrendered template variables. Ensure Volcengine AK/SK are configured and STS can fetch account_id."
             )
+            error_code = ErrorCode.CONFIG_INVALID
         elif strategy_config.cr_instance_name == AUTO_CREATE_VE or not strategy_config.cr_instance_name:
             error_msg = (
                 f"Hybrid mode requires valid CR configuration. Current cr_instance_name='{strategy_config.cr_instance_name}' is invalid.\n"
                 f"Use 'agentkit config' to configure a valid CR instance name, or switch to local/cloud mode."
             )
+            error_code = ErrorCode.CONFIG_INVALID
         else:
             error_msg = (
                 "CR image URL not found. Run 'agentkit build' to build and push the image to CR."
             )
+            error_code = ErrorCode.RESOURCE_NOT_FOUND
         
         return DeployResult(
             success=False,
             error=error_msg,
-            error_code="INVALID_IMAGE_URL"
+            error_code=error_code
         )
     
     def _to_builder_config(self, common_config: CommonConfig,
                            strategy_config: HybridStrategyConfig) -> LocalDockerBuilderConfig:
         """
-        Convert HybridVeAgentkitConfig to LocalDockerBuilderConfig.
+        Convert HybridStrategyConfig to LocalDockerBuilderConfig.
         """
+        # Retrieve Docker build config from manager (contains CLI runtime options)
+        docker_build_config = None
+        if self.config_manager:
+            try:
+                docker_build_config = self.config_manager.get_docker_build_config()
+            except Exception:
+                docker_build_config = None
         return LocalDockerBuilderConfig(
             common_config=common_config,
             image_name=common_config.agent_name or "agentkit-app",
-            image_tag=strategy_config.image_tag
+            image_tag=strategy_config.image_tag,
+            docker_build_config=docker_build_config
         )
     
     def _to_runner_config(self, common_config: CommonConfig,
                           strategy_config: HybridStrategyConfig) -> VeAgentkitRunnerConfig:
         """
-        Convert HybridVeAgentkitConfig to VeAgentkitRunnerConfig.
+        Convert HybridStrategyConfig to VeAgentkitRunnerConfig.
         """
         merged_envs = merge_runtime_envs(common_config, strategy_config.to_dict())
         
@@ -367,46 +425,4 @@ class HybridStrategy(Strategy):
             image_url=strategy_config.cr_image_full_url
         )
     
-    def _push_to_cr(self, local_image: str, cr_instance: str, 
-                    cr_namespace: str, cr_repo: str, tag: str) -> str:
-        """
-        Push local image to Container Registry.
-        
-        Args:
-            local_image: Local image name (e.g., agentkit-app:v1.0).
-            cr_instance: CR instance name.
-            cr_namespace: CR namespace.
-            cr_repo: CR repository name.
-            tag: Image tag.
-            
-        Returns:
-            Full CR image URL.
-            
-        Raises:
-            Exception: If image push fails. Exceptions are handled by Executor.
-        """
-        cr_config = CRServiceConfig(
-            instance_name=cr_instance,
-            namespace_name=cr_namespace,
-            repo_name=cr_repo
-        )
-        
-        cr_service = CRService(reporter=self.reporter)
-        
-        import docker
-        client = docker.from_env()
-        image = client.images.get(local_image)
-        image_id = image.id
-        
-        self.reporter.info(f"Pushing image to CR: {cr_instance}/{cr_namespace}/{cr_repo}:{tag}")
-        success, result = cr_service.login_and_push_image(
-            cr_config=cr_config,
-            image_id=image_id,
-            image_tag=tag,
-            namespace=cr_namespace
-        )
-        
-        if not success:
-            raise Exception(f"Image push failed: {result}")
-        
-        return result
+    # _push_to_cr removed: logic is handled inline within _handle_cr_push