Merge branch 'main' into release/reflex-0.8.0

Author: adhami3310

reflex/.templates/jinja/web/pages/_app.js.jinja2

@@ -2,7 +2,7 @@
 {% from "web/pages/macros.js.jinja2" import renderHooks %}
 
 {% block early_imports %}
-import '$/styles/__reflex_global_styles.css'
+import reflexGlobalStyles from '$/styles/__reflex_global_styles.css?url';
 {% endblock %}
 
 {% block declaration %}
@@ -20,6 +20,10 @@ import * as {{library_alias}} from "{{library_path}}";
 {% endblock %}
 
 {% block export %}
+export const links = () => [
+  { rel: 'stylesheet', href: reflexGlobalStyles, type: 'text/css' }
+];
+
 function AppWrap({children}) {
   {{ renderHooks(hooks) }}
 

reflex/constants/installer.py

@@ -130,6 +130,7 @@ def DEPENDENCIES(cls) -> dict[str, str]:
             "@react-router/node": cls._react_router_version,
             "serve": "14.2.4",
             "react": cls._react_version,
+            "react-helmet": "6.1.0",
             "react-dom": cls._react_version,
             "isbot": "5.1.26",
             "socket.io-client": "4.8.1",

reflex/testing.py

@@ -22,7 +22,7 @@
 from collections.abc import AsyncIterator, Callable, Coroutine, Sequence
 from http.server import SimpleHTTPRequestHandler
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, TypeVar
+from typing import TYPE_CHECKING, Any, Literal, TypeVar
 
 import psutil
 import uvicorn
@@ -526,7 +526,7 @@ def _poll_for(
         target: Callable[[], T],
         timeout: TimeoutType = None,
         step: TimeoutType = None,
-    ) -> T | bool:
+    ) -> T | Literal[False]:
         """Generic polling logic.
 
         Args:
@@ -544,9 +544,10 @@ def _poll_for(
             step = POLL_INTERVAL
         deadline = time.time() + timeout
         while time.time() < deadline:
-            success = target()
-            if success:
-                return success
+            with contextlib.suppress(Exception):
+                success = target()
+                if success:
+                    return success
             time.sleep(step)
         return False
 
@@ -850,35 +851,55 @@ def poll_for_clients(self, timeout: TimeoutType = None) -> dict[str, BaseState]:
         return state_manager.states
 
     @staticmethod
-    def poll_for_result(
-        f: Callable[[], T],
-        exception: type[Exception] = Exception,
-        max_attempts: int = 5,
-        seconds_between_attempts: int = 1,
+    def poll_for_or_raise_timeout(
+        target: Callable[[], T],
+        timeout: TimeoutType = None,
+        step: TimeoutType = None,
     ) -> T:
-        """Poll for a result from a function.
+        """Poll target callable for a truthy return value.
+
+        Like `_poll_for`, but raises a `TimeoutError` if the target does not
+        return a truthy value within the timeout.
 
         Args:
-            f: function to call
-            exception: exception to catch
-            max_attempts: maximum number of attempts
-            seconds_between_attempts: seconds to wait between
+            target: callable that returns truthy if polling condition is met.
+            timeout: max polling time
+            step: interval between checking target()
 
         Returns:
-            Result of the function
+            return value of target() if truthy within timeout
 
         Raises:
-            AssertionError: if the function does not return a value
+            TimeoutError: when target does not return a truthy value within timeout
         """
-        attempts = 0
-        while attempts < max_attempts:
-            try:
-                return f()
-            except exception:  # noqa: PERF203
-                attempts += 1
-                time.sleep(seconds_between_attempts)
-        msg = "Function did not return a value"
-        raise AssertionError(msg)
+        result = AppHarness._poll_for(
+            target=target,
+            timeout=timeout,
+            step=step,
+        )
+        if result is False:
+            msg = "Target did not return a truthy value while polling."
+            raise TimeoutError(msg)
+        return result
+
+    @staticmethod
+    def expect(
+        target: Callable[[], T],
+        timeout: TimeoutType = None,
+        step: TimeoutType = None,
+    ):
+        """Expect a target callable to return a truthy value within the timeout.
+
+        Args:
+            target: callable that returns truthy if polling condition is met.
+            timeout: max polling time
+            step: interval between checking target()
+        """
+        AppHarness.poll_for_or_raise_timeout(
+            target=target,
+            timeout=timeout,
+            step=step,
+        )
 
 
 class SimpleHTTPRequestHandlerCustomErrors(SimpleHTTPRequestHandler):

