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

reflex/.templates/web/utils/state.js

@@ -529,6 +529,14 @@ export const connect = async (
   navigate,
   params,
 ) => {
+  // Socket already allocated, just reconnect it if needed.
+  if (socket.current) {
+    if (!socket.current.connected) {
+      socket.current.reconnect();
+    }
+    return;
+  }
+
   // Get backend URL object from the endpoint.
   const endpoint = getBackendURL(EVENTURL);
   const on_hydrated_queue = [];
@@ -540,7 +548,9 @@ export const connect = async (
     protocols: [reflexEnvironment.version],
     autoUnref: false,
     query: { token: getToken() },
+    reconnection: false, // Reconnection will be handled manually.
   });
+  socket.current.wait_connect = !socket.current.connected;
   // Ensure undefined fields in events are sent as null instead of removed
   socket.current.io.encoder.replacer = (k, v) => (v === undefined ? null : v);
   socket.current.io.decoder.tryParse = (str) => {
@@ -550,6 +560,18 @@ export const connect = async (
       return false;
     }
   };
+  // Set up a reconnect helper function
+  socket.current.reconnect = () => {
+    if (
+      socket.current &&
+      !socket.current.connected &&
+      !socket.current.wait_connect
+    ) {
+      socket.current.wait_connect = true;
+      socket.current.io.opts.query = { token: getToken() }; // Update token for reconnect.
+      socket.current.connect();
+    }
+  };
 
   function checkVisibility() {
     if (document.visibilityState === "visible") {
@@ -565,7 +587,7 @@ export const connect = async (
         );
       } else if (!socket.current.connected) {
         console.log("Socket is disconnected, attempting to reconnect ");
-        socket.current.connect();
+        socket.current.reconnect();
       } else {
         console.log("Socket is reconnected ");
       }
@@ -588,6 +610,7 @@ export const connect = async (
 
   // Once the socket is open, hydrate the page.
   socket.current.on("connect", async () => {
+    socket.current.wait_connect = false;
     setConnectErrors([]);
     window.addEventListener("pagehide", pagehideHandler);
     window.addEventListener("beforeunload", disconnectTrigger);
@@ -599,16 +622,33 @@ export const connect = async (
   });
 
   socket.current.on("connect_error", (error) => {
-    setConnectErrors((connectErrors) => [connectErrors.slice(-9), error]);
+    socket.current.wait_connect = false;
+    let n_connect_errors = 0;
+    setConnectErrors((connectErrors) => {
+      const new_errors = [...connectErrors.slice(-9), error];
+      n_connect_errors = new_errors.length;
+      return new_errors;
+    });
+    window.setTimeout(() => {
+      if (socket.current && !socket.current.connected) {
+        socket.current.reconnect();
+      }
+    }, 200 * n_connect_errors); // Incremental backoff
   });
 
   // When the socket disconnects reset the event_processing flag
-  socket.current.on("disconnect", () => {
-    socket.current = null; // allow reconnect to occur automatically
+  socket.current.on("disconnect", (reason, details) => {
+    socket.current.wait_connect = false;
+    const try_reconnect =
+      reason !== "io server disconnect" && reason !== "io client disconnect";
     event_processing = false;
     window.removeEventListener("unload", disconnectTrigger);
     window.removeEventListener("beforeunload", disconnectTrigger);
     window.removeEventListener("pagehide", pagehideHandler);
+    if (try_reconnect) {
+      // Attempt to reconnect transient non-intentional disconnects.
+      socket.current.reconnect();
+    }
   });
 
   // On each received message, queue the updates and events.
@@ -785,6 +825,7 @@ export const useEventLoop = (
   const [searchParams] = useSearchParams();
   const [connectErrors, setConnectErrors] = useState([]);
   const params = useRef(paramsR);
+  const mounted = useRef(false);
 
   useEffect(() => {
     const { "*": splat, ...remainingParams } = paramsR;
@@ -796,11 +837,16 @@ export const useEventLoop = (
   }, [paramsR]);
 
   const ensureSocketConnected = useCallback(async () => {
+    if (!mounted.current) {
+      // During hot reload, some components may still have a reference to
+      // addEvents, so avoid reconnecting the socket of an unmounted event loop.
+      return;
+    }
     // only use websockets if state is present and backend is not disabled (reflex cloud).
     if (
       Object.keys(initialState).length > 1 &&
       !isBackendDisabled() &&
-      !socket.current
+      !socket.current?.connected
     ) {
       // Initialize the websocket connection.
       await connect(
@@ -813,13 +859,23 @@ export const useEventLoop = (
         () => params.current,
       );
     }
-  }, [socket, dispatch, setConnectErrors, client_storage, navigate, params]);
+  }, [
+    socket,
+    dispatch,
+    setConnectErrors,
+    client_storage,
+    navigate,
+    params,
+    mounted,
+  ]);
 
   // Function to add new events to the event queue.
   const addEvents = useCallback((events, args, event_actions) => {
     const _events = events.filter((e) => e !== undefined && e !== null);
-
-    ensureSocketConnected();
+    if (!event_actions?.temporal) {
+      // Reconnect socket if needed for non-temporal events.
+      ensureSocketConnected();
+    }
 
     if (!(args instanceof Array)) {
       args = [args];
@@ -914,12 +970,16 @@ export const useEventLoop = (
   // Handle socket connect/disconnect.
   useEffect(() => {
     // Initialize the websocket connection.
+    mounted.current = true;
     ensureSocketConnected();
 
     // Cleanup function.
     return () => {
+      mounted.current = false;
       if (socket.current) {
         socket.current.disconnect();
+        socket.current.off();
+        socket.current = null;
       }
     };
   }, []);

reflex/__init__.py

@@ -84,13 +84,18 @@ In the example above, you will be able to do `rx.list`
 
 from __future__ import annotations
 
-from reflex.utils import (
-    compat,  # for side-effects
-    lazy_loader,
-)
+import sys
+
+from reflex.utils import lazy_loader
+
+if sys.version_info < (3, 11):
+    from reflex.utils import console
 
-# Remove the `compat` name from the namespace, it was imported for side-effects only.
-del compat
+    console.warn(
+        "Reflex support for Python 3.10 is deprecated and will be removed in a future release. Please upgrade to Python 3.11 or higher for continued support."
+    )
+    del console
+del sys
 
 RADIX_THEMES_MAPPING: dict = {
     "components.radix.themes.base": ["color_mode", "theme", "theme_panel"],
@@ -323,7 +328,7 @@ _MAPPING: dict = {
         "SessionStorage",
     ],
     "middleware": ["middleware", "Middleware"],
-    "model": ["asession", "session", "Model"],
+    "model": ["asession", "session", "Model", "ModelRegistry"],
     "page": ["page"],
     "state": [
         "var",

reflex/__init__.pyi

@@ -3,7 +3,7 @@
 # This file was generated by `reflex/utils/pyi_generator.py`!
 # ------------------------------------------------------
 
-from reflex.utils import compat
+import sys
 
 from . import (
     admin,
@@ -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
@@ -160,7 +160,14 @@ from .utils.misc import run_in_thread
 from .utils.serializers import serializer
 from .vars import Field, Var, field
 
-del compat
+if sys.version_info < (3, 11):
+    from reflex.utils import console
+
+    console.warn(
+        "Reflex support for Python 3.10 is deprecated and will be removed in a future release. Please upgrade to Python 3.11 or higher for continued support."
+    )
+    del console
+del sys
 RADIX_THEMES_MAPPING: dict
 RADIX_THEMES_COMPONENTS_MAPPING: dict
 RADIX_THEMES_LAYOUT_MAPPING: dict
@@ -192,6 +199,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
 
@@ -1780,16 +1781,16 @@ async def process(
                     name=f"reflex_emit_reload|{event.name}|{time.time()}|{event.token}",
                 )
                 return
+            router_data[constants.RouteVar.PATH] = "/" + (
+                app.router(path) or "404"
+                if (path := router_data.get(constants.RouteVar.PATH))
+                else "404"
+            ).removeprefix("/")
             # re-assign only when the value is different
             if state.router_data != router_data:
                 # assignment will recurse into substates and force recalculation of
                 # dependent ComputedVar (dynamic route variables)
                 state.router_data = router_data
-                router_data[constants.RouteVar.PATH] = "/" + (
-                    app.router(path) or "404"
-                    if (path := router_data.get(constants.RouteVar.PATH))
-                    else "404"
-                ).removeprefix("/")
                 state.router = RouterData.from_router_data(router_data)
 
             # Preprocess the event.
@@ -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,72 @@
 """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.
+    from reflex.utils.compat import ModelMetaclassLazyAnnotations
 
-    This class wraps Pydantic and provides common methods such as
-    serialization and setting fields.
+    class Base(BaseModel, metaclass=ModelMetaclassLazyAnnotations):
+        """The base class subclassed by all Reflex classes.
 
-    Any data structure that needs to be transferred between the
-    frontend and backend should subclass this class.
-    """
+        This class wraps Pydantic and provides common methods such as
+        serialization and setting fields.
 
-    class Config:
-        """Pydantic config."""
+        Any data structure that needs to be transferred between the
+        frontend and backend should subclass this class.
+        """
 
-        arbitrary_types_allowed = True
-        use_enum_values = True
-        extra = "allow"
+        class Config:
+            """Pydantic config."""
 
-    def json(self) -> str:
-        """Convert the object to a json string.
+            arbitrary_types_allowed = True
+            use_enum_values = True
+            extra = "allow"
 
-        Returns:
-            The object as a json string.
-        """
-        from reflex.utils.serializers import serialize
+        def __init_subclass__(cls):
+            """Warn that rx.Base is deprecated."""
+            from reflex.utils import console
 
-        return self.__config__.json_dumps(
-            self.dict(),
-            default=serialize,
-        )
+            console.deprecate(
+                feature_name="rx.Base",
+                reason=f"{cls!r} is subclassing rx.Base. You can subclass from `pydantic.BaseModel` directly instead or use dataclasses if possible.",
+                deprecation_version="0.8.15",
+                removal_version="0.9.0",
+            )
+            super().__init_subclass__()
 
-    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/field.py

@@ -7,6 +7,7 @@ from dataclasses import _MISSING_TYPE, MISSING
 from typing import Annotated, Any, Generic, TypeVar, get_origin
 
 from reflex.utils import types
+from reflex.utils.compat import annotations_from_namespace
 
 FIELD_TYPE = TypeVar("FIELD_TYPE")
 
@@ -117,7 +118,8 @@ class FieldBasedMeta(type):
         cls, namespace: dict[str, Any], name: str
     ) -> dict[str, Any]:
         return types.resolve_annotations(
-            namespace.get("__annotations__", {}), namespace["__module__"]
+            annotations_from_namespace(namespace),
+            namespace["__module__"],
         )
 
     @classmethod

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/markdown/markdown.py

@@ -38,6 +38,84 @@ _REHYPE_PLUGINS = LiteralVar.create([_REHYPE_KATEX, _REHYPE_RAW])
 NO_PROPS_TAGS = ("ul", "ol", "li")
 
 
+def _h1(value: object):
+    from reflex.components.radix.themes.typography.heading import Heading
+
+    return Heading.create(value, as_="h1", size="6", margin_y="0.5em")
+
+
+def _h2(value: object):
+    from reflex.components.radix.themes.typography.heading import Heading
+
+    return Heading.create(value, as_="h2", size="5", margin_y="0.5em")
+
+
+def _h3(value: object):
+    from reflex.components.radix.themes.typography.heading import Heading
+
+    return Heading.create(value, as_="h3", size="4", margin_y="0.5em")
+
+
+def _h4(value: object):
+    from reflex.components.radix.themes.typography.heading import Heading
+
+    return Heading.create(value, as_="h4", size="3", margin_y="0.5em")
+
+
+def _h5(value: object):
+    from reflex.components.radix.themes.typography.heading import Heading
+
+    return Heading.create(value, as_="h5", size="2", margin_y="0.5em")
+
+
+def _h6(value: object):
+    from reflex.components.radix.themes.typography.heading import Heading
+
+    return Heading.create(value, as_="h6", size="1", margin_y="0.5em")
+
+
+def _p(value: object):
+    from reflex.components.radix.themes.typography.text import Text
+
+    return Text.create(value, margin_y="1em")
+
+
+def _ul(value: object):
+    from reflex.components.radix.themes.layout.list import UnorderedList
+
+    return UnorderedList.create(value, margin_y="1em")
+
+
+def _ol(value: object):
+    from reflex.components.radix.themes.layout.list import OrderedList
+
+    return OrderedList.create(value, margin_y="1em")
+
+
+def _li(value: object):
+    from reflex.components.radix.themes.layout.list import ListItem
+
+    return ListItem.create(value, margin_y="0.5em")
+
+
+def _a(value: object):
+    from reflex.components.radix.themes.typography.link import Link
+
+    return Link.create(value)
+
+
+def _code(value: object):
+    from reflex.components.radix.themes.typography.code import Code
+
+    return Code.create(value)
+
+
+def _codeblock(value: object, **props):
+    from reflex.components.datadisplay.code import CodeBlock
+
+    return CodeBlock.create(value, margin_y="1em", wrap_long_lines=True, **props)
+
+
 # Component Mapping
 @lru_cache
 def get_base_component_map() -> dict[str, Callable]:
@@ -46,33 +124,20 @@ def get_base_component_map() -> dict[str, Callable]:
     Returns:
         The base component map.
     """
-    from reflex.components.datadisplay.code import CodeBlock
-    from reflex.components.radix.themes.layout.list import (
-        ListItem,
-        OrderedList,
-        UnorderedList,
-    )
-    from reflex.components.radix.themes.typography.code import Code
-    from reflex.components.radix.themes.typography.heading import Heading
-    from reflex.components.radix.themes.typography.link import Link
-    from reflex.components.radix.themes.typography.text import Text
-
     return {
-        "h1": lambda value: Heading.create(value, as_="h1", size="6", margin_y="0.5em"),
-        "h2": lambda value: Heading.create(value, as_="h2", size="5", margin_y="0.5em"),
-        "h3": lambda value: Heading.create(value, as_="h3", size="4", margin_y="0.5em"),
-        "h4": lambda value: Heading.create(value, as_="h4", size="3", margin_y="0.5em"),
-        "h5": lambda value: Heading.create(value, as_="h5", size="2", margin_y="0.5em"),
-        "h6": lambda value: Heading.create(value, as_="h6", size="1", margin_y="0.5em"),
-        "p": lambda value: Text.create(value, margin_y="1em"),
-        "ul": lambda value: UnorderedList.create(value, margin_y="1em"),
-        "ol": lambda value: OrderedList.create(value, margin_y="1em"),
-        "li": lambda value: ListItem.create(value, margin_y="0.5em"),
-        "a": lambda value: Link.create(value),
-        "code": lambda value: Code.create(value),
-        "codeblock": lambda value, **props: CodeBlock.create(
-            value, margin_y="1em", wrap_long_lines=True, **props
-        ),
+        "h1": _h1,
+        "h2": _h2,
+        "h3": _h3,
+        "h4": _h4,
+        "h5": _h5,
+        "h6": _h6,
+        "p": _p,
+        "ul": _ul,
+        "ol": _ol,
+        "li": _li,
+        "a": _a,
+        "code": _code,
+        "codeblock": _codeblock,
     }
 
 
@@ -413,7 +478,16 @@ let {_LANGUAGE!s} = match ? match[1] : '';
     @staticmethod
     def _component_map_hash(component_map: dict) -> str:
         inp = str(
-            {tag: component(_MOCK_ARG) for tag, component in component_map.items()}
+            {
+                tag: (
+                    f"{component.__module__}.{component.__qualname__}"
+                    if (
+                        "<" not in component.__name__
+                    )  # simple way to check against lambdas
+                    else component(_MOCK_ARG)
+                )
+                for tag, component in component_map.items()
+            }
         ).encode()
         return md5(inp).hexdigest()