Skip to content

Commit 0e8aaff

Browse files
Prevent notebook execution failure by avoiding mlclient private field… (#3327)
* Prevent notebook execution failure by avoiding mlclient private field access warning * Take changes from Kevin's PR for blocking workflows * update notebooks * update flakes * revert failing notebooks * Revert "revert failing notebooks" This reverts commit 14f3163. * restore failing notebook to main commit * Update
1 parent cb3b034 commit 0e8aaff

File tree

14 files changed

+35
-20
lines changed

14 files changed

+35
-20
lines changed

.github/workflows/sdk-jobs-automl-standalone-jobs-automl-forecasting-distributed-tcn-automl-forecasting-distributed-tcn.yml

+8
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ jobs:
6969
source "${{ github.workspace }}/infra/bootstrapping/init_environment.sh";
7070
bash setup.sh
7171
working-directory: cli
72+
- name: Eagerly cache access tokens for required scopes
73+
run: |
74+
# Workaround for azure-cli's lack of support for ID token refresh
75+
# Taken from: https://github.com/Azure/login/issues/372#issuecomment-2056289617
76+
# Management
77+
az account get-access-token --scope https://management.azure.com/.default --output none
78+
# ML
79+
az account get-access-token --scope https://ml.azure.com/.default --output none
7280
continue-on-error: true
7381
- name: Eagerly cache access tokens for required scopes
7482
run: |

sdk/python/jobs/automl-standalone-jobs/automl-classification-task-bankmarketing/automl-classification-task-bankmarketing-serverless.ipynb

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"**Requirements** - In order to benefit from this tutorial, you will need:\n",
1010
"- A basic understanding of Machine Learning\n",
1111
"- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)\n",
12-
"- An Azure ML workspace. [Check this notebook for creating a workspace](../../../resources/workspace/workspace.ipynb) \n",
12+
"- An Azure ML workspace. [Check this notebook for creating a workspace](../../../resources/workspace/workspace.ipynb) \n",
1313
"- A python environment\n",
1414
"- Installed Azure Machine Learning Python SDK v2 - [install instructions](../../../README.md) - check the getting started section\n",
1515
"\n",
@@ -120,7 +120,7 @@
120120
"source": [
121121
"workspace = ml_client.workspaces.get(name=ml_client.workspace_name)\n",
122122
"\n",
123-
"subscription_id = ml_client.connections._subscription_id\n",
123+
"subscription_id = ml_client.subscription_id\n",
124124
"resource_group = workspace.resource_group\n",
125125
"workspace_name = ml_client.workspace_name\n",
126126
"\n",
@@ -230,7 +230,7 @@
230230
"# Create the AutoML classification job with the related factory-function.\n",
231231
"from azure.ai.ml.entities import ResourceConfiguration \n",
232232
"\n",
233-
"classification_job = automl.classification(\n",
233+
"classification_job = automl.classification(\n",
234234
" experiment_name=exp_name,\n",
235235
" training_data=my_training_data_input,\n",
236236
" target_column_name=\"y\",\n",

sdk/python/jobs/automl-standalone-jobs/automl-classification-task-bankmarketing/automl-classification-task-bankmarketing.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"source": [
123123
"workspace = ml_client.workspaces.get(name=ml_client.workspace_name)\n",
124124
"\n",
125-
"subscription_id = ml_client.connections._subscription_id\n",
125+
"subscription_id = ml_client.subscription_id\n",
126126
"resource_group = workspace.resource_group\n",
127127
"workspace_name = ml_client.workspace_name\n",
128128
"\n",

sdk/python/jobs/automl-standalone-jobs/automl-forecasting-distributed-tcn/automl-forecasting-distributed-tcn.ipynb

+13-6
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@
5353
"Make sure you have executed the [configuration](https://github.com/Azure/MachineLearningNotebooks/blob/master/configuration.ipynb) before running this notebook."
5454
]
5555
},
56+
{
57+
"cell_type": "code",
58+
"execution_count": null,
59+
"metadata": {},
60+
"outputs": [],
61+
"source": [
62+
"%pip install azure-ai-ml==1.8.0\n",
63+
"%pip install azure-identity==1.13.0"
64+
]
65+
},
5666
{
5767
"cell_type": "markdown",
5868
"metadata": {},
@@ -162,7 +172,7 @@
162172
"\n",
163173
"output = {}\n",
164174
"output[\"Workspace\"] = ml_client.workspace_name\n",
165-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
175+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
166176
"output[\"Resource Group\"] = ws.resource_group\n",
167177
"output[\"Location\"] = ws.location\n",
168178
"pd.DataFrame(data=output, index=[\"\"]).T"
@@ -673,7 +683,7 @@
673683
"outputs": [],
674684
"source": [
675685
"inference_component = ml_client_registry.components.get(\n",
676-
" name=\"automl_forecasting_inference\", label=\"latest\"\n",
686+
" name=\"automl_forecasting_inference\"\n",
677687
")\n",
678688
"print(f\"Inference component version: {inference_component.version}\\n---\")"
679689
]
@@ -684,10 +694,7 @@
684694
"metadata": {},
685695
"outputs": [],
686696
"source": [
687-
"compute_metrics_component = ml_client_registry.components.get(\n",
688-
" name=\"compute_metrics\",\n",
689-
" version=\"0.0.26\", # label=\"latest\"\n",
690-
")\n",
697+
"compute_metrics_component = ml_client_registry.components.get(name=\"compute_metrics\")\n",
691698
"print(f\"Compute metrics component version: {compute_metrics_component.version}\\n---\")"
692699
]
693700
},

sdk/python/jobs/automl-standalone-jobs/automl-forecasting-github-dau/auto-ml-forecasting-github-dau.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"\n",
139139
"output = {}\n",
140140
"output[\"Workspace\"] = ml_client.workspace_name\n",
141-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
141+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
142142
"output[\"Resource Group\"] = workspace.resource_group\n",
143143
"output[\"Location\"] = workspace.location\n",
144144
"output"

sdk/python/jobs/automl-standalone-jobs/automl-forecasting-orange-juice-sales/automl-forecasting-orange-juice-sales-mlflow.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"\n",
120120
"output = {}\n",
121121
"output[\"Workspace\"] = ml_client.workspace_name\n",
122-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
122+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
123123
"output[\"Resource Group\"] = workspace.resource_group\n",
124124
"output[\"Location\"] = workspace.location\n",
125125
"pd.set_option(\"display.max_colwidth\", None)\n",

sdk/python/jobs/automl-standalone-jobs/automl-forecasting-recipes-univariate/automl-forecasting-recipe-univariate-run.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
"\n",
163163
"output = {}\n",
164164
"output[\"Workspace\"] = ml_client.workspace_name\n",
165-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
165+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
166166
"output[\"Resource Group\"] = workspace.resource_group\n",
167167
"output[\"Location\"] = workspace.location\n",
168168
"output"

sdk/python/jobs/automl-standalone-jobs/automl-forecasting-task-bike-share/auto-ml-forecasting-bike-share.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"\n",
121121
"output = {}\n",
122122
"output[\"Workspace\"] = ml_client.workspace_name\n",
123-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
123+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
124124
"output[\"Resource Group\"] = workspace.resource_group\n",
125125
"output[\"Location\"] = workspace.location\n",
126126
"pd.set_option(\"display.max_colwidth\", None)\n",

sdk/python/jobs/automl-standalone-jobs/automl-forecasting-task-energy-demand/automl-forecasting-task-energy-demand-advanced-mlflow.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"\n",
121121
"output = {}\n",
122122
"output[\"Workspace\"] = ml_client.workspace_name\n",
123-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
123+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
124124
"output[\"Resource Group\"] = workspace.resource_group\n",
125125
"output[\"Location\"] = workspace.location\n",
126126
"pd.set_option(\"display.max_colwidth\", None)\n",

sdk/python/jobs/automl-standalone-jobs/automl-forecasting-task-energy-demand/automl-forecasting-task-energy-demand-advanced.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"\n",
117117
"output = {}\n",
118118
"output[\"Workspace\"] = ml_client.workspace_name\n",
119-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
119+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
120120
"output[\"Resource Group\"] = workspace.resource_group\n",
121121
"output[\"Location\"] = workspace.location\n",
122122
"output"

sdk/python/jobs/automl-standalone-jobs/automl-regression-task-hardware-performance/automl-regression-task-hardware-performance.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"source": [
111111
"workspace = ml_client.workspaces.get(name=ml_client.workspace_name)\n",
112112
"\n",
113-
"subscription_id = ml_client.connections._subscription_id\n",
113+
"subscription_id = ml_client.subscription_id\n",
114114
"resource_group = workspace.resource_group\n",
115115
"workspace_name = ml_client.workspace_name\n",
116116
"\n",

sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-forecasting-in-pipeline/automl-forecasting-in-pipeline.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"\n",
137137
"output = {}\n",
138138
"output[\"Workspace\"] = ml_client.workspace_name\n",
139-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
139+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
140140
"output[\"Resource Group\"] = workspace.resource_group\n",
141141
"output[\"Location\"] = workspace.location\n",
142142
"pd.set_option(\"display.max_colwidth\", None)\n",

sdk/python/jobs/pipelines/1k_demand_forecast_pipeline/aml-demand-forecast-hts-pipeline/aml-demand-forecast-hts.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
"\n",
152152
"output = {}\n",
153153
"output[\"Workspace\"] = ml_client.workspace_name\n",
154-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
154+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
155155
"output[\"Resource Group\"] = ws.resource_group\n",
156156
"output[\"Location\"] = ws.location\n",
157157
"pd.DataFrame(data=output, index=[\"\"]).T"

sdk/python/jobs/pipelines/1k_demand_forecast_pipeline/aml-demand-forecast-mm-pipeline/aml-demand-forecast-mm-pipeline.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
"\n",
151151
"output = {}\n",
152152
"output[\"Workspace\"] = ml_client.workspace_name\n",
153-
"output[\"Subscription ID\"] = ml_client.connections._subscription_id\n",
153+
"output[\"Subscription ID\"] = ml_client.subscription_id\n",
154154
"output[\"Resource Group\"] = ws.resource_group\n",
155155
"output[\"Location\"] = ws.location\n",
156156
"pd.DataFrame(data=output, index=[\"\"]).T"

0 commit comments

Comments
 (0)