oracle-ads 2.13.5__py3-none-any.whl → 2.13.6__py3-none-any.whl

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 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

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")

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",
                                 )

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",
         )

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.dist-info → oracle_ads-2.13.6.dist-info}/METADATA

@@ -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.dist-info → oracle_ads-2.13.6.dist-info}/RECORD

@@ -13,9 +13,9 @@ ads/aqua/client/openai_client.py,sha256=Gi8nSrtPAUOjxRNu-6UUAqtxWyQIQ5CAvatnm7Xf
 ads/aqua/common/__init__.py,sha256=rZrmh1nho40OCeabXCNWtze-mXi-PGKetcZdxZSn3_0,204
 ads/aqua/common/decorator.py,sha256=JEN6Cy4DYgQbmIR3ShCjTuBMCnilDxq7jkYMJse1rcM,4112
 ads/aqua/common/entities.py,sha256=kLUJu77Sg97VrHb76PvFAAaSWEUum9nYTwzMtOnUo50,8922
-ads/aqua/common/enums.py,sha256=ZuGidUsZvfWkTxkj4S6K9tRJAXPTrR7t2v4JgGSV7_8,3175
+ads/aqua/common/enums.py,sha256=rTZDOQzTfcgwEl7gjVY3_JotHXkz7wB_edEIB0i6AeQ,3739
 ads/aqua/common/errors.py,sha256=QONm-2jKBg8AjgOKXm6x-arAV1KIW9pdhfNN1Ys21Wo,3044
-ads/aqua/common/utils.py,sha256=enU8TvoR4-kaNKRt7SCF-ARMFrDNs6vOsubFfyqV5S0,42843
+ads/aqua/common/utils.py,sha256=OtHtGCC0gZvqNif_sfQoYp4KnZhIulv5a_gbceomIew,44238
 ads/aqua/config/__init__.py,sha256=2a_1LI4jWtJpbic5_v4EoOUTXCAH7cmsy9BW5prDHjU,179
 ads/aqua/config/config.py,sha256=MNY4ttccaQdhxUyS1o367YIDl-U_AiSLVlgvzSd7JE4,944
 ads/aqua/config/container_config.py,sha256=7n3ZZG7Y1J4IkwEAhkoQ-h638pthPcyjRQogR25pSB4,8292
@@ -58,7 +58,7 @@ ads/aqua/model/__init__.py,sha256=j2iylvERdANxgrEDp7b_mLcKMz1CF5Go0qgYCiMwdos,27
 ads/aqua/model/constants.py,sha256=3BT5Dpr7EmTrBL7xF128gHGGjwyBgwAr3OlLSWSnR9g,1628
 ads/aqua/model/entities.py,sha256=kBjsihInnbGw9MhWQEfJ4hcWEzv6BxF8VlDDFWUPYVg,9903
 ads/aqua/model/enums.py,sha256=iJi-AZRh7KR_HK5HUwTkgnTOGVna2Ai5WEzqCjk7Y3s,1079
-ads/aqua/model/model.py,sha256=Um7CqAJlFm4UOFtfU70KUXOaTC2fVpixJi1MqOUBKSQ,78762
+ads/aqua/model/model.py,sha256=9gl2bPyUURb3azHmtu-iZJy2-hpCQKI-NvVPAxjPuy8,79324
 ads/aqua/modeldeployment/__init__.py,sha256=RJCfU1yazv3hVWi5rS08QVLTpTwZLnlC8wU8diwFjnM,391
 ads/aqua/modeldeployment/constants.py,sha256=lJF77zwxmlECljDYjwFAMprAUR_zctZHmawiP-4alLg,296
 ads/aqua/modeldeployment/deployment.py,sha256=bKwq0-qrAni2mZ9LMslcME-qlWSOhp7bn1H1zCvi1e0,55636
@@ -171,7 +171,7 @@ ads/dataset/label_encoder.py,sha256=JEvS7zdQRrj-hyDqLCY-tXLeROYCtdibapRWoUDXy_0,
 ads/dataset/pipeline.py,sha256=laXu4E-ipL7UKWEeTcvJEw2ub8YYUNFUo4Taqa4eB_o,1642
 ads/dataset/plot.py,sha256=8DB7brJqBJBsTFWogOxfYPYwTykFwAHFOIjA3Q8P2NE,26056
 ads/dataset/progress.py,sha256=ulcjMurT0P0FKJk0-6tmUQF5clpv2VGpnD2shM2EIHA,2298
