reflex 0.8.14a2__py3-none-any.whl → 0.8.15a0__py3-none-any.whl

reflex/__init__.py

@@ -323,7 +323,7 @@ _MAPPING: dict = {
         "SessionStorage",
     ],
     "middleware": ["middleware", "Middleware"],
-    "model": ["asession", "session", "Model"],
+    "model": ["asession", "session", "Model", "ModelRegistry"],
     "page": ["page"],
     "state": [
         "var",

reflex/__init__.pyi

@@ -151,7 +151,7 @@ from .experimental import _x
 from .istate.storage import Cookie, LocalStorage, SessionStorage
 from .istate.wrappers import get_state
 from .middleware import Middleware, middleware
-from .model import Model, asession, session
+from .model import Model, ModelRegistry, asession, session
 from .page import page
 from .state import ComponentState, State, dynamic, var
 from .style import Style, toggle_color_mode
@@ -192,6 +192,7 @@ __all__ = [
     "LocalStorage",
     "Middleware",
     "Model",
+    "ModelRegistry",
     "MomentDelta",
     "NoSSRComponent",
     "PropsBase",

reflex/app.py

@@ -83,7 +83,6 @@ from reflex.event import (
     get_hydrate_event,
     noop,
 )
-from reflex.model import Model, get_db_status
 from reflex.page import DECORATED_PAGES
 from reflex.route import (
     get_route_args,
@@ -648,7 +647,7 @@ class App(MiddlewareMixin, LifespanMixin):
 
             for api_transformer in api_transformers:
                 if isinstance(api_transformer, Starlette):
-                    # Mount the api to the fastapi app.
+                    # Mount the api to the starlette app.
                     App._add_cors(api_transformer)
                     api_transformer.mount("", asgi_app)
                     asgi_app = api_transformer
@@ -957,6 +956,8 @@ class App(MiddlewareMixin, LifespanMixin):
         try:
             from starlette_admin.contrib.sqla.admin import Admin
             from starlette_admin.contrib.sqla.view import ModelView
+
+            from reflex.model import Model
         except ImportError:
             return
 
@@ -1849,6 +1850,8 @@ async def health(_request: Request) -> JSONResponse:
     tasks = []
 
     if prerequisites.check_db_used():
+        from reflex.model import get_db_status
+
         tasks.append(get_db_status())
     if prerequisites.check_redis_used():
         tasks.append(prerequisites.get_redis_status())

reflex/base.py

@@ -1,47 +1,75 @@
 """Define the base Reflex class."""
 
-from pydantic.v1 import BaseModel
+from importlib.util import find_spec
 
+if find_spec("pydantic") and find_spec("pydantic.v1"):
+    from pydantic.v1 import BaseModel
 
-class Base(BaseModel):
-    """The base class subclassed by all Reflex classes.
+    class Base(BaseModel):
+        """The base class subclassed by all Reflex classes.
 
-    This class wraps Pydantic and provides common methods such as
-    serialization and setting fields.
+        This class wraps Pydantic and provides common methods such as
+        serialization and setting fields.
 
-    Any data structure that needs to be transferred between the
-    frontend and backend should subclass this class.
-    """
+        Any data structure that needs to be transferred between the
+        frontend and backend should subclass this class.
+        """
 
-    class Config:
-        """Pydantic config."""
+        class Config:
+            """Pydantic config."""
 
-        arbitrary_types_allowed = True
-        use_enum_values = True
-        extra = "allow"
+            arbitrary_types_allowed = True
+            use_enum_values = True
+            extra = "allow"
 
-    def json(self) -> str:
-        """Convert the object to a json string.
+        def __init__(self, *args, **kwargs):
+            """Initialize the base class.
 
-        Returns:
-            The object as a json string.
-        """
-        from reflex.utils.serializers import serialize
+            Args:
+                *args: Positional arguments.
+                **kwargs: Keyword arguments.
+            """
+            from reflex.utils import console
 
-        return self.__config__.json_dumps(
-            self.dict(),
-            default=serialize,
-        )
+            console.deprecate(
+                feature_name="rx.Base",
+                reason="You can subclass from `pydantic.BaseModel` directly instead or use dataclasses if possible.",
+                deprecation_version="0.8.2",
+                removal_version="0.9.0",
+            )
+            super().__init__(*args, **kwargs)
 
-    def set(self, **kwargs: object):
-        """Set multiple fields and return the object.
+        def json(self) -> str:
+            """Convert the object to a json string.
 
-        Args:
-            **kwargs: The fields and values to set.
+            Returns:
+                The object as a json string.
+            """
+            from reflex.utils.serializers import serialize
 
-        Returns:
-            The object with the fields set.
-        """
-        for key, value in kwargs.items():
-            setattr(self, key, value)
-        return self
+            return self.__config__.json_dumps(
+                self.dict(),
+                default=serialize,
+            )
+else:
+
+    class PydanticNotFoundFallback:
+        """Fallback base class for environments without Pydantic."""
+
+        def __init__(self, *args, **kwargs):
+            """Initialize the base class.
+
+            Args:
+                *args: Positional arguments.
+                **kwargs: Keyword arguments.
+
+            Raises:
+                ImportError: As Pydantic is not installed.
+            """
+            msg = (
+                "Pydantic is not installed. Please install it to use rx.Base."
+                "You can install it with `pip install pydantic`."
+            )
+            raise ImportError(msg)
+
+    Base = PydanticNotFoundFallback  # pyright: ignore[reportAssignmentType]

reflex/components/datadisplay/dataeditor.py

@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
+import dataclasses
 from collections.abc import Mapping, Sequence
 from enum import Enum
 from typing import Any, Literal, TypedDict
 
-from reflex.base import Base
 from reflex.components.component import Component, NoSSRComponent
 from reflex.components.literals import LiteralRowMarker
 from reflex.event import EventHandler, no_args_event_spec, passthrough_event_spec
@@ -50,7 +50,8 @@ class GridColumnIcons(Enum):
     VideoUri = "video_uri"
 
 
-class DataEditorTheme(Base):
+@dataclasses.dataclass
+class DataEditorThemeBase:
     """The theme for the DataEditor component."""
 
     accent_color: str | None = None
@@ -87,6 +88,20 @@ class DataEditorTheme(Base):
     text_medium: str | None = None
 
 
+@dataclasses.dataclass(init=False)
+class DataEditorTheme(DataEditorThemeBase):
+    """The theme for the DataEditor component."""
+
+    def __init__(self, **kwargs: Any):
+        """Initialize the DataEditorTheme.
+
+        Args:
+            **kwargs: The keyword arguments to initialize the theme.
+        """
+        kwargs = {format.to_snake_case(k): v for k, v in kwargs.items()}
+        super().__init__(**kwargs)
+
+
 class Bounds(TypedDict):
     """The bounds of the group header."""
 

reflex/components/datadisplay/dataeditor.pyi

@@ -3,11 +3,11 @@
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `reflex/utils/pyi_generator.py`!
 # ------------------------------------------------------
+import dataclasses
 from collections.abc import Mapping, Sequence
 from enum import Enum
 from typing import Any, Literal, TypedDict
 
-from reflex.base import Base
 from reflex.components.component import NoSSRComponent
 from reflex.components.core.breakpoints import Breakpoints
 from reflex.event import EventType, PointerEventInfo
@@ -43,7 +43,8 @@ class GridColumnIcons(Enum):
     Uri = "uri"
     VideoUri = "video_uri"
 
-class DataEditorTheme(Base):
+@dataclasses.dataclass
+class DataEditorThemeBase:
     accent_color: str | None
     accent_fg: str | None
     accent_light: str | None
@@ -77,6 +78,9 @@ class DataEditorTheme(Base):
     text_light: str | None
     text_medium: str | None
 
+@dataclasses.dataclass(init=False)
+class DataEditorTheme(DataEditorThemeBase): ...
+
 class Bounds(TypedDict):
     x: int
     y: int

reflex/components/lucide/icon.py

@@ -6,7 +6,7 @@ from reflex.utils.imports import ImportVar
 from reflex.vars.base import LiteralVar, Var
 from reflex.vars.sequence import LiteralStringVar, StringVar
 
-LUCIDE_LIBRARY = "lucide-react@0.544.0"
+LUCIDE_LIBRARY = "lucide-react@0.545.0"
 
 
 class LucideIconComponent(Component):
@@ -1129,6 +1129,7 @@ LUCIDE_ICON_LIST = [
     "monitor",
     "moon_star",
     "moon",
+    "motorbike",
     "mountain_snow",
     "mountain",
     "mouse_off",

reflex/components/lucide/icon.pyi

@@ -11,7 +11,7 @@ from reflex.components.core.breakpoints import Breakpoints
 from reflex.event import EventType, PointerEventInfo
 from reflex.vars.base import Var
 
-LUCIDE_LIBRARY = "lucide-react@0.544.0"
+LUCIDE_LIBRARY = "lucide-react@0.545.0"
 
 class LucideIconComponent(Component):
     @classmethod
@@ -1194,6 +1194,7 @@ LUCIDE_ICON_LIST = [
     "monitor",
     "moon_star",
     "moon",
+    "motorbike",
     "mountain_snow",
     "mountain",
     "mouse_off",

reflex/components/sonner/toast.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
+import dataclasses
 from typing import Any, Literal
 
-from reflex.base import Base
 from reflex.components.component import Component, ComponentNamespace
 from reflex.components.lucide.icon import Icon
 from reflex.components.props import NoExtrasAllowedProps
@@ -35,7 +35,8 @@ toast_ref = Var(
 )
 
 
-class ToastAction(Base):
+@dataclasses.dataclass
+class ToastAction:
     """A toast action that render a button in the toast."""
 
     label: str

reflex/components/sonner/toast.pyi

@@ -3,10 +3,10 @@
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `reflex/utils/pyi_generator.py`!
 # ------------------------------------------------------
+import dataclasses
 from collections.abc import Mapping, Sequence
 from typing import Any, Literal
 
-from reflex.base import Base
 from reflex.components.component import Component, ComponentNamespace
 from reflex.components.core.breakpoints import Breakpoints
 from reflex.components.lucide.icon import Icon
@@ -32,7 +32,8 @@ toast_ref = Var(
     _var_data=VarData(imports={f"$/{Dirs.STATE_PATH}": [ImportVar(tag="refs")]}),
 )
 
-class ToastAction(Base):
+@dataclasses.dataclass
+class ToastAction:
     label: str
     on_click: Any
 

reflex/constants/installer.py

@@ -87,7 +87,7 @@ def _determine_react_router_version() -> str:
 
 
 def _determine_react_version() -> str:
-    default_version = "19.1.1"
+    default_version = "19.2.0"
     if (version := os.getenv("REACT_VERSION")) and version != default_version:
         from reflex.utils import console
 
@@ -143,11 +143,11 @@ class PackageJson(SimpleNamespace):
         "postcss-import": "16.1.1",
         "@react-router/dev": _react_router_version,
         "@react-router/fs-routes": _react_router_version,
-        "vite": "npm:rolldown-vite@7.1.13",
+        "vite": "npm:rolldown-vite@7.1.14",
     }
     OVERRIDES = {
         # This should always match the `react` version in DEPENDENCIES for recharts compatibility.
         "react-is": _react_version,
         "cookie": "1.0.2",
-        "vite": "npm:rolldown-vite@7.1.13",
+        "vite": "npm:rolldown-vite@7.1.14",
     }

reflex/environment.py

@@ -24,6 +24,7 @@ from typing import (
 )
 
 from reflex import constants
+from reflex.constants.base import LogLevel
 from reflex.plugins import Plugin
 from reflex.utils.exceptions import EnvironmentVarValueError
 from reflex.utils.types import GenericType, is_union, value_inside_optional
@@ -204,7 +205,8 @@ def interpret_env_var_value(
         The interpreted value.
 
     Raises:
-        ValueError: If the environment variable type is invalid.
+        ValueError: If the value is invalid.
+        EnvironmentVarValueError: If the value is invalid for the specific type.
     """
     field_type = value_inside_optional(field_type)
 
@@ -218,6 +220,12 @@ def interpret_env_var_value(
         return interpret_boolean_env(value, field_name)
     if field_type is str:
         return value
+    if field_type is LogLevel:
+        loglevel = LogLevel.from_string(value)
+        if loglevel is None:
+            msg = f"Invalid log level value: {value} for {field_name}"
+            raise EnvironmentVarValueError(msg)
+        return loglevel
     if field_type is int:
         return interpret_int_env(value, field_name)
     if field_type is Path:

reflex/experimental/client_state.py

@@ -236,7 +236,7 @@ class ClientStateVar(Var):
 
             setter = ArgsFunctionOperationBuilder.create(
                 # remove patterns of ["*"] from the value_str using regex
-                args_names=(re.sub(r"\[\".*\"\]", "", value_str),)
+                args_names=(re.sub(r"(\?\.)?\[\".*\"\]", "", value_str),)
                 if value_str.startswith("_")
                 else (),
                 return_expr=setter.call(value_var),

reflex/istate/proxy.py

@@ -9,19 +9,16 @@ import functools
 import inspect
 import json
 from collections.abc import Callable, Sequence
+from importlib.util import find_spec
 from types import MethodType
 from typing import TYPE_CHECKING, Any, SupportsIndex, TypeVar
 
-import pydantic
 import wrapt
-from pydantic import BaseModel as BaseModelV2
-from pydantic.v1 import BaseModel as BaseModelV1
-from sqlalchemy.orm import DeclarativeBase
 
 from reflex.base import Base
 from reflex.utils import prerequisites
 from reflex.utils.exceptions import ImmutableStateError
-from reflex.utils.serializers import serializer
+from reflex.utils.serializers import can_serialize, serialize, serializer
 from reflex.vars.base import Var
 
 if TYPE_CHECKING:
@@ -339,6 +336,34 @@ class ReadOnlyStateProxy(StateProxy):
         raise NotImplementedError(msg)
 
 
+if find_spec("pydantic"):
+    import pydantic
+
+    NEVER_WRAP_BASE_ATTRS = set(Base.__dict__) - {"set"} | set(
+        pydantic.BaseModel.__dict__
+    )
+else:
+    NEVER_WRAP_BASE_ATTRS = {}
+
+MUTABLE_TYPES = (
+    list,
+    dict,
+    set,
+    Base,
+)
+
+if find_spec("sqlalchemy"):
+    from sqlalchemy.orm import DeclarativeBase
+
+    MUTABLE_TYPES += (DeclarativeBase,)
+
+if find_spec("pydantic"):
+    from pydantic import BaseModel as BaseModelV2
+    from pydantic.v1 import BaseModel as BaseModelV1
+
+    MUTABLE_TYPES += (BaseModelV1, BaseModelV2)
+
+
 class MutableProxy(wrapt.ObjectProxy):
     """A proxy for a mutable object that tracks changes."""
 
@@ -371,11 +396,6 @@ class MutableProxy(wrapt.ObjectProxy):
         "setdefault",
     }
 
-    # These internal attributes on rx.Base should NOT be wrapped in a MutableProxy.
-    __never_wrap_base_attrs__ = set(Base.__dict__) - {"set"} | set(
-        pydantic.BaseModel.__dict__
-    )
-
     # Dynamically generated classes for tracking dataclass mutations.
     __dataclass_proxies__: dict[type, type] = {}
 
@@ -539,7 +559,7 @@ class MutableProxy(wrapt.ObjectProxy):
 
             if (
                 isinstance(self.__wrapped__, Base)
-                and __name not in self.__never_wrap_base_attrs__
+                and __name not in NEVER_WRAP_BASE_ATTRS
                 and hasattr(value, "__func__")
             ):
                 # Wrap methods called on Base subclasses, which might do _anything_
@@ -669,7 +689,10 @@ def serialize_mutable_proxy(mp: MutableProxy):
     Returns:
         The wrapped object.
     """
-    return mp.__wrapped__
+    obj = mp.__wrapped__
+    if can_serialize(type(obj)):
+        return serialize(obj)
+    return obj
 
 
 _orig_json_encoder_default = json.JSONEncoder.default
@@ -739,18 +762,6 @@ class ImmutableMutableProxy(MutableProxy):
         )
 
 
-# These types will be wrapped in MutableProxy
-MUTABLE_TYPES = (
-    list,
-    dict,
-    set,
-    Base,
-    DeclarativeBase,
-    BaseModelV2,
-    BaseModelV1,
-)
-
-
 @functools.lru_cache(maxsize=1024)
 def is_mutable_type(type_: type) -> bool:
     """Check if a type is mutable and should be wrapped.