feat(client): 支持自定义服务端点和协议方案

为BaseServiceClient及其子类添加scheme配置支持
扩展全局配置以支持agentkit、iam和cr服务的host和schema配置
更新相关服务客户端以使用全局配置中的自定义设置

(cherry picked from commit 82a913b384b95f11358e07c1dce49fdf135986b4)

Author: liulei.88

.gitignore

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

agentkit/client/base_agentkit_client.py

@@ -21,6 +21,7 @@
 
 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):
@@ -77,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

@@ -107,6 +107,7 @@ 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(
@@ -121,7 +122,7 @@ def __init__(
             ),
             connection_timeout=30,
             socket_timeout=30,
-            scheme="https",
+            scheme=self.scheme,
         )
 
         # Generate ApiInfo for all actions

agentkit/toolkit/cli/cli_config.py

@@ -424,6 +424,20 @@ def _set_global_field(field_value: str):
             if not hasattr(config.tos, field):
                 raise AttributeError(f"tos has no field: {field}")
             setattr(config.tos, field, value)
+        elif section == 'agentkit':
+            if field not in ['host', 'schema']:
+                raise AttributeError(f"agentkit has no field: {field}")
+            if field == 'host':
+                config.agentkit_host = value
+            elif field == 'schema':
+                config.agentkit_schema = value
+        elif section == 'iam':
+            if field not in ['host', 'schema']:
+                raise AttributeError(f"iam has no field: {field}")
+            if field == 'host':
+                config.iam_host = value
+            elif field == 'schema':
+                config.iam_schema = value
         else:
             console.print(f"[red]❌ Unknown config section: {section}[/red]")
             console.print("\nSupported sections: volcengine, cr, tos")

agentkit/toolkit/config/global_config.py

@@ -24,7 +24,6 @@
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Optional
-import yaml
 import logging
 
 from .utils import is_valid_config
@@ -68,12 +67,16 @@ class CRGlobalConfig:
     instance_name: str = ""
     namespace_name: str = ""
     auto_create_instance_type: str = "Micro"  # Instance type when auto-creating: "Micro" or "Enterprise"
+    host: str = ""
+    schema: str = "https"
 
     def to_dict(self):
         return {
             "instance_name": self.instance_name,
             "namespace_name": self.namespace_name,
             "auto_create_instance_type": self.auto_create_instance_type,
+            "host": self.host,
+            "schema": self.schema,
         }
 
     @classmethod
@@ -82,6 +85,8 @@ def from_dict(cls, data: dict):
             instance_name=data.get("instance_name", ""),
             namespace_name=data.get("namespace_name", ""),
             auto_create_instance_type=data.get("auto_create_instance_type", "Micro"),
+            host=data.get("host", ""),
+            schema=data.get("schema", "https"),
         )
 
 
@@ -120,12 +125,24 @@ class GlobalConfig:
     volcengine: VolcengineCredentials = field(default_factory=VolcengineCredentials)
     cr: CRGlobalConfig = field(default_factory=CRGlobalConfig)
     tos: TOSGlobalConfig = field(default_factory=TOSGlobalConfig)
+    agentkit_host: str = ""
+    agentkit_schema: str = "https"
+    iam_host: str = ""
+    iam_schema: str = "https"
 
     def to_dict(self):
         return {
             "volcengine": self.volcengine.to_dict(),
             "cr": self.cr.to_dict(),
             "tos": self.tos.to_dict(),
+            "agentkit": {
+                "host": self.agentkit_host,
+                "schema": self.agentkit_schema,
+            },
+            "iam": {
+                "host": self.iam_host,
+                "schema": self.iam_schema,
+            },
         }
 
     @classmethod
@@ -134,6 +151,10 @@ def from_dict(cls, data: dict):
             volcengine=VolcengineCredentials.from_dict(data.get("volcengine", {})),
             cr=CRGlobalConfig.from_dict(data.get("cr", {})),
             tos=TOSGlobalConfig.from_dict(data.get("tos", {})),
+            agentkit_host=(data.get("agentkit", {}) or {}).get("host", ""),
+            agentkit_schema=(data.get("agentkit", {}) or {}).get("schema", "https"),
+            iam_host=(data.get("iam", {}) or {}).get("host", ""),
+            iam_schema=(data.get("iam", {}) or {}).get("schema", "https"),
         )
 
 
@@ -169,6 +190,7 @@ def load(self) -> GlobalConfig:
             return GlobalConfig()
 
         try:
+            import yaml
             with open(self.config_path, 'r', encoding='utf-8') as f:
                 data = yaml.safe_load(f) or {}
             logger.debug(f"Loaded global config from: {self.config_path}")
@@ -188,6 +210,7 @@ def save(self, config: GlobalConfig):
 
         # Write YAML config
         with open(self.config_path, 'w', encoding='utf-8') as f:
