reflex 0.6.0a1__py3-none-any.whl → 0.6.0a3__py3-none-any.whl

reflex/{ivars → vars}/function.py

@@ -7,21 +7,21 @@ import sys
 from typing import Any, Callable, ClassVar, Optional, Tuple, Type, Union
 
 from reflex.utils.types import GenericType
-from reflex.vars import VarData
 
 from .base import (
     CachedVarOperation,
-    ImmutableVar,
     LiteralVar,
     ToOperation,
+    Var,
+    VarData,
     cached_property_no_lock,
 )
 
 
-class FunctionVar(ImmutableVar[Callable]):
+class FunctionVar(Var[Callable]):
     """Base class for immutable function vars."""
 
-    def __call__(self, *args: ImmutableVar | Any) -> ArgsFunctionOperation:
+    def __call__(self, *args: Var | Any) -> ArgsFunctionOperation:
         """Call the function with the given arguments.
 
         Args:
@@ -32,10 +32,10 @@ class FunctionVar(ImmutableVar[Callable]):
         """
         return ArgsFunctionOperation.create(
             ("...args",),
-            VarOperationCall.create(self, *args, ImmutableVar.create_safe("...args")),
+            VarOperationCall.create(self, *args, Var(_js_expr="...args")),
         )
 
-    def call(self, *args: ImmutableVar | Any) -> VarOperationCall:
+    def call(self, *args: Var | Any) -> VarOperationCall:
         """Call the function with the given arguments.
 
         Args:
@@ -67,7 +67,7 @@ class FunctionStringVar(FunctionVar):
             The function var.
         """
         return cls(
-            _var_name=func,
+            _js_expr=func,
             _var_type=_var_type,
             _var_data=_var_data,
         )
@@ -78,13 +78,11 @@ class FunctionStringVar(FunctionVar):
     frozen=True,
     **{"slots": True} if sys.version_info >= (3, 10) else {},
 )
-class VarOperationCall(CachedVarOperation, ImmutableVar):
+class VarOperationCall(CachedVarOperation, Var):
     """Base class for immutable vars that are the result of a function call."""
 
     _func: Optional[FunctionVar] = dataclasses.field(default=None)
-    _args: Tuple[Union[ImmutableVar, Any], ...] = dataclasses.field(
-        default_factory=tuple
-    )
+    _args: Tuple[Union[Var, Any], ...] = dataclasses.field(default_factory=tuple)
 
     @cached_property_no_lock
     def _cached_var_name(self) -> str:
@@ -112,7 +110,7 @@ class VarOperationCall(CachedVarOperation, ImmutableVar):
     def create(
         cls,
         func: FunctionVar,
-        *args: ImmutableVar | Any,
+        *args: Var | Any,
         _var_type: GenericType = Any,
         _var_data: VarData | None = None,
     ) -> VarOperationCall:
