Skip to content

Commit 31688d9

Browse files
authored
auto ml job serialization failure fix (#37043)
* fixing sweep job service response parsing issue * fixing sweep job service response parsing issue * raising a work around for cmd job and spark job name lowering case * fixing black issue * fixing serialization issue in sweep job * include black fix * found and fix the issue in compute validation * fixing a corrupt wokspace arm template * fixing the failed test case * updating the date for 1.18.0 release * removing empty section * adding in progress version details * adding IDC code reviewers * correcting the directory path * lint fix * adding change log entry * addressing review comment * fixing ut * addressing api review comment * adding a fix for subnet validation in compute instance * my py fix * fixing autoML serialization issue * formatting * moving auto ML job create API to 2024
1 parent fa65742 commit 31688d9

15 files changed

+33
-31
lines changed

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/automl_job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from abc import ABC, abstractmethod
99
from typing import Any, Dict, Optional, Union
1010

11-
from azure.ai.ml._restclient.v2023_04_01_preview.models import (
11+
from azure.ai.ml._restclient.v2024_01_01_preview.models import (
1212
JobBase,
1313
MLTableJobInput,
1414
QueueSettings,

sdk/ml/azure-ai-ml/azure/ai/ml/operations/_job_operations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,8 @@ def _create_or_update_with_different_version_api( # pylint: disable=name-too-lo
725725
service_client_operation = self.service_client_01_2024_preview.jobs
726726
if rest_job_resource.properties.job_type == RestJobType.PIPELINE:
727727
service_client_operation = self.service_client_01_2024_preview.jobs
728-
728+
if rest_job_resource.properties.job_type == RestJobType.AUTO_ML:
729+
service_client_operation = self.service_client_01_2024_preview.jobs
729730
if rest_job_resource.properties.job_type == RestJobType.SWEEP:
730731
service_client_operation = self.service_client_01_2024_preview.jobs
731732

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_image_classification.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import pytest
66

77
from azure.ai.ml import UserIdentityConfiguration
8-
from azure.ai.ml._restclient.v2023_04_01_preview.models import (
8+
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
9+
from azure.ai.ml._restclient.v2024_01_01_preview.models import (
910
ClassificationPrimaryMetrics,
1011
LearningRateScheduler,
1112
MLTableJobInput,
1213
SamplingAlgorithmType,
1314
StochasticOptimizer,
1415
)
15-
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
1616
from azure.ai.ml.automl import image_classification
1717
from azure.ai.ml.constants._common import AssetTypes
1818
from azure.ai.ml.entities._inputs_outputs import Input

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_image_classification_multilabel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import pytest
66

77
from azure.ai.ml import UserIdentityConfiguration
8-
from azure.ai.ml._restclient.v2023_04_01_preview.models import (
8+
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
9+
from azure.ai.ml._restclient.v2024_01_01_preview.models import (
910
ClassificationMultilabelPrimaryMetrics,
1011
LearningRateScheduler,
1112
MLTableJobInput,
1213
SamplingAlgorithmType,
1314
StochasticOptimizer,
1415
)
15-
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
1616
from azure.ai.ml.automl import image_classification_multilabel
1717
from azure.ai.ml.constants._common import AssetTypes
1818
from azure.ai.ml.entities._inputs_outputs import Input

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_image_instance_segmentation.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
import pytest
66

77
from azure.ai.ml import UserIdentityConfiguration
8-
from azure.ai.ml._restclient.v2023_04_01_preview.models import (
8+
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
9+
from azure.ai.ml._restclient.v2023_04_01_preview.models import ValidationMetricType
10+
from azure.ai.ml._restclient.v2024_01_01_preview.models import (
911
InstanceSegmentationPrimaryMetrics,
1012
LearningRateScheduler,
13+
LogTrainingMetrics,
14+
LogValidationLoss,
1115
MLTableJobInput,
1216
ModelSize,
1317
SamplingAlgorithmType,
1418
StochasticOptimizer,
15-
LogTrainingMetrics,
16-
LogValidationLoss,
1719
)
18-
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
19-
from azure.ai.ml._restclient.v2023_04_01_preview.models import ValidationMetricType
2020
from azure.ai.ml.automl import image_instance_segmentation
2121
from azure.ai.ml.constants._common import AssetTypes
2222
from azure.ai.ml.entities._inputs_outputs import Input

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_image_object_detection.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
import pytest
66

77
from azure.ai.ml import UserIdentityConfiguration
8-
from azure.ai.ml._restclient.v2023_04_01_preview.models import (
8+
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
9+
from azure.ai.ml._restclient.v2023_04_01_preview.models import ValidationMetricType
10+
from azure.ai.ml._restclient.v2024_01_01_preview.models import (
911
LearningRateScheduler,
12+
LogTrainingMetrics,
13+
LogValidationLoss,
1014
MLTableJobInput,
1115
ModelSize,
1216
ObjectDetectionPrimaryMetrics,
1317
SamplingAlgorithmType,
1418
StochasticOptimizer,
15-
LogTrainingMetrics,
16-
LogValidationLoss,
1719
)
18-
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
19-
from azure.ai.ml._restclient.v2023_04_01_preview.models import ValidationMetricType
2020
from azure.ai.ml.automl import image_object_detection
2121
from azure.ai.ml.constants._common import AssetTypes
2222
from azure.ai.ml.entities._inputs_outputs import Input

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_image_schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
ImageObjectDetection as RestImageObjectDetection,
4949
)
5050
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import ImageSweepSettings as RestImageSweepSettings
51-
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
51+
from azure.ai.ml._restclient.v2024_01_01_preview.models._models_py3 import (
5252
InstanceSegmentationPrimaryMetrics,
5353
JobBase,
5454
LogVerbosity,

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_nlp_schema.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
from azure.ai.ml import load_job
99
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import AutoMLJob as RestAutoMLJob
1010
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import BanditPolicy as RestBanditPolicy
11-
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
12-
ClassificationPrimaryMetrics,
13-
JobBase,
14-
LogVerbosity,
15-
MLTableJobInput,
16-
)
1711
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import NlpFixedParameters as RestNlpFixedParameters
1812
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
1913
NlpParameterSubspace as RestNlpParameterSubspace,
@@ -30,6 +24,12 @@
3024
TextClassificationMultilabel as RestTextClassificationMultilabel,
3125
)
3226
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import TextNer as RestTextNer
27+
from azure.ai.ml._restclient.v2024_01_01_preview.models._models_py3 import (
28+
ClassificationPrimaryMetrics,
29+
JobBase,
30+
LogVerbosity,
31+
MLTableJobInput,
32+
)
3333
from azure.ai.ml._scope_dependent_operations import OperationScope
3434
from azure.ai.ml._utils.utils import dump_yaml_to_file, load_yaml, to_iso_duration_format_mins
3535
from azure.ai.ml.automl import (

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_tabular_schema.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
2727
ForecastingTrainingSettings as RestForecastingTrainingSettings,
2828
)
29-
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import JobBase, LogVerbosity, MLTableJobInput
3029
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import Regression as RestRegression
3130
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import RegressionPrimaryMetrics
3231
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
@@ -38,6 +37,7 @@
3837
from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
3938
TableVerticalLimitSettings as RestTableVerticalLimitSettings,
4039
)
40+
from azure.ai.ml._restclient.v2024_01_01_preview.models._models_py3 import JobBase, LogVerbosity, MLTableJobInput
4141
from azure.ai.ml._schema.automl.table_vertical.regression import AutoMLRegressionSchema
4242
from azure.ai.ml._scope_dependent_operations import OperationScope
4343
from azure.ai.ml._utils.utils import camel_to_snake, to_iso_duration_format_mins
@@ -47,11 +47,11 @@
4747
from azure.ai.ml.entities import Job
4848
from azure.ai.ml.entities._inputs_outputs import Input
4949
from azure.ai.ml.entities._job.automl.automl_job import AutoMLJob
50-
from azure.ai.ml.exceptions import ValidationException
5150
from azure.ai.ml.entities._job.automl.tabular.featurization_settings import TabularFeaturizationSettings
5251
from azure.ai.ml.entities._job.automl.tabular.forecasting_settings import ForecastingSettings
5352
from azure.ai.ml.entities._job.automl.tabular.limit_settings import TabularLimitSettings
5453
from azure.ai.ml.entities._job.automl.training_settings import TrainingSettings
54+
from azure.ai.ml.exceptions import ValidationException
5555

5656

5757
@pytest.fixture(autouse=True)

sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_classification_job.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
import pytest
77

88
from azure.ai.ml import UserIdentityConfiguration
9-
from azure.ai.ml._restclient.v2023_04_01_preview.models import CustomNCrossValidations, MLTableJobInput
9+
from azure.ai.ml._restclient.v2023_04_01_preview.models import CustomNCrossValidations
1010
from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
11+
from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput
1112
from azure.ai.ml.automl import ClassificationModels, ClassificationPrimaryMetrics, classification
1213
from azure.ai.ml.constants import TabularTrainingMode
1314
from azure.ai.ml.constants._common import AssetTypes

0 commit comments

Comments
 (0)