remove ref to datapane

ahosler · ahosler · commit 0dcf1b89d977 · 2024-04-22T13:47:22.000+01:00
diff --git a/ads/opctl/operator/lowcode/anomaly/README.md b/ads/opctl/operator/lowcode/anomaly/README.md
@@ -35,7 +35,7 @@ All generated configurations should be ready to use without the need for any add
 To run anomaly detection locally, create and activate a new conda environment (`ads-anomaly`). Install all the required libraries listed in the `environment.yaml` file.
 
 ```yaml
-- datapane
+- report-creator
 - cerberus
 - oracle-automlx==23.4.1
 - oracle-automlx[classic]==23.4.1
diff --git a/ads/opctl/operator/lowcode/anomaly/environment.yaml b/ads/opctl/operator/lowcode/anomaly/environment.yaml
@@ -5,7 +5,7 @@ dependencies:
   - python=3.8
   - pip
   - pip:
-      - datapane
+      - report-creator
       - cerberus
       - oracle-automlx==23.4.1
       - oracle-automlx[classic]==23.4.1
diff --git a/ads/opctl/operator/lowcode/anomaly/model/base_model.py b/ads/opctl/operator/lowcode/anomaly/model/base_model.py
@@ -255,7 +255,7 @@ def _save_report(
         else:
             storage_options = dict()
 
-        # datapane html report
+        # report-creator html report
         with tempfile.TemporaryDirectory() as temp_dir:
             report_local_path = os.path.join(temp_dir, "___report.html")
             disable_print()
diff --git a/ads/opctl/operator/lowcode/forecast/README.md b/ads/opctl/operator/lowcode/forecast/README.md
@@ -35,7 +35,7 @@ To run forecasting locally, create and activate a new conda environment (`ads-fo
 - neuralprophet
 - pmdarima
 - statsmodels
-- datapane
+- report-creator
 - cerberus
 - sktime
 - optuna==3.1.0
diff --git a/ads/opctl/operator/lowcode/forecast/environment.yaml b/ads/opctl/operator/lowcode/forecast/environment.yaml
@@ -10,12 +10,12 @@ dependencies:
       - neuralprophet
       - pmdarima
       - statsmodels
-      - datapane
+      - report-creator
       - cerberus
       - sktime
       - shap
       - autots[additional]
-      - optuna==3.1.0
-      - oracle-automlx==23.4.1
-      - oracle-automlx[forecasting]==23.4.1
+      - optuna
+      - 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
@@ -172,9 +172,9 @@ def _build_model(self) -> pd.DataFrame:
         return self.forecast_output.get_forecast_long()
 
     @runtime_dependency(
-        module="datapane",
+        module="report-creator",
         err_msg=(
-            "Please run `pip3 install datapane` to install the required dependencies for report generation."
+            "Please run `pip3 install report-creator` to install the required dependencies for report generation."
         ),
     )
     def _generate_report(self):
@@ -187,8 +187,8 @@ def _generate_report(self):
 
         Returns
         -------
-            - model_description (datapane.Text): A Text component containing the description of the automlx model.
-            - other_sections (List[Union[datapane.Text, datapane.Blocks]]): A list of Text and Blocks components representing various sections of the report.
+            - model_description (report-creator.Text): A Text component containing the description of the automlx model.
+            - other_sections (List[Union[report-creator.Text, report-creator.Block]]): A list of Text and Blocks components representing various sections of the report.
             - forecast_col_name (str): The name of the forecasted column.
             - train_metrics (bool): A boolean value indicating whether to include train metrics in the report.
             - ds_column_series (pd.Series): The pd.Series object representing the datetime column of the dataset.
