clear cache before after run

Author: VipulMascarenhas

ads/aqua/common/utils.py

@@ -1101,9 +1101,9 @@ def generate_tei_cmd_var(os_path: str) -> List[str]:
 
     cmd_prefix = "--"
     cmd_var = [
-        cmd_prefix + TextEmbeddingInferenceContainerParams.MODEL_ID,
+        f"{cmd_prefix}{TextEmbeddingInferenceContainerParams.MODEL_ID}",
         f"{AQUA_MODEL_DEPLOYMENT_FOLDER}{ObjectStorageDetails.from_path(os_path.rstrip('/')).filepath}/",
-        cmd_prefix + TextEmbeddingInferenceContainerParams.PORT,
+        f"{cmd_prefix}{TextEmbeddingInferenceContainerParams.PORT}",
         TEI_CONTAINER_DEFAULT_HOST,
     ]
 

tests/unitary/with_extras/aqua/test_model.py

@@ -24,6 +24,7 @@
     AquaModel,
     ModelValidationResult,
 )
+from ads.aqua.common.utils import get_hf_model_info
 import ads.common
 import ads.common.oci_client
 import ads.config
@@ -49,7 +50,7 @@ def mock_auth():
         yield mock_default_signer
 
 
-@pytest.fixture(autouse=True, scope="class")
+@pytest.fixture(autouse=True, scope="function")
 def mock_get_container_config():
     with patch("ads.aqua.ui.get_container_config") as mock_config:
         with open(
@@ -266,6 +267,7 @@ def teardown_method(self):
         self.create_signer_patch.stop()
         self.validate_config_patch.stop()
         self.create_client_patch.stop()
+        get_hf_model_info.cache_clear()
 
     @classmethod
     def setup_class(cls):
@@ -933,7 +935,7 @@ def test_import_model_with_missing_config(
         app.list = MagicMock(return_value=[])
 
         if download_from_hf:
-            with pytest.raises(AquaRuntimeError):
+            with pytest.raises(AquaValueError):
                 mock_get_hf_model_info.return_value.siblings = []
                 with tempfile.TemporaryDirectory() as tmpdir:
                     model: AquaModel = app.register(
@@ -1012,7 +1014,6 @@ def test_import_any_model_smc_container(
             assert model.ready_to_deploy is True
             assert model.ready_to_finetune is True
 
-    @pytest.mark.skip(reason="Skipping this test to check for unit test failure in GA")
     @pytest.mark.parametrize(
         "download_from_hf",
         [True, False],