oracle-ads 2.12.3__py3-none-any.whl → 2.12.5__py3-none-any.whl

ads/aqua/evaluation/entities.py

@@ -9,19 +9,18 @@ aqua.evaluation.entities
 This module contains dataclasses for aqua evaluation.
 """
 
-from dataclasses import dataclass, field
-from typing import List, Optional, Union
+from pydantic import Field
+from typing import Any, Dict, List, Optional, Union
 
 from ads.aqua.data import AquaResourceIdentifier
-from ads.common.serializer import DataClassSerializable
+from ads.aqua.config.utils.serializer import Serializable
 
 
-@dataclass(repr=False)
-class CreateAquaEvaluationDetails(DataClassSerializable):
-    """Dataclass to create aqua model evaluation.
+class CreateAquaEvaluationDetails(Serializable):
+    """Class for creating aqua model evaluation.
 
-    Fields
-    ------
+    Properties
+    ----------
     evaluation_source_id: str
         The evaluation source id. Must be either model or model deployment ocid.
     evaluation_name: str
@@ -83,69 +82,64 @@ class CreateAquaEvaluationDetails(DataClassSerializable):
     ocpus: Optional[float] = None
     log_group_id: Optional[str] = None
     log_id: Optional[str] = None
-    metrics: Optional[List] = None
+    metrics: Optional[List[str]] = None
     force_overwrite: Optional[bool] = False
 
+    class Config:
+        extra = "ignore"
 
-@dataclass(repr=False)
-class AquaEvalReport(DataClassSerializable):
+class AquaEvalReport(Serializable):
     evaluation_id: str = ""
     content: str = ""
 
+    class Config:
+        extra = "ignore"
 
-@dataclass(repr=False)
-class ModelParams(DataClassSerializable):
-    max_tokens: str = ""
-    top_p: str = ""
-    top_k: str = ""
-    temperature: str = ""
-    presence_penalty: Optional[float] = 0.0
-    frequency_penalty: Optional[float] = 0.0
-    stop: Optional[Union[str, List[str]]] = field(default_factory=list)
-    model: Optional[str] = "odsc-llm"
-
-
-@dataclass(repr=False)
-class AquaEvalParams(ModelParams, DataClassSerializable):
+class AquaEvalParams(Serializable):
     shape: str = ""
     dataset_path: str = ""
     report_path: str = ""
 
+    class Config:
+        extra = "allow"
 
-@dataclass(repr=False)
-class AquaEvalMetric(DataClassSerializable):
+class AquaEvalMetric(Serializable):
     key: str
     name: str
     description: str = ""
 
+    class Config:
+        extra = "ignore"
 
-@dataclass(repr=False)
-class AquaEvalMetricSummary(DataClassSerializable):
+class AquaEvalMetricSummary(Serializable):
     metric: str = ""
     score: str = ""
     grade: str = ""
 
+    class Config:
+        extra = "ignore"
 
-@dataclass(repr=False)
-class AquaEvalMetrics(DataClassSerializable):
+class AquaEvalMetrics(Serializable):
     id: str
     report: str
-    metric_results: List[AquaEvalMetric] = field(default_factory=list)
-    metric_summary_result: List[AquaEvalMetricSummary] = field(default_factory=list)
+    metric_results: List[AquaEvalMetric] = Field(default_factory=list)
+    metric_summary_result: List[AquaEvalMetricSummary] = Field(default_factory=list)
 
+    class Config:
+        extra = "ignore"
 
-@dataclass(repr=False)
-class AquaEvaluationCommands(DataClassSerializable):
+class AquaEvaluationCommands(Serializable):
     evaluation_id: str
     evaluation_target_id: str
-    input_data: dict
-    metrics: list
+    input_data: Dict[str, Any]
+    metrics: List[str]
     output_dir: str
-    params: dict
+    params: Dict[str, Any]
 
+    class Config:
+        extra = "ignore"
 
-@dataclass(repr=False)
-class AquaEvaluationSummary(DataClassSerializable):
+class AquaEvaluationSummary(Serializable):
     """Represents a summary of Aqua evalution."""
 
     id: str
@@ -154,17 +148,18 @@ class AquaEvaluationSummary(DataClassSerializable):
     lifecycle_state: str
     lifecycle_details: str
     time_created: str
-    tags: dict
-    experiment: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)
-    source: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)
-    job: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)
-    parameters: AquaEvalParams = field(default_factory=AquaEvalParams)
+    tags: Dict[str, Any]
+    experiment: AquaResourceIdentifier = Field(default_factory=AquaResourceIdentifier)
+    source: AquaResourceIdentifier = Field(default_factory=AquaResourceIdentifier)
+    job: AquaResourceIdentifier = Field(default_factory=AquaResourceIdentifier)
+    parameters: AquaEvalParams = Field(default_factory=AquaEvalParams)
 
+    class Config:
+        extra = "ignore"
 
-@dataclass(repr=False)
-class AquaEvaluationDetail(AquaEvaluationSummary, DataClassSerializable):
+class AquaEvaluationDetail(AquaEvaluationSummary):
     """Represents a details of Aqua evalution."""
 
-    log_group: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)
-    log: AquaResourceIdentifier = field(default_factory=AquaResourceIdentifier)
-    introspection: dict = field(default_factory=dict)
+    log_group: AquaResourceIdentifier = Field(default_factory=AquaResourceIdentifier)
+    log: AquaResourceIdentifier = Field(default_factory=AquaResourceIdentifier)
+    introspection: dict = Field(default_factory=dict)

ads/aqua/evaluation/evaluation.py

@@ -7,7 +7,6 @@ import os
 import re
 import tempfile
 from concurrent.futures import ThreadPoolExecutor, as_completed
-from dataclasses import asdict, fields
 from datetime import datetime, timedelta
 from pathlib import Path
 from threading import Lock
@@ -46,7 +45,6 @@ from ads.aqua.common.utils import (
     upload_local_to_os,
 )
 from ads.aqua.config.config import get_evaluation_service_config
-from ads.aqua.config.evaluation.evaluation_service_config import EvaluationServiceConfig
 from ads.aqua.constants import (
     CONSOLE_LINK_RESOURCE_TYPE_MAPPING,
     EVALUATION_REPORT,
@@ -75,7 +73,6 @@ from ads.aqua.evaluation.entities import (
     AquaEvaluationSummary,
     AquaResourceIdentifier,
     CreateAquaEvaluationDetails,
-    ModelParams,
 )
 from ads.aqua.evaluation.errors import EVALUATION_JOB_EXIT_CODE_MESSAGE
 from ads.aqua.ui import AquaContainerConfig
@@ -161,10 +158,11 @@ class AquaEvaluationApp(AquaApp):
             try:
                 create_aqua_evaluation_details = CreateAquaEvaluationDetails(**kwargs)
             except Exception as ex:
+                custom_errors = {
+                    ".".join(map(str, e["loc"])): e["msg"] for e in json.loads(ex.json())
+                }
                 raise AquaValueError(
-                    "Invalid create evaluation parameters. "
-                    "Allowable parameters are: "
-                    f"{', '.join([field.name for field in fields(CreateAquaEvaluationDetails)])}."
+                    f"Invalid create evaluation parameters. Error details: {custom_errors}."
                 ) from ex
 
         if not is_valid_ocid(create_aqua_evaluation_details.evaluation_source_id):
@@ -175,15 +173,7 @@ class AquaEvaluationApp(AquaApp):
 
         # The model to evaluate
         evaluation_source = None
-        # The evaluation service config
-        evaluation_config: EvaluationServiceConfig = get_evaluation_service_config()
-        # The evaluation inference configuration. The inference configuration will be extracted
-        # based on the inferencing container family.
         eval_inference_configuration: Dict = {}
-        # The evaluation inference model sampling params. The system parameters that will not be
-        # visible for user, but will be applied implicitly for evaluation. The service model params
-        # will be extracted based on the container family and version.
-        eval_inference_service_model_params: Dict = {}
 
         if (
             DataScienceResource.MODEL_DEPLOYMENT
@@ -200,29 +190,14 @@ class AquaEvaluationApp(AquaApp):
                     runtime = ModelDeploymentContainerRuntime.from_dict(
                         evaluation_source.runtime.to_dict()
                     )
-                    container_config = AquaContainerConfig.from_container_index_json(
+                    inference_config = AquaContainerConfig.from_container_index_json(
                         enable_spec=True
-                    )
-                    for (
-                        inference_container_family,
-                        inference_container_info,
-                    ) in container_config.inference.items():
-                        if (
-                            inference_container_info.name
-                            == runtime.image[: runtime.image.rfind(":")]
-                        ):
+                    ).inference
+                    for container in inference_config.values():
+                        if container.name == runtime.image[: runtime.image.rfind(":")]:
                             eval_inference_configuration = (
-                                evaluation_config.get_merged_inference_params(
-                                    inference_container_family
-                                ).to_dict()
-                            )
-                            eval_inference_service_model_params = (
-                                evaluation_config.get_merged_inference_model_params(
-                                    inference_container_family,
-                                    inference_container_info.version,
-                                )
+                                container.spec.evaluation_configuration
                             )
-
             except Exception:
                 logger.debug(
                     f"Could not load inference config details for the evaluation source id: "
@@ -277,19 +252,12 @@ class AquaEvaluationApp(AquaApp):
             )
             evaluation_dataset_path = dst_uri
 
-        evaluation_model_parameters = None
-        try:
-            evaluation_model_parameters = AquaEvalParams(
-                shape=create_aqua_evaluation_details.shape_name,
-                dataset_path=evaluation_dataset_path,
-                report_path=create_aqua_evaluation_details.report_path,
-                **create_aqua_evaluation_details.model_parameters,
-            )
-        except Exception as ex:
-            raise AquaValueError(
-                "Invalid model parameters. Model parameters should "
-                f"be a dictionary with keys: {', '.join(list(ModelParams.__annotations__.keys()))}."
-            ) from ex
+        evaluation_model_parameters = AquaEvalParams(
+            shape=create_aqua_evaluation_details.shape_name,
+            dataset_path=evaluation_dataset_path,
+            report_path=create_aqua_evaluation_details.report_path,
+            **create_aqua_evaluation_details.model_parameters,
+        )
 
         target_compartment = (
             create_aqua_evaluation_details.compartment_id or COMPARTMENT_OCID
@@ -370,7 +338,7 @@ class AquaEvaluationApp(AquaApp):
         evaluation_model_taxonomy_metadata = ModelTaxonomyMetadata()
         evaluation_model_taxonomy_metadata[
             MetadataTaxonomyKeys.HYPERPARAMETERS
-        ].value = {"model_params": dict(asdict(evaluation_model_parameters))}
+        ].value = {"model_params": evaluation_model_parameters.to_dict()}
 
         evaluation_model = (
             DataScienceModel()
@@ -443,7 +411,6 @@ class AquaEvaluationApp(AquaApp):
                 dataset_path=evaluation_dataset_path,
                 report_path=create_aqua_evaluation_details.report_path,
                 model_parameters={
-                    **eval_inference_service_model_params,
                     **create_aqua_evaluation_details.model_parameters,
                 },
                 metrics=create_aqua_evaluation_details.metrics,
@@ -580,16 +547,14 @@ class AquaEvaluationApp(AquaApp):
                 **{
                     "AIP_SMC_EVALUATION_ARGUMENTS": json.dumps(
                         {
-                            **asdict(
-                                self._build_launch_cmd(
-                                    evaluation_id=evaluation_id,
-                                    evaluation_source_id=evaluation_source_id,
-                                    dataset_path=dataset_path,
-                                    report_path=report_path,
-                                    model_parameters=model_parameters,
-                                    metrics=metrics,
-                                ),
-                            ),
+                            **self._build_launch_cmd(
+                                evaluation_id=evaluation_id,
+                                evaluation_source_id=evaluation_source_id,
+                                dataset_path=dataset_path,
+                                report_path=report_path,
+                                model_parameters=model_parameters,
+                                metrics=metrics,
+                            ).to_dict(),
                             **(inference_configuration or {}),
                         },
                     ),
@@ -662,9 +627,9 @@ class AquaEvaluationApp(AquaApp):
                 "format": Path(dataset_path).suffix,
                 "url": dataset_path,
             },
-            metrics=metrics,
+            metrics=metrics or [],
             output_dir=report_path,
-            params=model_parameters,
+            params=model_parameters or {},
         )
 
     @telemetry(entry_point="plugin=evaluation&action=get", name="aqua")
@@ -1340,7 +1305,7 @@ class AquaEvaluationApp(AquaApp):
             "id": model_id,
             "name": model.display_name,
             "console_url": console_url,
-            "time_created": model.time_created,
+            "time_created": str(model.time_created),
             "tags": tags,
             "experiment": self._build_resource_identifier(
                 id=experiment_id,

ads/aqua/extension/deployment_handler.py

@@ -54,6 +54,33 @@ class AquaDeploymentHandler(AquaAPIhandler):
         else:
             raise HTTPError(400, f"The request {self.request.path} is invalid.")
 
+    @handle_exceptions
+    def delete(self, model_deployment_id):
+        return self.finish(AquaDeploymentApp().delete(model_deployment_id))
+
+    @handle_exceptions
+    def put(self, *args, **kwargs):
+        """
+        Handles put request for the activating and deactivating OCI datascience model deployments
+        Raises
+        ------
+        HTTPError
+            Raises HTTPError if inputs are missing or are invalid
+        """
+        url_parse = urlparse(self.request.path)
+        paths = url_parse.path.strip("/").split("/")
+        if len(paths) != 4 or paths[0] != "aqua" or paths[1] != "deployments":
+            raise HTTPError(400, f"The request {self.request.path} is invalid.")
+
+        model_deployment_id = paths[2]
+        action = paths[3]
+        if action == "activate":
+            return self.finish(AquaDeploymentApp().activate(model_deployment_id))
+        elif action == "deactivate":
+            return self.finish(AquaDeploymentApp().deactivate(model_deployment_id))
+        else:
+            raise HTTPError(400, f"The request {self.request.path} is invalid.")
+
     @handle_exceptions
     def post(self, *args, **kwargs):
         """
