Automl fix (#37745)

achauhan-scc · web-flow · commit 82983c4d6387 · 2024-10-08T11:15:49.000+05:30
AutoML job serialization.
diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/nlp/text_classification_job.py b/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/nlp/text_classification_job.py
@@ -8,10 +8,10 @@
 
 from azure.ai.ml._restclient.v2023_04_01_preview.models import AutoMLJob as RestAutoMLJob
 from azure.ai.ml._restclient.v2023_04_01_preview.models import JobBase, TaskType
-from azure.ai.ml._restclient.v2023_04_01_preview.models import TextClassification as RestTextClassification
 from azure.ai.ml._restclient.v2023_04_01_preview.models._azure_machine_learning_workspaces_enums import (
     ClassificationPrimaryMetrics,
 )
+from azure.ai.ml._restclient.v2024_01_01_preview.models import TextClassification as RestTextClassification
 from azure.ai.ml._utils.utils import camel_to_snake, is_data_binding_expression
 from azure.ai.ml.constants._common import BASE_PATH_CONTEXT_KEY
 from azure.ai.ml.constants._job.automl import AutoMLConstants
diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/nlp/text_classification_multilabel_job.py b/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/nlp/text_classification_multilabel_job.py
@@ -8,7 +8,7 @@
 
 from azure.ai.ml._restclient.v2023_04_01_preview.models import AutoMLJob as RestAutoMLJob
 from azure.ai.ml._restclient.v2023_04_01_preview.models import ClassificationMultilabelPrimaryMetrics, JobBase, TaskType
-from azure.ai.ml._restclient.v2023_04_01_preview.models import (
+from azure.ai.ml._restclient.v2024_01_01_preview.models import (
     TextClassificationMultilabel as RestTextClassificationMultilabel,
 )
 from azure.ai.ml._utils.utils import camel_to_snake, is_data_binding_expression
diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/nlp/text_ner_job.py b/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/nlp/text_ner_job.py
@@ -8,10 +8,10 @@
 
 from azure.ai.ml._restclient.v2023_04_01_preview.models import AutoMLJob as RestAutoMLJob
 from azure.ai.ml._restclient.v2023_04_01_preview.models import JobBase, TaskType
-from azure.ai.ml._restclient.v2023_04_01_preview.models import TextNer as RestTextNER
 from azure.ai.ml._restclient.v2023_04_01_preview.models._azure_machine_learning_workspaces_enums import (
     ClassificationPrimaryMetrics,
 )
+from azure.ai.ml._restclient.v2024_01_01_preview.models import TextNer as RestTextNER
 from azure.ai.ml._utils.utils import camel_to_snake, is_data_binding_expression
 from azure.ai.ml.constants._common import BASE_PATH_CONTEXT_KEY
 from azure.ai.ml.constants._job.automl import AutoMLConstants
diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/tabular/automl_tabular.py b/sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/tabular/automl_tabular.py
@@ -7,7 +7,7 @@
 from abc import ABC
 from typing import Any, Dict, List, Optional, Union
 
-from azure.ai.ml._restclient.v2023_04_01_preview.models import (
+from azure.ai.ml._restclient.v2024_01_01_preview.models import (
     AutoNCrossValidations,
     BlockedTransformers,
     CustomNCrossValidations,
diff --git a/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_nlp_schema.py b/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_nlp_schema.py
@@ -19,7 +19,6 @@
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
     NlpVerticalLimitSettings as RestNlpVerticalLimitSettings,
 )
-from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import TextClassification as RestTextClassification
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
     TextClassificationMultilabel as RestTextClassificationMultilabel,
 )
@@ -30,6 +29,7 @@
     LogVerbosity,
     MLTableJobInput,
 )
+from azure.ai.ml._restclient.v2024_01_01_preview.models._models_py3 import TextClassification as RestTextClassification
 from azure.ai.ml._scope_dependent_operations import OperationScope
 from azure.ai.ml._utils.utils import dump_yaml_to_file, load_yaml, to_iso_duration_format_mins
 from azure.ai.ml.automl import (
diff --git a/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_tabular_schema.py b/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_automl_tabular_schema.py
@@ -10,14 +10,12 @@
 
 from azure.ai.ml import load_job
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import AutoMLJob as RestAutoMLJob
-from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import AutoNCrossValidations
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import Classification as RestClassification
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import ClassificationPrimaryMetrics
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
     ClassificationTrainingSettings as RestClassificationTrainingSettings,
 )
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import ColumnTransformer as RestColumnTransformer
-from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import CustomNCrossValidations
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import Forecasting as RestForecasting
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import ForecastingPrimaryMetrics
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
@@ -37,7 +35,13 @@
 from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (
     TableVerticalLimitSettings as RestTableVerticalLimitSettings,
 )
-from azure.ai.ml._restclient.v2024_01_01_preview.models._models_py3 import JobBase, LogVerbosity, MLTableJobInput
+from azure.ai.ml._restclient.v2024_01_01_preview.models._models_py3 import (
+    AutoNCrossValidations,
+    CustomNCrossValidations,
+    JobBase,
+    LogVerbosity,
+    MLTableJobInput,
+)
 from azure.ai.ml._schema.automl.table_vertical.regression import AutoMLRegressionSchema
 from azure.ai.ml._scope_dependent_operations import OperationScope
 from azure.ai.ml._utils.utils import camel_to_snake, to_iso_duration_format_mins
diff --git a/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_classification_job.py b/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_classification_job.py
@@ -6,9 +6,8 @@
 import pytest
 
 from azure.ai.ml import UserIdentityConfiguration
-from azure.ai.ml._restclient.v2023_04_01_preview.models import CustomNCrossValidations
 from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
-from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput
+from azure.ai.ml._restclient.v2024_01_01_preview.models import CustomNCrossValidations, MLTableJobInput
 from azure.ai.ml.automl import ClassificationModels, ClassificationPrimaryMetrics, classification
 from azure.ai.ml.constants import TabularTrainingMode
 from azure.ai.ml.constants._common import AssetTypes
diff --git a/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_tabular_n_cross_validation_settings.py b/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_tabular_n_cross_validation_settings.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from azure.ai.ml._restclient.v2023_04_01_preview.models import AutoNCrossValidations, CustomNCrossValidations, JobBase
+from azure.ai.ml._restclient.v2024_01_01_preview.models import AutoNCrossValidations, CustomNCrossValidations, JobBase
 from azure.ai.ml.automl import classification, forecasting, regression
 from azure.ai.ml.constants._common import AssetTypes
 from azure.ai.ml.entities._inputs_outputs import Input
diff --git a/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_text_classification_job.py b/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_text_classification_job.py
@@ -12,12 +12,11 @@
     NlpVerticalFeaturizationSettings,
     NlpVerticalLimitSettings,
     SamplingAlgorithmType,
-    TextClassification,
 )
 from azure.ai.ml._restclient.v2023_04_01_preview.models._azure_machine_learning_workspaces_enums import (
     ClassificationPrimaryMetrics,
 )
