oracle-ads 2.13.2rc1__py3-none-any.whl → 2.13.4__py3-none-any.whl

ads/aqua/app.py

@@ -225,6 +225,7 @@ class AquaApp:
         model_taxonomy_metadata: Union[ModelTaxonomyMetadata, Dict],
         compartment_id: str,
         project_id: str,
+        defined_tags: Dict = None,
         **kwargs,
     ) -> DataScienceModel:
         model = (
@@ -237,7 +238,7 @@ class AquaApp:
             .with_custom_metadata_list(model_custom_metadata)
             .with_defined_metadata_list(model_taxonomy_metadata)
             .with_provenance_metadata(ModelProvenanceMetadata(training_id=UNKNOWN))
-            # TODO: decide what parameters will be needed
+            .with_defined_tags(**(defined_tags or {})) # Create defined tags when a model is created.
             .create(
                 **kwargs,
             )

ads/aqua/evaluation/evaluation.py

@@ -260,6 +260,10 @@ class AquaEvaluationApp(AquaApp):
             **create_aqua_evaluation_details.model_parameters,
         )
 
+        evaluation_model_defined_tags = (
+            create_aqua_evaluation_details.defined_tags or {}
+        )
+
         target_compartment = (
             create_aqua_evaluation_details.compartment_id or COMPARTMENT_OCID
         )
@@ -311,9 +315,7 @@ class AquaEvaluationApp(AquaApp):
                         create_aqua_evaluation_details.experiment_description
                     )
                     .with_freeform_tags(**evaluation_mvs_freeform_tags)
-                    .with_defined_tags(
-                        **(create_aqua_evaluation_details.defined_tags or {})
-                    )
+                    .with_defined_tags(**evaluation_model_defined_tags)
                     # TODO: decide what parameters will be needed
                     .create(**kwargs)
                 )
@@ -358,6 +360,7 @@ class AquaEvaluationApp(AquaApp):
             .with_custom_metadata_list(evaluation_model_custom_metadata)
             .with_defined_metadata_list(evaluation_model_taxonomy_metadata)
             .with_provenance_metadata(ModelProvenanceMetadata(training_id=UNKNOWN))
+            .with_defined_tags(**evaluation_model_defined_tags)
             # TODO uncomment this once the evaluation container will get the updated version of the ADS
             # .with_input_schema(create_aqua_evaluation_details.to_dict())
             # TODO: decide what parameters will be needed
@@ -390,7 +393,7 @@ class AquaEvaluationApp(AquaApp):
             .with_shape_name(create_aqua_evaluation_details.shape_name)
             .with_block_storage_size(create_aqua_evaluation_details.block_storage_size)
             .with_freeform_tag(**evaluation_job_freeform_tags)
-            .with_defined_tag(**(create_aqua_evaluation_details.defined_tags or {}))
+            .with_defined_tag(**evaluation_model_defined_tags)
         )
         if (
             create_aqua_evaluation_details.memory_in_gbs
@@ -429,7 +432,9 @@ class AquaEvaluationApp(AquaApp):
                 metrics=create_aqua_evaluation_details.metrics,
                 inference_configuration=eval_inference_configuration or {},
             )
-        ).create(**kwargs)  ## TODO: decide what parameters will be needed
+        ).create(
+            **kwargs
+        )  ## TODO: decide what parameters will be needed
         logger.debug(
             f"Successfully created evaluation job {evaluation_job.id} for {create_aqua_evaluation_details.evaluation_source_id}."
         )
@@ -437,7 +442,7 @@ class AquaEvaluationApp(AquaApp):
         evaluation_job_run = evaluation_job.run(
             name=evaluation_model.display_name,
             freeform_tags=evaluation_job_freeform_tags,
-            defined_tags=(create_aqua_evaluation_details.defined_tags or {}),
+            defined_tags=evaluation_model_defined_tags,
             wait=False,
         )
         logger.debug(
@@ -461,16 +466,12 @@ class AquaEvaluationApp(AquaApp):
             Tags.AQUA_EVALUATION: Tags.AQUA_EVALUATION,
             **(create_aqua_evaluation_details.freeform_tags or {}),
         }
-        evaluation_model_defined_tags = (
-            create_aqua_evaluation_details.defined_tags or {}
-        )
 
         self.ds_client.update_model(
             model_id=evaluation_model.id,
             update_model_details=UpdateModelDetails(
                 custom_metadata_list=updated_custom_metadata_list,
                 freeform_tags=evaluation_model_freeform_tags,
-                defined_tags=evaluation_model_defined_tags,
             ),
         )
 

