Fix UTs and add supported arm shape sizes

harsh97 · harsh97 · commit 93609fa45b82 · 2024-07-17T00:25:09.000+05:30
diff --git a/ads/aqua/config/deployment_config_defaults.json b/ads/aqua/config/deployment_config_defaults.json
@@ -6,19 +6,19 @@
         "configs": [
           {
             "memory_in_gbs": 128,
-            "ocpu": 32
+            "ocpu": 20
           },
           {
             "memory_in_gbs": 256,
-            "ocpu": 64
+            "ocpu": 40
           },
           {
-            "memory_in_gbs": 512,
-            "ocpu": 128
+            "memory_in_gbs": 384,
+            "ocpu": 60
           },
           {
-            "memory_in_gbs": 1024,
-            "ocpu": 256
+            "memory_in_gbs": 512,
+            "ocpu": 80
           }
         ],
         "type": "CPU"
diff --git a/ads/aqua/ui.py b/ads/aqua/ui.py
@@ -51,6 +51,9 @@ class Platform(Enum):
         def to_dict(self):
             return self.value
 
+        def __repr__(self):
+            return repr(self.value)
+
     name: str = None
     version: str = None
     display_name: str = None
diff --git a/ads/common/object_storage_details.py b/ads/common/object_storage_details.py
@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
 # Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import json
 import os
 import re
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
 from typing import Dict, List
 from urllib.parse import urlparse
 
-
 import oci
 from ads.common import auth as authutil
 from ads.common import oci_client
 from ads.dataset.progress import TqdmProgressBar
-from concurrent.futures import ThreadPoolExecutor, as_completed
 
 THREAD_POOL_MAX_WORKERS = 10
 
