Batch endpoint to october api (#33649)

Author: nemanjarajic

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

@@ -542,7 +542,7 @@ def __init__(
         self._batch_deployments = BatchDeploymentOperations(
             self._operation_scope,
             self._operation_config,
-            self._service_client_05_2022,
+            self._service_client_10_2023,
             self._operation_container,
             credentials=self._credential,
             requests_pipeline=self._requests_pipeline,

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_endpoint/batch_endpoint.py

@@ -7,8 +7,8 @@
 from pathlib import Path
 from typing import IO, Any, AnyStr, Dict, Optional, Union
 
-from azure.ai.ml._restclient.v2022_05_01.models import BatchEndpointData
-from azure.ai.ml._restclient.v2022_05_01.models import BatchEndpointDetails as RestBatchEndpoint
+from azure.ai.ml._restclient.v2023_10_01.models import BatchEndpoint as BatchEndpointData
+from azure.ai.ml._restclient.v2023_10_01.models import BatchEndpointProperties as RestBatchEndpoint
 from azure.ai.ml._schema._endpoint import BatchEndpointSchema
 from azure.ai.ml._utils.utils import camel_to_snake, snake_to_camel
 from azure.ai.ml.constants._common import AAD_TOKEN_YAML, BASE_PATH_CONTEXT_KEY, PARAMS_OVERRIDE_KEY

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

@@ -17,7 +17,7 @@
 from azure.ai.ml._azure_environments import _get_aml_resource_id_from_metadata, _resource_to_scopes
 from azure.ai.ml._exception_helper import log_and_raise_error
 from azure.ai.ml._restclient.v2020_09_01_dataplanepreview.models import BatchJobResource
-from azure.ai.ml._restclient.v2022_05_01 import AzureMachineLearningWorkspaces as ServiceClient052022
+from azure.ai.ml._restclient.v2023_10_01 import AzureMachineLearningServices as ServiceClient102023
 from azure.ai.ml._schema._deployment.batch.batch_job import BatchJobSchema
 from azure.ai.ml._scope_dependent_operations import (
     OperationConfig,
@@ -78,9 +78,9 @@ class BatchEndpointOperations(_ScopeDependentOperations):
     :type operation_scope: ~azure.ai.ml._scope_dependent_operations.OperationScope
     :param operation_config: Common configuration for operations classes of an MLClient object.
     :type operation_config: ~azure.ai.ml._scope_dependent_operations.OperationConfig
-    :param service_client_05_2022: Service client to allow end users to operate on Azure Machine Learning Workspace
+    :param service_client_10_2023: Service client to allow end users to operate on Azure Machine Learning Workspace
         resources.
-    :type service_client_05_2022: ~azure.ai.ml._restclient.v2022_05_01._azure_machine_learning_workspaces.
+    :type service_client_10_2023: ~azure.ai.ml._restclient.v2023_10_01._azure_machine_learning_workspaces.
         AzureMachineLearningWorkspaces
     :param all_operations: All operations classes of an MLClient object.
     :type all_operations: ~azure.ai.ml._scope_dependent_operations.OperationsContainer
@@ -92,15 +92,15 @@ def __init__(
         self,
         operation_scope: OperationScope,
         operation_config: OperationConfig,
-        service_client_05_2022: ServiceClient052022,
+        service_client_10_2023: ServiceClient102023,
         all_operations: OperationsContainer,
         credentials: Optional[TokenCredential] = None,
         **kwargs: Any,
     ):
         super(BatchEndpointOperations, self).__init__(operation_scope, operation_config)
         ops_logger.update_info(kwargs)
-        self._batch_operation = service_client_05_2022.batch_endpoints
-        self._batch_deployment_operation = service_client_05_2022.batch_deployments
+        self._batch_operation = service_client_10_2023.batch_endpoints
+        self._batch_deployment_operation = service_client_10_2023.batch_deployments
         self._batch_job_endpoint = kwargs.pop("service_client_09_2020_dataplanepreview").batch_job_endpoint
         self._all_operations = all_operations
         self._credentials = credentials

sdk/ml/azure-ai-ml/tests/batch_services/unittests/test_batch_endpoints.py

@@ -8,8 +8,8 @@
 from requests import Response
 
 from azure.ai.ml import load_batch_endpoint
-from azure.ai.ml._restclient.v2022_05_01.models import BatchEndpointData
-from azure.ai.ml._restclient.v2022_05_01.models import BatchEndpointDetails as RestBatchEndpoint
+from azure.ai.ml._restclient.v2023_10_01.models import BatchEndpoint as BatchEndpointData
+from azure.ai.ml._restclient.v2023_10_01.models import BatchEndpointProperties as RestBatchEndpoint
 from azure.ai.ml._scope_dependent_operations import OperationConfig, OperationScope
 from azure.ai.ml.constants._common import AssetTypes, AzureMLResourceType
 from azure.ai.ml.constants._endpoint import EndpointYamlFields
@@ -138,7 +138,7 @@ def mock_local_endpoint_helper() -> Mock:
 def mock_batch_endpoint_operations(
     mock_workspace_scope: OperationScope,
     mock_operation_config: OperationConfig,
-    mock_aml_services_2022_05_01: Mock,
+    mock_aml_services_2023_10_01: Mock,
     mock_aml_services_2020_09_01_dataplanepreview: Mock,
     mock_machinelearning_client: Mock,
     mock_environment_operations: Mock,
@@ -158,7 +158,7 @@ def mock_batch_endpoint_operations(
     yield BatchEndpointOperations(
         operation_scope=mock_workspace_scope,
         operation_config=mock_operation_config,
-        service_client_05_2022=mock_aml_services_2022_05_01,
+        service_client_10_2023=mock_aml_services_2023_10_01,
         all_operations=mock_machinelearning_client._operation_container,
         requests_pipeline=mock_machinelearning_client._requests_pipeline,
         **kwargs,
@@ -310,10 +310,10 @@ def test_list_deployment_jobs(
     def test_batch_get(
         self,
         mock_batch_endpoint_operations: BatchEndpointOperations,
-        mock_aml_services_2022_05_01: Mock,
+        mock_aml_services_2023_10_01: Mock,
     ) -> None:
         random_name = "random_name"
-        mock_aml_services_2022_05_01.batch_endpoints.get.return_value = BatchEndpointData(
+        mock_aml_services_2023_10_01.batch_endpoints.get.return_value = BatchEndpointData(
             name=random_name,
             location="eastus",
             properties=RestBatchEndpoint(auth_mode="AADToken"),
@@ -324,11 +324,11 @@ def test_batch_get(
     def test_delete_batch_endpoint(
         self,
         mock_batch_endpoint_operations: BatchEndpointOperations,
-        mock_aml_services_2022_05_01: Mock,
+        mock_aml_services_2023_10_01: Mock,
         mocker: MockFixture,
         mock_delete_poller: LROPoller,
     ) -> None:
         random_name = "random_name"
-        mock_aml_services_2022_05_01.batch_endpoints.begin_delete.return_value = mock_delete_poller
+        mock_aml_services_2023_10_01.batch_endpoints.begin_delete.return_value = mock_delete_poller
         mock_batch_endpoint_operations.begin_delete(name=random_name)
         mock_batch_endpoint_operations._batch_operation.begin_delete.assert_called_once()