oracle-ads 2.11.7__py3-none-any.whl → 2.11.8__py3-none-any.whl

ads/opctl/operator/lowcode/forecast/model/prophet.py

@@ -133,7 +133,6 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
             }
 
     def _build_model(self) -> pd.DataFrame:
-
         full_data_dict = self.datasets.get_data_by_series()
         self.models = dict()
         self.outputs = dict()
@@ -160,6 +159,7 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
     def run_tuning(self, data_i, model_kwargs_i):
         from prophet import Prophet
         from prophet.diagnostics import cross_validation, performance_metrics
+
         def objective(trial):
             params = {
                 "seasonality_mode": trial.suggest_categorical(
@@ -243,29 +243,34 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
         return model_kwargs_i
 
     def _generate_report(self):
-        import datapane as dp
+        import report_creator as rc
         from prophet.plot import add_changepoints_to_plot
+
         series_ids = self.models.keys()
         all_sections = []
         if len(series_ids) > 0:
-            sec1_text = dp.Text(
-                "## Forecast Overview \n"
-                "These plots show your forecast in the context of historical data."
-            )
             sec1 = _select_plot_list(
                 lambda s_id: self.models[s_id].plot(
                     self.outputs[s_id], include_legend=True
                 ),
                 series_ids=series_ids,
             )
+            section_1 = rc.Block(
+                rc.Heading("Forecast Overview", level=2),
+                rc.Text(
+                    "These plots show your forecast in the context of historical data."
+                ),
+                sec1,
+            )
 
-            sec2_text = dp.Text(f"## Forecast Broken Down by Trend Component")
             sec2 = _select_plot_list(
                 lambda s_id: self.models[s_id].plot_components(self.outputs[s_id]),
                 series_ids=series_ids,
             )
+            section_2 = rc.Block(
+                rc.Heading("Forecast Broken Down by Trend Component", level=2), sec2
+            )
 
-            sec3_text = dp.Text(f"## Forecast Changepoints")
             sec3_figs = {
                 s_id: self.models[s_id].plot(self.outputs[s_id]) for s_id in series_ids
             }
@@ -273,11 +278,14 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
                 add_changepoints_to_plot(
                     sec3_figs[s_id].gca(), self.models[s_id], self.outputs[s_id]
                 )
-            sec3 = _select_plot_list(lambda s_id: sec3_figs[s_id], series_ids=series_ids)
+            sec3 = _select_plot_list(
+                lambda s_id: sec3_figs[s_id], series_ids=series_ids
+            )
+            section_3 = rc.Block(rc.Heading("Forecast Changepoints", level=2), sec3)
 
-            all_sections = [sec1_text, sec1, sec2_text, sec2, sec3_text, sec3]
+            all_sections = [section_1, section_2, section_3]
 
-            sec5_text = dp.Text(f"## Prophet Model Seasonality Components")
+            sec5_text = rc.Heading("Prophet Model Seasonality Components", level=2)
             model_states = []
             for s_id in series_ids:
                 m = self.models[s_id]
@@ -291,7 +299,7 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
                 )
             all_model_states = pd.concat(model_states, axis=1)
             if not all_model_states.empty:
-                sec5 = dp.DataTable(all_model_states)
+                sec5 = rc.DataTable(all_model_states, index=True)
                 all_sections = all_sections + [sec5_text, sec5]
 
         if self.spec.generate_explanations:
@@ -299,12 +307,6 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
                 # If the key is present, call the "explain_model" method
                 self.explain_model()
 
-                # Create a markdown text block for the global explanation section
-                global_explanation_text = dp.Text(
-                    f"## Global Explanation of Models \n "
-                    "The following tables provide the feature attribution for the global explainability."
-                )
-
                 # Convert the global explanation data to a DataFrame
                 global_explanation_df = pd.DataFrame(self.global_explanation)
 
@@ -313,9 +315,12 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
                 )
 
                 # Create a markdown section for the global explainability
-                global_explanation_section = dp.Blocks(
-                    "### Global Explainability ",
-                    dp.DataTable(self.formatted_global_explanation),
+                global_explanation_section = rc.Block(
+                    rc.Heading("Global Explanation of Models", level=2),
+                    rc.Text(
+                        "The following tables provide the feature attribution for the global explainability."
+                    ),
+                    rc.DataTable(self.formatted_global_explanation, index=True),
                 )
 
                 aggregate_local_explanations = pd.DataFrame()
@@ -327,21 +332,21 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
                     )
                 self.formatted_local_explanation = aggregate_local_explanations
 