@@ -169,8 +167,7 @@ def is_bucket_versioned(self) -> bool:
 
     def list_objects(self, **kwargs):
         """Lists objects in a given oss path
-
-        Parameters
+            Parameters
         -------
         **kwargs:
             namespace, bucket, filepath are set by the class. By default, fields gets all values. For other supported
diff --git a/ads/common/serializer.py b/ads/common/serializer.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
 # Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -25,10 +24,8 @@
 from ads.common.auth import default_signer
 
 try:
-    from yaml import CSafeDumper as dumper
     from yaml import CSafeLoader as loader
 except:
-    from yaml import SafeDumper as dumper
     from yaml import SafeLoader as loader
 
 
@@ -99,6 +96,8 @@ def serialize(obj):
         """JSON serializer for objects not serializable by default json code."""
         if isinstance(obj, datetime):
             return obj.isoformat()
+        if hasattr(obj, "to_dict"):
+            return obj.to_dict()
         raise TypeError(f"Type {type(obj)} not serializable.")
 
     @staticmethod
diff --git a/tests/unitary/with_extras/aqua/test_data/ui/container_index.json b/tests/unitary/with_extras/aqua/test_data/ui/container_index.json
@@ -63,44 +63,56 @@
   },
   "odsc-llama-cpp-serving": [
     {
-      "displayName": "llama.cpp",
-      "name": "dsmc://odsc-llama-cpp-serving",
+      "displayName": "LLAMA-CPP:0.2.75",
+      "modelFormats": [
+        "GGUF"
+      ],
+      "name": "iad.ocir.io/ociodscdev/odsc-llama-cpp-python-aio-linux_arm64_v8",
+      "platforms": [
+        "ARM_CPU"
+      ],
       "type": "inference",
-      "version": "0.2.75.2"
+      "version": "0.2.75.5"
     }
   ],
   "odsc-llm-evaluate": [
     {
       "name": "dsmc://odsc-llm-evaluate",
-      "version": "0.1.2.0"
+      "version": "0.1.2.1"
     }
   ],
   "odsc-llm-fine-tuning": [
     {
       "name": "dsmc://odsc-llm-fine-tuning",
-      "version": "1.1.33.34"
+      "version": "1.1.37.37"
     }
   ],
   "odsc-tgi-serving": [
     {
-      "displayName": "TGI:1.4.5",
-      "name": "dsmc://odsc-tgi-serving",
-      "type": "inference",
-      "version": "1.4.5"
-    },
-    {
-      "displayName": "TGI:2.0.2",
-      "name": "dsmc://odsc-tgi-serving",
+      "displayName": "TGI:2.0.1",
+      "modelFormats": [
+        "SAFETENSORS"
+      ],
+      "name": "dsmc://odsc-text-generation-inference",
+      "platforms": [
+        "NVIDIA_GPU"
+      ],
       "type": "inference",
-      "version": "2.0.2"
+      "version": "2.0.1.4"
     }
   ],
   "odsc-vllm-serving": [
     {
-      "displayName": "VLLM:0.3.0",
+      "displayName": "VLLM:0.4.1",
+      "modelFormats": [
+        "SAFETENSORS"
+      ],
       "name": "dsmc://odsc-vllm-serving",
+      "platforms": [
+        "NVIDIA_GPU"
+      ],
       "type": "inference",
-      "version": "0.3.0.7"
+      "version": "0.4.1.3"
     }
   ]
 }
diff --git a/tests/unitary/with_extras/aqua/test_decorator.py b/tests/unitary/with_extras/aqua/test_decorator.py
@@ -126,7 +126,7 @@ def setUp(self, ipython_init_mock) -> None:
                     "status": 500,
                     "message": "Internal Server Error",
                     "service_payload": {},
-                    "reason": f"MultipartUploadError: MultipartUploadError exception has occured. {UPLOAD_MANAGER_DEBUG_INFORMATION_LOG}",
+                    "reason": f"MultipartUploadError: MultipartUploadError exception has occurred. {UPLOAD_MANAGER_DEBUG_INFORMATION_LOG}",
                     "request_id": TestDataset.mock_request_id,
                 },
             ],
diff --git a/tests/unitary/with_extras/aqua/test_handlers.py b/tests/unitary/with_extras/aqua/test_handlers.py
@@ -211,6 +211,7 @@ def tearDownClass(cls):
                 "load_evaluation_config",
                 TestDataset.MOCK_OCID,
                 TestDataset.MOCK_OCID,
+                "/evaluation/config",
             ),
             (
                 "AquaEvaluationMetricsHandler",
@@ -219,6 +220,7 @@ def tearDownClass(cls):
                 "load_metrics",
                 TestDataset().mock_url("metrics"),
                 TestDataset.MOCK_OCID,
+                f"/evaluation/{TestDataset.MOCK_OCID}/metrics",
             ),
             (
                 "AquaEvaluationReportHandler",
@@ -227,6 +229,7 @@ def tearDownClass(cls):
                 "download_report",
                 TestDataset().mock_url("report"),
                 TestDataset.MOCK_OCID,
+                f"/evaluation/{TestDataset.MOCK_OCID}/report",
             ),
             (
                 "AquaEvaluationStatusHandler",
@@ -235,6 +238,7 @@ def tearDownClass(cls):
                 "get_status",
                 TestDataset().mock_url("status"),
                 TestDataset.MOCK_OCID,
+                f"/aqua/evaluation/{TestDataset.MOCK_OCID}/status",
             ),
             (
                 "ADSVersionHandler",
@@ -243,6 +247,7 @@ def tearDownClass(cls):
                 None,
                 None,
                 {"data": metadata.version("oracle_ads")},
+                f"/aqua/ads_version",
             ),
             (
                 "CompatibilityCheckHandler",
@@ -251,6 +256,7 @@ def tearDownClass(cls):
                 None,
                 None,
                 dict(status="ok"),
+                "/aqua/hello",
             ),
             (
                 "AquaModelLicenseHandler",
@@ -259,6 +265,7 @@ def tearDownClass(cls):
                 "load_license",
                 TestDataset().mock_url("license"),
                 TestDataset.MOCK_OCID,
+                f"/aqua/model/{TestDataset.MOCK_OCID}/license",
             ),
             (
                 "AquaModelHandler",
@@ -267,6 +274,7 @@ def tearDownClass(cls):
                 "get",
                 TestDataset.MOCK_OCID,
                 TestDataset.MOCK_OCID,
+                f"/aqua/model/{TestDataset.MOCK_OCID}",
             ),
             (
                 "AquaModelHandler_list",
@@ -275,6 +283,7 @@ def tearDownClass(cls):
                 "list",
                 "",
                 (None, None),
+                f"/aqua/model",
             ),
         ]
     )
@@ -287,6 +296,7 @@ def test_get(
         associated_api,
         url,
         expected_call,
+        path,
         ipython_init_mock,
     ):
         """Tests invoking GET method successfully."""
@@ -295,6 +305,7 @@ def test_get(
         test_instance = target_handler(MagicMock(), MagicMock())
         test_instance.finish = MagicMock()
         test_instance.request = MagicMock()
+        test_instance.request.path = path
 
         if associated_api:
             with patch.object(target_app, associated_api) as mock_api:
diff --git a/tests/unitary/with_extras/aqua/test_model.py b/tests/unitary/with_extras/aqua/test_model.py
@@ -11,6 +11,7 @@
 
 import oci
 import pytest
+from ads.aqua.ui import ModelFormat
 from parameterized import parameterized
 
 import ads.aqua.model
@@ -323,16 +324,17 @@ def test_get_foundation_models(
             )
 
         assert asdict(aqua_model) == {
+            "arm_cpu_supported": False,
             "compartment_id": f"{ds_model.compartment_id}",
-            "console_link": (
-                f"https://cloud.oracle.com/data-science/models/{ds_model.id}?region={self.app.region}",
-            ),
+            "console_link": f"https://cloud.oracle.com/data-science/models/{ds_model.id}?region={self.app.region}",
             "icon": "",
             "id": f"{ds_model.id}",
             "is_fine_tuned_model": False,
             "license": f'{ds_model.freeform_tags["license"]}',
             "model_card": f"{mock_read_file.return_value}",
+            "model_format": ModelFormat.SAFETENSORS,
             "name": f"{ds_model.display_name}",
+            "nvidia_gpu_supported": False,
             "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,
@@ -464,10 +466,9 @@ def test_get_model_fine_tuned(
         mock_query_resource.assert_called()
 
         assert asdict(model) == {
+            "arm_cpu_supported": False,
             "compartment_id": f"{ds_model.compartment_id}",
-            "console_link": (
-                f"https://cloud.oracle.com/data-science/models/{ds_model.id}?region={self.app.region}",
-            ),
+            "console_link": f"https://cloud.oracle.com/data-science/models/{ds_model.id}?region={self.app.region}",
             "dataset": "test_training_data",
             "experiment": {"id": "", "name": "", "url": ""},
             "icon": "",
@@ -504,7 +505,9 @@ 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,
             "organization": "test_organization",
             "project_id": f"{ds_model.project_id}",
             "ready_to_deploy": True,
@@ -564,6 +567,7 @@ def test_import_verified_model(
         ds_freeform_tags = {
             "OCI_AQUA": "ACTIVE",
             "license": "aqua-license",
+            "model_format": "SAFETENSORS",
             "organization": "oracle",
             "task": "text-generation",
             "ready_to_import": "true",
@@ -762,6 +766,7 @@ def test_import_any_model_smc_container(
             )
             assert model.tags == {
                 "aqua_custom_base_model": "true",
+                "model_format": "SAFETENSORS",
                 "ready_to_fine_tune": "true",
                 **ds_freeform_tags,
             }
diff --git a/tests/unitary/with_extras/aqua/test_model_handler.py b/tests/unitary/with_extras/aqua/test_model_handler.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*--
-
+import json
+import os
 # 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/
 
@@ -23,13 +24,19 @@ def setUp(self, ipython_init_mock) -> None:
         self.model_handler = AquaModelHandler(MagicMock(), MagicMock())
         self.model_handler.request = MagicMock()
 
+    @patch("ads.aqua.extension.model_handler.urlparse")
     @patch.object(AquaModelHandler, "list")
-    def test_get_no_id(self, mock_list):
+    def test_get_no_id(self, mock_list, mock_urlparse):
+        request_path = MagicMock(path="aqua/model")
+        mock_urlparse.return_value = request_path
         self.model_handler.get()
         mock_list.assert_called()
 
+    @patch("ads.aqua.extension.model_handler.urlparse")
     @patch.object(AquaModelHandler, "read")
-    def test_get_with_id(self, mock_read):
+    def test_get_with_id(self, mock_read, mock_urlparse):
+        request_path = MagicMock(path="aqua/model/test_model_id")
+        mock_urlparse.return_value = request_path
         self.model_handler.get(model_id="test_model_id")
         mock_read.assert_called_with("test_model_id")
 
@@ -99,6 +106,7 @@ def test_register(self, mock_register, mock_finish):
             finetuning_container=None,
             compartment_id=None,
             project_id=None,
+            model_file=None,
         )
         assert result["id"] == "test_id"
         assert result["inference_container"] == "odsc-tgi-serving"
diff --git a/tests/unitary/with_extras/aqua/test_ui.py b/tests/unitary/with_extras/aqua/test_ui.py
diff --git a/tests/unitary/with_extras/aqua/test_utils.py b/tests/unitary/with_extras/aqua/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,19 @@`
`6`	`6`	`"configs": [`
`7`	`7`	`{`
`8`	`8`	`"memory_in_gbs": 128,`
`9`		`- "ocpu": 32`
	`9`	`+ "ocpu": 20`
`10`	`10`	`},`
`11`	`11`	`{`
`12`	`12`	`"memory_in_gbs": 256,`
`13`		`- "ocpu": 64`
	`13`	`+ "ocpu": 40`
`14`	`14`	`},`
`15`	`15`	`{`
`16`		`- "memory_in_gbs": 512,`
`17`		`- "ocpu": 128`
	`16`	`+ "memory_in_gbs": 384,`
	`17`	`+ "ocpu": 60`
`18`	`18`	`},`
`19`	`19`	`{`
`20`		`- "memory_in_gbs": 1024,`
`21`		`- "ocpu": 256`
	`20`	`+ "memory_in_gbs": 512,`
	`21`	`+ "ocpu": 80`
`22`	`22`	`}`
`23`	`23`	`],`
`24`	`24`	`"type": "CPU"`