ads/aqua/finetuning/finetuning.py

@@ -263,6 +263,7 @@ class AquaFineTuningApp(AquaApp):
             compartment_id=target_compartment,
             project_id=target_project,
             model_by_reference=True,
+            defined_tags=create_fine_tuning_details.defined_tags
         )
 
         ft_job_freeform_tags = {
@@ -382,14 +383,12 @@ class AquaFineTuningApp(AquaApp):
             Tags.AQUA_FINE_TUNED_MODEL_TAG: f"{source.id}#{source.display_name}",
             **(create_fine_tuning_details.freeform_tags or {}),
         }
-        model_defined_tags = create_fine_tuning_details.defined_tags or {}
 
         self.update_model(
             model_id=ft_model.id,
             update_model_details=UpdateModelDetails(
                 custom_metadata_list=updated_custom_metadata_list,
                 freeform_tags=model_freeform_tags,
-                defined_tags=model_defined_tags,
             ),
         )
         logger.debug(
@@ -490,7 +489,7 @@ class AquaFineTuningApp(AquaApp):
                 "finetuning_source": source.id,
                 "finetuning_experiment_id": experiment_model_version_set_id,
                 **model_freeform_tags,
-                **model_defined_tags,
+                **(create_fine_tuning_details.defined_tags or {}),
             },
             parameters=ft_parameters,
         )

ads/common/utils.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2020, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 
@@ -152,22 +152,6 @@ def oci_key_location():
     )
 
 
-def text_sanitizer(content):
-    if isinstance(content, str):
-        return (
-            content.replace("“", '"')
-            .replace("”", '"')
-            .replace("’", "'")
-            .replace("‘", "'")
-            .replace("—", "-")
-            .encode("utf-8", "ignore")
-            .decode("utf-8", "ignore")
-        )
-    if isinstance(content, dict):
-        return json.dumps(content)
-    return str(content)
-
-
 @deprecated(
     "2.5.10",
     details="Deprecated, use: from ads.common.auth import AuthState; AuthState().oci_config_path",

ads/model/datascience_model.py

@@ -89,6 +89,11 @@ class InvalidArtifactType(Exception):  # pragma: no cover
     pass
 
 
+class InvalidArtifactPathTypeOrContentError(Exception):  # pragma: no cover
+    def __init__(self, msg="Invalid type of Metdata artifact content"):
+        super().__init__(msg)
+
+
 class CustomerNotificationType(ExtendedEnum):
     NONE = "NONE"
     ALL = "ALL"
@@ -2238,7 +2243,7 @@ class DataScienceModel(Builder):
     def create_custom_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path_or_content: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType = MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Creates model custom metadata artifact for specified model.
@@ -2248,13 +2253,22 @@ class DataScienceModel(Builder):
         metadata_key_name: str
             The name of the model custom metadata key
 
-        artifact_path_or_content: str
-            The model custom metadata artifact path to be upload. It can also be the actual content of the custom metadata
+        artifact_path_or_content: Union[str,bytes]
+            The model custom metadata artifact path to be uploaded. It can also be the actual content of the custom metadata artifact
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type: MetadataArtifactPathType
             Can be either of MetadataArtifactPathType.LOCAL , MetadataArtifactPathType.OSS , MetadataArtifactPathType.CONTENT
             Specifies what type of path is to be provided for metadata artifact.
-            Can be either local , oss or the actual content itself
+
+        Example:
+        >>>       ds_model=DataScienceModel.from_id("ocid1.datasciencemodel.iad.xxyxz...")
+        >>>       ds_model.create_custom_metadata_artifact(
+        ...         "README",
+        ...         artifact_path_or_content="/Users/<username>/Downloads/README.md",
+        ...         path_type=MetadataArtifactPathType.LOCAL
+        ...       )
 
         Returns
         -------
@@ -2273,16 +2287,23 @@ class DataScienceModel(Builder):
             }
 
         """
+        if path_type == MetadataArtifactPathType.CONTENT and not isinstance(
+            artifact_path_or_content, bytes
+        ):
+            raise InvalidArtifactPathTypeOrContentError(
+                f"Invalid type of artifact content: {type(artifact_path_or_content)}. It should be bytes."
+            )
+
         return self.dsc_model.create_custom_metadata_artifact(
             metadata_key_name=metadata_key_name,
-            artifact_path=artifact_path_or_content,
+            artifact_path_or_content=artifact_path_or_content,
             path_type=path_type,
         )
 
     def create_defined_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path_or_content: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType = MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Creates model defined metadata artifact for specified model.
@@ -2292,14 +2313,24 @@ class DataScienceModel(Builder):
         metadata_key_name: str
             The name of the model defined metadata key
 
-        artifact_path_or_content: str
-            The model defined metadata artifact path to be upload. It can also be the actual content of the defined metadata
+        artifact_path_or_content: Union[str,bytes]
+            The model defined metadata artifact path to be uploaded. It can also be the actual content of the defined metadata
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type: MetadataArtifactPathType
             Can be either of MetadataArtifactPathType.LOCAL , MetadataArtifactPathType.OSS , MetadataArtifactPathType.CONTENT
             Specifies what type of path is to be provided for metadata artifact.
             Can be either local , oss or the actual content itself
 
+        Example:
+        >>>       ds_model=DataScienceModel.from_id("ocid1.datasciencemodel.iad.xxyxz...")
+        >>>       ds_model.create_defined_metadata_artifact(
+        ...         "README",
+        ...         artifact_path_or_content="oci://path/to/bucket/README.md",
+        ...         path_type=MetadataArtifactPathType.OSS
+        ...       )
+
         Returns
         -------
         ModelMetadataArtifactDetails
@@ -2317,16 +2348,23 @@ class DataScienceModel(Builder):
             }
 
         """
