Merge pull request #14 from volcengine/fix/sync-bugfix-and-service-check-cr-type

Sync: sycn bugfix and new features include service check,  CR type, more global config, etc.

Author: YumengBao

.gitignore

@@ -180,4 +180,6 @@ local_docs/
 local_test/
 
 # deprecated files
-*deprecated*
+*deprecated*
+
+.trae/

agentkit/client/base_agentkit_client.py

@@ -17,10 +17,11 @@
 Provides common initialization and API invocation logic.
 """
 
-from typing import Any, Dict, Union
+from typing import Any, Dict, Union, Optional
 
 from agentkit.client.base_service_client import BaseServiceClient, ApiConfig
 from agentkit.utils.ve_sign import get_volc_agentkit_host_info
+from agentkit.toolkit.config.global_config import get_global_config
 
 
 class BaseAgentkitClient(BaseServiceClient):
@@ -47,6 +48,7 @@ def __init__(
         region: str = "",
         session_token: str = "",
         service_name: str = "",
+        header: Optional[Dict[str, Any]] = {"Accept": "application/json"},
     ) -> None:
         """
         Initialize the AgentKit client.
@@ -65,6 +67,7 @@ def __init__(
             session_token=session_token,
             service_name=service_name,
             credential_env_prefix='AGENTKIT',
+            header=header,
         )
 
     def _get_service_config(self) -> Dict[str, str]:
@@ -75,10 +78,13 @@ def _get_service_config(self) -> Dict[str, str]:
             Dictionary with host, api_version, and service
         """
         host, api_version, service = get_volc_agentkit_host_info()
+        gc = get_global_config()
+        scheme = gc.agentkit_schema or 'https'
         return {
-            'host': host,
+            'host': gc.agentkit_host or host,
             'api_version': api_version,
             'service': service,
+            'scheme': scheme,
         }
 
     def _get(self, api_action: str, params: Dict[str, Any] = None) -> str:

agentkit/client/base_iam_client.py

@@ -20,6 +20,7 @@
 from typing import Dict, Union
 
 from agentkit.client.base_service_client import BaseServiceClient, ApiConfig
+from agentkit.toolkit.config.global_config import get_global_config
 
 
 class BaseIAMClient(BaseServiceClient):
@@ -42,7 +43,7 @@ class BaseIAMClient(BaseServiceClient):
     # IAM service specific configuration
     IAM_API_VERSION = "2018-01-01"
     IAM_SERVICE_CODE = "iam"
-    IAM_HOST ="open.volcengineapi.com"
+    IAM_HOST = "open.volcengineapi.com"
 
     def __init__(
         self,
@@ -78,8 +79,12 @@ def _get_service_config(self) -> Dict[str, str]:
         Returns:
             Dictionary with host, api_version, and service
         """
+        gc = get_global_config()
+        scheme = gc.iam_schema or 'https'
+        host = gc.iam_host or self.IAM_HOST
         return {
-            'host': self.IAM_HOST,
+            'host': host,
             'api_version': self.IAM_API_VERSION,
             'service': self.IAM_SERVICE_CODE,
+            'scheme': scheme,
         }

agentkit/client/base_service_client.py