-ads/dataset/recommendation.py,sha256=GZQiTxAC8ucSRV6W_ioEtbN8tKUV2By930iaBgGckjA,12909
+ads/dataset/recommendation.py,sha256=lxVN9ThG2Mjs9aSLbVRxx_lWJ1U3kFZEN5QoqMiY-aw,12633
 ads/dataset/recommendation_transformer.py,sha256=ijt7EnG65vUuuMgfMH6gRE-kSVXtXoHvieFiagWg05U,22159
 ads/dataset/regression_dataset.py,sha256=KYoxzhn7kPXSUFX_QDDC4eSHP-3rAC3Y-2BHj-L28Zo,562
 ads/dataset/sampled_dataset.py,sha256=rvmQagFVDXZXtmUw_ugKO1cDL4sOZfqvsG033PnxXR4,39566
@@ -579,7 +579,7 @@ ads/opctl/forecast.py,sha256=ZInj8FyXHkdjiEmXDc-jH1xT7JAGHEKwP0Lnq39xWGQ,418
 ads/opctl/index.yaml,sha256=cf9j3VXcNY-DvFlAZQLZj8-hA9QArWlirPtN1sRKqyM,68
 ads/opctl/schema.yaml.yml,sha256=L4eoHVFLu5tHPDOD53-dVGbscKkXG86i4IbRX-bVL2g,546
 ads/opctl/script.py,sha256=3AgTOjDnvmheu4ROrn56d38h8wZVOZwne_ix2x3U6bY,1181
-ads/opctl/utils.py,sha256=DcEbj4xMB4H8brjwq6-F1SyWDK4o007xRTWC0IEmvoM,10672
+ads/opctl/utils.py,sha256=QL0TmdVdP9Cywwqt8pF7mcpJpG0tLfc8A9M6X_sb20U,10671
 ads/opctl/backend/__init__.py,sha256=DwYupQz6SOfMLmmAjJ9danchK0shQRJKTGPU--naQgY,204
 ads/opctl/backend/ads_dataflow.py,sha256=XHk6OEcaWPU6vRvvRMqROiN8PriFKx_5Gvu6cz6pZas,13031
 ads/opctl/backend/ads_ml_job.py,sha256=Wwt2uiehi7ulkoPlhb4k5UeqYw1Y56Y_ANhGw5G5zP8,27834
@@ -748,7 +748,7 @@ ads/opctl/operator/lowcode/pii/model/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmS
 ads/opctl/operator/lowcode/pii/model/factory.py,sha256=mM-xifHwVa1tGHcTcvgySUrGsPmIqmOavf8i_dVbkRQ,2502
 ads/opctl/operator/lowcode/pii/model/guardrails.py,sha256=--GUFt-zlVyJY5WQZNMHjQDlVfVy-tYeXubgvYN-H-U,6246
 ads/opctl/operator/lowcode/pii/model/pii.py,sha256=hbOomsCNgj7uZNOdUIja3rE-iTGhh9P2hKh8xrtpXR4,5110
-ads/opctl/operator/lowcode/pii/model/report.py,sha256=vDivP5dWWBoIzDpT1ww2WMBZKybX6DigaPSCW46F__Q,16361
+ads/opctl/operator/lowcode/pii/model/report.py,sha256=8D24DlDHPy_FRNUzFkKN7iTFH-974xiJ48rzUWsUsd8,16167
 ads/opctl/operator/lowcode/pii/model/processor/__init__.py,sha256=febfGPoGJXTD-hCJoiVmsnBP3K3MYBqfuQoTNPm_4kY,910
 ads/opctl/operator/lowcode/pii/model/processor/email_replacer.py,sha256=sTjMbP8UfwszrzFI0QgzZ0BwWfVqYxhWJ1z8S5AcE2U,996
 ads/opctl/operator/lowcode/pii/model/processor/mbi_replacer.py,sha256=nm4dRZjFwxraktXTR1FConaAH4o1uagiXMVeGU0H0O0,1025
@@ -852,8 +852,8 @@ ads/type_discovery/unknown_detector.py,sha256=yZuYQReO7PUyoWZE7onhhtYaOg6088wf1y
 ads/type_discovery/zipcode_detector.py,sha256=3AlETg_ZF4FT0u914WXvTT3F3Z6Vf51WiIt34yQMRbw,1421
 ads/vault/__init__.py,sha256=x9tMdDAOdF5iDHk9u2di_K-ze5Nq068x25EWOBoWwqY,245
 ads/vault/vault.py,sha256=hFBkpYE-Hfmzu1L0sQwUfYcGxpWmgG18JPndRl0NOXI,8624
-oracle_ads-2.13.5.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.13.5.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.13.5.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-oracle_ads-2.13.5.dist-info/METADATA,sha256=X_fCTf7Z5NMzhSK-j-O9ikinJQ6WMydYIZyfJO7TfPE,16639
-oracle_ads-2.13.5.dist-info/RECORD,,
+oracle_ads-2.13.6.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.13.6.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.13.6.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+oracle_ads-2.13.6.dist-info/METADATA,sha256=r07qyuquzLOV4t2OloGNRKDEgdbwifVB6v6viXCK7oI,16639
+oracle_ads-2.13.6.dist-info/RECORD,,