+        if path_type == MetadataArtifactPathType.CONTENT and not isinstance(
+            artifact_path_or_content, bytes
+        ):
+            raise InvalidArtifactPathTypeOrContentError(
+                f"Invalid type of artifact content: {type(artifact_path_or_content)}. It should be bytes."
+            )
+
         return self.dsc_model.create_defined_metadata_artifact(
             metadata_key_name=metadata_key_name,
-            artifact_path=artifact_path_or_content,
+            artifact_path_or_content=artifact_path_or_content,
             path_type=path_type,
         )
 
     def update_custom_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path_or_content: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType = MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Update model custom metadata artifact for specified model.
@@ -2336,8 +2374,10 @@ class DataScienceModel(Builder):
         metadata_key_name: str
             The name of the model custom metadata key
 
-        artifact_path_or_content: str
-            The model custom metadata artifact path. It can also be the actual content of the custom metadata
+        artifact_path_or_content: Union[str,bytes]
+            The model custom metadata artifact path to be uploaded. It can also be the actual content of the custom metadata
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type: MetadataArtifactPathType
             Can be either of MetadataArtifactPathType.LOCAL , MetadataArtifactPathType.OSS , MetadataArtifactPathType.CONTENT
@@ -2361,16 +2401,23 @@ class DataScienceModel(Builder):
             }
 
         """
+        if path_type == MetadataArtifactPathType.CONTENT and not isinstance(
+            artifact_path_or_content, bytes
+        ):
+            raise InvalidArtifactPathTypeOrContentError(
+                f"Invalid type of artifact content: {type(artifact_path_or_content)}. It should be bytes."
+            )
+
         return self.dsc_model.update_custom_metadata_artifact(
             metadata_key_name=metadata_key_name,
-            artifact_path=artifact_path_or_content,
+            artifact_path_or_content=artifact_path_or_content,
             path_type=path_type,
         )
 
     def update_defined_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path_or_content: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType = MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Update model defined metadata artifact for specified model.
@@ -2380,8 +2427,10 @@ class DataScienceModel(Builder):
         metadata_key_name: str
             The name of the model defined metadata key
 
-        artifact_path_or_content: str
-            The model defined metadata artifact path. It can also be the actual content of the defined metadata
+        artifact_path_or_content: Union[str,bytes]
+            The model defined metadata artifact path to be uploaded. It can also be the actual content of the defined metadata
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type: MetadataArtifactPathType
             Can be either of MetadataArtifactPathType.LOCAL , MetadataArtifactPathType.OSS , MetadataArtifactPathType.CONTENT
@@ -2405,9 +2454,16 @@ class DataScienceModel(Builder):
             }
 
         """
+        if path_type == MetadataArtifactPathType.CONTENT and not isinstance(
+            artifact_path_or_content, bytes
+        ):
+            raise InvalidArtifactPathTypeOrContentError(
+                f"Invalid type of artifact content: {type(artifact_path_or_content)}. It should be bytes."
+            )
+
         return self.dsc_model.update_defined_metadata_artifact(
             metadata_key_name=metadata_key_name,
-            artifact_path=artifact_path_or_content,
+            artifact_path_or_content=artifact_path_or_content,
             path_type=path_type,
         )
 
