[ML][Pipelines] Bugfix: component version auto increment under non-registry create operation (Azure#28367)

* partly revert component create operation to fix component version auto increment bug for non-registry scenario

* re-enable skip test and update recording

* revert test code changes for breaking unit tests

* update recordings for breaking end-to-end tests

* not apply auto increment version for anonymous component

* update recordings for breaking tests

* update recordings for breaking tests

Author: zhengfeiwang

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

@@ -29,6 +29,7 @@
 # )
 from azure.ai.ml._utils._asset_utils import (
     _archive_or_restore,
+    _create_or_update_autoincrement,
     _get_latest,
     _get_next_version_from_container,
     _resolve_label_to_asset,
@@ -295,7 +296,11 @@ def create_or_update(
             component = _refine_component(component)
         if version is not None:
             component.version = version
-        if not component.version and component._auto_increment_version:
+        # In non-registry scenario, if component does not have version, no need to get next version here.
+        # As Component property version has setter that updates `_auto_increment_version` in-place, then
+        # a component will get a version after its creation, and it will always use this version in its
+        # future creation operations, which breaks version auto increment mechanism.
+        if self._registry_name and not component.version and component._auto_increment_version:
             component.version = _get_next_version_from_container(
                 name=component.name,
                 container_operation=self._container_operation,
@@ -340,14 +345,27 @@ def create_or_update(
                 polling_wait(poller=poller, start_time=start_time, message=message, timeout=None)
 
             else:
-                result = self._version_operation.create_or_update(
-                    name=name,
-                    version=version,
-                    resource_group_name=self._resource_group_name,
-                    workspace_name=self._workspace_name,
-                    body=rest_component_resource,
-                    **self._init_args,
-                )
+                # _auto_increment_version can be True for non-registry component creation operation;
+                # and anonymous component should use hash as version
+                if not component._is_anonymous and component._auto_increment_version:
+                    result = _create_or_update_autoincrement(
+                        name=name,
+                        body=rest_component_resource,
+                        version_operation=self._version_operation,
+                        container_operation=self._container_operation,
+                        resource_group_name=self._operation_scope.resource_group_name,
+                        workspace_name=self._workspace_name,
+                        **self._init_args,
+                    )
+                else:
+                    result = self._version_operation.create_or_update(
+                        name=name,
+                        version=version,
+                        resource_group_name=self._resource_group_name,
+                        workspace_name=self._workspace_name,
+                        body=rest_component_resource,
+                        **self._init_args,
+                    )
         except Exception as e:
             raise e
 

sdk/ml/azure-ai-ml/tests/component/e2etests/test_component.py

@@ -511,9 +511,6 @@ def test_tensorflow_component(
         tensorflow_component_resource = client.components.create_or_update(component_entity)
         assert tensorflow_component_resource.distribution.__dict__ == tensorflow_distribution(has_strs=True)
 
-    @pytest.mark.skip(
-        "Could not rerecord the test , errors: (UserError) Failed to update component test_81585734883"
-    )
     def test_command_component_create_autoincrement(self, client: MLClient, randstr: Callable[[str], str]) -> None:
         component_name = randstr("component_name")
         params_override = [{"name": component_name}]

sdk/ml/azure-ai-ml/tests/component/unittests/test_component_operations.py

@@ -80,15 +80,13 @@ def test_create_autoincrement(self, mock_component_operation: ComponentOperation
         assert component._auto_increment_version
         with patch.object(ComponentOperations, "_resolve_arm_id_or_upload_dependencies") as mock_thing, patch(
             "azure.ai.ml.operations._component_operations.Component._from_rest_object", return_value=component
-        ) , patch(
-            "azure.ai.ml.operations._component_operations._get_next_version_from_container", return_value="version"
-        ) as mock_nextver:
+        ):
             mock_component_operation.create_or_update(component)
-            mock_nextver.assert_called_once()
+            mock_thing.assert_called_once()
 
         mock_component_operation._version_operation.create_or_update.assert_called_once_with(
             name=component.name,
-            version=mock_nextver.return_value,
+            version=mock_component_operation._container_operation.get().properties.next_version,
             body=component._to_rest_object(),
             resource_group_name=mock_component_operation._operation_scope.resource_group_name,
             workspace_name=mock_component_operation._operation_scope.workspace_name,

sdk/ml/azure-ai-ml/tests/component/unittests/test_parallel_component_operations.py

@@ -83,16 +83,20 @@ def test_create_autoincrement(
         )
         assert component._auto_increment_version
         with patch.object(ComponentOperations, "_resolve_arm_id_or_upload_dependencies") as mock_thing, patch(
-            "azure.ai.ml.operations._component_operations.Component._from_rest_object", return_value=component
-        ) , patch(
-            "azure.ai.ml.operations._component_operations._get_next_version_from_container", return_value="version"
-        ) as mock_nextver:
+                "azure.ai.ml.operations._component_operations.Component._from_rest_object",
+                return_value=component,
+        ):
             mock_component_operation.create_or_update(component)
-            mock_nextver.assert_called_once()
+            mock_thing.assert_called_once()
 
+        mock_component_operation._container_operation.get.assert_called_once_with(
+            name=component.name,
+            resource_group_name=mock_component_operation._operation_scope.resource_group_name,
+            workspace_name=mock_component_operation._operation_scope.workspace_name,
+        )
         mock_component_operation._version_operation.create_or_update.assert_called_once_with(
             name=component.name,
-            version=mock_nextver.return_value,
+            version=mock_component_operation._container_operation.get().properties.next_version,
             body=component._to_rest_object(),
             resource_group_name=mock_component_operation._operation_scope.resource_group_name,
             workspace_name=mock_component_operation._operation_scope.workspace_name,