WIP: update to Vega-Lite 5.2

altair/expr/core.py

@@ -31,114 +31,151 @@ def _js_repr(val):
         return "false"
     elif val is None:
         return "null"
+    elif isinstance(val, OperatorMixin):
+        return val._to_expr()
     else:
         return repr(val)
 
 
-class Expression(SchemaBase):
-    """Expression
-
-    Base object for enabling build-up of Javascript expressions using
-    a Python syntax. Calling ``repr(obj)`` will return a Javascript
-    representation of the object and the operations it encodes.
-    """
-
-    _schema = {"type": "string"}
-
-    def to_dict(self, *args, **kwargs):
+# Designed to work with Expression and VariableParameter
+class OperatorMixin(object):
+    def _to_expr(self):
         return repr(self)
 
-    def __setattr__(self, attr, val):
-        # We don't need the setattr magic defined in SchemaBase
-        return object.__setattr__(self, attr, val)
+    def _from_expr(self, expr):
+        return expr
 
     def __add__(self, other):
-        return BinaryExpression("+", self, other)
+        comp_value = BinaryExpression("+", self, other)
+        return self._from_expr(comp_value)
 
     def __radd__(self, other):
-        return BinaryExpression("+", other, self)
+        comp_value = BinaryExpression("+", other, self)
+        return self._from_expr(comp_value)
 
     def __sub__(self, other):
-        return BinaryExpression("-", self, other)
+        comp_value = BinaryExpression("-", self, other)
+        return self._from_expr(comp_value)
 
     def __rsub__(self, other):
-        return BinaryExpression("-", other, self)
+        comp_value = BinaryExpression("-", other, self)
+        return self._from_expr(comp_value)
 
     def __mul__(self, other):
-        return BinaryExpression("*", self, other)
+        comp_value = BinaryExpression("*", self, other)
+        return self._from_expr(comp_value)
 
     def __rmul__(self, other):
-        return BinaryExpression("*", other, self)
+        comp_value = BinaryExpression("*", other, self)
+        return self._from_expr(comp_value)
 
     def __truediv__(self, other):
-        return BinaryExpression("/", self, other)
+        comp_value = BinaryExpression("/", self, other)
+        return self._from_expr(comp_value)
 
     def __rtruediv__(self, other):
-        return BinaryExpression("/", other, self)
+        comp_value = BinaryExpression("/", other, self)
+        return self._from_expr(comp_value)
 
     __div__ = __truediv__
 
     __rdiv__ = __rtruediv__
 
     def __mod__(self, other):
-        return BinaryExpression("%", self, other)
+        comp_value = BinaryExpression("%", self, other)
+        return self._from_expr(comp_value)
 
     def __rmod__(self, other):
-        return BinaryExpression("%", other, self)
+        comp_value = BinaryExpression("%", other, self)
+        return self._from_expr(comp_value)
 
     def __pow__(self, other):
         # "**" Javascript operator is not supported in all browsers
-        return FunctionExpression("pow", (self, other))
+        comp_value = FunctionExpression("pow", (self, other))
+        return self._from_expr(comp_value)
 
     def __rpow__(self, other):
         # "**" Javascript operator is not supported in all browsers
-        return FunctionExpression("pow", (other, self))
+        comp_value = FunctionExpression("pow", (other, self))
+        return self._from_expr(comp_value)
 
     def __neg__(self):
-        return UnaryExpression("-", self)
+        comp_value = UnaryExpression("-", self)
+        return self._from_expr(comp_value)
 
     def __pos__(self):
-        return UnaryExpression("+", self)
+        comp_value = UnaryExpression("+", self)
+        return self._from_expr(comp_value)
 
     # comparison operators
 
     def __eq__(self, other):
-        return BinaryExpression("===", self, other)
+        comp_value = BinaryExpression("===", self, other)
+        return self._from_expr(comp_value)
 
     def __ne__(self, other):
-        return BinaryExpression("!==", self, other)
+        comp_value = BinaryExpression("!==", self, other)
+        return self._from_expr(comp_value)
 
     def __gt__(self, other):
-        return BinaryExpression(">", self, other)
+        comp_value = BinaryExpression(">", self, other)
+        return self._from_expr(comp_value)
 
     def __lt__(self, other):
-        return BinaryExpression("<", self, other)
+        comp_value = BinaryExpression("<", self, other)
+        return self._from_expr(comp_value)
 
     def __ge__(self, other):
-        return BinaryExpression(">=", self, other)
+        comp_value = BinaryExpression(">=", self, other)
+        return self._from_expr(comp_value)
 
     def __le__(self, other):
-        return BinaryExpression("<=", self, other)
+        comp_value = BinaryExpression("<=", self, other)
+        return self._from_expr(comp_value)
 
     def __abs__(self):
-        return FunctionExpression("abs", (self,))
+        comp_value = FunctionExpression("abs", (self,))
+        return self._from_expr(comp_value)
 
     # logical operators
 
     def __and__(self, other):
-        return BinaryExpression("&&", self, other)
+        comp_value = BinaryExpression("&&", self, other)
+        return self._from_expr(comp_value)
 
     def __rand__(self, other):
-        return BinaryExpression("&&", other, self)
+        comp_value = BinaryExpression("&&", other, self)
+        return self._from_expr(comp_value)
 
     def __or__(self, other):
-        return BinaryExpression("||", self, other)
+        comp_value = BinaryExpression("||", self, other)
+        return self._from_expr(comp_value)
 
     def __ror__(self, other):
-        return BinaryExpression("||", other, self)
+        comp_value = BinaryExpression("||", other, self)
+        return self._from_expr(comp_value)
 
     def __invert__(self):
-        return UnaryExpression("!", self)
+        comp_value = UnaryExpression("!", self)
+        return self._from_expr(comp_value)
+
+
+class Expression(OperatorMixin, SchemaBase):
+    """Expression
+
+    Base object for enabling build-up of Javascript expressions using
+    a Python syntax. Calling ``repr(obj)`` will return a Javascript
+    representation of the object and the operations it encodes.
+    """
+
+    _schema = {"type": "string"}
+
+    def to_dict(self, *args, **kwargs):
+        return repr(self)
+
+    def __setattr__(self, attr, val):
+        # We don't need the setattr magic defined in SchemaBase
+        return object.__setattr__(self, attr, val)
 
     # item access
     def __getitem__(self, val):

altair/vegalite/__init__.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-from .v4 import *
+from .v5 import *

altair/vegalite/v5/__init__.py

@@ -0,0 +1,23 @@
+# flake8: noqa
+from .schema import *
+from .api import *
+
+from ...datasets import list_datasets, load_dataset
+
+from ... import expr
+from ...expr import datum
+
+from .display import VegaLite, renderers
+
+from .data import (
+    MaxRowsError,
+    pipe,
+    curry,
+    limit_rows,
+    sample,
+    to_json,
+    to_csv,
+    to_values,
+    default_data_transformer,
+    data_transformers,
+)