oracle-ads 2.12.11__py3-none-any.whl → 2.13.1__py3-none-any.whl

ads/opctl/operator/lowcode/forecast/whatifserve/deployment_manager.py

@@ -15,6 +15,7 @@ import cloudpickle
 
 from ads.opctl import logger
 from ads.common.model_export_util import prepare_generic_model
+from ads.opctl.operator.common.utils import create_log_in_log_group
 from ads.opctl.operator.lowcode.common.utils import write_data, write_simple_json
 from ads.opctl.operator.lowcode.common.utils import default_signer
 from ..model.forecast_datasets import AdditionalData
@@ -184,6 +185,10 @@ class ModelDeploymentManager:
 
         log_group = self.spec.what_if_analysis.model_deployment.log_group
         log_id = self.spec.what_if_analysis.model_deployment.log_id
+        if not log_id and not self.test_mode:
+            signer = oci.auth.signers.get_resource_principals_signer()
+            auth = {"signer": signer, "config": {}}
+            log_id = create_log_in_log_group(self.compartment_id, log_group, auth)
 
         logs_configuration_details_object = CategoryLogDetails(
             access=LogDetails(log_group_id=log_group,
@@ -211,8 +216,10 @@ class ModelDeploymentManager:
             logger.info(f"deployment metadata :{model_deployment.data}")
             md = data_science.get_model_deployment(model_deployment_id=model_deployment.data.resources[0].identifier)
             self.deployment_info['model_deployment_ocid'] = md.data.id
+            self.deployment_info['status'] = md.data.lifecycle_state
             endpoint_url = md.data.model_deployment_url
             self.deployment_info['model_deployment_endpoint'] = f"{endpoint_url}/predict"
+            self.deployment_info['log_id'] = log_id
 
     def save_deployment_info(self):
         output_dir = self.spec.output_directory.url

ads/opctl/operator/lowcode/forecast/whatifserve/score.py

@@ -151,34 +151,42 @@ def get_forecast(future_df, model_name, series_id, model_object, date_col, targe
         pred_obj = model_object.predict(future_regressor=future_reg)
         return pred_obj.forecast[series_id].tolist()
     elif model_name == SupportedModels.Prophet and series_id in model_object:
-        model = model_object[series_id]
+        model = model_object[series_id]['model']
+        label_encoder = model_object[series_id]['le']
         processed = future_df.rename(columns={date_col_name: 'ds', target_column: 'y'})
-        forecast = model.predict(processed)
+        encoded_df = label_encoder.transform(processed)
+        forecast = model.predict(encoded_df)
         return forecast['yhat'].tolist()
     elif model_name == SupportedModels.NeuralProphet and series_id in model_object:
-        model = model_object[series_id]
+        model = model_object[series_id]['model']
+        label_encoder = model_object[series_id]['le']
         model.restore_trainer()
         accepted_regressors = list(model.config_regressors.regressors.keys())
         data = future_df.rename(columns={date_col_name: 'ds', target_column: 'y'})
-        future = data[accepted_regressors + ["ds"]].reset_index(drop=True)
+        encoded_df = label_encoder.transform(data)
+        future = encoded_df[accepted_regressors + ["ds"]].reset_index(drop=True)
         future["y"] = None
         forecast = model.predict(future)
         return forecast['yhat1'].tolist()
     elif model_name == SupportedModels.Arima and series_id in model_object:
-        model = model_object[series_id]
-        future_df = future_df.set_index(date_col_name)
-        x_pred = future_df.drop(target_cat_col, axis=1)
+        model = model_object[series_id]['model']
+        label_encoder = model_object[series_id]['le']
+        predict_cols = model_object[series_id]["predict_component_cols"]
+        encoded_df = label_encoder.transform(future_df)
+        x_pred = encoded_df.set_index(date_col_name)
+        x_pred = x_pred.drop(target_cat_col, axis=1)
         yhat, conf_int = model.predict(
             n_periods=horizon,
-            X=x_pred,
+            X=x_pred[predict_cols],
             return_conf_int=True
         )
         yhat_clean = pd.DataFrame(yhat, index=yhat.index, columns=["yhat"])
         return yhat_clean['yhat'].tolist()
     elif model_name == SupportedModels.AutoMLX and series_id in model_object:
-        # automlx model
-        model = model_object[series_id]
-        x_pred = future_df.drop(target_cat_col, axis=1)
+        model = model_object[series_id]['model']
+        label_encoder = model_object[series_id]['le']
+        encoded_df = label_encoder.transform(future_df)
+        x_pred = encoded_df.drop(target_cat_col, axis=1)
         x_pred = x_pred.set_index(date_col_name)
         forecast = model.forecast(
             X=x_pred,

ads/opctl/operator/lowcode/pii/constant.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
-from ads.common.extended_enum import ExtendedEnumMeta
+from ads.common.extended_enum import ExtendedEnum
 
 DEFAULT_SHOW_ROWS = 25
 DEFAULT_TIME_OUT = 5
@@ -12,7 +11,7 @@ DEFAULT_REPORT_FILENAME = "report.html"
 DEFAULT_TARGET_COLUMN = "target"
 
 
-class SupportedAction(str, metaclass=ExtendedEnumMeta):
+class SupportedAction(ExtendedEnum):
     """Supported action to process detected entities."""
 
     MASK = "mask"
@@ -20,19 +19,19 @@ class SupportedAction(str, metaclass=ExtendedEnumMeta):
     ANONYMIZE = "anonymize"
 
 
-class SupportedDetector(str, metaclass=ExtendedEnumMeta):
+class SupportedDetector(ExtendedEnum):
     """Supported pii detectors."""
 
     DEFAULT = "default"
     SPACY = "spacy"
 
 
-class DataFrameColumn(str, metaclass=ExtendedEnumMeta):
+class DataFrameColumn(ExtendedEnum):
     REDACTED_TEXT: str = "redacted_text"
     ENTITIES: str = "entities_cols"
 
 
-class YamlKey(str, metaclass=ExtendedEnumMeta):
+class YamlKey(ExtendedEnum):
     """Yaml key used in pii.yaml."""
 
     pass

ads/opctl/operator/lowcode/recommender/constant.py

@@ -1,25 +1,30 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
-from ads.common.extended_enum import ExtendedEnumMeta
+from ads.common.extended_enum import ExtendedEnum
 
 DEFAULT_SHOW_ROWS = 25
 DEFAULT_REPORT_FILENAME = "report.html"
 
-class OutputColumns(str, metaclass=ExtendedEnumMeta):
+
+class OutputColumns(ExtendedEnum):
     """output columns for recommender operator"""
+
     USER_COL = "user"
     ITEM_COL = "item"
     SCORE = "score"
 
-class SupportedMetrics(str, metaclass=ExtendedEnumMeta):
+
+class SupportedMetrics(ExtendedEnum):
     """Supported recommender metrics."""
+
     RMSE = "RMSE"
     MAE = "MAE"
 
-class SupportedModels(str, metaclass=ExtendedEnumMeta):
+
+class SupportedModels(ExtendedEnum):
     """Supported recommender models."""
-    SVD = "svd"
+
+    SVD = "svd"

ads/opctl/operator/runtime/marketplace_runtime.py

@@ -1,20 +1,14 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2024 Oracle and/or its affiliates.
+# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 from dataclasses import dataclass
 from typing import ClassVar, Dict
 
-from ads.opctl.operator.common.utils import _load_yaml_from_uri
-
-from ads.opctl.operator.common.operator_yaml_generator import YamlGenerator
-
-from ads.common.serializer import DataClassSerializable
-
 from ads.common.extended_enum import ExtendedEnum
-
+from ads.opctl.operator.common.operator_yaml_generator import YamlGenerator
+from ads.opctl.operator.common.utils import _load_yaml_from_uri
 from ads.opctl.operator.runtime.runtime import Runtime
 
 
@@ -30,7 +24,7 @@ class MarketplacePythonRuntime(Runtime):
     """Represents a python operator runtime."""
 
     _schema: ClassVar[str] = "python_marketplace_runtime_schema.yaml"
-    type: str = OPERATOR_MARKETPLACE_LOCAL_RUNTIME_TYPE.PYTHON.value
+    type: str = OPERATOR_MARKETPLACE_LOCAL_RUNTIME_TYPE.PYTHON
     version: str = "v1"
 
     def __init__(self, **kwargs):

ads/opctl/operator/runtime/runtime.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
-# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 
@@ -14,9 +13,8 @@ from cerberus import Validator
 
 from ads.common.extended_enum import ExtendedEnum
 from ads.common.serializer import DataClassSerializable
-from ads.opctl.operator.common.utils import _load_yaml_from_uri
 from ads.opctl.operator.common.errors import InvalidParameterError
-
+from ads.opctl.operator.common.utils import _load_yaml_from_uri
 
 
 class OPERATOR_LOCAL_RUNTIME_TYPE(ExtendedEnum):
@@ -79,7 +77,7 @@ class ContainerRuntime(Runtime):
     """Represents a container operator runtime."""
 
     _schema: ClassVar[str] = "container_runtime_schema.yaml"
-    type: str = OPERATOR_LOCAL_RUNTIME_TYPE.CONTAINER.value
+    type: str = OPERATOR_LOCAL_RUNTIME_TYPE.CONTAINER
     version: str = "v1"
     kind: str = OPERATOR_LOCAL_RUNTIME_KIND
     spec: ContainerRuntimeSpec = field(default_factory=ContainerRuntimeSpec)
@@ -102,7 +100,7 @@ class PythonRuntime(Runtime):
 
     _schema: ClassVar[str] = "python_runtime_schema.yaml"
     kind: str = OPERATOR_LOCAL_RUNTIME_KIND
-    type: str = OPERATOR_LOCAL_RUNTIME_TYPE.PYTHON.value
+    type: str = OPERATOR_LOCAL_RUNTIME_TYPE.PYTHON
     version: str = "v1"
 
     @classmethod

ads/pipeline/ads_pipeline_run.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
-# 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 copy
 import logging
@@ -10,11 +9,12 @@ from typing import List, Optional
 
 import oci
 import yaml
+
 from ads.common.decorator.runtime_dependency import (
     OptionalDependency,
     runtime_dependency,
 )
-from ads.common.extended_enum import ExtendedEnumMeta
+from ads.common.extended_enum import ExtendedEnum
 from ads.common.oci_datascience import OCIDataScienceMixin
 from ads.common.oci_logging import ConsolidatedLog, OCILog
 from ads.jobs.builders.infrastructure.base import RunInstance
@@ -56,22 +56,22 @@ ALLOWED_WAITER_KWARGS = [
 logger = logging.getLogger(__name__)
 
 
-class LogType(str, metaclass=ExtendedEnumMeta):
+class LogType(ExtendedEnum):
     CUSTOM_LOG = "custom_log"
     SERVICE_LOG = "service_log"
 
 
-class ShowMode(str, metaclass=ExtendedEnumMeta):
+class ShowMode(ExtendedEnum):
     GRAPH = "graph"
     TEXT = "text"
 
 
-class StepType(str, metaclass=ExtendedEnumMeta):
+class StepType(ExtendedEnum):
     ML_JOB = "ML_JOB"
     CUSTOM_SCRIPT = "CUSTOM_SCRIPT"
 
 
-class LogNotConfiguredError(Exception):   # pragma: no cover
+class LogNotConfiguredError(Exception):  # pragma: no cover
     pass
 
 
@@ -416,30 +416,18 @@ class PipelineRun(
                                     "stepConfigurationDetails"
                                 ] = {}
 
-                            if (
-                                override_step.step_configuration_details.maximum_runtime_in_minutes
-                            ):
+                            if override_step.step_configuration_details.maximum_runtime_in_minutes:
                                 updated_step_detail["spec"]["stepConfigurationDetails"][
                                     "maximumRuntimeInMinutes"
-                                ] = (
-                                    override_step.step_configuration_details.maximum_runtime_in_minutes
-                                )
-                            if (
-                                override_step.step_configuration_details.environment_variables
-                            ):
+                                ] = override_step.step_configuration_details.maximum_runtime_in_minutes
+                            if override_step.step_configuration_details.environment_variables:
                                 updated_step_detail["spec"]["stepConfigurationDetails"][
                                     "environmentVariables"
-                                ] = (
-                                    override_step.step_configuration_details.environment_variables
-                                )
-                            if (
-                                override_step.step_configuration_details.command_line_arguments
-                            ):
+                                ] = override_step.step_configuration_details.environment_variables
+                            if override_step.step_configuration_details.command_line_arguments:
                                 updated_step_detail["spec"]["stepConfigurationDetails"][
                                     "commandLineArguments"
-                                ] = (
-                                    override_step.step_configuration_details.command_line_arguments
-                                )
+                                ] = override_step.step_configuration_details.command_line_arguments
 
             updated_step_details.append(PipelineStep.from_dict(updated_step_detail))
         self._pipeline.with_step_details(updated_step_details)

ads/pipeline/visualizer/graph_renderer.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
 
-# Copyright (c) 2022 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 itertools
@@ -11,7 +10,7 @@ from ads.common.decorator.runtime_dependency import (
     OptionalDependency,
     runtime_dependency,
 )
-from ads.common.extended_enum import ExtendedEnumMeta
+from ads.common.extended_enum import ExtendedEnum
 from ads.pipeline.visualizer.base import (
     COMPLETE_STATUS,
     FAIL_STATUS,
@@ -29,7 +28,7 @@ from ads.pipeline.visualizer.base import (
 GRAPH_BOX_COLOR = "#DEDEDE"
 
 
-class RenderTo(str, metaclass=ExtendedEnumMeta):
+class RenderTo(ExtendedEnum):
     SVG = "svg"
     JPEG = "jpeg"
     PNG = "png"

{oracle_ads-2.12.11.dist-info → oracle_ads-2.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: oracle_ads
-Version: 2.12.11
+Version: 2.13.1
 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
@@ -10,10 +10,10 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Universal Permissive License (UPL)
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+License-File: LICENSE.txt
 Requires-Dist: PyYAML>=6
 Requires-Dist: asteval>=0.9.25
 Requires-Dist: cerberus>=1.3.4
@@ -23,10 +23,9 @@ Requires-Dist: gitpython>=3.1.2
 Requires-Dist: jinja2>=2.11.2
 Requires-Dist: matplotlib>=3.1.3,<=3.8.4
 Requires-Dist: numpy>=1.19.2,<2.0.0
-Requires-Dist: oci>=2.125.3
+Requires-Dist: oci>=2.148.0
 Requires-Dist: ocifs>=1.1.3
-Requires-Dist: pandas>1.2.1; python_version<'3.9'
-Requires-Dist: pandas>=2.2.0; python_version>='3.9'
+Requires-Dist: pandas>=2.2.0
 Requires-Dist: psutil>=5.7.2
 Requires-Dist: python_jsonschema_objects>=0.3.13
 Requires-Dist: requests
@@ -39,11 +38,17 @@ Requires-Dist: httpx
 Requires-Dist: oracle_ads[opctl] ; extra == "anomaly"
 Requires-Dist: autots ; extra == "anomaly"
 Requires-Dist: oracledb ; extra == "anomaly"
-Requires-Dist: report-creator==1.0.32 ; extra == "anomaly"
+Requires-Dist: report-creator==1.0.37 ; extra == "anomaly"
 Requires-Dist: rrcf==0.4.4 ; extra == "anomaly"
 Requires-Dist: scikit-learn<1.6.0 ; extra == "anomaly"
 Requires-Dist: salesforce-merlion[all]==2.0.4 ; extra == "anomaly"
 Requires-Dist: jupyter_server ; extra == "aqua"
+Requires-Dist: tornado ; extra == "aqua"
+Requires-Dist: notebook>=6.4,<=6.6 ; extra == "aqua"
+Requires-Dist: fire ; extra == "aqua"
+Requires-Dist: cachetools ; extra == "aqua"
+Requires-Dist: huggingface_hub ; extra == "aqua"
+Requires-Dist: python-dotenv ; extra == "aqua"
 Requires-Dist: hdfs[kerberos] ; extra == "bds"
 Requires-Dist: ibis-framework[impala] ; extra == "bds"
 Requires-Dist: sqlalchemy ; extra == "bds"
@@ -78,7 +83,7 @@ Requires-Dist: sktime ; extra == "forecast"
 Requires-Dist: statsmodels ; extra == "forecast"
 Requires-Dist: plotly ; extra == "forecast"
 Requires-Dist: oracledb ; extra == "forecast"
-Requires-Dist: report-creator==1.0.32 ; extra == "forecast"
+Requires-Dist: report-creator==1.0.37 ; extra == "forecast"
 Requires-Dist: geopandas<1.0.0 ; extra == "geo"
 Requires-Dist: fiona<=1.9.6 ; extra == "geo"
 Requires-Dist: oracle_ads[viz] ; extra == "geo"
@@ -122,11 +127,11 @@ Requires-Dist: scrubadub==2.0.1 ; extra == "pii"
 Requires-Dist: scrubadub_spacy ; extra == "pii"
 Requires-Dist: spacy-transformers==1.2.5 ; extra == "pii"
 Requires-Dist: spacy==3.6.1 ; extra == "pii"
-Requires-Dist: report-creator==1.0.32 ; extra == "pii"
+Requires-Dist: report-creator>=1.0.37 ; extra == "pii"
 Requires-Dist: oracle_ads[opctl] ; extra == "recommender"
 Requires-Dist: scikit-surprise ; extra == "recommender"
 Requires-Dist: plotly ; extra == "recommender"
-Requires-Dist: report-creator==1.0.32 ; 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"
@@ -145,17 +150,15 @@ Requires-Dist: opensearch-py ; extra == "testsuite"
 Requires-Dist: pdfplumber ; extra == "testsuite"
 Requires-Dist: py4j ; extra == "testsuite"
 Requires-Dist: pyarrow>=15.0.0 ; extra == "testsuite"
-Requires-Dist: statsmodels ; extra == "testsuite" and ( python_version=='3.8')
-Requires-Dist: statsmodels>=0.14.1 ; extra == "testsuite" and ( python_version>='3.9')
-Requires-Dist: tables ; extra == "testsuite"
-Requires-Dist: tables>3.9.0 ; extra == "testsuite" and ( python_version>='3.9')
+Requires-Dist: statsmodels>=0.14.1 ; extra == "testsuite"
+Requires-Dist: tables>3.9.0 ; extra == "testsuite"
 Requires-Dist: xlrd>=1.2.0 ; extra == "testsuite"
 Requires-Dist: spacy>=3.4.2,<3.8 ; extra == "text"
 Requires-Dist: wordcloud>=1.8.1 ; extra == "text"
 Requires-Dist: oracle_ads[viz] ; extra == "torch"
 Requires-Dist: torch ; extra == "torch"
 Requires-Dist: torchvision ; extra == "torch"
-Requires-Dist: bokeh>=3.0.0,<3.2.0 ; extra == "viz"
+Requires-Dist: bokeh ; extra == "viz"
 Requires-Dist: folium>=0.12.1 ; extra == "viz"
 Requires-Dist: graphviz<0.17 ; extra == "viz"
 Requires-Dist: scipy>=1.5.4 ; extra == "viz"