Fix RAI image builds

Azure · Nov 27, 2024 · 6cf58fe · 6cf58fe
1 parent 57da35d
commit 6cf58fe
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 13 deletions.
diff --git a/assets/responsibleai/environments/responsibleai-tabular/asset.yaml b/assets/responsibleai/environments/responsibleai-tabular/asset.yaml
@@ -6,6 +6,6 @@ extra_config: environment.yaml
 test:
   pytest:
     enabled: true 
-    pip_requirements: tests/requirements.txt
+    conda_environment: tests/test_conda_env.yaml
     tests_dir: tests
 categories: ["Responsible AI"]
diff --git a/assets/responsibleai/environments/responsibleai-tabular/tests/requirements.txt b/assets/responsibleai/environments/responsibleai-tabular/tests/requirements.txt
@@ -1,4 +1,4 @@
-azure-ai-ml~=1.0.0
-azure.identity==1.10.0
-azureml-core~=1.53.0
+azure-ai-ml==1.22.4
+azure.identity==1.19.0
+azureml-core>=1.58.0
 azureml-mlflow
diff --git a/assets/responsibleai/environments/responsibleai-tabular/tests/responsibleai_sample_test.py b/assets/responsibleai/environments/responsibleai-tabular/tests/responsibleai_sample_test.py
@@ -11,7 +11,7 @@
 from azure.ai.ml.entities import Environment, BuildContext
 from azure.ai.ml import automl
 from azure.ai.ml.constants import AssetTypes
-from azure.identity import AzureCliCredential
+from azure.identity import DefaultAzureCredential
 
 
 BUILD_CONTEXT = Path("../context")
@@ -53,8 +53,10 @@ def test_responsibleai():
     resource_group = os.environ.get("resource_group")
     workspace_name = os.environ.get("workspace")
 
+    credential = DefaultAzureCredential()
+
     ml_client = MLClient(
-        AzureCliCredential(), subscription_id, resource_group, workspace_name
+        credential, subscription_id, resource_group, workspace_name
     )
 
     env_name = "responsibleai"

diff --git a/assets/responsibleai/environments/responsibleai-tabular/tests/test_conda_env.yaml b/assets/responsibleai/environments/responsibleai-tabular/tests/test_conda_env.yaml
@@ -0,0 +1,14 @@
+channels:
+  - conda-forge
+  - defaults
+  - anaconda
+dependencies:
+  - python=3.12.0
+  - pip
+  - pip:
+    - -r requirements.txt
+    ## Test requirements
+    - pytest
+    - tqdm
+    - azure-core
+name: rai_test
diff --git a/assets/responsibleai/environments/responsibleai-text/asset.yaml b/assets/responsibleai/environments/responsibleai-text/asset.yaml
@@ -5,7 +5,7 @@ spec: spec.yaml
 extra_config: environment.yaml
 test:
   pytest:
-    enabled: true 
-    pip_requirements: tests/requirements.txt
+    enabled: true
+    conda_environment: tests/test_conda_env.yaml
     tests_dir: tests
 categories: ["Responsible AI"]
diff --git a/assets/responsibleai/environments/responsibleai-text/tests/responsibleai_text_sample_test.py b/assets/responsibleai/environments/responsibleai-text/tests/responsibleai_text_sample_test.py
@@ -9,7 +9,7 @@
 from azure.ai.ml import command
 from azure.ai.ml.operations._run_history_constants import JobStatus
 from azure.ai.ml.entities import Environment, BuildContext
-from azure.identity import AzureCliCredential
+from azure.identity import DefaultAzureCredential
 
 BUILD_CONTEXT = Path("../context")
 JOB_SOURCE_CODE = "src"
@@ -25,8 +25,10 @@ def test_responsibleai_text():
     resource_group = os.environ.get("resource_group")
     workspace_name = os.environ.get("workspace")
 
+    credential = DefaultAzureCredential()
+
     ml_client = MLClient(
-        AzureCliCredential(), subscription_id, resource_group, workspace_name
+        credential, subscription_id, resource_group, workspace_name
     )
 
     env_name = "responsibleai-text"

diff --git a/assets/responsibleai/environments/responsibleai-text/tests/test_conda_env.yaml b/assets/responsibleai/environments/responsibleai-text/tests/test_conda_env.yaml
@@ -0,0 +1,14 @@
+channels:
+  - conda-forge
+  - defaults
+  - anaconda
+dependencies:
+  - python=3.12.0
+  - pip
+  - pip:
+    - -r requirements.txt
+    ## Test requirements
+    - pytest
+    - tqdm
+    - azure-core
+name: rai_test
diff --git a/assets/responsibleai/environments/responsibleai-vision/asset.yaml b/assets/responsibleai/environments/responsibleai-vision/asset.yaml
@@ -6,6 +6,6 @@ extra_config: environment.yaml
 test:
   pytest:
     enabled: true 
-    pip_requirements: tests/requirements.txt
+    conda_environment: tests/test_conda_env.yaml
     tests_dir: tests
 categories: ["Responsible AI"]
diff --git a/...responsibleai/environments/responsibleai-vision/tests/responsibleai_vision_sample_test.py b/...responsibleai/environments/responsibleai-vision/tests/responsibleai_vision_sample_test.py
@@ -8,7 +8,7 @@
 from azure.ai.ml import MLClient
 from azure.ai.ml import command
 from azure.ai.ml.entities import Environment, BuildContext
-from azure.identity import AzureCliCredential
+from azure.identity import DefaultAzureCredential
 
 BUILD_CONTEXT = Path("../context")
 JOB_SOURCE_CODE = "src"
@@ -24,8 +24,10 @@ def test_responsibleai_vision():
     resource_group = os.environ.get("resource_group")
     workspace_name = os.environ.get("workspace")
 
+    credential = DefaultAzureCredential()
+
     ml_client = MLClient(
-        AzureCliCredential(), subscription_id, resource_group, workspace_name
+        credential, subscription_id, resource_group, workspace_name
     )
 
     env_name = "responsibleai-vision"

diff --git a/assets/responsibleai/environments/responsibleai-vision/tests/test_conda_env.yaml b/assets/responsibleai/environments/responsibleai-vision/tests/test_conda_env.yaml
@@ -0,0 +1,14 @@
+channels:
+  - conda-forge
+  - defaults
+  - anaconda
+dependencies:
+  - python=3.12.0
+  - pip
+  - pip:
+    - -r requirements.txt
+    ## Test requirements
+    - pytest
+    - tqdm
+    - azure-core
+name: rai_test