+            import yaml
             yaml.dump(
                 config.to_dict(), 
                 f, 

agentkit/toolkit/volcengine/cr.py

@@ -28,8 +28,16 @@ def __init__(self, access_key: str, secret_key: str, region: str = "cn-beijing")
         self.ak = access_key
         self.sk = secret_key
         self.region = region
-        assert region in ["cn-beijing", "cn-guangzhou", "cn-shanghai"]
         self.version = "2022-05-12"
+        try:
+            from agentkit.toolkit.config.global_config import get_global_config
+            gc = get_global_config()
+            default_host = f"cr.{self.region}.volcengineapi.com"
+            self.host = gc.cr.host or default_host
+            self.scheme = gc.cr.schema or "https"
+        except Exception:
+            self.host = f"cr.{self.region}.volcengineapi.com"
+            self.scheme = "https"
 
     def _create_instance(
         self, 
@@ -70,7 +78,8 @@ def _create_instance(
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"create cr instance {instance_name}: {response}")
 
@@ -122,7 +131,8 @@ def _check_instance(self, instance_name: str) -> str:
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"check cr instance {instance_name}: {response}")
 
@@ -159,7 +169,8 @@ def _create_namespace(
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"create cr namespace {namespace_name}: {response}")
 
@@ -210,7 +221,8 @@ def _create_repo(
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"create cr repo {repo_name}: {response}")
 
@@ -243,7 +255,8 @@ def _get_authorization_token(self, instance_name: str):
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"get cr authorization token: {response}")
 
@@ -274,7 +287,8 @@ def _get_public_endpoint(self, instance_name: str = DEFAULT_CR_INSTANCE_NAME):
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"get cr public endpoint: {response}")
         if "Error" in response["ResponseMetadata"]:
@@ -304,7 +318,8 @@ def _update_public_endpoint(self, instance_name: str, enabled: bool):
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"update cr public endpoint: {response}")
         if "Error" in response["ResponseMetadata"]:
@@ -336,7 +351,8 @@ def _create_endpoint_acl_policies(self, instance_name: str = DEFAULT_CR_INSTANCE
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"create endpoint acl policies: {response}")
 
@@ -367,7 +383,8 @@ def _list_domains(self, instance_name: str = DEFAULT_CR_INSTANCE_NAME):
             service="cr",
             version=self.version,
             region=self.region,
-            host=f"cr.{self.region}.volcengineapi.com",
+            host=self.host,
+            scheme=self.scheme,
         )
         logger.debug(f"list cr domains: {response}")
         if "Error" in response["ResponseMetadata"]:
@@ -386,6 +403,14 @@ def _get_default_domain(self, instance_name: str = DEFAULT_CR_INSTANCE_NAME):
         get default cr domain
         """
         domains = self._list_domains(instance_name=instance_name)
+        # 如果只有一个结果，直接返回该域名
+        try:
+            if isinstance(domains, list) and len(domains) == 1:
+                single = domains[0]
+                if isinstance(single, dict) and "Domain" in single:
+                    return single["Domain"]
+        except Exception:
+            pass
         for domain in domains:
             if domain["Default"] == True:
                 return domain["Domain"]

agentkit/utils/ve_sign.py

@@ -25,6 +25,7 @@
 Region = ""
 Host = ""
 ContentType = ""
+Scheme = "https"
 
 
 def norm_query(params):
@@ -149,7 +150,7 @@ def request(method, date, query, header, ak, sk, action, body):
     # 第六步：将 Signature 签名写入 HTTP Header 中，并发送 HTTP 请求。
     r = requests.request(
         method=method,
-        url="https://{}{}".format(request_param["host"], request_param["path"]),
+        url=f"{Scheme}://{request_param['host']}{request_param['path']}",
         headers=header,
         params=request_param["query"],
         data=request_param["body"],
@@ -168,6 +169,7 @@ def ve_request(
     host: str,
     header: dict = {},
     content_type: str = "application/json",
+    scheme: str = "https",
 ):
     # response_body = request("Get", datetime.datetime.utcnow(), {}, {}, AK, SK, "ListUsers", None)
     # print(response_body)
@@ -182,6 +184,8 @@ def ve_request(
     Host = host
     global ContentType
     ContentType = content_type
+    global Scheme
+    Scheme = scheme or "https"
 
     AK = ak
     SK = sk
@@ -281,7 +285,15 @@ def get_volc_ak_sk_region(service: str = ""):
 
 
 def get_volc_agentkit_host_info():
-    host = os.getenv("VOLCENGINE_AGENTKIT_HOST") or os.getenv("VOLC_AGENTKIT_HOST")
+    try:
+        from agentkit.toolkit.config.global_config import get_global_config
+        gc = get_global_config()
+        if gc.agentkit_host:
+            host = gc.agentkit_host
+        else:
+            host = os.getenv("VOLCENGINE_AGENTKIT_HOST") or os.getenv("VOLC_AGENTKIT_HOST")
+    except Exception:
+        host = os.getenv("VOLCENGINE_AGENTKIT_HOST") or os.getenv("VOLC_AGENTKIT_HOST")
     api_version = os.getenv("VOLCENGINE_AGENTKIT_API_VERSION") or os.getenv("VOLC_AGENTKIT_API_VERSION")
     service_code = os.getenv("VOLCENGINE_AGENTKIT_SERVICE") or os.getenv("VOLC_AGENTKIT_SERVICE")
     return host if host else "open.volcengineapi.com", api_version if api_version else "2025-10-30", service_code if service_code else "agentkit"
@@ -294,4 +306,3 @@ def get_identity_host_info():
     service_code = os.getenv("VOLCENGINE_IDENTITY_SERVICE") or os.getenv("VOLC_IDENTITY_SERVICE")
     region = os.getenv("VOLCENGINE_IDENTITY_REGION") or os.getenv("VOLC_IDENTITY_REGION")
     return host if host else "open.volcengineapi.com", api_version if api_version else "2023-10-01", service_code if service_code else "cis_test", region if region else "cn-beijing"
-