From 5b4605eaad04fe523ada46969c1d87a2acc618d8 Mon Sep 17 00:00:00 2001 From: Kelly Date: Wed, 19 Feb 2025 15:26:12 -0500 Subject: [PATCH 1/4] Update account_uri when storage_name is updated for AzureBlobstoreAssetPath --- scripts/azureml-assets/CHANGELOG.md | 3 +++ scripts/azureml-assets/azureml/assets/config.py | 7 ++++--- scripts/azureml-assets/setup.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/azureml-assets/CHANGELOG.md b/scripts/azureml-assets/CHANGELOG.md index 2c7d2a8bc9..3f27bb5f52 100644 --- a/scripts/azureml-assets/CHANGELOG.md +++ b/scripts/azureml-assets/CHANGELOG.md @@ -1,6 +1,9 @@ ## 1.17.0 (Unreleased) ### 🚀 New Features +## 1.16.72 (2025-02-29) +### 🐛 Bugs Fixed +- [#3846](https://github.com/Azure/azureml-assets/pull/3846) Update account_uri when storage_name is updated for AzureBlobstoreAssetPath ## 1.16.71 (2025-02-12) ### 🐛 Bugs Fixed diff --git a/scripts/azureml-assets/azureml/assets/config.py b/scripts/azureml-assets/azureml/assets/config.py index ab89f1e230..e9baa40af3 100644 --- a/scripts/azureml-assets/azureml/assets/config.py +++ b/scripts/azureml-assets/azureml/assets/config.py @@ -528,10 +528,10 @@ def __init__(self, storage_name: str, container_name: str, container_path: str): if _get_default_cloud_name() in [AzureEnvironments.ENV_DEFAULT, AzureEnvironments.ENV_US_GOVERNMENT, AzureEnvironments.ENV_CHINA]: - cloud_suffix = AzureBlobstoreAssetPath.AZURE_CLOUD_SUFFIX + self._cloud_suffix = AzureBlobstoreAssetPath.AZURE_CLOUD_SUFFIX else: - cloud_suffix = _get_storage_endpoint_from_metadata() - self._account_uri = f"https://{storage_name}.blob.{cloud_suffix}" + self._cloud_suffix = _get_storage_endpoint_from_metadata() + self._account_uri = f"https://{storage_name}.blob.{self._cloud_suffix}" # Its possible that the account URL may need additional tweaking to add a SAS # token if the account does not allow for anonymous access. However, for @@ -697,6 +697,7 @@ def storage_name(self, storage_name: str): """Set storage name.""" self._storage_name = storage_name self._uri = None + self._account_uri = f"https://{storage_name}.blob.{self._cloud_suffix}" @property def container_name(self) -> str: diff --git a/scripts/azureml-assets/setup.py b/scripts/azureml-assets/setup.py index 7d3a2196ec..e91106600b 100644 --- a/scripts/azureml-assets/setup.py +++ b/scripts/azureml-assets/setup.py @@ -7,7 +7,7 @@ setup( name="azureml-assets", - version="1.16.71", + version="1.16.72", description="Utilities for publishing assets to Azure Machine Learning system registries.", author="Microsoft Corp", packages=find_packages(), From badf8fe6fa90f19befa73857ace5640725b4acf5 Mon Sep 17 00:00:00 2001 From: Kelly Date: Wed, 19 Feb 2025 15:28:29 -0500 Subject: [PATCH 2/4] fix date --- 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 3f27bb5f52..bbe34d8cf4 100644 --- a/scripts/azureml-assets/CHANGELOG.md +++ b/scripts/azureml-assets/CHANGELOG.md @@ -1,7 +1,7 @@ ## 1.17.0 (Unreleased) ### 🚀 New Features -## 1.16.72 (2025-02-29) +## 1.16.72 (2025-02-19) ### 🐛 Bugs Fixed - [#3846](https://github.com/Azure/azureml-assets/pull/3846) Update account_uri when storage_name is updated for AzureBlobstoreAssetPath From 68f70563e5b508372ad7924449bb26fdb5d68b29 Mon Sep 17 00:00:00 2001 From: Kelly Date: Wed, 19 Feb 2025 15:40:44 -0500 Subject: [PATCH 3/4] create account_uri property --- scripts/azureml-assets/azureml/assets/config.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/azureml-assets/azureml/assets/config.py b/scripts/azureml-assets/azureml/assets/config.py index e9baa40af3..c45d6be2c4 100644 --- a/scripts/azureml-assets/azureml/assets/config.py +++ b/scripts/azureml-assets/azureml/assets/config.py @@ -531,7 +531,6 @@ def __init__(self, storage_name: str, container_name: str, container_path: str): self._cloud_suffix = AzureBlobstoreAssetPath.AZURE_CLOUD_SUFFIX else: self._cloud_suffix = _get_storage_endpoint_from_metadata() - self._account_uri = f"https://{storage_name}.blob.{self._cloud_suffix}" # Its possible that the account URL may need additional tweaking to add a SAS # token if the account does not allow for anonymous access. However, for @@ -680,6 +679,11 @@ def get_file_contents(self, name: str, encoding: str = "UTF-8") -> Union[str, by file_contents = container_client.download_blob(container_prefix + name, encoding=encoding).readall() return file_contents + @property + def _account_uri(self) -> str: + """Account URI.""" + return f"https://{self._storage_name}.blob.{self._cloud_suffix}" + @property def uri(self) -> str: """Asset URI. Value is cached after first call.""" From dd830d80bb71b9a216e89437e16c760ccb652019 Mon Sep 17 00:00:00 2001 From: Kelly Date: Wed, 19 Feb 2025 15:41:49 -0500 Subject: [PATCH 4/4] remove line --- scripts/azureml-assets/azureml/assets/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/azureml-assets/azureml/assets/config.py b/scripts/azureml-assets/azureml/assets/config.py index c45d6be2c4..20e8d03688 100644 --- a/scripts/azureml-assets/azureml/assets/config.py +++ b/scripts/azureml-assets/azureml/assets/config.py @@ -701,7 +701,6 @@ def storage_name(self, storage_name: str): """Set storage name.""" self._storage_name = storage_name self._uri = None - self._account_uri = f"https://{storage_name}.blob.{self._cloud_suffix}" @property def container_name(self) -> str: