oracle-ads 2.13.15__py3-none-any.whl → 2.13.17rc0__py3-none-any.whl

ads/aqua/client/client.py

@@ -582,6 +582,19 @@ class Client(BaseClient):
         payload = {**(payload or {}), "input": input}
         return self._request(payload=payload, headers=headers)
 
+    def fetch_data(self) -> Union[Dict[str, Any], Iterator[Mapping[str, Any]]]:
+        """Fetch Data in json format by sending a request to the endpoint.
+
+        Args:
+
+        Returns:
+            Union[Dict[str, Any], Iterator[Mapping[str, Any]]]: The server's response, typically including the data in JSON format.
+        """
+        # headers = {"Content-Type", "application/json"}
+        response = self._client.get(self.endpoint)
+        json_response = response.json()
+        return json_response
+
 
 class AsyncClient(BaseClient):
     """

ads/aqua/config/container_config.py

@@ -191,21 +191,28 @@ class AquaContainerConfig(Serializable):
                     additional_configurations.get("modelFormats")
                 )
 
-                # Parse environment variables from `additional_configurations`.
-                # Only keys present in the configuration will be added to the result.
-                config_keys = {
-                    "MODEL_DEPLOY_PREDICT_ENDPOINT": UNKNOWN,
-                    "MODEL_DEPLOY_HEALTH_ENDPOINT": UNKNOWN,
-                    "PORT": UNKNOWN,
-                    "HEALTH_CHECK_PORT": UNKNOWN,
-                    "VLLM_USE_V1": UNKNOWN,
-                }
-
-                env_vars = [
-                    {key: additional_configurations.get(key, default)}
-                    for key, default in config_keys.items()
-                    if key in additional_configurations
-                ]
+                # TODO: Remove the else condition once SMC env variable config is updated everywhere
+                if additional_configurations.get("env_vars", None):
+                    env_vars_dict = json.loads(
+                        additional_configurations.get("env_vars") or "{}"
+                    )
+                    env_vars = [
+                        {key: str(value)} for key, value in env_vars_dict.items()
+                    ]
+                else:
+                    config_keys = {
+                        "MODEL_DEPLOY_PREDICT_ENDPOINT": UNKNOWN,
+                        "MODEL_DEPLOY_HEALTH_ENDPOINT": UNKNOWN,
+                        "PORT": UNKNOWN,
+                        "HEALTH_CHECK_PORT": UNKNOWN,
+                        "VLLM_USE_V1": UNKNOWN,
+                    }
+
+                    env_vars = [
+                        {key: additional_configurations.get(key, default)}
+                        for key, default in config_keys.items()
+                        if key in additional_configurations
+                    ]
 
                 # Build container spec
                 container_item.spec = AquaContainerConfigSpec(

ads/aqua/extension/deployment_handler.py

@@ -373,6 +373,37 @@ class AquaDeploymentParamsHandler(AquaAPIhandler):
         )
 
 
+class AquaModelListHandler(AquaAPIhandler):
+    """Handler for Aqua model list params REST APIs.
+
+    Methods
+    -------
+    get(self, *args, **kwargs)
+        Validates parameters for the given model id.
+    """
+
+    @handle_exceptions
+    def get(self, model_deployment_id):
+        """
+        Handles get model list for the Active Model Deployment
+        Raises
+        ------
+        HTTPError
+            Raises HTTPError if inputs are missing or are invalid
+        """
+
+        self.set_header("Content-Type", "application/json")
+        endpoint: str = ""
+        model_deployment = AquaDeploymentApp().get(model_deployment_id)
+        endpoint = model_deployment.endpoint.rstrip("/") + "/predict/v1/models"
+        aqua_client = Client(endpoint=endpoint)
+        try:
+            list_model_result = aqua_client.fetch_data()
+            return self.finish(list_model_result)
+        except Exception as ex:
+            raise HTTPError(500, str(ex))
+
+
 __handlers__ = [
     ("deployments/?([^/]*)/params", AquaDeploymentParamsHandler),
     ("deployments/config/?([^/]*)", AquaDeploymentHandler),
@@ -381,4 +412,5 @@ __handlers__ = [
     ("deployments/?([^/]*)/activate", AquaDeploymentHandler),
     ("deployments/?([^/]*)/deactivate", AquaDeploymentHandler),
     ("inference/stream/?([^/]*)", AquaDeploymentStreamingInferenceHandler),
+    ("deployments/models/list/?([^/]*)", AquaModelListHandler),
 ]

ads/aqua/version.json

@@ -1,3 +1,3 @@
 {
-  "aqua": "1.0.7"
+  "aqua": "1.0.7a"
 }

ads/opctl/operator/lowcode/anomaly/model/automlx.py

@@ -24,8 +24,8 @@ class AutoMLXOperatorModel(AnomalyOperatorBaseModel):
     @runtime_dependency(
         module="automlx",
         err_msg=(
-            "Please run `pip3 install oracle-automlx>=23.4.1` and "
-            "`pip3 install oracle-automlx[classic]>=23.4.1` "
+            "Please run `pip3 install oracle-automlx>=25.3.0` and "
+            "`pip3 install oracle-automlx[classic]>=25.3.0` "
             "to install the required dependencies for automlx."
         ),
     )

ads/opctl/operator/lowcode/forecast/const.py

@@ -76,7 +76,7 @@ class ForecastOutputColumns(ExtendedEnum):
 
 AUTOMLX_METRIC_MAP = {
     "smape": "neg_sym_mean_abs_percent_error",
-    "mape": "neg_sym_mean_abs_percent_error",
+    "mape": "neg_mean_abs_percent_error",
     "mase": "neg_mean_abs_scaled_error",
     "mae": "neg_mean_absolute_error",
     "mse": "neg_mean_squared_error",

ads/opctl/operator/lowcode/forecast/model/automlx.py

@@ -28,7 +28,9 @@ from .forecast_datasets import ForecastDatasets, ForecastOutput
 
 logging.getLogger("report_creator").setLevel(logging.WARNING)
 AUTOMLX_N_ALGOS_TUNED = 4
-AUTOMLX_DEFAULT_SCORE_METRIC = "neg_sym_mean_abs_percent_error"
+AUTOMLX_DEFAULT_SCORE_METRIC = ['neg_sym_mean_abs_percent_error',
+                                'neg_mean_abs_percent_error',
+                                'neg_root_mean_squared_error']
 
 
 class AutoMLXOperatorModel(ForecastOperatorBaseModel):
@@ -45,10 +47,13 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
         model_kwargs_cleaned["n_algos_tuned"] = model_kwargs_cleaned.get(
             "n_algos_tuned", AUTOMLX_N_ALGOS_TUNED
         )
-        model_kwargs_cleaned["score_metric"] = AUTOMLX_METRIC_MAP.get(
-            self.spec.metric,
-            model_kwargs_cleaned.get("score_metric", AUTOMLX_DEFAULT_SCORE_METRIC),
-        )
+        metric_to_optimize = AUTOMLX_METRIC_MAP.get(self.spec.metric)
+        model_kwargs_cleaned["score_metric"] = AUTOMLX_DEFAULT_SCORE_METRIC
+        # The first score metric in the list will be the one for which the pipeline optimizes
+        if metric_to_optimize is not None:
+            model_kwargs_cleaned["score_metric"].remove(metric_to_optimize)
+            model_kwargs_cleaned["score_metric"].insert(0, metric_to_optimize)
+
         model_kwargs_cleaned.pop("task", None)
         time_budget = model_kwargs_cleaned.pop("time_budget", -1)
         model_kwargs_cleaned["preprocessing"] = (
@@ -70,7 +75,7 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
     @runtime_dependency(
         module="automlx",
         err_msg=(
-            "Please run `pip3 install oracle-automlx[forecasting]>=25.1.1` "
+            "Please run `pip3 install oracle-automlx[forecasting]>=25.3.0` "
             "to install the required dependencies for automlx."
         ),
     )
@@ -163,7 +168,7 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
                 self.models[s_id] = {}
                 self.models[s_id]["model"] = model
                 self.models[s_id]["le"] = self.le[s_id]
-                self.models[s_id]["score"] = self.get_validation_score_and_metric(model)
+                self.models[s_id]["score"] = self.get_all_metrics(model)
 
                 # In case of Naive model, model.forecast function call does not return confidence intervals.
                 if f"{target}_ci_upper" not in summary_frame:
@@ -518,26 +523,27 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
                 )
                 logger.debug(f"Full Traceback: {traceback.format_exc()}")
 
-    def get_validation_score_and_metric(self, model):
+    def get_all_metrics(self, model):
         trials = model.completed_trials_summary_
         model_params = model.selected_model_params_
         if len(trials) > 0:
-            score_col = [col for col in trials.columns if "Score" in col][0]
-            validation_score = trials[trials.Hyperparameters == model_params][
-                score_col
+            all_metrics = trials[trials.Hyperparameters == model_params][
+                "All Metrics"
             ].iloc[0]
         else:
-            validation_score = 0
-        return -1 * validation_score
+            all_metrics = {}
+        reverse_map = {v: k for k, v in AUTOMLX_METRIC_MAP.items()}
+        all_metrics = {reverse_map[key]: -1 * value for key, value in all_metrics.items() if key in reverse_map}
+        return all_metrics
 
     def generate_train_metrics(self) -> pd.DataFrame:
         """
