oracle-ads 2.13.8__py3-none-any.whl → 2.13.9rc1__py3-none-any.whl

ads/aqua/common/entities.py

@@ -151,6 +151,8 @@ class AquaMultiModelRef(Serializable):
         The name of the model.
     gpu_count : Optional[int]
         Number of GPUs required for deployment.
+    model_task : Optional[str]
+        The task that model operates on. Supported tasks are in MultiModelSupportedTaskType
     env_var : Optional[Dict[str, Any]]
         Optional environment variables to override during deployment.
     artifact_location : Optional[str]
@@ -162,6 +164,7 @@ class AquaMultiModelRef(Serializable):
     gpu_count: Optional[int] = Field(
         None, description="The gpu count allocation for the model."
     )
+    model_task: Optional[str] = Field(None, description="The task that model operates on. Supported tasks are in MultiModelSupportedTaskType")
     env_var: Optional[dict] = Field(
         default_factory=dict, description="The environment variables of the model."
     )

ads/aqua/constants.py

@@ -43,6 +43,8 @@ HF_METADATA_FOLDER = ".cache/"
 HF_LOGIN_DEFAULT_TIMEOUT = 2
 MODEL_NAME_DELIMITER = ";"
 AQUA_TROUBLESHOOTING_LINK = "https://github.com/oracle-samples/oci-data-science-ai-samples/blob/main/ai-quick-actions/troubleshooting-tips.md"
+MODEL_FILE_DESCRIPTION_VERSION = "1.0"
+MODEL_FILE_DESCRIPTION_TYPE = "modelOSSReferenceDescription"
 
 TRAINING_METRICS_FINAL = "training_metrics_final"
 VALIDATION_METRICS_FINAL = "validation_metrics_final"

ads/aqua/finetuning/finetuning.py

@@ -58,6 +58,7 @@ from ads.jobs.ads_job import Job
 from ads.jobs.builders.infrastructure.dsc_job import DataScienceJob
 from ads.jobs.builders.runtimes.base import Runtime
 from ads.jobs.builders.runtimes.container_runtime import ContainerRuntime
+from ads.model.common.utils import MetadataArtifactPathType
 from ads.model.model_metadata import (
     MetadataTaxonomyKeys,
     ModelCustomMetadata,
@@ -315,6 +316,23 @@ class AquaFineTuningApp(AquaApp):
             model_by_reference=True,
             defined_tags=create_fine_tuning_details.defined_tags,
         )
