Skip to content

Commit a64d80c

Browse files
author
dawnguo
committed
feat(skills): 为vestack环境添加 minio 文件上传下载支持
添加对vestack环境的支持，包括： 1. 通过GenTempTosObjectUrl/GenTempTosObjectDownloadUrl API获取临时URL 2. 使用requests库实现文件上传下载 3. 使用环境变量AGENTKIT_TOOL_SCHEME配置请求协议
1 parent be38ca5 commit a64d80c

4 files changed

Lines changed: 286 additions & 55 deletions

File tree

‎veadk/skills/utils.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ def load_skills_from_cloud(skill_space_ids: str) -> list[Skill]:
174174
"InnerTags": {"source": "sandbox"},
175175
}
176176
logger.debug(f"ListSkillsBySpaceId request body: {request_body}")
177+
scheme = os.getenv("AGENTKIT_TOOL_SCHEME", "https").lower()
177178

178179
response = ve_request(
179180
request_body=request_body,
@@ -185,6 +186,7 @@ def load_skills_from_cloud(skill_space_ids: str) -> list[Skill]:
185186
region=region,
186187
host=host,
187188
header={"X-Security-Token": session_token},
189+
scheme=scheme,
188190
)
189191

190192
if isinstance(response, str):

‎veadk/tools/skills_tools/download_skills_tool.py‎

