deckgl-marimo 0.2.0__tar.gz → 0.3.0__tar.gz

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/.gitignore

@@ -20,6 +20,7 @@ js/node_modules/
 .venv/
 venv/
 
+__marimo__/
 
 # IDE
 .idea/

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deckgl-marimo
-Version: 0.2.0
+Version: 0.3.0
 Summary: deck.gl visualization library for marimo notebooks — interactive maps with 33 layer types
 Project-URL: Homepage, https://github.com/kihaji/deckgl-marimo
 Project-URL: Documentation, https://kihaji.github.io/deckgl-marimo
@@ -22,8 +22,9 @@ Classifier: Topic :: Scientific/Engineering :: GIS
 Classifier: Topic :: Scientific/Engineering :: Visualization
 Requires-Python: >=3.10
 Requires-Dist: anywidget>=0.9.0
-Requires-Dist: marimo>=0.21.1
+Requires-Dist: marimo>=0.22
 Requires-Dist: narwhals>=1.0.0
+Requires-Dist: pandas>=2.3.3
 Requires-Dist: traitlets>=5.0.0
 Provides-Extra: dev
 Requires-Dist: duckdb; extra == 'dev'
@@ -50,11 +51,12 @@ Interactive [deck.gl](https://deck.gl) visualization library for [marimo](https:
 
 ## Features
 
-- **33 deck.gl layer types** — scatter plots, hexagonal bins, heatmaps, arcs, paths, polygons, GeoJSON, 3D columns, and more
+- **10 deck.gl layer types** — scatter plots, hexagonal bins, heatmaps, arcs, paths, polygons, GeoJSON, 3D columns, and more
 - **Multi-layer maps** — compose multiple layers on a single map
 - **Standalone layers** — display any layer directly without explicit map setup
 - **Marimo-native reactivity** — bind layer properties to sliders, dropdowns, and other widgets
 - **Multiple data sources** — pandas, polars, geopandas, DuckDB, GeoJSON dicts, and URLs
+- **Authenticated data loading** — pass HTTP headers, API keys, or credentials for remote data sources
 - **Fully offline** — all JavaScript bundled in the package, no CDN dependencies
 - **Viewport readback** — read the current map center, zoom, pitch, and bearing from Python
 - **Click & hover events** — inspect picked objects reactively in downstream cells
@@ -160,6 +162,42 @@ rel = duckdb.sql("SELECT lon, lat, value FROM 'data.parquet' WHERE value > 100")
 layer = dgl.ScatterplotLayer(data=rel, get_position=["lon", "lat"])
 ```
 
+### Authenticated remote data
+
+Any layer that loads data from a URL supports custom HTTP headers via
+`fetch_headers`, or full control over the fetch request via `load_options`.
+
+```python
+# Bearer token
+layer = dgl.GeoJsonLayer(
+    data="https://secure-api.example.com/data.geojson",
+    fetch_headers={"Authorization": "Bearer my-token"},
+    get_fill_color=[0, 180, 230, 160],
+)
+
+# API key
+layer = dgl.GeoJsonLayer(
+    data="https://api.example.com/features",
+    fetch_headers={"X-API-Key": "abc123"},
+)
+
+# Full fetch control (mTLS / CORS / custom options)
+layer = dgl.GeoJsonLayer(
+    data="https://internal.example.com/data.geojson",
+    load_options={
+        "fetch": {
+            "credentials": "include",
+            "mode": "cors",
+            "headers": {"Authorization": "Bearer token"},
+        }
+    },
+)
+```
+
+Both parameters are available on all layer types via `BaseLayer`. When
+`fetch_headers` and `load_options` both specify headers, the `load_options`
+headers take precedence.
+
 ## Available layers
 
 ### Fully tested (10)
@@ -200,18 +238,8 @@ dgl.Map(basemap="https://my-tileserver.example.com/style.json")
 
 ### `Content-Length` errors in the marimo console
 
-You may see `h11._util.LocalProtocolError: Too little data for declared Content-Length`
-in the server console when a notebook loads. This is a known issue with uvicorn's
-default `h11` HTTP parser serving the large JS bundle. The map still works correctly.
+This is fixed in Marimo >= 0.22.0 please update to that.
 
-To suppress it, install `httptools` so uvicorn uses a faster HTTP parser, then
-**fully restart marimo** (kill and relaunch):
-
-```bash
-uv add httptools
-# then restart marimo
-uv run marimo edit your_notebook.py
-```
 
 ## License
 

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/README.md

@@ -10,11 +10,12 @@ Interactive [deck.gl](https://deck.gl) visualization library for [marimo](https:
 
 ## Features
 
-- **33 deck.gl layer types** — scatter plots, hexagonal bins, heatmaps, arcs, paths, polygons, GeoJSON, 3D columns, and more
+- **10 deck.gl layer types** — scatter plots, hexagonal bins, heatmaps, arcs, paths, polygons, GeoJSON, 3D columns, and more
 - **Multi-layer maps** — compose multiple layers on a single map
 - **Standalone layers** — display any layer directly without explicit map setup
 - **Marimo-native reactivity** — bind layer properties to sliders, dropdowns, and other widgets
 - **Multiple data sources** — pandas, polars, geopandas, DuckDB, GeoJSON dicts, and URLs
+- **Authenticated data loading** — pass HTTP headers, API keys, or credentials for remote data sources
 - **Fully offline** — all JavaScript bundled in the package, no CDN dependencies
 - **Viewport readback** — read the current map center, zoom, pitch, and bearing from Python
 - **Click & hover events** — inspect picked objects reactively in downstream cells
@@ -120,6 +121,42 @@ rel = duckdb.sql("SELECT lon, lat, value FROM 'data.parquet' WHERE value > 100")
 layer = dgl.ScatterplotLayer(data=rel, get_position=["lon", "lat"])
 ```
 
+### Authenticated remote data
+
+Any layer that loads data from a URL supports custom HTTP headers via
+`fetch_headers`, or full control over the fetch request via `load_options`.
+
+```python
+# Bearer token
+layer = dgl.GeoJsonLayer(
+    data="https://secure-api.example.com/data.geojson",
+    fetch_headers={"Authorization": "Bearer my-token"},
+    get_fill_color=[0, 180, 230, 160],
+)
+
+# API key
+layer = dgl.GeoJsonLayer(
+    data="https://api.example.com/features",
+    fetch_headers={"X-API-Key": "abc123"},
+)
+
+# Full fetch control (mTLS / CORS / custom options)
+layer = dgl.GeoJsonLayer(
+    data="https://internal.example.com/data.geojson",
+    load_options={
+        "fetch": {
+            "credentials": "include",
+            "mode": "cors",
+            "headers": {"Authorization": "Bearer token"},
+        }
+    },
+)
+```
+
+Both parameters are available on all layer types via `BaseLayer`. When
+`fetch_headers` and `load_options` both specify headers, the `load_options`
+headers take precedence.
+
 ## Available layers
 
 ### Fully tested (10)
@@ -160,18 +197,8 @@ dgl.Map(basemap="https://my-tileserver.example.com/style.json")
 
 ### `Content-Length` errors in the marimo console
 
-You may see `h11._util.LocalProtocolError: Too little data for declared Content-Length`
-in the server console when a notebook loads. This is a known issue with uvicorn's
-default `h11` HTTP parser serving the large JS bundle. The map still works correctly.
+This is fixed in Marimo >= 0.22.0 please update to that.
 
-To suppress it, install `httptools` so uvicorn uses a faster HTTP parser, then
-**fully restart marimo** (kill and relaunch):
-
-```bash
-uv add httptools
-# then restart marimo
-uv run marimo edit your_notebook.py
-```
 
 ## License
 

deckgl_marimo-0.3.0/examples/displacement.py

@@ -0,0 +1,101 @@
+# /// script
+# requires-python = ">=3.10"
+# dependencies = [
+#     "marimo",
+#     "pandas",
+#     "deckgl-marimo",
+# ]
+#
+# [tool.uv.sources]
+# deckgl-marimo = { path = ".." }
+# ///
+
+import marimo
+
+__generated_with = "0.19.11"
+app = marimo.App(width="full")
+
+
+@app.cell
+def _():
+    import marimo as mo
+
+    return (mo,)
+
+
+@app.cell
+def _():
+    import pandas as pd
+
+    return (pd,)
+
+
+@app.cell
+def _():
+    import deckgl_marimo as dgl
+
+    return (dgl,)
+
+
+@app.cell
+def _(mo, pd):
+    # Simulated vessel displacement data: recorded position vs reported (AIS) position
+    vessels = pd.DataFrame(
+        [
+            {"name": "Vessel A", "rec_lon": -90.10, "rec_lat": 29.95, "rep_lon": -90.07, "rep_lat": 29.97},
+            {"name": "Vessel B", "rec_lon": -89.95, "rec_lat": 30.00, "rep_lon": -89.90, "rep_lat": 29.96},
+            {"name": "Vessel C", "rec_lon": -90.20, "rec_lat": 29.90, "rep_lon": -90.25, "rep_lat": 29.88},
+            {"name": "Vessel D", "rec_lon": -89.80, "rec_lat": 30.05, "rep_lon": -89.82, "rep_lat": 30.10},
+            {"name": "Vessel E", "rec_lon": -90.05, "rec_lat": 29.85, "rep_lon": -90.00, "rep_lat": 29.80},
+            {"name": "Vessel F", "rec_lon": -90.30, "rec_lat": 30.10, "rep_lon": -90.35, "rep_lat": 30.15},
+            {"name": "Vessel G", "rec_lon": -89.70, "rec_lat": 29.92, "rep_lon": -89.65, "rep_lat": 29.95},
+            {"name": "Vessel H", "rec_lon": -90.15, "rec_lat": 30.02, "rep_lon": -90.12, "rep_lat": 30.06},
+        ]
+    )
+    mo.md(
+        f"**DisplacementLayer** — **{len(vessels)}** vessels showing recorded vs reported positions"
+    )
+    return (vessels,)
+
+
+@app.cell
+def _(mo):
+    show_arcs = mo.ui.switch(value=True, label="Show Arcs")
+    show_origin = mo.ui.switch(value=True, label="Show Recorded (green)")
+    show_displaced = mo.ui.switch(value=True, label="Show Reported (red)")
+    mo.hstack([show_arcs, show_origin, show_displaced], justify="start", gap=2)
+    return show_arcs, show_displaced, show_origin
+
+
+@app.cell
+def _(dgl, mo):
+    map_widget = dgl.Map(basemap="dark-matter", center=(-90.0, 29.95), zoom=10)
+    widget = mo.ui.anywidget(map_widget)
+    return map_widget, widget
+
+
+@app.cell
+def _(widget):
+    widget
+    return
+
+
+@app.cell
+def _(dgl, map_widget, show_arcs, show_displaced, show_origin, vessels):
+    map_widget.layer_specs = [
+        spec
+        for spec in dgl.DisplacementLayer(
+            data=vessels.to_dict("records"),
+            origin=["rec_lon", "rec_lat"],
+            displaced=["rep_lon", "rep_lat"],
+            show_arcs=show_arcs.value,
+            show_origin_dots=show_origin.value,
+            show_displaced_dots=show_displaced.value,
+            arc_width=2,
+        ).to_specs()
+    ]
+    return
+
+
+if __name__ == "__main__":
+    app.run()

deckgl_marimo-0.3.0/examples/ellipse.py

@@ -0,0 +1,103 @@
+# /// script
+# requires-python = ">=3.10"
+# dependencies = [
+#     "marimo",
+#     "pandas",
+#     "deckgl-marimo",
+# ]
+#
+# [tool.uv.sources]
+# deckgl-marimo = { path = ".." }
+# ///
+
+import marimo
+
+__generated_with = "0.19.11"
+app = marimo.App(width="full")
+
+
+@app.cell
+def _():
+    import marimo as mo
+
+    return (mo,)
+
+
+@app.cell
+def _():
+    import pandas as pd
+
+    return (pd,)
+
+
+@app.cell
+def _():
+    import deckgl_marimo as dgl
+
+    return (dgl,)
+
+
+@app.cell
+def _(mo, pd):
+    # Sample data: storm cells with elliptical uncertainty regions
+    storms = pd.DataFrame(
+        [
+            {"name": "Cell A", "lon": -90.10, "lat": 29.95, "major": 5000, "minor": 3000, "bearing": 45},
+            {"name": "Cell B", "lon": -89.80, "lat": 30.05, "major": 8000, "minor": 4000, "bearing": 120},
+            {"name": "Cell C", "lon": -90.30, "lat": 30.10, "major": 6000, "minor": 6000, "bearing": 0},
+            {"name": "Cell D", "lon": -89.95, "lat": 29.85, "major": 10000, "minor": 3000, "bearing": 90},
+            {"name": "Cell E", "lon": -90.20, "lat": 29.90, "major": 4000, "minor": 2000, "bearing": 160},
+        ]
+    )
+    mo.md(
+        f"**EllipseLayer** — **{len(storms)}** storm cells with elliptical uncertainty regions (diameters in meters, 0=north clockwise)"
+    )
+    return (storms,)
+
+
+@app.cell
+def _(mo):
+    show_dots = mo.ui.switch(value=True, label="Show Centers")
+    filled = mo.ui.switch(value=True, label="Filled")
+    stroked = mo.ui.switch(value=True, label="Stroked")
+    mo.hstack([show_dots, filled, stroked], justify="start", gap=2)
+    return filled, show_dots, stroked
+
+
+@app.cell
+def _(dgl, mo):
+    map_widget = dgl.Map(basemap="dark-matter", center=(-90.05, 29.97), zoom=10)
+    widget = mo.ui.anywidget(map_widget)
+    return map_widget, widget
+
+
+@app.cell
+def _(widget):
+    widget
+    return
+
+
+@app.cell
+def _(dgl, filled, map_widget, show_dots, storms, stroked):
+    map_widget.layer_specs = [
+        spec
+        for spec in dgl.EllipseLayer(
+            data=storms.to_dict("records"),
+            center=["lon", "lat"],
+            major_axis="major",
+            minor_axis="minor",
+            orientation="bearing",
+            units="meters",
+            show_center_dots=show_dots.value,
+            filled=filled.value,
+            stroked=stroked.value,
+            fill_color=[0, 140, 255, 80],
+            line_color=[0, 200, 255, 255],
+            line_width=2,
+        ).to_specs()
+    ]
+    return
+
+
+if __name__ == "__main__":
+    app.run()

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "deckgl-marimo"
-version = "0.2.0"
+version = "0.3.0"
 description = "deck.gl visualization library for marimo notebooks — interactive maps with 33 layer types"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -30,7 +30,8 @@ dependencies = [
     "anywidget>=0.9.0",
     "traitlets>=5.0.0",
     "narwhals>=1.0.0",
-    "marimo>=0.21.1",
+    "marimo>=0.22",
+    "pandas>=2.3.3",
 ]
 
 [project.urls]

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/src/deckgl_marimo/__init__.py

@@ -26,6 +26,12 @@ from deckgl_marimo.layers._aggregation import (
     HexagonLayer,
 )
 
+# Composite layers
+from deckgl_marimo.layers._composite import (
+    DisplacementLayer,
+    EllipseLayer,
+)
+
 # Backward compatibility
 from deckgl_marimo.widget import DeckGLHexagonWidget
 
@@ -46,6 +52,9 @@ __all__ = [
     # Aggregation layers
     "HeatmapLayer",
     "HexagonLayer",
+    # Composite layers
+    "DisplacementLayer",
+    "EllipseLayer",
     # Backward compat
     "DeckGLHexagonWidget",
 ]

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/src/deckgl_marimo/_base.py

@@ -32,6 +32,16 @@ class BaseLayer:
         Whether the layer responds to pointer events.
     auto_highlight
         Whether to highlight the picked object.
+    load_options
+        Options passed to deck.gl's loaders.gl data loading system.
+        Use this for full control over fetch configuration, e.g.
+        ``{"fetch": {"credentials": "include", "headers": {...}}}``.
+    fetch_headers
+        Convenience shortcut to set HTTP headers on the data fetch
+        request. Equivalent to
+        ``load_options={"fetch": {"headers": {...}}}``.
+        If both ``fetch_headers`` and ``load_options`` specify headers,
+        the ``load_options`` headers take precedence.
     basemap
         Basemap style for standalone display (default ``"dark-matter"``).
     center
@@ -64,6 +74,8 @@ class BaseLayer:
         opacity: float = 1.0,
         pickable: bool = True,
         auto_highlight: bool = False,
+        load_options: dict[str, Any] | None = None,
+        fetch_headers: dict[str, str] | None = None,
         basemap: str = "dark-matter",
         center: tuple[float, float] | None = None,
         zoom: float = 1.0,
@@ -78,6 +90,8 @@ class BaseLayer:
         self.opacity = opacity
         self.pickable = pickable
         self.auto_highlight = auto_highlight
+        self.load_options = load_options
+        self.fetch_headers = fetch_headers
         self._props = props
 
         # Map parameters for standalone display
@@ -119,8 +133,25 @@ class BaseLayer:
             camel_key = to_camel_case(key)
             spec[camel_key] = value
 
+        # Build loadOptions from explicit params + convenience params
+        effective_load_options = dict(self.load_options) if self.load_options else {}
+        if self.fetch_headers:
+            fetch_opts = effective_load_options.setdefault("fetch", {})
+            merged_headers = {**self.fetch_headers, **fetch_opts.get("headers", {})}
+            fetch_opts["headers"] = merged_headers
+        if effective_load_options:
+            spec["loadOptions"] = effective_load_options
+
         return spec
 
+    def to_specs(self) -> list[dict]:
+        """Serialize to a list of JSON-compatible specs.
+
+        Composite layers override this to return multiple specs.
+        Simple layers return a single-element list.
+        """
+        return [self.to_spec()]
+
     def _get_map(self) -> Any:
         """Get or create the backing Map widget for anywidget compatibility."""
         if self.__map is None:
@@ -139,8 +170,8 @@ class BaseLayer:
         # Avoid infinite recursion for our own attributes
         if name.startswith("_BaseLayer") or name in (
             "id", "data", "visible", "opacity", "pickable",
-            "auto_highlight", "_props", "_map_kwargs",
-            "LAYER_TYPE", "_MAP_KEYS",
+            "auto_highlight", "load_options", "fetch_headers",
+            "_props", "_map_kwargs", "LAYER_TYPE", "_MAP_KEYS",
         ):
             raise AttributeError(name)
 

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/src/deckgl_marimo/_map.py

@@ -91,7 +91,7 @@ class Map(anywidget.AnyWidget):
         **kwargs: Any,
     ) -> None:
         self._layers: list[BaseLayer] = list(layers or [])
-        specs = [layer.to_spec() for layer in self._layers]
+        specs = [spec for layer in self._layers for spec in layer.to_specs()]
         style = Basemaps.resolve(basemap)
 
         init_kwargs: dict[str, Any] = {
@@ -172,4 +172,4 @@ class Map(anywidget.AnyWidget):
 
     def _sync_layers(self) -> None:
         """Re-serialize all layers and update the traitlet."""
-        self.layer_specs = [layer.to_spec() for layer in self._layers]
+        self.layer_specs = [spec for layer in self._layers for spec in layer.to_specs()]

{deckgl_marimo-0.2.0 → deckgl_marimo-0.3.0}/src/deckgl_marimo/layers/__init__.py

@@ -38,6 +38,10 @@ from deckgl_marimo.layers._mesh import (
     ScenegraphLayer,
     SimpleMeshLayer,
 )
+from deckgl_marimo.layers._composite import (
+    DisplacementLayer,
+    EllipseLayer,
+)
 
 __all__ = [
     # Core
@@ -74,4 +78,7 @@ __all__ = [
     # Mesh
     "ScenegraphLayer",
     "SimpleMeshLayer",
+    # Composite
+    "DisplacementLayer",
+    "EllipseLayer",
 ]