|
9 | 9 |
|
10 | 10 | from ggsql._ggsql import ( |
11 | 11 | DuckDBReader, |
12 | | - VegaLiteWriter, |
| 12 | + VegaLiteWriter as _RustVegaLiteWriter, |
13 | 13 | Validated, |
14 | 14 | Spec, |
15 | 15 | validate, |
|
41 | 41 | ] |
42 | 42 |
|
43 | 43 |
|
| 44 | +def _json_to_altair_chart(vegalite_json: str, **kwargs: Any) -> AltairChart: |
| 45 | + """Convert a Vega-Lite JSON string to the appropriate Altair chart type.""" |
| 46 | + spec = json.loads(vegalite_json) |
| 47 | + |
| 48 | + if "layer" in spec: |
| 49 | + return altair.LayerChart.from_json(vegalite_json, **kwargs) |
| 50 | + elif "facet" in spec or "spec" in spec: |
| 51 | + return altair.FacetChart.from_json(vegalite_json, **kwargs) |
| 52 | + elif "concat" in spec: |
| 53 | + return altair.ConcatChart.from_json(vegalite_json, **kwargs) |
| 54 | + elif "hconcat" in spec: |
| 55 | + return altair.HConcatChart.from_json(vegalite_json, **kwargs) |
| 56 | + elif "vconcat" in spec: |
| 57 | + return altair.VConcatChart.from_json(vegalite_json, **kwargs) |
| 58 | + elif "repeat" in spec: |
| 59 | + return altair.RepeatChart.from_json(vegalite_json, **kwargs) |
| 60 | + else: |
| 61 | + return altair.Chart.from_json(vegalite_json, **kwargs) |
| 62 | + |
| 63 | + |
| 64 | +class VegaLiteWriter: |
| 65 | + """Vega-Lite v6 JSON output writer. |
| 66 | +
|
| 67 | + Methods |
| 68 | + ------- |
| 69 | + render(spec) |
| 70 | + Render a Spec to a Vega-Lite JSON string. |
| 71 | + render_chart(spec, **kwargs) |
| 72 | + Render a Spec to an Altair chart object. |
| 73 | + """ |
| 74 | + |
| 75 | + def __init__(self) -> None: |
| 76 | + self._inner = _RustVegaLiteWriter() |
| 77 | + |
| 78 | + def render(self, spec: Spec) -> str: |
| 79 | + """Render a Spec to a Vega-Lite JSON string.""" |
| 80 | + return self._inner.render(spec) |
| 81 | + |
| 82 | + def render_chart(self, spec: Spec, **kwargs: Any) -> AltairChart: |
| 83 | + """Render a Spec to an Altair chart object. |
| 84 | +
|
| 85 | + Parameters |
| 86 | + ---------- |
| 87 | + spec |
| 88 | + The resolved visualization specification from ``reader.execute()``. |
| 89 | + **kwargs |
| 90 | + Additional keyword arguments passed to ``altair.Chart.from_json()``. |
| 91 | + Common options include ``validate=False`` to skip schema validation. |
| 92 | +
|
| 93 | + Returns |
| 94 | + ------- |
| 95 | + AltairChart |
| 96 | + An Altair chart object (Chart, LayerChart, FacetChart, etc.). |
| 97 | + """ |
| 98 | + vegalite_json = self.render(spec) |
| 99 | + return _json_to_altair_chart(vegalite_json, **kwargs) |
| 100 | + |
| 101 | + |
44 | 102 | def render_altair( |
45 | 103 | df: IntoFrame, |
46 | 104 | viz: str, |
@@ -86,21 +144,4 @@ def render_altair( |
86 | 144 | writer = VegaLiteWriter() |
87 | 145 | vegalite_json = writer.render(spec) |
88 | 146 |
|
89 | | - # Parse to determine the correct Altair class |
90 | | - spec = json.loads(vegalite_json) |
91 | | - |
92 | | - # Determine the correct Altair class based on spec structure |
93 | | - if "layer" in spec: |
94 | | - return altair.LayerChart.from_json(vegalite_json, **kwargs) |
95 | | - elif "facet" in spec or "spec" in spec: |
96 | | - return altair.FacetChart.from_json(vegalite_json, **kwargs) |
97 | | - elif "concat" in spec: |
98 | | - return altair.ConcatChart.from_json(vegalite_json, **kwargs) |
99 | | - elif "hconcat" in spec: |
100 | | - return altair.HConcatChart.from_json(vegalite_json, **kwargs) |
101 | | - elif "vconcat" in spec: |
102 | | - return altair.VConcatChart.from_json(vegalite_json, **kwargs) |
103 | | - elif "repeat" in spec: |
104 | | - return altair.RepeatChart.from_json(vegalite_json, **kwargs) |
105 | | - else: |
106 | | - return altair.Chart.from_json(vegalite_json, **kwargs) |
| 147 | + return _json_to_altair_chart(vegalite_json, **kwargs) |
0 commit comments