@@ -103,6 +130,8 @@ class AquaDeploymentHandler(AquaAPIhandler):
         memory_in_gbs = input_data.get("memory_in_gbs")
         model_file = input_data.get("model_file")
         private_endpoint_id = input_data.get("private_endpoint_id")
+        container_image_uri = input_data.get("container_image_uri")
+        cmd_var = input_data.get("cmd_var")
 
         self.finish(
             AquaDeploymentApp().create(
@@ -126,6 +155,8 @@ class AquaDeploymentHandler(AquaAPIhandler):
                 memory_in_gbs=memory_in_gbs,
                 model_file=model_file,
                 private_endpoint_id=private_endpoint_id,
+                container_image_uri=container_image_uri,
+                cmd_var=cmd_var,
             )
         )
 
@@ -266,5 +297,7 @@ __handlers__ = [
     ("deployments/?([^/]*)/params", AquaDeploymentParamsHandler),
     ("deployments/config/?([^/]*)", AquaDeploymentHandler),
     ("deployments/?([^/]*)", AquaDeploymentHandler),
+    ("deployments/?([^/]*)/activate", AquaDeploymentHandler),
+    ("deployments/?([^/]*)/deactivate", AquaDeploymentHandler),
     ("inference", AquaDeploymentInferenceHandler),
 ]

ads/aqua/extension/errors.py

