From 6f9c081616aa3282ded387864af223292afcb82e Mon Sep 17 00:00:00 2001 From: Andrew Schonhoffer Date: Wed, 21 May 2025 16:55:50 -0400 Subject: [PATCH 1/5] Print azcopy log if output_level==default --- .../azureml/assets/model/download_utils.py | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/scripts/azureml-assets/azureml/assets/model/download_utils.py b/scripts/azureml-assets/azureml/assets/model/download_utils.py index 394cd079da..38e2540176 100644 --- a/scripts/azureml-assets/azureml/assets/model/download_utils.py +++ b/scripts/azureml-assets/azureml/assets/model/download_utils.py @@ -94,7 +94,7 @@ def _onerror(func, path, exc_info): raise -def run_cmd(cmd, cwd: Path = None) -> int: +def run_cmd(cmd, cwd: Path | None = None, env: dict | None = None) -> int: """Run the command and returns the result.""" logger.print(cmd) result = subprocess.run( @@ -104,6 +104,7 @@ def run_cmd(cmd, cwd: Path = None) -> int: stderr=subprocess.STDOUT, encoding=sys.stdout.encoding, errors="ignore", + env=env, ) if result.returncode != 0: logger.log_error(f"Failed with error {result.stdout}") @@ -173,9 +174,23 @@ def run_azcopy(src_uri: str, dstn_uri: str, include_paths: List[str] = None, exc if not overwrite: download_cmd.append("--overwrite=false") - result = run_cmd(download_cmd) - logger.print(f"azcopy result: {result}") - return result + # Create a tempdir and set AZCOPY_LOG_LOCATION in env + with tempfile.TemporaryDirectory() as temp_log_dir: + env = os.environ.copy() + env["AZCOPY_LOG_LOCATION"] = temp_log_dir + result = run_cmd(download_cmd, env=env) + logger.print(f"azcopy result: {result}") + + if output_level == "default": + # list all files in the temp log dir + for root, _, files in os.walk(temp_log_dir): + for file in files: + file_path = os.path.join(root, file) + logger.print(f"azcopy log file: {file_path}") + with open(file_path, "r") as f: + logger.print(f.read()) + + return result def copy_azure_artifacts(src_uri: str, dstn_uri: str, copy_updater: CopyUpdater = None, From 72ac85ae71052f3a2015d25850b3d40bc4dbfdc2 Mon Sep 17 00:00:00 2001 From: vizhur Date: Thu, 22 May 2025 10:30:12 -0400 Subject: [PATCH 2/5] Update download_utils.py --- scripts/azureml-assets/azureml/assets/model/download_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azureml-assets/azureml/assets/model/download_utils.py b/scripts/azureml-assets/azureml/assets/model/download_utils.py index 38e2540176..55a85dbdc9 100644 --- a/scripts/azureml-assets/azureml/assets/model/download_utils.py +++ b/scripts/azureml-assets/azureml/assets/model/download_utils.py @@ -94,7 +94,7 @@ def _onerror(func, path, exc_info): raise -def run_cmd(cmd, cwd: Path | None = None, env: dict | None = None) -> int: +def run_cmd(cmd, cwd: Path | None = None, env: dict | None = None) -> int: """Run the command and returns the result.""" logger.print(cmd) result = subprocess.run( From 9d626ac76c6f4aba6347876943bf54baab81c3ac Mon Sep 17 00:00:00 2001 From: Kelly <40868256+lykelly19@users.noreply.github.com> Date: Thu, 22 May 2025 10:52:34 -0400 Subject: [PATCH 3/5] Update CHANGELOG.md --- scripts/azureml-assets/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/azureml-assets/CHANGELOG.md b/scripts/azureml-assets/CHANGELOG.md index b05c3f0a82..ee1d8eb367 100644 --- a/scripts/azureml-assets/CHANGELOG.md +++ b/scripts/azureml-assets/CHANGELOG.md @@ -1,6 +1,10 @@ ## 1.17.0 (Unreleased) ### 🚀 New Features +## 1.16.82 (2025-05-22) +### 🚀 New Features +- [#4184](https://github.com/Azure/azureml-assets/pull/4206) Print azcopy log if output_level==default + ## 1.16.81 (2025-05-15) ### 🚀 New Features - [#4184](https://github.com/Azure/azureml-assets/pull/4184) Generate SAS token instead of checking container access From 06ac603b258ee1272332d6ce68f631c6eec7c37c Mon Sep 17 00:00:00 2001 From: Kelly <40868256+lykelly19@users.noreply.github.com> Date: Thu, 22 May 2025 10:52:54 -0400 Subject: [PATCH 4/5] Update setup.py --- scripts/azureml-assets/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azureml-assets/setup.py b/scripts/azureml-assets/setup.py index 790aaa6f71..6c496ec6c6 100644 --- a/scripts/azureml-assets/setup.py +++ b/scripts/azureml-assets/setup.py @@ -7,7 +7,7 @@ setup( name="azureml-assets", - version="1.16.81", + version="1.16.82", description="Utilities for publishing assets to Azure Machine Learning system registries.", author="Microsoft Corp", packages=find_packages(), From 270ed897abe99baaa9fa5f5100be5e579087ba46 Mon Sep 17 00:00:00 2001 From: Kelly <40868256+lykelly19@users.noreply.github.com> Date: Thu, 22 May 2025 10:53:33 -0400 Subject: [PATCH 5/5] Update CHANGELOG.md --- scripts/azureml-assets/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azureml-assets/CHANGELOG.md b/scripts/azureml-assets/CHANGELOG.md index ee1d8eb367..befcbf6a1f 100644 --- a/scripts/azureml-assets/CHANGELOG.md +++ b/scripts/azureml-assets/CHANGELOG.md @@ -3,7 +3,7 @@ ## 1.16.82 (2025-05-22) ### 🚀 New Features -- [#4184](https://github.com/Azure/azureml-assets/pull/4206) Print azcopy log if output_level==default +- [#4206](https://github.com/Azure/azureml-assets/pull/4206) Print azcopy log if output_level==default ## 1.16.81 (2025-05-15) ### 🚀 New Features