Merge branch 'main' into ODSC-53010/get_create_model_tests

lu-ohai · web-flow · commit ea4fdc482daa · 2024-04-11T12:35:52.000-04:00
diff --git a/.github/workflows/run-operators-unit-tests.yml b/.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
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1 @@
+* @darenr @mayoor @mrDzurb @VipulMascarenhas @qiuosier
diff --git a/ads/common/serializer.py b/ads/common/serializer.py
@@ -464,7 +464,7 @@ def from_dict(
             )
 
         obj = cls(
-            **{key: obj_dict.get(key) for key in allowed_fields if key in obj_dict}
+            **{key: obj_dict.get(key) for key in allowed_fields}
         )
 
         for key, value in obj_dict.items():
diff --git a/ads/model/model_artifact_boilerplate/artifact_introspection_test/model_artifact_validate.py b/ads/model/model_artifact_boilerplate/artifact_introspection_test/model_artifact_validate.py
@@ -29,7 +29,7 @@
 TESTS_PATH = os.path.join(_cwd, "resources", "tests.yaml")
 HTML_PATH = os.path.join(_cwd, "resources", "template.html")
 CONFIG_PATH = os.path.join(_cwd, "resources", "config.yaml")
-PYTHON_VER_PATTERN = "^([3])(\.[6-9])(\.\d+)?$"
+PYTHON_VER_PATTERN = "^([3])(\.([6-9]|1[0-2]))(\.\d+)?$"
 PAR_URL = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/WyjtfVIG0uda-P3-2FmAfwaLlXYQZbvPZmfX1qg0-sbkwEQO6jpwabGr2hMDBmBp/n/ociodscdev/b/service-conda-packs/o/service_pack/index.json"
 
 TESTS = {
diff --git a/ads/opctl/operator/lowcode/anomaly/model/automlx.py b/ads/opctl/operator/lowcode/anomaly/model/automlx.py
@@ -26,8 +26,9 @@ class AutoMLXOperatorModel(AnomalyOperatorBaseModel):
     )
     def _build_model(self) -> pd.DataFrame:
         from automlx import init
+        import logging
         try:
-            init(engine="ray", engine_opts={"ray_setup": {"_temp_dir": "/tmp/ray-temp"}})
+            init(engine="ray", engine_opts={"ray_setup": {"_temp_dir": "/tmp/ray-temp"}}, loglevel=logging.CRITICAL)
         except Exception as e:
             logger.info("Ray already initialized")
         date_column = self.spec.datetime_column.name
diff --git a/ads/opctl/operator/lowcode/forecast/environment.yaml b/ads/opctl/operator/lowcode/forecast/environment.yaml
@@ -18,3 +18,4 @@ dependencies:
       - optuna==3.1.0
       - oracle-automlx==23.4.1
       - oracle-automlx[forecasting]==23.4.1
+      - fire
diff --git a/ads/opctl/operator/lowcode/forecast/model/automlx.py b/ads/opctl/operator/lowcode/forecast/model/automlx.py
@@ -70,17 +70,15 @@ def preprocess(self, data, series_id=None):
     )
     def _build_model(self) -> pd.DataFrame:
         from automlx import init
-        from sktime.forecasting.model_selection import temporal_train_test_split
+        import logging
         try:
-            init(engine="ray", engine_opts={"ray_setup": {"_temp_dir": "/tmp/ray-temp"}})
+            init(engine="ray", engine_opts={"ray_setup": {"_temp_dir": "/tmp/ray-temp"}}, loglevel=logging.CRITICAL)
         except Exception as e:
             logger.info("Ray already initialized")
 
-
         full_data_dict = self.datasets.get_data_by_series()
 
         self.models = dict()