+        defined_metadata_dict = {}
+        defined_metadata_list_source = source.defined_metadata_list._to_oci_metadata()
+        for defined_metadata in defined_metadata_list_source:
+            if (
+                defined_metadata.has_artifact
+                and defined_metadata.key.lower()
+                != AquaModelMetadataKeys.FINE_TUNING_CONFIGURATION.lower()
+            ):
+                content = self.ds_client.get_model_defined_metadatum_artifact_content(
+                    source.id, defined_metadata.key
+                ).data.content
+                defined_metadata_dict[defined_metadata.key] = content
+
+        for key, value in defined_metadata_dict.items():
+            ft_model.create_defined_metadata_artifact(
+                key, value, MetadataArtifactPathType.CONTENT
+            )
 
         ft_job_freeform_tags = {
             Tags.AQUA_TAG: UNKNOWN,

ads/aqua/model/entities.py

@@ -15,12 +15,19 @@ from typing import List, Optional
 
 import oci
 from huggingface_hub import hf_api
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
+from pydantic.alias_generators import to_camel
 
 from ads.aqua import logger
 from ads.aqua.app import CLIBuilderMixin
 from ads.aqua.common import utils
-from ads.aqua.constants import LIFECYCLE_DETAILS_MISSING_JOBRUN, UNKNOWN_VALUE
+from ads.aqua.config.utils.serializer import Serializable
+from ads.aqua.constants import (
+    LIFECYCLE_DETAILS_MISSING_JOBRUN,
+    MODEL_FILE_DESCRIPTION_TYPE,
+    MODEL_FILE_DESCRIPTION_VERSION,
+    UNKNOWN_VALUE,
+)
 from ads.aqua.data import AquaResourceIdentifier
 from ads.aqua.model.enums import FineTuningDefinedMetadata
 from ads.aqua.training.exceptions import exit_code_dict
@@ -304,3 +311,75 @@ class ImportModelDetails(CLIBuilderMixin):
 
     def __post_init__(self):
         self._command = "model register"
+
+
+class ModelFileInfo(Serializable):
+    """Describes the file information of this model.
+
+    Attributes:
+        name (str): The name of the model artifact file.
+        version (str): The version of the model artifact file.
+        size_in_bytes (int): The size of the model artifact file in bytes.
+    """
+
+    name: str = Field(..., description="The name of model artifact file.")
+    version: str = Field(..., description="The version of model artifact file.")
+    size_in_bytes: int = Field(
+        ..., description="The size of model artifact file in bytes."
+    )
+
+    class Config:
+        alias_generator = to_camel
+        extra = "allow"
+
+
+class ModelArtifactInfo(Serializable):
+    """Describes the artifact information of this model.
+
+    Attributes:
+        namespace (str): The namespace of the model artifact location.
+        bucket_name (str): The bucket name of model artifact location.
+        prefix (str): The prefix of model artifact location.
+        objects: (List[ModelFileInfo]): A list of model artifact objects.
+    """
+
+    namespace: str = Field(
+        ..., description="The name space of model artifact location."
+    )
+    bucket_name: str = Field(
+        ..., description="The bucket name of model artifact location."
+    )
+    prefix: str = Field(..., description="The prefix of model artifact location.")
+    objects: List[ModelFileInfo] = Field(
+        ..., description="List of model artifact objects."
+    )
+
+    class Config:
+        alias_generator = to_camel
+        extra = "allow"
+
+
+class ModelFileDescription(Serializable):
+    """Describes the model file description.
+
+    Attributes:
+        version (str): The version of the model file description. Defaults to `1.0`.
+        type (str): The type of model file description. Defaults to `modelOSSReferenceDescription`.
+        models List[ModelArtifactInfo]: A list of model artifact information.
+    """
+
+    version: str = Field(
+        default=MODEL_FILE_DESCRIPTION_VERSION,
+        description="The version of model file description.",
+    )
+    type: str = Field(
+        default=MODEL_FILE_DESCRIPTION_TYPE,
+        description="The type of model file description.",
+    )
+    models: List[ModelArtifactInfo] = Field(
+        ..., description="List of model artifact information."
+    )
+
+    class Config:
+        alias_generator = to_camel
+        extra = "allow"

ads/aqua/model/enums.py

@@ -26,5 +26,7 @@ class FineTuningCustomMetadata(ExtendedEnum):
 
 
 class MultiModelSupportedTaskType(ExtendedEnum):
-    TEXT_GENERATION = "text-generation"
-    TEXT_GENERATION_ALT = "text_generation"
+    TEXT_GENERATION = "text_generation"
+    IMAGE_TEXT_TO_TEXT = "image_text_to_text"
+    CODE_SYNTHESIS = "code_synthesis"
+    EMBEDDING = "text_embedding"

ads/aqua/model/model.py

@@ -4,6 +4,7 @@
 import json
 import os
 import pathlib
+import re
 from datetime import datetime, timedelta
 from threading import Lock
 from typing import Any, Dict, List, Optional, Set, Union
@@ -78,6 +79,7 @@ from ads.aqua.model.entities import (
     AquaModelReadme,
     AquaModelSummary,
     ImportModelDetails,
+    ModelFileDescription,
     ModelValidationResult,
 )
 from ads.aqua.model.enums import MultiModelSupportedTaskType
@@ -184,8 +186,12 @@ class AquaModelApp(AquaApp):
         target_project = project_id or PROJECT_OCID
         target_compartment = compartment_id or COMPARTMENT_OCID
 
-        # Skip model copying if it is registered model
-        if service_model.freeform_tags.get(Tags.BASE_MODEL_CUSTOM, None) is not None:
+        # Skip model copying if it is registered model or fine-tuned model
+        if (
+            service_model.freeform_tags.get(Tags.BASE_MODEL_CUSTOM, None) is not None
+            or service_model.freeform_tags.get(Tags.AQUA_FINE_TUNED_MODEL_TAG)
+            is not None
+        ):
             logger.info(
                 f"Aqua Model {model_id} already exists in the user's compartment."
                 "Skipped copying."
@@ -266,8 +272,8 @@ class AquaModelApp(AquaApp):
                 "Model list cannot be empty. Please provide at least one model for deployment."
             )
 
-        artifact_list = []
         display_name_list = []
+        model_file_description_list: List[ModelFileDescription] = []
         model_custom_metadata = ModelCustomMetadata()
 
         service_inference_containers = (
@@ -294,6 +300,7 @@ class AquaModelApp(AquaApp):
         for model in models:
             source_model = DataScienceModel.from_id(model.model_id)
             display_name = source_model.display_name
+            model_file_description = source_model.model_file_description
             # Update model name in user's input model
             model.model_name = model.model_name or display_name
 
@@ -304,18 +311,10 @@ class AquaModelApp(AquaApp):
             #         "Currently only service models are supported for multi model deployment."
             #     )
 
-            # TODO uncomment the section below if only the specific types of models should be allowed for multi-model deployment
-            # if (
-            #     source_model.freeform_tags.get(Tags.TASK, UNKNOWN).lower()
-            #     not in MultiModelSupportedTaskType
-            # ):
-            #     raise AquaValueError(
-            #         f"Invalid or missing {Tags.TASK} tag for selected model {display_name}. "
-            #         f"Currently only `{MultiModelSupportedTaskType.values()}` models are supported for multi model deployment."
-            #     )
-
             display_name_list.append(display_name)
 
+            self._extract_model_task(model, source_model)
+
             # Retrieve model artifact
             model_artifact_path = source_model.artifact
             if not model_artifact_path:
@@ -327,7 +326,15 @@ class AquaModelApp(AquaApp):
             # Update model artifact location in user's input model
             model.artifact_location = model_artifact_path
 
-            artifact_list.append(model_artifact_path)
+            if not model_file_description:
+                raise AquaValueError(
+                    f"Model '{display_name}' (ID: {model.model_id}) has no file description. "
+                    "Please register the model first."
+                )
+
+            model_file_description_list.append(
+                ModelFileDescription(**model_file_description)
+            )
 
             # Validate deployment container consistency
             deployment_container = source_model.custom_metadata_list.get(
@@ -405,9 +412,16 @@ class AquaModelApp(AquaApp):
             .with_custom_metadata_list(model_custom_metadata)
         )
 
-        # Attach artifacts
-        for artifact in artifact_list:
-            custom_model.add_artifact(uri=artifact)
+        # Update multi model file description to attach artifacts
+        custom_model.with_model_file_description(
+            json_dict=ModelFileDescription(
+                models=[
+                    models
+                    for model_file_description in model_file_description_list
+                    for models in model_file_description.models
+                ]
+            ).model_dump(by_alias=True)
+        )
 
         # Finalize creation
         custom_model.create(model_by_reference=True)
@@ -704,6 +718,26 @@ class AquaModelApp(AquaApp):
         else:
             raise AquaRuntimeError("Only registered unverified models can be edited.")
 
+    def _extract_model_task(
+        self,
+        model: AquaMultiModelRef,
+        source_model: DataScienceModel,
+    ) -> None:
+        """In a Multi Model Deployment, will set model_task parameter in AquaMultiModelRef from freeform tags or user"""
+        # user does not supply model task, we extract from model metadata
+        if not model.model_task:
+            model.model_task = source_model.freeform_tags.get(Tags.TASK, UNKNOWN)
+
+        task_tag = re.sub(r"-", "_", model.model_task).lower()
+        # re-visit logic when more model task types are supported
+        if task_tag in MultiModelSupportedTaskType:
+            model.model_task = task_tag
+        else:
+            raise AquaValueError(
+                f"Invalid or missing {task_tag} tag for selected model {source_model.display_name}. "
+                f"Currently only `{MultiModelSupportedTaskType.values()}` models are supported for multi model deployment."
+            )
+
     def _fetch_metric_from_metadata(
         self,
         custom_metadata_list: ModelCustomMetadata,

ads/aqua/modeldeployment/deployment.py

@@ -178,9 +178,7 @@ class AquaDeploymentApp(AquaApp):
         # validate instance shape availability in compartment
         available_shapes = [
             shape.name.lower()
-            for shape in self.list_shapes(
-                compartment_id=compartment_id
-            )
+            for shape in self.list_shapes(compartment_id=compartment_id)
         ]
 
         if create_deployment_details.instance_shape.lower() not in available_shapes:
@@ -645,7 +643,11 @@ class AquaDeploymentApp(AquaApp):
                 os_path = ObjectStorageDetails.from_path(artifact_path_prefix)
                 artifact_path_prefix = os_path.filepath.rstrip("/")
 
-            model_config.append({"params": params, "model_path": artifact_path_prefix})
+            # override by-default completion/ chat endpoint with other endpoint (embedding)
+            config_data = {"params": params, "model_path": artifact_path_prefix}
+            if model.model_task:
+                config_data["model_task"] = model.model_task
+            model_config.append(config_data)
             model_name_list.append(model.model_name)
 
         env_var.update({AQUA_MULTI_MODEL_CONFIG: json.dumps({"models": model_config})})

ads/opctl/operator/lowcode/common/utils.py

@@ -11,6 +11,7 @@ import sys
 import tempfile
 from typing import List, Union
 
+import cloudpickle
 import fsspec
 import oracledb
 import pandas as pd
@@ -126,7 +127,26 @@ def load_data(data_spec, storage_options=None, **kwargs):
     return data
 
 
+def _safe_write(fn, **kwargs):
+    try:
+        fn(**kwargs)
+    except Exception:
+        logger.warning(f'Failed to write file {kwargs.get("filename", "UNKNOWN")}')
+
+
 def write_data(data, filename, format, storage_options=None, index=False, **kwargs):
+    return _safe_write(
+        fn=_write_data,
+        data=data,
+        filename=filename,
+        format=format,
+        storage_options=storage_options,
+        index=index,
+        **kwargs,
+    )
+
+
+def _write_data(data, filename, format, storage_options=None, index=False, **kwargs):
     disable_print()
     if not format:
         _, format = os.path.splitext(filename)
@@ -143,11 +163,24 @@ def write_data(data, filename, format, storage_options=None, index=False, **kwar
 
 
 def write_json(json_dict, filename, storage_options=None):
+    return _safe_write(
+        fn=_write_json,
+        json_dict=json_dict,
+        filename=filename,
+        storage_options=storage_options,
+    )
+
+
+def _write_json(json_dict, filename, storage_options=None):
     with fsspec.open(filename, mode="w", **storage_options) as f:
         f.write(json.dumps(json_dict))
 
 
 def write_simple_json(data, path):
+    return _safe_write(fn=_write_simple_json, data=data, path=path)
+
+
+def _write_simple_json(data, path):
     if ObjectStorageDetails.is_oci_path(path):
         storage_options = default_signer()
     else:
@@ -156,6 +189,60 @@ def write_simple_json(data, path):
         json.dump(data, f, indent=4)
 
 
+def write_file(local_filename, remote_filename, storage_options, **kwargs):
+    return _safe_write(
+        fn=_write_file,
+        local_filename=local_filename,
+        remote_filename=remote_filename,
+        storage_options=storage_options,
+        **kwargs,
+    )
+
+
+def _write_file(local_filename, remote_filename, storage_options, **kwargs):
+    with open(local_filename) as f1:
+        with fsspec.open(
+            remote_filename,
+            "w",
+            **storage_options,
+        ) as f2:
+            f2.write(f1.read())
+
+
+def load_pkl(filepath):
+    return _safe_write(fn=_load_pkl, filepath=filepath)
+
+
+def _load_pkl(filepath):
+    storage_options = {}
+    if ObjectStorageDetails.is_oci_path(filepath):
+        storage_options = default_signer()
+
+    with fsspec.open(filepath, "rb", **storage_options) as f:
+        return cloudpickle.load(f)
+    return None
+
+
+def write_pkl(obj, filename, output_dir, storage_options):
+    return _safe_write(
+        fn=_write_pkl,
+        obj=obj,
+        filename=filename,
+        output_dir=output_dir,
+        storage_options=storage_options,
+    )
+
+
+def _write_pkl(obj, filename, output_dir, storage_options):
+    pkl_path = os.path.join(output_dir, filename)
+    with fsspec.open(
+        pkl_path,
+        "wb",
+        **storage_options,
+    ) as f:
+        cloudpickle.dump(obj, f)
+
+
 def merge_category_columns(data, target_category_columns):
     result = data.apply(
         lambda x: "__".join([str(x[col]) for col in target_category_columns]), axis=1
@@ -290,4 +377,8 @@ def disable_print():
 
 # Restore
 def enable_print():
+    try:
+        sys.stdout.close()
+    except Exception:
+        pass
     sys.stdout = sys.__stdout__

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

@@ -38,6 +38,7 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
         super().__init__(config, datasets)
         self.global_explanation = {}
         self.local_explanation = {}
+        self.explainability_kwargs = {}
 
     def set_kwargs(self):
         model_kwargs_cleaned = self.spec.model_kwargs
@@ -54,6 +55,9 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
             self.spec.preprocessing.enabled
             or model_kwargs_cleaned.get("preprocessing", True)
         )
+        sample_ratio = model_kwargs_cleaned.pop("sample_to_feature_ratio", None)
+        if sample_ratio is not None:
+            self.explainability_kwargs = {"sample_to_feature_ratio": sample_ratio}
         return model_kwargs_cleaned, time_budget
 
     def preprocess(self, data, series_id):  # TODO: re-use self.le for explanations
@@ -445,6 +449,7 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
                         else None,
                         pd.DataFrame(data_i[self.spec.target_column]),
                         task="forecasting",
+                        **self.explainability_kwargs,
                     )
 
                     # Generate explanations for the forecast
@@ -518,7 +523,9 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
         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].iloc[0]
+            validation_score = trials[trials.Hyperparameters == model_params][
+                score_col
+            ].iloc[0]
         else:
             validation_score = 0
         return -1 * validation_score
@@ -531,8 +538,12 @@ class AutoMLXOperatorModel(ForecastOperatorBaseModel):
         for s_id in self.forecast_output.list_series_ids():
             try:
                 metrics = {self.spec.metric.upper(): self.models[s_id]["score"]}
-                metrics_df = pd.DataFrame.from_dict(metrics, orient="index", columns=[s_id])
-                logger.warning("AutoMLX failed to generate training metrics. Recovering validation loss instead")
+                metrics_df = pd.DataFrame.from_dict(
+                    metrics, orient="index", columns=[s_id]
+                )
+                logger.warning(
+                    "AutoMLX failed to generate training metrics. Recovering validation loss instead"
+                )
                 total_metrics = pd.concat([total_metrics, metrics_df], axis=1)
             except Exception as e:
                 logger.debug(

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

@@ -11,7 +11,6 @@ import traceback
 from abc import ABC, abstractmethod
 from typing import Tuple
 
-import fsspec
 import numpy as np
 import pandas as pd
 import report_creator as rc
@@ -25,10 +24,13 @@ from ads.opctl.operator.lowcode.common.utils import (
     disable_print,
     enable_print,
     human_time_friendly,
+    load_pkl,
     merged_category_column_name,
     seconds_to_datetime,
     write_data,
+    write_file,
     write_json,
+    write_pkl,
 )
 from ads.opctl.operator.lowcode.forecast.utils import (
     _build_metrics_df,
@@ -38,8 +40,6 @@ from ads.opctl.operator.lowcode.forecast.utils import (
     evaluate_train_metrics,
     get_auto_select_plot,
     get_forecast_plots,
-    load_pkl,
-    write_pkl,
 )
 
 from ..const import (
@@ -493,13 +493,11 @@ class ForecastOperatorBaseModel(ABC):
                 enable_print()
 
                 report_path = os.path.join(unique_output_dir, self.spec.report_filename)
-                with open(report_local_path) as f1:
-                    with fsspec.open(
-                        report_path,
-                        "w",
-                        **storage_options,
-                    ) as f2:
-                        f2.write(f1.read())
+                write_file(
+                    local_filename=report_local_path,
+                    remote_filename=report_path,
+                    storage_options=storage_options,
+                )
 
         # forecast csv report
         # todo: add test data into forecast.csv
@@ -573,9 +571,16 @@ class ForecastOperatorBaseModel(ABC):
         if self.spec.generate_explanations:
             try:
                 if not self.formatted_global_explanation.empty:
+                    # Round to 4 decimal places before writing
+                    global_expl_rounded = self.formatted_global_explanation.copy()
+                    global_expl_rounded = global_expl_rounded.apply(
+                        lambda col: np.round(col, 4)
+                        if np.issubdtype(col.dtype, np.number)
+                        else col
+                    )
                     if self.spec.generate_explanation_files:
                         write_data(
-                            data=self.formatted_global_explanation,
+                            data=global_expl_rounded,
                             filename=os.path.join(
                                 unique_output_dir, self.spec.global_explanation_filename
                             ),
@@ -583,16 +588,23 @@ class ForecastOperatorBaseModel(ABC):
                             storage_options=storage_options,
                             index=True,
                         )
-                    results.set_global_explanations(self.formatted_global_explanation)
+                    results.set_global_explanations(global_expl_rounded)
                 else:
                     logger.warning(
                         f"Attempted to generate global explanations for the {self.spec.global_explanation_filename} file, but an issue occured in formatting the explanations."
                     )
 
                 if not self.formatted_local_explanation.empty:
+                    # Round to 4 decimal places before writing
+                    local_expl_rounded = self.formatted_local_explanation.copy()
+                    local_expl_rounded = local_expl_rounded.apply(
+                        lambda col: np.round(col, 4)
+                        if np.issubdtype(col.dtype, np.number)
+                        else col
+                    )
                     if self.spec.generate_explanation_files:
                         write_data(
-                            data=self.formatted_local_explanation,
+                            data=local_expl_rounded,
                             filename=os.path.join(
                                 unique_output_dir, self.spec.local_explanation_filename
                             ),
@@ -600,7 +612,7 @@ class ForecastOperatorBaseModel(ABC):
                             storage_options=storage_options,
                             index=True,
                         )
-                    results.set_local_explanations(self.formatted_local_explanation)
+                    results.set_local_explanations(local_expl_rounded)
                 else:
                     logger.warning(
                         f"Attempted to generate local explanations for the {self.spec.local_explanation_filename} file, but an issue occured in formatting the explanations."

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

@@ -19,12 +19,10 @@ from ads.opctl import logger
 from ads.opctl.operator.lowcode.common.utils import (
     disable_print,
     enable_print,
-)
-from ads.opctl.operator.lowcode.forecast.utils import (
-    _select_plot_list,
     load_pkl,
     write_pkl,
 )
+from ads.opctl.operator.lowcode.forecast.utils import _select_plot_list
 
 from ..const import DEFAULT_TRIALS, SupportedModels
 from ..operator_config import ForecastOperatorConfig
@@ -159,20 +157,18 @@ class NeuralProphetOperatorModel(ForecastOperatorBaseModel):
                 upper_bound=self.get_horizon(forecast[upper_bound_col_name]).values,
                 lower_bound=self.get_horizon(forecast[lower_bound_col_name]).values,
             )
-            core_columns = set(forecast.columns) - set(
-                [
-                    "y",
-                    "yhat1",
-                    upper_bound_col_name,
-                    lower_bound_col_name,
-                    "future_regressors_additive",
-                    "future_regressors_multiplicative",
-                ]
-            )
+            core_columns = set(forecast.columns) - {
+                "y",
+                "yhat1",
+                upper_bound_col_name,
+                lower_bound_col_name,
+                "future_regressors_additive",
+                "future_regressors_multiplicative",
+            }
             exog_variables = set(
                 filter(lambda x: x.startswith("future_regressor_"), list(core_columns))
             )
-            combine_terms = list(core_columns - exog_variables - set(["ds"]))
+            combine_terms = list(core_columns - exog_variables - {"ds"})
             temp_df = (
                 forecast[list(core_columns)]
                 .rename({"ds": "Date"}, axis=1)

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

@@ -1,14 +1,12 @@
 #!/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/
 
 import logging
 import os
 from typing import Set
 
-import cloudpickle
-import fsspec
 import numpy as np
 import pandas as pd
 import report_creator as rc
@@ -21,7 +19,6 @@ from sklearn.metrics import (
     r2_score,
 )
 
-from ads.common.object_storage_details import ObjectStorageDetails
 from ads.dataset.label_encoder import DataFrameLabelEncoder
 from ads.opctl import logger
 from ads.opctl.operator.lowcode.forecast.const import ForecastOutputColumns
@@ -170,26 +167,6 @@ def _build_metrics_per_horizon(
     return metrics_df
 
 
-def load_pkl(filepath):
-    storage_options = {}
-    if ObjectStorageDetails.is_oci_path(filepath):
-        storage_options = default_signer()
-
-    with fsspec.open(filepath, "rb", **storage_options) as f:
-        return cloudpickle.load(f)
-    return None
-
-
-def write_pkl(obj, filename, output_dir, storage_options):
-    pkl_path = os.path.join(output_dir, filename)
-    with fsspec.open(
-        pkl_path,
-        "wb",
-        **storage_options,
-    ) as f:
-        cloudpickle.dump(obj, f)
-
-
 def _build_metrics_df(y_true, y_pred, series_id):
     if len(y_true) == 0 or len(y_pred) == 0:
         return pd.DataFrame()
@@ -251,7 +228,10 @@ def evaluate_train_metrics(output):
 
 
 def _select_plot_list(fn, series_ids, target_category_column):
-    blocks = [rc.Widget(fn(s_id=s_id), label=s_id if target_category_column else None) for s_id in series_ids]
+    blocks = [
+        rc.Widget(fn(s_id=s_id), label=s_id if target_category_column else None)
+        for s_id in series_ids
+    ]
     return rc.Select(blocks=blocks) if len(blocks) > 1 else blocks[0]
 
 
@@ -264,8 +244,10 @@ def get_auto_select_plot(backtest_results):
     back_test_csv_columns = backtest_results.columns.tolist()
     back_test_column = "backtest"
     metric_column = "metric"
-    models = [x for x in back_test_csv_columns if x not in [back_test_column, metric_column]]
-    for i, column in enumerate(models):
+    models = [
+        x for x in back_test_csv_columns if x not in [back_test_column, metric_column]
+    ]
+    for column in models:
         fig.add_trace(
             go.Scatter(
                 x=backtest_results[back_test_column],
@@ -283,7 +265,7 @@ def get_forecast_plots(
     horizon,
     test_data=None,
     ci_interval_width=0.95,
-    target_category_column=None
+    target_category_column=None,
 ):
     def plot_forecast_plotly(s_id):
         fig = go.Figure()
@@ -380,7 +362,9 @@ def get_forecast_plots(
         )
         return fig
 
-    return _select_plot_list(plot_forecast_plotly, forecast_output.list_series_ids(), target_category_column)
+    return _select_plot_list(
+        plot_forecast_plotly, forecast_output.list_series_ids(), target_category_column
+    )
 
 
 def convert_target(target: str, target_col: str):

{oracle_ads-2.13.8.dist-info → oracle_ads-2.13.9rc1.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: oracle_ads
-Version: 2.13.8
+Version: 2.13.9rc1
 Summary: Oracle Accelerated Data Science SDK
-Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
+Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle,GenAI,Generative AI,Forecast,Anomaly,Document Understanding
 Author: Oracle Data Science
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-Expression: UPL-1.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Universal Permissive License (UPL)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10

{oracle_ads-2.13.8.dist-info → oracle_ads-2.13.9rc1.dist-info}/RECORD

@@ -4,7 +4,7 @@ ads/config.py,sha256=yrCvWEEYcMwWkk9_6IJJZnxbvrOVzsQNMBrCJVafYU8,8106
 ads/aqua/__init__.py,sha256=7DjwtmZaX-_atIkmZu6XQKHqJUEeemJGR2TlxzMHSXs,973
 ads/aqua/app.py,sha256=KesfIyVm3T8mj3ugsdVSp05b9RwQAEVw7QN1UB4o4qU,18397
 ads/aqua/cli.py,sha256=8S0JnhWY9IBZjMyB-5r4I-2nl-WK6yw1iirPsAXICF0,3358
-ads/aqua/constants.py,sha256=E_7eaHTMkKjY1VMe8os8xW337giIjESUYvMAnbN9bKw,4981
+ads/aqua/constants.py,sha256=dUl02j5XTAG6sL7XJ9HS5fT0Z869WceRLFIbBwCzmtw,5081
 ads/aqua/data.py,sha256=HfxLfKiNiPJecMQy0JAztUsT3IdZilHHHOrCJnjZMc4,408
 ads/aqua/ui.py,sha256=AyX1vFW9f6hoyKN55M6s4iKBLHsOHC41hwRjDfD4NlI,20191
 ads/aqua/client/__init__.py,sha256=-46EcKQjnWEXxTt85bQzXjA5xsfoBXIGm_syKFlVL1c,178
@@ -12,7 +12,7 @@ ads/aqua/client/client.py,sha256=zlscNhFZVgGnkJ-aj5iZ5v5FedOzpQc4RJDxGPl9VvQ,313
 ads/aqua/client/openai_client.py,sha256=Gi8nSrtPAUOjxRNu-6UUAqtxWyQIQ5CAvatnm7XfnaM,12501
 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/entities.py,sha256=2_Sv07SvekPmU77DfQIycdv0UJOaT6TZM5WyNJyq7GM,9188
 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=z93NqufjGzmEpsd7VmSvIpFUawcaoLjBFPSiBCjq2Wk,42001
@@ -52,15 +52,15 @@ ads/aqua/extension/models/ws_models.py,sha256=IgAwu324zlT0XII2nFWQUTeEzqvbFch_9K
 ads/aqua/finetuning/__init__.py,sha256=vwYT5PluMR0mDQwVIavn_8Icms7LmvfV_FOrJ8fJx8I,296
 ads/aqua/finetuning/constants.py,sha256=Fx-8LMyF9ZbV9zo5LUYgCv9VniV7djGnM2iW7js2ILE,844
 ads/aqua/finetuning/entities.py,sha256=ax6tpqrzuF54YNdwJNRSpzhAnkvOeXdnJ18EA-GfIlw,6885
-ads/aqua/finetuning/finetuning.py,sha256=SizHmPN1kOlzriQ2GHUvyhL9LxEmntoBFusHhYAz6SI,30220
+ads/aqua/finetuning/finetuning.py,sha256=11DJEEZPa0yu8k0wZvp9IuYEU7IdOd_ZQFUigTqvG0k,31094
 ads/aqua/model/__init__.py,sha256=j2iylvERdANxgrEDp7b_mLcKMz1CF5Go0qgYCiMwdos,278
 ads/aqua/model/constants.py,sha256=oOAb4ulsdWBtokCE5SPX7wg8X8SaisLPayua58zhWfY,1856
-ads/aqua/model/entities.py,sha256=8P9BEXCroruJHA1RhL66NdmScL-Lql1_7SjnFYk273Y,10089
-ads/aqua/model/enums.py,sha256=iJi-AZRh7KR_HK5HUwTkgnTOGVna2Ai5WEzqCjk7Y3s,1079
-ads/aqua/model/model.py,sha256=i1cRCdGV1UWyLNwfkikHF0oPhF682ZB-uKqgvJJ7860,86864
+ads/aqua/model/entities.py,sha256=JiKB8SnaUxerRMlwrgpyfQLRuTOB8I14J-Rg5RFPwqw,12660
+ads/aqua/model/enums.py,sha256=bN8GKmgRl40PQrTmd1r-Pqr9VXTIV8gic5-3SAGNnwg,1152
+ads/aqua/model/model.py,sha256=AjsM7o5Dcas4G5imdCQ1VX2Y5bCooMZvDQBKQX8KTUA,88217
 ads/aqua/modeldeployment/__init__.py,sha256=RJCfU1yazv3hVWi5rS08QVLTpTwZLnlC8wU8diwFjnM,391
 ads/aqua/modeldeployment/constants.py,sha256=lJF77zwxmlECljDYjwFAMprAUR_zctZHmawiP-4alLg,296
-ads/aqua/modeldeployment/deployment.py,sha256=8HWFkc50_DdTM4MEPVzUXYOxvAmXeEHplqsPzK-II8k,56071
+ads/aqua/modeldeployment/deployment.py,sha256=hWpjomp9UyRRsUDAa9VN5ezpqNOpLB7lOZJX8mYwDjI,56265
 ads/aqua/modeldeployment/entities.py,sha256=qwNH-8eHv-C2QPMITGQkb6haaJRvZ5c0i1H0Aoxeiu4,27100
 ads/aqua/modeldeployment/inference.py,sha256=rjTF-AM_rHLzL5HCxdLRTrsaSMdB-SzFYUp9dIy5ejw,2109
 ads/aqua/modeldeployment/utils.py,sha256=Aky4WZ5E564JVZ96X9RYJz_KlB_cAHGzV6mihtd3HV8,22009
@@ -692,7 +692,7 @@ ads/opctl/operator/lowcode/common/const.py,sha256=1dUhgup4L_U0s6BSYmgLPpZAe6xqfS
 ads/opctl/operator/lowcode/common/data.py,sha256=_0UbW-A0kVQjNOO2aeZoRiebgmKqDqcprPPjZ6KDWdk,4188
 ads/opctl/operator/lowcode/common/errors.py,sha256=LvQ_Qzh6cqD6uP91DMFFVXPrcc3010EE8LfBH-CH0ho,1534
 ads/opctl/operator/lowcode/common/transformations.py,sha256=n-Yac9WtI9GLEc5sDKSq75-2q0j59bR_pxlV5EAmkO0,11048
-ads/opctl/operator/lowcode/common/utils.py,sha256=z8NqmBk1ScU6R1cTBna9drJxkoD-UGiPqvN9HUw2VR8,9941
+ads/opctl/operator/lowcode/common/utils.py,sha256=9wVM7lNZX_RRO0MVxZrN0FkWBPZweKq_D3_0ON7wjnM,12159
 ads/opctl/operator/lowcode/feature_store_marketplace/MLoperator,sha256=JO5ulr32WsFnbpk1KN97h8-D70jcFt1kRQ08UMkP4rU,346
 ads/opctl/operator/lowcode/feature_store_marketplace/README.md,sha256=fN9ROzOPdEZdRgSP_uYvAmD5bD983NC7Irfe_D-mvrw,1356
 ads/opctl/operator/lowcode/feature_store_marketplace/__init__.py,sha256=rZrmh1nho40OCeabXCNWtze-mXi-PGKetcZdxZSn3_0,204
@@ -718,16 +718,16 @@ ads/opctl/operator/lowcode/forecast/errors.py,sha256=X9zuV2Lqb5N9FuBHHshOFYyhvng
 ads/opctl/operator/lowcode/forecast/model_evaluator.py,sha256=crtCQ4KIWCueOf2zU-AKD_i3h_cJA_-qAGakdgBazVI,10257
 ads/opctl/operator/lowcode/forecast/operator_config.py,sha256=3pJzgbSqgPzE7vkce6KkthPQJEgWRRdDOAf1l6aSZpg,8318
 ads/opctl/operator/lowcode/forecast/schema.yaml,sha256=RoNwjg5jxXMbljtregMkV_rJbax8ir7zdJltC5YfYM8,12438
-ads/opctl/operator/lowcode/forecast/utils.py,sha256=0ssrXBAEL5hjQX4avLPkSwFp3sKE8QV5M3K5InqvzYg,14137
+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=4XwS60f7Cs9-oexAn_v0hiWHmrw4jBY_o-_VLzuOd-4,22891
+ads/opctl/operator/lowcode/forecast/model/automlx.py,sha256=XnF3zku8RWrqwBJet5yfx_f6G5nkJ_2e-TzdVJQt7yE,23292
 ads/opctl/operator/lowcode/forecast/model/autots.py,sha256=UThBBGsEiC3WLSn-BPAuNWT_ZFa3bYMu52keB0vvSt8,13137
-ads/opctl/operator/lowcode/forecast/model/base_model.py,sha256=s9WwPpo61YY7teAcmL2MK7cl1GGYAKZu7IkxoReD1I0,35969
+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
 ads/opctl/operator/lowcode/forecast/model/forecast_datasets.py,sha256=2NsWE2WtD_O7uAXw42_3tmG3vb5lk3mdnzCZTph4hao,18903
 ads/opctl/operator/lowcode/forecast/model/ml_forecast.py,sha256=t5x6EBxOd7XwfT3FGdt-n9gscxaHMm3R2A4Evvxbj38,9646
-ads/opctl/operator/lowcode/forecast/model/neuralprophet.py,sha256=60nfNGxjRDsD09Sg7s1YG8G8Qxfcyw0_2rW2PcNy1-c,20021
+ads/opctl/operator/lowcode/forecast/model/neuralprophet.py,sha256=-AS3PPd8Fqn1uaMybJwTnFbmIfUxNPDlgYjGtjy9-E8,19944
 ads/opctl/operator/lowcode/forecast/model/prophet.py,sha256=jb8bshJf5lDdGJkNH-2SrwN4tdHImP7iD9I8KS4EmZU,17321
 ads/opctl/operator/lowcode/forecast/whatifserve/__init__.py,sha256=JNDDjLrNorKXMHUuXMifqXea3eheST-lnrcwCl2bWrk,242
 ads/opctl/operator/lowcode/forecast/whatifserve/deployment_manager.py,sha256=w42anuqAScEQ0vBG3vW4LVLNq1bPdpAWGQEmNhMwZ08,12052
@@ -851,8 +851,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.8.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.13.8.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.13.8.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-oracle_ads-2.13.8.dist-info/METADATA,sha256=LfiYG2aQlavlrsikEbkE1C6CN9ytsyDU32oF0oHClg4,16639
-oracle_ads-2.13.8.dist-info/RECORD,,
+oracle_ads-2.13.9rc1.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.13.9rc1.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.13.9rc1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+oracle_ads-2.13.9rc1.dist-info/METADATA,sha256=322tybBGPwpm9eAuQEcS9dQ_7qwMye0YfNFu75RxQhs,16656
+oracle_ads-2.13.9rc1.dist-info/RECORD,,