From b5a65bbe5a82c4d304c6d11c7bcab31e550e3751 Mon Sep 17 00:00:00 2001 From: Lu Peng Date: Fri, 27 Jun 2025 14:15:40 -0400 Subject: [PATCH 1/4] Skip aqua deployments that are created from model group. --- ads/aqua/modeldeployment/deployment.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ads/aqua/modeldeployment/deployment.py b/ads/aqua/modeldeployment/deployment.py index 82402af4b..f86881b75 100644 --- a/ads/aqua/modeldeployment/deployment.py +++ b/ads/aqua/modeldeployment/deployment.py @@ -847,6 +847,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 From c7318aa5c9eb4eb4af731f6f26673ac3a1ab01d9 Mon Sep 17 00:00:00 2001 From: Kumar Ranjan Date: Thu, 10 Jul 2025 12:29:47 +0530 Subject: [PATCH 2/4] Fixing LIST MD AQUA call --- ads/aqua/modeldeployment/deployment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ads/aqua/modeldeployment/deployment.py b/ads/aqua/modeldeployment/deployment.py index f86881b75..dff1f0d1c 100644 --- a/ads/aqua/modeldeployment/deployment.py +++ b/ads/aqua/modeldeployment/deployment.py @@ -852,7 +852,7 @@ def list(self, **kwargs) -> List["AquaDeployment"]: aqua_model_id = model_deployment.freeform_tags.get( Tags.AQUA_MODEL_ID_TAG, UNKNOWN ) - if "datasciencemodelgroup" in aqua_model_id: + if "datasciencemodelgroup" in aqua_model_id or not aqua_model_id: continue results.append( AquaDeployment.from_oci_model_deployment( From fcfd0b8cf8c1390e5a036a87f487d257d00efc95 Mon Sep 17 00:00:00 2001 From: Kumar Ranjan Date: Thu, 10 Jul 2025 15:16:54 +0530 Subject: [PATCH 3/4] Fixing MD list call --- ads/aqua/modeldeployment/deployment.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ads/aqua/modeldeployment/deployment.py b/ads/aqua/modeldeployment/deployment.py index b4dae9bc9..460a62ff3 100644 --- a/ads/aqua/modeldeployment/deployment.py +++ b/ads/aqua/modeldeployment/deployment.py @@ -864,17 +864,21 @@ 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 or not aqua_model_id: + if ( + "datasciencemodelgroup" in aqua_model_id + or model_deployment.model_deployment_configuration_details.deployment_type + == "UNKNOWN_ENUM_VALUE" + ): continue results.append( AquaDeployment.from_oci_model_deployment( model_deployment, self.region ) ) - # log telemetry if MD is in active or failed state deployment_id = model_deployment.id state = model_deployment.lifecycle_state.upper() From a67c7cc1fd61acb939540554c31c5e192d966e6a Mon Sep 17 00:00:00 2001 From: Kumar Ranjan Date: Thu, 10 Jul 2025 15:17:44 +0530 Subject: [PATCH 4/4] Fixing MD list call --- ads/aqua/modeldeployment/deployment.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ads/aqua/modeldeployment/deployment.py b/ads/aqua/modeldeployment/deployment.py index 460a62ff3..8d0a3d37b 100644 --- a/ads/aqua/modeldeployment/deployment.py +++ b/ads/aqua/modeldeployment/deployment.py @@ -864,7 +864,6 @@ 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 )