-from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput
+from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput, TextClassification
 from azure.ai.ml._utils.utils import to_iso_duration_format_mins
 from azure.ai.ml.automl import text_classification
 from azure.ai.ml.constants._common import AssetTypes
diff --git a/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_text_classification_multilabel_job.py b/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_text_classification_multilabel_job.py
@@ -14,13 +14,12 @@
     NlpVerticalFeaturizationSettings,
     NlpVerticalLimitSettings,
     SamplingAlgorithmType,
-    TextClassificationMultilabel,
 )
 from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
 from azure.ai.ml._restclient.v2023_04_01_preview.models._azure_machine_learning_workspaces_enums import (
     ClassificationPrimaryMetrics,
 )
-from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput
+from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput, TextClassificationMultilabel
 from azure.ai.ml._utils.utils import to_iso_duration_format_mins
 from azure.ai.ml.automl import text_classification_multilabel
 from azure.ai.ml.constants._common import AssetTypes
diff --git a/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_text_ner_job.py b/sdk/ml/azure-ai-ml/tests/automl_job/unittests/test_text_ner_job.py
@@ -13,13 +13,12 @@
     NlpVerticalLimitSettings,
     SamplingAlgorithmType,
     TaskType,
-    TextNer,
 )
 from azure.ai.ml._restclient.v2023_04_01_preview.models import UserIdentity as RestUserIdentity
 from azure.ai.ml._restclient.v2023_04_01_preview.models._azure_machine_learning_workspaces_enums import (
     ClassificationPrimaryMetrics,
 )
-from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput
+from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput, TextNer
 from azure.ai.ml._utils.utils import to_iso_duration_format_mins
 from azure.ai.ml.automl import text_ner
 from azure.ai.ml.constants._common import AssetTypes

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`from azure.ai.ml._restclient.v2023_04_01_preview.models import AutoMLJob as RestAutoMLJob`
`10`	`10`	`from azure.ai.ml._restclient.v2023_04_01_preview.models import ClassificationMultilabelPrimaryMetrics, JobBase, TaskType`
`11`		`-from azure.ai.ml._restclient.v2023_04_01_preview.models import (`
	`11`	`+from azure.ai.ml._restclient.v2024_01_01_preview.models import (`
`12`	`12`	`TextClassificationMultilabel as RestTextClassificationMultilabel,`
`13`	`13`	`)`
`14`	`14`	`from azure.ai.ml._utils.utils import camel_to_snake, is_data_binding_expression`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (`
`20`	`20`	`NlpVerticalLimitSettings as RestNlpVerticalLimitSettings,`
`21`	`21`	`)`
`22`		`-from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import TextClassification as RestTextClassification`
`23`	`22`	`from azure.ai.ml._restclient.v2023_04_01_preview.models._models_py3 import (`
`24`	`23`	`TextClassificationMultilabel as RestTextClassificationMultilabel,`
`25`	`24`	`)`
`@@ -30,6 +29,7 @@`
`30`	`29`	`LogVerbosity,`
`31`	`30`	`MLTableJobInput,`
`32`	`31`	`)`
	`32`	`+from azure.ai.ml._restclient.v2024_01_01_preview.models._models_py3 import TextClassification as RestTextClassification`
`33`	`33`	`from azure.ai.ml._scope_dependent_operations import OperationScope`
`34`	`34`	`from azure.ai.ml._utils.utils import dump_yaml_to_file, load_yaml, to_iso_duration_format_mins`
`35`	`35`	`from azure.ai.ml.automl import (`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,11 @@`
`12`	`12`	`NlpVerticalFeaturizationSettings,`
`13`	`13`	`NlpVerticalLimitSettings,`
`14`	`14`	`SamplingAlgorithmType,`
`15`		`- TextClassification,`
`16`	`15`	`)`
`17`	`16`	`from azure.ai.ml._restclient.v2023_04_01_preview.models._azure_machine_learning_workspaces_enums import (`
`18`	`17`	`ClassificationPrimaryMetrics,`
`19`	`18`	`)`
`20`		`-from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput`
	`19`	`+from azure.ai.ml._restclient.v2024_01_01_preview.models import MLTableJobInput, TextClassification`
`21`	`20`	`from azure.ai.ml._utils.utils import to_iso_duration_format_mins`
`22`	`21`	`from azure.ai.ml.automl import text_classification`
`23`	`22`	`from azure.ai.ml.constants._common import AssetTypes`