Updated pr.

Author: lu-ohai

ads/aqua/model/model.py

@@ -141,7 +141,7 @@ class AquaModelApp(AquaApp):
     @telemetry(entry_point="plugin=model&action=create", name="aqua")
     def create(
         self,
-        model_id: Union[str, AquaMultiModelRef],
+        model: Union[str, AquaMultiModelRef],
         project_id: Optional[str] = None,
         compartment_id: Optional[str] = None,
         freeform_tags: Optional[Dict] = None,
@@ -153,7 +153,7 @@ def create(
 
         Parameters
         ----------
-        model_id : Union[str, AquaMultiModelRef]
+        model : Union[str, AquaMultiModelRef]
             The model ID as a string or a AquaMultiModelRef instance to be deployed.
         project_id : Optional[str]
             The project ID for the custom model.
@@ -171,11 +171,11 @@ def create(
             The instance of DataScienceModel or DataScienceModelGroup.
         """
         fine_tune_weights = []
-        if isinstance(model_id, AquaMultiModelRef):
-            fine_tune_weights = model_id.fine_tune_weights
-            model_id = model_id.model_id
+        if isinstance(model, AquaMultiModelRef):
+            fine_tune_weights = model.fine_tune_weights
+            model = model.model_id
 
-        service_model = DataScienceModel.from_id(model_id)
+        service_model = DataScienceModel.from_id(model)
         target_project = project_id or PROJECT_OCID
         target_compartment = compartment_id or COMPARTMENT_OCID
 
@@ -192,7 +192,7 @@ def create(
         custom_model = None
         if fine_tune_weights:
             custom_model = self._create_model_group(
-                model_id=model_id,
+                model_id=model,
                 compartment_id=target_compartment,
                 project_id=target_project,
                 freeform_tags=combined_freeform_tags,
@@ -202,18 +202,16 @@ def create(
             )
 
             logger.info(
-                f"Aqua Model Group {custom_model.id} created with the service model {model_id}."
+                f"Aqua Model Group {custom_model.id} created with the service model {model}."
             )
         else:
             # Skip model copying if it is registered model or fine-tuned model
             if (
-                service_model.freeform_tags.get(Tags.BASE_MODEL_CUSTOM, None)
-                is not None
-                or service_model.freeform_tags.get(Tags.AQUA_FINE_TUNED_MODEL_TAG)
-                is not None
+                Tags.BASE_MODEL_CUSTOM in service_model.freeform_tags
+                or Tags.AQUA_FINE_TUNED_MODEL_TAG in service_model.freeform_tags
             ):
                 logger.info(
-                    f"Aqua Model {model_id} already exists in the user's compartment."
+                    f"Aqua Model {model} already exists in the user's compartment."
                     "Skipped copying."
                 )
                 return service_model
@@ -227,7 +225,7 @@ def create(
                 **kwargs,
             )
             logger.info(
-                f"Aqua Model {custom_model.id} created with the service model {model_id}."
+                f"Aqua Model {custom_model.id} created with the service model {model}."
             )
 
         # Track unique models that were created in the user's compartment

ads/aqua/modeldeployment/constants.py

@@ -9,6 +9,12 @@
 This module contains constants used in Aqua Model Deployment.
 """
 
+from ads.common.extended_enum import ExtendedEnum
+
 DEFAULT_WAIT_TIME = 12000
 DEFAULT_POLL_INTERVAL = 10
-DEFAULT_DEPLOYMENT_TYPE = "MODEL_STACK"
+
+
+class DeploymentType(ExtendedEnum):
+    STACKED = "STACKED"
+    MULTI = "MULTI"

ads/aqua/modeldeployment/deployment.py

@@ -64,9 +64,9 @@
     MultiModelDeploymentConfigLoader,
 )
 from ads.aqua.modeldeployment.constants import (
-    DEFAULT_DEPLOYMENT_TYPE,
     DEFAULT_POLL_INTERVAL,
     DEFAULT_WAIT_TIME,
+    DeploymentType,
 )
 from ads.aqua.modeldeployment.entities import (
     AquaDeployment,
@@ -216,30 +216,24 @@ def create(
         model_app = AquaModelApp()
         if (
             create_deployment_details.model_id
-            or create_deployment_details.deployment_type
+            or create_deployment_details.deployment_type == DeploymentType.STACKED
         ):
-            model_id = create_deployment_details.model_id
-            if not model_id:
+            model = create_deployment_details.model_id
+            if not model:
                 if len(create_deployment_details.models) != 1:
                     raise AquaValueError(
                         "Invalid 'models' provided. Only one base model is required for model stack deployment."
                     )
-                if create_deployment_details.deployment_type != DEFAULT_DEPLOYMENT_TYPE:
-                    raise AquaValueError(
-                        f"Invalid 'deployment_type' provided. Only {DEFAULT_DEPLOYMENT_TYPE} is supported for model stack deployment."
-                    )
-                model_id = create_deployment_details.models[0]
+                model = create_deployment_details.models[0]
 
-            service_model_id = (
-                model_id if isinstance(model_id, str) else model_id.model_id
-            )
+            service_model_id = model if isinstance(model, str) else model.model_id
             logger.debug(
                 f"Single model ({service_model_id}) provided. "
                 "Delegating to single model creation method."
             )
 
             aqua_model = model_app.create(
-                model_id=model_id,
+                model=model,
                 compartment_id=compartment_id,
                 project_id=project_id,
                 freeform_tags=freeform_tags,
@@ -250,6 +244,7 @@ def create(
                 create_deployment_details=create_deployment_details,
                 container_config=container_config,
             )
+        # TODO: add multi model validation from deployment_type
         else:
             # Collect all unique model IDs (including fine-tuned models)
             source_model_ids = list(

tests/unitary/with_extras/aqua/test_deployment.py

@@ -1515,7 +1515,7 @@ def test_create_deployment_for_foundation_model(
         )
 
         mock_create.assert_called_with(
-            model_id=TestDataset.MODEL_ID,
+            model=TestDataset.MODEL_ID,
             compartment_id=TestDataset.USER_COMPARTMENT_ID,
             project_id=TestDataset.USER_PROJECT_ID,
             freeform_tags=freeform_tags,
@@ -1611,7 +1611,7 @@ def test_create_deployment_for_fine_tuned_model(
         )
 
         mock_create.assert_called_with(
-            model_id=TestDataset.MODEL_ID,
+            model=TestDataset.MODEL_ID,
             compartment_id=TestDataset.USER_COMPARTMENT_ID,
             project_id=TestDataset.USER_PROJECT_ID,
             freeform_tags=None,
@@ -1707,7 +1707,7 @@ def test_create_deployment_for_gguf_model(
         )
 
         mock_create.assert_called_with(
-            model_id=TestDataset.MODEL_ID,
+            model=TestDataset.MODEL_ID,
             compartment_id=TestDataset.USER_COMPARTMENT_ID,
             project_id=TestDataset.USER_PROJECT_ID,
             freeform_tags=None,
@@ -1810,7 +1810,7 @@ def test_create_deployment_for_tei_byoc_embedding_model(
         )
 
         mock_create.assert_called_with(
-            model_id=TestDataset.MODEL_ID,
+            model=TestDataset.MODEL_ID,
             compartment_id=TestDataset.USER_COMPARTMENT_ID,
             project_id=TestDataset.USER_PROJECT_ID,
             freeform_tags=None,
@@ -1928,7 +1928,7 @@ def test_create_deployment_for_stack_model(
             predict_log_id="ocid1.log.oc1.<region>.<OCID>",
             freeform_tags=freeform_tags,
             defined_tags=defined_tags,
-            deployment_type="MODEL_STACK",
+            deployment_type="STACKED",
         )
 
         mock_create.assert_called()

tests/unitary/with_extras/aqua/test_model.py

@@ -418,7 +418,7 @@ def test_create_model(self, mock_from_id, mock_validate, mock_create):
 
         # will not copy service model
         self.app.create(
-            model_id="test_model_id",
+            model="test_model_id",
             project_id="test_project_id",
             compartment_id="test_compartment_id",
         )
@@ -433,7 +433,7 @@ def test_create_model(self, mock_from_id, mock_validate, mock_create):
         mock_model.freeform_tags.pop(Tags.BASE_MODEL_CUSTOM)
         # will copy service model
         model = self.app.create(
-            model_id="test_model_id",
+            model="test_model_id",
             project_id="test_project_id",
             compartment_id="test_compartment_id",
         )