fix: Restrict static & runtime top-level imports

altair/__init__.py

@@ -123,10 +123,8 @@
     "Data",
     "DataFormat",
     "DataSource",
-    "DataType",
     "Datasets",
     "DateTime",
-    "DatumChannelMixin",
     "DatumDef",
     "Day",
     "DensityTransform",
@@ -168,7 +166,6 @@
     "FeatureCollection",
     "FeatureGeometryGeoJsonProperties",
     "Field",
-    "FieldChannelMixin",
     "FieldDefWithoutScale",
     "FieldEqualPredicate",
     "FieldGTEPredicate",
@@ -475,7 +472,6 @@
     "StrokeWidthValue",
     "StyleConfigIndex",
     "SymbolShape",
-    "TOPLEVEL_ONLY_KEYS",
     "Text",
     "TextBaseline",
     "TextDatum",
@@ -537,7 +533,6 @@
     "VEGAEMBED_VERSION",
     "VEGALITE_VERSION",
     "VEGA_VERSION",
-    "ValueChannelMixin",
     "ValueDefWithConditionMarkPropFieldOrDatumDefGradientstringnull",
     "ValueDefWithConditionMarkPropFieldOrDatumDefTypeForShapestringnull",
     "ValueDefWithConditionMarkPropFieldOrDatumDefnumber",
@@ -617,7 +612,6 @@
     "limit_rows",
     "load_ipython_extension",
     "load_schema",
-    "mixins",
     "param",
     "parse_shorthand",
     "renderers",
@@ -641,7 +635,6 @@
     "vegalite",
     "vegalite_compilers",
     "when",
-    "with_property_setters",
 ]
 
 
@@ -653,7 +646,7 @@ def __dir__():
 from altair.vegalite.v5.schema.core import Dict
 from altair.jupyter import JupyterChart
 from altair.expr import expr
-from altair.utils import AltairDeprecationWarning
+from altair.utils import AltairDeprecationWarning, parse_shorthand, Optional, Undefined
 
 
 def load_ipython_extension(ipython):

altair/vegalite/__init__.py

@@ -1,2 +1,2 @@
-# ruff: noqa
+# ruff: noqa: F403
 from .v5 import *

altair/vegalite/schema.py

@@ -1,4 +1,4 @@
 """Altair schema wrappers"""
 
-# ruff: noqa
+# ruff: noqa: F403
 from .v5.schema import *

altair/vegalite/v5/__init__.py

@@ -1,10 +1,16 @@
-# ruff: noqa
+# ruff: noqa: F401, F403
 from .schema import *
 from .api import *
 
 from altair.expr.core import datum
 
-from .display import VegaLite, renderers
+from .display import (
+    VegaLite,
+    renderers,
+    VEGALITE_VERSION,
+    VEGAEMBED_VERSION,
+    VEGA_VERSION,
+)
 from .compiler import vegalite_compilers
 
 from .data import (
@@ -17,3 +23,4 @@
     default_data_transformer,
     data_transformers,
 )
+from .theme import themes

altair/vegalite/v5/api.py

@@ -22,9 +22,10 @@
 import functools
 import operator
 from copy import deepcopy as _deepcopy
-from .schema import core, channels, mixins, Undefined, SCHEMA_URL
 
-from altair.utils import Optional
+from .schema import core, channels, mixins, SCHEMA_URL
+
+from altair.utils import Optional, Undefined
 from .data import data_transformers
 from ... import utils
 from ...expr import core as _expr_core
@@ -128,6 +129,55 @@
         SingleTimeUnit_T,
     )
 
+__all__ = [
+    "Bin",
+    "ChainedWhen",
+    "Chart",
+    "ChartDataType",
+    "ChartType",
+    "ConcatChart",
+    "FacetChart",
+    "FacetMapping",
+    "HConcatChart",
+    "Impute",
+    "LayerChart",
+    "LookupData",
+    "Parameter",
+    "ParameterExpression",
+    "RepeatChart",
+    "SelectionExpression",
+    "SelectionPredicateComposition",
+    "Then",
+    "Title",
+    "TopLevelMixin",
+    "VConcatChart",
+    "When",
+    "binding",
+    "binding_checkbox",
+    "binding_radio",
+    "binding_range",
+    "binding_select",
+    "check_fields_and_encodings",
+    "concat",
+    "condition",
+    "graticule",
+    "hconcat",
+    "is_chart_type",
+    "layer",
+    "param",
+    "repeat",
+    "selection",
+    "selection_interval",
+    "selection_multi",
+    "selection_point",
+    "selection_single",
+    "sequence",
+    "sphere",
+    "topo_feature",
+    "value",
+    "vconcat",
+    "when",
+]
 
 ChartDataType: TypeAlias = Optional[Union[DataType, core.Data, str, core.Generator]]
 _TSchemaBase = TypeVar("_TSchemaBase", bound=core.SchemaBase)

altair/vegalite/v5/schema/channels.py

@@ -31,6 +31,109 @@
     from ._typing import *  # noqa: F403
 
 