@@ -2442,8 +2498,10 @@ class DataScienceModel(Builder):
         )
         artifact_file_path = os.path.join(target_dir, f"{metadata_key_name}")
 
-        if not override and os.path.exists(artifact_file_path):
-            raise FileExistsError(f"File already exists: {artifact_file_path}")
+        if not override and is_path_exists(artifact_file_path):
+            raise FileExistsError(
+                f"File already exists: {artifact_file_path}. Please use boolean override parameter to override the file content."
+            )
 
         with open(artifact_file_path, "wb") as _file:
             _file.write(file_content)
@@ -2481,8 +2539,10 @@ class DataScienceModel(Builder):
         )
         artifact_file_path = os.path.join(target_dir, f"{metadata_key_name}")
 
-        if not override and os.path.exists(artifact_file_path):
-            raise FileExistsError(f"File already exists: {artifact_file_path}")
+        if not override and is_path_exists(artifact_file_path):
+            raise FileExistsError(
+                f"File already exists: {artifact_file_path}. Please use boolean override parameter to override the file content."
+            )
 
         with open(artifact_file_path, "wb") as _file:
             _file.write(file_content)

ads/model/service/oci_datascience_model.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2022, 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
@@ -28,7 +28,7 @@ from ads.common.oci_datascience import OCIDataScienceMixin
 from ads.common.oci_mixin import OCIWorkRequestMixin
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
 from ads.common.serializer import DataClassSerializable
-from ads.common.utils import extract_region, read_file, text_sanitizer
+from ads.common.utils import extract_region, read_file
 from ads.common.work_request import DataScienceWorkRequest
 from ads.model.common.utils import MetadataArtifactPathType
 from ads.model.deployment import ModelDeployment
@@ -621,45 +621,43 @@ class OCIDataScienceModel(
         return False
 
     def get_metadata_content(
-        self, artifact_path_or_content: str, path_type: MetadataArtifactPathType
-    ):
+        self,
+        artifact_path_or_content: Union[str, bytes],
+        path_type: MetadataArtifactPathType,
+    ) -> bytes:
         """
         returns the content of the metadata artifact
 
         Parameters
         ----------
-        artifact_path_or_content: str
+        artifact_path_or_content: Union[str,bytes]
             The path of the file (local or oss) containing metadata artifact or content.
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
         path_type: str
             can be one of local , oss or actual content itself
 
         Returns
         -------
-        metadata artifact content
+        bytes
+            metadata artifact content in bytes
         """
 
         if path_type == MetadataArtifactPathType.CONTENT:
             return artifact_path_or_content
 
-        elif path_type == MetadataArtifactPathType.LOCAL:
-            if not utils.is_path_exists(artifact_path_or_content):
-                raise FileNotFoundError(
-                    f"File not found:  {artifact_path_or_content} . "
-                )
-
-            with open(artifact_path_or_content, "rb") as f:
-                contents = f.read()
-                logger.info(f"The metadata artifact content - {contents}")
-
-            return contents
-
-        elif path_type == MetadataArtifactPathType.OSS:
+        elif (
+            path_type == MetadataArtifactPathType.LOCAL
+            or path_type == MetadataArtifactPathType.OSS
+        ):
             if not utils.is_path_exists(artifact_path_or_content):
                 raise FileNotFoundError(f"File not found: {artifact_path_or_content}")
