oracle-ads 2.13.5__tar.gz → 2.13.6__tar.gz

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oracle_ads
-Version: 2.13.5
+Version: 2.13.6
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
 Author: Oracle Data Science

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/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,
+    ],
+}

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/ads/aqua/common/utils.py

@@ -37,6 +37,7 @@ from pydantic import BaseModel, ValidationError
 
 from ads.aqua.common.entities import GPUShapesIndex
 from ads.aqua.common.enums import (
+    CONTAINER_FAMILY_COMPATIBILITY,
     InferenceContainerParamType,
     InferenceContainerType,
     RqsAdditionalDetails,
@@ -1316,3 +1317,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

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/ads/aqua/model/model.py

@@ -39,6 +39,7 @@ from ads.aqua.common.utils import (
     get_artifact_path,
     get_container_config,
     get_hf_model_info,
+    get_preferred_compatible_family,
     list_os_files_with_extension,
     load_config,
     read_file,
@@ -337,15 +338,25 @@ class AquaModelApp(AquaApp):
 
             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")

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/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 @@ class Recommendation:
             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 @@ class Recommendation:
     @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 @@ class Recommendation:
                 ]
                 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,9 +177,9 @@ class Recommendation:
                                     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]
@@ -194,7 +187,7 @@ class Recommendation:
                         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 @@ class Recommendation:
                             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",
                                 )

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/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 @@ class RowReportFields:
                     self._make_stats_card(),
                     self._make_text_card(),
                 ],
-                type=rc.SelectType.TABS,
             ),
             label="Row Id: " + str(self.spec.id),
         )
@@ -256,7 +253,7 @@ class RowReportFields:
                     index=True,
                 )
             )
-        return rc.Group(stats, label="STATS")
+        return rc.Group(*stats, label="STATS")
 
     def _make_text_card(self):
         annotations = []
@@ -277,7 +274,7 @@ class RowReportFields:
             },
             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 @@ class PIIOperatorReport:
             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 @@ class PIIOperatorReport:
                         label="Details",
                     ),
                 ],
-                type=rc.SelectType.TABS,
             )
         )
         self.report_sections = [title_text, report_description, time_proceed, structure]
@@ -331,7 +327,8 @@ class PIIOperatorReport:
             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 @@ class PIIOperatorReport:
                     self._make_yaml_card(),
                     self._make_model_card(),
                 ],
-                type=rc.SelectType.TABS,
             ),
         )
 
@@ -367,7 +363,6 @@ class PIIOperatorReport:
                 blocks=[
                     row.build_report() for row in self.rows_details
                 ],  # RowReportFields
-                type=rc.SelectType.DROPDOWN,
                 label="Details",
             ),
         )
@@ -414,7 +409,6 @@ class PIIOperatorReport:
                         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 @@ class PIIOperatorReport:
             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 @@ class PIIOperatorReport:
 
         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",
         )

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/ads/opctl/utils.py

@@ -154,7 +154,7 @@ def build_image(image_type: str, gpu: bool = False) -> None:
         # Just get the manufacturer of the processors
         manufacturer = cpuinfo.get_cpu_info().get("brand_raw")
         arch = (
-            "arm" if re.search("apple m\d ", manufacturer, re.IGNORECASE) else "other"
+            "arm" if re.search("apple m\d", manufacturer, re.IGNORECASE) else "other"
         )
         print(f"The local machine's platform is {arch}.")
         image, dockerfile, target = _get_image_name_dockerfile_target(

{oracle_ads-2.13.5 → oracle_ads-2.13.6}/pyproject.toml

@@ -21,7 +21,7 @@ build-backend = "flit_core.buildapi"
 
 # Required
 name = "oracle_ads" # the install (PyPI) name; name for local build in [tool.flit.module] section below
-version = "2.13.5"
+version = "2.13.6"
 
 # Optional
 description = "Oracle Accelerated Data Science SDK"