@@ -8,3 +8,4 @@ class Errors(str):
     NO_INPUT_DATA = "No input data provided."
     MISSING_REQUIRED_PARAMETER = "Missing required parameter: '{}'"
     MISSING_ONEOF_REQUIRED_PARAMETER = "Either '{}' or '{}' is required."
+    INVALID_VALUE_OF_PARAMETER = "Invalid value of parameter: '{}'"

ads/aqua/extension/evaluation_handler.py

@@ -12,7 +12,6 @@ from ads.aqua.evaluation import AquaEvaluationApp
 from ads.aqua.evaluation.entities import CreateAquaEvaluationDetails
 from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.errors import Errors
-from ads.aqua.extension.utils import validate_function_parameters
 from ads.config import COMPARTMENT_OCID
 
 
@@ -47,10 +46,6 @@ class AquaEvaluationHandler(AquaAPIhandler):
         if not input_data:
             raise HTTPError(400, Errors.NO_INPUT_DATA)
 
-        validate_function_parameters(
-            data_class=CreateAquaEvaluationDetails, input_data=input_data
-        )
-
         self.finish(
             # TODO: decide what other kwargs will be needed for create aqua evaluation.
             AquaEvaluationApp().create(

ads/aqua/extension/model_handler.py

@@ -9,7 +9,10 @@ from tornado.web import HTTPError
 
 from ads.aqua.common.decorator import handle_exceptions
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
-from ads.aqua.common.utils import get_hf_model_info, list_hf_models
+from ads.aqua.common.utils import (
+    get_hf_model_info,
+    list_hf_models,
+)
 from ads.aqua.extension.base_handler import AquaAPIhandler
 from ads.aqua.extension.errors import Errors
 from ads.aqua.model import AquaModelApp
@@ -73,6 +76,8 @@ class AquaModelHandler(AquaAPIhandler):
         paths = url_parse.path.strip("/")
         if paths.startswith("aqua/model/cache"):
             return self.finish(AquaModelApp().clear_model_list_cache())
+        elif id:
+            return self.finish(AquaModelApp().delete_model(id))
         else:
             raise HTTPError(400, f"The request {self.request.path} is invalid.")
 
@@ -123,6 +128,7 @@ class AquaModelHandler(AquaAPIhandler):
         download_from_hf = (
             str(input_data.get("download_from_hf", "false")).lower() == "true"
         )
+        inference_container_uri = input_data.get("inference_container_uri")
 
         return self.finish(
             AquaModelApp().register(
@@ -134,9 +140,40 @@ class AquaModelHandler(AquaAPIhandler):
                 compartment_id=compartment_id,
                 project_id=project_id,
                 model_file=model_file,
+                inference_container_uri=inference_container_uri,
             )
         )
 
+    @handle_exceptions
+    def put(self, id):
+        try:
+            input_data = self.get_json_body()
+        except Exception as ex:
+            raise HTTPError(400, Errors.INVALID_INPUT_DATA_FORMAT) from ex
+
+        if not input_data:
+            raise HTTPError(400, Errors.NO_INPUT_DATA)
+
+        inference_container = input_data.get("inference_container")
+        inference_containers = AquaModelApp.list_valid_inference_containers()
+        if (
+            inference_container is not None
+            and inference_container not in inference_containers
+        ):
+            raise HTTPError(
+                400, Errors.INVALID_VALUE_OF_PARAMETER.format("inference_container")
+            )
+
+        enable_finetuning = input_data.get("enable_finetuning")
+        task = input_data.get("task")
+        app=AquaModelApp()
+        self.finish(
+            app.edit_registered_model(
+                id, inference_container, enable_finetuning, task
+            )
+        )
+        app.clear_model_details_cache(model_id=id)
+
 
 class AquaModelLicenseHandler(AquaAPIhandler):
     """Handler for Aqua Model license REST APIs."""

ads/aqua/model/model.py

@@ -10,11 +10,15 @@ from typing import Dict, List, Optional, Set, Union
 import oci
 from cachetools import TTLCache
 from huggingface_hub import snapshot_download
-from oci.data_science.models import JobRun, Model
+from oci.data_science.models import JobRun, Metadata, Model, UpdateModelDetails
 
 from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID, logger
 from ads.aqua.app import AquaApp
-from ads.aqua.common.enums import InferenceContainerTypeFamily, Tags
+from ads.aqua.common.enums import (
+    FineTuningContainerTypeFamily,
+    InferenceContainerTypeFamily,
+    Tags,
+)
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
 from ads.aqua.common.utils import (
     LifecycleStatus,
@@ -23,6 +27,7 @@ from ads.aqua.common.utils import (
     create_word_icon,
     generate_tei_cmd_var,
     get_artifact_path,
+    get_container_config,
     get_hf_model_info,
     list_os_files_with_extension,
     load_config,
@@ -78,7 +83,11 @@ from ads.config import (
     TENANCY_OCID,
 )
 from ads.model import DataScienceModel
-from ads.model.model_metadata import ModelCustomMetadata, ModelCustomMetadataItem
+from ads.model.model_metadata import (
+    MetadataCustomCategory,
+    ModelCustomMetadata,
+    ModelCustomMetadataItem,
+)
 from ads.telemetry import telemetry
 
 
@@ -333,6 +342,96 @@ class AquaModelApp(AquaApp):
 
         return model_details
 
+    @telemetry(entry_point="plugin=model&action=delete", name="aqua")
+    def delete_model(self, model_id):
+        ds_model = DataScienceModel.from_id(model_id)
+        is_registered_model = ds_model.freeform_tags.get(Tags.BASE_MODEL_CUSTOM, None)
+        is_fine_tuned_model = ds_model.freeform_tags.get(
+            Tags.AQUA_FINE_TUNED_MODEL_TAG, None
+        )
+        if is_registered_model or is_fine_tuned_model:
+            return ds_model.delete()
+        else:
+            raise AquaRuntimeError(
+                f"Failed to delete model:{model_id}. Only registered models or finetuned model can be deleted."
+            )
+
+    @telemetry(entry_point="plugin=model&action=delete", name="aqua")
+    def edit_registered_model(self, id, inference_container, enable_finetuning, task):
+        """Edits the default config of unverified registered model.
+
+        Parameters
+        ----------
+        id: str
+            The model OCID.
+        inference_container: str.
+            The inference container family name
+        enable_finetuning: str
+            Flag to enable or disable finetuning over the model. Defaults to None
+        task:
+            The usecase type of the model. e.g , text-generation , text_embedding etc.
+
+        Returns
+        -------
+        Model:
+            The instance of oci.data_science.models.Model.
+
+        """
+        ds_model = DataScienceModel.from_id(id)
+        if ds_model.freeform_tags.get(Tags.BASE_MODEL_CUSTOM, None):
+            if ds_model.freeform_tags.get(Tags.AQUA_SERVICE_MODEL_TAG, None):
+                raise AquaRuntimeError(
+                    f"Failed to edit model:{id}. Only registered unverified models can be edited."
+                )
+            else:
+                custom_metadata_list = ds_model.custom_metadata_list
+                freeform_tags = ds_model.freeform_tags
+                if inference_container:
+                    custom_metadata_list.add(
+                        key=ModelCustomMetadataFields.DEPLOYMENT_CONTAINER,
+                        value=inference_container,
+                        category=MetadataCustomCategory.OTHER,
+                        description="Deployment container mapping for SMC",
+                        replace=True,
+                    )
+                if enable_finetuning is not None:
+                    if enable_finetuning.lower() == "true":
+                        custom_metadata_list.add(
+                            key=ModelCustomMetadataFields.FINETUNE_CONTAINER,
+                            value=FineTuningContainerTypeFamily.AQUA_FINETUNING_CONTAINER_FAMILY,
+                            category=MetadataCustomCategory.OTHER,
+                            description="Fine-tuning container mapping for SMC",
+                            replace=True,
+                        )
+                        freeform_tags.update({Tags.READY_TO_FINE_TUNE: "true"})
+                    elif enable_finetuning.lower() == "false":
+                        try:
+                            custom_metadata_list.remove(
+                                ModelCustomMetadataFields.FINETUNE_CONTAINER
+                            )
+                            freeform_tags.pop(Tags.READY_TO_FINE_TUNE)
+                        except Exception as ex:
+                            raise AquaRuntimeError(
+                                f"The given model already doesn't support finetuning: {ex}"
+                            )
+
+                custom_metadata_list.remove("modelDescription")
+                if task:
+                    freeform_tags.update({Tags.TASK: task})
+                updated_custom_metadata_list = [
+                    Metadata(**metadata)
+                    for metadata in custom_metadata_list.to_dict()["data"]
+                ]
+                update_model_details = UpdateModelDetails(
+                    custom_metadata_list=updated_custom_metadata_list,
+                    freeform_tags=freeform_tags,
+                )
+                AquaApp().update_model(id, update_model_details)
+        else:
+            raise AquaRuntimeError(
+                f"Failed to edit model:{id}. Only registered unverified models can be edited."
+            )
+
     def _fetch_metric_from_metadata(
         self,
         custom_metadata_list: ModelCustomMetadata,
@@ -629,6 +728,32 @@ class AquaModelApp(AquaApp):
                 }
         return res
 
+    def clear_model_details_cache(self, model_id):
+        """
+        Allows user to clear model details cache item
+        Returns
+        -------
+            dict with the key used, and True if cache has the key that needs to be deleted.
+        """
+        res = {}
+        logger.info(f"Clearing _service_model_details_cache for {model_id}")
+        with self._cache_lock:
+            if model_id in self._service_model_details_cache:
+                self._service_model_details_cache.pop(key=model_id)
+                res = {"key": {"model_id": model_id}, "cache_deleted": True}
+
+        return res
+
+    @staticmethod
+    def list_valid_inference_containers():
+        containers = list(
+            AquaContainerConfig.from_container_index_json(
+                config=get_container_config(), enable_spec=True
+            ).inference.values()
+        )
+        family_values = [item.family for item in containers]
+        return family_values
+
     def _create_model_catalog_entry(
         self,
         os_path: str,

ads/aqua/modeldeployment/deployment.py

@@ -532,6 +532,18 @@ class AquaDeploymentApp(AquaApp):
 
         return results
 
+    @telemetry(entry_point="plugin=deployment&action=delete", name="aqua")
+    def delete(self,model_deployment_id:str):
+        return self.ds_client.delete_model_deployment(model_deployment_id=model_deployment_id).data
+
+    @telemetry(entry_point="plugin=deployment&action=deactivate",name="aqua")
+    def deactivate(self,model_deployment_id:str):
+        return self.ds_client.deactivate_model_deployment(model_deployment_id=model_deployment_id).data
+
+    @telemetry(entry_point="plugin=deployment&action=activate",name="aqua")
+    def activate(self,model_deployment_id:str):
+        return self.ds_client.activate_model_deployment(model_deployment_id=model_deployment_id).data
+
     @telemetry(entry_point="plugin=deployment&action=get", name="aqua")
     def get(self, model_deployment_id: str, **kwargs) -> "AquaDeploymentDetail":
         """Gets the information of Aqua model deployment.

ads/dataset/dataset.py

@@ -202,7 +202,7 @@ class ADSDataset(PandasDataset):
                     self.sampled_df.head(5)
                     .style.set_table_styles(utils.get_dataframe_styles())
                     .set_table_attributes("class=table")
-                    .hide_index()
+                    .hide()
                     .to_html()
                 )
             )
@@ -261,7 +261,7 @@ class ADSDataset(PandasDataset):
                         utils.horizontal_scrollable_div(
                             self.style.set_table_styles(utils.get_dataframe_styles())
                             .set_table_attributes("class=table")
-                            .hide_index()
+                            .hide()
                             .to_html()
                         )
                     )

ads/dataset/factory.py

@@ -366,7 +366,7 @@ class DatasetFactory:
             display(
                 HTML(
                     list_df.style.set_table_attributes("class=table")
-                    .hide_index()
+                    .hide()
                     .to_html()
                 )
             )

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

@@ -1,18 +1,12 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 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
 
-import click
-
-from ads.opctl import logger
-from ads.opctl.operator.common.utils import _load_yaml_from_uri
 from ads.opctl.operator.common.operator_yaml_generator import YamlGenerator
-
-from .const import SupportedModels
+from ads.opctl.operator.common.utils import _load_yaml_from_uri
 
 
 def init(**kwargs: Dict) -> str:
@@ -39,7 +33,7 @@ def init(**kwargs: Dict) -> str:
     #     type=click.Choice(SupportedModels.values()),
     #     default=SupportedModels.Auto,
     # )
-    model_type = "auto"
+    model_type = "prophet"
 
     return YamlGenerator(
         schema=_load_yaml_from_uri(__file__.replace("cmd.py", "schema.yaml"))

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

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 from ads.common.extended_enum import ExtendedEnumMeta
@@ -17,7 +16,7 @@ class SupportedModels(str, metaclass=ExtendedEnumMeta):
     LGBForecast = "lgbforecast"
     AutoMLX = "automlx"
     AutoTS = "autots"
-    Auto = "auto"
+    # Auto = "auto"
 
 
 class SpeedAccuracyMode(str, metaclass=ExtendedEnumMeta):
@@ -28,7 +27,7 @@ class SpeedAccuracyMode(str, metaclass=ExtendedEnumMeta):
     HIGH_ACCURACY = "HIGH_ACCURACY"
     BALANCED = "BALANCED"
     FAST_APPROXIMATE = "FAST_APPROXIMATE"
-    ratio = dict()
+    ratio = {}
     ratio[HIGH_ACCURACY] = 1  # 100 % data used for generating explanations
     ratio[BALANCED] = 0.5  # 50 % data used for generating explanations
     ratio[FAST_APPROXIMATE] = 0  # constant

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

@@ -1,20 +1,19 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
-from ..const import SupportedModels, AUTO_SELECT
+from ..const import AUTO_SELECT, SupportedModels
+from ..model_evaluator import ModelEvaluator
 from ..operator_config import ForecastOperatorConfig
 from .arima import ArimaOperatorModel
 from .automlx import AutoMLXOperatorModel
 from .autots import AutoTSOperatorModel
 from .base_model import ForecastOperatorBaseModel
+from .forecast_datasets import ForecastDatasets
 from .neuralprophet import NeuralProphetOperatorModel
 from .prophet import ProphetOperatorModel
-from .forecast_datasets import ForecastDatasets
-from .ml_forecast import MLForecastOperatorModel
-from ..model_evaluator import ModelEvaluator
+
 
 class UnSupportedModelError(Exception):
     def __init__(self, model_type: str):
@@ -33,9 +32,9 @@ class ForecastOperatorModelFactory:
         SupportedModels.Prophet: ProphetOperatorModel,
         SupportedModels.Arima: ArimaOperatorModel,
         SupportedModels.NeuralProphet: NeuralProphetOperatorModel,
-        SupportedModels.LGBForecast: MLForecastOperatorModel,
+        # SupportedModels.LGBForecast: MLForecastOperatorModel,
         SupportedModels.AutoMLX: AutoMLXOperatorModel,
-        SupportedModels.AutoTS: AutoTSOperatorModel
+        SupportedModels.AutoTS: AutoTSOperatorModel,
     }
 
     @classmethod
@@ -65,14 +64,14 @@ class ForecastOperatorModelFactory:
         model_type = operator_config.spec.model
         if model_type == AUTO_SELECT:
             model_type = cls.auto_select_model(datasets, operator_config)
-            operator_config.spec.model_kwargs = dict()
+            operator_config.spec.model_kwargs = {}
         if model_type not in cls._MAP:
             raise UnSupportedModelError(model_type)
         return cls._MAP[model_type](config=operator_config, datasets=datasets)
 
     @classmethod
     def auto_select_model(
-            cls, datasets: ForecastDatasets, operator_config: ForecastOperatorConfig
+        cls, datasets: ForecastDatasets, operator_config: ForecastOperatorConfig
     ) -> str:
         """
         Selects AutoMLX or Arima model based on column count.
@@ -90,8 +89,10 @@ class ForecastOperatorModelFactory:
         str
             The type of the model.
         """
-        all_models = operator_config.spec.model_kwargs.get("model_list", cls._MAP.keys())
+        all_models = operator_config.spec.model_kwargs.get(
+            "model_list", cls._MAP.keys()
+        )
         num_backtests = operator_config.spec.model_kwargs.get("num_backtests", 5)
         sample_ratio = operator_config.spec.model_kwargs.get("sample_ratio", 0.20)
         model_evaluator = ModelEvaluator(all_models, num_backtests, sample_ratio)
-        return model_evaluator.find_best_model(datasets, operator_config)
+        return model_evaluator.find_best_model(datasets, operator_config)

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

@@ -2,7 +2,8 @@
 
 # Copyright (c) 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
-import numpy as np
+import traceback
+
 import pandas as pd
 
 from ads.common.decorator import runtime_dependency
@@ -164,7 +165,7 @@ class MLForecastOperatorModel(ForecastOperatorBaseModel):
             self.errors_dict[self.spec.model] = {
                 "model_name": self.spec.model,
                 "error": str(e),
-                "error_trace": traceback.format_exc()
+                "error_trace": traceback.format_exc(),
             }
             logger.warn(f"Encountered Error: {e}. Skipping.")
             logger.warn(traceback.format_exc())
@@ -173,7 +174,7 @@ class MLForecastOperatorModel(ForecastOperatorBaseModel):
     def _build_model(self) -> pd.DataFrame:
         data_train = self.datasets.get_all_data_long(include_horizon=False)
         data_test = self.datasets.get_all_data_long_forecast_horizon()
-        self.models = dict()
+        self.models = {}
         model_kwargs = self.set_kwargs()
         self.forecast_output = ForecastOutput(
             confidence_interval_width=self.spec.confidence_interval_width,

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

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import os
@@ -9,13 +8,17 @@ from dataclasses import dataclass, field
 from typing import Dict, List
 
 from ads.common.serializer import DataClassSerializable
+from ads.opctl.operator.common.operator_config import (
+    InputData,
+    OperatorConfig,
+    OutputDirectory,
+)
 from ads.opctl.operator.common.utils import _load_yaml_from_uri
-from ads.opctl.operator.common.operator_config import OperatorConfig, OutputDirectory, InputData
-
-from .const import SupportedMetrics, SpeedAccuracyMode
-from .const import SupportedModels
 from ads.opctl.operator.lowcode.common.utils import find_output_dirname
 
+from .const import SpeedAccuracyMode, SupportedMetrics, SupportedModels
+
+
 @dataclass(repr=True)
 class TestData(InputData):
     """Class representing operator specification test data details."""
@@ -90,13 +93,17 @@ class ForecastOperatorSpec(DataClassSerializable):
 
     def __post_init__(self):
         """Adjusts the specification details."""
-        self.output_directory = self.output_directory or OutputDirectory(url=find_output_dirname(self.output_directory))
+        self.output_directory = self.output_directory or OutputDirectory(
+            url=find_output_dirname(self.output_directory)
+        )
         self.metric = (self.metric or "").lower() or SupportedMetrics.SMAPE.lower()
-        self.model = self.model or SupportedModels.Auto
+        self.model = self.model or SupportedModels.Prophet
         self.confidence_interval_width = self.confidence_interval_width or 0.80
         self.report_filename = self.report_filename or "report.html"
         self.preprocessing = (
-            self.preprocessing if self.preprocessing is not None else DataPreprocessor(enabled=True)
+            self.preprocessing
+            if self.preprocessing is not None
+            else DataPreprocessor(enabled=True)
         )
         # For Report Generation. When user doesn't specify defaults to True
         self.generate_report = (
@@ -138,7 +145,7 @@ class ForecastOperatorSpec(DataClassSerializable):
         )
         self.target_column = self.target_column or "Sales"
         self.errors_dict_filename = "errors.json"
-        self.model_kwargs = self.model_kwargs or dict()
+        self.model_kwargs = self.model_kwargs or {}
 
 
 @dataclass(repr=True)

ads/opctl/operator/lowcode/forecast/schema.yaml

@@ -374,12 +374,12 @@ spec:
     model:
       type: string
       required: false
-      default: auto-select
+      default: prophet
       allowed:
         - prophet
         - arima
         - neuralprophet
-        - lgbforecast
+        # - lgbforecast
         - automlx
         - autots
         - auto-select

ads/oracledb/oracle_db.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """
@@ -17,19 +16,20 @@ If user uses DSN string copied from OCI console with OCI database setup for TLS
 Note: We need to account for cx_Oracle though oracledb can operate in thick mode. The end user may be is using one of the old conda packs or an environment where cx_Oracle is the only available driver.
 """
 
-from ads.common.utils import ORACLE_DEFAULT_PORT
-
 import logging
-import numpy as np
 import os
-import pandas as pd
 import tempfile
-from time import time
-from typing import Dict, Optional, List, Union, Iterator
 import zipfile
+from time import time
+from typing import Dict, Iterator, List, Optional, Union
+
+import numpy as np
+import pandas as pd
+
 from ads.common.decorator.runtime_dependency import (
     OptionalDependency,
 )
+from ads.common.utils import ORACLE_DEFAULT_PORT
 
 logger = logging.getLogger("ads.oracle_connector")
 CX_ORACLE = "cx_Oracle"
@@ -40,17 +40,17 @@ try:
     import oracledb as oracle_driver  # Both the driver share same signature for the APIs that we are using.
 
     PYTHON_DRIVER_NAME = PYTHON_ORACLEDB
-except:
+except ModuleNotFoundError:
     logger.info("oracledb package not found. Trying to load cx_Oracle")
     try:
         import cx_Oracle as oracle_driver
 
         PYTHON_DRIVER_NAME = CX_ORACLE
-    except ModuleNotFoundError:
+    except ModuleNotFoundError as err2:
         raise ModuleNotFoundError(
             f"Neither `oracledb` nor `cx_Oracle` module was not found. Please run "
             f"`pip install {OptionalDependency.DATA}`."
-        )
+        ) from err2
 
 
 class OracleRDBMSConnection(oracle_driver.Connection):
@@ -75,7 +75,7 @@ class OracleRDBMSConnection(oracle_driver.Connection):
                 logger.info(
                     "Running oracledb driver in thick mode. For mTLS based connection, thick mode is default."
                 )
-            except:
+            except Exception:
                 logger.info(
                     "Could not use thick mode. The driver is running in thin mode. System might prompt for passphrase"
                 )
@@ -154,7 +154,6 @@ class OracleRDBMSConnection(oracle_driver.Connection):
         batch_size=100000,
         encoding="utf-8",
     ):
-
         if if_exists not in ["fail", "replace", "append"]:
             raise ValueError(
                 f"Unknown option `if_exists`={if_exists}. Valid options are 'fail', 'replace', 'append'"
@@ -173,7 +172,6 @@ class OracleRDBMSConnection(oracle_driver.Connection):
         df_orcl.columns = df_orcl.columns.str.replace(r"\W+", "_", regex=True)
         table_exist = True
         with self.cursor() as cursor:
-
             if if_exists != "replace":
                 try:
                     cursor.execute(f"SELECT 1 from {table_name} FETCH NEXT 1 ROWS ONLY")
@@ -275,7 +273,6 @@ class OracleRDBMSConnection(oracle_driver.Connection):
                     yield lst[i : i + batch_size]
 
             for batch in chunks(record_data, batch_size=batch_size):
-
                 cursor.executemany(sql, batch, batcherrors=True)
 
                 for error in cursor.getbatcherrors():
@@ -304,7 +301,6 @@ class OracleRDBMSConnection(oracle_driver.Connection):
     def query(
         self, sql: str, bind_variables: Optional[Dict], chunksize=None
     ) -> Union[pd.DataFrame, Iterator[pd.DataFrame]]:
-
         start_time = time()
 
         cursor = self.cursor()
@@ -315,10 +311,8 @@ class OracleRDBMSConnection(oracle_driver.Connection):
             cursor.execute(sql, **bind_variables)
             columns = [row[0] for row in cursor.description]
             df = iter(
-                (
-                    pd.DataFrame(data=rows, columns=columns)
-                    for rows in self._fetch_by_batch(cursor, chunksize)
-                )
+                pd.DataFrame(data=rows, columns=columns)
+                for rows in self._fetch_by_batch(cursor, chunksize)
             )
 
         else:
@@ -332,3 +326,21 @@ class OracleRDBMSConnection(oracle_driver.Connection):
             )
 
         return df
+
+
+def get_adw_connection(vault_secret_id: str) -> "oracledb.Connection":
+    """Creates ADW connection from the credentials stored in the vault"""
+    import oracledb
+
+    from ads.secrets.adb import ADBSecretKeeper
+
+    secret = vault_secret_id
+
+    logging.getLogger().debug("A secret id was used to retrieve credentials.")
+    creds = ADBSecretKeeper.load_secret(secret).to_dict()
+    user = creds.pop("user_name", None)
+    password = creds.pop("password", None)
+    if not user or not password:
+        raise ValueError(f"The user or password is missing in {secret}")
+    logging.getLogger().debug("Downloaded secrets successfully.")
+    return oracledb.connect(user=user, password=password, **creds)

ads/secrets/adb.py

@@ -1,17 +1,18 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
-import ads
-from ads.secrets import SecretKeeper, Secret
 import json
 import os
 import tempfile
 import zipfile
+
 from tqdm.auto import tqdm
 
+import ads
+from ads.secrets import Secret, SecretKeeper
+
 logger = ads.getLogger("ads.secrets")
 
 from dataclasses import dataclass, field
@@ -25,7 +26,7 @@ class ADBSecret(Secret):
 
     user_name: str
     password: str
-    service_name: str
+    service_name: str = field(default=None)
     wallet_location: str = field(
         default=None, metadata={"serializable": False}
     )  # Not saved in vault
@@ -40,6 +41,7 @@ class ADBSecret(Secret):
     wallet_secret_ids: list = field(
         repr=False, default_factory=list
     )  # Not exposed through environment or `to_dict` function
+    dsn: str = field(default=None)
 
     def __post_init__(self):
         self.wallet_file_name = (
@@ -76,6 +78,22 @@ class ADBSecretKeeper(SecretKeeper):
     >>> print(adw_keeper.secret_id) # Prints the secret_id of the stored credentials
     >>> adw_keeper.export_vault_details("adw_employee_att.json", format="json") # Save the secret id and vault info to a json file
 
+
+    >>> # Saving credentials for TLS connection
+    >>> from ads.secrets.adw import ADBSecretKeeper
+    >>> vault_id = "ocid1.vault.oc1..<unique_ID>"
+    >>> kid = "ocid1.ke..<unique_ID>"
+
+    >>> import ads
+    >>> ads.set_auth("resource_principal") # If using resource principal for authentication
+    >>> connection_parameters={
+    ...     "user_name":"admin",
+    ...     "password":"<your password>",
+    ...     "dsn":"<dsn string>"
+    ... }
+    >>> adw_keeper = ADBSecretKeeper(vault_id=vault_id, key_id=kid, **connection_parameters)
+    >>> adw_keeper.save("adw_employee", "My DB credentials", freeform_tags={"schema":"emp"})
+
     >>> # Loading credentails
     >>> import ads
     >>> ads.set_auth("resource_principal") # If using resource principal for authentication
@@ -133,6 +151,7 @@ class ADBSecretKeeper(SecretKeeper):
         wallet_dir: str = None,
         repository_path: str = None,
         repository_key: str = None,
+        dsn: str = None,
         **kwargs,
     ):
         """
@@ -152,6 +171,8 @@ class ADBSecretKeeper(SecretKeeper):
             Path to credentials repository. For more details refer `ads.database.connection`
         repository_key: (str, optional). Default None.
             Configuration key for loading the right configuration from repository. For more details refer `ads.database.connection`
+        dsn: (str, optional). Default None.
+            dsn string copied from the OCI console for TLS connection
         kwargs:
             vault_id: str. OCID of the vault where the secret is stored. Required for saving secret.
             key_id: str. OCID of the key used for encrypting the secret. Required for saving secret.
@@ -180,6 +201,7 @@ class ADBSecretKeeper(SecretKeeper):
             password=password,
             service_name=service_name,
             wallet_location=wallet_location,
+            dsn=dsn,
         )
         self.wallet_dir = wallet_dir
 
@@ -252,7 +274,7 @@ class ADBSecretKeeper(SecretKeeper):
             logger.debug(f"Setting wallet file to {self.data.wallet_location}")
             data.wallet_location = self.data.wallet_location
         elif data.wallet_secret_ids and len(data.wallet_secret_ids) > 0:
-            logger.debug(f"Secret ids corresponding to the wallet files found.")
+            logger.debug("Secret ids corresponding to the wallet files found.")
             # If the secret ids for wallet files are available in secret, then we
             # can generate the wallet file.
 

{oracle_ads-2.12.3.dist-info → oracle_ads-2.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: oracle_ads
-Version: 2.12.3
+Version: 2.12.5
 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.12.3.dist-info → oracle_ads-2.12.5.dist-info}/RECORD

@@ -26,21 +26,21 @@ ads/aqua/dummy_data/oci_models.json,sha256=mxUU8o3plmAFfr06fQmIQuiGe2qFFBlUB7QNP
 ads/aqua/dummy_data/readme.md,sha256=AlBPt0HBSOFA5HbYVsFsdTm-BC3R5NRpcKrTxdjEnlI,1256
 ads/aqua/evaluation/__init__.py,sha256=Fd7WL7MpQ1FtJjlftMY2KHli5cz1wr5MDu3hGmV89a0,298
 ads/aqua/evaluation/constants.py,sha256=GvcXvPIw-VDKw4a8WNKs36uWdT-f7VJrWSpnnRnthGg,1533
-ads/aqua/evaluation/entities.py,sha256=mlu_ohjNPxxyDh4s_dFFxXJqKrwutAn48Wqr_odcT2M,5713
+ads/aqua/evaluation/entities.py,sha256=bDIEtIwyNkUK-1S5jsbbne6xy49U-UmtuzzNuYf0tgk,5430
 ads/aqua/evaluation/errors.py,sha256=qzR63YEIA8haCh4HcBHFFm7j4g6jWDfGszqrPkXx9zQ,4564
-ads/aqua/evaluation/evaluation.py,sha256=LoEBUHwJwMa-seLa8d4qzPRMic_4AjeYcxMbftkoXa0,59885
+ads/aqua/evaluation/evaluation.py,sha256=iopL7A6RNfqsaLg19xsg9lRnSZ0aI6mkx8kooDyulio,58016
 ads/aqua/extension/__init__.py,sha256=mRArjU6UZpZYVr0qHSSkPteA_CKcCZIczOFaK421m9o,1453
 ads/aqua/extension/aqua_ws_msg_handler.py,sha256=PcRhBqGpq5aOPP0ibhaKfmkA8ajimldsvJC32o9JeTw,3291
 ads/aqua/extension/base_handler.py,sha256=MuVxsJG66NdatL-Hh99UD3VQOQw1ir-q2YBajwh9cJk,5132
 ads/aqua/extension/common_handler.py,sha256=Oz3riHDy5pFfbArLge5iaaRoK8PEAnkBvhqqVGbUsvE,4196
 ads/aqua/extension/common_ws_msg_handler.py,sha256=pMX79tmJKTKog684o6vuwZkAD47l8SxtRx5TNn8se7k,2230
-ads/aqua/extension/deployment_handler.py,sha256=UOhtlYNEHSXOG2oCQ9pLNZzOkcY0mbm7EeMhRc_TuKg,9600
+ads/aqua/extension/deployment_handler.py,sha256=i2UAZQ8_uVgg32OmM1vif3kplAVuRwxZsjgTfUSKnH8,11025
 ads/aqua/extension/deployment_ws_msg_handler.py,sha256=JX3ZHRtscrflSxT7ZTEEI_p_owtk3m5FZq3QXE96AGY,2013
-ads/aqua/extension/errors.py,sha256=i37EnRzxGgvxzUNoyEORzHYmB296DGOUb6pm7VwEyTU,451
-ads/aqua/extension/evaluation_handler.py,sha256=RT2W7WDtxNIT0uirLfTcDlmTPYCuMuWRhiDxYZYliZs,4542
+ads/aqua/extension/errors.py,sha256=ojDolyr3_0UCCwKqPtiZZyMQuX35jr8h8MQRP6HcBs4,519
+ads/aqua/extension/evaluation_handler.py,sha256=fJH73fa0xmkEiP8SxKL4A4dJgj-NoL3z_G-w_WW2zJs,4353
 ads/aqua/extension/evaluation_ws_msg_handler.py,sha256=dv0iwOSTxYj1kQ1rPEoDmGgFBzLUCLXq5h7rpmY2T1M,2098
 ads/aqua/extension/finetune_handler.py,sha256=abiDXNhkhtoV9hrYhCzwhDjdQKlqQ_KSqxKWntkvh3E,3288
-ads/aqua/extension/model_handler.py,sha256=lsa8cRblUbITOtn2K9HuPWrl_CVGV2GXHq2aiGh4K5U,9130
+ads/aqua/extension/model_handler.py,sha256=Mlx12n8cssb7Cti0zpDNRHzIDk-xPC7pXzeHf8eY66E,10398
 ads/aqua/extension/models_ws_msg_handler.py,sha256=3CPfzWl1xfrE2Dpn_WYP9zY0kY5zlsAE8tU_6Y2-i18,1801
 ads/aqua/extension/ui_handler.py,sha256=3TibTMeqcsSWfPsorspFrhIV0PRh8_4FoWpudycT80g,10664
 ads/aqua/extension/ui_websocket_handler.py,sha256=oLFjaDrqkSERbhExdvxjLJX0oRcP-DVJ_aWn0qy0uvo,5084
@@ -55,10 +55,10 @@ ads/aqua/model/__init__.py,sha256=j2iylvERdANxgrEDp7b_mLcKMz1CF5Go0qgYCiMwdos,27
 ads/aqua/model/constants.py,sha256=H239zDu3koa3UTdw-uQveXHX2NDwidclVcS4QIrCTJo,1593
 ads/aqua/model/entities.py,sha256=9SsdJfoBH7fDKGXQYs8pKLiZ-SqFnXaZrJod4FWU3mI,9670
 ads/aqua/model/enums.py,sha256=t8GbK2nblIPm3gClR8W31RmbtTuqpoSzoN4W3JfD6AI,1004
-ads/aqua/model/model.py,sha256=Vkm1oszD6Lw1rl8Yxf2azuWI1zF4jl-QE5Sk5SEDKWM,57414
+ads/aqua/model/model.py,sha256=IwfN9I3p7KDzhM5moiEBh9sxU6pGtIARKxJcyDOGslA,62711
 ads/aqua/modeldeployment/__init__.py,sha256=RJCfU1yazv3hVWi5rS08QVLTpTwZLnlC8wU8diwFjnM,391
 ads/aqua/modeldeployment/constants.py,sha256=lJF77zwxmlECljDYjwFAMprAUR_zctZHmawiP-4alLg,296
-ads/aqua/modeldeployment/deployment.py,sha256=OE_jpPCGNxC6-p88kk7Xx1yQ1rKALgALRgcOnfLZb0A,29970
+ads/aqua/modeldeployment/deployment.py,sha256=8qx4cxzuln5FZpAXTZlvaHCio2fzFJxO4PrrAS1_b6A,30652
 ads/aqua/modeldeployment/entities.py,sha256=7aoE2HemsFEvkQynAI4PCfZBcfPJrvbyZeEYvc7OIAA,5111
 ads/aqua/modeldeployment/inference.py,sha256=JPqzbHJoM-PpIU_Ft9lHudO9_1vFr7OPQ2GHjPoAufU,2142
 ads/aqua/training/__init__.py,sha256=w2DNWltXtASQgbrHyvKo0gMs5_chZoG-CSDMI4qe7i0,202
@@ -149,11 +149,11 @@ ads/dataset/correlation.py,sha256=OKdUO-bhZTQnZ3flrju1se6ToB8v6yod_uYeFPRLHfU,80
 ads/dataset/correlation_plot.py,sha256=LLGy9ZzkQ-V9yPo58T2Jjj6qdBeqwJcave5yUgBOYK4,17266
 ads/dataset/dask_series.py,sha256=2BhjLDyKL4-dHq7tBgipd8-2VxR0kJdzImu3sxjdNOg,5427
 ads/dataset/dataframe_transformer.py,sha256=xPBG8nvYh35hfXcwutj8FDrO1DnSM4_NgW6EMRQWW7s,3592
-ads/dataset/dataset.py,sha256=nXNUBEBxX8D5OJNyn8AgvYYQFNMTdRD4R-6-UaxavQs,73481
+ads/dataset/dataset.py,sha256=UhcvDBg1zxz3dADroaHAO8iLoPtGhmLOMEdry13Lyqg,73469
 ads/dataset/dataset_browser.py,sha256=E-Cx0lJPAHicDUi6nIDWBCd_M_LM7EXpdT1S80l7EPE,11879
 ads/dataset/dataset_with_target.py,sha256=n11qv3bPaZU_XXwZYBtzZYVmX2sn_wuc422HFBXoE_8,38574
 ads/dataset/exception.py,sha256=Z96xkd9hzbn0NrMsmubcrXLGIU6nP2-0M02T9C0Xwg0,602
-ads/dataset/factory.py,sha256=bD2T-fYuKTo9Wk8OscZeAjYpzym54eMfU_eYWvBl4Fk,37594
+ads/dataset/factory.py,sha256=n-KSiNFJR__8PQ39vTdN0uvPXx0Qjnt00dADZAW6aeE,37588
 ads/dataset/feature_engineering_transformer.py,sha256=IbR-V7YW-WgGRpNUvFyO_rpmWqeyL4WqlZcJO4gy0v8,1140
 ads/dataset/feature_selection.py,sha256=FJLsQ0obLW9lSFibxNpmUI592SLSXnL_2hD9Y8E5BWI,4144
 ads/dataset/forecasting_dataset.py,sha256=-qNeCcFmm-1FDN_EmG7tYEs8-MSzmHyIb9PHeSCk0PM,980
@@ -678,22 +678,22 @@ ads/opctl/operator/lowcode/forecast/MLoperator,sha256=xM8yBUQObjG_6Mg36f3Vv8b9N3
 ads/opctl/operator/lowcode/forecast/README.md,sha256=kbCCEdo-0pwKlZp9ctnWUK6Z31n69IsnG0i26b202Zg,9768
 ads/opctl/operator/lowcode/forecast/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
 ads/opctl/operator/lowcode/forecast/__main__.py,sha256=5Vh-kClwxTsvZLEuECyQBvbZFfH37HQW2G09RwX11Kw,2503
-ads/opctl/operator/lowcode/forecast/cmd.py,sha256=Q-R3yfK7aPfE4-0zIqzLFSjnz1tVMxJ1bbvrCirVZHQ,1246
-ads/opctl/operator/lowcode/forecast/const.py,sha256=PBEhOGZaFWzkd5H9Vw687lq2A5q5RZNlS6Mj6ZelOuw,2618
+ads/opctl/operator/lowcode/forecast/cmd.py,sha256=uwU-QvnYwxoRFXZv7_JFkzAUnjTNoSsHEme2FF-9Rl0,1151
+ads/opctl/operator/lowcode/forecast/const.py,sha256=jyoXhrRXFipcATwGIU_3rFRZL-r6hvbKNUVO2uG2siY,2597
 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=dSV1aj25wzv0V3y72YdYj4rCPjXAog13ppxYDNY9HQU,8913
-ads/opctl/operator/lowcode/forecast/operator_config.py,sha256=XskXuOWtZZb6_EcR_t6XAEdr6jt1wT30oBcWt-8zeWA,6396
-ads/opctl/operator/lowcode/forecast/schema.yaml,sha256=Zfhh_wfWxNeTtN4bqAe623Vf0HbQWCLyNx8LkiCTCgo,10138
+ads/opctl/operator/lowcode/forecast/operator_config.py,sha256=vG7n-RIiazujH0UtJ0uarx9IKDIAS0b4WcCo1dNLVL0,6422
+ads/opctl/operator/lowcode/forecast/schema.yaml,sha256=twmsn0wPPkgdVk8tKPZL3zBlxqecuXL0GSlIz3I8ZEI,10136
 ads/opctl/operator/lowcode/forecast/utils.py,sha256=oc6eBH9naYg4BB14KS2HL0uFdZHMgKsxx9vG28dJrXA,14347
 ads/opctl/operator/lowcode/forecast/model/__init__.py,sha256=sAqmLhogrLXb3xI7dPOj9HmSkpTnLh9wkzysuGd8AXk,204
 ads/opctl/operator/lowcode/forecast/model/arima.py,sha256=6ZXtzXcqoEMVF9DChzX0cnTJ-9tXKdbPiiSPQq4a9oM,10914
 ads/opctl/operator/lowcode/forecast/model/automlx.py,sha256=D7U-y-sTdkiqynk_l86z1HNSjn9c58DJTU7l8T33BJk,14856
 ads/opctl/operator/lowcode/forecast/model/autots.py,sha256=QxU24eZeaRpnC5rTqBFe6-5ylMorPN0sCamHUiNQVaE,13162
 ads/opctl/operator/lowcode/forecast/model/base_model.py,sha256=s4_lvasasCqvrj49ubD0H_2wA9pvh16_f5BiivqvL20,30876
-ads/opctl/operator/lowcode/forecast/model/factory.py,sha256=NV_m2sEgj3byHHqLs9Vbth7d5yfvFuXj8QI3-y9x2Po,3488
+ads/opctl/operator/lowcode/forecast/model/factory.py,sha256=RrE6JJcUmkypjD6IQOR53I9GCg7jQO380r53oLmVK6A,3439
 ads/opctl/operator/lowcode/forecast/model/forecast_datasets.py,sha256=02gOA-0KKtD0VYj87SsgRMq4EP2VSnhfuxoH1suAIO0,16968
-ads/opctl/operator/lowcode/forecast/model/ml_forecast.py,sha256=EOFZR5wjZcpKACW3ZNnxd31Okz_ehOSaO5_dKL-Ktgw,9558
+ads/opctl/operator/lowcode/forecast/model/ml_forecast.py,sha256=6ynnmfVESR5rBjh5FaX1YEXYziIydEJ4t4IDpiUe-Jg,9554
 ads/opctl/operator/lowcode/forecast/model/neuralprophet.py,sha256=pRmhLHjP027gmPbkgqzR2SZYKvj1rG9Heev2P8mSZ_k,19347
 ads/opctl/operator/lowcode/forecast/model/prophet.py,sha256=0OBnyVP9bFpo1zSAqA5qtobZxICRTLVT9mwPOlHb3sM,14554
 ads/opctl/operator/lowcode/pii/MLoperator,sha256=GKCuiXRwfGLyBqELbtgtg-kJPtNWNVA-kSprYTqhF64,6406
@@ -744,7 +744,7 @@ ads/opctl/spark/cli.py,sha256=ylgV9L2pHY6RzT9WRzpzvFPjA6EPWYi04txpS0X_Xaw,1264
 ads/opctl/spark/cmds.py,sha256=QFrWaHzKqHHpnX_uyztMMMvvJ5s2dOV5edc05AnoNeM,5055
 ads/opctl/templates/diagnostic_report_template.jinja2,sha256=YfcEyTTrM-i2WgmS6b1X5ifPy0Pf0xG3WkKi6OunYco,3341
 ads/oracledb/__init__.py,sha256=xMyuwB5xsIEW9MFmvyjmF1YnRarsIjeFe2Ib-aprCG4,210
-ads/oracledb/oracle_db.py,sha256=_8Z8DL45RrWdaVZA464ICDtgm8tBoPGoX_wQTozDPHE,12889
+ads/oracledb/oracle_db.py,sha256=mb70joLXAnm_ieROFWtG0LvsPNz4URh5dpDDP73_YOo,13570
 ads/pipeline/__init__.py,sha256=AAxC4BtaiTO4fj5odxTPWBToqxSKfKzQzRHW_9ozIOY,1268
 ads/pipeline/ads_pipeline.py,sha256=NkeryW1guYghFkbOlPdN-Kh_LlyZMwJV3c6eAC56V28,84882
 ads/pipeline/ads_pipeline_run.py,sha256=sNczf-1B0sROoFno9LbbND5HDUPtTTHOpFlIXB-IUH4,28374
@@ -763,7 +763,7 @@ ads/pipeline/visualizer/base.py,sha256=2TYw4EwTmiMqF7Q9SsSAqXEzJj0859XB6-jqteNUg
 ads/pipeline/visualizer/graph_renderer.py,sha256=u1o9K6pVdvd2Z_xkEJkItJ3ewy0V8xMC0mSh8dlIB-I,9208
 ads/pipeline/visualizer/text_renderer.py,sha256=nACiVMGkiv0MKNaki4S3MXym98Jb7ofRJmH1zNgmaC4,2625
 ads/secrets/__init__.py,sha256=UPcdOB6VfEr4QA61fPFP-_Oqhi3PSR9a4ciKc8HEMFI,381
-ads/secrets/adb.py,sha256=1XGn40I-0jKWYuJr9iuY5E4JGlu4Zt2JhfZlZcFLsE0,15817
+ads/secrets/adb.py,sha256=f-ttTGbdc3OMGQm-MrDki2aAOSI_0GvW1skzJe38SjU,16648
 ads/secrets/auth_token.py,sha256=NCdqYMFXdkqsQpvjLPyQFW01cMq7LinxSYM8Rywd4q0,3705
 ads/secrets/big_data_service.py,sha256=elZTVTXOqoANF0yF2jeDOCH_0RBz34CnjNCaVH34rg0,13926
 ads/secrets/mysqldb.py,sha256=hVkWV6drmkmLzLX8WeZr4yriMZvzf-n4am15SRTiIgc,5668
@@ -813,8 +813,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.12.3.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.12.3.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.12.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-oracle_ads-2.12.3.dist-info/METADATA,sha256=y5hVMbLVQSS4QuN-cS9TW6TfE8Z8ntnDvgNMMs0-wbw,16217
-oracle_ads-2.12.3.dist-info/RECORD,,
+oracle_ads-2.12.5.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.12.5.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.12.5.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+oracle_ads-2.12.5.dist-info/METADATA,sha256=lajLr7qS9UZDCuU_GbOg8A4NBYt7-sRjIxaGzBcFOTg,16217
+oracle_ads-2.12.5.dist-info/RECORD,,

{oracle_ads-2.12.3.dist-info → oracle_ads-2.12.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any