-
-            contents = str(
-                read_file(file_path=artifact_path_or_content, auth=default_signer())
+            signer = (
+                default_signer() if path_type == MetadataArtifactPathType.OSS else {}
             )
+            contents = read_file(
+                file_path=artifact_path_or_content, auth=signer
+            ).encode()
             logger.debug(f"The metadata artifact content - {contents}")
 
             return contents
@@ -670,7 +668,7 @@ class OCIDataScienceModel(
     def create_custom_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType,
     ) -> ModelMetadataArtifactDetails:
         """Creates model custom metadata artifact for specified model.
@@ -680,8 +678,10 @@ class OCIDataScienceModel(
         metadata_key_name: str
             The name of the model metadatum in the metadata.
 
-        artifact_path: str
-            The model custom metadata artifact path to be upload.
+        artifact_path_or_content: Union[str,bytes]
+            The path of the file (local or oss) containing metadata artifact or content.
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type: MetadataArtifactPathType
             can be one of local , oss or actual content itself
@@ -704,12 +704,13 @@ class OCIDataScienceModel(
 
         """
         contents = self.get_metadata_content(
-            artifact_path_or_content=artifact_path, path_type=path_type
+            artifact_path_or_content=artifact_path_or_content, path_type=path_type
         )
+
         response = self.client.create_model_custom_metadatum_artifact(
             self.id,
             metadata_key_name,
-            text_sanitizer(contents),
+            contents,
             content_disposition="form" '-data; name="file"; filename="readme.*"',
         )
         response_data = convert_model_metadata_response(
@@ -723,7 +724,7 @@ class OCIDataScienceModel(
     def create_defined_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType,
     ) -> ModelMetadataArtifactDetails:
         """Creates model defined metadata artifact for specified model.
@@ -733,8 +734,10 @@ class OCIDataScienceModel(
         metadata_key_name: str
             The name of the model metadatum in the metadata.
 
-        artifact_path: str
-            The model custom metadata artifact path to be upload.
+        artifact_path_or_content: Union[str,bytes]
+            The path of the file (local or oss) containing metadata artifact or content.
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type: MetadataArtifactPathType
             can be one of local , oss or actual content itself.
@@ -757,12 +760,13 @@ class OCIDataScienceModel(
 
         """
         contents = self.get_metadata_content(
-            artifact_path_or_content=artifact_path, path_type=path_type
+            artifact_path_or_content=artifact_path_or_content, path_type=path_type
         )
+
         response = self.client.create_model_defined_metadatum_artifact(
             self.id,
             metadata_key_name,
-            text_sanitizer(contents),
+            contents,
             content_disposition='form-data; name="file"; filename="readme.*"',
         )
         response_data = convert_model_metadata_response(
@@ -776,7 +780,7 @@ class OCIDataScienceModel(
     def update_defined_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType,
     ) -> ModelMetadataArtifactDetails:
         """Update model defined metadata artifact for specified model.
@@ -786,8 +790,10 @@ class OCIDataScienceModel(
         metadata_key_name: str
             The name of the model metadatum in the metadata.
 
-        artifact_path: str
-            The model defined metadata artifact path to be upload.
+        artifact_path_or_content: Union[str,bytes]
+            The path of the file (local or oss) containing metadata artifact or content.
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type:MetadataArtifactPathType
             can be one of local , oss or actual content itself.
@@ -809,12 +815,12 @@ class OCIDataScienceModel(
 
         """
         contents = self.get_metadata_content(
-            artifact_path_or_content=artifact_path, path_type=path_type
+            artifact_path_or_content=artifact_path_or_content, path_type=path_type
         )
         response = self.client.update_model_defined_metadatum_artifact(
             self.id,
             metadata_key_name,
-            text_sanitizer(contents),
+            contents,
             content_disposition='form-data; name="file"; filename="readme.*"',
         )
         response_data = convert_model_metadata_response(
@@ -828,7 +834,7 @@ class OCIDataScienceModel(
     def update_custom_metadata_artifact(
         self,
         metadata_key_name: str,
-        artifact_path: str,
+        artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType,
     ) -> ModelMetadataArtifactDetails:
         """Update model custom metadata artifact for specified model.
@@ -838,8 +844,10 @@ class OCIDataScienceModel(
         metadata_key_name: str
             The name of the model metadatum in the metadata.
 
-        artifact_path: str
-            The model custom metadata artifact path to be upload.
+        artifact_path_or_content: Union[str,bytes]
+            The path of the file (local or oss) containing metadata artifact or content.
+            The type is string when it represents local path or oss path.
+            The type is bytes when it represents content itself
 
         path_type: MetadataArtifactPathType
             can be one of local , oss or actual content itself.
@@ -862,12 +870,12 @@ class OCIDataScienceModel(
 
         """
         contents = self.get_metadata_content(
-            artifact_path_or_content=artifact_path, path_type=path_type
+            artifact_path_or_content=artifact_path_or_content, path_type=path_type
         )
         response = self.client.update_model_custom_metadatum_artifact(
             self.id,
             metadata_key_name,
-            text_sanitizer(contents),
+            contents,
             content_disposition="form" '-data; name="file"; filename="readme.*"',
         )
         response_data = convert_model_metadata_response(

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

@@ -3,7 +3,7 @@
 # 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 AUTO_SELECT, SupportedModels
+from ..const import AUTO_SELECT, SpeedAccuracyMode, SupportedModels
 from ..model_evaluator import ModelEvaluator
 from ..operator_config import ForecastOperatorConfig
 from .arima import ArimaOperatorModel
@@ -66,6 +66,13 @@ class ForecastOperatorModelFactory:
         if model_type == AUTO_SELECT:
             model_type = cls.auto_select_model(datasets, operator_config)
             operator_config.spec.model_kwargs = {}
+            # set the explanations accuracy mode to AUTOMLX if the selected model is automlx
+            if (
+                model_type == SupportedModels.AutoMLX
+                and operator_config.spec.explanations_accuracy_mode
+                == SpeedAccuracyMode.FAST_APPROXIMATE
+            ):
+                operator_config.spec.explanations_accuracy_mode = SpeedAccuracyMode.AUTOMLX
         if model_type not in cls._MAP:
             raise UnSupportedModelError(model_type)
         return cls._MAP[model_type](config=operator_config, datasets=datasets)

{oracle_ads-2.13.2rc1.dist-info → oracle_ads-2.13.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oracle_ads
-Version: 2.13.2rc1
+Version: 2.13.4
 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
@@ -13,6 +13,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE.txt
 Requires-Dist: PyYAML>=6
 Requires-Dist: asteval>=0.9.25
@@ -97,9 +98,11 @@ Requires-Dist: evaluate>=0.4.0 ; extra == "llm"
 Requires-Dist: ipython>=7.23.1, <8.0 ; extra == "notebook"
 Requires-Dist: ipywidgets~=7.6.3 ; extra == "notebook"
 Requires-Dist: lightgbm ; extra == "onnx"
-Requires-Dist: onnx>=1.12.0,<=1.15.0 ; extra == "onnx"
+Requires-Dist: onnx>=1.12.0,<=1.15.0 ; extra == "onnx" and ( python_version < '3.12')
+Requires-Dist: onnx>=1.12.0 ; extra == "onnx" and ( python_version >= '3.12')
 Requires-Dist: onnxmltools>=1.10.0 ; extra == "onnx"
-Requires-Dist: onnxruntime~=1.17.0,!=1.16.0 ; extra == "onnx"
+Requires-Dist: onnxruntime~=1.17.0,!=1.16.0 ; extra == "onnx" and ( python_version < '3.12')
+Requires-Dist: onnxruntime ; extra == "onnx" and ( python_version >= '3.12')
 Requires-Dist: oracle_ads[viz] ; extra == "onnx"
 Requires-Dist: protobuf ; extra == "onnx"
 Requires-Dist: skl2onnx>=1.10.4 ; extra == "onnx"
@@ -134,7 +137,8 @@ Requires-Dist: plotly ; extra == "recommender"
 Requires-Dist: report-creator==1.0.37 ; extra == "recommender"
 Requires-Dist: pyspark>=3.0.0 ; extra == "spark"
 Requires-Dist: oracle_ads[viz] ; extra == "tensorflow"
-Requires-Dist: tensorflow<=2.15.1 ; extra == "tensorflow"
+Requires-Dist: tensorflow<=2.15.1 ; extra == "tensorflow" and ( python_version < '3.12')
+Requires-Dist: tensorflow ; extra == "tensorflow" and ( python_version >= '3.12')
 Requires-Dist: arff ; extra == "testsuite"
 Requires-Dist: autogen-agentchat<0.4 ; extra == "testsuite"
 Requires-Dist: category_encoders==2.6.3 ; extra == "testsuite"

{oracle_ads-2.13.2rc1.dist-info → oracle_ads-2.13.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ ads/__init__.py,sha256=OxHySbHbMqPgZ8sUj33Bxy-smSiNgRjtcSUV77oBL08,3787
 ads/cli.py,sha256=WkOpZv8jWgFYN9BNkt2LJBs9KzJHgFqq3pIymsqc8Q4,4292
 ads/config.py,sha256=Xa6CGxNUQf3CKTS9HpXnAWR5kOFvAs0M66f8kEl6z54,8051
 ads/aqua/__init__.py,sha256=I3HL7LadTue3X41EPUZue4rILG8xeMTapJiBA6Lu8Mg,1149
-ads/aqua/app.py,sha256=Ug-Jt5qvnO1CtxRqIf9dWbz6i_WrR4rf0Mf3s8dgGXA,14281
+ads/aqua/app.py,sha256=_LrDKMR0SSxPEylIMPTsJvXnSnJFDud_MS3tMO25RMo,14360
 ads/aqua/cli.py,sha256=W-0kswzRDEilqHyw5GSMOrARgvOyPRtkEtpy54ew0Jo,3907
 ads/aqua/constants.py,sha256=bdBBafATGl5rYHjZ2i9jZPDKFab8nWjzjJKA2DFgIDc,3019
 ads/aqua/data.py,sha256=HfxLfKiNiPJecMQy0JAztUsT3IdZilHHHOrCJnjZMc4,408
@@ -30,7 +30,7 @@ ads/aqua/evaluation/__init__.py,sha256=Fd7WL7MpQ1FtJjlftMY2KHli5cz1wr5MDu3hGmV89
 ads/aqua/evaluation/constants.py,sha256=dmvDs_t93EhGa0N7J0y8R18AFW0cokj2Q5Oy0LHelxU,1436
 ads/aqua/evaluation/entities.py,sha256=pvZWrO-Hlsh0TIFnly84OijKHULRVM13D5a-4ZGxte8,5733
 ads/aqua/evaluation/errors.py,sha256=IbqcQFgXfwzlF5EoaT5jPw8JE8OWqtgiXpH0ddFhRzY,4523
-ads/aqua/evaluation/evaluation.py,sha256=p3oPgogtdE_viFCeS6jiJENGrWlYZMPloPW7c50r5ns,59595
+ads/aqua/evaluation/evaluation.py,sha256=Q8822M1asVpBdw5e2LmN1B-vI3k8SdT-44nGQI0d4YI,59510
 ads/aqua/extension/__init__.py,sha256=mRArjU6UZpZYVr0qHSSkPteA_CKcCZIczOFaK421m9o,1453
 ads/aqua/extension/aqua_ws_msg_handler.py,sha256=zR7Fb3LEXzPrEICooWvuo_ahoY6KhcABpKUmYQkEpS0,3626
 ads/aqua/extension/base_handler.py,sha256=gK3YBBrkbG__0eAq49zHRmJKJXp-lvEOYdYlDuxWPpM,5475
@@ -52,7 +52,7 @@ ads/aqua/extension/models/ws_models.py,sha256=y_3LlzKGNRcWqfuW5TGHl0PchM5xE83WGm
 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=1RRaRFuxoBtApeCIqG-0H8Iom2kz2dv7LOX6y2wWLnA,6116
-ads/aqua/finetuning/finetuning.py,sha256=XICYUsbj6U2XMRs2aHMpTBaTlb2b88Moq3InR9IRYK4,26332
+ads/aqua/finetuning/finetuning.py,sha256=-re_K9wR46_EbENddUEefNrnYd5IlR0GotUa_kkgXU8,26302
 ads/aqua/model/__init__.py,sha256=j2iylvERdANxgrEDp7b_mLcKMz1CF5Go0qgYCiMwdos,278
 ads/aqua/model/constants.py,sha256=pI_oHKSLJvt3dOC4hdkj75Y3CJqK9yW3AT1kHyDfPTI,1500
 ads/aqua/model/entities.py,sha256=kBjsihInnbGw9MhWQEfJ4hcWEzv6BxF8VlDDFWUPYVg,9903
@@ -102,7 +102,7 @@ ads/common/oci_logging.py,sha256=U0HRAUkpnycGpo2kWMrT3wjQVFZaWqLL6pZ2B6_epsM,419
 ads/common/oci_mixin.py,sha256=mhja5UomrhXH43uB0jT-u2KaT37op9tM-snxvtGfc40,34548
 ads/common/oci_resource.py,sha256=zRa4z5yh5GoOW_6ZE57nhMmK2d94WUqyFqvaNvje9Co,4484
 ads/common/serializer.py,sha256=JyUJWNybuCwFO_oem41F8477QR2Mj-1P-PKJ-3D3_qw,18813
-ads/common/utils.py,sha256=dXVf3QEtlS0YE_vA7xbtCc0A5MmSnODoeBSx_4q8VwU,54317
+ads/common/utils.py,sha256=Clw1unEySV4XMEx3VKLOl60lU-g5wH9n4oMdYYxTKdM,53883
 ads/common/word_lists.py,sha256=luyfSHWZtwAYKuRsSmUYd1VskKYR_8jG_Y26D3j2Vc8,22306
 ads/common/work_request.py,sha256=z7OGroZNKs9FnOVCi89QnrxOh4PEWEdTsyXWUUydKwM,6591
 ads/common/artifact/.model-ignore,sha256=C8hKYunLSYF36BqZiTaCZN-XLpl3Iuhphsa8RZXfOy8,879
@@ -497,7 +497,7 @@ ads/model/artifact.py,sha256=CmHdeINF0K6p2MaWZOwU5tLPQ9PoIdnfQis2voMAhHE,21459
 ads/model/artifact_downloader.py,sha256=mGVvIl_pfNikvPIsPgLCrh36z-puQ-DCYGjYbqGrSJ0,9769
 ads/model/artifact_uploader.py,sha256=jdkpmncczceOc28LyMkv4u6f845HJ1vVCoI-hLBT-RM,11305
 ads/model/base_properties.py,sha256=YeVyjCync4fzqqruMc9UfZKR4PnscU31n0mf4CJv3R8,7885
-ads/model/datascience_model.py,sha256=mcbOmjhFLfs3ko5corYZ_MnJuSv-0gXKs6LNbdACfsA,94593
+ads/model/datascience_model.py,sha256=T0T6czpp6hTFTAkyJv3b-9Iz8nw9F-DiW3-pEB6O-6E,97619
 ads/model/generic_model.py,sha256=JVL5WYpZW7LSECm8Yeq59IDLymMRgfF2SIkOkqdoU8c,147014
 ads/model/model_file_description_schema.json,sha256=NZw_U4CvKf9oOdxCKr1eUxq8FHwjR_g0GSDk0Hz3SnE,1402
 ads/model/model_introspect.py,sha256=z9pJul9dwT9w8flvRguhu0ZKoEkbm2Tvdutw_SHYTeg,9745
@@ -560,7 +560,7 @@ ads/model/serde/common.py,sha256=cDtblusT8fZ04mbBASg7EC62oaB9Sp7X_NPPhPiDnJk,112
 ads/model/serde/model_input.py,sha256=MB6Uf4H_UzlAUTRIRqHTW4ZiyQKw0yerGtUE-WFSw-g,18577
 ads/model/serde/model_serializer.py,sha256=2vi4MoUHZV-V-4r1OWD5YJzwARFqIBv7-oyGeXGhrK4,43197
 ads/model/service/__init__.py,sha256=xMyuwB5xsIEW9MFmvyjmF1YnRarsIjeFe2Ib-aprCG4,210
-ads/model/service/oci_datascience_model.py,sha256=5RTf8jSAxR7aMjNBjvk1INb3fVJbuhV5L0nbzJv-_lM,37999
+ads/model/service/oci_datascience_model.py,sha256=gyaFcFC9-yVjAd8pgV0bJ1X7-giZuHSutpxMjsYwz7o,38765
 ads/model/service/oci_datascience_model_deployment.py,sha256=ONiogPK_wN7omxdnTMAcJhcvDEZQwI_XqmT84Q1xoj0,18472
 ads/model/service/oci_datascience_model_version_set.py,sha256=lYw9BauH4BNZk2Jdf8mRjFO3MorQDSMPAxkP-inlwiM,5690
 ads/model/transformer/__init__.py,sha256=yBa9sP_49XF0GDWWG-u1Q5ry-vXfmO61oUjNp7mdN74,204
@@ -722,7 +722,7 @@ ads/opctl/operator/lowcode/forecast/model/arima.py,sha256=PvHoTdDr6RIC4I-YLzed91
 ads/opctl/operator/lowcode/forecast/model/automlx.py,sha256=2M1Ipnq73x-bnKg9ju4Oyi9-0WxmdrCNWgAACob1HRI,21488
 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/factory.py,sha256=hSRPPWdpIRSMYPUFMIUuxc2TPZt-SG18MiqhtdfL3mg,3488
+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
@@ -849,8 +849,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.2rc1.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
-oracle_ads-2.13.2rc1.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
-oracle_ads-2.13.2rc1.dist-info/WHEEL,sha256=_2ozNFCLWc93bK4WKHCO-eDUENDlo-dgc9cU3qokYO4,82
-oracle_ads-2.13.2rc1.dist-info/METADATA,sha256=W_1M3xrI7Nde-4P6W8hlevNetQT2B0yeGw9X8wbEMTI,16261
-oracle_ads-2.13.2rc1.dist-info/RECORD,,
+oracle_ads-2.13.4.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
+oracle_ads-2.13.4.dist-info/licenses/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
+oracle_ads-2.13.4.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+oracle_ads-2.13.4.dist-info/METADATA,sha256=h627fGPS6HRcuxJqujEXMGJQZSA2wAyI-nL0mhfht30,16639
+oracle_ads-2.13.4.dist-info/RECORD,,

{oracle_ads-2.13.2rc1.dist-info → oracle_ads-2.13.4.dist-info}/WHEEL

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