Merge branch 'main' into feature/oss-bucket-config-dependency

Author: kumar-shivam-ranjan

README-development.md

@@ -4,7 +4,7 @@
 The Oracle Accelerated Data Science (ADS) SDK used by data scientists and analysts for
 data exploration and experimental machine learning to democratize machine learning and
 analytics by providing easy-to-use, 
-performant, and user friendly tools that
+performant, and user-friendly tools that
 brings together the best of data science practices.
 
 The ADS SDK helps you connect to different data sources, perform exploratory data analysis,
@@ -176,7 +176,7 @@ pip install -r test-requirements.txt
 ```
 
 ### Step 2: Create local .env files 
-Running the local JuypterLab server requires setting OCI authentication, proxy, and OCI namespace parameters. Adapt this .env file with your specific OCI profile and OCIDs to set these variables.
+Running the local JupyterLab server requires setting OCI authentication, proxy, and OCI namespace parameters. Adapt this .env file with your specific OCI profile and OCIDs to set these variables.
 
 ```
 CONDA_BUCKET_NS="your_conda_bucket"

ads/aqua/common/enums.py

@@ -2,6 +2,8 @@
 # Copyright (c) 2024, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
+from typing import Dict, List
+
 from ads.common.extended_enum import ExtendedEnum
 
 
@@ -106,3 +108,15 @@ class ModelFormat(ExtendedEnum):
 class Platform(ExtendedEnum):
     ARM_CPU = "ARM_CPU"
     NVIDIA_GPU = "NVIDIA_GPU"
+
+
+# This dictionary defines compatibility groups for container families.
+# The structure is:
+#   - Key: The preferred container family to use when multiple compatible families are selected.
+#   - Value: A list of all compatible families (including the preferred one).
+CONTAINER_FAMILY_COMPATIBILITY: Dict[str, List[str]] = {
+    InferenceContainerTypeFamily.AQUA_VLLM_V1_CONTAINER_FAMILY: [
+        InferenceContainerTypeFamily.AQUA_VLLM_V1_CONTAINER_FAMILY,
+        InferenceContainerTypeFamily.AQUA_VLLM_CONTAINER_FAMILY,
+    ],
+}

ads/aqua/common/utils.py

@@ -37,6 +37,7 @@
 
 from ads.aqua.common.entities import GPUShapesIndex
 from ads.aqua.common.enums import (
+    CONTAINER_FAMILY_COMPATIBILITY,
     InferenceContainerParamType,
     InferenceContainerType,
     RqsAdditionalDetails,
@@ -1245,3 +1246,40 @@ def load_gpu_shapes_index(
             )
 
     return GPUShapesIndex(**data)
+
+
+def get_preferred_compatible_family(selected_families: set[str]) -> str:
+    """
+    Determines the preferred container family from a given set of container families.
+
+    This method is used in the context of multi-model deployment to handle cases
+    where models selected for deployment use different, but compatible, container families.
+
+    It checks the input `families` set against the `CONTAINER_FAMILY_COMPATIBILITY` map.
+    If a compatibility group exists that fully includes all the families in the input,
+    the corresponding key (i.e., the preferred family) is returned.
+
+    Parameters
+    ----------
+    families : set[str]
+        A set of container family identifiers.
+
+    Returns
+    -------
+    Optional[str]
+        The preferred container family if all families are compatible within one group;
+        otherwise, returns `None` indicating that no compatible family group was found.
+
+    Example
+    -------
+    >>> get_preferred_compatible_family({"odsc-vllm-serving", "odsc-vllm-serving-v1"})
+    'odsc-vllm-serving-v1'
+
+    >>> get_preferred_compatible_family({"odsc-vllm-serving", "odsc-tgi-serving"})
+    None  # Incompatible families
+    """
+    for preferred, compatible_list in CONTAINER_FAMILY_COMPATIBILITY.items():
+        if selected_families.issubset(set(compatible_list)):
+            return preferred
+
+    return None

ads/aqua/model/model.py

@@ -38,6 +38,7 @@
     generate_tei_cmd_var,
     get_artifact_path,
     get_hf_model_info,
+    get_preferred_compatible_family,
     list_os_files_with_extension,
     load_config,
     upload_folder,
@@ -343,15 +344,25 @@ def create_multi(
 
             selected_models_deployment_containers.add(deployment_container)
 
-        # Check if the all models in the group shares same container family
-        if len(selected_models_deployment_containers) > 1:
+        if not selected_models_deployment_containers:
             raise AquaValueError(
-                "The selected models are associated with different container families: "
-                f"{list(selected_models_deployment_containers)}."
-                "For multi-model deployment, all models in the group must share the same container family."
+                "None of the selected models are associated with a recognized container family. "
+                "Please review the selected models, or select a different group of models."
             )
 
-        deployment_container = selected_models_deployment_containers.pop()
+        # Check if the all models in the group shares same container family
+        if len(selected_models_deployment_containers) > 1:
+            deployment_container = get_preferred_compatible_family(
+                selected_families=selected_models_deployment_containers
+            )
+            if not deployment_container:
+                raise AquaValueError(
+                    "The selected models are associated with different container families: "
+                    f"{list(selected_models_deployment_containers)}."
+                    "For multi-model deployment, all models in the group must share the same container family."
+                )
+        else:
+            deployment_container = selected_models_deployment_containers.pop()
 
         # Generate model group details
         timestamp = datetime.now().strftime("%Y%m%d")

ads/dataset/recommendation.py

@@ -1,15 +1,14 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
-# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import copy
 import importlib
 
 from ads.common.decorator.runtime_dependency import (
-    runtime_dependency,
     OptionalDependency,
+    runtime_dependency,
 )
 from ads.dataset import logger
 
@@ -59,11 +58,10 @@ def on_action_change(change):
             if change["type"] == "change" and change["name"] == "value":
                 if change["new"] == "Fill missing values with constant":
                     self._show_constant_fill_widget(column)
-                else:
-                    if change["old"] == "Fill missing values with constant":
-                        text = self.fill_nan_dict.pop(column, None)
-                        if text is not None:
-                            text.close()
+                elif change["old"] == "Fill missing values with constant":
+                    text = self.fill_nan_dict.pop(column, None)
+                    if text is not None:
+                        text.close()
                 self.reco_dict[recommendation_type][column]["Selected Action"] = change[
                     "new"
                 ]
@@ -151,7 +149,6 @@ def show_in_notebook(self):
     @runtime_dependency(module="IPython", install_from=OptionalDependency.NOTEBOOK)
     @runtime_dependency(module="ipywidgets", install_from=OptionalDependency.NOTEBOOK)
     def _display(self):
-
         from IPython.core.display import display
 
         if self.recommendation_type_index != len(self.recommendation_types):
@@ -164,11 +161,7 @@ def _display(self):
                 ]
                 if self.recommendation_type_index == 0:
                     for column in recommendation:
-                        print(
-                            "Column '{0}' is constant and will be dropped".format(
-                                column
-                            )
-                        )
+                        print(f"Column '{column}' is constant and will be dropped")
                     self.recommendation_type_index += 1
                     self._display()
                     return
@@ -184,17 +177,17 @@ def _display(self):
                                     self.recommendation_type_labels[
                                         self.recommendation_type_index
                                     ]
-                                )
+                                ),
+                                layout=ipywidgets.Layout(display="flex"),
                             ),