+__all__ = [
+    "X2",
+    "Y2",
+    "Angle",
+    "AngleDatum",
+    "AngleValue",
+    "Color",
+    "ColorDatum",
+    "ColorValue",
+    "Column",
+    "Description",
+    "DescriptionValue",
+    "Detail",
+    "Facet",
+    "Fill",
+    "FillDatum",
+    "FillOpacity",
+    "FillOpacityDatum",
+    "FillOpacityValue",
+    "FillValue",
+    "Href",
+    "HrefValue",
+    "Key",
+    "Latitude",
+    "Latitude2",
+    "Latitude2Datum",
+    "Latitude2Value",
+    "LatitudeDatum",
+    "Longitude",
+    "Longitude2",
+    "Longitude2Datum",
+    "Longitude2Value",
+    "LongitudeDatum",
+    "Opacity",
+    "OpacityDatum",
+    "OpacityValue",
+    "Order",
+    "OrderValue",
+    "Radius",
+    "Radius2",
+    "Radius2Datum",
+    "Radius2Value",
+    "RadiusDatum",
+    "RadiusValue",
+    "Row",
+    "Shape",
+    "ShapeDatum",
+    "ShapeValue",
+    "Size",
+    "SizeDatum",
+    "SizeValue",
+    "Stroke",
+    "StrokeDash",
+    "StrokeDashDatum",
+    "StrokeDashValue",
+    "StrokeDatum",
+    "StrokeOpacity",
+    "StrokeOpacityDatum",
+    "StrokeOpacityValue",
+    "StrokeValue",
+    "StrokeWidth",
+    "StrokeWidthDatum",
+    "StrokeWidthValue",
+    "Text",
+    "TextDatum",
+    "TextValue",
+    "Theta",
+    "Theta2",
+    "Theta2Datum",
+    "Theta2Value",
+    "ThetaDatum",
+    "ThetaValue",
+    "Tooltip",
+    "TooltipValue",
+    "Url",
+    "UrlValue",
+    "X",
+    "X2Datum",
+    "X2Value",
+    "XDatum",
+    "XError",
+    "XError2",
+    "XError2Value",
+    "XErrorValue",
+    "XOffset",
+    "XOffsetDatum",
+    "XOffsetValue",
+    "XValue",
+    "Y",
+    "Y2Datum",
+    "Y2Value",
+    "YDatum",
+    "YError",
+    "YError2",
+    "YError2Value",
+    "YErrorValue",
+    "YOffset",
+    "YOffsetDatum",
+    "YOffsetValue",
+    "YValue",
+]
+
+
 class FieldChannelMixin:
     _encoding_name: str
 

tests/vegalite/v5/test_api.py

@@ -23,6 +23,7 @@
 import polars as pl
 
 import altair as alt
+from altair.utils.schemapi import Undefined
 
 try:
     import vl_convert as vlc
@@ -1351,14 +1352,14 @@ def test_subcharts_with_same_data(method, data):
     text = point.mark_text()
 
     chart1 = func(point, line, text)
-    assert chart1.data is not alt.Undefined
-    assert all(c.data is alt.Undefined for c in getattr(chart1, method))
+    assert chart1.data is not Undefined
+    assert all(c.data is Undefined for c in getattr(chart1, method))
 
     if method != "concat":
         op = OP_DICT[method]
         chart2 = op(op(point, line), text)
-        assert chart2.data is not alt.Undefined
-        assert all(c.data is alt.Undefined for c in getattr(chart2, method))
+        assert chart2.data is not Undefined
+        assert all(c.data is Undefined for c in getattr(chart2, method))
 
 
 @pytest.mark.parametrize("method", ["layer", "hconcat", "vconcat", "concat"])
@@ -1373,20 +1374,20 @@ def test_subcharts_different_data(method, data):
     nodata = alt.Chart().mark_point().encode(x="x:Q", y="y:Q")
 
     chart1 = func(point, otherdata)
-    assert chart1.data is alt.Undefined
+    assert chart1.data is Undefined
     assert getattr(chart1, method)[0].data is data
 
     chart2 = func(point, nodata)
-    assert chart2.data is alt.Undefined
+    assert chart2.data is Undefined
     assert getattr(chart2, method)[0].data is data
 
 
 def test_layer_facet(basic_chart):
     chart = (basic_chart + basic_chart).facet(row="row:Q")
-    assert chart.data is not alt.Undefined
-    assert chart.spec.data is alt.Undefined
+    assert chart.data is not Undefined
+    assert chart.spec.data is Undefined
     for layer in chart.spec.layer:
-        assert layer.data is alt.Undefined
+        assert layer.data is Undefined
 
     dct = chart.to_dict()
     assert "data" in dct

tests/vegalite/v5/test_params.py

@@ -8,6 +8,7 @@
 import re
 
 import altair.vegalite.v5 as alt
+from altair.utils.deprecation import AltairDeprecationWarning
 
 
 def test_variable_param():
@@ -82,9 +83,9 @@ def test_selection_deprecation():
         alt.selection_interval()
 
         # this v4 syntax is deprecated
-        with pytest.warns(alt.utils.deprecation.AltairDeprecationWarning):
+        with pytest.warns(AltairDeprecationWarning):
             alt.selection_single()
-        with pytest.warns(alt.utils.deprecation.AltairDeprecationWarning):
+        with pytest.warns(AltairDeprecationWarning):
             alt.selection_multi()
 
         # new syntax
@@ -95,7 +96,7 @@ def test_selection_deprecation():
         # this v4 syntax is deprecated
         brush = alt.selection_interval()
         c = alt.Chart().mark_point()
-        with pytest.warns(alt.utils.deprecation.AltairDeprecationWarning):
+        with pytest.warns(AltairDeprecationWarning):
             c.add_selection(brush)