Lines changed: 85 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def download_skills_tool(
101101
"InnerTags": {"source": "sandbox"},
102102
}
103103
logger.info(f"ListSkillsBySpaceId request body: {request_body}")
104-
104+
scheme = os.getenv("AGENTKIT_TOOL_SCHEME", "https").lower()
105105
response = ve_request(
106106
request_body=request_body,
107107
action="ListSkillsBySpaceId",
@@ -112,6 +112,7 @@ def download_skills_tool(
112112
region=region,
113113
host=host,
114114
header={"X-Security-Token": session_token},
115+
scheme=scheme,
115116
)
116117

117118
if isinstance(response, str):
@@ -161,11 +162,89 @@ def download_skills_tool(
161162

162163
# Download zip file
163164
zip_path = download_dir / f"{skill_name}.zip"
164-
success = tos_client.download(
165-
bucket_name=tos_bucket,
166-
object_key=tos_path,
167-
save_path=str(zip_path),
168-
)
165+
166+
if cloud_provider == "vestack":
167+
import requests
168+
169+
try:
170+
path_parts = tos_path.split("/")
171+
if len(path_parts) >= 3:
172+
skill_id = path_parts[1]
173+
skill_version = path_parts[2]
174+
else:
175+
logger.error(
176+
f"Invalid TosPath format for skill '{skill_name}': {tos_path}"
177+
)
178+
success = False
179+
continue
180+
except Exception as e:
181+
logger.error(
182+
f"Failed to parse TosPath for skill '{skill_name}': {e}"
183+
)
184+
success = False
185+
continue
186+
187+
# Call GenTempTosObjectDownloadUrl API
188+
temp_url_request_body = {
189+
"SkillId": skill_id,
190+
"SkillVersion": skill_version,
191+
}
192+
logger.debug(
193+
f"GenTempTosObjectDownloadUrl request body: {temp_url_request_body}"
194+
)
195+
196+
scheme = os.getenv("AGENTKIT_TOOL_SCHEME", "https").lower()
197+
198+
temp_url_res = ve_request(
199+
request_body=temp_url_request_body,
200+
action="GenTempTosObjectDownloadUrl",
201+
ak=access_key,
202+
sk=secret_key,
203+
service=service,
204+
version="2025-10-30",
205+
region=region,
206+
host=host,
207+
header={"X-Security-Token": session_token},
208+
scheme=scheme,
209+
)
210+
211+
if isinstance(temp_url_res, str):
212+
temp_url_res = json.loads(temp_url_res)
213+
214+
if (
215+
"ResponseMetadata" in temp_url_res
216+
and "Error" in temp_url_res["ResponseMetadata"]
217+
):
218+
error_details = temp_url_res["ResponseMetadata"]["Error"]
219+
logger.error(
220+
f"Failed to get temporary download URL for '{skill_name}': {error_details}"
221+
)
222+
success = False
223+
else:
224+
signed_url = temp_url_res.get("Result", {}).get("SignedUrl")
225+
if not signed_url:
226+
logger.error(
227+
f"Failed to get SignedUrl from GenTempTosObjectDownloadUrl response: {temp_url_res}"
228+
)
229+
success = False
230+
else:
231+
try:
232+
response = requests.get(signed_url)
233+
response.raise_for_status()
234+
with open(zip_path, "wb") as f:
235+
f.write(response.content)
236+
success = True
237+
except Exception as e:
238+
logger.warning(
239+
f"Failed to download skill '{skill_name}' from minio: {e}"
240+
)
241+
success = False
242+
else:
243+
success = tos_client.download(
244+
bucket_name=tos_bucket,
245+
object_key=tos_path,
246+
save_path=str(zip_path),
247+
)
169248

170249
if not success:
171250
logger.warning(f"Failed to download skill '{skill_name}'")

‎veadk/tools/skills_tools/register_skills_tool.py‎

Lines changed: 90 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -111,46 +111,101 @@ def register_skills_tool(
111111
secret_key = cred.secret_access_key
112112
session_token = cred.session_token
113113

114-
res = ve_request(
115-
request_body={},
116-
action="GetCallerIdentity",
117-
ak=access_key,
118-
sk=secret_key,
119-
service="sts",
120-
version="2018-01-01",
121-
region=region,
122-
host="sts.volcengineapi.com"
123-
if cloud_provider != "byteplus"
124-
else "open.byteplusapi.com",
125-
header={"X-Security-Token": session_token},
126-
)
127-
try:
128-
account_id = res["Result"]["AccountId"]
129-
except KeyError as e:
130-
logger.error(
131-
f"Error occurred while getting account id: {e}, response is {res}"
114+
account_id = ""
115+
if cloud_provider != "vestack":
116+
res = ve_request(
117+
request_body={},
118+
action="GetCallerIdentity",
119+
ak=access_key,
120+
sk=secret_key,
121+
service="sts",
122+
version="2018-01-01",
123+
region=region,
124+
host="sts.volcengineapi.com"
125+
if cloud_provider != "byteplus"
126+
else "open.byteplusapi.com",
127+
header={"X-Security-Token": session_token},
132128
)
133-
return f"Error: Failed to get account id when registering skill '{skill_name}'."
129+
try:
130+
account_id = res["Result"]["AccountId"]
131+
except KeyError as e:
132+
logger.error(
133+
f"Error occurred while getting account id: {e}, response is {res}"
134+
)
135+
return f"Error: Failed to get account id when registering skill '{skill_name}'."
134136

135137
tos_bucket = f"agentkit-platform-{region}-{account_id}-skill"
136138

137-
tos_client = VeTOS(
138-
ak=access_key,
139-
sk=secret_key,
140-
session_token=session_token,
141-
bucket_name=tos_bucket,
142-
region=region,
143-
)
139+
if cloud_provider == "vestack":
140+
import requests
141+
142+
# Call GenTempTosObjectUrl API
143+
temp_url_request_body = {
144+
"SkillName": skill_name,
145+
}
146+
logger.debug(f"GenTempTosObjectUrl request body: {temp_url_request_body}")
147+
scheme = os.getenv("AGENTKIT_TOOL_SCHEME", "https").lower()
148+
149+
temp_url_res = ve_request(
150+
request_body=temp_url_request_body,
151+
action="GenTempTosObjectUrl",
152+
ak=access_key,
153+
sk=secret_key,
154+
service=agentkit_tool_service,
155+
version="2025-10-30",
156+
region=region,
157+
host=agentkit_skill_host,
158+
header={"X-Security-Token": session_token},
159+
scheme=scheme,
160+
)
144161

145-
object_key = (
146-
f"uploads/{datetime.now().strftime('%Y%m%d_%H%M%S')}/{skill_name}.zip"
147-
)
148-
tos_client.upload_file(
149-
file_path=zip_file_path, bucket_name=tos_bucket, object_key=object_key
150-
)
151-
tos_url = tos_client.build_tos_url(
152-
bucket_name=tos_bucket, object_key=object_key
153-
)
162+
if isinstance(temp_url_res, str):
163+
temp_url_res = json.loads(temp_url_res)
164+
165+
if (
166+
"ResponseMetadata" in temp_url_res
167+
and "Error" in temp_url_res["ResponseMetadata"]
168+
):
169+
error_details = temp_url_res["ResponseMetadata"]["Error"]
170+
logger.error(
171+
f"Failed to get temporary upload URL for '{skill_name}': {error_details}"
172+
)
173+
return f"Failed to get temporary upload URL for '{skill_name}': {error_details}"
174+
175+
signed_url = temp_url_res.get("Result", {}).get("SignedUrl")
176+
tos_url = temp_url_res.get("Result", {}).get("TosUrl")
177+
178+
if not signed_url or not tos_url:
179+
logger.error(
180+
f"Failed to get SignedUrl or TosUrl from GenTempTosObjectUrl response: {temp_url_res}"
181+
)
182+
return f"Failed to get temporary upload URL for '{skill_name}'."
183+
184+
try:
185+
with open(zip_file_path, "rb") as f:
186+
response = requests.put(signed_url, data=f)
187+
response.raise_for_status()
188+
except Exception as e:
189+
logger.error(f"Failed to upload skill '{skill_name}' to minio: {e}")
190+
return f"Failed to upload skill '{skill_name}' to minio: {e}"
191+
else:
192+
tos_client = VeTOS(
193+
ak=access_key,
194+
sk=secret_key,
195+
session_token=session_token,
196+
bucket_name=tos_bucket,
197+
region=region,
198+
)
199+
200+
object_key = (
201+
f"uploads/{datetime.now().strftime('%Y%m%d_%H%M%S')}/{skill_name}.zip"
202+
)
203+
tos_client.upload_file(
204+
file_path=zip_file_path, bucket_name=tos_bucket, object_key=object_key
205+
)
206+
tos_url = tos_client.build_tos_url(
207+
bucket_name=tos_bucket, object_key=object_key
208+
)
154209

155210
skill_space_ids = os.getenv("SKILL_SPACE_ID", "")
156211
skill_space_ids_list = [

0 commit comments

Comments
 (0)