Update model tests

Author: harsh97

ads/aqua/common/utils.py

@@ -46,7 +46,6 @@
 )
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.auth import default_signer
-from ads.common.decorator.threaded import threaded
 from ads.common.extended_enum import ExtendedEnumMeta
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
@@ -216,7 +215,6 @@ def read_file(file_path: str, **kwargs) -> str:
         return UNKNOWN
 
 
-@threaded()
 def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
     artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
     signer = default_signer() if artifact_path.startswith("oci://") else {}

tests/unitary/with_extras/aqua/test_model.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*--
-
+import json
 # Copyright (c) 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
@@ -37,6 +37,21 @@ def mock_auth():
         yield mock_default_signer
 
 
+@pytest.fixture(autouse=True, scope="class")
+def mock_get_container_config():
+    with patch("ads.aqua.ui.get_container_config") as mock_config:
+        with open(
+            os.path.join(
+                os.path.dirname(os.path.abspath(__file__)),
+                "test_data/ui/container_index.json",
+            ),
+            "r",
+        ) as _file:
+            container_index_json = json.load(_file)
+        mock_config.return_value = container_index_json
+        yield mock_config
+
+
 @pytest.fixture(autouse=True, scope="class")
 def mock_init_client():
     with patch(
@@ -256,6 +271,7 @@ def test_get_foundation_models(
         mock_from_id,
         mock_read_file,
         foundation_model_type,
+        mock_get_container_config,
         mock_auth,
     ):
         ds_model = MagicMock()
@@ -334,7 +350,7 @@ def test_get_foundation_models(
             "model_card": f"{mock_read_file.return_value}",
             "model_format": ModelFormat.SAFETENSORS,
             "name": f"{ds_model.display_name}",
-            "nvidia_gpu_supported": False,
+            "nvidia_gpu_supported": True,
             "organization": f'{ds_model.freeform_tags["organization"]}',
             "project_id": f"{ds_model.project_id}",
             "ready_to_deploy": False if foundation_model_type == "verified" else True,
@@ -366,6 +382,7 @@ def test_get_model_fine_tuned(
         mock_from_id,
         mock_read_file,
         mock_query_resource,
+        mock_get_container_config,
         mock_auth,
     ):
         ds_model = MagicMock()
@@ -507,7 +524,7 @@ def test_get_model_fine_tuned(
             "model_card": f"{mock_read_file.return_value}",
             "model_format": ModelFormat.SAFETENSORS,
             "name": f"{ds_model.display_name}",
-            "nvidia_gpu_supported": False,
+            "nvidia_gpu_supported": True,
             "organization": "test_organization",
             "project_id": f"{ds_model.project_id}",
             "ready_to_deploy": True,
@@ -709,12 +726,16 @@ def test_import_model_with_project_compartment_override(self, mock_load_config):
         assert model.project_id == project_override
 
     @patch("ads.aqua.common.utils.load_config", side_effect=AquaFileNotFoundError)
-    def test_import_model_with_missing_config(self, mock_load_config):
+    def test_import_model_with_missing_config(
+        self, mock_load_config, mock_get_container_config
+    ):
         """Test for validating if error is returned when model artifacts are incomplete or not available."""
+
         os_path = "oci://aqua-bkt@aqua-ns/prefix/path"
         model_name = "oracle/aqua-1t-mega-model"
         reload(ads.aqua.model.model)
         app = AquaModelApp()
+        app.list_resource = MagicMock(return_value=[])
         with pytest.raises(AquaRuntimeError):
             model: AquaModel = app.register(
                 model=model_name,