Skip to content

fix tos provider #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZQlQZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix tos provider #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions veadk/integrations/ve_tos/ve_tos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,33 @@ def __init__(
ak: str = "",
sk: str = "",
session_token: str = "",
region: str = "cn-beijing",
bucket_name: str = DEFAULT_TOS_BUCKET_NAME,
) -> None:
self.ak = ak if ak else os.getenv("VOLCENGINE_ACCESS_KEY", "")
self.sk = sk if sk else os.getenv("VOLCENGINE_SECRET_KEY", "")
self.session_token = session_token

# get provider
provider = os.getenv("CLOUD_PROVIDER")
logger.info(f"Cloud provider: {provider}")
if provider and provider.lower() == "byteplus":
self.region = "ap-southeast-1"
self.sld = "bytepluses"
else:
self.region = "cn-beijing"
self.sld = "volces"

logger.info(
f"TOS client ready: region={self.region}, endpoint=tos-{self.region}.{self.sld}.com"
)

# Add empty value validation
if not self.ak or not self.sk:
raise ValueError(
"VOLCENGINE_ACCESS_KEY and VOLCENGINE_SECRET_KEY must be provided "
"either via parameters or environment variables."
)

self.region = region
self.bucket_name = (
bucket_name if bucket_name else getenv("", DEFAULT_TOS_BUCKET_NAME)
)
Expand All @@ -75,7 +87,7 @@ def __init__(
ak=self.ak,
sk=self.sk,
security_token=self.session_token,
endpoint=f"tos-{self.region}.volces.com",
endpoint=f"tos-{self.region}.{self.sld}.com",
region=self.region,
)
logger.info("Init TOS client.")
Expand All @@ -90,7 +102,7 @@ def _refresh_client(self):
self.ak,
self.sk,
security_token=self.session_token,
endpoint=f"tos-{self.region}.volces.com",
endpoint=f"tos-{self.region}.{self.sld}.com",
region=self.region,
)
logger.info("refreshed client successfully.")
Expand Down Expand Up @@ -255,7 +267,7 @@ def _build_object_key_for_bytes(self) -> str:
def build_tos_url(self, object_key: str, bucket_name: str = "") -> str:
bucket_name = self._check_bucket_name(bucket_name)
tos_url: str = (
f"https://{bucket_name}.tos-{self.region}.volces.com/{object_key}"
f"https://{bucket_name}.tos-{self.region}.{self.sld}.com/{object_key}"
)
return tos_url

Expand Down Expand Up @@ -606,7 +618,7 @@ async def async_upload_files(
bucket=bucket_name,
key=object_key,
file_path=file_path,
metadata=metadata,
meta=metadata,
)
logger.debug(f"Async upload success, object_key: {object_key}")
return
Expand Down