Fix/add UTs for 1.0.3 and update supported arm shapes (#905)

Author: harsh97

ads/aqua/common/utils.py

@@ -46,7 +46,6 @@
 )
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.auth import default_signer
-from ads.common.decorator.threaded import threaded
 from ads.common.extended_enum import ExtendedEnumMeta
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
@@ -216,7 +215,6 @@ def read_file(file_path: str, **kwargs) -> str:
         return UNKNOWN
 
 
-@threaded()
 def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
     artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
     signer = default_signer() if artifact_path.startswith("oci://") else {}

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"

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

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

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

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"
     }
   ]
 }

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,
                 },
             ],

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: