reflex 0.8.12a1__py3-none-any.whl → 0.8.12a2__py3-none-any.whl

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

@@ -531,6 +531,7 @@ export const connect = async (
 ) => {
   // Get backend URL object from the endpoint.
   const endpoint = getBackendURL(EVENTURL);
+  const on_hydrated_queue = [];
 
   // Create the socket.
   socket.current = io(endpoint.href, {
@@ -552,7 +553,17 @@ export const connect = async (
 
   function checkVisibility() {
     if (document.visibilityState === "visible") {
-      if (!socket.current.connected) {
+      if (!socket.current) {
+        connect(
+          socket,
+          dispatch,
+          transports,
+          setConnectErrors,
+          client_storage,
+          navigate,
+          params,
+        );
+      } else if (!socket.current.connected) {
         console.log("Socket is disconnected, attempting to reconnect ");
         socket.current.connect();
       } else {
@@ -593,6 +604,7 @@ export const connect = async (
 
   // When the socket disconnects reset the event_processing flag
   socket.current.on("disconnect", () => {
+    socket.current = null; // allow reconnect to occur automatically
     event_processing = false;
     window.removeEventListener("unload", disconnectTrigger);
     window.removeEventListener("beforeunload", disconnectTrigger);
@@ -603,6 +615,14 @@ export const connect = async (
   socket.current.on("event", async (update) => {
     for (const substate in update.delta) {
       dispatch[substate](update.delta[substate]);
+      // handle events waiting for `is_hydrated`
+      if (
+        substate === state_name &&
+        update.delta[substate]?.is_hydrated_rx_state_
+      ) {
+        queueEvents(on_hydrated_queue, socket, false, navigate, params);
+        on_hydrated_queue.length = 0;
+      }
     }
     applyClientStorageDelta(client_storage, update.delta);
     event_processing = !update.final;
@@ -612,7 +632,8 @@ export const connect = async (
   });
   socket.current.on("reload", async (event) => {
     event_processing = false;
-    queueEvents([...initialEvents(), event], socket, true, navigate, params);
+    on_hydrated_queue.push(event);
+    queueEvents(initialEvents(), socket, true, navigate, params);
   });
   socket.current.on("new_token", async (new_token) => {
     token = new_token;
@@ -774,10 +795,32 @@ export const useEventLoop = (
     }
   }, [paramsR]);
 
+  const ensureSocketConnected = useCallback(async () => {
+    // only use websockets if state is present and backend is not disabled (reflex cloud).
+    if (
+      Object.keys(initialState).length > 1 &&
+      !isBackendDisabled() &&
+      !socket.current
+    ) {
+      // Initialize the websocket connection.
+      await connect(
+        socket,
+        dispatch,
+        ["websocket"],
+        setConnectErrors,
+        client_storage,
+        navigate,
+        () => params.current,
+      );
+    }
+  }, [socket, dispatch, setConnectErrors, client_storage, navigate, params]);
+
   // 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 (!(args instanceof Array)) {
       args = [args];
     }
@@ -870,21 +913,8 @@ export const useEventLoop = (
 
   // Handle socket connect/disconnect.
   useEffect(() => {
-    // only use websockets if state is present and backend is not disabled (reflex cloud).
-    if (Object.keys(initialState).length > 1 && !isBackendDisabled()) {
-      // Initialize the websocket connection.
-      if (!socket.current) {
-        connect(
-          socket,
-          dispatch,
-          ["websocket"],
-          setConnectErrors,
-          client_storage,
-          navigate,
-          () => params.current,
-        );
-      }
-    }
+    // Initialize the websocket connection.
+    ensureSocketConnected();
 
     // Cleanup function.
     return () => {
@@ -903,6 +933,7 @@ export const useEventLoop = (
     (async () => {
       // Process all outstanding events.
       while (event_queue.length > 0 && !event_processing) {
+        await ensureSocketConnected();
         await processEvent(socket.current, navigate, () => params.current);
       }
     })();

reflex/app.py

@@ -97,6 +97,7 @@ from reflex.state import (
     State,
     StateManager,
     StateUpdate,
+    _split_substate_key,
     _substate_key,
     all_base_state_classes,
     code_uses_state_contexts,
@@ -1559,7 +1560,7 @@ class App(MiddlewareMixin, LifespanMixin):
                 state._clean()
                 await self.event_namespace.emit_update(
                     update=StateUpdate(delta=delta),
-                    sid=state.router.session.session_id,
+                    token=token,
                 )
 
     def _process_background(
@@ -1599,7 +1600,7 @@ class App(MiddlewareMixin, LifespanMixin):
                 # Send the update to the client.
                 await self.event_namespace.emit_update(
                     update=update,
-                    sid=state.router.session.session_id,
+                    token=event.token,
                 )
 
         task = asyncio.create_task(
@@ -2061,20 +2062,19 @@ class EventNamespace(AsyncNamespace):
                 and console.error(f"Token cleanup error: {t.exception()}")
             )
 
-    async def emit_update(self, update: StateUpdate, sid: str) -> None:
+    async def emit_update(self, update: StateUpdate, token: str) -> None:
         """Emit an update to the client.
 
         Args:
             update: The state update to send.
-            sid: The Socket.IO session id.
+            token: The client token (tab) associated with the event.
         """
-        if not sid:
+        client_token, _ = _split_substate_key(token)
+        sid = self.token_to_sid.get(client_token)
+        if sid is None:
             # If the sid is None, we are not connected to a client. Prevent sending
             # updates to all clients.
-            return
-        token = self.sid_to_token.get(sid)
-        if token is None:
-            console.warn(f"Attempting to send delta to disconnected websocket {sid}")
+            console.warn(f"Attempting to send delta to disconnected client {token!r}")
             return
         # Creating a task prevents the update from being blocked behind other coroutines.
         await asyncio.create_task(
@@ -2165,7 +2165,7 @@ class EventNamespace(AsyncNamespace):
             # Process the events.
             async for update in updates_gen:
                 # Emit the update from processing the event.
-                await self.emit_update(update=update, sid=sid)
+                await self.emit_update(update=update, token=event.token)
 
     async def on_ping(self, sid: str):
         """Event for testing the API endpoint.

reflex/app_mixins/lifespan.py

@@ -60,6 +60,17 @@ class LifespanMixin(AppMixin):
             for task in running_tasks:
                 console.debug(f"Canceling lifespan task: {task}")
                 task.cancel(msg="lifespan_cleanup")
+        # Disassociate sid / token pairings so they can be reconnected properly.
+        try:
+            event_namespace = self.event_namespace  # pyright: ignore[reportAttributeAccessIssue]
+        except AttributeError:
+            pass
+        else:
+            try:
+                if event_namespace:
+                    await event_namespace._token_manager.disconnect_all()
+            except Exception as e:
+                console.error(f"Error during lifespan cleanup: {e}")
 
     def register_lifespan_task(self, task: Callable | asyncio.Task, **task_kwargs):
         """Register a task to run during the lifespan of the app.

reflex/compiler/compiler.py

@@ -621,7 +621,10 @@ def purge_web_pages_dir():
         return
 
     # Empty out the web pages directory.
-    utils.empty_dir(get_web_dir() / constants.Dirs.PAGES, keep_files=["routes.js"])
+    utils.empty_dir(
+        get_web_dir() / constants.Dirs.PAGES,
+        keep_files=["routes.js", "entry.client.js"],
+    )
 
 
 if TYPE_CHECKING:

reflex/components/core/upload.py

@@ -17,6 +17,7 @@ from reflex.components.component import (
 from reflex.components.core.cond import cond
 from reflex.components.el.elements.forms import Input
 from reflex.components.radix.themes.layout.box import Box
+from reflex.components.sonner.toast import toast
 from reflex.constants import Dirs
 from reflex.constants.compiler import Hooks, Imports
 from reflex.environment import environment
@@ -36,7 +37,8 @@ from reflex.utils.imports import ImportVar
 from reflex.vars import VarData
 from reflex.vars.base import Var, get_unique_variable_name
 from reflex.vars.function import FunctionVar
-from reflex.vars.sequence import LiteralStringVar
+from reflex.vars.object import ObjectVar
+from reflex.vars.sequence import ArrayVar, LiteralStringVar
 
 DEFAULT_UPLOAD_ID: str = "default"
 
@@ -178,6 +180,34 @@ def _on_drop_spec(files: Var) -> tuple[Var[Any]]:
     return (files,)
 
 
+def _default_drop_rejected(rejected_files: ArrayVar[list[dict[str, Any]]]) -> EventSpec:
+    """Event handler for showing a toast with rejected file info.
+
+    Args:
+        rejected_files: The files that were rejected.
+
+    Returns:
+        An event spec that shows a toast with the rejected file info when triggered.
+    """
+
+    def _format_rejected_file_record(rf: ObjectVar[dict[str, Any]]) -> str:
+        rf = rf.to(ObjectVar, dict[str, dict[str, Any]])
+        file = rf["file"].to(ObjectVar, dict[str, Any])
+        errors = rf["errors"].to(ArrayVar, list[dict[str, Any]])
+        return (
+            f"{file['path']}: {errors.foreach(lambda err: err['message']).join(', ')}"
+        )
+
+    return toast.error(
+        title="Files not Accepted",
+        description=rejected_files.to(ArrayVar)
+        .foreach(_format_rejected_file_record)
+        .join("\n\n"),
+        close_button=True,
+        style={"white_space": "pre-line"},
+    )
+
+
 class UploadFilesProvider(Component):
     """AppWrap component that provides a dict of selected files by ID via useContext."""
 
@@ -191,6 +221,9 @@ class GhostUpload(Fragment):
     # Fired when files are dropped.
     on_drop: EventHandler[_on_drop_spec]
 
+    # Fired when dropped files do not meet the specified criteria.
+    on_drop_rejected: EventHandler[_on_drop_spec]
+
 
 class Upload(MemoizationLeaf):
     """A file upload component."""
@@ -234,6 +267,9 @@ class Upload(MemoizationLeaf):
     # Fired when files are dropped.
     on_drop: EventHandler[_on_drop_spec]
 
+    # Fired when dropped files do not meet the specified criteria.
+    on_drop_rejected: EventHandler[_on_drop_spec]
+
     # Style rules to apply when actively dragging.
     drag_active_style: Style | None = field(default=None, is_javascript_property=False)
 
@@ -295,6 +331,10 @@ class Upload(MemoizationLeaf):
                 on_drop[ix] = event
             upload_props["on_drop"] = on_drop
 
+        if upload_props.get("on_drop_rejected") is None:
+            # If on_drop_rejected is not provided, show an error toast.
+            upload_props["on_drop_rejected"] = _default_drop_rejected
+
         input_props_unique_name = get_unique_variable_name()
         root_props_unique_name = get_unique_variable_name()
         is_drag_active_unique_name = get_unique_variable_name()
@@ -313,22 +353,22 @@ class Upload(MemoizationLeaf):
                 ),
             )
 
-        event_var, callback_str = StatefulComponent._get_memoized_event_triggers(
-            GhostUpload.create(on_drop=upload_props["on_drop"])
-        )["on_drop"]
-
-        upload_props["on_drop"] = event_var
+        event_triggers = StatefulComponent._get_memoized_event_triggers(
+            GhostUpload.create(
+                on_drop=upload_props["on_drop"],
+                on_drop_rejected=upload_props["on_drop_rejected"],
+            )
+        )
+        callback_hooks = []
+        for trigger_name, (event_var, callback_str) in event_triggers.items():
+            upload_props[trigger_name] = event_var
+            callback_hooks.append(callback_str)
 
         upload_props = {
             format.to_camel_case(key): value for key, value in upload_props.items()
         }
 
-        use_dropzone_arguments = Var.create(
-            {
-                "onDrop": event_var,
-                **upload_props,
-            }
-        )
+        use_dropzone_arguments = Var.create(upload_props)
 
         left_side = (
             "const { "
@@ -344,11 +384,10 @@ class Upload(MemoizationLeaf):
                 imports=Imports.EVENTS,
                 hooks={Hooks.EVENTS: None},
             ),
-            event_var._get_all_var_data(),
             use_dropzone_arguments._get_all_var_data(),
             VarData(
                 hooks={
-                    callback_str: None,
+                    **dict.fromkeys(callback_hooks, None),
                     f"{left_side} = {right_side};": None,
                 },
                 imports={

reflex/istate/proxy.py

@@ -71,10 +71,15 @@ class StateProxy(wrapt.ObjectProxy):
             state_instance: The state instance to proxy.
             parent_state_proxy: The parent state proxy, for linked mutability and context tracking.
         """
+        from reflex.state import _substate_key
+
         super().__init__(state_instance)
-        # compile is not relevant to backend logic
         self._self_app = prerequisites.get_and_validate_app().app
         self._self_substate_path = tuple(state_instance.get_full_name().split("."))
+        self._self_substate_token = _substate_key(
+            state_instance.router.session.client_token,
+            self._self_substate_path,
+        )
         self._self_actx = None
         self._self_mutable = False
         self._self_actx_lock = asyncio.Lock()
@@ -127,16 +132,9 @@ class StateProxy(wrapt.ObjectProxy):
             msg = "The state is already mutable. Do not nest `async with self` blocks."
             raise ImmutableStateError(msg)
 
-        from reflex.state import _substate_key
-
         await self._self_actx_lock.acquire()
         self._self_actx_lock_holder = current_task
-        self._self_actx = self._self_app.modify_state(
-            token=_substate_key(
-                self.__wrapped__.router.session.client_token,
-                self._self_substate_path,
-            )
-        )
+        self._self_actx = self._self_app.modify_state(token=self._self_substate_token)
         mutable_state = await self._self_actx.__aenter__()
         super().__setattr__(
             "__wrapped__", mutable_state.get_substate(self._self_substate_path)
@@ -378,17 +376,6 @@ class MutableProxy(wrapt.ObjectProxy):
         pydantic.BaseModel.__dict__
     )
 
-    # These types will be wrapped in MutableProxy
-    __mutable_types__ = (
-        list,
-        dict,
-        set,
-        Base,
-        DeclarativeBase,
-        BaseModelV2,
-        BaseModelV1,
-    )
-
     # Dynamically generated classes for tracking dataclass mutations.
     __dataclass_proxies__: dict[type, type] = {}
 
@@ -469,20 +456,6 @@ class MutableProxy(wrapt.ObjectProxy):
             return wrapped(*args, **(kwargs or {}))
         return None
 
-    @classmethod
-    def _is_mutable_type(cls, value: Any) -> bool:
-        """Check if a value is of a mutable type and should be wrapped.
-
-        Args:
-            value: The value to check.
-
-        Returns:
-            Whether the value is of a mutable type.
-        """
-        return isinstance(value, cls.__mutable_types__) or (
-            dataclasses.is_dataclass(value) and not isinstance(value, Var)
-        )
-
     @staticmethod
     def _is_called_from_dataclasses_internal() -> bool:
         """Check if the current function is called from dataclasses helper.
@@ -514,7 +487,7 @@ class MutableProxy(wrapt.ObjectProxy):
         if self._is_called_from_dataclasses_internal():
             return value
         # Recursively wrap mutable types, but do not re-wrap MutableProxy instances.
-        if self._is_mutable_type(value) and not isinstance(value, MutableProxy):
+        if is_mutable_type(type(value)) and not isinstance(value, MutableProxy):
             base_cls = globals()[self.__base_proxy__]
             return base_cls(
                 wrapped=value,
@@ -575,7 +548,7 @@ class MutableProxy(wrapt.ObjectProxy):
                     self._wrap_recursive_decorator,
                 )
 
-        if self._is_mutable_type(value) and __name not in (
+        if is_mutable_type(type(value)) and __name not in (
             "__wrapped__",
             "_self_state",
             "__dict__",
@@ -764,3 +737,30 @@ class ImmutableMutableProxy(MutableProxy):
         return super()._mark_dirty(
             wrapped=wrapped, instance=instance, args=args, kwargs=kwargs
         )
+
+
+# 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.
+
+    Args:
+        type_: The type to check.
+
+    Returns:
+        Whether the type is mutable and should be wrapped.
+    """
+    return issubclass(type_, MUTABLE_TYPES) or (
+        dataclasses.is_dataclass(type_) and not issubclass(type_, Var)
+    )

reflex/reflex.py

@@ -422,6 +422,13 @@ def compile(dry: bool, rich: bool):
     default=constants.Env.PROD.value,
     help="The environment to export the app in.",
 )
+@click.option(
+    "--exclude-from-backend",
+    "backend_excluded_dirs",
+    multiple=True,
+    type=click.Path(exists=True, path_type=Path, resolve_path=True),
+    help="Files or directories to exclude from the backend zip. Can be used multiple times.",
+)
 def export(
     zip: bool,
     frontend_only: bool,
@@ -429,6 +436,7 @@ def export(
     zip_dest_dir: str,
     upload_db_file: bool,
     env: LITERAL_ENV,
+    backend_excluded_dirs: tuple[Path, ...] = (),
 ):
     """Export the app to a zip file."""
     from reflex.utils import export as export_utils
@@ -455,6 +463,7 @@ def export(
         upload_db_file=upload_db_file,
         env=constants.Env.DEV if env == constants.Env.DEV else constants.Env.PROD,
         loglevel=config.loglevel.subprocess_level(),
+        backend_excluded_dirs=backend_excluded_dirs,
     )
 
 
@@ -660,6 +669,13 @@ def makemigrations(message: str | None):
     "--config",
     help="path to the config file",
 )
+@click.option(
+    "--exclude-from-backend",
+    "backend_excluded_dirs",
+    multiple=True,
+    type=click.Path(exists=True, path_type=Path, resolve_path=True),
+    help="Files or directories to exclude from the backend zip. Can be used multiple times.",
+)
 def deploy(
     app_name: str | None,
     app_id: str | None,
@@ -673,6 +689,7 @@ def deploy(
     project_name: str | None,
     token: str | None,
     config_path: str | None,
+    backend_excluded_dirs: tuple[Path, ...] = (),
 ):
     """Deploy the app to the Reflex hosting service."""
     from reflex_cli.utils import dependency
@@ -721,6 +738,7 @@ def deploy(
                 zipping=zipping,
                 loglevel=config.loglevel.subprocess_level(),
                 upload_db_file=upload_db,
+                backend_excluded_dirs=backend_excluded_dirs,
             )
         ),
         regions=list(region),

reflex/state.py

@@ -41,7 +41,7 @@ from reflex.event import (
 from reflex.istate import HANDLED_PICKLE_ERRORS, debug_failed_pickles
 from reflex.istate.data import RouterData
 from reflex.istate.proxy import ImmutableMutableProxy as ImmutableMutableProxy
-from reflex.istate.proxy import MutableProxy, StateProxy
+from reflex.istate.proxy import MutableProxy, StateProxy, is_mutable_type
 from reflex.istate.storage import ClientStorageBase
 from reflex.model import Model
 from reflex.utils import console, format, prerequisites, types
@@ -1359,7 +1359,7 @@ class BaseState(EvenMoreBasicBaseState):
             if parent_state is not None:
                 return getattr(parent_state, name)
 
-        if MutableProxy._is_mutable_type(value) and (
+        if is_mutable_type(type(value)) and (
             name in super().__getattribute__("base_vars") or name in backend_vars
         ):
             # track changes in mutable containers (list, dict, set, etc)

reflex/testing.py

@@ -47,6 +47,7 @@ from reflex.state import (
 )
 from reflex.utils import console, js_runtimes
 from reflex.utils.export import export
+from reflex.utils.token_manager import TokenManager
 from reflex.utils.types import ASGIApp
 
 try:
@@ -774,6 +775,19 @@ class AppHarness:
                 self.app_instance._state_manager = app_state_manager
                 await self.state_manager.close()
 
+    def token_manager(self) -> TokenManager:
+        """Get the token manager for the app instance.
+
+        Returns:
+            The current token_manager attached to the app's EventNamespace.
+        """
+        assert self.app_instance is not None
+        app_event_namespace = self.app_instance.event_namespace
+        assert app_event_namespace is not None
+        app_token_manager = app_event_namespace._token_manager
+        assert app_token_manager is not None
+        return app_token_manager
+
     def poll_for_content(
         self,
         element: WebElement,

reflex/utils/build.py

@@ -26,14 +26,14 @@ def set_env_json():
 
 
 def _zip(
+    *,
     component_name: constants.ComponentName,
-    target: str | Path,
-    root_dir: str | Path,
-    exclude_venv_dirs: bool,
-    upload_db_file: bool = False,
-    dirs_to_exclude: set[str] | None = None,
-    files_to_exclude: set[str] | None = None,
-    top_level_dirs_to_exclude: set[str] | None = None,
+    target: Path,
+    root_directory: Path,
+    exclude_venv_directories: bool,
+    include_db_file: bool = False,
+    directory_names_to_exclude: set[str] | None = None,
+    files_to_exclude: set[Path] | None = None,
     globs_to_include: list[str] | None = None,
 ) -> None:
     """Zip utility function.
@@ -41,49 +41,62 @@ def _zip(
     Args:
         component_name: The name of the component: backend or frontend.
         target: The target zip file.
-        root_dir: The root directory to zip.
-        exclude_venv_dirs: Whether to exclude venv directories.
-        upload_db_file: Whether to include local sqlite db files.
-        dirs_to_exclude: The directories to exclude.
+        root_directory: The root directory to zip.
+        exclude_venv_directories: Whether to exclude venv directories.
+        include_db_file: Whether to include local sqlite db files.
+        directory_names_to_exclude: The directory names to exclude.
         files_to_exclude: The files to exclude.
-        top_level_dirs_to_exclude: The top level directory names immediately under root_dir to exclude. Do not exclude folders by these names further in the sub-directories.
-        globs_to_include: Apply these globs from the root_dir and always include them in the zip.
+        globs_to_include: Apply these globs from the root_directory and always include them in the zip.
 
     """
     target = Path(target)
-    root_dir = Path(root_dir)
-    dirs_to_exclude = dirs_to_exclude or set()
+    root_directory = Path(root_directory).resolve()
+    directory_names_to_exclude = directory_names_to_exclude or set()
     files_to_exclude = files_to_exclude or set()
-    files_to_zip: list[str] = []
+    files_to_zip: list[Path] = []
     # Traverse the root directory in a top-down manner. In this traversal order,
     # we can modify the dirs list in-place to remove directories we don't want to include.
-    for root, dirs, files in os.walk(root_dir, topdown=True, followlinks=True):
-        root = Path(root)
+    for directory_path, subdirectories_names, subfiles_names in os.walk(
+        root_directory, topdown=True, followlinks=True
+    ):
+        directory_path = Path(directory_path).resolve()
         # Modify the dirs in-place so excluded and hidden directories are skipped in next traversal.
-        dirs[:] = [
-            d
-            for d in dirs
-            if (basename := Path(d).resolve().name) not in dirs_to_exclude
-            and not basename.startswith(".")
-            and (not exclude_venv_dirs or not _looks_like_venv_dir(root / d))
+        subdirectories_names[:] = [
+            subdirectory_name
+            for subdirectory_name in subdirectories_names
+            if subdirectory_name not in directory_names_to_exclude
+            and not any(
+                (directory_path / subdirectory_name).samefile(exclude)
+                for exclude in files_to_exclude
+                if exclude.exists()
+            )
+            and not subdirectory_name.startswith(".")
+            and (
+                not exclude_venv_directories
+                or not _looks_like_venv_directory(directory_path / subdirectory_name)
+            )
         ]
-        # If we are at the top level with root_dir, exclude the top level dirs.
-        if top_level_dirs_to_exclude and root == root_dir:
-            dirs[:] = [d for d in dirs if d not in top_level_dirs_to_exclude]
         # Modify the files in-place so the hidden files and db files are excluded.
-        files[:] = [
-            f
-            for f in files
-            if not f.startswith(".") and (upload_db_file or not f.endswith(".db"))
+        subfiles_names[:] = [
+            subfile_name
+            for subfile_name in subfiles_names
+            if not subfile_name.startswith(".")
+            and (include_db_file or not subfile_name.endswith(".db"))
         ]
         files_to_zip += [
-            str(root / file) for file in files if file not in files_to_exclude
+            directory_path / subfile_name
+            for subfile_name in subfiles_names
+            if not any(
+                (directory_path / subfile_name).samefile(excluded_file)
+                for excluded_file in files_to_exclude
+                if excluded_file.exists()
+            )
         ]
     if globs_to_include:
         for glob in globs_to_include:
             files_to_zip += [
-                str(file)
-                for file in root_dir.glob(glob)
+                file
+                for file in root_directory.glob(glob)
                 if file.name not in files_to_exclude
             ]
     # Create a progress bar for zipping the component.
@@ -100,14 +113,15 @@ def _zip(
         for file in files_to_zip:
             console.debug(f"{target}: {file}", progress=progress)
             progress.advance(task)
-            zipf.write(file, Path(file).relative_to(root_dir))
+            zipf.write(file, Path(file).relative_to(root_directory))
 
 
 def zip_app(
     frontend: bool = True,
     backend: bool = True,
     zip_dest_dir: str | Path | None = None,
-    upload_db_file: bool = False,
+    include_db_file: bool = False,
+    backend_excluded_dirs: tuple[Path, ...] = (),
 ):
     """Zip up the app.
 
@@ -115,41 +129,41 @@ def zip_app(
         frontend: Whether to zip up the frontend app.
         backend: Whether to zip up the backend app.
         zip_dest_dir: The directory to export the zip file to.
-        upload_db_file: Whether to upload the database file.
+        include_db_file: Whether to include the database file.
+        backend_excluded_dirs: A tuple of files or directories to exclude from the backend zip.  Defaults to ().
     """
     zip_dest_dir = zip_dest_dir or Path.cwd()
     zip_dest_dir = Path(zip_dest_dir)
     files_to_exclude = {
-        constants.ComponentName.FRONTEND.zip(),
-        constants.ComponentName.BACKEND.zip(),
+        Path(constants.ComponentName.FRONTEND.zip()).resolve(),
+        Path(constants.ComponentName.BACKEND.zip()).resolve(),
     }
 
     if frontend:
         _zip(
             component_name=constants.ComponentName.FRONTEND,
             target=zip_dest_dir / constants.ComponentName.FRONTEND.zip(),
-            root_dir=prerequisites.get_web_dir() / constants.Dirs.STATIC,
+            root_directory=prerequisites.get_web_dir() / constants.Dirs.STATIC,
             files_to_exclude=files_to_exclude,
-            exclude_venv_dirs=False,
+            exclude_venv_directories=False,
         )
 
     if backend:
         _zip(
             component_name=constants.ComponentName.BACKEND,
             target=zip_dest_dir / constants.ComponentName.BACKEND.zip(),
-            root_dir=Path.cwd(),
-            dirs_to_exclude={"__pycache__"},
-            files_to_exclude=files_to_exclude,
-            top_level_dirs_to_exclude={"assets"},
-            exclude_venv_dirs=True,
-            upload_db_file=upload_db_file,
+            root_directory=Path.cwd(),
+            directory_names_to_exclude={"__pycache__"},
+            files_to_exclude=files_to_exclude | set(backend_excluded_dirs),
+            exclude_venv_directories=True,
+            include_db_file=include_db_file,
             globs_to_include=[
                 str(Path(constants.Dirs.WEB) / constants.Dirs.BACKEND / "*")
             ],
         )
 
 
-def _duplicate_index_html_to_parent_dir(directory: Path):
+def _duplicate_index_html_to_parent_directory(directory: Path):
     """Duplicate index.html in the child directories to the given directory.
 
     This makes accessing /route and /route/ work in production.
@@ -169,7 +183,7 @@ def _duplicate_index_html_to_parent_dir(directory: Path):
                 else:
                     console.debug(f"Skipping {index_html}, already exists at {target}")
             # Recursively call this function for the child directory.
-            _duplicate_index_html_to_parent_dir(child)
+            _duplicate_index_html_to_parent_directory(child)
 
 
 def build():
@@ -200,7 +214,7 @@ def build():
         },
     )
     processes.show_progress("Creating Production Build", process, checkpoints)
-    _duplicate_index_html_to_parent_dir(wdir / constants.Dirs.STATIC)
+    _duplicate_index_html_to_parent_directory(wdir / constants.Dirs.STATIC)
     path_ops.cp(
         wdir / constants.Dirs.STATIC / constants.ReactRouter.SPA_FALLBACK,
         wdir / constants.Dirs.STATIC / "404.html",
@@ -247,6 +261,6 @@ def setup_frontend_prod(
     build()
 
 
-def _looks_like_venv_dir(dir_to_check: str | Path) -> bool:
-    dir_to_check = Path(dir_to_check)
-    return (dir_to_check / "pyvenv.cfg").exists()
+def _looks_like_venv_directory(directory_to_check: str | Path) -> bool:
+    directory_to_check = Path(directory_to_check)
+    return (directory_to_check / "pyvenv.cfg").exists()

reflex/utils/exec.py

@@ -497,6 +497,7 @@ HOTRELOAD_IGNORE_EXTENSIONS = (
     "sh",
     "bash",
     "log",
+    "db",
 )
 
 HOTRELOAD_IGNORE_PATTERNS = (

reflex/utils/export.py

@@ -18,6 +18,7 @@ def export(
     deploy_url: str | None = None,
     env: constants.Env = constants.Env.PROD,
     loglevel: constants.LogLevel = console._LOG_LEVEL,
+    backend_excluded_dirs: tuple[Path, ...] = (),
 ):
     """Export the app to a zip file.
 
@@ -31,6 +32,7 @@ def export(
         deploy_url: The deploy URL to use. Defaults to None.
         env: The environment to use. Defaults to constants.Env.PROD.
         loglevel: The log level to use. Defaults to console._LOG_LEVEL.
+        backend_excluded_dirs: A tuple of files or directories to exclude from the backend zip.  Defaults to ().
     """
     config = get_config()
 
@@ -70,7 +72,8 @@ def export(
             frontend=frontend,
             backend=backend,
             zip_dest_dir=zip_dest_dir,
-            upload_db_file=upload_db_file,
+            include_db_file=upload_db_file,
+            backend_excluded_dirs=backend_excluded_dirs,
         )
 
     # Post a telemetry event.

reflex/utils/token_manager.py

@@ -66,6 +66,16 @@ class TokenManager(ABC):
 
         return LocalTokenManager()
 
+    async def disconnect_all(self):
+        """Disconnect all tracked tokens when the server is going down."""
+        token_sid_pairs: set[tuple[str, str]] = set(self.token_to_sid.items())
+        token_sid_pairs.update(
+            ((token, sid) for sid, token in self.sid_to_token.items())
+        )
+        # Perform the disconnection logic here
+        for token, sid in token_sid_pairs:
+            await self.disconnect_token(token, sid)
+
 
 class LocalTokenManager(TokenManager):
     """Token manager using local in-memory dictionaries (single worker)."""

reflex/utils/types.py

@@ -6,6 +6,7 @@ import dataclasses
 import sys
 import types
 from collections.abc import Callable, Iterable, Mapping, Sequence
+from enum import Enum
 from functools import cached_property, lru_cache
 from types import GenericAlias
 from typing import (  # noqa: UP035
@@ -1241,6 +1242,7 @@ IMMUTABLE_TYPES = (
     frozenset,
     tuple,
     type(None),
+    Enum,
 )
 
 

{reflex-0.8.12a1.dist-info → reflex-0.8.12a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex
-Version: 0.8.12a1
+Version: 0.8.12a2
 Summary: Web apps in pure Python.
 Project-URL: homepage, https://reflex.dev
 Project-URL: repository, https://github.com/reflex-dev/reflex

{reflex-0.8.12a1.dist-info → reflex-0.8.12a2.dist-info}/RECORD

@@ -2,7 +2,7 @@ reflex/__init__.py,sha256=_1PVYjDeA6_JyfXvL6OuKjjO6AX2oMiNcAq8AEHf6xw,10161
 reflex/__init__.pyi,sha256=0D46kHVUJPE_kgYL-BjraERu-MXNCPsQTZQShrijmeQ,10148
 reflex/__main__.py,sha256=6cVrGEyT3j3tEvlEVUatpaYfbB5EF3UVY-6vc_Z7-hw,108
 reflex/admin.py,sha256=Nbc38y-M8iaRBvh1W6DQu_D3kEhO8JFvxrog4q2cB_E,434
-reflex/app.py,sha256=K3HgJEVKOVEINNOGc8mIT7NIwLolnzs6aUBObm5zJ64,78485
+reflex/app.py,sha256=LCIj6hU3AbJJpVipG3AIBJfNK1eKGjn_SRTtg5MH2vw,78526
 reflex/assets.py,sha256=l5O_mlrTprC0lF7Rc_McOe3a0OtSLnRdNl_PqCpDCBA,3431
 reflex/base.py,sha256=Oh664QL3fZEHErhUasFqP7fE4olYf1y-9Oj6uZI2FCU,1173
 reflex/config.py,sha256=LsHAtdH4nkSn3q_Ie-KNdOGdflLXrFICUQov29oFjVk,21229
@@ -11,11 +11,11 @@ reflex/event.py,sha256=e2EIBmLF63KRw4GXSbuiQ6yDp1-YQHHIxJKenTra9vk,76223
 reflex/model.py,sha256=2QhU1TJlcDeRA23pv8usLjyDaA6FhbQRYdzsjOHzvUI,19665
 reflex/page.py,sha256=ssCbMVFuIy60vH-YhJUzN0OxzUwXFCCD3ej56dVjp3g,3525
 reflex/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reflex/reflex.py,sha256=qKpWvXuA55y519MWckr6oxKSf3pCQfRCrvzsyXSuAqk,22729
+reflex/reflex.py,sha256=5R-NYJCrlmZoOdIGnO1NyBdNLQjfpqiJNaPuLXaxvzY,23459
 reflex/route.py,sha256=TnS4m6Hm-b3LfGFpm37iAMEd-_JISAouPW5FqUxTAfU,7858
-reflex/state.py,sha256=gqQNmLGdrG9sxivfbyE1bHrLSlYZarbQCt6PtPaWO2w,94991
+reflex/state.py,sha256=wQ4ozzgeTQHVeX4-zHhQfyHHDaykHdka6B5xGvo-5UQ,95000
 reflex/style.py,sha256=Jc7hZyH9CSFDbweoRCrkVtSu8tZq5aIggSoAYAh-w1M,13304
-reflex/testing.py,sha256=wLhvUdvTa6jPDkfdWLOYt69piX1KFhYxZfEjQzWfJo0,39902
+reflex/testing.py,sha256=Wt1qdmqT3Yo9CKWZzHXiytizZJ5KjqxVzuoGPjI_Vfk,40458
 reflex/.templates/apps/blank/assets/favicon.ico,sha256=baxxgDAQ2V4-G5Q4S2yK5uUJTUGkv-AOWBQ0xd6myUo,4286
 reflex/.templates/apps/blank/code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reflex/.templates/apps/blank/code/blank.py,sha256=wry9E3VjC7qtt_gzqNOyo4KZAAlzVyNp3uhFkcLZmM0,898
@@ -30,7 +30,7 @@ reflex/.templates/web/components/reflex/radix_themes_color_mode_provider.js,sha2
 reflex/.templates/web/components/shiki/code.js,sha256=4Es1pxsr-lX4hTQ5mglrwwC6O_SI-z-O60k03z8VFzQ,1144
 reflex/.templates/web/styles/__reflex_style_reset.css,sha256=qbC6JIT643YEsvSQ0D7xBmWE5vXy94JGrKNihRuEjnA,8913
 reflex/.templates/web/utils/react-theme.js,sha256=Aa-RND3ooGCXW6Zavzitc-v0ciKlcQDTFlDtE4mPkFI,2713
-reflex/.templates/web/utils/state.js,sha256=Hqx-h7bGSSaaHA0z_6sEWWqv6V08LFa8nh_nPKOhEf0,32155
+reflex/.templates/web/utils/state.js,sha256=RdNHwQzS_iP0Z_fx-H4pjVjl-qUoz31JLvwPwcp0F-s,33046
 reflex/.templates/web/utils/helpers/dataeditor.js,sha256=pG6MgsHuStDR7-qPipzfiK32j9bKDBa-4hZ0JSUo4JM,1623
 reflex/.templates/web/utils/helpers/debounce.js,sha256=xGhtTRtS_xIcaeqnYVvYJNseLgQVk-DW-eFiHJYO9As,528
 reflex/.templates/web/utils/helpers/paste.js,sha256=ef30HsR83jRzzvZnl8yV79yqFP8TC_u8SlN99cCS_OM,1799
@@ -38,11 +38,11 @@ reflex/.templates/web/utils/helpers/range.js,sha256=Bjr7Ex1Mghpsopjfrcp__IVFw8F8
 reflex/.templates/web/utils/helpers/throttle.js,sha256=qxeyaEojaTeX36FPGftzVWrzDsRQU4iqg3U9RJz9Vj4,566
 reflex/.templates/web/utils/helpers/upload.js,sha256=YiAv-KC-LijTsEmzG_o6YxUprgSN7Pbyd__xu8HTX6s,4814
 reflex/app_mixins/__init__.py,sha256=Oegz3-gZLP9p2OAN5ALNbsgxuNQfS6lGZgQA8cc-9mQ,137
-reflex/app_mixins/lifespan.py,sha256=a156ZUYVo2bN1Tv-4WmWSjojo90PP_2-V12BX0q8YNw,3543
+reflex/app_mixins/lifespan.py,sha256=_JMloSOpmpPpAPpVMYO42LW3-6DxPbx0fcRsC2VVyM8,4028
 reflex/app_mixins/middleware.py,sha256=BKhe0jUFO1_TylEC48LUZyaeYyPmAYW-NV4H5Rw221k,2848
 reflex/app_mixins/mixin.py,sha256=R1YncalqDrbdPZvpKVbm72ZKmQZxYAWfuFq9JknzTqQ,305
 reflex/compiler/__init__.py,sha256=r8jqmDSFf09iV2lHlNhfc9XrTLjNxfDNwPYlxS4cmHE,27
-reflex/compiler/compiler.py,sha256=rE0aMl_xwq-qvPd6fgvUV_F4qaMiNKo_82LfCKbX258,29114
+reflex/compiler/compiler.py,sha256=-MnavauFrb9xmePf0VsFB0vLlE6Nr5zY8x7kne2Uzvg,29156
 reflex/compiler/templates.py,sha256=ucfkEMOGA49ceUnL1KXDP_oHKxPrELSKWtRgtXUVHjk,20547
 reflex/compiler/utils.py,sha256=RmeUoZMHdIfnqPl-p0ToPgwd0FEFO5u0Xbb-J20UYdQ,19621
 reflex/components/__init__.py,sha256=eWpgWFbSQDj2TpGp6StEbxU7roQgzY7ZM0XIcIc5RE8,588
@@ -95,7 +95,7 @@ reflex/components/core/match.py,sha256=xBB9vtWgVlotPHq6ssng8lzxwXDDQLp9k6Ew5RPPd
 reflex/components/core/responsive.py,sha256=ACZdtJ4a4F8B3dm1k8h6J2_UJx0Z5LDB7XHQ2ty4wAc,1911
 reflex/components/core/sticky.py,sha256=2B3TxrwG2Rtp_lv1VkMOIF2bqSiT7qYGbqbiZiMKxKY,3856
 reflex/components/core/sticky.pyi,sha256=5D-yT0LYs0ewOlUlInU7KCpuz49yKK7dirysUs1C2VI,32908
-reflex/components/core/upload.py,sha256=OEjXq4O06YSoRlJvYs-hyFJgo7GzQJByO9RqPI1RUzc,13585
+reflex/components/core/upload.py,sha256=V0vIYig6XoOstQY2KDH88OYmLYPuSzkQopEYm3GZ81E,15195
 reflex/components/core/upload.pyi,sha256=UqfcPGUs8xmnKHKuvqYV7CtOXeF_D1s9ooRe49w6C3E,15757
 reflex/components/core/window_events.py,sha256=opbuO20zVxt252kQLk49V7cltb_Um2oh7iePeGNJ538,3355
 reflex/components/core/window_events.pyi,sha256=aTkBiAy-e9LqkQm6_apRsXXfJRdawA11cE1tQQSIy3c,3206
@@ -330,7 +330,7 @@ reflex/istate/__init__.py,sha256=afq_pCS5B_REC-Kl3Rbaa538uWi59xNz4INeuENcWnk,203
 reflex/istate/data.py,sha256=8RydiarP7f5ET5a3dfGpuuXdYZ7KHEWS6aENVoxRxGc,7918
 reflex/istate/dynamic.py,sha256=xOQ9upZVPf6ngqcLQZ9HdAAYmoWwJ8kRFPH34Q5HTiM,91
 reflex/istate/manager.py,sha256=WyBBhDuq3cVuno3H-axeT8sqF0EqHR3MNZJw-B76cZs,30517
-reflex/istate/proxy.py,sha256=Q8JrV1m6drVcTNJL9JuN-nKUXclazs96OHl_fhR0UBk,25928
+reflex/istate/proxy.py,sha256=4SE3-W6OpHA51JlLdz5Kbslpusp5xOUQI91nmzpH8Xo,25825
 reflex/istate/storage.py,sha256=gCPoiZxuG-Rw0y-Pz3OC7rv4o08dQ_jK1fE2u8Jhxqg,4339
 reflex/istate/wrappers.py,sha256=p8uuioXRbR5hperwbOJHUcWdu7hukLikQdoR7qrnKsI,909
 reflex/middleware/__init__.py,sha256=x7xTeDuc73Hjj43k1J63naC9x8vzFxl4sq7cCFBX7sk,111
@@ -344,14 +344,14 @@ reflex/plugins/sitemap.py,sha256=X_CtH5B1w3CZno-gdPj1rp63WjOuNjFnX4B3fx_-VFQ,613
 reflex/plugins/tailwind_v3.py,sha256=jCEZ5UYdr706Mw48L-WSHOUB6O55o1C3uG6AMwXqZoI,4810
 reflex/plugins/tailwind_v4.py,sha256=fcNaFtikSIu1LhF94DcBs1xR2CjbQRB5o1_KYeThUF0,5230
 reflex/utils/__init__.py,sha256=y-AHKiRQAhk2oAkvn7W8cRVTZVK625ff8tTwvZtO7S4,24
-reflex/utils/build.py,sha256=GLT2ycqgAe1cw__MFbfdlYrkzcTnY1oJ8cAv80jEcnQ,8641
+reflex/utils/build.py,sha256=wwpG1K5WZGbMSsX9iF8hA5kJCbawtJizRlkotgovzQs,9287
 reflex/utils/codespaces.py,sha256=kEQ-j-jclTukFpXDlYgNp95kYMGDrQmP3VNEoYGZ1u4,3052
 reflex/utils/compat.py,sha256=aSJH_M6iomgHPQ4onQ153xh1MWqPi3HSYDzE68N6gZM,2635
 reflex/utils/console.py,sha256=W41Ogj1Jk8tEOhXXy9dy4KCLYp5rn0NZQwbBqXbkwSI,13668
 reflex/utils/decorator.py,sha256=QUZntENupeW5FA5mNRTx0I1GzGKFQXhMjVg24_IIM5o,3957
 reflex/utils/exceptions.py,sha256=Wwu7Ji2xgq521bJKtU2NgjwhmFfnG8erirEVN2h8S-g,8884
-reflex/utils/exec.py,sha256=x0I45o0JTB2vj2CYi5SdnTiRXIe8uu2pXCRFqESz5Uw,21960
-reflex/utils/export.py,sha256=Z2AHuhkxGQzOi9I90BejQ4qEcD0URr2i-ZU5qTJt7eQ,2562
+reflex/utils/exec.py,sha256=RsUpJsXLoQKMF4tMWPKP2xjvKcDP1OyNXU0gC__7RSU,21970
+reflex/utils/export.py,sha256=jQvOP09LVlCpznsOWqZ9AQzBHwyhZPcDqZ5iuAvrVNM,2783
 reflex/utils/format.py,sha256=-EC0tfx7VCIijcuJx9l-ArRnRnPKrrrW8RgsKwXIoBc,21115
 reflex/utils/frontend_skeleton.py,sha256=8sXRmVsKUiWf6O5rA1RRR_E4YjEsqDdIQlkUByp3aOI,8774
 reflex/utils/imports.py,sha256=SlQfMTbJasXHxrpcHdWKPWiIZ1Kn2-tulMF32_YA2ek,4262
@@ -370,8 +370,8 @@ reflex/utils/rename.py,sha256=qdE4SXHOaNs-TDGrnJz-h_nvLWA1C5osVrWb4wLSfyI,5262
 reflex/utils/serializers.py,sha256=ZqQ2xrBIyOXaN0RIRZwy2oU5O0Y1R0SEGWx-kf5rXMs,13938
 reflex/utils/telemetry.py,sha256=KY54NmGWyJVSf9TMTcXw2V6gIbEqut1JkAXmmtIlRfw,10776
 reflex/utils/templates.py,sha256=tWo3jO6laQX8b0gUsqHkio_hUQGIvFbmXC-lxiGcdRo,14251
-reflex/utils/token_manager.py,sha256=o_HGbqT9WfYRmek2iY9nem4vDZMz8Q4Dra-eW1lKmuA,6999
-reflex/utils/types.py,sha256=Xh9jXSMBgwrR-Whn_5qAnjqQWzHiIJbm1b8qwMG4QmY,38511
+reflex/utils/token_manager.py,sha256=ZtrYR0X8tTs8FpQHtMb09-H2V1xSoLWwVH8jW8OCrU8,7445
+reflex/utils/types.py,sha256=v2shXUDPqsgrxXDwrP9JYYgSTwZht0YjAo5c1mDDI8M,38543
 reflex/vars/__init__.py,sha256=85eXMt32bFoKtMdH3KxYRMD8mtnKyYiQcThPxJLoW1k,1359
 reflex/vars/base.py,sha256=LKnjDvg7_XKzPZlDD9WfYbWzyMoSjiZ7Bdt4sICjW60,113344
 reflex/vars/datetime.py,sha256=F2Jv_bfydipFSkIQ1F6x5MnSgFEyES9Vq5RG_uGH81E,5118
@@ -381,8 +381,8 @@ reflex/vars/number.py,sha256=tO7pnvFaBsedq1HWT4skytnSqHWMluGEhUbjAUMx8XQ,28190
 reflex/vars/object.py,sha256=p7dyn9rD6rVJlHQ_RcDTBgsU_AlbwYklGjx1HK3XxZg,16565
 reflex/vars/sequence.py,sha256=1kBrqihspyjyQ1XDqFPC8OpVGtZs_EVkOdIKBro5ilA,55249
 scripts/hatch_build.py,sha256=-4pxcLSFmirmujGpQX9UUxjhIC03tQ_fIQwVbHu9kc0,1861
-reflex-0.8.12a1.dist-info/METADATA,sha256=1mlLvn8KLKt-7gFEixs_LGbugmbrrPoBDb_pLdG684w,12336
-reflex-0.8.12a1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reflex-0.8.12a1.dist-info/entry_points.txt,sha256=Rxt4dXc7MLBNt5CSHTehVPuSe9Xqow4HLX55nD9tQQ0,45
-reflex-0.8.12a1.dist-info/licenses/LICENSE,sha256=dw3zLrp9f5ObD7kqS32vWfhcImfO52PMmRqvtxq_YEE,11358
-reflex-0.8.12a1.dist-info/RECORD,,
+reflex-0.8.12a2.dist-info/METADATA,sha256=6T1DqZw5zqu08qGQf6voKyO5NSIrhbMkzsvHPa7SaT8,12336
+reflex-0.8.12a2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reflex-0.8.12a2.dist-info/entry_points.txt,sha256=Rxt4dXc7MLBNt5CSHTehVPuSe9Xqow4HLX55nD9tQQ0,45
+reflex-0.8.12a2.dist-info/licenses/LICENSE,sha256=dw3zLrp9f5ObD7kqS32vWfhcImfO52PMmRqvtxq_YEE,11358
+reflex-0.8.12a2.dist-info/RECORD,,