Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions agentkit/sdk/identity/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ def _get_api_key() -> str:
endpoint = resolve_endpoint("identity")
access_key = creds.access_key
secret_key = creds.secret_key
session_token = ""
session_token = getattr(creds, "session_token", None) or None

response = ve_request(
request_body={
"ProviderName": provider_name,
"IdentityToken": "identity_token",
},
action="GetResourceApiKey",
header={"X-Security-Token": session_token} if session_token else {},
ak=access_key,
sk=secret_key,
session_token=session_token,
version=endpoint.api_version,
service=endpoint.service,
host=endpoint.host,
Expand Down
95 changes: 25 additions & 70 deletions agentkit/toolkit/volcengine/code_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ def __init__(
secret_key: str = "",
region: str = "",
provider: str | None = None,
session_token: str = "",
) -> None:
# Use provided region or None to trigger auto-detection in VolcConfiguration
config = VolcConfiguration(
access_key=access_key or None,
secret_key=secret_key or None,
session_token=session_token or None,
region=region or None,
provider=provider or None,
)
Expand All @@ -45,13 +47,15 @@ def __init__(
creds = config.get_service_credentials("cp")
self.volcengine_access_key = creds.access_key
self.volcengine_secret_key = creds.secret_key
self.volcengine_session_token = creds.session_token or None
elif not all([access_key, secret_key]):
raise ValueError(
"Error create cp instance: missing access key or secret key",
)
else:
self.volcengine_access_key = access_key
self.volcengine_secret_key = secret_key
self.volcengine_session_token = session_token or None

endpoint = config.get_service_endpoint("cp")

Expand All @@ -61,19 +65,26 @@ def __init__(
self.host = endpoint.host
self.content_type = "application/json"

def _get_default_workspace(self) -> str:
logger.info("Getting default workspace...")

res = ve_request(
request_body={},
action="GetDefaultWorkspaceInner",
def _ve_request(self, request_body: dict, action: str) -> dict:
return ve_request(
request_body=request_body,
action=action,
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
session_token=self.volcengine_session_token,
)

def _get_default_workspace(self) -> str:
logger.info("Getting default workspace...")

res = self._ve_request(
request_body={},
action="GetDefaultWorkspaceInner",
)

try:
Expand Down Expand Up @@ -134,16 +145,9 @@ def create_workspace(
if visible_users:
request_body["VisibleUsers"] = visible_users

res = ve_request(
res = self._ve_request(
request_body=request_body,
action="CreateWorkspace",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down Expand Up @@ -206,16 +210,9 @@ def list_workspaces(
if workspace_ids:
request_body["Filter"]["Ids"] = workspace_ids

res = ve_request(
res = self._ve_request(
request_body=request_body,
action="ListWorkspaces",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down Expand Up @@ -301,21 +298,14 @@ def _create_pipeline(
parameters: list[dict[str, str]] | None = None,
) -> str:
logger.info("Creating pipeline...")
res = ve_request(
res = self._ve_request(
request_body={
"WorkspaceId": workspace_id,
"Name": pipeline_name,
"Spec": spec,
"Parameters": parameters or [],
},
action="CreatePipeline",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down Expand Up @@ -366,16 +356,9 @@ def run_pipeline(
if resources:
request_body["Resources"] = resources

res = ve_request(
res = self._ve_request(
request_body=request_body,
action="RunPipeline",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down Expand Up @@ -459,16 +442,9 @@ def list_pipeline_runs(
if run_ids:
request_body["Filter"]["Ids"] = run_ids

res = ve_request(
res = self._ve_request(
request_body=request_body,
action="ListPipelineRuns",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down Expand Up @@ -569,16 +545,9 @@ def list_pipelines(
if pipeline_ids:
request_body["Filter"]["Ids"] = pipeline_ids

res = ve_request(
res = self._ve_request(
request_body=request_body,
action="ListPipelines",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down Expand Up @@ -684,16 +653,9 @@ def list_pipeline_run_stages_inner(
"PipelineRunId": pipeline_run_id,
}

res = ve_request(
res = self._ve_request(
request_body=request_body,
action="ListPipelineRunStagesInner",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down Expand Up @@ -757,16 +719,9 @@ def get_task_run_log_download_uri(
"StepName": step_name,
}

res = ve_request(
res = self._ve_request(
request_body=request_body,
action="GetTaskRunLogDownloadURI",
ak=self.volcengine_access_key,
sk=self.volcengine_secret_key,
service=self.service,
version=self.version,
region=self.region,
host=self.host,
content_type=self.content_type,
)

try:
Expand Down
Loading