-        date_column = self.spec.datetime_column.name
         horizon = self.spec.horizon
         self.spec.confidence_interval_width = self.spec.confidence_interval_width or 0.8
         self.forecast_output = ForecastOutput(
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -79,6 +79,13 @@ Oracle Accelerated Data Science (ADS)
 
    modules
 
+.. admonition:: Introducing AI Quick Actions
+   :class: note
+
+   Deploy, Fine Tune and Evaluate Large language models such as `Mistral-7B-Instruct-v0.2 <https://huggingface.co/mistralai/Mistral-7B-Instruct-v0.2>`__, `CodeLlama-13b-Instruct-hf <https://huggingface.co/codellama/CodeLlama-13b-Instruct-hf>`__, etc with just a couple of clicks.
+
+   Visit `AI Quick Actions documentation <https://github.com/oracle-samples/oci-data-science-ai-samples/tree/main/ai-quick-actions>`__ for the latest information
+  
 .. admonition:: Oracle Accelerated Data Science (ADS)
    :class: note
 
diff --git a/docs/source/user_guide/model_serialization/automlmodel.rst b/docs/source/user_guide/model_serialization/automlmodel.rst
@@ -23,8 +23,8 @@ Example
     from sklearn.model_selection import train_test_split
 
     import ads
-    import automl
-    from automl import init
+    import automlx as automl
+    from automlx import init
     from ads.model import GenericModel
     from ads.common.model_metadata import UseCaseType
 
@@ -48,8 +48,8 @@ Example
 
     ads.set_auth("resource_principal")
     automl_model = GenericModel(estimator=est, artifact_dir="automl_model_artifact")
-    automl_model.prepare(inference_conda_env="automlx_p38_cpu_v1",
-                         training_conda_env="automlx_p38_cpu_v1",
+    automl_model.prepare(inference_conda_env="automlx234_p38_cpu_x86_64_v1",
+                         training_conda_env="automlx234_p38_cpu_x86_64_v1",
                          use_case_type=UseCaseType.BINARY_CLASSIFICATION,
                          X_sample=X_test,
                          force_overwrite=True)
@@ -70,7 +70,7 @@ Open ``automl_model_artifact/score.py`` and edit the code to instantiate the mod
     from io import StringIO
     import logging
     import sys
-    import automl
+    import automlx as automl
     import pandas as pd
     import numpy as np
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -179,7 +179,7 @@ pii = [
   "spacy-transformers==1.2.5",
   "spacy==3.6.1",
 ]
-llm = ["langchain>=0.1.10", "evaluate>=0.4.0"]
+llm = ["langchain-community<0.0.32", "langchain>=0.1.10,<0.1.14", "evaluate>=0.4.0"]
 aqua = ["jupyter_server"]
 
 # To reduce backtracking (decrese deps install time) during test/dev env setup reducing number of versions pip is
diff --git a/test-requirements-operators.txt b/test-requirements-operators.txt
@@ -1,5 +1,5 @@
 -r test-requirements.txt
 -e ".[forecast]"
 -e ".[feature-store-marketplace]"
-darts
+darts>=0.28
 plotly
diff --git a/tests/unitary/default_setup/model/test_model_introspect.py b/tests/unitary/default_setup/model/test_model_introspect.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 """Unit Tests for model introspection module."""
@@ -249,3 +249,21 @@ def test_to_list(self):
         """Tests converting instance to a list representation."""
         expected_result = ["test_key", "test_case", "test_result", "test_message"]
         assert self.mock_print_item.to_list() == expected_result
+
+
+class TestPythonVersionCheck(TestCase):
+    def test_python_version_check(self):
+        from ads.model.model_artifact_boilerplate.artifact_introspection_test import (
+            model_artifact_validate as at,
+        )
+        import re
+
+        supported_python_version = [f"3.{minor}" for minor in range(6, 12)]
+        for version in supported_python_version:
+            m = re.match(at.PYTHON_VER_PATTERN, str(version))
+            assert m and m.group(), "Python version check failed."
+
+        unsupported_python_version = ["3.5", "3.13"]
+        for version in unsupported_python_version:
+            m = re.match(at.PYTHON_VER_PATTERN, str(version))
+            assert not m, "Python version check failed."

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+* @darenr @mayoor @mrDzurb @VipulMascarenhas @qiuosier`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ def from_dict(`
`464`	`464`	`)`
`465`	`465`
`466`	`466`	`obj = cls(`
`467`		`- **{key: obj_dict.get(key) for key in allowed_fields if key in obj_dict}`
	`467`	`+ **{key: obj_dict.get(key) for key in allowed_fields}`
`468`	`468`	`)`
`469`	`469`
`470`	`470`	`for key, value in obj_dict.items():`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ pii = [`
`179`	`179`	`"spacy-transformers==1.2.5",`
`180`	`180`	`"spacy==3.6.1",`
`181`	`181`	`]`
`182`		`-llm = ["langchain>=0.1.10", "evaluate>=0.4.0"]`
	`182`	`+llm = ["langchain-community<0.0.32", "langchain>=0.1.10,<0.1.14", "evaluate>=0.4.0"]`
`183`	`183`	`aqua = ["jupyter_server"]`
`184`	`184`
`185`	`185`	`# To reduce backtracking (decrese deps install time) during test/dev env setup reducing number of versions pip is`