Create MLConfig from passed argument (#2532)

* Create MLConfig from passed argument * use default cred --------- Co-authored-by: grajguru <[email protected]>
Azure · Aug 4, 2023 · ea919fd · ea919fd
1 parent 1384c93
commit ea919fd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 40 deletions.
diff --git a/...ion-models/system/finetune/image-classification/multiclass-classification/prepare_data.py b/...ion-models/system/finetune/image-classification/multiclass-classification/prepare_data.py
@@ -5,7 +5,7 @@
 import urllib
 from zipfile import ZipFile
 
-from azure.identity import InteractiveBrowserCredential
+from azure.identity import DefaultAzureCredential
 from azure.ai.ml import MLClient
 from azure.ai.ml.entities import Data
 from azure.ai.ml.constants import AssetTypes
@@ -150,16 +150,12 @@ def read_image(image_path):
     args, unknown = parser.parse_known_args()
     args_dict = vars(args)
 
-    credential = InteractiveBrowserCredential()
+    credential = DefaultAzureCredential()
     ml_client = None
-    try:
-        ml_client = MLClient.from_config(credential)
-    except Exception as ex:
-        # Enter details of your AML workspace
-        subscription_id = args.subscription
-        resource_group = args.group
-        workspace = args.workspace
-        ml_client = MLClient(credential, subscription_id, resource_group, workspace)
+    subscription_id = args.subscription
+    resource_group = args.group
+    workspace = args.workspace
+    ml_client = MLClient(credential, subscription_id, resource_group, workspace)
 
     upload_data_and_create_jsonl_mltable_files(ml_client=ml_client, dataset_parent_dir=args.data_path)
 

diff --git a/...ion-models/system/finetune/image-classification/multilabel-classification/prepare_data.py b/...ion-models/system/finetune/image-classification/multilabel-classification/prepare_data.py
@@ -5,7 +5,7 @@
 import urllib
 from zipfile import ZipFile
 
-from azure.identity import InteractiveBrowserCredential
+from azure.identity import DefaultAzureCredential
 from azure.ai.ml import MLClient
 from azure.ai.ml.entities import Data
 from azure.ai.ml.constants import AssetTypes
@@ -155,16 +155,12 @@ def read_image(image_path):
     args, unknown = parser.parse_known_args()
     args_dict = vars(args)
 
-    credential = InteractiveBrowserCredential()
+    credential = DefaultAzureCredential()
     ml_client = None
-    try:
-        ml_client = MLClient.from_config(credential)
-    except Exception as ex:
-        # Enter details of your AML workspace
-        subscription_id = args.subscription
-        resource_group = args.group
-        workspace = args.workspace
-        ml_client = MLClient(credential, subscription_id, resource_group, workspace)
+    subscription_id = args.subscription
+    resource_group = args.group
+    workspace = args.workspace
+    ml_client = MLClient(credential, subscription_id, resource_group, workspace)
 
     upload_data_and_create_jsonl_mltable_files(ml_client=ml_client, dataset_parent_dir=args.data_path)
 

diff --git a/cli/foundation-models/system/finetune/image-instance-segmentation/prepare_data.py b/cli/foundation-models/system/finetune/image-instance-segmentation/prepare_data.py
@@ -9,7 +9,7 @@
 
 from zipfile import ZipFile
 
-from azure.identity import InteractiveBrowserCredential
+from azure.identity import DefaultAzureCredential
 from azure.ai.ml import MLClient
 from azure.ai.ml.entities import Data
 from azure.ai.ml.constants import AssetTypes
@@ -258,16 +258,12 @@ def read_image(image_path: str):
     args, unknown = parser.parse_known_args()
     args_dict = vars(args)
 
-    credential = InteractiveBrowserCredential()
+    credential = DefaultAzureCredential()
     ml_client = None
-    try:
-        ml_client = MLClient.from_config(credential)
-    except Exception as ex:
-        # Enter details of your AML workspace
-        subscription_id = args.subscription
-        resource_group = args.group
-        workspace = args.workspace
-        ml_client = MLClient(credential, subscription_id, resource_group, workspace)
+    subscription_id = args.subscription
+    resource_group = args.group
+    workspace = args.workspace
+    ml_client = MLClient(credential, subscription_id, resource_group, workspace)
 
     upload_data_and_create_jsonl_mltable_files(
         ml_client=ml_client, dataset_parent_dir=args.data_path

diff --git a/cli/foundation-models/system/finetune/image-object-detection/prepare_data.py b/cli/foundation-models/system/finetune/image-object-detection/prepare_data.py
@@ -7,7 +7,7 @@
 
 from zipfile import ZipFile
 
-from azure.identity import InteractiveBrowserCredential
+from azure.identity import DefaultAzureCredential
 from azure.ai.ml import MLClient
 from azure.ai.ml.entities import Data
 from azure.ai.ml.constants import AssetTypes
@@ -223,16 +223,12 @@ def read_image(image_path: str):
     args, unknown = parser.parse_known_args()
     args_dict = vars(args)
 
-    credential = InteractiveBrowserCredential()
+    credential = DefaultAzureCredential()
     ml_client = None
-    try:
-        ml_client = MLClient.from_config(credential)
-    except Exception as ex:
-        # Enter details of your AML workspace
-        subscription_id = args.subscription
-        resource_group = args.group
-        workspace = args.workspace
-        ml_client = MLClient(credential, subscription_id, resource_group, workspace)
+    subscription_id = args.subscription
+    resource_group = args.group
+    workspace = args.workspace
+    ml_client = MLClient(credential, subscription_id, resource_group, workspace)
 
     upload_data_and_create_jsonl_mltable_files(
         ml_client=ml_client, dataset_parent_dir=args.data_path