Merge branch 'main' of https://github.com/oracle/accelerated-data-science into feature/model_group

Author: lu-ohai

ads/aqua/client/client.py

@@ -582,6 +582,19 @@ def embeddings(
         payload = {**(payload or {}), "input": input}
         return self._request(payload=payload, headers=headers)
 
+    def fetch_data(self) -> Union[Dict[str, Any], Iterator[Mapping[str, Any]]]:
+        """Fetch Data in json format by sending a request to the endpoint.
+
+        Args:
+
+        Returns:
+            Union[Dict[str, Any], Iterator[Mapping[str, Any]]]: The server's response, typically including the data in JSON format.
+        """
+        # headers = {"Content-Type", "application/json"}
+        response = self._client.get(self.endpoint)
+        json_response = response.json()
+        return json_response
+
 
 class AsyncClient(BaseClient):
     """

ads/aqua/extension/deployment_handler.py

@@ -373,6 +373,37 @@ def post(self, *args, **kwargs):  # noqa: ARG002
         )
 
 
+class AquaModelListHandler(AquaAPIhandler):
+    """Handler for Aqua model list params REST APIs.
+
+    Methods
+    -------
+    get(self, *args, **kwargs)
+        Validates parameters for the given model id.
+    """
+
+    @handle_exceptions
+    def get(self, model_deployment_id):
+        """
+        Handles get model list for the Active Model Deployment
+        Raises
+        ------
+        HTTPError
+            Raises HTTPError if inputs are missing or are invalid
+        """
+
+        self.set_header("Content-Type", "application/json")
+        endpoint: str = ""
+        model_deployment = AquaDeploymentApp().get(model_deployment_id)
+        endpoint = model_deployment.endpoint.rstrip("/") + "/predict/v1/models"
+        aqua_client = Client(endpoint=endpoint)
+        try:
+            list_model_result = aqua_client.fetch_data()
+            return self.finish(list_model_result)
+        except Exception as ex:
+            raise HTTPError(500, str(ex))
+
+
 __handlers__ = [
     ("deployments/?([^/]*)/params", AquaDeploymentParamsHandler),
     ("deployments/config/?([^/]*)", AquaDeploymentHandler),
@@ -381,4 +412,5 @@ def post(self, *args, **kwargs):  # noqa: ARG002
     ("deployments/?([^/]*)/activate", AquaDeploymentHandler),
     ("deployments/?([^/]*)/deactivate", AquaDeploymentHandler),
     ("inference/stream/?([^/]*)", AquaDeploymentStreamingInferenceHandler),
+    ("deployments/models/list/?([^/]*)", AquaModelListHandler),
 ]

tests/unitary/default_setup/model_deployment/test_model_deployment_v2.py

@@ -373,6 +373,7 @@ def test__load_default_properties(self, mock_from_ocid):
                 "cpu_baseline": None,
                 "ocpus": 10.0,
                 "memory_in_gbs": 36.0,
+                "cpu_baseline": None,
             },
             ModelDeploymentInfrastructure.CONST_REPLICA: 1,
         }

tests/unitary/default_setup/pipeline/test_pipeline.py

@@ -32,7 +32,7 @@
     nb_session_ocid="ocid1.datasciencenotebooksession.oc1.iad..<unique_ocid>",
     shape_name="VM.Standard.E3.Flex",
     block_storage_size_in_gbs=100,
-    shape_config_details={"ocpus": 1, "memory_in_gbs": 16},
+    shape_config_details={"ocpus": 1.0, "memory_in_gbs": 16.0, "cpu_baseline": None},
 )
 PIPELINE_OCID = "ocid.xxx.datasciencepipeline.<unique_ocid>"
 
@@ -334,10 +334,8 @@ def test_pipeline_define(self):
                             "jobId": "TestJobIdOne",
                             "description": "Test description one",
                             "commandLineArguments": "ARGUMENT --KEY VALUE",
-                            "environmentVariables": {
-                                "ENV": "VALUE"
-                            },
-                            "maximumRuntimeInMinutes": 20
+                            "environmentVariables": {"ENV": "VALUE"},
+                            "maximumRuntimeInMinutes": 20,
                         },
                     },
                     {
@@ -1066,10 +1064,8 @@ def test_pipeline_to_dict(self):
                             "jobId": "TestJobIdOne",
                             "description": "Test description one",
                             "commandLineArguments": "ARGUMENT --KEY VALUE",
-                            "environmentVariables": {
-                                "ENV": "VALUE"
-                            },
-                            "maximumRuntimeInMinutes": 20
+                            "environmentVariables": {"ENV": "VALUE"},
+                            "maximumRuntimeInMinutes": 20,
                         },
                     },
                     {

tests/unitary/with_extras/aqua/test_deployment_handler.py

@@ -13,11 +13,13 @@
 from parameterized import parameterized
 
 import ads.aqua
+from ads.aqua.modeldeployment.entities import AquaDeploymentDetail
 import ads.config
 from ads.aqua.extension.deployment_handler import (
     AquaDeploymentHandler,
     AquaDeploymentParamsHandler,
     AquaDeploymentStreamingInferenceHandler,
+    AquaModelListHandler,
 )
 
 
@@ -260,3 +262,25 @@ 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 = {
+        "data": [{"id": "id", "object": "object", "owned_by": "openAI", "created": 124}]
+    }
+
+    @patch.object(IPythonHandler, "__init__")
+    def setUp(self, ipython_init_mock) -> None:
+        ipython_init_mock.return_value = None
+        self.aqua_model_list_handler = AquaModelListHandler(MagicMock(), MagicMock())
+        self.aqua_model_list_handler._headers = MagicMock()
+
+    @patch("ads.aqua.modeldeployment.AquaDeploymentApp.get")
+    @patch("notebook.base.handlers.APIHandler.finish")
+    def test_get_model_list(self, mock_get, mock_finish):
+        """Test to check the handler get method to return model list."""
+
+        mock_get.return_value = MagicMock(id="test_model_id")
+        mock_finish.side_effect = lambda x: x
+        result = self.aqua_model_list_handler.get(model_id="test_model_id")
+        mock_get.assert_called()