vgplot 0.32.0b0__tar.gz → 0.33.0__tar.gz

{vgplot-0.32.0b0 → vgplot-0.33.0}/.gitignore

@@ -3,6 +3,7 @@
 .duckdb
 .ipynb_checkpoints
 .idea
+*.pem
 dev/specs
 docs/.vitepress/cache
 docs/.vitepress/dist

{vgplot-0.32.0b0 → vgplot-0.33.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: vgplot
-Version: 0.32.0-beta.0
+Version: 0.33.0
 Summary: A Python API for authoring Mosaic vgplot visualizations
 Project-URL: homepage, https://github.com/uwdata/mosaic
 Requires-Python: >=3.10

{vgplot-0.32.0b0 → vgplot-0.33.0}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vgplot-python",
-  "version": "0.32.0-beta.0",
+  "version": "0.33.0",
   "private": true,
   "scripts": {
     "prerelease": "uv run ruff check && uv run ruff format --check",

{vgplot-0.32.0b0 → vgplot-0.33.0}/tests/test_python_api.py

@@ -105,6 +105,52 @@ class TestDataFrames:
         assert d["data"]["weather"] is weather
         assert d["data"]["athletes"] == {"type": "csv", "file": "athletes.csv"}
 
+    def test_frame_typing(self) -> None:
+        pytest.importorskip("polars")
+        pytest.importorskip("pandas")
+        pytest.importorskip("duckdb")
+        pytest.importorskip("pyarrow")
+        import duckdb
+        import pandas as pd
+        import polars as pl
+        import pyarrow as pa
+
+        data = {"a": [1]}
+
+        df_polars = pl.DataFrame(data)
+        df_pandas = pd.DataFrame(data)
+        df_duckdb = duckdb.from_arrow(df_polars)
+        df_pyarrow = pa.table(data)
+
+        mark_polars = vg.bar_x(df_polars)
+        vg.line(df_polars)
+        vg.circle(df_polars)
+        vg.mark("rectX", df_polars)
+
+        mark_pandas = vg.bar_x(df_pandas)
+        vg.line(df_pandas)
+        vg.circle(df_pandas)
+        vg.mark("rectX", df_pandas)
+
+        mark_duckdb = vg.bar_x(df_duckdb)
+        vg.line(df_duckdb)
+        vg.circle(df_duckdb)
+        vg.mark("rectX", df_duckdb)
+
+        mark_pyarrow = vg.bar_x(df_pyarrow)
+        vg.line(df_pyarrow)
+        vg.circle(df_pyarrow)
+        vg.mark("rectX", df_pyarrow)
+
+        if TYPE_CHECKING:
+            from typing_extensions import assert_type
+            from vgplot._types import MarkData
+
+            assert_type(mark_polars.data, MarkData)
+            assert_type(mark_pandas.data, MarkData)
+            assert_type(mark_duckdb.data, MarkData)
+            assert_type(mark_pyarrow.data, MarkData)
+
 
 if TYPE_CHECKING:
 

{vgplot-0.32.0b0 → vgplot-0.33.0}/vgplot/_types.py

@@ -4,6 +4,8 @@ from collections.abc import Sequence
 from datetime import date
 from typing import Any, TypeAlias
 
+from narwhals.typing import IntoFrame
+
 from vgplot._compat import sentinel
 
 from .data import DataDef
@@ -19,7 +21,16 @@ ChannelValue = (
 AttrValue = (
     str | float | bool | date | dict[str, Any] | Sequence[Any] | _ParamBase | None
 )
-MarkData = str | FromRef | DataDef | dict[str, Any] | Sequence[Any] | _ParamBase | None
+MarkData: TypeAlias = (
+    str
+    | FromRef
+    | DataDef
+    | IntoFrame
+    | dict[str, Any]
+    | Sequence[Any]
+    | _ParamBase
+    | None
+)
 TransformArg = str | float | bool | dict[str, Any] | _ParamBase
 
 UNSET = sentinel("UNSET")

{vgplot-0.32.0b0 → vgplot-0.33.0}/vgplot/plot.py

@@ -9,6 +9,7 @@ from .params import _ParamBase
 from .util import camelize, omit_none
 
 if TYPE_CHECKING:
+    from vgplot._types import MarkData
     from vgplot.spec import View
 
 
@@ -37,7 +38,7 @@ class Directive:
 @dataclass
 class Mark:
     mark: str
-    data: Any | None = None
+    data: MarkData = None
     enc: dict[str, Any] | None = None
 
     def to_dict(self, param_names: dict[int, str] | None = None) -> dict[str, Any]:
@@ -123,7 +124,7 @@ def directive(key: str, value: Any) -> Directive:
     return Directive(key, value)
 
 
-def mark(name: str, data: Any = None, **enc: Any) -> Mark:
+def mark(name: str, data: MarkData = None, **enc: Any) -> Mark:
     return Mark(name, data=data, enc=enc)