Fixes unit tests

Author: mrDzurb

ads/aqua/common/enums.py

@@ -41,7 +41,7 @@ class Tags(ExtendedEnum):
     AQUA_EVALUATION_MODEL_ID = "evaluation_model_id"
     MODEL_FORMAT = "model_format"
     MODEL_ARTIFACT_FILE = "model_file"
-    MULTIMODEL_TYPE_TAG = "multimodel"
+    MULTIMODEL_TYPE_TAG = "aqua_multimodel"
 
 
 class InferenceContainerType(ExtendedEnum):

ads/aqua/model/model.py

@@ -369,7 +369,7 @@ def create_multi(
 
         # Combine tags
         tags = {
-            Tags.AQUA_TAG: "active",
+            # Tags.AQUA_TAG: "active",
             Tags.MULTIMODEL_TYPE_TAG: "true",
             **(freeform_tags or {}),
         }
@@ -1809,8 +1809,8 @@ def _rqs(self, compartment_id: str, model_type="FT", **kwargs):
             filter_tag = Tags.AQUA_FINE_TUNED_MODEL_TAG
         elif model_type == ModelType.BASE:
             filter_tag = Tags.BASE_MODEL_CUSTOM
-        elif model_type == ModelType.MULTIMODEL:
-            filter_tag = Tags.MULTIMODEL_TYPE_TAG
+        # elif model_type == ModelType.MULTIMODEL:
+        #     filter_tag = Tags.MULTIMODEL_TYPE_TAG
         else:
             raise AquaValueError(
                 f"Model of type {model_type} is unknown. The values should be in {ModelType.values()}"

ads/aqua/modeldeployment/entities.py

@@ -164,6 +164,7 @@ def from_oci_model_deployment(
 
     class Config:
         extra = "ignore"
+        protected_namespaces = ()
 
 
 class AquaDeploymentDetail(AquaDeployment, DataClassSerializable):
@@ -180,16 +181,16 @@ class ShapeInfoConfig(Serializable):
     """Describes how many memory and cpu to this model for specific shape.
 
     Attributes:
-        memory_in_gbs (int, optional): The number of memory in gbs to this model of the shape.
-        ocpu (int, optional): The number of ocpus to this model of the shape.
+        memory_in_gbs (float, optional): The number of memory in gbs to this model of the shape.
+        ocpu (float, optional): The number of ocpus to this model of the shape.
     """
 
-    memory_in_gbs: Optional[int] = Field(
-        default_factory=int,
+    memory_in_gbs: Optional[float] = Field(
+        None,
         description="The number of memory in gbs to this model of the shape.",
     )
-    ocpu: Optional[int] = Field(
-        default_factory=int,
+    ocpu: Optional[float] = Field(
+        None,
         description="The number of ocpus to this model of the shape.",
     )
 
@@ -558,3 +559,4 @@ def validate_multimodel_deployment_feasibility(
 
     class Config:
         extra = "ignore"
+        protected_namespaces = ()

tests/unitary/with_extras/aqua/test_data/deployment/aqua_create_gguf_deployment.yaml

@@ -18,7 +18,7 @@ spec:
       shapeName: "VM.Standard.A1.Flex"
       shapeConfigDetails:
         memoryInGBs: 60.0
-        ocpus: 10
+        ocpus: 10.0
     type: datascienceModelDeployment
   lifecycleState: CREATING
   modelDeploymentUrl: "https://modeldeployment.customer-oci.com/ocid1.datasciencemodeldeployment.oc1.<region>.<MD_OCID>"

tests/unitary/with_extras/aqua/test_data/deployment/aqua_create_multi_deployment.yaml

@@ -4,7 +4,7 @@ spec:
   displayName: multi-model-deployment-name
   freeformTags:
     OCI_AQUA: active
-    multimodel: "true"
+    aqua_multimodel: "true"
     aqua_model_id: model-id
   id: "ocid1.datasciencemodeldeployment.oc1.<region>.<MD_OCID>"
   infrastructure:

tests/unitary/with_extras/aqua/test_data/deployment/aqua_multi_model.yaml

@@ -77,7 +77,7 @@ spec:
   displayName: multi_model
   freeformTags:
     OCI_AQUA: active
-    multimodel: "true"
+    aqua_multimodel: "true"
     license: Apache 2.0
     organization: Organization
     ready_to_fine_tune: false

tests/unitary/with_extras/aqua/test_deployment.py

@@ -180,7 +180,7 @@ class TestDataset:
         "freeform_tags": {
             "OCI_AQUA": "active",
             "aqua_model_id": "model-id",
-            "multimodel": "true",
+            "aqua_multimodel": "true",
         },
         "id": "ocid1.datasciencemodeldeployment.oc1.<region>.<MD_OCID>",
         "lifecycle_state": "ACTIVE",
@@ -264,7 +264,7 @@ class TestDataset:
                                     "instance_shape_name": DEPLOYMENT_SHAPE_NAME_CPU,
                                     "model_deployment_instance_shape_config_details": oci.data_science.models.ModelDeploymentInstanceShapeConfigDetails(
                                         **{
-                                            "ocpus": 10,
+                                            "ocpus": 10.0,
                                             "memory_in_gbs": 60.0,
                                         }
                                     ),
@@ -366,7 +366,7 @@ class TestDataset:
         "created_on": "2024-01-01T00:00:00.000000+00:00",
         "created_by": "ocid1.user.oc1..<OCID>",
         "endpoint": MODEL_DEPLOYMENT_URL,
-        "private_endpoint_id": "",
+        "private_endpoint_id": None,
         "models": [],
         "model_id": "ocid1.datasciencemodel.oc1.<region>.<OCID>",
         "environment_variables": {
@@ -397,7 +397,7 @@ class TestDataset:
         "created_on": "2024-01-01T00:00:00.000000+00:00",
         "created_by": "ocid1.user.oc1..<OCID>",
         "endpoint": MODEL_DEPLOYMENT_URL,
-        "private_endpoint_id": "",
+        "private_endpoint_id": None,
         "models": [
             {
                 "env_var": {},
@@ -435,7 +435,7 @@ class TestDataset:
         "tags": {
             "OCI_AQUA": "active",
             "aqua_model_id": "model-id",
-            "multimodel": "true",
+            "aqua_multimodel": "true",
         },
     }
 
@@ -450,7 +450,7 @@ class TestDataset:
     aqua_deployment_gguf_shape_info = {
         "instance_shape": DEPLOYMENT_SHAPE_NAME_CPU,
         "instance_count": 1,
-        "ocpus": 10,
+        "ocpus": 10.0,
         "memory_in_gbs": 60.0,
     }
 

tests/unitary/with_extras/aqua/test_finetuning.py

@@ -10,7 +10,7 @@
 from parameterized import parameterized
 from unittest import TestCase
 from unittest.mock import MagicMock, PropertyMock
-from mock import patch
+from unittest.mock import patch
 from importlib import reload
 
 import ads.aqua

tests/unitary/with_extras/aqua/test_finetuning_handler.py

@@ -7,7 +7,7 @@
 from unittest import TestCase
 from unittest.mock import MagicMock
 
-from mock import patch
+from unittest.mock import patch
 from notebook.base.handlers import IPythonHandler
 
 from ads.aqua.extension.finetune_handler import (

tests/unitary/with_extras/aqua/test_model.py

@@ -449,7 +449,7 @@ def test_create_multimodel(
         mock_from_id.return_value = mock_model
         mock_create.return_value = mock_model
 
-        assert model.freeform_tags == {"OCI_AQUA": "active", "multimodel": "true"}
+        assert model.freeform_tags == {"OCI_AQUA": "active", "aqua_multimodel": "true"}
         assert model.custom_metadata_list.get("model_group_count").value == "2"
         assert (
             model.custom_metadata_list.get("deployment-container").value

tests/unitary/with_extras/aqua/utils.py

@@ -29,7 +29,7 @@ class HandlerTestDataset:
         block_storage_size=1,
         experiment_name="test_experiment_name",
         memory_in_gbs=1,
-        ocpus=1,
+        ocpus=1.0,
     )
     mock_invalid_input = dict(name="myvalue")
     mock_dataclass_obj = MockData(id="myid", name="myname")