oracle-ads 2.11.7__tar.gz → 2.11.8__tar.gz

{oracle_ads-2.11.7 → oracle_ads-2.11.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.7
+Version: 2.11.8
 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
@@ -22,7 +22,7 @@ Requires-Dist: gitpython>=3.1.2
 Requires-Dist: jinja2>=2.11.2
 Requires-Dist: matplotlib>=3.1.3
 Requires-Dist: numpy>=1.19.2
-Requires-Dist: oci>=2.113.0
+Requires-Dist: oci>=2.125.3
 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'
@@ -37,7 +37,7 @@ Requires-Dist: autots ; extra == "anomaly"
 Requires-Dist: oracle-automlx[forecasting]==23.4.1 ; extra == "anomaly"
 Requires-Dist: oracle-automlx[classic]==23.4.1 ; extra == "anomaly"
 Requires-Dist: oracledb ; extra == "anomaly"
-Requires-Dist: datapane ; extra == "anomaly"
+Requires-Dist: report-creator ; extra == "anomaly"
 Requires-Dist: jupyter_server ; extra == "aqua"
 Requires-Dist: hdfs[kerberos] ; extra == "bds"
 Requires-Dist: ibis-framework[impala] ; extra == "bds"
@@ -61,7 +61,6 @@ Requires-Dist: oci-cli ; extra == "forecast"
 Requires-Dist: py-cpuinfo ; extra == "forecast"
 Requires-Dist: rich ; extra == "forecast"
 Requires-Dist: autots[additional] ; extra == "forecast"
-Requires-Dist: datapane ; extra == "forecast"
 Requires-Dist: holidays==0.21.13 ; extra == "forecast"
 Requires-Dist: neuralprophet ; extra == "forecast"
 Requires-Dist: numpy ; extra == "forecast"
@@ -77,6 +76,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 ; extra == "forecast"
 Requires-Dist: geopandas ; extra == "geo"
 Requires-Dist: oracle_ads[viz] ; extra == "geo"
 Requires-Dist: transformers ; extra == "huggingface"
@@ -107,7 +107,6 @@ Requires-Dist: cachetools ; extra == "opctl"
 Requires-Dist: optuna==2.9.0 ; extra == "optuna"
 Requires-Dist: oracle_ads[viz] ; extra == "optuna"
 Requires-Dist: aiohttp ; extra == "pii"
-Requires-Dist: datapane ; extra == "pii"
 Requires-Dist: gender_guesser ; extra == "pii"
 Requires-Dist: nameparser ; extra == "pii"
 Requires-Dist: oracle_ads[opctl] ; extra == "pii"
@@ -116,6 +115,7 @@ 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 ; extra == "pii"
 Requires-Dist: pyspark>=3.0.0 ; extra == "spark"
 Requires-Dist: oracle_ads[viz] ; extra == "tensorflow"
 Requires-Dist: tensorflow ; extra == "tensorflow"

{oracle_ads-2.11.7 → oracle_ads-2.11.8}/THIRD_PARTY_LICENSES.txt

@@ -18,6 +18,12 @@ asteval
 * Source code: https://github.com/newville/asteval
 * Project home: https://github.com/newville/asteval
 
+autots
+* Copyright (c) 2024 Colin Catlin
+* License: MIT License
+* Source code: https://github.com/winedarksea/AutoTS
+* Project home: https://winedarksea.github.io/AutoTS/build/html/index.html
+
 bokeh
 * Copyright Copyright (c) 2012 - 2021, Anaconda, Inc., and Bokeh Contributors
 * License: BSD 3-Clause "New" or "Revised" License
@@ -169,6 +175,12 @@ nbformat
 * Source code: https://github.com/jupyter/nbconvert
 * Project home: https://jupyter.org/
 
+neuralprophet
+* Copyright (c) 2020 Oskar Triebe
+* License: MIT License
+* Source Code: https://github.com/ourownstory/neural_prophet
+* Project Home: https://neuralprophet.com
+
 numpy
 * Copyright (c) 2005-2021, NumPy Developers.
 * License: BSD 3-Clause "New" or "Revised" License
@@ -247,6 +259,18 @@ plotly
 * Source code: https://github.com/plotly/plotly.py
 * Project home: https://plotly.com/
 
+pmdarima
+* Copyright (c) 2017 Taylor G Smith
+* License: MIT License
+* Source code: https://github.com/alkaline-ml/pmdarima
+* Project home: https://alkaline-ml.com/pmdarima/
+
+prophet
+* Copyright (c) Facebook, Inc. and its affiliates.
+* License: MIT License
+* Source code: https://github.com/facebook/prophet
+* Project home: https://facebook.github.io/prophet/
+
 protobuf
 * Copyright 2008 Google Inc.  All rights reserved.
 * License: Google Protobuf License
@@ -289,6 +313,12 @@ PyYAML
 * Source code: https://github.com/yaml/pyyaml/
 * Project home: https://pyyaml.org/
 
+report-creator
+* Copyright 2024 Daren Race
+* License: MIT License
+* Source code: https://github.com/darenr/report_creator
+* Project home: https://darenr.github.io/report_creator/
+
 requests
 * Copyright 2023 Kenneth Reitz
 * License: Apache-2.0 license

oracle_ads-2.11.8/ads/aqua/__init__.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- coding: utf-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 os
+
+from ads import logger, set_auth
+from ads.aqua.utils import fetch_service_compartment
+from ads.config import OCI_RESOURCE_PRINCIPAL_VERSION
+
+ENV_VAR_LOG_LEVEL = "ADS_AQUA_LOG_LEVEL"
+
+
+def get_logger_level():
+    """Retrieves logging level from environment variable `ADS_AQUA_LOG_LEVEL`."""
+    level = os.environ.get(ENV_VAR_LOG_LEVEL, "INFO").upper()
+    return level
+
+
+logger.setLevel(get_logger_level())
+
+
+def set_log_level(log_level: str):
+    """Global for setting logging level."""
+
+    log_level = log_level.upper()
+    logger.setLevel(log_level.upper())
+    logger.handlers[0].setLevel(log_level)
+
+
+if OCI_RESOURCE_PRINCIPAL_VERSION:
+    set_auth("resource_principal")
+
+ODSC_MODEL_COMPARTMENT_OCID = (
+    os.environ.get("ODSC_MODEL_COMPARTMENT_OCID") or fetch_service_compartment()
+)

{oracle_ads-2.11.7 → oracle_ads-2.11.8}/ads/aqua/base.py

@@ -19,7 +19,6 @@ from ads.aqua.utils import (
     get_artifact_path,
     is_valid_ocid,
     load_config,
-    logger,
 )
 from ads.common import oci_client as oc
 from ads.common.auth import default_signer
@@ -164,7 +163,6 @@ class AquaApp:
         tag = Tags.AQUA_FINE_TUNING.value
 
         if not model_version_set_id:
-            tag = Tags.AQUA_FINE_TUNING.value # TODO: Fix this
             try:
                 model_version_set = ModelVersionSet.from_name(
                     name=model_version_set_name,

oracle_ads-2.11.8/ads/aqua/cli.py

@@ -0,0 +1,67 @@
+#!/usr/bin/env python
+# -*- coding: utf-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 os
+import sys
+
+from ads.aqua import (
+    ENV_VAR_LOG_LEVEL,
+    set_log_level,
+    ODSC_MODEL_COMPARTMENT_OCID,
+    logger,
+)
+from ads.aqua.deployment import AquaDeploymentApp
+from ads.aqua.evaluation import AquaEvaluationApp
+from ads.aqua.finetune import AquaFineTuningApp
+from ads.aqua.model import AquaModelApp
+from ads.config import NB_SESSION_OCID
+from ads.common.utils import LOG_LEVELS
+
+
+class AquaCommand:
+    """Contains the command groups for project Aqua.
+
+    Acts as an entry point for managing different components of the Aqua
+    project including model management, fine-tuning, deployment, and
+    evaluation.
+    """
+
+    model = AquaModelApp
+    fine_tuning = AquaFineTuningApp
+    deployment = AquaDeploymentApp
+    evaluation = AquaEvaluationApp
+
+    def __init__(
+        self,
+        log_level: str = os.environ.get(ENV_VAR_LOG_LEVEL, "ERROR").upper(),
+    ):
+        """
+        Initialize the command line interface settings for the Aqua project.
+
+        FLAGS
+        -----
+        log_level (str):
+            Sets the logging level for the application.
+            Default is retrieved from environment variable `LOG_LEVEL`,
+            or 'ERROR' if not set. Example values include 'DEBUG', 'INFO',
+            'WARNING', 'ERROR', and 'CRITICAL'.
+        """
+        if log_level.upper() not in LOG_LEVELS:
+            logger.error(
+                f"Log level should be one of {LOG_LEVELS}. Setting default to ERROR."
+            )
+            log_level = "ERROR"
+        set_log_level(log_level)
+        # gracefully exit if env var is not set
+        if not ODSC_MODEL_COMPARTMENT_OCID:
+            logger.debug(
+                "ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
+            )
+            if NB_SESSION_OCID:
+                logger.error(
+                    f"Aqua is not available for the notebook session {NB_SESSION_OCID}. For more information, "
+                    f"please refer to the documentation."
+                )
+            sys.exit(1)

{oracle_ads-2.11.7 → oracle_ads-2.11.8}/ads/aqua/decorator.py

@@ -17,6 +17,7 @@ from oci.exceptions import (
     RequestException,
     ServiceError,
 )
+from tornado.web import HTTPError
 
 from ads.aqua.exception import AquaError
 from ads.aqua.extension.base_handler import AquaAPIhandler
@@ -58,6 +59,7 @@ def handle_exceptions(func):
         except ServiceError as error:
             self.write_error(
                 status_code=error.status or 500,
+                message=error.message,
                 reason=error.message,
                 service_payload=error.args[0] if error.args else None,
                 exc_info=sys.exc_info(),
@@ -91,6 +93,12 @@ def handle_exceptions(func):
                 service_payload=error.service_payload,
                 exc_info=sys.exc_info(),
             )
+        except HTTPError as e:
+            self.write_error(
+                status_code=e.status_code,
+                reason=e.log_message,
+                exc_info=sys.exc_info(),
+            )
         except Exception as ex:
             self.write_error(
                 status_code=500,

{oracle_ads-2.11.7 → oracle_ads-2.11.8}/ads/aqua/deployment.py

@@ -22,6 +22,9 @@ from ads.aqua.utils import (
     UNKNOWN_DICT,
     get_resource_name,
     get_model_by_reference_paths,
+    get_ocid_substring,
+    AQUA_MODEL_TYPE_SERVICE,
+    AQUA_MODEL_TYPE_CUSTOM,
 )
 from ads.aqua.finetune import FineTuneCustomMetadata
 from ads.aqua.data import AquaResourceIdentifier
@@ -391,40 +394,27 @@ class AquaDeploymentApp(AquaApp):
             .with_runtime(container_runtime)
         ).deploy(wait_for_completion=False)
 
-        if is_fine_tuned_model:
-            # tracks unique deployments that were created in the user compartment
-            self.telemetry.record_event_async(
-                category="aqua/custom/deployment", action="create", detail=model_name
-            )
-            # tracks the shape used for deploying the custom models
-            self.telemetry.record_event_async(
-                category="aqua/custom/deployment/create",
-                action="shape",
-                detail=instance_shape,
-            )
-            # tracks the shape used for deploying the custom models by name
-            self.telemetry.record_event_async(
-                category=f"aqua/custom/{model_name}/deployment/create",
-                action="shape",
-                detail=instance_shape,
-            )
-        else:
-            # tracks unique deployments that were created in the user compartment
-            self.telemetry.record_event_async(
-                category="aqua/service/deployment", action="create", detail=model_name
-            )
-            # tracks the shape used for deploying the service models
-            self.telemetry.record_event_async(
-                category="aqua/service/deployment/create",
-                action="shape",
-                detail=instance_shape,
-            )
-            # tracks the shape used for deploying the service models by name
-            self.telemetry.record_event_async(
-                category=f"aqua/service/{model_name}/deployment/create",
-                action="shape",
-                detail=instance_shape,
-            )
+        model_type = (
+            AQUA_MODEL_TYPE_CUSTOM if is_fine_tuned_model else AQUA_MODEL_TYPE_SERVICE
+        )
+        deployment_id = deployment.dsc_model_deployment.id
+        # we arbitrarily choose last 8 characters of OCID to identify MD in telemetry
+        telemetry_kwargs = {"ocid": get_ocid_substring(deployment_id, key_len=8)}
+
+        # tracks unique deployments that were created in the user compartment
+        self.telemetry.record_event_async(
+            category=f"aqua/{model_type}/deployment",
+            action="create",
+            detail=model_name,
+            **telemetry_kwargs,
+        )
+        # tracks the shape used for deploying the custom or service models by name
+        self.telemetry.record_event_async(
+            category=f"aqua/{model_type}/deployment/create",
+            action="shape",
+            detail=instance_shape,
+            value=model_name,
+        )
 
         return AquaDeployment.from_oci_model_deployment(
             deployment.dsc_model_deployment, self.region
@@ -471,6 +461,19 @@ class AquaDeploymentApp(AquaApp):
                     )
                 )
 
+                # log telemetry if MD is in active or failed state
+                deployment_id = model_deployment.id
+                state = model_deployment.lifecycle_state.upper()
+                if state in ["ACTIVE", "FAILED"]:
+                    # tracks unique deployments that were listed in the user compartment
+                    # we arbitrarily choose last 8 characters of OCID to identify MD in telemetry
+                    self.telemetry.record_event_async(
+                        category=f"aqua/deployment",
+                        action="list",
+                        detail=get_ocid_substring(deployment_id, key_len=8),
+                        value=state,
+                    )
+
         # tracks number of times deployment listing was called
         self.telemetry.record_event_async(category="aqua/deployment", action="list")