@@ -72,6 +72,7 @@ def __init__(
         session_token: str = "",
         service_name: str = "",
         credential_env_prefix: str = "",
+        header: Optional[Dict[str, Any]] = {"Accept": "application/json"},
     ) -> None:
         """
         Initialize the service client.
@@ -106,11 +107,12 @@ def __init__(
         self.host = config['host']
         self.api_version = config['api_version']
         self.service = config['service']
+        self.scheme = config.get('scheme', 'https')
 
         # Create ServiceInfo
         self.service_info = ServiceInfo(
             host=self.host,
-            header={'Accept': 'application/json'},
+            header=header,
             credentials=Credentials(
                 ak=self.access_key,
                 sk=self.secret_key,
@@ -120,7 +122,7 @@ def __init__(
             ),
             connection_timeout=30,
             socket_timeout=30,
-            scheme="https",
+            scheme=self.scheme,
         )
 
         # Generate ApiInfo for all actions

agentkit/sdk/account/client.py

@@ -0,0 +1,110 @@
+# Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Auto-generated from API JSON definition
+# Do not edit manually
+
+from __future__ import annotations
+
+from typing import Dict, List, Optional
+from agentkit.client import BaseAgentkitClient
+from agentkit.sdk.account.types import (
+    ListAccountLinkedServicesRequest,
+    ListAccountLinkedServicesResponse,
+)
+
+
+class AgentkitAccountClient(BaseAgentkitClient):
+    """AgentKit Account Management Service"""
+    API_ACTIONS: Dict[str, str] = {
+        "ListAccountLinkedServices": "ListAccountLinkedServices",
+    }
+
+    def __init__(
+        self,
+        access_key: str = "",
+        secret_key: str = "",
+        region: str = "",
+        session_token: str = "",
+    ) -> None:
+        super().__init__(
+            access_key=access_key,
+            secret_key=secret_key,
+            region=region,
+            session_token=session_token,
+            service_name="account",
+        )
+
+
+    def list_account_linked_services(self, request: ListAccountLinkedServicesRequest) -> ListAccountLinkedServicesResponse:
+        return self._invoke_api(
+            api_action="ListAccountLinkedServices",
+            request=request,
+            response_type=ListAccountLinkedServicesResponse,
+        )
+
+    def get_service_status(self, service_name: str) -> Optional[str]:
+        """
+        Query the LinkServices status for a specific service.
+        
+        Args:
+            service_name: The name of the service to query (e.g., 'ark', 'vefaas')
+            
+        Returns:
+            The status string ('Enabled' or 'Disabled'), or None if service not found.
+        """
+        print(1)
+        response = self.list_account_linked_services(ListAccountLinkedServicesRequest())
+        print(2)
+        if not response.service_statuses:
+            return None
+        for svc in response.service_statuses:
+            if svc.service_name == service_name:
+                return svc.status
+        return None
+
+    def get_services_status(self, service_names: List[str]) -> Dict[str, Optional[str]]:
+        """
+        Query the LinkServices status for multiple services.
+        
+        Args:
+            service_names: List of service names to query (e.g., ['ark', 'vefaas', 'cr'])
+            
+        Returns:
+            A dict mapping service_name -> status ('Enabled'/'Disabled'/None if not found).
+        """
+        response = self.list_account_linked_services(ListAccountLinkedServicesRequest())
+        status_map: Dict[str, Optional[str]] = {name: None for name in service_names}
+        if response.service_statuses:
+            for svc in response.service_statuses:
+                if svc.service_name in status_map:
+                    status_map[svc.service_name] = svc.status
+        return status_map
+
+    def has_disabled_services(self) -> List[str]:
+        """
+        Check if any returned service has a disabled status.
+        
+        Returns:
+            A list of service names that are disabled (status != 'Enabled').
+            Returns empty list if all services are enabled.
+        """
+        response = self.list_account_linked_services(ListAccountLinkedServicesRequest())
+        disabled = []
+        if response.service_statuses:
+            for svc in response.service_statuses:
+                if svc.status != "Enabled":
+                    disabled.append(svc.service_name)
+        return disabled
+

agentkit/sdk/account/types.py

@@ -0,0 +1,45 @@
+# Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Auto-generated from API JSON definition
+# Do not edit manually
+
+from __future__ import annotations
+
+from typing import Optional
+from pydantic import BaseModel, Field
+
+class AccountBaseModel(BaseModel):
+    """AgentKit auto-generated base model"""
+    model_config = {
+        "populate_by_name": True,
+        "arbitrary_types_allowed": True
+    }
+
+
+# Data Types
+class ServiceStatusesForListAccountLinkedServices(AccountBaseModel):
+    service_name: Optional[str] = Field(default=None, alias="ServiceName")
+    status: Optional[str] = Field(default=None, alias="Status")
+
+
+# ListAccountLinkedServices - Request
+class ListAccountLinkedServicesRequest(AccountBaseModel):
+    pass
+
+
+# ListAccountLinkedServices - Response
+class ListAccountLinkedServicesResponse(AccountBaseModel):
+    service_statuses: Optional[list[ServiceStatusesForListAccountLinkedServices]] = Field(default=None, alias="ServiceStatuses")
+

agentkit/toolkit/builders/ve_pipeline.py

@@ -54,6 +54,7 @@ class VeCPCRBuilderConfig(AutoSerializableMixin):
     cr_instance_name: str = field(default=AUTO_CREATE_VE, metadata={"description": "CR instance name", "render_template": True})
     cr_namespace_name: str = field(default=AUTO_CREATE_VE, metadata={"description": "CR namespace", "render_template": True})
     cr_repo_name: str = field(default=AUTO_CREATE_VE, metadata={"description": "CR repository name"})
+    cr_auto_create_instance_type: str = field(default="Micro", metadata={"description": "CR instance type when auto-creating (Micro or Enterprise)"})
     cr_region: str = field(default="cn-beijing", metadata={"description": "CR region"})
 
     cp_workspace_name: str = field(default=DEFAULT_WORKSPACE_NAME, metadata={"description": "Code Pipeline workspace name"})
@@ -224,7 +225,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,
@@ -679,6 +680,10 @@ def _upload_to_tos(self, archive_path: str, config: VeCPCRBuilderConfig) -> str:
             return tos_url
 
         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:
@@ -698,6 +703,7 @@ def _prepare_cr_resources(self, config: VeCPCRBuilderConfig) -> CRServiceConfig:
                 instance_name=config.cr_instance_name,
                 namespace_name=config.cr_namespace_name,
                 repo_name=config.cr_repo_name,
+                auto_create_instance_type=config.cr_auto_create_instance_type,
                 region=config.cr_region
             )
 
@@ -726,18 +732,24 @@ def config_updater(service: str, cr_config_dict: Dict[str, Any]) -> None:
             cr_result = cr_service.ensure_cr_resources(cr_config, common_config)
 
             if not cr_result.success:
-                error_msg = f"CR resource preparation failed: {cr_result.error}"
-                self.reporter.error(error_msg)
-                raise Exception(error_msg)
+                raise Exception(cr_result.error)
 
-            # Ensure public endpoint access for image pulls
-            self.reporter.info("Ensuring CR public endpoint access...")
-            public_result = cr_service.ensure_public_endpoint(cr_config)
-            
-            if not public_result.success:
-                error_msg = f"Public endpoint configuration failed: {public_result.error}"
-                self.reporter.error(error_msg)
-                raise Exception(error_msg)
+            # Ensure public endpoint access for image pulls (controlled by global config)
+            try:
+                from agentkit.toolkit.config.global_config import get_global_config
+                gc = get_global_config()
+                do_check = getattr(getattr(gc, 'defaults', None), 'cr_public_endpoint_check', None)
+            except Exception:
+                do_check = None
+            if do_check is False:
+                self.reporter.info("Skipping CR public endpoint check per global config")
+            else:
+                self.reporter.info("Ensuring CR public endpoint access...")
+                public_result = cr_service.ensure_public_endpoint(cr_config)
+                
+                if not public_result.success:
+                    error_msg = f"Public endpoint configuration failed: {public_result.error}"
+                    raise Exception(error_msg)
 
             self.reporter.success("CR resource preparation completed")
             self.reporter.info(f"   Instance: {cr_result.instance_name}")
@@ -937,10 +949,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},
@@ -1030,9 +1042,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"},
@@ -1128,4 +1140,4 @@ def download_and_show_logs(run_id: str):
             return image_url
 
         except Exception as e:
-            raise Exception(f"Build execution failed: {str(e)}")
+            raise Exception(f"Build execution failed: {str(e)}")