Skip to content

Commit 07b689c

Browse files
maykumar-msftmaykumar-msft
authored
Migrate data and datastore operations rest client from 2022-05-01 API version to 2022-10-01 API version (Azure#28179)
* Upgrading api version * upgrading api version * updating rest client api version * Fix lint and test
1 parent 8cdb84a commit 07b689c

File tree

25 files changed

+95
-89
lines changed

25 files changed

+95
-89
lines changed

‎sdk/ml/azure-ai-ml/azure/ai/ml/_ml_client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def __init__(
309309
self._datastores = DatastoreOperations(
310310
operation_scope=self._operation_scope,
311311
operation_config=self._operation_config,
312-
serviceclient_2022_05_01=self._service_client_05_2022,
312+
serviceclient_2022_10_01=self._service_client_10_2022,
313313
**ops_kwargs,
314314
)
315315
self._operation_container.add(AzureMLResourceType.DATASTORE, self._datastores)
@@ -385,7 +385,7 @@ def __init__(
385385
self._data = DataOperations(
386386
self._operation_scope,
387387
self._operation_config,
388-
self._service_client_05_2022,
388+
self._service_client_10_2022,
389389
self._datastores,
390390
requests_pipeline=self._requests_pipeline,
391391
**ops_kwargs,

‎sdk/ml/azure-ai-ml/azure/ai/ml/_schema/_datastore/_on_prem.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from marshmallow import fields, post_load
1010

11-
from azure.ai.ml._restclient.v2022_02_01_preview.models import DatastoreType
11+
from azure.ai.ml._restclient.v2022_10_01_preview.models import DatastoreType
1212
from azure.ai.ml._schema.core.fields import NestedField, PathAwareSchema, StringTransformedEnum, UnionField
1313
from azure.ai.ml._utils.utils import camel_to_snake
1414

‎sdk/ml/azure-ai-ml/azure/ai/ml/_schema/_datastore/azure_storage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from marshmallow import fields, post_load
1010

11-
from azure.ai.ml._restclient.v2022_05_01.models import DatastoreType
11+
from azure.ai.ml._restclient.v2022_10_01.models import DatastoreType
1212
from azure.ai.ml._schema.core.fields import NestedField, PathAwareSchema, StringTransformedEnum, UnionField
1313
from azure.ai.ml._utils.utils import camel_to_snake
1414

‎sdk/ml/azure-ai-ml/azure/ai/ml/entities/_assets/_artifacts/data.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
from typing import Dict, Optional, Type, Union
1212

1313
from azure.ai.ml._exception_helper import log_and_raise_error
14-
from azure.ai.ml._restclient.v2022_05_01.models import (
15-
DataContainerData,
16-
DataContainerDetails,
14+
from azure.ai.ml._restclient.v2022_10_01.models import (
15+
DataContainer,
16+
DataContainerProperties,
1717
DataType,
18-
DataVersionBaseData,
19-
DataVersionBaseDetails,
18+
DataVersionBase,
19+
DataVersionBaseProperties,
2020
MLTableData,
2121
UriFileDataVersion,
2222
UriFolderDataVersion,
@@ -32,14 +32,14 @@
3232

3333
from .artifact import ArtifactStorageInfo
3434

35-
DataAssetTypeModelMap: Dict[str, Type[DataVersionBaseDetails]] = {
35+
DataAssetTypeModelMap: Dict[str, Type[DataVersionBaseProperties]] = {
3636
AssetTypes.URI_FILE: UriFileDataVersion,
3737
AssetTypes.URI_FOLDER: UriFolderDataVersion,
3838
AssetTypes.MLTABLE: MLTableData,
3939
}
4040

4141

42-
def getModelForDataAssetType(data_asset_type: str) -> Type[DataVersionBaseDetails]:
42+
def getModelForDataAssetType(data_asset_type: str) -> Type[DataVersionBaseProperties]:
4343
model = DataAssetTypeModelMap.get(data_asset_type)
4444
if model is None:
4545
msg = "Unknown DataType {}".format(data_asset_type)
@@ -150,18 +150,18 @@ def _to_dict(self) -> Dict:
150150
# pylint: disable=no-member
151151
return DataSchema(context={BASE_PATH_CONTEXT_KEY: "./"}).dump(self)
152152

153-
def _to_container_rest_object(self) -> DataContainerData:
153+
def _to_container_rest_object(self) -> DataContainer:
154154
VersionDetailsClass = getModelForDataAssetType(self.type)
155-
return DataContainerData(
156-
properties=DataContainerDetails(
155+
return DataContainer(
156+
properties=DataContainerProperties(
157157
properties=self.properties,
158158
tags=self.tags,
159159
is_archived=False,
160160
data_type=VersionDetailsClass.data_type,
161161
)
162162
)
163163

164-
def _to_rest_object(self) -> DataVersionBaseData:
164+
def _to_rest_object(self) -> DataVersionBase:
165165
VersionDetailsClass = getModelForDataAssetType(self.type)
166166
data_version_details = VersionDetailsClass(
167167
description=self.description,
@@ -173,11 +173,11 @@ def _to_rest_object(self) -> DataVersionBaseData:
173173
)
174174
if VersionDetailsClass._attribute_map.get("referenced_uris") is not None:
175175
data_version_details.referenced_uris = self._referenced_uris
176-
return DataVersionBaseData(properties=data_version_details)
176+
return DataVersionBase(properties=data_version_details)
177177

178178
@classmethod
179-
def _from_container_rest_object(cls, data_container_rest_object: DataContainerData) -> "Data":
180-
data_rest_object_details: DataContainerDetails = data_container_rest_object.properties
179+
def _from_container_rest_object(cls, data_container_rest_object: DataContainer) -> "Data":
180+
data_rest_object_details: DataContainerProperties = data_container_rest_object.properties
181181
data = Data(
182182
name=data_container_rest_object.name,
183183
creation_context=SystemData._from_rest_object(data_container_rest_object.system_data),
@@ -189,8 +189,8 @@ def _from_container_rest_object(cls, data_container_rest_object: DataContainerDa
189189
return data
190190

191191
@classmethod
192-
def _from_rest_object(cls, data_rest_object: DataVersionBaseData) -> "Data":
193-
data_rest_object_details: DataVersionBaseDetails = data_rest_object.properties
192+
def _from_rest_object(cls, data_rest_object: DataVersionBase) -> "Data":
193+
data_rest_object_details: DataVersionBaseProperties = data_rest_object.properties
194194
arm_id_object = get_arm_id_object_from_id(data_rest_object.id)
195195
path = data_rest_object_details.data_uri
196196
data = Data(

‎sdk/ml/azure-ai-ml/azure/ai/ml/entities/_credentials.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@
2424
from azure.ai.ml._restclient.v2022_01_01_preview.models import (
2525
UsernamePassword as RestWorkspaceConnectionUsernamePassword,
2626
)
27-
from azure.ai.ml._restclient.v2022_05_01.models import (
27+
from azure.ai.ml._restclient.v2022_10_01.models import (
2828
AccountKeyDatastoreCredentials as RestAccountKeyDatastoreCredentials,
2929
)
30-
from azure.ai.ml._restclient.v2022_05_01.models import AccountKeyDatastoreSecrets as RestAccountKeyDatastoreSecrets
31-
from azure.ai.ml._restclient.v2022_05_01.models import (
30+
from azure.ai.ml._restclient.v2022_10_01.models import AccountKeyDatastoreSecrets as RestAccountKeyDatastoreSecrets
31+
from azure.ai.ml._restclient.v2022_10_01.models import (
3232
CertificateDatastoreCredentials as RestCertificateDatastoreCredentials,
3333
)
34-
from azure.ai.ml._restclient.v2022_05_01.models import CertificateDatastoreSecrets, CredentialsType
34+
from azure.ai.ml._restclient.v2022_10_01.models import CertificateDatastoreSecrets, CredentialsType
3535
from azure.ai.ml._restclient.v2022_05_01.models import ManagedServiceIdentity as RestManagedServiceIdentityConfiguration
36-
from azure.ai.ml._restclient.v2022_05_01.models import NoneDatastoreCredentials as RestNoneDatastoreCredentials
37-
from azure.ai.ml._restclient.v2022_05_01.models import SasDatastoreCredentials as RestSasDatastoreCredentials
38-
from azure.ai.ml._restclient.v2022_05_01.models import SasDatastoreSecrets as RestSasDatastoreSecrets
39-
from azure.ai.ml._restclient.v2022_05_01.models import (
36+
from azure.ai.ml._restclient.v2022_10_01.models import NoneDatastoreCredentials as RestNoneDatastoreCredentials
37+
from azure.ai.ml._restclient.v2022_10_01.models import SasDatastoreCredentials as RestSasDatastoreCredentials
38+
from azure.ai.ml._restclient.v2022_10_01.models import SasDatastoreSecrets as RestSasDatastoreSecrets
39+
from azure.ai.ml._restclient.v2022_10_01.models import (
4040
ServicePrincipalDatastoreCredentials as RestServicePrincipalDatastoreCredentials,
4141
)
42-
from azure.ai.ml._restclient.v2022_05_01.models import (
42+
from azure.ai.ml._restclient.v2022_10_01.models import (
4343
ServicePrincipalDatastoreSecrets as RestServicePrincipalDatastoreSecrets,
4444
)
4545
from azure.ai.ml._restclient.v2022_05_01.models import UserAssignedIdentity as RestUserAssignedIdentityConfiguration

‎sdk/ml/azure-ai-ml/azure/ai/ml/entities/_datastore/_on_prem.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from pathlib import Path
99
from typing import Dict, Optional, Union
1010

11-
from azure.ai.ml._restclient.v2022_02_01_preview.models import DatastoreData, DatastoreType
12-
from azure.ai.ml._restclient.v2022_02_01_preview.models import HdfsDatastore as RestHdfsDatastore
11+
from azure.ai.ml._restclient.v2022_10_01_preview.models import Datastore as DatastoreData, DatastoreType
12+
from azure.ai.ml._restclient.v2022_10_01_preview.models import HdfsDatastore as RestHdfsDatastore
1313
from azure.ai.ml._schema._datastore._on_prem import HdfsSchema
1414
from azure.ai.ml._utils._experimental import experimental
1515
from azure.ai.ml.constants._common import BASE_PATH_CONTEXT_KEY, TYPE

‎sdk/ml/azure-ai-ml/azure/ai/ml/entities/_datastore/_on_prem_credentials.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from base64 import b64encode
66

7-
from azure.ai.ml._restclient.v2022_02_01_preview import models as model_preview
7+
from azure.ai.ml._restclient.v2022_10_01_preview import models as model_preview
88
from azure.ai.ml._utils._experimental import experimental
99
from azure.ai.ml.entities._credentials import NoneCredentialConfiguration
1010

‎sdk/ml/azure-ai-ml/azure/ai/ml/entities/_datastore/adls_gen1.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
from pathlib import Path
88
from typing import Dict, Optional, Union
99

10-
from azure.ai.ml._restclient.v2022_05_01.models import AzureDataLakeGen1Datastore as RestAzureDatalakeGen1Datastore
11-
from azure.ai.ml._restclient.v2022_05_01.models import DatastoreData, DatastoreType
10+
from azure.ai.ml._restclient.v2022_10_01.models import AzureDataLakeGen1Datastore as RestAzureDatalakeGen1Datastore
11+
from azure.ai.ml._restclient.v2022_10_01.models import Datastore as DatastoreData, DatastoreType
1212
from azure.ai.ml._schema._datastore.adls_gen1 import AzureDataLakeGen1Schema
1313
from azure.ai.ml.constants._common import BASE_PATH_CONTEXT_KEY, TYPE
1414
from azure.ai.ml.entities._credentials import CertificateConfiguration, ServicePrincipalConfiguration

‎sdk/ml/azure-ai-ml/azure/ai/ml/entities/_datastore/azure_storage.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
from typing import Dict, Optional, Union
99

1010
from azure.ai.ml._azure_environments import _get_storage_endpoint_from_metadata
11-
from azure.ai.ml._restclient.v2022_05_01.models import AzureBlobDatastore as RestAzureBlobDatastore
12-
from azure.ai.ml._restclient.v2022_05_01.models import AzureDataLakeGen2Datastore as RestAzureDataLakeGen2Datastore
13-
from azure.ai.ml._restclient.v2022_05_01.models import AzureFileDatastore as RestAzureFileDatastore
14-
from azure.ai.ml._restclient.v2022_05_01.models import DatastoreData, DatastoreType
11+
from azure.ai.ml._restclient.v2022_10_01.models import AzureBlobDatastore as RestAzureBlobDatastore
12+
from azure.ai.ml._restclient.v2022_10_01.models import AzureDataLakeGen2Datastore as RestAzureDataLakeGen2Datastore
13+
from azure.ai.ml._restclient.v2022_10_01.models import AzureFileDatastore as RestAzureFileDatastore
14+
from azure.ai.ml._restclient.v2022_10_01.models import Datastore as DatastoreData, DatastoreType
1515
from azure.ai.ml._schema._datastore import AzureBlobSchema, AzureDataLakeGen2Schema, AzureFileSchema
1616
from azure.ai.ml.constants._common import BASE_PATH_CONTEXT_KEY, TYPE
1717
from azure.ai.ml.entities._credentials import (

‎sdk/ml/azure-ai-ml/azure/ai/ml/entities/_datastore/datastore.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from pathlib import Path
1010
from typing import IO, Any, AnyStr, Dict, Optional, Union
1111

12-
from azure.ai.ml._restclient.v2022_05_01.models import DatastoreData, DatastoreType
12+
from azure.ai.ml._restclient.v2022_10_01.models import Datastore as DatastoreData, DatastoreType
1313
from azure.ai.ml._utils.utils import camel_to_snake, dump_yaml_to_file
1414
from azure.ai.ml.constants._common import BASE_PATH_CONTEXT_KEY, PARAMS_OVERRIDE_KEY, CommonYamlFields
1515
from azure.ai.ml.entities._credentials import NoneCredentialConfiguration

0 commit comments

Comments
 (0)