@@ -37,21 +37,33 @@ def __init__(
3737 ak : str = "" ,
3838 sk : str = "" ,
3939 session_token : str = "" ,
40- region : str = "cn-beijing" ,
4140 bucket_name : str = DEFAULT_TOS_BUCKET_NAME ,
4241 ) -> None :
4342 self .ak = ak if ak else os .getenv ("VOLCENGINE_ACCESS_KEY" , "" )
4443 self .sk = sk if sk else os .getenv ("VOLCENGINE_SECRET_KEY" , "" )
4544 self .session_token = session_token
4645
46+ # get provider
47+ provider = os .getenv ("CLOUD_PROVIDER" )
48+ logger .info (f"Cloud provider: { provider } " )
49+ if provider and provider .lower () == "byteplus" :
50+ self .region = "ap-southeast-1"
51+ self .sld = "bytepluses"
52+ else :
53+ self .region = "cn-beijing"
54+ self .sld = "volces"
55+
56+ logger .info (
57+ f"TOS client ready: region={ self .region } , endpoint=tos-{ self .region } .{ self .sld } .com"
58+ )
59+
4760 # Add empty value validation
4861 if not self .ak or not self .sk :
4962 raise ValueError (
5063 "VOLCENGINE_ACCESS_KEY and VOLCENGINE_SECRET_KEY must be provided "
5164 "either via parameters or environment variables."
5265 )
5366
54- self .region = region
5567 self .bucket_name = (
5668 bucket_name if bucket_name else getenv ("" , DEFAULT_TOS_BUCKET_NAME )
5769 )
@@ -75,7 +87,7 @@ def __init__(
7587 ak = self .ak ,
7688 sk = self .sk ,
7789 security_token = self .session_token ,
78- endpoint = f"tos-{ self .region } .volces .com" ,
90+ endpoint = f"tos-{ self .region } .{ self . sld } .com" ,
7991 region = self .region ,
8092 )
8193 logger .info ("Init TOS client." )
@@ -90,7 +102,7 @@ def _refresh_client(self):
90102 self .ak ,
91103 self .sk ,
92104 security_token = self .session_token ,
93- endpoint = f"tos-{ self .region } .volces .com" ,
105+ endpoint = f"tos-{ self .region } .{ self . sld } .com" ,
94106 region = self .region ,
95107 )
96108 logger .info ("refreshed client successfully." )
@@ -255,7 +267,7 @@ def _build_object_key_for_bytes(self) -> str:
255267 def build_tos_url (self , object_key : str , bucket_name : str = "" ) -> str :
256268 bucket_name = self ._check_bucket_name (bucket_name )
257269 tos_url : str = (
258- f"https://{ bucket_name } .tos-{ self .region } .volces .com/{ object_key } "
270+ f"https://{ bucket_name } .tos-{ self .region } .{ self . sld } .com/{ object_key } "
259271 )
260272 return tos_url
261273
@@ -606,7 +618,7 @@ async def async_upload_files(
606618 bucket = bucket_name ,
607619 key = object_key ,
608620 file_path = file_path ,
609- metadata = metadata ,
621+ meta = metadata ,
610622 )
611623 logger .debug (f"Async upload success, object_key: { object_key } " )
612624 return
0 commit comments