fix: change tos var to param-var and use it in code pipeline spec

- Reorder TOS_REGION parameter to appear after TOS_BUCKET_NAME in both template and build parameters
- Remove Env flag from TOS_BUCKET_NAME and TOS_REGION in pipeline template definition
- Update code-pipeline template to use dynamic parameters for bucket name and region
- Add cp_pipeline_id and cp_pipeline_name to cloud launch type config clearing

(cherry picked from commit 60df9f2a37a58ded3f0e9d06824b75e457c33539)

Author: innsd

agentkit/toolkit/builders/ve_pipeline.py

@@ -224,7 +224,7 @@ def build(self, config: VeCPCRBuilderConfig) -> BuildResult:
                 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 @@ def _upload_to_tos(self, archive_path: str, config: VeCPCRBuilderConfig) -> str:
         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 @@ def _prepare_pipeline_resources(self, config: VeCPCRBuilderConfig, tos_url: str,
                         {"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 @@ def download_and_show_logs(run_id: str):
             # 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/toolkit/executors/base_executor.py

@@ -428,6 +428,9 @@ def _clear_deploy_config(self, config, launch_type: str):
             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/toolkit/resources/templates/code-pipeline-tos-cr-step.j2

@@ -12,8 +12,8 @@ stages:
               displayName: TOS 下载
               component: [email protected]/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/toolkit/volcengine/services/cr_service.py

@@ -61,6 +61,10 @@ def is_quota_exceeded(error: Exception) -> bool:
     def is_already_exists(error: Exception) -> bool:
         return "AlreadyExists" in str(error)
 
+    @staticmethod
+    def is_insufficient_balance(error: Exception) -> bool:
+        return "Insufficient.Balance" in str(error)
+    
     @staticmethod
     def handle_auto_create_error(
         error: Exception,
@@ -81,6 +85,8 @@ def handle_auto_create_error(
         """
         if CRErrorHandler.is_quota_exceeded(error):
             result.error = f"Failed to create CR {resource_type}: account quota exceeded. Please upgrade your account quota or clean up unused CR {resource_type}s."
+        elif CRErrorHandler.is_insufficient_balance(error):
+            result.error = f"Failed to create CR {resource_type}: insufficient balance. Please ensure that you have enough balance in your account to create a container registry instance."
         else:
             result.error = f"Failed to create CR {resource_type}: {str(error)}"
 

agentkit/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "0.1.11"
+VERSION = "0.1.12"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentkit-sdk-python"
-version = "0.1.11"
+version = "0.1.12"
 description = "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."
 readme = "README.md"
 requires-python = ">=3.10"