Skip to content

handling Model Deployment list for model group deployment type #1247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ads/aqua/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
MODEL_BY_REFERENCE_OSS_PATH_KEY = "artifact_location"

AQUA_CHAT_TEMPLATE_METADATA_KEY = "chat_template"
UNKNOWN_ENUM_VALUE = "UNKNOWN_ENUM_VALUE"
MODEL_GROUP = "MODEL_GROUP"
SINGLE_MODEL_FLEX = "SINGLE_MODEL_FLEX"

CONSOLE_LINK_RESOURCE_TYPE_MAPPING = {
"datasciencemodel": "models",
Expand Down
30 changes: 19 additions & 11 deletions ads/aqua/modeldeployment/deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@
AQUA_MODEL_TYPE_SERVICE,
AQUA_MULTI_MODEL_CONFIG,
MODEL_BY_REFERENCE_OSS_PATH_KEY,
MODEL_GROUP,
MODEL_NAME_DELIMITER,
SINGLE_MODEL_FLEX,
UNKNOWN_DICT,
UNKNOWN_ENUM_VALUE,
)
from ads.aqua.data import AquaResourceIdentifier
from ads.aqua.model import AquaModelApp
Expand Down Expand Up @@ -864,21 +867,26 @@ 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 model_deployment.model_deployment_configuration_details.deployment_type
== "UNKNOWN_ENUM_VALUE"
model_deployment.model_deployment_configuration_details.deployment_type
in [UNKNOWN_ENUM_VALUE, MODEL_GROUP, SINGLE_MODEL_FLEX]
):
continue
results.append(
AquaDeployment.from_oci_model_deployment(
model_deployment, self.region
try:
results.append(
AquaDeployment.from_oci_model_deployment(
model_deployment, self.region
)
)
)
except Exception as e:
logger.error(
f"There was an issue processing the list of model deployments . Error: {str(e)}",
exc_info=True,
)
raise AquaRuntimeError(
f"There was an issue processing the list of model deployments . Error: {str(e)}"
) from e

# log telemetry if MD is in active or failed state
deployment_id = model_deployment.id
state = model_deployment.lifecycle_state.upper()
Expand Down
Loading