add deployment tests

VipulMascarenhas · VipulMascarenhas · commit 71b1e9f28cbf · 2024-10-25T23:03:28.000-07:00
diff --git a/tests/unitary/with_extras/aqua/test_data/deployment/aqua_create_embedding_deployment.yaml b/tests/unitary/with_extras/aqua/test_data/deployment/aqua_create_embedding_deployment.yaml
@@ -0,0 +1,34 @@
+kind: deployment
+spec:
+  createdBy: ocid1.user.oc1..<OCID>
+  displayName: model-deployment-name
+  freeformTags:
+    OCI_AQUA: active
+    aqua_model_name: model-name
+  id: "ocid1.datasciencemodeldeployment.oc1.<region>.<MD_OCID>"
+  infrastructure:
+    kind: infrastructure
+    spec:
+      bandwidthMbps: 10
+      compartmentId: ocid1.compartment.oc1..<OCID>
+      deploymentType: SINGLE_MODEL
+      policyType: FIXED_SIZE
+      projectId: ocid1.datascienceproject.oc1.iad.<OCID>
+      replica: 1
+      shapeName: "VM.GPU.A10.1"
+    type: datascienceModelDeployment
+  lifecycleState: CREATING
+  modelDeploymentUrl: "https://modeldeployment.customer-oci.com/ocid1.datasciencemodeldeployment.oc1.<region>.<MD_OCID>"
+  runtime:
+    kind: runtime
+    spec:
+      env:
+        BASE_MODEL: service_models/model-name/artifact
+        MODEL_DEPLOY_PREDICT_ENDPOINT: /v1/embeddings
+      healthCheckPort: 8080
+      image: "dsmc://image-name:1.0.0.0"
+      modelUri: "ocid1.datasciencemodeldeployment.oc1.<region>.<MODEL_OCID>"
+      serverPort: 8080
+    type: container
+  timeCreated: 2024-01-01T00:00:00.000000+00:00
+type: modelDeployment
diff --git a/tests/unitary/with_extras/aqua/test_data/deployment/aqua_tei_byoc_embedding_model.yaml b/tests/unitary/with_extras/aqua/test_data/deployment/aqua_tei_byoc_embedding_model.yaml
@@ -0,0 +1,88 @@
+kind: datascienceModel
+spec:
+  artifact: oci://service-managed-models@namespace/service_models/model-name/artifact
+  compartmentId: ocid1.compartment.oc1..<OCID>
+  customMetadataList:
+    data:
+    - category: Other
+      description: artifact location
+      key: artifact_location
+      value: service_models/model-name/artifact
+    - category: Other
+      description: model by reference flag
+      key: modelDescription
+      value: true
+    - category: Other
+      description: Deployment container mapping for model model-name
+      key: deployment-container
+      value: odsc-tei-serving
+    - category: Other
+      description: Inference container URI for model model-name
+      key: deployment-container-uri
+      value: region.ocir.io/tenancy/image_name:tag
+    - category: Other
+      description: Inference container cmd vars for model-name
+      key: container-cmd-var
+      value: --model-id,/opt/ds/model/deployed_model/service_models/model-name/artifact/,--port,8080
+  definedTags: {}
+  description: Mock model description
+  displayName: model-name
+  freeformTags:
+    OCI_AQUA: active
+    license: License
+    organization: Organization
+    ready_to_fine_tune: false
+    task: text_embedding
+  id: ocid1.datasciencemodel.oc1.iad.<OCID>
+  lifecycleState: ACTIVE
+  modelDescription:
+    models:
+    - bucketName: service-managed-models
+      namespace: namespace
+      objects:
+      - name: service_models/model-name/artifact/README.md
+        sizeInBytes: 10317
+        version: 450a8124-f5ca-4ee6-b4cf-c1dc05b13d46
+      - name: service_models/model-name/artifact/config.json
+        sizeInBytes: 950
+        version: 3ace781b-4a48-4e89-88b6-61f0db6d51ad
+      - name: service_models/model-name/artifact/configuration_RW.py
+        sizeInBytes: 2607
+        version: ba1df5b6-7546-42e5-964e-63cd013e988c
+      - name: service_models/model-name/artifact/generation_config.json
+        sizeInBytes: 111
+        version: e23a04c8-9725-4f20-8bb1-f455129e2a4e
+      - name: service_models/model-name/artifact/modelling_RW.py
+        sizeInBytes: 47560
+        version: a584c221-afab-441f-901d-fbe8251dccf6
+      - name: service_models/model-name/artifact/pytorch_model-00001-of-00002.bin
+        sizeInBytes: 9951028193
+        version: e919676e-48dd-4bea-af82-14b5f3eb2b9b
+      - name: service_models/model-name/artifact/pytorch_model-00002-of-00002.bin
+        sizeInBytes: 4483421659
+        version: d6255d3e-bd91-4c05-b3ca-fc1be576ee10
+      - name: service_models/model-name/artifact/pytorch_model.bin.index.json
+        sizeInBytes: 16924
+        version: 0419428c-2a7b-45d9-bb78-142fe0630017
+      - name: service_models/model-name/artifact/special_tokens_map.json
+        sizeInBytes: 281
+        version: 5569231a-a526-4881-8945-a94a1bb59b2e
+      - name: service_models/model-name/artifact/tokenizer.json
+        sizeInBytes: 2734130
+        version: d3a8a00a-de79-4d80-aa69-d8f68ee800ec
+      - name: service_models/model-name/artifact/tokenizer_config.json
+        sizeInBytes: 220
+        version: 84eed6ff-c1ed-4641-8c10-e6a49364d7dd
+      prefix: service_models/model-name/artifact
+    type: modelOSSReferenceDescription
+    version: '1.0'
+  projectId: ocid1.datascienceproject.oc1.iad.<OCID>
+  provenanceMetadata:
+    artifact_dir: null
+    git_branch: null
+    git_commit: 123456
+    repository_url: https://model-name-url.com
+    training_id: null
+    training_script_path: null
+  timeCreated: 2024-01-01T00:00:00.000000+00:00
+type: dataScienceModel
diff --git a/tests/unitary/with_extras/aqua/test_deployment.py b/tests/unitary/with_extras/aqua/test_deployment.py
@@ -171,6 +171,78 @@ class TestDataset:
         }
     ]
 
