Merge branch 'main' into track_md_logs_for_error_logging

Author: agrimk

ads/aqua/modeldeployment/deployment.py

@@ -851,6 +851,13 @@ def list(self, **kwargs) -> List["AquaDeployment"]:
             )
 
             if oci_aqua:
+                # skipping the AQUA model deployments that are created from model group
+                # TODO: remove this checker after AQUA deployment is integrated with model group
+                aqua_model_id = model_deployment.freeform_tags.get(
+                    Tags.AQUA_MODEL_ID_TAG, UNKNOWN
+                )
+                if "datasciencemodelgroup" in aqua_model_id:
+                    continue
                 results.append(
                     AquaDeployment.from_oci_model_deployment(
                         model_deployment, self.region