Merge branch 'main' into forecast_preprocessing_schema

Author: ahosler

.github/workflows/run-unittests-default_setup.yml

@@ -3,6 +3,7 @@ name: "[Py3.8][Py3.9][Py3.10] tests/unitary/default_setup/**"
 on:
   workflow_dispatch:
   pull_request:
+    branches: [ "main" ]
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -43,13 +44,15 @@ jobs:
         name: "Test config setup"
 
       - name: "Run default_setup tests folder ONLY with minimum ADS dependencies"
-        timeout-minutes: 15
+        timeout-minutes: 30
         shell: bash
         env:
           NoDependency: True
         run: |
           set -x # print commands that are executed
           $CONDA/bin/conda init
           source /home/runner/.bashrc
+          conda install python=${{ matrix.python-version }}
           pip install -r test-requirements.txt
+          conda list
           python -m pytest -v -p no:warnings --durations=5 tests/unitary/default_setup

.github/workflows/run-unittests-py38-cov-report.yml

@@ -3,6 +3,7 @@ name: "[Py3.8][COV REPORT] tests/unitary/**"
 on:
   workflow_dispatch:
   pull_request:
+    branches: [ "main" ]
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -33,9 +34,12 @@ jobs:
             test-path: "tests/unitary"
             # `model` tests running in "slow_tests",
             # `feature_store` tests has its own test suite
+            # `forecast` tests has its own test suite
+            # 'hpo' tests hangs if run together with all unitary tests. Tests running in separate command before running all unitary
             ignore-path: |
               --ignore tests/unitary/with_extras/model \
               --ignore tests/unitary/with_extras/feature_store \
+              --ignore tests/unitary/with_extras/operator/forecast \
               --ignore tests/unitary/with_extras/hpo
           - name: "slow_tests"
             test-path: "tests/unitary/with_extras/model"
@@ -59,13 +63,13 @@ jobs:
 
       - uses: ./.github/workflows/test-env-setup
         name: "Test env setup"
-        timeout-minutes: 20
+        timeout-minutes: 30
 
-      # Installing forecast deps for python3.8 test setup only, it will not work with python3.9/3.10, because
-      # automlx do not support py3.9 and some versions of py3.10. This step omitted in -py39-py30.yml workflow
-      - name: "Install Forecasting dependencies"
+      # Installing pii deps for python3.8 test setup only, it will not work with python3.9/3.10, because
+      # 'datapane' library conflicts with pandas>2.2.0, which used in py3.9/3.10 setup
+      - name: "Install PII dependencies"
         run: |
-          pip install -e ".[forecast]"
+          pip install -e ".[pii]"
       - name: "Install featurestore marketplace dependencies"
         run: |
           pip install -e ".[feature-store-marketplace]"

.github/workflows/run-unittests-py39-py310.yml

@@ -35,11 +35,13 @@ jobs:
             # `model` tests running in "slow_tests",
             # `feature_store` tests has its own test suite
             # `forecast` tests not supported in python 3.9,3.10 (automlx dependency). Tests are running in python3.8 test env, see run-unittests-py38-cov-report.yml
+            # 'pii' tests run only with py3.8, 'datapane' library conflicts with pandas>2.2.0, which used in py3.9/3.10 setup
             # 'hpo' tests hangs if run together with all unitary tests. Tests running in separate command before running all unitary
             ignore-path: |
               --ignore tests/unitary/with_extras/model \
               --ignore tests/unitary/with_extras/feature_store \
               --ignore tests/unitary/with_extras/operator/forecast \
+              --ignore tests/unitary/with_extras/operator/pii \
               --ignore tests/unitary/with_extras/hpo
           - name: "slow_tests"
             test-path: "tests/unitary/with_extras/model"
@@ -63,7 +65,7 @@ jobs:
 
       - uses: ./.github/workflows/test-env-setup
         name: "Test env setup"
-        timeout-minutes: 20
+        timeout-minutes: 30
 
       - name: "Run hpo tests"
         timeout-minutes: 10

.github/workflows/test-env-setup/action.yml

@@ -14,5 +14,6 @@ runs:
         sudo apt-get install libkrb5-dev graphviz
         $CONDA/bin/conda init
         source /home/runner/.bashrc
-
+        conda install python=${{ matrix.python-version }}
         pip install -r dev-requirements.txt
+        conda list

CODEOWNERS

@@ -0,0 +1 @@
+* @darenr @mayoor @mrDzurb @VipulMascarenhas @qiuosier

README-development.md

@@ -101,7 +101,8 @@ To run all unit test install extra dependencies to test all modules of ADS ASD.
 
 ```bash
   # Update your environment with tests dependencies
-  pip install -r dev-requirements.txt
+  pip install -r test-requirements.txt
+  pip install -e ".[testsuite]"
   # Run all unit tests
   python3 -m pytest tests/unitary
 ```
@@ -113,7 +114,8 @@ To run all but opctl integration tests, you can run:
 
 ```bash
   # Update your environment with tests dependencies
-  pip install -r dev-requirements.txt
+  pip install -r test-requirements.txt
+  pip install -e ".[testsuite]"
   # Run integration tests
   python3 -m pytest tests/integration --ignore=tests/integration/opctl
 ```

THIRD_PARTY_LICENSES.txt

@@ -405,6 +405,19 @@ delta
 * Source code: https://github.com/delta-io/delta/
 * Project home: https://delta.io/
 
+cachetools
+* Copyright (c) 2014-2024 Thomas Kemmer
+* License: The MIT License (MIT)
+* Source code: https://github.com/tkem/cachetools/
+* Project home: https://cachetools.readthedocs.io/
+
+python-fire
+* Copyright 2017 Google Inc. All rights reserved.
+* License: Apache License 2.0
+* Source code: https://github.com/google/python-fire
+* Project home: https://github.com/google/python-fire
+
+=======
 =============================== Licenses ===============================
 ------------------------------------------------------------------------
 

ads/aqua/__init__.py

@@ -0,0 +1,28 @@
+#!/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 logging
+import sys
+import os
+from ads.aqua.utils import fetch_service_compartment
+from ads.config import OCI_RESOURCE_PRINCIPAL_VERSION
+from ads import set_auth
+
+logger = logging.getLogger(__name__)
+handler = logging.StreamHandler(sys.stdout)
+logger.setLevel(logging.INFO)
+
+if OCI_RESOURCE_PRINCIPAL_VERSION:
+    set_auth("resource_principal")
+
+ODSC_MODEL_COMPARTMENT_OCID = os.environ.get("ODSC_MODEL_COMPARTMENT_OCID")
+if not ODSC_MODEL_COMPARTMENT_OCID:
+    try:
+        ODSC_MODEL_COMPARTMENT_OCID = fetch_service_compartment()
+    except Exception as e:
+        logger.error(
+            f"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua, due to {e}."
+        )