added unit test and addressed PR review comments

Author: agrimk

ads/aqua/client/client.py

@@ -590,10 +590,11 @@ def list_models(self) -> Union[Dict[str, Any], Iterator[Mapping[str, Any]]]:
         Returns:
             Union[Dict[str, Any], Iterator[Mapping[str, Any]]]: The server's response, typically including the generated embeddings.
         """
-        headers = {"Content-Type", "application/json"}
-        response = self._client.get(self.endpoint, headers=headers, json={}).json()
+        # headers = {"Content-Type", "application/json"}
+        response = self._client.get(self.endpoint)
+        logger.debug(f"Response JSON: {response}")
         json_response = response.json()
-        logger.debug(f"Response JSON: {json_response}")
+        print(json_response)
         return json_response
 
 

ads/aqua/config/container_config.py

@@ -15,6 +15,7 @@
     UNKNOWN_JSON_STR,
 )
 from ads.common.extended_enum import ExtendedEnum
+from ads.common.utils import UNKNOWN
 
 
 class Usage(ExtendedEnum):
@@ -189,10 +190,22 @@ def from_service_config(
                 container_item.model_formats.append(
                     additional_configurations.get("modelFormats")
                 )
-                env_vars_dict = json.loads(
-                    additional_configurations.get("env_vars") or "{}"
-                )
-                env_vars = [{key: str(value)} for key, value in env_vars_dict.items()]
+
+                # Parse environment variables from `additional_configurations`.
+                # Only keys present in the configuration will be added to the result.
+                config_keys = {
+                    "MODEL_DEPLOY_PREDICT_ENDPOINT": UNKNOWN,
+                    "MODEL_DEPLOY_HEALTH_ENDPOINT": UNKNOWN,
+                    "PORT": UNKNOWN,
+                    "HEALTH_CHECK_PORT": UNKNOWN,
+                    "VLLM_USE_V1": UNKNOWN,
+                }
+
+                env_vars = [
+                    {key: additional_configurations.get(key, default)}
+                    for key, default in config_keys.items()
+                    if key in additional_configurations
+                ]
 
                 # Build container spec
                 container_item.spec = AquaContainerConfigSpec(

ads/aqua/extension/deployment_handler.py

@@ -395,11 +395,13 @@ def get(self, model_deployment_id):
         self.set_header("Content-Type", "application/json")
 
         model_deployment = AquaDeploymentApp().get(model_deployment_id)
-        endpoint = model_deployment.endpoint + "/predict/v1/models"
 
+        endpoint = model_deployment.endpoint + "/predict/v1/models"
+        print(endpoint)
         aqua_client = Client(endpoint=endpoint)
         try:
             list_model_result = aqua_client.list_models()
+            print(list_model_result)
             return self.finish(list_model_result)
         except Exception as ex:
             raise HTTPError(500, str(ex))

tests/unitary/with_extras/aqua/test_deployment_handler.py

@@ -18,6 +18,7 @@
     AquaDeploymentHandler,
     AquaDeploymentParamsHandler,
     AquaDeploymentStreamingInferenceHandler,
+    AquaModelListHandler,
 )
 
 
@@ -260,3 +261,31 @@ def test_post(self, mock_get_model_deployment_response):
         self.handler.write.assert_any_call("chunk1")
         self.handler.write.assert_any_call("chunk2")
         self.handler.finish.assert_called_once()
+
+
+class AquaModelListHandlerTestCase(unittest.TestCase):
+    default_params = ["--seed 42", "--trust-remote-code"]
+
+    @patch.object(IPythonHandler, "__init__")
+    def setUp(self, ipython_init_mock) -> None:
+        ipython_init_mock.return_value = None
+        self.test_instance = AquaModelListHandler(MagicMock(), MagicMock())
+
+    @patch("notebook.base.handlers.APIHandler.finish")
+    # @patch("ads.aqua.modeldeployment.AquaDeploymentApp.get_deployment_default_params")
+    def test_get_model_list(self, mock_get_model_list_default_params, mock_finish):
+        """Test to check the handler get method to return model list."""
+
+        mock_get_model_list_default_params.return_value = self.default_params
+        mock_finish.side_effect = lambda x: x
+
+        # args = {"instance_shape": TestDataset.INSTANCE_SHAPE}
+        # self.test_instance.get_argument = MagicMock(
+        #     side_effect=lambda arg, default=None : args.get(arg, default)
+        # )
+        result = self.test_instance.get(model_id="test_model_id")
+        self.assertCountEqual(result["data"], self.default_params)
+
+        mock_get_model_list_default_params.assert_called_with(
+            model_id="test_model_id",
+        )