Skip to content

Commit 1b58096

Browse files
Unexclude _azure_environments.py file (#34037)
* update * update
1 parent de4d77b commit 1b58096

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

sdk/ml/azure-ai-ml/azure/ai/ml/_azure_environments.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
from typing import Dict, List, Optional
1010

1111
from azure.ai.ml._utils.utils import _get_mfe_url_override
12-
from azure.ai.ml.constants._common import AZUREML_CLOUD_ENV_NAME
13-
from azure.ai.ml.constants._common import ArmConstants
12+
from azure.ai.ml.constants._common import AZUREML_CLOUD_ENV_NAME, ArmConstants
1413
from azure.core.rest import HttpRequest
1514
from azure.mgmt.core import ARMPipelineClient
1615

17-
1816
module_logger = logging.getLogger(__name__)
1917

2018

@@ -72,7 +70,7 @@ def _get_cloud(cloud: str) -> Dict[str, str]:
7270
arm_clouds = _get_clouds_by_metadata_url(arm_url)
7371
try:
7472
new_cloud = arm_clouds[cloud]
75-
_environments.update(new_cloud)
73+
_environments.update(new_cloud) # type: ignore[arg-type]
7674
return new_cloud
7775
except KeyError as e:
7876
raise Exception('Unknown cloud environment "{0}".'.format(cloud)) from e
@@ -86,7 +84,7 @@ def _get_default_cloud_name() -> str:
8684
return os.getenv(AZUREML_CLOUD_ENV_NAME, AzureEnvironments.ENV_DEFAULT)
8785

8886

89-
def _get_cloud_details(cloud: str = AzureEnvironments.ENV_DEFAULT) -> Dict[str, str]:
87+
def _get_cloud_details(cloud: Optional[str] = AzureEnvironments.ENV_DEFAULT) -> Dict[str, str]:
9088
"""Returns a Cloud endpoints object for the specified Azure Cloud.
9189
9290
:param cloud: cloud name
@@ -134,7 +132,7 @@ def _get_base_url_from_metadata(cloud_name: Optional[str] = None, is_local_mfe:
134132
base_url = _get_mfe_url_override()
135133
if base_url is None:
136134
cloud_details = _get_cloud_details(cloud_name)
137-
base_url = cloud_details.get(EndpointURLS.RESOURCE_MANAGER_ENDPOINT).strip("/")
135+
base_url = str(cloud_details.get(EndpointURLS.RESOURCE_MANAGER_ENDPOINT)).strip("/")
138136
return base_url
139137

140138

@@ -147,7 +145,7 @@ def _get_aml_resource_id_from_metadata(cloud_name: Optional[str] = None) -> str:
147145
:rtype: str
148146
"""
149147
cloud_details = _get_cloud_details(cloud_name)
150-
aml_resource_id = cloud_details.get(EndpointURLS.AML_RESOURCE_ID).strip("/")
148+
aml_resource_id = str(cloud_details.get(EndpointURLS.AML_RESOURCE_ID)).strip("/")
151149
return aml_resource_id
152150

153151

@@ -160,7 +158,7 @@ def _get_active_directory_url_from_metadata(cloud_name: Optional[str] = None) ->
160158
:rtype: str
161159
"""
162160
cloud_details = _get_cloud_details(cloud_name)
163-
active_directory_url = cloud_details.get(EndpointURLS.ACTIVE_DIRECTORY_ENDPOINT).strip("/")
161+
active_directory_url = str(cloud_details.get(EndpointURLS.ACTIVE_DIRECTORY_ENDPOINT)).strip("/")
164162
return active_directory_url
165163

166164

@@ -174,7 +172,7 @@ def _get_storage_endpoint_from_metadata(cloud_name: Optional[str] = None) -> str
174172
"""
175173
cloud_details = _get_cloud_details(cloud_name)
176174
storage_endpoint = cloud_details.get(EndpointURLS.STORAGE_ENDPOINT)
177-
return storage_endpoint
175+
return str(storage_endpoint)
178176

179177

180178
def _get_azure_portal_id_from_metadata(cloud_name: Optional[str] = None) -> str:
@@ -187,7 +185,7 @@ def _get_azure_portal_id_from_metadata(cloud_name: Optional[str] = None) -> str:
187185
"""
188186
cloud_details = _get_cloud_details(cloud_name)
189187
azure_portal_id = cloud_details.get(EndpointURLS.AZURE_PORTAL_ENDPOINT)
190-
return azure_portal_id
188+
return str(azure_portal_id)
191189

192190

193191
def _get_cloud_information_from_metadata(cloud_name: Optional[str] = None, **kwargs) -> Dict:
@@ -199,10 +197,12 @@ def _get_cloud_information_from_metadata(cloud_name: Optional[str] = None, **kwa
199197
:rtype: Dict
200198
"""
201199
cloud_details = _get_cloud_details(cloud_name)
202-
credential_scopes = _resource_to_scopes(cloud_details.get(EndpointURLS.RESOURCE_MANAGER_ENDPOINT).strip("/"))
200+
credential_scopes = _resource_to_scopes(
201+
cloud_details.get(EndpointURLS.RESOURCE_MANAGER_ENDPOINT).strip("/") # type: ignore[union-attr]
202+
)
203203

204204
# Update the kwargs with the cloud information
205-
client_kwargs = {"cloud": cloud_name}
205+
client_kwargs: Dict = {"cloud": cloud_name}
206206
if credential_scopes is not None:
207207
client_kwargs["credential_scopes"] = credential_scopes
208208
kwargs.update(client_kwargs)
@@ -219,7 +219,7 @@ def _get_registry_discovery_endpoint_from_metadata(cloud_name: Optional[str] = N
219219
"""
220220
cloud_details = _get_cloud_details(cloud_name)
221221
registry_discovery_endpoint = cloud_details.get(EndpointURLS.REGISTRY_DISCOVERY_ENDPOINT)
222-
return registry_discovery_endpoint
222+
return str(registry_discovery_endpoint)
223223

224224

225225
def _resource_to_scopes(resource: str) -> List[str]:
@@ -250,7 +250,7 @@ def _get_registry_discovery_url(cloud: dict, cloud_suffix: str = "") -> str:
250250
"""
251251
cloud_name = cloud["name"]
252252
if cloud_name in _environments:
253-
return _environments[cloud_name].registry_url
253+
return _environments[cloud_name].registry_url # type: ignore[attr-defined]
254254

255255
registry_discovery_region = os.environ.get(
256256
ArmConstants.REGISTRY_DISCOVERY_REGION_ENV_NAME,

sdk/ml/azure-ai-ml/pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ exclude = [
3737
"azure/ai/ml/_utils",
3838
"azure/ai/ml/data_transfer/",
3939
"azure/ai/ml/parallel/",
40-
"azure/ai/ml/_azure_environments.py",
4140
"azure/ai/ml/exceptions.py",
4241
"azure/ai/ml/_exception_helper.py",
4342
]

0 commit comments

Comments
 (0)