Merge branch 'feature/aquav1.0.1' of github.com:oracle/accelerated-data-science into feature/aquav1.0.1

Author: VipulMascarenhas

ads/aqua/deployment.py

@@ -403,17 +403,12 @@ def create(
             detail=model_name,
             **telemetry_kwargs,
         )
-        # tracks the shape used for deploying the custom or service models
-        self.telemetry.record_event_async(
-            category=f"aqua/{model_type}/deployment/create",
-            action="shape",
-            detail=instance_shape,
-        )
         # tracks the shape used for deploying the custom or service models by name
         self.telemetry.record_event_async(
-            category=f"aqua/{model_type}/{model_name}/deployment/create",
+            category=f"aqua/{model_type}/deployment/create",
             action="shape",
             detail=instance_shape,
+            value=model_name,
         )
 
         return AquaDeployment.from_oci_model_deployment(

ads/aqua/evaluation.py

@@ -683,6 +683,14 @@ def create(
             ),
         )
 
+        # tracks shapes used in evaluation that were created for the given evaluation source
+        self.telemetry.record_event_async(
+            category="aqua/evaluation/create",
+            action="shape",
+            detail=create_aqua_evaluation_details.shape_name,
+            value=self._get_service_model_name(evaluation_source),
+        )
+
         # tracks unique evaluation that were created for the given evaluation source
         self.telemetry.record_event_async(
             category="aqua/evaluation",

ads/aqua/finetune.py

@@ -462,8 +462,9 @@ def create(
         telemetry_kwargs = (
             {"ocid": ft_job.id[-6:]} if ft_job and len(ft_job.id) > 6 else {}
         )
+        # track shapes that were used for fine-tune creation
         self.telemetry.record_event_async(
-            category=f"aqua/service/{source.display_name}/finetune/create/shape/",
+            category=f"aqua/service/finetune/create/shape/",
             action=f"{create_fine_tuning_details.shape_name}x{create_fine_tuning_details.replica}",
             **telemetry_kwargs,
         )
@@ -473,6 +474,14 @@ def create(
             category="aqua/service/finetune",
             action="create",
             detail=source.display_name,
+            **telemetry_kwargs,
+        )
+        # track combination of model and shape used for fine-tune creation
+        self.telemetry.record_event_async(
+            category="aqua/service/finetune/create",
+            action="shape",
+            detail=f"{create_fine_tuning_details.shape_name}x{create_fine_tuning_details.replica}",
+            value=source.display_name,
         )
 
         return AquaFineTuningSummary(