[ML] Adding validations not to allow both workspace_name and registry_name together in ml_client (#26562)

Author: banibrata-de

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

@@ -155,6 +155,14 @@ def __init__(
 
         if credential is None:
             raise ValueError("credential can not be None")
+
+        if registry_name and workspace_name:
+            raise ValidationException(
+            message="Both workspace_name and registry_name cannot be used together, for the ml_client.",
+            no_personal_data_message="Both workspace_name and registry_name are used for ml_client.",
+            target=ErrorTarget.GENERAL,
+            error_category=ErrorCategory.USER_ERROR,
+        )
         if not registry_name:
             _validate_missing_sub_or_rg_and_raise(subscription_id, resource_group_name)
         self._credential = credential

sdk/ml/azure-ai-ml/tests/conftest.py

@@ -243,7 +243,6 @@ def registry_client(e2e_ws_scope: OperationScope, auth: ClientSecretCredential)
         credential=auth,
         subscription_id=e2e_ws_scope.subscription_id,
         resource_group_name=e2e_ws_scope.resource_group_name,
-        workspace_name=e2e_ws_scope.workspace_name,
         logging_enable=getenv(E2E_TEST_LOGGING_ENABLED),
         registry_name="testFeed",
     )
@@ -254,8 +253,6 @@ def only_registry_client(e2e_ws_scope: OperationScope, auth: ClientSecretCredent
     """return a machine learning client using default e2e testing workspace"""
     return MLClient(
         credential=auth,
-        subscription_id=e2e_ws_scope.subscription_id,
-        resource_group_name=e2e_ws_scope.resource_group_name,
         logging_enable=getenv(E2E_TEST_LOGGING_ENABLED),
         registry_name="testFeed",
     )

sdk/ml/azure-ai-ml/tests/internal_utils/unittests/test_ml_client.py

@@ -448,3 +448,16 @@ def test_ml_client_with_no_rg_sub_for_ws_throws(
             message
             == "Both subscription id and resource group are required for this operation, missing subscription id and resource group"
         )
+
+    def test_ml_client_with_both_workspace_registry_names_throws(self, e2e_ws_scope: OperationScope, auth: ClientSecretCredential) -> None:	
+        with pytest.raises(ValidationException) as exception:	
+            MLClient(	
+                credential=auth,	
+                workspace_name=e2e_ws_scope.workspace_name,	
+                registry_name="testfeed",	
+            )	
+        message = exception.value.args[0]	
+        assert (	
+            message	
+            == "Both workspace_name and registry_name cannot be used together, for the ml_client."	
+        )