diff --git a/ads/opctl/operator/lowcode/forecast/model/base_model.py b/ads/opctl/operator/lowcode/forecast/model/base_model.py
@@ -417,9 +417,8 @@ def _save_report(
         else:
             storage_options = dict()
 
-        # datapane html report
+        # report-creator html report
         if self.spec.generate_report:
-            # datapane html report
             with tempfile.TemporaryDirectory() as temp_dir:
                 report_local_path = os.path.join(temp_dir, "___report.html")
                 # disable_print()
diff --git a/ads/opctl/operator/lowcode/pii/README.md b/ads/opctl/operator/lowcode/pii/README.md
@@ -33,7 +33,7 @@ To run pii operator locally, create and activate a new conda environment (`ads-p
 
 ```yaml
 - aiohttp
-- datapane
+- report-creator
 - gender_guesser
 - nameparser
 - oracle_ads[opctl]
diff --git a/ads/opctl/operator/lowcode/pii/environment.yaml b/ads/opctl/operator/lowcode/pii/environment.yaml
@@ -6,7 +6,7 @@ dependencies:
   - pip
   - pip:
       - aiohttp
-      - datapane
+      - report-creator
       - gender_guesser
       - nameparser
       - oracle_ads[opctl]
diff --git a/ads/opctl/operator/lowcode/pii/model/report.py b/ads/opctl/operator/lowcode/pii/model/report.py
@@ -42,7 +42,7 @@
     import report_creator as rc
 except ImportError:
     raise ModuleNotFoundError(
-        f"`datapane` module was not found. Please run "
+        f"`report-creator` module was not found. Please run "
         f"`pip install {OptionalDependency.PII}`."
     )
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -138,7 +138,6 @@ forecast = [
   "py-cpuinfo",
   "rich",
   "autots[additional]",
-  "datapane",
   "holidays==0.21.13",
   "neuralprophet",
   "numpy",
@@ -162,7 +161,6 @@ anomaly  = [
   "oracle-automlx[forecasting]==23.4.1",
   "oracle-automlx[classic]==23.4.1",
   "oracledb",
-  "datapane",
   "report-creator",
 ]
 feature-store-marketplace = [
@@ -171,7 +169,6 @@ feature-store-marketplace = [
 ]
 pii = [
   "aiohttp",
-  "datapane",
   "gender_guesser",
   "nameparser",
   "oracle_ads[opctl]",
diff --git a/tests/unitary/with_extras/operator/forecast/test_model_automlx.py b/tests/unitary/with_extras/operator/forecast/test_model_automlx.py
@@ -7,7 +7,6 @@
 import unittest
 from unittest.mock import patch, Mock
 import pandas as pd
-import datapane as dp
 from ads.opctl.operator.lowcode.forecast.model.automlx import AutoMLXOperatorModel
 from ads.opctl.operator.lowcode.forecast.model.forecast_datasets import ForecastDatasets
 
diff --git a/tests/unitary/with_extras/operator/forecast/test_model_autots.py b/tests/unitary/with_extras/operator/forecast/test_model_autots.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8; -*-
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 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 unittest
 from unittest.mock import patch, Mock
 import pandas as pd
-import datapane as dp
 import autots
 from ads.opctl.operator.common.utils import _build_image, _parse_input_args
 from ads.opctl.operator.lowcode.forecast.model.forecast_datasets import ForecastDatasets
diff --git a/tests/unitary/with_extras/operator/forecast/test_model_base_model.py b/tests/unitary/with_extras/operator/forecast/test_model_base_model.py
@@ -1,7 +1,7 @@
 # #!/usr/bin/env python
 # # -*- coding: utf-8; -*-
 
-# # Copyright (c) 2023 Oracle and/or its affiliates.
+# # Copyright (c) 2023, 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 unittest
@@ -26,7 +26,6 @@
 # import unittest
 # from unittest.mock import patch, Mock
 # import pandas as pd
-# import datapane as dp
 # from ads.opctl.operator.common.utils import _build_image, _parse_input_args
 # from ads.opctl.operator.lowcode.forecast.model.prophet import ProphetOperatorModel
 # from ads.opctl.operator.lowcode.forecast.model.automlx import AutoMLXOperatorModel
@@ -394,7 +393,6 @@
 #         self.assertEquals(total_metrics.index.to_list(), self.evaluation_metrics)
 #         self.assertEquals(summary_metrics.columns.to_list(), self.summary_metrics)
 
-#     @patch("datapane.save_report")
 #     @patch("ads.opctl.operator.lowcode.forecast.utils.get_forecast_plots")
 #     @patch("ads.opctl.operator.lowcode.forecast.utils.evaluate_train_metrics")
 #     @patch("ads.opctl.operator.lowcode.forecast.utils._write_data")

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`import report_creator as rc`
`43`	`43`	`except ImportError:`
`44`	`44`	`raise ModuleNotFoundError(`
`45`		- f"`datapane` module was not found. Please run "
	`45`	+ f"`report-creator` module was not found. Please run "
`46`	`46`	f"`pip install {OptionalDependency.PII}`."
`47`	`47`	`)`
`48`	`48`