Merge branch 'main' into ODSC-69756/refactor_container_index_loader

Author: mrDzurb

ads/model/artifact_downloader.py

@@ -170,7 +170,10 @@ def _download(self):
         """Downloads model artifacts."""
         self.progress.update("Importing model artifacts from catalog")
 
-        if self.dsc_model._is_model_by_reference() and self.model_file_description:
+        if (
+            self.dsc_model.is_model_created_by_reference()
+            and self.model_file_description
+        ):
             self.download_from_model_file_description()
             self.progress.update()
             return

ads/model/datascience_model.py

@@ -1779,7 +1779,7 @@ def _update_from_oci_dsc_model(
                 artifact_info["Content-Disposition"]
             )
 
-            if self.dsc_model._is_model_by_reference():
+            if self.dsc_model.is_model_created_by_reference():
                 _, file_extension = os.path.splitext(file_name_info["filename"])
                 if file_extension.lower() == ".json":
                     bucket_uri, _ = self._download_file_description_artifact()

ads/model/service/oci_datascience_model.py

@@ -579,7 +579,7 @@ def from_id(cls, ocid: str) -> "OCIDataScienceModel":
             raise ValueError("Model OCID not provided.")
         return super().from_ocid(ocid)
 
-    def _is_model_by_reference(self):
+    def is_model_created_by_reference(self):
         """Checks if model is created by reference
         Returns
         -------

ads/opctl/operator/lowcode/forecast/model_evaluator.py

@@ -100,6 +100,7 @@ def create_operator_config(self, operator_config, backtest, model, historical_da
         backtest_op_config_draft = operator_config.to_dict()
         backtest_spec = backtest_op_config_draft["spec"]
         backtest_spec["historical_data"]["url"] = historical_data_url
+        backtest_spec["datetime_column"]["format"] = None
         if backtest_spec["additional_data"]:
             backtest_spec["additional_data"]["url"] = additional_data_url
         backtest_spec["test_data"] = {}

tests/operators/data/timeseries/dataset6.csv

@@ -0,0 +1,9 @@
+Store,Date,Sales
+1,01-07-2022,328
+1,01-08-2022,369
+1,01-09-2022,415
+1,01-10-2022,277
+1,01-11-2022,248
+1,01-12-2022,251
+1,01-07-2023,329
+1,01-08-2023,446

tests/operators/forecast/test_errors.py

@@ -868,5 +868,30 @@ def test_what_if_analysis(operator_setup, model):
     ), f"Deployment info file not found at {deployment_metadata}"
 
 
+def test_auto_select(operator_setup):
+    DATASET_PREFIX = f"{os.path.dirname(os.path.abspath(__file__))}/../data/timeseries/"
+    tmpdirname = operator_setup
+    historical_test_path = f"{DATASET_PREFIX}/dataset6.csv"
+    model = "auto-select"
+    yaml_i, output_data_path = populate_yaml(
+        tmpdirname=tmpdirname,
+        historical_data_path=historical_test_path,
+        output_data_path=f"{tmpdirname}/{model}/results",
+    )
+    yaml_i["spec"].pop("additional_data")
+    yaml_i["spec"]["horizon"] = 2
+    yaml_i["spec"]["datetime_column"]["format"] = "%d-%m-%Y"
+    yaml_i["spec"]["model"] = model
+    yaml_i["spec"]["model_kwargs"] = {"model_list": ["prophet", "arima"]}
+
+    run_yaml(
+        tmpdirname=tmpdirname,
+        yaml_i=yaml_i,
+        output_data_path=output_data_path,
+        test_metrics_check=False,
+    )
+    report_path = f"{output_data_path}/report.html"
+    assert os.path.exists(report_path), f"Report file not found at {report_path}"
+
 if __name__ == "__main__":
     pass

tests/unitary/default_setup/model/test_artifact_downloader.py

@@ -189,7 +189,7 @@ def test_download_large_artifact_from_model_file_description(self, mock_download
         """Tests whether model_file_description is loaded within downloader and is parsed, and also if
         #  download_from_model_file_description is appropriately called."""
 
-        self.mock_dsc_model._is_model_by_reference.return_value = True
+        self.mock_dsc_model.is_model_created_by_reference.return_value = True
         self.mock_artifact_file_path = os.path.join(
             self.curr_dir, "test_files/model_description.json"
         )

tests/unitary/default_setup/model/test_datascience_model.py

@@ -613,7 +613,7 @@ def test__to_oci_dsc_model(self):
             True,
         ],
     )
-    @patch.object(OCIDataScienceModel, "_is_model_by_reference")
+    @patch.object(OCIDataScienceModel, "is_model_created_by_reference")
     @patch.object(OCIDataScienceModel, "get_artifact_info")
     @patch.object(OCIDataScienceModel, "get_model_provenance")
     @patch.object(DataScienceModel, "_download_file_description_artifact")

tests/unitary/default_setup/model/test_oci_datascience_model.py

@@ -473,7 +473,7 @@ def test_is_model_by_reference(self):
             category="Other",
         )
         self.mock_model.custom_metadata_list = [metadata_item]
-        assert not self.mock_model._is_model_by_reference()
+        assert not self.mock_model.is_model_created_by_reference()
 
         metadata_item = ModelCustomMetadataItem(
             key="modelDescription",
@@ -483,4 +483,4 @@ def test_is_model_by_reference(self):
         )
         self.mock_model.custom_metadata_list = [metadata_item]
 
-        assert self.mock_model._is_model_by_reference()
+        assert self.mock_model.is_model_created_by_reference()