tests/integration/test_background_task.py

@@ -242,10 +242,9 @@ def token(background_task: AppHarness, driver: WebDriver) -> str:
     """
     assert background_task.app_instance is not None
 
-    token_input = background_task.poll_for_result(
+    token_input = AppHarness.poll_for_or_raise_timeout(
         lambda: driver.find_element(By.ID, "token")
     )
-    assert token_input
 
     # wait for the backend connection to send the token
     token = background_task.poll_for_value(token_input, timeout=DEFAULT_TIMEOUT * 2)
@@ -305,10 +304,10 @@ def test_background_task(
         increment_button.click()
     yield_increment_button.click()
     blocking_pause_button.click()
-    assert background_task._poll_for(lambda: counter.text == "620", timeout=40)
-    assert background_task._poll_for(lambda: counter_async_cv.text == "620", timeout=40)
+    AppHarness.expect(lambda: counter.text == "620", timeout=40)
+    AppHarness.expect(lambda: counter_async_cv.text == "620", timeout=40)
     # all tasks should have exited and cleaned up
-    assert background_task._poll_for(
+    AppHarness.expect(
         lambda: not background_task.app_instance._background_tasks  # pyright: ignore [reportOptionalMemberAccess]
     )
 
@@ -333,13 +332,13 @@ def test_nested_async_with_self(
 
     # get a reference to the counter
     counter = driver.find_element(By.ID, "counter")
-    assert background_task._poll_for(lambda: counter.text == "0", timeout=5)
+    AppHarness.expect(lambda: counter.text == "0", timeout=5)
 
     nested_async_with_self_button.click()
-    assert background_task._poll_for(lambda: counter.text == "1", timeout=5)
+    AppHarness.expect(lambda: counter.text == "1", timeout=5)
 
     increment_button.click()
-    assert background_task._poll_for(lambda: counter.text == "2", timeout=5)
+    AppHarness.expect(lambda: counter.text == "2", timeout=5)
 
 
 def test_get_state(
@@ -362,13 +361,13 @@ def test_get_state(
 
     # get a reference to the counter
     counter = driver.find_element(By.ID, "counter")
-    assert background_task._poll_for(lambda: counter.text == "0", timeout=5)
+    AppHarness.expect(lambda: counter.text == "0", timeout=5)
 
     other_state_button.click()
-    assert background_task._poll_for(lambda: counter.text == "12", timeout=5)
+    AppHarness.expect(lambda: counter.text == "12", timeout=5)
 
     increment_button.click()
-    assert background_task._poll_for(lambda: counter.text == "13", timeout=5)
+    AppHarness.expect(lambda: counter.text == "13", timeout=5)
 
 
 def test_yield_in_async_with_self(
@@ -392,7 +391,7 @@ def test_yield_in_async_with_self(
 
     # get a reference to the counter
     counter = driver.find_element(By.ID, "counter")
-    assert background_task._poll_for(lambda: counter.text == "0", timeout=5)
+    AppHarness.expect(lambda: counter.text == "0", timeout=5)
 
     yield_in_async_with_self_button.click()
-    assert background_task._poll_for(lambda: counter.text == "2", timeout=5)
+    AppHarness.expect(lambda: counter.text == "2", timeout=5)

tests/integration/test_client_storage.py

@@ -252,10 +252,9 @@ async def test_client_side_state(
     assert client_side.frontend_url is not None
 
     def poll_for_token():
-        token_input = client_side.poll_for_result(
+        token_input = AppHarness.poll_for_or_raise_timeout(
             lambda: driver.find_element(By.ID, "token")
         )
-        assert token_input
 
         # wait for the backend connection to send the token
         token = client_side.poll_for_value(token_input)
@@ -267,8 +266,8 @@ def set_sub(var: str, value: str):
         state_var_input = driver.find_element(By.ID, "state_var")
         input_value_input = driver.find_element(By.ID, "input_value")
         set_sub_state_button = driver.find_element(By.ID, "set_sub_state")
-        AppHarness._poll_for(lambda: state_var_input.get_attribute("value") == "")
-        AppHarness._poll_for(lambda: input_value_input.get_attribute("value") == "")
+        AppHarness.expect(lambda: state_var_input.get_attribute("value") == "")
+        AppHarness.expect(lambda: input_value_input.get_attribute("value") == "")
 
         # Set the values.
         state_var_input.send_keys(var)
@@ -280,8 +279,8 @@ def set_sub_sub(var: str, value: str):
         state_var_input = driver.find_element(By.ID, "state_var")
         input_value_input = driver.find_element(By.ID, "input_value")
         set_sub_sub_state_button = driver.find_element(By.ID, "set_sub_sub_state")
-        AppHarness._poll_for(lambda: state_var_input.get_attribute("value") == "")
-        AppHarness._poll_for(lambda: input_value_input.get_attribute("value") == "")
+        AppHarness.expect(lambda: state_var_input.get_attribute("value") == "")
+        AppHarness.expect(lambda: input_value_input.get_attribute("value") == "")
 
         # Set the values.
         state_var_input.send_keys(var)
@@ -418,7 +417,7 @@ def set_sub_sub(var: str, value: str):
             "value": "c1s%20value",
         },
     }
-    AppHarness._poll_for(
+    AppHarness.expect(
         lambda: all(cookie_key in cookie_info_map(driver) for cookie_key in exp_cookies)
     )
     cookies = cookie_info_map(driver)
@@ -429,7 +428,7 @@ def set_sub_sub(var: str, value: str):
 
     # Test cookie with expiry by itself to avoid timing flakiness
     set_sub("c3", "c3 value")
-    AppHarness._poll_for(
+    AppHarness.expect(
         lambda: f"{sub_state_name}.c3" + FIELD_MARKER in cookie_info_map(driver)
     )
     c3_cookie = cookie_info_map(driver)[f"{sub_state_name}.c3" + FIELD_MARKER]
@@ -499,7 +498,7 @@ def set_sub_sub(var: str, value: str):
         driver.get(client_side.frontend_url.removesuffix("/") + "/foo/")
 
     # get new references to all cookie and local storage elements
-    c1 = client_side.poll_for_result(lambda: driver.find_element(By.ID, "c1"))
+    c1 = AppHarness.poll_for_or_raise_timeout(lambda: driver.find_element(By.ID, "c1"))
     c2 = driver.find_element(By.ID, "c2")
     c3 = driver.find_element(By.ID, "c3")
     c4 = driver.find_element(By.ID, "c4")
@@ -541,7 +540,7 @@ def set_sub_sub(var: str, value: str):
     driver.refresh()
 
     # wait for the backend connection to send the token (again)
-    token_input = client_side.poll_for_result(
+    token_input = AppHarness.poll_for_or_raise_timeout(
         lambda: driver.find_element(By.ID, "token")
     )
     assert token_input
@@ -586,7 +585,7 @@ def set_sub_sub(var: str, value: str):
     assert s1s.text == "s1s value"
 
     # make sure c5 cookie shows up on the `/foo` route
-    AppHarness._poll_for(
+    AppHarness.expect(
         lambda: f"{sub_state_name}.c5" + FIELD_MARKER in cookie_info_map(driver)
     )
     assert cookie_info_map(driver)[f"{sub_state_name}.c5" + FIELD_MARKER] == {
@@ -612,15 +611,15 @@ def set_sub_sub(var: str, value: str):
     set_sub("l6", "l6 value")
     l5 = driver.find_element(By.ID, "l5")
     l6 = driver.find_element(By.ID, "l6")
-    assert AppHarness._poll_for(lambda: l6.text == "l6 value")
+    AppHarness.expect(lambda: l6.text == "l6 value")
     assert l5.text == "l5 value"
 
     # Set session storage values in the new tab
     set_sub("s1", "other tab s1")
     s1 = driver.find_element(By.ID, "s1")
     s2 = driver.find_element(By.ID, "s2")
     s3 = driver.find_element(By.ID, "s3")
-    assert AppHarness._poll_for(lambda: s1.text == "other tab s1")
+    AppHarness.expect(lambda: s1.text == "other tab s1")
     assert s2.text == "s2 default"
     assert s3.text == ""
 
@@ -630,13 +629,13 @@ def set_sub_sub(var: str, value: str):
     # The values should have updated automatically.
     l5 = driver.find_element(By.ID, "l5")
     l6 = driver.find_element(By.ID, "l6")
-    assert AppHarness._poll_for(lambda: l6.text == "l6 value")
+    AppHarness.expect(lambda: l6.text == "l6 value")
     assert l5.text == "l5 value"
 
     s1 = driver.find_element(By.ID, "s1")
     s2 = driver.find_element(By.ID, "s2")
     s3 = driver.find_element(By.ID, "s3")
-    assert AppHarness._poll_for(lambda: s1.text == "s1 value")
+    AppHarness.expect(lambda: s1.text == "s1 value")
     assert s2.text == "s2 value"
     assert s3.text == "s3 value"
 
@@ -748,10 +747,9 @@ async def poll_for_c1_set():
     driver.refresh()
 
     # wait for the backend connection to send the token (again)
-    token_input = client_side.poll_for_result(
+    token_input = AppHarness.poll_for_or_raise_timeout(
         lambda: driver.find_element(By.ID, "token")
     )
-    assert token_input
     token = client_side.poll_for_value(token_input)
     assert token is not None
 

tests/integration/test_computed_vars.py

@@ -172,10 +172,9 @@ def token(computed_vars: AppHarness, driver: WebDriver) -> str:
         The token for the connected client
     """
     assert computed_vars.app_instance is not None
