Merge branch 'main' into ODSC-54785/fix-modelversionset

Author: mrDzurb

.github/workflows/run-operators-unit-tests.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.10.8"]
+        python-version: ["3.8"]
 
     steps:
       - uses: actions/checkout@v4

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

@@ -4,6 +4,12 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ "main" ]
+    paths:
+      - "ads/**"
+      - "!ads/opctl/operator/**"
+      - "!ads/feature_store/**"
+      - "pyproject.toml"
+
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value

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

@@ -4,6 +4,11 @@ on:
   workflow_dispatch:
   pull_request:
     branches: [ "main" ]
+    paths:
+      - "ads/**"
+      - "!ads/opctl/operator/**"
+      - "!ads/feature_store/**"
+      - "pyproject.toml"
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value

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

@@ -3,6 +3,12 @@ name: "[Py3.9][Py3.10] - tests/unitary/**"
 on:
   workflow_dispatch:
   pull_request:
+    branches: [ "main" ]
+    paths:
+      - "ads/**"
+      - "!ads/opctl/operator/**"
+      - "!ads/feature_store/**"
+      - "pyproject.toml"
 
 # Cancel in progress workflows on pull_requests.
 # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value

CODEOWNERS

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

README.md

@@ -181,4 +181,4 @@ Consult the security guide [SECURITY.md](https://github.com/oracle/accelerated-d
 
 ## License
 
-Copyright (c) 2020, 2022 Oracle and/or its affiliates. Licensed under the [Universal Permissive License v1.0](https://oss.oracle.com/licenses/upl/)
+Copyright (c) 2020, 2024 Oracle and/or its affiliates. Licensed under the [Universal Permissive License v1.0](https://oss.oracle.com/licenses/upl/)

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

ads/aqua/__init__.py

@@ -6,7 +6,23 @@
 
 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}."
+        )

ads/aqua/evaluation.py

@@ -1392,11 +1392,6 @@ def load_evaluation_config(self, eval_id):
                     "memory_in_gbs": 128,
                     "block_storage_size": 200,
                 },
-                "VM.Standard.A1.Flex": {
-                    "ocpu": 8,
-                    "memory_in_gbs": 128,
-                    "block_storage_size": 200,
-                },
             },
             "default": {
                 "ocpu": 8,

ads/aqua/extension/common_handler.py

@@ -7,6 +7,8 @@
 from importlib import metadata
 
 from ads.aqua.extension.base_handler import AquaAPIhandler
+from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
+from ads.aqua.exception import AquaResourceAccessError
 
 
 class ADSVersionHandler(AquaAPIhandler):
@@ -16,6 +18,19 @@ def get(self):
         self.finish({"data": metadata.version("oracle_ads")})
 
 
+class CompatibilityCheckHandler(AquaAPIhandler):
+    """The handler to check if the extension is compatible."""
+
+    def get(self):
+        if ODSC_MODEL_COMPARTMENT_OCID:
+            return self.finish(dict(status="ok"))
+        else:
+            raise AquaResourceAccessError(
+                f"The AI Quick actions extension is not compatible in the given region."
+            )
+
+
 __handlers__ = [
     ("ads_version", ADSVersionHandler),
+    ("hello", CompatibilityCheckHandler),
 ]