-        Generate Training Metrics when fitted data is not available.
+        Generate Training Metrics for Automlx
         """
         total_metrics = pd.DataFrame()
         for s_id in self.forecast_output.list_series_ids():
             try:
-                metrics = {self.spec.metric.upper(): self.models[s_id]["score"]}
+                metrics = self.models[s_id]["score"]
                 metrics_df = pd.DataFrame.from_dict(
                     metrics, orient="index", columns=[s_id]
                 )

{oracle_ads-2.13.15.dist-info → oracle_ads-2.13.17rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oracle_ads
-Version: 2.13.15
+Version: 2.13.17rc0
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle,GenAI,Generative AI,Forecast,Anomaly,Document Understanding,Anomaly Detection
 Author: Oracle Data Science

{oracle_ads-2.13.15.dist-info → oracle_ads-2.13.17rc0.dist-info}/RECORD

@@ -7,9 +7,9 @@ ads/aqua/cli.py,sha256=cmNtLVktrT350gsqY2k2zH6GszFdAVmJwNuU5QZljKE,3988
 ads/aqua/constants.py,sha256=gEVXaXmVdKzIkZ7Q-7Zn_wGpOK0QPFBKnHNIJB12qjs,5132
 ads/aqua/data.py,sha256=HfxLfKiNiPJecMQy0JAztUsT3IdZilHHHOrCJnjZMc4,408
 ads/aqua/ui.py,sha256=PYyr46ewx9Qygcsv6BryUF6rLHU0t5YjUgKSb1uZK2Y,20971
-ads/aqua/version.json,sha256=QV-m8hKJzRfMbqOivBoZssnG4rgVMCriqen5YBCaGhI,22
+ads/aqua/version.json,sha256=f1syT59npva9jfyKmhgWI93kcoiyYabnkAG4Lqr-4cs,23
 ads/aqua/client/__init__.py,sha256=-46EcKQjnWEXxTt85bQzXjA5xsfoBXIGm_syKFlVL1c,178
-ads/aqua/client/client.py,sha256=_voMWUG6bnNDkgYjP6RHrBTtN7qJ9saBWJw7Vt3r7E8,32211
+ads/aqua/client/client.py,sha256=PzbIscVclkVwvfQWyKyRZjRCcT3cXE6bdSkMaMQMomI,32721
 ads/aqua/client/openai_client.py,sha256=JxSmjaeBb7jG8ARH6LdmsWGip467V0y6_mo2YwiiZz4,12921
 ads/aqua/common/__init__.py,sha256=rZrmh1nho40OCeabXCNWtze-mXi-PGKetcZdxZSn3_0,204
 ads/aqua/common/decorator.py,sha256=JEN6Cy4DYgQbmIR3ShCjTuBMCnilDxq7jkYMJse1rcM,4112
@@ -18,7 +18,7 @@ ads/aqua/common/enums.py,sha256=fBJczGd4Trv9Lf0O4_TAEDWYkp5ou9oGeKhxdSW2-84,4274
 ads/aqua/common/errors.py,sha256=QONm-2jKBg8AjgOKXm6x-arAV1KIW9pdhfNN1Ys21Wo,3044
 ads/aqua/common/utils.py,sha256=foFpWvtoqlTABlV5vLmWMCmMQzJiHOsczSc_DP9bY0E,43071
 ads/aqua/config/__init__.py,sha256=2a_1LI4jWtJpbic5_v4EoOUTXCAH7cmsy9BW5prDHjU,179
-ads/aqua/config/container_config.py,sha256=jBz9DRGsCaFXQWgyBoPUXQJbukyl1Fuac7m3tTI7ugo,9528
+ads/aqua/config/container_config.py,sha256=2N65TZNpqlpKJ9I4U9_v9bB_MoP4xsmEo8V4W1iZj9M,9882
 ads/aqua/config/evaluation/__init__.py,sha256=2a_1LI4jWtJpbic5_v4EoOUTXCAH7cmsy9BW5prDHjU,179
 ads/aqua/config/evaluation/evaluation_service_config.py,sha256=NuaQoLVYPHJiWjGfq1-F6-DK0DyOAGjVS87K1SXFVvw,4497
 ads/aqua/config/utils/__init__.py,sha256=2a_1LI4jWtJpbic5_v4EoOUTXCAH7cmsy9BW5prDHjU,179
@@ -37,7 +37,7 @@ ads/aqua/extension/aqua_ws_msg_handler.py,sha256=VDa9vQOsYKX6flsUkDEx6nl-5MFCH5R
 ads/aqua/extension/base_handler.py,sha256=W-eBXn9XYypCZuY84e9cSKRuY0CDyuou_znV6Yn9YzU,3047
 ads/aqua/extension/common_handler.py,sha256=LDcs2ELUkbUd9eS9napq06_NDMC0-1fMkX5KmlYynJc,5403
 ads/aqua/extension/common_ws_msg_handler.py,sha256=PAy98ZsM8VAXcy11ahsuam3QUDdmE-Hz4F5pISVkNHY,1242
-ads/aqua/extension/deployment_handler.py,sha256=_E1nRoL6g2KQC0Ktji_-SEcgTu6VH7eZ7Tx0p0F0NTM,14125
+ads/aqua/extension/deployment_handler.py,sha256=u9ks3qaaJpeKWk_Na0NkBGg2I4ZGzVcnmNeyufKhm1w,15152
 ads/aqua/extension/deployment_ws_msg_handler.py,sha256=JX3ZHRtscrflSxT7ZTEEI_p_owtk3m5FZq3QXE96AGY,2013
 ads/aqua/extension/errors.py,sha256=4LbzZdCoDEtOcrVI-1dgiza4oAYGof6w5LbN6HqroYk,1396
 ads/aqua/extension/evaluation_handler.py,sha256=fJH73fa0xmkEiP8SxKL4A4dJgj-NoL3z_G-w_WW2zJs,4353
@@ -688,7 +688,7 @@ ads/opctl/operator/lowcode/anomaly/utils.py,sha256=szOgGp6ssrE6yk8LA69w2Kk2pZ2ZG
 ads/opctl/operator/lowcode/anomaly/model/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
 ads/opctl/operator/lowcode/anomaly/model/anomaly_dataset.py,sha256=FN4JO5x1rLzeyC2_tsXhP6gPb4-TBHrMa4uJdybz-Us,5404
 ads/opctl/operator/lowcode/anomaly/model/anomaly_merlion.py,sha256=IT0g6wf2rZI-GFuuOgtESWYTE_D77P8y9YeRZ6ucguQ,5836
-ads/opctl/operator/lowcode/anomaly/model/automlx.py,sha256=40rY-mVYoLBmDw5uagayRoyYSkjsIY4U4LfyeU11AoA,3469
+ads/opctl/operator/lowcode/anomaly/model/automlx.py,sha256=ZqXGXvIFAiajdTpvT55M1vwlwRy5PRGxVioEJeOHG4c,3469
 ads/opctl/operator/lowcode/anomaly/model/autots.py,sha256=Ft6bLEXdpIMMDv4lLBzLhC2kRZki7zD9Jnu-LIPDDbw,4154
 ads/opctl/operator/lowcode/anomaly/model/base_model.py,sha256=5XOwbdJV7fjAr6DXP0LA0XLS0EmV77Xx75p_WEhh4ak,15523
 ads/opctl/operator/lowcode/anomaly/model/factory.py,sha256=EVYgEGvVTMNFt-tDP6SH3qDoVBAZD3D_Jlw6Xu9zdQU,4148
@@ -721,7 +721,7 @@ ads/opctl/operator/lowcode/forecast/README.md,sha256=kbCCEdo-0pwKlZp9ctnWUK6Z31n
 ads/opctl/operator/lowcode/forecast/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
 ads/opctl/operator/lowcode/forecast/__main__.py,sha256=FTQhYCZEAbQO2sCOpepermKimSktFd9pERNu1rC-K3A,2926
 ads/opctl/operator/lowcode/forecast/cmd.py,sha256=uwU-QvnYwxoRFXZv7_JFkzAUnjTNoSsHEme2FF-9Rl0,1151
-ads/opctl/operator/lowcode/forecast/const.py,sha256=HJQFM35t-pG4g6z63YABx2ehuKfo9yBHklVbZrGpVzY,2615
+ads/opctl/operator/lowcode/forecast/const.py,sha256=Vt03VuFCbm5y9y-NomJsLX6wd3GzWwcCx7di8cnQ9dY,2611
 ads/opctl/operator/lowcode/forecast/environment.yaml,sha256=eVMf9pcjADI14_GRGdZOB_gK5_MyG_-cX037TXqzFho,330
 ads/opctl/operator/lowcode/forecast/errors.py,sha256=X9zuV2Lqb5N9FuBHHshOFYyhvng5r9KGLHnQijZ5b8c,911
 ads/opctl/operator/lowcode/forecast/model_evaluator.py,sha256=crtCQ4KIWCueOf2zU-AKD_i3h_cJA_-qAGakdgBazVI,10257
@@ -730,7 +730,7 @@ ads/opctl/operator/lowcode/forecast/schema.yaml,sha256=RoNwjg5jxXMbljtregMkV_rJb
 ads/opctl/operator/lowcode/forecast/utils.py,sha256=00prJFK1F3esHlPsPp1WSJ3YoT0NK95f3cH2qNH8AJQ,13578
 ads/opctl/operator/lowcode/forecast/model/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
 ads/opctl/operator/lowcode/forecast/model/arima.py,sha256=PvHoTdDr6RIC4I-YLzed91td6Pq6uxbgluEdu_h0e3c,11766
-ads/opctl/operator/lowcode/forecast/model/automlx.py,sha256=XnF3zku8RWrqwBJet5yfx_f6G5nkJ_2e-TzdVJQt7yE,23292
+ads/opctl/operator/lowcode/forecast/model/automlx.py,sha256=f11WY1gsGrUIuzbgJd0c-t1nM3416nAxqj_ylvYtC7k,23669
 ads/opctl/operator/lowcode/forecast/model/autots.py,sha256=UThBBGsEiC3WLSn-BPAuNWT_ZFa3bYMu52keB0vvSt8,13137
 ads/opctl/operator/lowcode/forecast/model/base_model.py,sha256=ENrizwJwhHbJa8DPMqCDEUKqwQaGfR5-fYdTxreQrHU,36613
 ads/opctl/operator/lowcode/forecast/model/factory.py,sha256=5a9A3ql-bU412BiTB20ob6OxQlkdk8z_tGONMwDXT1k,3900
@@ -860,8 +860,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.15.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.13.15.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.13.15.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-oracle_ads-2.13.15.dist-info/METADATA,sha256=VPcnpZDTS29a-Wr0-SJP2DiA7z9-tDplkWBXih6eJy0,16994
-oracle_ads-2.13.15.dist-info/RECORD,,
+oracle_ads-2.13.17rc0.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.13.17rc0.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.13.17rc0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+oracle_ads-2.13.17rc0.dist-info/METADATA,sha256=hhUVYf9P7EnzOHGkYatClHSs37fHk-EzZ9rvfAj4_g0,16997
+oracle_ads-2.13.17rc0.dist-info/RECORD,,