-    token_input = computed_vars.poll_for_result(
+    token_input = AppHarness.poll_for_or_raise_timeout(
         lambda: driver.find_element(By.ID, "token")
     )
-    assert token_input
 
     # wait for the backend connection to send the token
     token = computed_vars.poll_for_value(token_input, timeout=DEFAULT_TIMEOUT * 2)

tests/integration/test_connection_banner.py

@@ -148,7 +148,7 @@ async def test_connection_banner(connection_banner: AppHarness):
     driver = connection_banner.frontend()
 
     _assert_token(connection_banner, driver)
-    assert connection_banner._poll_for(lambda: not has_error_modal(driver))
+    AppHarness.expect(lambda: not has_error_modal(driver))
 
     delay_button = driver.find_element(By.ID, "delay")
     increment_button = driver.find_element(By.ID, "increment")
@@ -170,7 +170,7 @@ async def test_connection_banner(connection_banner: AppHarness):
         connection_banner.backend_thread.join()
 
     # Error modal should now be displayed
-    assert connection_banner._poll_for(lambda: has_error_modal(driver))
+    AppHarness.expect(lambda: has_error_modal(driver))
 
     # Increment the counter with backend down
     increment_button.click()
@@ -183,7 +183,7 @@ async def test_connection_banner(connection_banner: AppHarness):
     await connection_banner._reset_backend_state_manager()
 
     # Banner should be gone now
-    assert connection_banner._poll_for(lambda: not has_error_modal(driver))
+    AppHarness.expect(lambda: not has_error_modal(driver))
 
     # Count should have incremented after coming back up
     assert connection_banner.poll_for_value(counter_element, exp_not_equal="1") == "2"
@@ -206,17 +206,17 @@ async def test_cloud_banner(
     driver.add_cookie({"name": "backend-enabled", "value": "truly"})
     driver.refresh()
     _assert_token(connection_banner, driver)
-    assert connection_banner._poll_for(lambda: not has_cloud_banner(driver))
+    AppHarness.expect(lambda: not has_cloud_banner(driver))
 
     driver.add_cookie({"name": "backend-enabled", "value": "false"})
     driver.refresh()
     if simulate_compile_context == constants.CompileContext.DEPLOY:
-        assert connection_banner._poll_for(lambda: has_cloud_banner(driver))
+        AppHarness.expect(lambda: has_cloud_banner(driver))
     else:
         _assert_token(connection_banner, driver)
-        assert connection_banner._poll_for(lambda: not has_cloud_banner(driver))
+        AppHarness.expect(lambda: not has_cloud_banner(driver))
 
     driver.delete_cookie("backend-enabled")
     driver.refresh()
     _assert_token(connection_banner, driver)
-    assert connection_banner._poll_for(lambda: not has_cloud_banner(driver))
+    AppHarness.expect(lambda: not has_cloud_banner(driver))