@@ -127,7 +125,7 @@ class VarOperationCall(CachedVarOperation, ImmutableVar):
             The function call var.
         """
         return cls(
-            _var_name="",
+            _js_expr="",
             _var_type=_var_type,
             _var_data=_var_data,
             _func=func,
@@ -144,7 +142,7 @@ class ArgsFunctionOperation(CachedVarOperation, FunctionVar):
     """Base class for immutable function defined via arguments and return expression."""
 
     _args_names: Tuple[str, ...] = dataclasses.field(default_factory=tuple)
-    _return_expr: Union[ImmutableVar, Any] = dataclasses.field(default=None)
+    _return_expr: Union[Var, Any] = dataclasses.field(default=None)
 
     @cached_property_no_lock
     def _cached_var_name(self) -> str:
@@ -159,7 +157,7 @@ class ArgsFunctionOperation(CachedVarOperation, FunctionVar):
     def create(
         cls,
         args_names: Tuple[str, ...],
-        return_expr: ImmutableVar | Any,
+        return_expr: Var | Any,
         _var_type: GenericType = Callable,
         _var_data: VarData | None = None,
     ) -> ArgsFunctionOperation:
@@ -174,7 +172,7 @@ class ArgsFunctionOperation(CachedVarOperation, FunctionVar):
             The function var.
         """
         return cls(
-            _var_name="",
+            _js_expr="",
             _var_type=_var_type,
             _var_data=_var_data,
             _args_names=args_names,
@@ -190,9 +188,7 @@ class ArgsFunctionOperation(CachedVarOperation, FunctionVar):
 class ToFunctionOperation(ToOperation, FunctionVar):
     """Base class of converting a var to a function."""
 
-    _original: ImmutableVar = dataclasses.field(
-        default_factory=lambda: LiteralVar.create(None)
-    )
+    _original: Var = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
 
     _default_var_type: ClassVar[GenericType] = Callable
 

reflex/{ivars → vars}/number.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import dataclasses
 import json
+import math
 import sys
 from typing import (
     TYPE_CHECKING,
@@ -17,15 +18,17 @@ from typing import (
     overload,
 )
 
-from reflex.utils.exceptions import VarTypeError
-from reflex.vars import Var, VarData
+from reflex.constants.base import Dirs
+from reflex.utils.exceptions import PrimitiveUnserializableToJSON, VarTypeError
+from reflex.utils.imports import ImportDict, ImportVar
 
 from .base import (
     CustomVarOperationReturn,
-    ImmutableVar,
     LiteralNoneVar,
     LiteralVar,
     ToOperation,
+    Var,
+    VarData,
     unionize,
     var_operation,
     var_operation_return,
@@ -54,7 +57,7 @@ def raise_unsupported_operand_types(
     )
 
 
-class NumberVar(ImmutableVar[NUMBER_T]):
+class NumberVar(Var[NUMBER_T]):
     """Base class for immutable number vars."""
 
     @overload
@@ -848,8 +851,8 @@ def boolean_to_number_operation(value: BooleanVar):
 
 
 def comparison_operator(
-    func: Callable[[ImmutableVar, ImmutableVar], str],
-) -> Callable[[ImmutableVar | Any, ImmutableVar | Any], BooleanVar]:
+    func: Callable[[Var, Var], str],
+) -> Callable[[Var | Any, Var | Any], BooleanVar]:
     """Decorator to create a comparison operation.
 
     Args:
@@ -860,13 +863,13 @@ def comparison_operator(
     """
 
     @var_operation
-    def operation(lhs: ImmutableVar, rhs: ImmutableVar):
+    def operation(lhs: Var, rhs: Var):
         return var_operation_return(
             js_expression=func(lhs, rhs),
             var_type=bool,
         )
 
-    def wrapper(lhs: ImmutableVar | Any, rhs: ImmutableVar | Any) -> BooleanVar:
+    def wrapper(lhs: Var | Any, rhs: Var | Any) -> BooleanVar:
         """Create the comparison operation.
 
         Args:
@@ -882,7 +885,7 @@ def comparison_operator(
 
 
 @comparison_operator
-def greater_than_operation(lhs: ImmutableVar, rhs: ImmutableVar):
+def greater_than_operation(lhs: Var, rhs: Var):
     """Greater than comparison.
 
     Args:
@@ -896,7 +899,7 @@ def greater_than_operation(lhs: ImmutableVar, rhs: ImmutableVar):
 
 
 @comparison_operator
-def greater_than_or_equal_operation(lhs: ImmutableVar, rhs: ImmutableVar):
+def greater_than_or_equal_operation(lhs: Var, rhs: Var):
     """Greater than or equal comparison.
 
     Args:
@@ -910,7 +913,7 @@ def greater_than_or_equal_operation(lhs: ImmutableVar, rhs: ImmutableVar):
 
 
 @comparison_operator
-def less_than_operation(lhs: ImmutableVar, rhs: ImmutableVar):
+def less_than_operation(lhs: Var, rhs: Var):
     """Less than comparison.
 
     Args:
@@ -924,7 +927,7 @@ def less_than_operation(lhs: ImmutableVar, rhs: ImmutableVar):
 
 
 @comparison_operator
-def less_than_or_equal_operation(lhs: ImmutableVar, rhs: ImmutableVar):
+def less_than_or_equal_operation(lhs: Var, rhs: Var):
     """Less than or equal comparison.
 
     Args:
@@ -938,7 +941,7 @@ def less_than_or_equal_operation(lhs: ImmutableVar, rhs: ImmutableVar):
 
 
 @comparison_operator
-def equal_operation(lhs: ImmutableVar, rhs: ImmutableVar):
+def equal_operation(lhs: Var, rhs: Var):
     """Equal comparison.
 
     Args:
@@ -952,7 +955,7 @@ def equal_operation(lhs: ImmutableVar, rhs: ImmutableVar):
 
 
 @comparison_operator
-def not_equal_operation(lhs: ImmutableVar, rhs: ImmutableVar):
+def not_equal_operation(lhs: Var, rhs: Var):
     """Not equal comparison.
 
     Args:
@@ -1016,7 +1019,7 @@ class LiteralBooleanVar(LiteralVar, BooleanVar):
             The boolean var.
         """
         return cls(
-            _var_name="true" if value else "false",
+            _js_expr="true" if value else "false",
             _var_type=bool,
             _var_data=_var_data,
             _var_value=value,
@@ -1038,7 +1041,14 @@ class LiteralNumberVar(LiteralVar, NumberVar):
 
         Returns:
             The JSON representation of the var.
+
+        Raises:
+            PrimitiveUnserializableToJSON: If the var is unserializable to JSON.
         """
+        if math.isinf(self._var_value) or math.isnan(self._var_value):
+            raise PrimitiveUnserializableToJSON(
+                f"No valid JSON representation for {self}"
+            )
         return json.dumps(self._var_value)
 
     def __hash__(self) -> int:
@@ -1060,8 +1070,15 @@ class LiteralNumberVar(LiteralVar, NumberVar):
         Returns:
             The number var.
         """
+        if math.isinf(value):
+            js_expr = "Infinity" if value > 0 else "-Infinity"
+        elif math.isnan(value):
+            js_expr = "NaN"
+        else:
+            js_expr = str(value)
+
         return cls(
-            _var_name=str(value),
+            _js_expr=js_expr,
             _var_type=type(value),
             _var_data=_var_data,
             _var_value=value,
@@ -1098,6 +1115,11 @@ class ToBooleanVarOperation(ToOperation, BooleanVar):
     _default_var_type: ClassVar[Type] = bool
 
 
+_IS_TRUE_IMPORT: ImportDict = {
+    f"/{Dirs.STATE_PATH}": [ImportVar(tag="isTrue")],
+}
+
+
 @var_operation
 def boolify(value: Var):
     """Convert the value to a boolean.
@@ -1109,15 +1131,14 @@ def boolify(value: Var):
         The boolean value.
     """
     return var_operation_return(
-        js_expression=f"Boolean({value})",
+        js_expression=f"isTrue({value})",
         var_type=bool,
+        var_data=VarData(imports=_IS_TRUE_IMPORT),
     )
 
 
 @var_operation
-def ternary_operation(
-    condition: BooleanVar, if_true: ImmutableVar, if_false: ImmutableVar
-):
+def ternary_operation(condition: BooleanVar, if_true: Var, if_false: Var):
     """Create a ternary operation.
 
     Args:

reflex/{ivars → vars}/object.py

@@ -23,13 +23,13 @@ from typing import (
 from reflex.utils import types
 from reflex.utils.exceptions import VarAttributeError
 from reflex.utils.types import GenericType, get_attribute_access_type, get_origin
-from reflex.vars import VarData
 
 from .base import (
     CachedVarOperation,
-    ImmutableVar,
     LiteralVar,
     ToOperation,
+    Var,
+    VarData,
     cached_property_no_lock,
     figure_out_type,
     var_operation,
@@ -48,7 +48,7 @@ ARRAY_INNER_TYPE = TypeVar("ARRAY_INNER_TYPE")
 OTHER_KEY_TYPE = TypeVar("OTHER_KEY_TYPE")
 
 
-class ObjectVar(ImmutableVar[OBJECT_TYPE]):
+class ObjectVar(Var[OBJECT_TYPE]):
     """Base class for immutable object vars."""
 
     def _key_type(self) -> Type:
@@ -134,8 +134,8 @@ class ObjectVar(ImmutableVar[OBJECT_TYPE]):
     @overload
     def __getitem__(
         self: ObjectVar[Dict[KEY_TYPE, NoReturn]],
-        key: ImmutableVar | Any,
-    ) -> ImmutableVar: ...
+        key: Var | Any,
+    ) -> Var: ...
 
     @overload
     def __getitem__(
@@ -144,40 +144,40 @@ class ObjectVar(ImmutableVar[OBJECT_TYPE]):
             | ObjectVar[Dict[KEY_TYPE, float]]
             | ObjectVar[Dict[KEY_TYPE, int | float]]
         ),
-        key: ImmutableVar | Any,
+        key: Var | Any,
     ) -> NumberVar: ...
 
     @overload
     def __getitem__(
         self: ObjectVar[Dict[KEY_TYPE, str]],
-        key: ImmutableVar | Any,
+        key: Var | Any,
     ) -> StringVar: ...
 
     @overload
     def __getitem__(
         self: ObjectVar[Dict[KEY_TYPE, list[ARRAY_INNER_TYPE]]],
-        key: ImmutableVar | Any,
+        key: Var | Any,
     ) -> ArrayVar[list[ARRAY_INNER_TYPE]]: ...
 
     @overload
     def __getitem__(
         self: ObjectVar[Dict[KEY_TYPE, set[ARRAY_INNER_TYPE]]],
-        key: ImmutableVar | Any,
+        key: Var | Any,
     ) -> ArrayVar[set[ARRAY_INNER_TYPE]]: ...
 
     @overload
     def __getitem__(
         self: ObjectVar[Dict[KEY_TYPE, tuple[ARRAY_INNER_TYPE, ...]]],
-        key: ImmutableVar | Any,
+        key: Var | Any,
     ) -> ArrayVar[tuple[ARRAY_INNER_TYPE, ...]]: ...
 
     @overload
     def __getitem__(
         self: ObjectVar[Dict[KEY_TYPE, dict[OTHER_KEY_TYPE, VALUE_TYPE]]],
-        key: ImmutableVar | Any,
+        key: Var | Any,
     ) -> ObjectVar[dict[OTHER_KEY_TYPE, VALUE_TYPE]]: ...
 
-    def __getitem__(self, key: ImmutableVar | Any) -> ImmutableVar:
+    def __getitem__(self, key: Var | Any) -> Var:
         """Get an item from the object.
 
         Args:
@@ -197,7 +197,7 @@ class ObjectVar(ImmutableVar[OBJECT_TYPE]):
     def __getattr__(
         self: ObjectVar[Dict[KEY_TYPE, NoReturn]],
         name: str,
-    ) -> ImmutableVar: ...
+    ) -> Var: ...
 
     @overload
     def __getattr__(
@@ -239,7 +239,7 @@ class ObjectVar(ImmutableVar[OBJECT_TYPE]):
         name: str,
     ) -> ObjectVar[dict[OTHER_KEY_TYPE, VALUE_TYPE]]: ...
 
-    def __getattr__(self, name) -> ImmutableVar:
+    def __getattr__(self, name) -> Var:
         """Get an attribute of the var.
 
         Args:
@@ -271,7 +271,7 @@ class ObjectVar(ImmutableVar[OBJECT_TYPE]):
         else:
             return ObjectItemOperation.create(self, name).guess_type()
 
-    def contains(self, key: ImmutableVar | Any) -> BooleanVar:
+    def contains(self, key: Var | Any) -> BooleanVar:
         """Check if the object contains a key.
 
         Args:
@@ -291,8 +291,8 @@ class ObjectVar(ImmutableVar[OBJECT_TYPE]):
 class LiteralObjectVar(CachedVarOperation, ObjectVar[OBJECT_TYPE], LiteralVar):
     """Base class for immutable literal object vars."""
 
-    _var_value: Dict[Union[ImmutableVar, Any], Union[ImmutableVar, Any]] = (
-        dataclasses.field(default_factory=dict)
+    _var_value: Dict[Union[Var, Any], Union[Var, Any]] = dataclasses.field(
+        default_factory=dict
     )
 
     def _key_type(self) -> Type:
@@ -354,7 +354,7 @@ class LiteralObjectVar(CachedVarOperation, ObjectVar[OBJECT_TYPE], LiteralVar):
         Returns:
             The hash of the var.
         """
-        return hash((self.__class__.__name__, self._var_name))
+        return hash((self.__class__.__name__, self._js_expr))
 
     @cached_property_no_lock
     def _cached_get_all_var_data(self) -> VarData | None:
@@ -390,7 +390,7 @@ class LiteralObjectVar(CachedVarOperation, ObjectVar[OBJECT_TYPE], LiteralVar):
             The literal object var.
         """
         return LiteralObjectVar(
-            _var_name="",
+            _js_expr="",
             _var_type=(figure_out_type(_var_value) if _var_type is None else _var_type),
             _var_data=_var_data,
             _var_value=_var_value,
@@ -470,15 +470,13 @@ def object_merge_operation(lhs: ObjectVar, rhs: ObjectVar):
     frozen=True,
     **{"slots": True} if sys.version_info >= (3, 10) else {},
 )
-class ObjectItemOperation(CachedVarOperation, ImmutableVar):
+class ObjectItemOperation(CachedVarOperation, Var):
     """Operation to get an item from an object."""
 
     _object: ObjectVar = dataclasses.field(
         default_factory=lambda: LiteralObjectVar.create({})
     )
-    _key: ImmutableVar | Any = dataclasses.field(
-        default_factory=lambda: LiteralVar.create(None)
-    )
+    _key: Var | Any = dataclasses.field(default_factory=lambda: LiteralVar.create(None))
 
     @cached_property_no_lock
     def _cached_var_name(self) -> str:
@@ -495,7 +493,7 @@ class ObjectItemOperation(CachedVarOperation, ImmutableVar):
     def create(
         cls,
         object: ObjectVar,
-        key: ImmutableVar | Any,
+        key: Var | Any,
         _var_type: GenericType | None = None,
         _var_data: VarData | None = None,
     ) -> ObjectItemOperation:
@@ -511,11 +509,11 @@ class ObjectItemOperation(CachedVarOperation, ImmutableVar):
             The object item operation.
         """
         return cls(
-            _var_name="",
+            _js_expr="",
             _var_type=object._value_type() if _var_type is None else _var_type,
             _var_data=_var_data,
             _object=object,
-            _key=key if isinstance(key, ImmutableVar) else LiteralVar.create(key),
+            _key=key if isinstance(key, Var) else LiteralVar.create(key),
         )
 
 
@@ -527,7 +525,7 @@ class ObjectItemOperation(CachedVarOperation, ImmutableVar):
 class ToObjectOperation(ToOperation, ObjectVar):
     """Operation to convert a var to an object."""
 
-    _original: ImmutableVar = dataclasses.field(
+    _original: Var = dataclasses.field(
         default_factory=lambda: LiteralObjectVar.create({})
     )
 
@@ -542,13 +540,13 @@ class ToObjectOperation(ToOperation, ObjectVar):
         Returns:
             The attribute of the var.
         """
-        if name == "_var_name":
-            return self._original._var_name
+        if name == "_js_expr":
+            return self._original._js_expr
         return ObjectVar.__getattr__(self, name)
 
 
 @var_operation
-def object_has_own_property_operation(object: ObjectVar, key: ImmutableVar):
+def object_has_own_property_operation(object: ObjectVar, key: Var):
     """Check if an object has a key.
 
     Args: