fix: fix type coercion for dataframe, catch some errors nicely

DataShades · May 16, 2024 · 38f01db · 38f01db
1 parent 3e2e6b1
commit 38f01db
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/ckanext/charts/chart_builders/plotly.py b/ckanext/charts/chart_builders/plotly.py
@@ -90,7 +90,7 @@ def to_json(self) -> Any:
         try:
             return px.scatter(self.df, **self.settings).to_json()
         except Exception as e:
-            raise exception.ChartBuildError from e
+            raise exception.ChartBuildError(f"Error building the chart: {e}")
 
     def to_html(self) -> str:
         return px.scatter(self.df, **self.settings).to_html()

diff --git a/ckanext/charts/fetchers.py b/ckanext/charts/fetchers.py
@@ -73,7 +73,7 @@ def fetch_data(self) -> pd.DataFrame:
             ).drop(columns=["_id", "_full_text"])
 
             # TODO: hack... Convert all columns to numeric if possible
-            df = cast(pd.DataFrame, df.apply(pd.to_numeric, errors='coerce').fillna(df))
+            df = cast(pd.DataFrame, df.apply(pd.to_numeric, errors="coerce").fillna(0))
 
         except ProgrammingError as e:
             raise exception.DataFetchError(

diff --git a/ckanext/charts/plugin.py b/ckanext/charts/plugin.py
@@ -52,7 +52,7 @@ def info(self) -> dict[str, Any]:
             "iframed": False,
             "filterable": False,
             "preview_enabled": False,
-            "requires_datastore": True
+            "requires_datastore": True,
         }
 
     def can_view(self, data_dict: dict[str, Any]) -> bool:
@@ -106,13 +106,15 @@ def setup_template_variables(
             data.update({"form_builder": form_builder})
         # view show
         else:
-            data.update(
-                {
-                    "chart": utils.build_chart_for_resource(
-                        settings, data_dict["resource"]["id"]
-                    ),
-                },
-            )
+            try:
+                chart = utils.build_chart_for_resource(
+                    settings, data_dict["resource"]["id"]
+                )
+            except exception.ChartBuildError as e:
+                data["error_msg"] = e
+                return data
+
+            data["chart"] = chart
 
         data.update({"settings": settings})
 

diff --git a/ckanext/charts/views.py b/ckanext/charts/views.py
@@ -35,10 +35,10 @@ def update_chart(resource_id: str):
         )
     except exception.ChartTypeNotImplementedError:
         return tk.render("charts/snippets/error_chart.html")
-    except exception.ChartBuildError:
+    except exception.ChartBuildError as e:
         return tk.render(
             "charts/snippets/error_chart.html",
-            {"error_msg": tk._("Error building chart")},
+            {"error_msg": tk._(f"Error building chart: {e}")},
         )