You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/08/03 05:47:47 UTC
(airavata) 02/02: fix bugs and bump version to 2.2.3
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch sdk-batch-jobs
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit a50551ce84a094392612a45f9af0b1f8b2b7c182
Author: yasithdev <ya...@icloud.com>
AuthorDate: Sun Aug 3 00:47:39 2025 -0500
fix bugs and bump version to 2.2.3
---
.../airavata-python-sdk/airavata_experiments/airavata.py | 12 ++++++------
dev-tools/airavata-python-sdk/airavata_experiments/task.py | 4 +++-
dev-tools/airavata-python-sdk/pyproject.toml | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dev-tools/airavata-python-sdk/airavata_experiments/airavata.py b/dev-tools/airavata-python-sdk/airavata_experiments/airavata.py
index 8dbebd6b5e..f5ca757de1 100644
--- a/dev-tools/airavata-python-sdk/airavata_experiments/airavata.py
+++ b/dev-tools/airavata-python-sdk/airavata_experiments/airavata.py
@@ -330,14 +330,14 @@ class AiravataOperator:
elif process_id is not None and agent_ref is not None:
assert len(local_files) == 1, f"Expected 1 file, got {len(local_files)}"
file = local_files[0]
- fp = os.path.join("/data", file.name)
+ fp = os.path.join(".", file.name)
rawdata = file.read_bytes()
b64data = base64.b64encode(rawdata).decode()
res = requests.post(f"{self.connection_svc_url()}/agent/execute/shell", json={
"agentId": agent_ref,
"envName": agent_ref,
"workingDir": ".",
- "arguments": ["sh", "-c", f"echo {b64data} | base64 -d > {fp}"]
+ "arguments": [f"echo {b64data} | base64 -d > {fp}"]
})
data = res.json()
if data["error"] is not None:
@@ -379,7 +379,7 @@ class AiravataOperator:
"agentId": agent_ref,
"envName": agent_ref,
"workingDir": ".",
- "arguments": ["sh", "-c", r"find /data -type d -name 'venv' -prune -o -type f -printf '%P\n' | sort"]
+ "arguments": [r"find . -type f -printf '%P\n' | sort"]
})
data = res.json()
if data["error"] is not None:
@@ -417,7 +417,7 @@ class AiravataOperator:
"agentId": agent_ref,
"envName": agent_ref,
"workingDir": ".",
- "arguments": ["sh", "-c", f"cat {fp} | base64 -w0"]
+ "arguments": [f"cat {fp} | base64 -w0"]
})
data = res.json()
if data["error"] is not None:
@@ -461,7 +461,7 @@ class AiravataOperator:
"agentId": agent_ref,
"envName": agent_ref,
"workingDir": ".",
- "arguments": ["sh", "-c", f"{cmd} | base64 -w0"]
+ "arguments": [f"{cmd} | base64 -w0"]
})
data = res.json()
if data["error"] is not None:
@@ -492,7 +492,7 @@ class AiravataOperator:
"agentId": agent_ref,
"envName": agent_ref,
"workingDir": ".",
- "arguments": ["sh", "-c", f"cat {fp} | base64 -w0"]
+ "arguments": [f"cat {fp} | base64 -w0"]
})
data = res.json()
if data["error"] is not None:
diff --git a/dev-tools/airavata-python-sdk/airavata_experiments/task.py b/dev-tools/airavata-python-sdk/airavata_experiments/task.py
index 3700bf2f66..fea221b1cf 100644
--- a/dev-tools/airavata-python-sdk/airavata_experiments/task.py
+++ b/dev-tools/airavata-python-sdk/airavata_experiments/task.py
@@ -73,7 +73,9 @@ class Task(pydantic.BaseModel):
from pathlib import Path
Path(local_dir).mkdir(parents=True, exist_ok=True)
try:
- return self.runtime.download(file, local_dir, self)
+ saved_path = self.runtime.download(file, local_dir, self)
+ print(f"[Remote] Downloaded {file} -> {saved_path}")
+ return saved_path
except Exception as e:
print(f"[Remote] Failed to download file: {repr(e)}")
return ""
diff --git a/dev-tools/airavata-python-sdk/pyproject.toml b/dev-tools/airavata-python-sdk/pyproject.toml
index 04620578c0..d995930f1b 100644
--- a/dev-tools/airavata-python-sdk/pyproject.toml
+++ b/dev-tools/airavata-python-sdk/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "airavata-python-sdk"
-version = "2.2.2"
+version = "2.2.3"
description = "Apache Airavata Python SDK"
readme = "README.md"
license = "Apache-2.0"