+    model_deployment_object_tei_byoc = [
+        {
+            "category_log_details": oci.data_science.models.CategoryLogDetails(
+                **{
+                    "access": oci.data_science.models.LogDetails(
+                        **{
+                            "log_group_id": "ocid1.loggroup.oc1.<region>.<OCID>",
+                            "log_id": "ocid1.log.oc1.<region>.<OCID>",
+                        }
+                    ),
+                    "predict": oci.data_science.models.LogDetails(
+                        **{
+                            "log_group_id": "ocid1.loggroup.oc1.<region>.<OCID>",
+                            "log_id": "ocid1.log.oc1.<region>.<OCID>",
+                        }
+                    ),
+                }
+            ),
+            "compartment_id": "ocid1.compartment.oc1..<OCID>",
+            "created_by": "ocid1.user.oc1..<OCID>",
+            "defined_tags": {},
+            "description": "Mock description",
+            "display_name": "model-deployment-name",
+            "freeform_tags": {"OCI_AQUA": "active", "aqua_model_name": "model-name"},
+            "id": "ocid1.datasciencemodeldeployment.oc1.<region>.<MD_OCID>",
+            "lifecycle_state": "ACTIVE",
+            "model_deployment_configuration_details": oci.data_science.models.SingleModelDeploymentConfigurationDetails(
+                **{
+                    "deployment_type": "SINGLE_MODEL",
+                    "environment_configuration_details": oci.data_science.models.OcirModelDeploymentEnvironmentConfigurationDetails(
+                        **{
+                            "cmd": [
+                                "--model-id",
+                                "/opt/ds/model/deployed_model/service_models/model-name/artifact/",
+                                "--port",
+                                "8080",
+                            ],
+                            "entrypoint": [],
+                            "environment_configuration_type": "OCIR_CONTAINER",
+                            "environment_variables": {
+                                "BASE_MODEL": "service_models/model-name/artifact",
+                                "MODEL_DEPLOY_PREDICT_ENDPOINT": "/v1/embeddings",
+                            },
+                            "health_check_port": 8080,
+                            "image": "dsmc://image-name:1.0.0.0",
+                            "image_digest": "sha256:mock22373c16f2015f6f33c5c8553923cf8520217da0bd9504471c5e53cbc9d",
+                            "server_port": 8080,
+                        }
+                    ),
+                    "model_configuration_details": oci.data_science.models.ModelConfigurationDetails(
+                        **{
+                            "bandwidth_mbps": 10,
+                            "instance_configuration": oci.data_science.models.InstanceConfiguration(
+                                **{
+                                    "instance_shape_name": DEPLOYMENT_SHAPE_NAME,
+                                    "model_deployment_instance_shape_config_details": null,
+                                }
+                            ),
+                            "model_id": "ocid1.datasciencemodel.oc1.<region>.<OCID>",
+                            "scaling_policy": oci.data_science.models.FixedSizeScalingPolicy(
+                                **{"instance_count": 1, "policy_type": "FIXED_SIZE"}
+                            ),
+                        }
+                    ),
+                }
+            ),
+            "model_deployment_url": MODEL_DEPLOYMENT_URL,
+            "project_id": "ocid1.datascienceproject.oc1.<region>.<OCID>",
+            "time_created": "2024-01-01T00:00:00.000000+00:00",
+        }
+    ]
+
     aqua_deployment_object = {
         "id": "ocid1.datasciencemodeldeployment.oc1.<region>.<MD_OCID>",
         "display_name": "model-deployment-name",
@@ -237,6 +309,25 @@ class TestDataset:
         "top_k": 10,
     }
 