-                local_explanation_text = dp.Text(f"## Local Explanation of Models \n ")
                 blocks = [
-                    dp.DataTable(
+                    rc.DataTable(
                         local_ex_df.div(local_ex_df.abs().sum(axis=1), axis=0) * 100,
                         label=s_id,
+                        index=True,
                     )
                     for s_id, local_ex_df in self.local_explanation.items()
                 ]
-                local_explanation_section = (
-                    dp.Select(blocks=blocks) if len(blocks) > 1 else blocks[0]
+                local_explanation_section = rc.Block(
+                    rc.Heading("Local Explanation of Models", level=2),
+                    rc.Select(blocks=blocks),
                 )
 
                 # Append the global explanation text and section to the "all_sections" list
                 all_sections = all_sections + [
-                    global_explanation_text,
                     global_explanation_section,
                     local_explanation_text,
                     local_explanation_section,
@@ -351,7 +356,7 @@ class ProphetOperatorModel(ForecastOperatorBaseModel):
                 logger.warn(f"Failed to generate Explanations with error: {e}.")
                 logger.debug(f"Full Traceback: {traceback.format_exc()}")
 
-        model_description = dp.Text(
+        model_description = (
             "Prophet is a procedure for forecasting time series data based on an additive "
             "model where non-linear trends are fit with yearly, weekly, and daily seasonality, "
             "plus holiday effects. It works best with time series that have strong seasonal "

ads/opctl/operator/lowcode/forecast/schema.yaml

@@ -302,11 +302,11 @@ spec:
             missing_value_imputation:
               type: boolean
               required: false
-              default: true
+              default: false
             outlier_treatment:
               type: boolean
               required: false
-              default: true
+              default: false
 
     generate_explanations:
       type: boolean

ads/opctl/operator/lowcode/forecast/utils.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 os
@@ -258,10 +258,10 @@ def evaluate_train_metrics(output, metrics_col_name=None):
 
 
 def _select_plot_list(fn, series_ids):
-    import datapane as dp
+    import report_creator as rc
 
-    blocks = [dp.Plot(fn(s_id=s_id), label=s_id) for s_id in series_ids]
-    return dp.Select(blocks=blocks) if len(blocks) > 1 else blocks[0]
+    blocks = [rc.Widget(fn(s_id=s_id), label=s_id) for s_id in series_ids]
+    return rc.Select(blocks=blocks) if len(blocks) > 1 else blocks[0]
 
 
 def _add_unit(num, unit):

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]

ads/opctl/operator/lowcode/pii/environment.yaml

@@ -6,7 +6,7 @@ dependencies:
   - pip
   - pip:
       - aiohttp
-      - datapane
+      - report-creator
       - gender_guesser
       - nameparser
       - oracle_ads[opctl]

ads/opctl/operator/lowcode/pii/model/report.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/
 
 
@@ -39,10 +39,10 @@ from ads.opctl.operator.lowcode.pii.operator_config import PiiOperatorConfig
 from ads.opctl.operator.lowcode.pii.utils import compute_rate
 
 try:
-    import datapane as dp
+    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}`."
     )
 
@@ -119,8 +119,8 @@ def make_model_card(model_name="", readme_path=""):
         logger.warning(
             "You don't have internet connection. Therefore, we are not able to generate model card."
         )
-        return dp.Group(
-            dp.Text("-"),
+        return rc.Group(
+            rc.Text("-"),
             columns=1,
         )
 
@@ -144,15 +144,15 @@ def make_model_card(model_name="", readme_path=""):
                 )
             ]
         )
-        eval_res_tb = dp.Plot(data=fig, caption="Evaluation Results")
+        eval_res_tb = rc.Widget(data=fig, caption="Evaluation Results")
     except:
-        eval_res_tb = dp.Text("-")
+        eval_res_tb = rc.Text("-")
         logger.warning(
             "The given readme.md doesn't have correct template for Evaluation Results."
         )
 
-    return dp.Group(
-        dp.Text(text),
+    return rc.Group(
+        rc.Text(text),
         eval_res_tb,
         columns=2,
     )
@@ -172,7 +172,7 @@ def map_label_to_color(labels):
 
 
 @runtime_dependency(module="plotly", install_from=OptionalDependency.PII)
-def plot_pie(count_map) -> dp.Plot:
+def plot_pie(count_map) -> rc.Widget:
     import plotly.express as px
 
     cols = count_map.keys()
@@ -190,7 +190,7 @@ def plot_pie(count_map) -> dp.Plot:
         color_discrete_map=map_label_to_color(cols),
     )
     fig.update_traces(textposition="inside", textinfo="percent+label")
-    return dp.Plot(fig)
+    return rc.Widget(fig)
 
 
 def build_entity_df(entites, id) -> pd.DataFrame:
@@ -223,37 +223,38 @@ class RowReportFields:
         self.spec = row_spec
         self.show_sensitive_info = show_sensitive_info
 
-    def build_report(self) -> dp.Group:
-        return dp.Group(
-            dp.Select(
+    def build_report(self) -> rc.Group:
+        return rc.Group(
+            rc.Select(
                 blocks=[
                     self._make_stats_card(),
                     self._make_text_card(),
                 ],
-                type=dp.SelectType.TABS,
+                type=rc.SelectType.TABS,
             ),
             label="Row Id: " + str(self.spec.id),
         )
 
     def _make_stats_card(self):
         stats = [
-            dp.Text("## Row Summary Statistics"),
-            dp.BigNumber(
+            rc.Heading("Row Summary Statistics", level=2),
+            rc.Metric(
                 heading="Total No. Of Entites Proceed",
                 value=self.spec.total_tokens or 0,
             ),
-            dp.Text(f"### Entities Distribution"),
+            rc.Heading("Entities Distribution", level=3),
             plot_pie(self.spec.statics),
         ]
         if self.show_sensitive_info:
-            stats.append(dp.Text(f"### Resolved Entities"))
+            stats.append(rc.Heading("Resolved Entities", level=3))
             stats.append(
-                dp.DataTable(
+                rc.DataTable(
                     build_entity_df(self.spec.entities, id=self.spec.id),
                     label="Resolved Entities",
+                    index=True,
                 )
             )
-        return dp.Group(blocks=stats, label="STATS")
+        return rc.Group(stats, label="STATS")
 
     def _make_text_card(self):
         annotations = []
@@ -274,7 +275,7 @@ class RowReportFields:
             },
             return_html=True,
         )
-        return dp.Group(dp.HTML(render_html), label="TEXT")
+        return rc.Group(rc.HTML(render_html), label="TEXT")
 
 
 class PIIOperatorReport:
@@ -293,26 +294,28 @@ class PIIOperatorReport:
         self.report_uri = report_uri
 
     def make_view(self):
-        title_text = dp.Text("# Personally Identifiable Information Operator Report")
-        time_proceed = dp.BigNumber(
+        title_text = rc.Heading(
+            "Personally Identifiable Information Operator Report", level=1
+        )
+        time_proceed = rc.Metric(
             heading="Ran at",
             value=self.report_spec.run_summary.timestamp or "today",
         )
-        report_description = dp.Text(PII_REPORT_DESCRIPTION)
+        report_description = rc.Text(PII_REPORT_DESCRIPTION)
 
-        structure = dp.Blocks(
-            dp.Select(
+        structure = rc.Block(
+            rc.Select(
                 blocks=[
-                    dp.Group(
+                    rc.Group(
                         self._build_summary_page(),
                         label="Summary",
                     ),
-                    dp.Group(
+                    rc.Group(
                         self._build_details_page(),
                         label="Details",
                     ),
                 ],
-                type=dp.SelectType.TABS,
+                type=rc.SelectType.TABS,
             )
         )
         self.report_sections = [title_text, report_description, time_proceed, structure]
@@ -322,11 +325,10 @@ class PIIOperatorReport:
         with tempfile.TemporaryDirectory() as temp_dir:
             report_local_path = os.path.join(temp_dir, "___report.html")
             disable_print()
-            dp.save_report(
-                report_sections or self.report_sections,
-                path=report_local_path,
-                open=False,
-            )
+            with rc.ReportCreator("My Report") as report:
+                report.save(
+                    rc.Block(report_sections or self.report_sections), report_local_path
+                )
             enable_print()
 
             report_uri = report_uri or self.report_uri
@@ -339,36 +341,36 @@ class PIIOperatorReport:
                     f2.write(f1.read())
 
     def _build_summary_page(self):
-        summary = dp.Blocks(
-            dp.Text("# PII Summary"),
-            dp.Text(self._get_summary_desc()),
-            dp.Select(
+        summary = rc.Block(
+            rc.Heading("PII Summary", level=1),
+            rc.Text(self._get_summary_desc()),
+            rc.Select(
                 blocks=[
                     self._make_summary_stats_card(),
                     self._make_yaml_card(),
                     self._make_model_card(),
                 ],
-                type=dp.SelectType.TABS,
+                type=rc.SelectType.TABS,
             ),
         )
 
         return summary
 
     def _build_details_page(self):
-        details = dp.Blocks(
-            dp.Text(DETAILS_REPORT_DESCRIPTION),
-            dp.Select(
+        details = rc.Block(
+            rc.Text(DETAILS_REPORT_DESCRIPTION),
+            rc.Select(
                 blocks=[
                     row.build_report() for row in self.rows_details
                 ],  # RowReportFields
-                type=dp.SelectType.DROPDOWN,
+                type=rc.SelectType.DROPDOWN,
                 label="Details",
             ),
         )
 
         return details
 
-    def _make_summary_stats_card(self) -> dp.Group:
+    def _make_summary_stats_card(self) -> rc.Group:
         """
         Shows summary statics
         1. total rows
@@ -388,21 +390,21 @@ class PIIOperatorReport:
             process_rate = "-"
 
         summary_stats = [
-            dp.Text("## Summary Statistics"),
-            dp.Group(
-                dp.BigNumber(
+            rc.Heading("Summary Statistics", level=2),
+            rc.Group(
+                rc.Metric(
                     heading="Total No. Of Rows",
                     value=self.report_spec.run_summary.total_rows or "unknown",
                 ),
-                dp.BigNumber(
+                rc.Metric(
                     heading="Total No. Of Entites Proceed",
                     value=self.report_spec.run_summary.total_tokens,
                 ),
-                dp.BigNumber(
+                rc.Metric(
                     heading="Rows per second processed",
                     value=process_rate,
                 ),
-                dp.BigNumber(
+                rc.Metric(
                     heading="Total Time Spent",
                     value=human_time_friendly(
                         self.report_spec.run_summary.elapsed_time
@@ -410,32 +412,31 @@ class PIIOperatorReport:
                 ),
                 columns=2,
             ),
-            dp.Text(f"### Entities Distribution"),
+            rc.Heading("Entities Distribution", level=3),
             plot_pie(self.report_spec.run_summary.statics),
         ]
         if self.report_spec.run_summary.show_sensitive_info:
             entites_df = self._build_total_entity_df()
-            summary_stats.append(dp.Text(f"### Resolved Entities"))
-            summary_stats.append(dp.DataTable(entites_df))
-        return dp.Group(blocks=summary_stats, label="STATS")
+            summary_stats.append(rc.Heading("Resolved Entities", level=3))
+            summary_stats.append(rc.DataTable(entites_df, index=True))
+        return rc.Group(summary_stats, label="STATS")
 
-    def _make_yaml_card(self) -> dp.Group:
+    def _make_yaml_card(self) -> rc.Group:
         """Shows the full pii config yaml."""
-        yaml_string = self.report_spec.run_summary.config.to_yaml()
-        yaml_appendix_title = dp.Text(f"## Reference: YAML File")
-        yaml_appendix = dp.Code(code=yaml_string, language="yaml")
-        return dp.Group(blocks=[yaml_appendix_title, yaml_appendix], label="YAML")
+        yaml_appendix_title = rc.Heading("Reference: YAML File", level=2)
+        yaml_appendix = rc.Yaml(self.report_spec.run_summary.config.to_dict())
+        return rc.Group(yaml_appendix_title, yaml_appendix, label="YAML")
 
-    def _make_model_card(self) -> dp.Group:
+    def _make_model_card(self) -> rc.Group:
         """Generates model card."""
         if len(self.report_spec.run_summary.selected_spacy_model) == 0:
-            return dp.Group(
-                dp.Text("No model used."),
+            return rc.Group(
+                rc.Text("No model used."),
                 label="MODEL CARD",
             )
 
         model_cards = [
-            dp.Group(
+            rc.Group(
                 make_model_card(model_name=x.get("model")),
                 label=x.get("model"),
             )
@@ -443,14 +444,14 @@ class PIIOperatorReport:
         ]
 
         if len(model_cards) <= 1:
-            return dp.Group(
-                blocks=model_cards,
+            return rc.Group(
+                model_cards,
                 label="MODEL CARD",
             )
-        return dp.Group(
-            dp.Select(
-                blocks=model_cards,
-                type=dp.SelectType.TABS,
+        return rc.Group(
+            rc.Select(
+                model_cards,
+                type=rc.SelectType.TABS,
             ),
             label="MODEL CARD",
         )

{oracle_ads-2.11.7.dist-info → oracle_ads-2.11.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oracle_ads
-Version: 2.11.7
+Version: 2.11.8
 Summary: Oracle Accelerated Data Science SDK
 Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
 Author: Oracle Data Science
@@ -22,7 +22,7 @@ Requires-Dist: gitpython>=3.1.2
 Requires-Dist: jinja2>=2.11.2
 Requires-Dist: matplotlib>=3.1.3
 Requires-Dist: numpy>=1.19.2
-Requires-Dist: oci>=2.113.0
+Requires-Dist: oci>=2.125.3
 Requires-Dist: ocifs>=1.1.3
 Requires-Dist: pandas>1.2.1; python_version<'3.9'
 Requires-Dist: pandas>=2.2.0; python_version>='3.9'
@@ -37,7 +37,7 @@ Requires-Dist: autots ; extra == "anomaly"
 Requires-Dist: oracle-automlx[forecasting]==23.4.1 ; extra == "anomaly"
 Requires-Dist: oracle-automlx[classic]==23.4.1 ; extra == "anomaly"
 Requires-Dist: oracledb ; extra == "anomaly"
-Requires-Dist: datapane ; extra == "anomaly"
+Requires-Dist: report-creator ; extra == "anomaly"
 Requires-Dist: jupyter_server ; extra == "aqua"
 Requires-Dist: hdfs[kerberos] ; extra == "bds"
 Requires-Dist: ibis-framework[impala] ; extra == "bds"
@@ -61,7 +61,6 @@ Requires-Dist: oci-cli ; extra == "forecast"
 Requires-Dist: py-cpuinfo ; extra == "forecast"
 Requires-Dist: rich ; extra == "forecast"
 Requires-Dist: autots[additional] ; extra == "forecast"
-Requires-Dist: datapane ; extra == "forecast"
 Requires-Dist: holidays==0.21.13 ; extra == "forecast"
 Requires-Dist: neuralprophet ; extra == "forecast"
 Requires-Dist: numpy ; extra == "forecast"
@@ -77,6 +76,7 @@ Requires-Dist: sktime ; extra == "forecast"
 Requires-Dist: statsmodels ; extra == "forecast"
 Requires-Dist: plotly ; extra == "forecast"
 Requires-Dist: oracledb ; extra == "forecast"
+Requires-Dist: report-creator ; extra == "forecast"
 Requires-Dist: geopandas ; extra == "geo"
 Requires-Dist: oracle_ads[viz] ; extra == "geo"
 Requires-Dist: transformers ; extra == "huggingface"
@@ -107,7 +107,6 @@ Requires-Dist: cachetools ; extra == "opctl"
 Requires-Dist: optuna==2.9.0 ; extra == "optuna"
 Requires-Dist: oracle_ads[viz] ; extra == "optuna"
 Requires-Dist: aiohttp ; extra == "pii"
-Requires-Dist: datapane ; extra == "pii"
 Requires-Dist: gender_guesser ; extra == "pii"
 Requires-Dist: nameparser ; extra == "pii"
 Requires-Dist: oracle_ads[opctl] ; extra == "pii"
@@ -116,6 +115,7 @@ Requires-Dist: scrubadub==2.0.1 ; extra == "pii"
 Requires-Dist: scrubadub_spacy ; extra == "pii"
 Requires-Dist: spacy-transformers==1.2.5 ; extra == "pii"
 Requires-Dist: spacy==3.6.1 ; extra == "pii"
+Requires-Dist: report-creator ; extra == "pii"
 Requires-Dist: pyspark>=3.0.0 ; extra == "spark"
 Requires-Dist: oracle_ads[viz] ; extra == "tensorflow"
 Requires-Dist: tensorflow ; extra == "tensorflow"