Enhancing list model api + config dependency removal

Author: kumar-shivam-ranjan

tests/unitary/with_extras/aqua/test_cli.py

@@ -82,38 +82,6 @@ def test_aquacommand_flag(self, name, arg):
         with self.assertRaises(AquaCLIError):
             AquaCommand(**arg)
 
-    @parameterized.expand(
-        [
-            (
-                "default",
-                {"ODSC_MODEL_COMPARTMENT_OCID": ""},
-                "ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua.",
-            ),
-            (
-                "using jupyter instance",
-                {
-                    "ODSC_MODEL_COMPARTMENT_OCID": "",
-                    "NB_SESSION_OCID": "nb-session-ocid",
-                },
-                "Aqua is not available for the notebook session nb-session-ocid. For more information, please refer to the documentation.",
-            ),
-        ]
-    )
-    def test_aqua_command_without_compartment_env_var(
-        self, name, mock_env_dict, expected_msg
-    ):
-        """Test whether exit is called when ODSC_MODEL_COMPARTMENT_OCID is not set.
-        Also check if NB_SESSION_OCID is set then log the appropriate message."""
-
-        with patch.dict(os.environ, mock_env_dict):
-            reload(ads.config)
-            reload(ads.aqua)
-            reload(ads.aqua.cli)
-            with self.assertRaises(AquaConfigError) as cm:
-                AquaCommand()
-
-            self.assertEqual(str(cm.exception), expected_msg)
-
     @patch("sys.argv", ["ads", "aqua", "--some-option"])
     @patch("ads.cli.serialize")
     @patch("fire.Fire")

tests/unitary/with_extras/aqua/test_common_handler.py

@@ -46,13 +46,7 @@ def test_get_ok(self):
             with patch(
                 "ads.aqua.extension.base_handler.AquaAPIhandler.finish"
             ) as mock_finish:
-                with patch(
-                    "ads.aqua.extension.utils.fetch_service_compartment"
-                ) as mock_fetch_service_compartment:
-                    mock_fetch_service_compartment.return_value = (
-                        TestDataset.SERVICE_COMPARTMENT_ID
-                    )
-                    mock_finish.side_effect = lambda x: x
-                    self.common_handler.request.path = "aqua/hello"
-                    result = self.common_handler.get()
-                    assert result["status"] == "ok"
+                mock_finish.side_effect = lambda x: x
+                self.common_handler.request.path = "aqua/hello"
+                result = self.common_handler.get()
+                assert result["status"] == "ok"

tests/unitary/with_extras/aqua/test_model.py

@@ -1452,11 +1452,15 @@ def test_list_service_models(self, mock_get_container_config):
             ]
         )
 
-        results = self.app.list()
+        results = self.app.list(
+            compartment_id=TestDataset.SERVICE_COMPARTMENT_ID,
+            category=ads.config.SERVICE,
+        )
 
         received_args = self.app.list_resource.call_args.kwargs
+        print("received_args: ", received_args)
         assert received_args.get("compartment_id") == TestDataset.SERVICE_COMPARTMENT_ID
-
+        assert received_args.get("category") == ads.config.SERVICE
         assert len(results) == 2
 
         attributes = AquaModelSummary.__annotations__.keys()