+    aqua_deployment_tei_byoc_embeddings_env_vars = {
+        "BASE_MODEL": "service_models/model-name/artifact",
+        "MODEL_DEPLOY_PREDICT_ENDPOINT": "/v1/embeddings",
+    }
+
+    aqua_deployment_tei_byoc_embeddings_shape_info = {
+        "instance_shape": DEPLOYMENT_SHAPE_NAME,
+        "instance_count": 1,
+        "ocpus": None,
+        "memory_in_gbs": None,
+    }
+
+    aqua_deployment_tei_byoc_embeddings_cmd = [
+        "--model-id",
+        "/opt/ds/model/deployed_model/service_models/model-name/artifact/",
+        "--port",
+        "8080",
+    ]
+
 
 class TestAquaDeployment(unittest.TestCase):
     def setUp(self):
@@ -489,6 +580,84 @@ def test_create_deployment_for_fine_tuned_model(
         expected_result["state"] = "CREATING"
         assert actual_attributes == expected_result
 
+    @patch("ads.aqua.modeldeployment.deployment.get_container_config")
+    @patch("ads.aqua.model.AquaModelApp.create")
+    @patch("ads.aqua.modeldeployment.deployment.get_container_image")
+    @patch("ads.model.deployment.model_deployment.ModelDeployment.deploy")
+    def test_create_deployment_for_tei_byoc_embedding_model(
+        self,
+        mock_deploy,
+        mock_get_container_image,
+        mock_create,
+        mock_get_container_config,
+    ):
+        """Test to create a deployment for fine-tuned model"""
+        aqua_model = os.path.join(
+            self.curr_dir, "test_data/deployment/aqua_tei_byoc_embedding_model.yaml"
+        )
+        datascience_model = DataScienceModel.from_yaml(uri=aqua_model)
+        mock_create.return_value = datascience_model
+
+        config_json = os.path.join(
+            self.curr_dir, "test_data/deployment/deployment_config.json"
+        )
+        with open(config_json, "r") as _file:
+            config = json.load(_file)
+
+        self.app.get_deployment_config = MagicMock(return_value=config)
+
+        container_index_json = os.path.join(
+            self.curr_dir, "test_data/ui/container_index.json"
+        )
+        with open(container_index_json, "r") as _file:
+            container_index_config = json.load(_file)
+        mock_get_container_config.return_value = container_index_config
+
+        mock_get_container_image.return_value = TestDataset.DEPLOYMENT_IMAGE_NAME
+        aqua_deployment = os.path.join(
+            self.curr_dir, "test_data/deployment/aqua_create_embedding_deployment.yaml"
+        )
+        model_deployment_obj = ModelDeployment.from_yaml(uri=aqua_deployment)
+        model_deployment_dsc_obj = copy.deepcopy(
+            TestDataset.model_deployment_object_tei_byoc[0]
+        )
+        model_deployment_dsc_obj["lifecycle_state"] = "CREATING"
+        model_deployment_obj.dsc_model_deployment = (
+            oci.data_science.models.ModelDeploymentSummary(**model_deployment_dsc_obj)
+        )
+        mock_deploy.return_value = model_deployment_obj
+
+        result = self.app.create(
+            model_id=TestDataset.MODEL_ID,
+            instance_shape=TestDataset.DEPLOYMENT_SHAPE_NAME,
+            display_name="model-deployment-name",
+            log_group_id="ocid1.loggroup.oc1.<region>.<OCID>",
+            access_log_id="ocid1.log.oc1.<region>.<OCID>",
+            predict_log_id="ocid1.log.oc1.<region>.<OCID>",
+            container_family="odsc-tei-serving",
+            cmd_var=[],
+        )
+
+        mock_create.assert_called_with(
+            model_id=TestDataset.MODEL_ID, compartment_id=None, project_id=None
+        )
+        mock_get_container_image.assert_called()
+        mock_deploy.assert_called()
+
+        expected_attributes = set(AquaDeployment.__annotations__.keys())
+        actual_attributes = asdict(result)
+        assert set(actual_attributes) == set(expected_attributes), "Attributes mismatch"
+        expected_result = copy.deepcopy(TestDataset.aqua_deployment_object)
+        expected_result["state"] = "CREATING"
+        expected_result["shape_info"] = (
+            TestDataset.aqua_deployment_tei_byoc_embeddings_shape_info
+        )
+        expected_result["cmd"] = TestDataset.aqua_deployment_tei_byoc_embeddings_cmd
+        expected_result["environment_variables"] = (
+            TestDataset.aqua_deployment_tei_byoc_embeddings_env_vars
+        )
+        assert actual_attributes == expected_result
+
     @patch("ads.aqua.modeldeployment.deployment.get_container_config")
     @patch("ads.aqua.model.AquaModelApp.create")
     @patch("ads.aqua.modeldeployment.deployment.get_container_image")
