Merge remote-tracking branch 'origin/main' into masenf/catch-all-exceptions-in-health-check

masenf · masenf · commit 3da46a58ec78 · 2026-02-12T10:01:00.000-08:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "reflex"
-version = "0.8.26dev1"
+version = "0.8.27dev1"
 description = "Web apps in pure Python."
 license.text = "Apache-2.0"
 authors = [
@@ -24,7 +24,7 @@ dependencies = [
   "click >=8.2",
   "granian[reload] >=2.5.5",
   "httpx >=0.23.3,<1.0",
-  "packaging >=24.2,<26",
+  "packaging >=24.2,<27",
   "platformdirs >=4.3.7,<5.0",
   "psutil >=7.0.0,<8.0; sys_platform == 'win32'",
   "pydantic >=1.10.21,<3.0",
@@ -156,6 +156,7 @@ lint.ignore = [
   "PT012",
   "PYI",
   "RUF012",
+  "RUF067",
   "S",
   "SLF",
   "SLOT",
@@ -243,7 +244,7 @@ fail_fast = true
 
 [[tool.pre-commit.repos]]
 repo = "https://github.com/astral-sh/ruff-pre-commit"
-rev = "v0.14.9"
+rev = "v0.14.13"
 hooks = [
   { id = "ruff-format", args = [
     "reflex",
@@ -275,7 +276,7 @@ hooks = [
 
 [[tool.pre-commit.repos]]
 repo = "https://github.com/RobertCraigie/pyright-python"
-rev = "v1.1.407"
+rev = "v1.1.408"
 hooks = [{ id = "pyright", args = ["reflex", "tests"], language = "system" }]
 
 [[tool.pre-commit.repos]]
diff --git a/reflex/.templates/web/utils/state.js b/reflex/.templates/web/utils/state.js
@@ -89,6 +89,9 @@ export const getToken = () => {
  * @returns The given URL modified to point to the actual backend server.
  */
 export const getBackendURL = (url_str) => {
+  if ((url_str ?? undefined) === undefined) {
+    url_str = env.PING;
+  }
   // Get backend URL object from the endpoint.
   const endpoint = new URL(url_str);
   if (
@@ -443,6 +446,16 @@ export const applyRestEvent = async (event, socket, navigate, params) => {
   return eventSent;
 };
 
+/**
+ * Resolve a socket reference to the actual socket object.
+ * Handles both ref objects ({ current: Socket }) and raw sockets.
+ * @param socket Either a ref object or raw socket.
+ * @returns The actual socket object.
+ */
+const resolveSocket = (socket) => {
+  return socket?.current ?? socket;
+};
+
 /**
  * Queue events to be processed and trigger processing of queue.
  * @param events Array of events to queue.
@@ -468,7 +481,7 @@ export const queueEvents = async (
     ];
   }
   event_queue.push(...events.filter((e) => e !== undefined && e !== null));
-  await processEvent(socket.current, navigate, params);
+  await processEvent(resolveSocket(socket), navigate, params);
 };
 
 /**
diff --git a/reflex/app.py b/reflex/app.py
@@ -2109,8 +2109,10 @@ def on_disconnect(self, sid: str) -> asyncio.Task | None:
             )
             # Don't await to avoid blocking disconnect, but handle potential errors
             task.add_done_callback(
-                lambda t: t.exception()
-                and console.error(f"Token cleanup error: {t.exception()}")
+                lambda t: (
+                    t.exception()
+                    and console.error(f"Token cleanup error: {t.exception()}")
+                )
             )
             return task
         return None
@@ -2218,7 +2220,8 @@ async def on_event(self, sid: str, data: Any):
 
         # Unroll reverse proxy forwarded headers.
         client_ip = (
-            headers.get(
+            headers
+            .get(
                 "x-forwarded-for",
                 client_ip,
             )
diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py
@@ -210,7 +210,8 @@ def _validate_stylesheet(stylesheet_full_path: Path, assets_app_path: Path) -> N
         raise ValueError(msg)
     if (
         len(
-            stylesheet_full_path.absolute()
+            stylesheet_full_path
+            .absolute()
             .relative_to(assets_app_path.absolute())
             .parts
         )
diff --git a/reflex/components/base/error_boundary.py b/reflex/components/base/error_boundary.py
@@ -36,7 +36,7 @@ def on_error_spec(
 class ErrorBoundary(Component):
     """A React Error Boundary component that catches unhandled frontend exceptions."""
 
-    library = "react-error-boundary@6.0.3"
+    library = "react-error-boundary@6.1.0"
     tag = "ErrorBoundary"
 
     # Fired when the boundary catches an error.
diff --git a/reflex/components/core/debounce.py b/reflex/components/core/debounce.py
@@ -111,6 +111,7 @@ def create(cls, *children: Component, **props: Any) -> Component:
         child_ref = child.get_ref()
         if props.get("input_ref") is None and child_ref:
             props["input_ref"] = Var(_js_expr=child_ref, _var_type=str)
+        if child.id is not None:
             props["id"] = child.id
 
         # Set the child element to wrap, including any imports/hooks from the child.
@@ -132,8 +133,8 @@ def create(cls, *children: Component, **props: Any) -> Component:
         component.children = child.children
         component._rename_props = child._rename_props  # pyright: ignore[reportAttributeAccessIssue]
         outer_get_all_custom_code = component._get_all_custom_code
-        component._get_all_custom_code = lambda: outer_get_all_custom_code() | (
-            child._get_all_custom_code()
+        component._get_all_custom_code = lambda: (
+            outer_get_all_custom_code() | (child._get_all_custom_code())
         )
         return component
 
diff --git a/reflex/components/core/upload.py b/reflex/components/core/upload.py
@@ -192,7 +192,8 @@ def _format_rejected_file_record(rf: ObjectVar[dict[str, Any]]) -> str:
 
     return toast.error(
         title="Files not Accepted",
-        description=rejected_files.to(ArrayVar)
+        description=rejected_files
+        .to(ArrayVar)
         .foreach(_format_rejected_file_record)
         .join("\n\n"),
         close_button=True,
diff --git a/reflex/components/datadisplay/code.py b/reflex/components/datadisplay/code.py
@@ -501,7 +501,8 @@ def _render(self):
         theme = self.theme
 
         return (
-            out.add_props(style=theme)
+            out
+            .add_props(style=theme)
             .remove_props("theme", "code")
             .add_props(
                 children=self.code,
diff --git a/reflex/components/dynamic.py b/reflex/components/dynamic.py
@@ -119,7 +119,8 @@ def make_component(component: Component) -> str:
             if line.startswith("import "):
                 if 'from "$/' in line or 'from "/' in line:
                     module_code_lines[ix] = (
-                        line.replace("import ", "const ", 1)
+                        line
+                        .replace("import ", "const ", 1)
                         .replace(" as ", ": ")
                         .replace(" from ", " = window['__reflex'][", 1)
                         + "]"
@@ -128,7 +129,8 @@ def make_component(component: Component) -> str:
                     for lib in libs_in_window:
                         if f'from "{lib}"' in line:
                             module_code_lines[ix] = (
-                                line.replace("import ", "const ", 1)
+                                line
+                                .replace("import ", "const ", 1)
                                 .replace(
                                     f' from "{lib}"', f" = window.__reflex['{lib}']", 1
                                 )
diff --git a/reflex/components/sonner/toast.py b/reflex/components/sonner/toast.py
@@ -280,7 +280,8 @@ def send_toast(
                 toast_ref.bool(),
                 toast,
                 FunctionVar("window.alert").call(
-                    Var.create(
+                    Var
+                    .create(
                         message
                         if isinstance(message, str) and message
                         else props.get("title", props.get("description", ""))
diff --git a/reflex/constants/installer.py b/reflex/constants/installer.py
@@ -14,7 +14,7 @@ class Bun(SimpleNamespace):
     """Bun constants."""
 
     # The Bun version.
-    VERSION = "1.3.5"
+    VERSION = "1.3.6"
 
     # Min Bun Version
     MIN_VERSION = "1.3.0"
@@ -131,7 +131,7 @@ def DEPENDENCIES(cls) -> dict[str, str]:
             "react": cls._react_version,
             "react-helmet": "6.1.0",
             "react-dom": cls._react_version,
-            "isbot": "5.1.32",
+            "isbot": "5.1.33",
             "socket.io-client": "4.8.3",
             "universal-cookie": "7.2.2",
         }
diff --git a/reflex/event.py b/reflex/event.py
@@ -89,6 +89,7 @@ def substate_token(self) -> str:
 _EVENT_FIELDS: set[str] = {f.name for f in dataclasses.fields(Event)}
 
 BACKGROUND_TASK_MARKER = "_reflex_background_task"
+EVENT_ACTIONS_MARKER = "_rx_event_actions"
 
 
 @dataclasses.dataclass(
@@ -1106,7 +1107,8 @@ def scroll_to(elem_id: str, align_to_top: bool | Var[bool] = True) -> EventSpec:
     get_element_by_id = FunctionStringVar.create("document.getElementById")
 
     return run_script(
-        get_element_by_id.call(elem_id)
+        get_element_by_id
+        .call(elem_id)
         .to(ObjectVar)
         .scrollIntoView.to(FunctionVar)
         .call(align_to_top),
@@ -2310,6 +2312,7 @@ class EventNamespace:
 
     # Constants
     BACKGROUND_TASK_MARKER = BACKGROUND_TASK_MARKER
+    EVENT_ACTIONS_MARKER = EVENT_ACTIONS_MARKER
     _EVENT_FIELDS = _EVENT_FIELDS
     FORM_DATA = FORM_DATA
     upload_files = upload_files
@@ -2460,7 +2463,7 @@ def wrapper(
             # Store decorator event actions on the function for later processing
             event_actions = _build_event_actions()
             if event_actions:
-                func._rx_event_actions = event_actions  # pyright: ignore [reportFunctionMemberAccess]
+                setattr(func, EVENT_ACTIONS_MARKER, event_actions)
             return func  # pyright: ignore [reportReturnType]
 
         if func is not None:
diff --git a/reflex/istate/proxy.py b/reflex/istate/proxy.py
@@ -26,6 +26,7 @@
     from reflex.state import BaseState, StateUpdate
 
 T_STATE = TypeVar("T_STATE", bound="BaseState")
+T = TypeVar("T")
 
 
 class StateProxy(wrapt.ObjectProxy):
@@ -671,19 +672,23 @@ def __deepcopy__(self, memo: dict[int, Any] | None = None) -> Any:
         return copy.deepcopy(self.__wrapped__, memo=memo)
 
     def __reduce_ex__(self, protocol_version: SupportsIndex):
-        """Get the state for redis serialization.
+        """Serialize the wrapped object for pickle, stripping off the proxy.
 
-        This method is called by cloudpickle to serialize the object.
-
-        It explicitly serializes the wrapped object, stripping off the mutable proxy.
+        Returns a function that reconstructs to the wrapped object directly,
+        ensuring pickle's memo system correctly tracks object identity.
 
         Args:
             protocol_version: The protocol version.
 
         Returns:
-            Tuple of (wrapped class, empty args, class __getstate__)
+            Tuple that reconstructs to the wrapped object.
         """
-        return self.__wrapped__.__reduce_ex__(protocol_version)
+        return (_unwrap_for_pickle, (self.__wrapped__,))
+
+
+def _unwrap_for_pickle(obj: T) -> T:
+    """Return the object unchanged. Used by MutableProxy.__reduce_ex__."""
+    return obj
 
 
 @serializer
diff --git a/reflex/reflex.py b/reflex/reflex.py
@@ -801,23 +801,19 @@ def deploy(
         app_name=app_name,
         app_id=app_id,
         export_fn=(
-            lambda zip_dest_dir,
-            api_url,
-            deploy_url,
-            frontend,
-            backend,
-            upload_db,
-            zipping: export_utils.export(
-                zip_dest_dir=zip_dest_dir,
-                api_url=api_url,
-                deploy_url=deploy_url,
-                frontend=frontend,
-                backend=backend,
-                zipping=zipping,
-                loglevel=config.loglevel.subprocess_level(),
-                upload_db_file=upload_db,
-                backend_excluded_dirs=backend_excluded_dirs,
-                prerender_routes=ssr,
+            lambda zip_dest_dir, api_url, deploy_url, frontend, backend, upload_db, zipping: (
+                export_utils.export(
+                    zip_dest_dir=zip_dest_dir,
+                    api_url=api_url,
+                    deploy_url=deploy_url,
+                    frontend=frontend,
+                    backend=backend,
+                    zipping=zipping,
+                    loglevel=config.loglevel.subprocess_level(),
+                    upload_db_file=upload_db,
+                    backend_excluded_dirs=backend_excluded_dirs,
+                    prerender_routes=ssr,
+                )
             )
         ),
         regions=list(region),
diff --git a/reflex/state.py b/reflex/state.py
@@ -42,6 +42,7 @@
 from reflex.environment import PerformanceMode, environment
 from reflex.event import (
     BACKGROUND_TASK_MARKER,
+    EVENT_ACTIONS_MARKER,
     Event,
     EventHandler,
     EventSpec,
@@ -686,6 +687,9 @@ def _copy_fn(fn: Callable) -> Callable:
         newfn.__annotations__ = fn.__annotations__
         if mark := getattr(fn, BACKGROUND_TASK_MARKER, None):
             setattr(newfn, BACKGROUND_TASK_MARKER, mark)
+        # Preserve event_actions from @rx.event decorator
+        if event_actions := getattr(fn, EVENT_ACTIONS_MARKER, None):
+            object.__setattr__(newfn, EVENT_ACTIONS_MARKER, event_actions)
         return newfn
 
     @staticmethod
@@ -1163,7 +1167,7 @@ def _create_event_handler(
             The event handler.
         """
         # Check if function has stored event_actions from decorator
-        event_actions = getattr(fn, "_rx_event_actions", {})
+        event_actions = getattr(fn, EVENT_ACTIONS_MARKER, {})
 
         return event_handler_cls(
             fn=fn, state_full_name=cls.get_full_name(), event_actions=event_actions
diff --git a/reflex/utils/pyi_generator.py b/reflex/utils/pyi_generator.py
@@ -574,7 +574,8 @@ def figure_out_return_type(annotation: Any):
 
         if isinstance(annotation, str) and annotation.lower().startswith("tuple["):
             inside_of_tuple = (
-                annotation.removeprefix("tuple[")
+                annotation
+                .removeprefix("tuple[")
                 .removeprefix("Tuple[")
                 .removesuffix("]")
             )
diff --git a/tests/integration/test_deploy_url.py b/tests/integration/test_deploy_url.py
@@ -97,7 +97,9 @@ def test_deploy_url_in_app(deploy_url_sample: AppHarness, driver: WebDriver) ->
     driver.find_element(By.ID, "goto_self").click()
 
     WebDriverWait(driver, 10).until(
-        lambda driver: deploy_url_sample.frontend_url
-        and driver.current_url.removesuffix("/")
-        == deploy_url_sample.frontend_url.removesuffix("/")
+        lambda driver: (
+            deploy_url_sample.frontend_url
+            and driver.current_url.removesuffix("/")
+            == deploy_url_sample.frontend_url.removesuffix("/")
+        )
     )
diff --git a/tests/integration/test_event_actions.py b/tests/integration/test_event_actions.py
@@ -145,9 +145,11 @@ def index():
             rx.button(
                 "Throttle",
                 id="btn-throttle",
-                on_click=lambda: EventActionState.on_click_throttle.throttle(  # pyright: ignore [reportFunctionMemberAccess]
-                    200
-                ).stop_propagation,
+                on_click=lambda: (
+                    EventActionState.on_click_throttle.throttle(  # pyright: ignore [reportFunctionMemberAccess]
+                        200
+                    ).stop_propagation
+                ),
             ),
             rx.button(
                 "Debounce",
diff --git a/tests/integration/test_input.py b/tests/integration/test_input.py
diff --git a/tests/units/compiler/test_compiler.py b/tests/units/compiler/test_compiler.py
diff --git a/tests/units/components/core/test_colors.py b/tests/units/components/core/test_colors.py
diff --git a/tests/units/components/core/test_match.py b/tests/units/components/core/test_match.py
diff --git a/tests/units/istate/test_proxy.py b/tests/units/istate/test_proxy.py
diff --git a/tests/units/test_state.py b/tests/units/test_state.py
diff --git a/tests/units/utils/test_format.py b/tests/units/utils/test_format.py
diff --git a/uv.lock b/uv.lock