-                            layout=ipywidgets.Layout(display="flex"),
                         )
                         self.action_list[
                             self.recommendation_types[self.recommendation_type_index]
                         ] = []
                         self.column_list = []
                         self.message_list = []
                         self.extra_info_list = []
-                        for column in recommendation.keys():
+                        for column in recommendation:
                             messages = ipywidgets.Label(
                                 recommendation[column]["Message"],
                                 layout=ipywidgets.Layout(
@@ -240,9 +233,7 @@ def _display(self):
                             self.column_list.append(
                                 ipywidgets.Label(
                                     column
-                                    + "(type: {0})".format(
-                                        self.ds.sampled_df[column].dtype
-                                    ),
+                                    + f"(type: {self.ds.sampled_df[column].dtype})",
                                     layout=ipywidgets.Layout(flex="auto"),
                                     color="grey",
                                 )

ads/opctl/operator/lowcode/pii/model/report.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 
@@ -123,7 +123,6 @@ def make_model_card(model_name="", readme_path=""):
         )
         return rc.Group(
             rc.Text("-"),
-            columns=1,
         )
 
     try:
@@ -156,7 +155,6 @@ def make_model_card(model_name="", readme_path=""):
     return rc.Group(
         rc.Text(text),
         eval_res_tb,
-        columns=2,
     )
 
 
@@ -216,7 +214,7 @@ def build_entity_df(entites, id) -> pd.DataFrame:
             "Type": "-",
             "Redacted To": "-",
         }
-        df = df.append(df2, ignore_index=True)
+        df = pd.concat([df, pd.DataFrame([df2])], ignore_index=True)
     return df
 
 
@@ -232,7 +230,6 @@ def build_report(self) -> rc.Group:
                     self._make_stats_card(),
                     self._make_text_card(),
                 ],
-                type=rc.SelectType.TABS,
             ),
             label="Row Id: " + str(self.spec.id),
         )
@@ -256,7 +253,7 @@ def _make_stats_card(self):
                     index=True,
                 )
             )
-        return rc.Group(stats, label="STATS")
+        return rc.Group(*stats, label="STATS")
 
     def _make_text_card(self):
         annotations = []
@@ -277,7 +274,7 @@ def _make_text_card(self):
             },
             return_html=True,
         )
-        return rc.Group(rc.HTML(render_html), label="TEXT")
+        return rc.Group(rc.Html(render_html), label="TEXT")
 
 
 class PIIOperatorReport:
