core-lens 0.1.dev159__tar.gz → 0.1.dev161__tar.gz

{core_lens-0.1.dev159 → core_lens-0.1.dev161}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: core-lens
-Version: 0.1.dev159
+Version: 0.1.dev161
 Summary: Query, analyse, and visualise CoreStack's microwatershed and Earth science data through a clean, composable Python API.
 Project-URL: Homepage, https://github.com/ApoorvaKashyap/core-lens
 Project-URL: Issues, https://github.com/ApoorvaKashyap/core-lens/issues

{core_lens-0.1.dev159 → core_lens-0.1.dev161}/src/core_lens/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.dev159'
-__version_tuple__ = version_tuple = (0, 1, 'dev159')
+__version__ = version = '0.1.dev161'
+__version_tuple__ = version_tuple = (0, 1, 'dev161')
 
 __commit_id__ = commit_id = None

{core_lens-0.1.dev159 → core_lens-0.1.dev161}/src/core_lens/base/namespaces/plot.py

@@ -233,12 +233,16 @@ class MapWithLegend:
         v_min: float,
         v_max: float,
         column_name: str,
+        clamped_min: bool = False,
+        clamped_max: bool = False,
     ) -> None:
         self._map = map_widget
         self._cmap = cmap
         self._v_min = v_min
         self._v_max = v_max
         self._column_name = column_name
+        self._clamped_min = clamped_min
+        self._clamped_max = clamped_max
 
     def __getattr__(self, name: str) -> Any:
         return getattr(self._map, name)
@@ -273,12 +277,19 @@ class MapWithLegend:
                 val = self._v_min + frac * (self._v_max - self._v_min)
                 rgba = self._cmap(frac)
                 hex_color = mcolors.to_hex(rgba)
+
+                prefix = ""
+                if i == stops - 1 and self._clamped_min:
+                    prefix = "< "
+                elif i == 0 and self._clamped_max:
+                    prefix = "> "
+
                 html.append(
                     f'<div style="margin-top:2px;">'
                     f'<span style="background:{hex_color};width:12px;height:12px;'
                     f"display:inline-block;margin-right:8px;vertical-align:middle;"
                     f'border:1px solid #ccc;"></span>'
-                    f'<span style="vertical-align:middle;">{val:.2f}</span></div>'
+                    f'<span style="vertical-align:middle;">{prefix}{val:.2f}</span></div>'
                 )
         html.append("</div>")
         return "".join(html)
@@ -333,7 +344,11 @@ class PlotNamespace:
         self.result = result
 
     def choropleth(
-        self, column: str, subplot_on: SubplotOn | None = None
+        self,
+        column: str,
+        subplot_on: SubplotOn | None = None,
+        v_min: float | None = None,
+        v_max: float | None = None,
     ) -> "MapWithLegend":
         """Render an interactive choropleth map using Lonboard.
 
@@ -407,23 +422,33 @@ class PlotNamespace:
 
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", category=RuntimeWarning)
-            v_min, v_max = np.nanmin(values), np.nanmax(values)
+            actual_min, actual_max = np.nanmin(values), np.nanmax(values)
+
+        calc_v_min = float(v_min) if v_min is not None else float(actual_min)
+        calc_v_max = float(v_max) if v_max is not None else float(actual_max)
 
-        if np.isnan(v_min) or np.isnan(v_max) or v_min >= v_max:
+        clamped_min = v_min is not None and actual_min < v_min
+        clamped_max = v_max is not None and actual_max > v_max
+
+        if np.isnan(calc_v_min) or np.isnan(calc_v_max) or calc_v_min >= calc_v_max:
             norm_values = np.where(np.isnan(values), np.nan, 0.0)
         else:
-            norm_values = (values - v_min) / (v_max - v_min)
+            norm_values = np.clip(
+                (values - calc_v_min) / (calc_v_max - calc_v_min), 0.0, 1.0
+            )
 
         cmap = mpl.colormaps["plasma_r"]
 
         layer = lonboard.PolygonLayer(
             arrow_table,
             get_fill_color=apply_continuous_cmap(norm_values, cmap),
-            get_line_color=[211, 211, 211, 255],
-            line_width_min_pixels=0.5,
+            get_line_color=[255, 255, 255, 180],
+            line_width_min_pixels=0.25,
         )
         map_widget = lonboard.Map(layers=[layer])
-        return MapWithLegend(map_widget, cmap, v_min, v_max, column)
+        return MapWithLegend(
+            map_widget, cmap, calc_v_min, calc_v_max, column, clamped_min, clamped_max
+        )
 
     def timeseries(
         self,
@@ -536,11 +561,19 @@ class PlotNamespace:
                             color=color,
                             size=5,
                         )
-            elif key_col in pdf.columns:
-                for i, entity in enumerate(pdf[key_col].unique()):
-                    row = pdf[pdf[key_col] == entity]
+            elif key_col in df.columns:
+                entities = df.get_column(key_col).unique().to_list()
+                for i, entity in enumerate(entities):
+                    entity_df = df.filter(pl.col(key_col) == entity)
+                    source_data = {}
+                    for c in hover_cols:
+                        if c in entity_df.columns:
+                            lst = entity_df.get_column(c).to_list()
+                            if entity_df.schema[c].is_numeric():
+                                lst = [float("nan") if v is None else v for v in lst]
+                            source_data[c] = lst
+                    source = ColumnDataSource(source_data)  # type: ignore[arg-type]
                     color = _color_for(i)
-                    source = _src(row)
                     fig.line(
                         x=x,
                         y=y_col,
@@ -651,8 +684,6 @@ class PlotNamespace:
             entities = unique_entities.limit(top_n).to_list()
             df = df.join(pl.DataFrame({key_col: entities}), on=key_col, how="inner")
 
-        df_pd = df.to_pandas()
-
         def _make_scatter(y_col: str) -> "BokehFigure":
             from bokeh.models import ColumnDataSource
 
@@ -664,11 +695,21 @@ class PlotNamespace:
                 tools="pan,wheel_zoom,box_zoom,reset,save,hover",
                 tooltips=[(c, f"@{{{c}}}") for c in hover_cols],
             )
-            for i, entity in enumerate(df_pd[key_col].unique()):
-                row = df_pd[df_pd[key_col] == entity]
-                source = ColumnDataSource(
-                    {c: row[c].tolist() for c in hover_cols if c in row.columns}
-                )
+
+            entities = df.get_column(key_col).unique().to_list()
+            for i, entity in enumerate(entities):
+                row = df.filter(pl.col(key_col) == entity)
+
+                # Replace None with NaN for numeric columns to prevent Bokeh JS rendering crashes
+                source_data = {}
+                for c in hover_cols:
+                    if c in row.columns:
+                        lst = row.get_column(c).to_list()
+                        if row.schema[c].is_numeric():
+                            lst = [float("nan") if v is None else v for v in lst]
+                        source_data[c] = lst
+
+                source = ColumnDataSource(source_data)  # type: ignore[arg-type]
                 fig.scatter(
                     x=x,
                     y=y_col,