@@ -292,7 +289,7 @@ def __init__(self, report_spec: PiiReportSpec, report_uri: str):
             RowReportFields(r, report_spec.run_summary.show_sensitive_info)
             for r in rows
         ]
-
+        self.report_sections = None
         self.report_uri = report_uri
 
     def make_view(self):
@@ -317,7 +314,6 @@ def make_view(self):
                         label="Details",
                     ),
                 ],
-                type=rc.SelectType.TABS,
             )
         )
         self.report_sections = [title_text, report_description, time_proceed, structure]
@@ -331,7 +327,8 @@ def save_report(
             disable_print()
             with rc.ReportCreator("My Report") as report:
                 report.save(
-                    rc.Block(report_sections or self.report_sections), report_local_path
+                    rc.Block(*(report_sections or self.report_sections)),
+                    report_local_path,
                 )
             enable_print()
 
@@ -354,7 +351,6 @@ def _build_summary_page(self):
                     self._make_yaml_card(),
                     self._make_model_card(),
                 ],
-                type=rc.SelectType.TABS,
             ),
         )
 
@@ -367,7 +363,6 @@ def _build_details_page(self):
                 blocks=[
                     row.build_report() for row in self.rows_details
                 ],  # RowReportFields
-                type=rc.SelectType.DROPDOWN,
                 label="Details",
             ),
         )
@@ -414,7 +409,6 @@ def _make_summary_stats_card(self) -> rc.Group:
                         self.report_spec.run_summary.elapsed_time
                     ),
                 ),
-                columns=2,
             ),
             rc.Heading("Entities Distribution", level=3),
             plot_pie(self.report_spec.run_summary.statics),
@@ -423,7 +417,7 @@ def _make_summary_stats_card(self) -> rc.Group:
             entites_df = self._build_total_entity_df()
             summary_stats.append(rc.Heading("Resolved Entities", level=3))
             summary_stats.append(rc.DataTable(entites_df, index=True))
-        return rc.Group(summary_stats, label="STATS")
+        return rc.Group(*summary_stats, label="STATS")
 
     def _make_yaml_card(self) -> rc.Group:
         """Shows the full pii config yaml."""
@@ -449,13 +443,12 @@ def _make_model_card(self) -> rc.Group:
 
         if len(model_cards) <= 1:
             return rc.Group(
-                model_cards,
+                *model_cards,
                 label="MODEL CARD",
             )
         return rc.Group(
             rc.Select(
                 model_cards,
-                type=rc.SelectType.TABS,
             ),
             label="MODEL CARD",
         )

docs/source/release_notes.rst

@@ -2,6 +2,15 @@
 Release Notes
 =============
 
+2.13.6
+-------
+Release date: April 7, 2025
+
+* Fixed PII operator report generator script to use the latest code from ``report-creator``.
+* AI Quick Actions: Enhance the container family validation for multi-model deployment.
+* AI Quick Actions: Removing OSS bucket config dependency.
+
+
 2.13.5
 -------
 Release date: April 3, 2025

docs/source/user_guide/configuration/configuration.rst

@@ -296,7 +296,7 @@ encryption keys.
 
 Master encryption keys can be generated internally by the Vault service
 or imported to the service from an external source. Once a master
-encryption key has been created, the Oracle Cloud Infrastruture API can
+encryption key has been created, the Oracle Cloud Infrastructure API can
 be used to generate data encryption keys that the Vault service returns
 to you. by default, a wrapping key is included with each vault. A
 wrapping key is a 4096-bit asymmetric encryption key pair based on the
@@ -673,7 +673,7 @@ prints it. This shows that the password was actually updated.
         wait_for_states=[oci.vault.models.Secret.LIFECYCLE_STATE_ACTIVE]).data
 
     # The secret OCID does not change.
-    print("Orginal Secret OCID: {}".format(secret_id))
+    print("Original Secret OCID: {}".format(secret_id))
     print("Updated Secret OCID: {}".format(secret_update.id))
 
     ### Read a secret's value.
@@ -685,7 +685,7 @@ prints it. This shows that the password was actually updated.
 
 .. parsed-literal::
 
-    Orginal Secret OCID: ocid1.vaultsecret.oc1.iad.amaaaaaav66vvnia2bmkbroin34eu2ghmubvmrtjdgo4yr6daewakacwuk4q
+    Original Secret OCID: ocid1.vaultsecret.oc1.iad.amaaaaaav66vvnia2bmkbroin34eu2ghmubvmrtjdgo4yr6daewakacwuk4q
     Updated Secret OCID: ocid1.vaultsecret.oc1.iad.amaaaaaav66vvnia2bmkbroin34eu2ghmubvmrtjdgo4yr6daewakacwuk4q
     {'database': 'datamart', 'username': 'admin', 'password': 'UpdatedPassword'}