reflex 0.7.3a2__py3-none-any.whl → 0.7.4a1__py3-none-any.whl

reflex/app.py

@@ -576,6 +576,22 @@ class App(MiddlewareMixin, LifespanMixin):
         """
         if not self.api:
             raise ValueError("The app has not been initialized.")
+
+        # For py3.9 compatibility when redis is used, we MUST add any decorator pages
+        # before compiling the app in a thread to avoid event loop error (REF-2172).
+        self._apply_decorated_pages()
+
+        compile_future = concurrent.futures.ThreadPoolExecutor(max_workers=1).submit(
+            self._compile
+        )
+        compile_future.add_done_callback(
+            # Force background compile errors to print eagerly
+            lambda f: f.result()
+        )
+        # Wait for the compile to finish in prod mode to ensure all optional endpoints are mounted.
+        if is_prod_mode():
+            compile_future.result()
+
         return self.api
 
     def _add_default_endpoints(self):
@@ -1063,7 +1079,7 @@ class App(MiddlewareMixin, LifespanMixin):
                 with stateful_pages_marker.open("r") as f:
                     stateful_pages = json.load(f)
                 for route in stateful_pages:
-                    console.info(f"BE Evaluating stateful page: {route}")
+                    console.debug(f"BE Evaluating stateful page: {route}")
                     self._compile_page(route, save_page=False)
                 self._enable_state()
             self._add_optional_endpoints()

reflex/compiler/compiler.py

@@ -19,6 +19,7 @@ from reflex.components.component import (
 from reflex.config import environment, get_config
 from reflex.state import BaseState
 from reflex.style import SYSTEM_COLOR_MODE
+from reflex.utils import console, path_ops
 from reflex.utils.exec import is_prod_mode
 from reflex.utils.imports import ImportVar
 from reflex.utils.prerequisites import get_web_dir
@@ -190,18 +191,74 @@ def _compile_root_stylesheet(stylesheets: list[str]) -> str:
         if get_config().tailwind is not None
         else []
     )
+
+    failed_to_import_sass = False
     for stylesheet in stylesheets:
         if not utils.is_valid_url(stylesheet):
             # check if stylesheet provided exists.
-            stylesheet_full_path = (
-                Path.cwd() / constants.Dirs.APP_ASSETS / stylesheet.strip("/")
-            )
+            assets_app_path = Path.cwd() / constants.Dirs.APP_ASSETS
+            stylesheet_full_path = assets_app_path / stylesheet.strip("/")
+
             if not stylesheet_full_path.exists():
                 raise FileNotFoundError(
                     f"The stylesheet file {stylesheet_full_path} does not exist."
                 )
-            stylesheet = f"../{constants.Dirs.PUBLIC}/{stylesheet.strip('/')}"
+
+            if stylesheet_full_path.is_dir():
+                # NOTE: this can create an infinite loop, for example:
+                # assets/
+                #   | dir_a/
+                #   |   | dir_c/ (symlink to "assets/dir_a")
+                #   | dir_b/
+                # so to avoid the infinite loop, we don't include symbolic links
+                stylesheets += [
+                    str(p.relative_to(assets_app_path))
+                    for p in stylesheet_full_path.iterdir()
+                    if not (p.is_symlink() and p.is_dir())
+                ]
+                continue
+
+            if (
+                stylesheet_full_path.suffix[1:].lower()
+                in constants.Reflex.STYLESHEETS_SUPPORTED
+            ):
+                target = (
+                    Path.cwd()
+                    / constants.Dirs.WEB
+                    / constants.Dirs.STYLES
+                    / (stylesheet.rsplit(".", 1)[0].strip("/") + ".css")
+                )
+                target.parent.mkdir(parents=True, exist_ok=True)
+
+                if stylesheet_full_path.suffix == ".css":
+                    path_ops.cp(src=stylesheet_full_path, dest=target, overwrite=True)
+                else:
+                    try:
+                        from sass import compile as sass_compile
+
+                        target.write_text(
+                            data=sass_compile(
+                                filename=str(stylesheet_full_path),
+                                output_style="compressed",
+                            ),
+                            encoding="utf8",
+                        )
+                    except ImportError:
+                        failed_to_import_sass = True
+            else:
+                raise FileNotFoundError(
+                    f'The stylesheet file "{stylesheet_full_path}" is not a valid file.'
+                )
+
+            stylesheet = f"./{stylesheet.rsplit('.', 1)[0].strip('/')}.css"
+
         sheets.append(stylesheet) if stylesheet not in sheets else None
+
+    if failed_to_import_sass:
+        console.error(
+            'The `libsass` package is required to compile sass/scss stylesheet files. Run `pip install "libsass>=0.23.0"`.'
+        )
+
     return templates.STYLE.render(stylesheets=sheets)
 
 
@@ -311,13 +368,11 @@ def _compile_stateful_components(
 
             # Include dynamic imports in the shared component.
             if dynamic_imports := component._get_all_dynamic_imports():
-                rendered_components.update(
-                    {dynamic_import: None for dynamic_import in dynamic_imports}
-                )
+                rendered_components.update(dict.fromkeys(dynamic_imports))
 
             # Include custom code in the shared component.
             rendered_components.update(
-                {code: None for code in component._get_all_custom_code()},
+                dict.fromkeys(component._get_all_custom_code()),
             )
 
             # Include all imports in the shared component.

reflex/components/core/client_side_routing.py

@@ -53,9 +53,9 @@ def wait_for_client_redirect(component: Component) -> Component:
         The conditionally rendered component.
     """
     return cond(
-        condition=route_not_found,
-        c1=component,
-        c2=ClientSideRouting.create(),
+        route_not_found,
+        component,
+        ClientSideRouting.create(),
     )
 
 

reflex/components/core/cond.py

@@ -31,7 +31,7 @@ class Cond(MemoizationLeaf):
         cls,
         cond: Var,
         comp1: BaseComponent,
-        comp2: BaseComponent | None = None,
+        comp2: BaseComponent | types.Unset = types.Unset(),
     ) -> Component:
         """Create a conditional component.
 
@@ -44,10 +44,14 @@ class Cond(MemoizationLeaf):
             The conditional component.
         """
         # Wrap everything in fragments.
-        if type(comp1).__name__ != "Fragment":
+        if type(comp1) is not Fragment:
             comp1 = Fragment.create(comp1)
-        if comp2 is None or type(comp2).__name__ != "Fragment":
-            comp2 = Fragment.create(comp2) if comp2 else Fragment.create()
+        if isinstance(comp2, types.Unset) or type(comp2) is not Fragment:
+            comp2 = (
+                Fragment.create(comp2)
+                if not isinstance(comp2, types.Unset)
+                else Fragment.create()
+            )
         return Fragment.create(
             cls._create(
                 children=[comp1, comp2],
@@ -96,18 +100,22 @@ class Cond(MemoizationLeaf):
 
 
 @overload
-def cond(condition: Any, c1: Component, c2: Any) -> Component: ...  # pyright: ignore [reportOverlappingOverload]
+def cond(condition: Any, c1: Component, c2: Any, /) -> Component: ...  # pyright: ignore [reportOverlappingOverload]
+
+
+@overload
+def cond(condition: Any, c1: Component, /) -> Component: ...
 
 
 @overload
-def cond(condition: Any, c1: Component) -> Component: ...
+def cond(condition: Any, c1: Any, c2: Component, /) -> Component: ...  # pyright: ignore [reportOverlappingOverload]
 
 
 @overload
-def cond(condition: Any, c1: Any, c2: Any) -> Var: ...
+def cond(condition: Any, c1: Any, c2: Any, /) -> Var: ...
 
 
-def cond(condition: Any, c1: Any, c2: Any = None) -> Component | Var:
+def cond(condition: Any, c1: Any, c2: Any = types.Unset(), /) -> Component | Var:
     """Create a conditional component or Prop.
 
     Args:
@@ -128,15 +136,15 @@ def cond(condition: Any, c1: Any, c2: Any = None) -> Component | Var:
 
     # If the first component is a component, create a Cond component.
     if isinstance(c1, BaseComponent):
-        if c2 is not None and not isinstance(c2, BaseComponent):
-            raise ValueError("Both arguments must be components.")
+        if not isinstance(c2, types.Unset) and not isinstance(c2, BaseComponent):
+            return Cond.create(cond_var.bool(), c1, Fragment.create(c2))
         return Cond.create(cond_var.bool(), c1, c2)
 
     # Otherwise, create a conditional Var.
     # Check that the second argument is valid.
     if isinstance(c2, BaseComponent):
-        raise ValueError("Both arguments must be props.")
-    if c2 is None:
+        return Cond.create(cond_var.bool(), Fragment.create(c1), c2)
+    if isinstance(c2, types.Unset):
         raise ValueError("For conditional vars, the second argument must be set.")
 
     # convert the truth and false cond parts into vars so the _var_data can be obtained.

reflex/components/core/upload.py

@@ -190,7 +190,7 @@ class GhostUpload(Fragment):
 class Upload(MemoizationLeaf):
     """A file upload component."""
 
-    library = "react-dropzone@14.3.5"
+    library = "react-dropzone@14.3.8"
 
     tag = ""
 

reflex/components/dynamic.py

@@ -72,13 +72,11 @@ def load_dynamic_serializer():
         rendered_components = {}
         # Include dynamic imports in the shared component.
         if dynamic_imports := component._get_all_dynamic_imports():
-            rendered_components.update(
-                {dynamic_import: None for dynamic_import in dynamic_imports}
-            )
+            rendered_components.update(dict.fromkeys(dynamic_imports))
 
         # Include custom code in the shared component.
         rendered_components.update(
-            {code: None for code in component._get_all_custom_code()},
+            dict.fromkeys(component._get_all_custom_code()),
         )
 
         rendered_components[

reflex/components/lucide/icon.py

@@ -53,42 +53,35 @@ class Icon(LucideIconComponent):
         if "tag" not in props:
             raise AttributeError("Missing 'tag' keyword-argument for Icon")
 
-        tag: str | Var | LiteralVar = Var.create(props.pop("tag"))
-        if isinstance(tag, LiteralVar):
-            if isinstance(tag, LiteralStringVar):
-                tag = tag._var_value
+        tag_var: Var | LiteralVar = Var.create(props.pop("tag"))
+        if isinstance(tag_var, LiteralVar):
+            if isinstance(tag_var, LiteralStringVar):
+                tag = format.to_snake_case(tag_var._var_value.lower())
             else:
-                raise TypeError(f"Icon name must be a string, got {type(tag)}")
-        elif isinstance(tag, Var):
-            tag_stringified = tag.guess_type()
+                raise TypeError(f"Icon name must be a string, got {type(tag_var)}")
+        elif isinstance(tag_var, Var):
+            tag_stringified = tag_var.guess_type()
             if not isinstance(tag_stringified, StringVar):
-                raise TypeError(f"Icon name must be a string, got {tag._var_type}")
+                raise TypeError(f"Icon name must be a string, got {tag_var._var_type}")
             return DynamicIcon.create(name=tag_stringified.replace("_", "-"), **props)
 
-        if (
-            not isinstance(tag, str)
-            or format.to_snake_case(tag) not in LUCIDE_ICON_LIST
-        ):
-            if isinstance(tag, str):
-                icons_sorted = sorted(
-                    LUCIDE_ICON_LIST,
-                    key=lambda s, tag=tag: format.length_of_largest_common_substring(
-                        tag, s
-                    ),
-                    reverse=True,
-                )
-            else:
-                icons_sorted = LUCIDE_ICON_LIST
+        if tag not in LUCIDE_ICON_LIST:
+            icons_sorted = sorted(
+                LUCIDE_ICON_LIST,
+                key=lambda s, tag=tag: format.length_of_largest_common_substring(
+                    tag, s
+                ),
+                reverse=True,
+            )
             console.warn(
                 f"Invalid icon tag: {tag}. Please use one of the following: {', '.join(icons_sorted[0:10])}, ..."
                 "\nSee full list at https://reflex.dev/docs/library/data-display/icon/#icons-list. Using 'circle-help' icon instead."
             )
-            tag = "circle-help"
+            tag = "circle_help"
 
-        if tag in LUCIDE_ICON_MAPPING_OVERRIDE:
-            props["tag"] = LUCIDE_ICON_MAPPING_OVERRIDE[tag]
-        else:
-            props["tag"] = format.to_title_case(format.to_snake_case(tag)) + "Icon"
+        props["tag"] = LUCIDE_ICON_MAPPING_OVERRIDE.get(
+            tag, format.to_title_case(tag) + "Icon"
+        )
         props["alias"] = f"Lucide{props['tag']}"
         props.setdefault("color", "var(--current-color)")
         return super().create(**props)

reflex/components/plotly/plotly.py

@@ -71,7 +71,7 @@ class Plotly(NoSSRComponent):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js@2.35.3"]
+    lib_dependencies: list[str] = ["plotly.js@3.0.1"]
 
     tag = "Plot"
 
@@ -289,7 +289,7 @@ class PlotlyBasic(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-basic-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-basic-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly basic component.
@@ -315,7 +315,7 @@ class PlotlyCartesian(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-cartesian-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-cartesian-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly cartesian component.
@@ -341,7 +341,7 @@ class PlotlyGeo(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-geo-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-geo-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly geo component.
@@ -367,7 +367,7 @@ class PlotlyGl3d(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-gl3d-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-gl3d-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly 3d component.
@@ -393,7 +393,7 @@ class PlotlyGl2d(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-gl2d-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-gl2d-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly 2d component.
@@ -419,7 +419,7 @@ class PlotlyMapbox(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-mapbox-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-mapbox-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly mapbox component.
@@ -445,7 +445,7 @@ class PlotlyFinance(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-finance-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-finance-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly finance component.
@@ -471,7 +471,7 @@ class PlotlyStrict(Plotly):
 
     library = "react-plotly.js@2.6.0"
 
-    lib_dependencies: list[str] = ["plotly.js-strict-dist-min@3.0.0"]
+    lib_dependencies: list[str] = ["plotly.js-strict-dist-min@3.0.1"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly strict component.

reflex/components/recharts/recharts.py

@@ -8,7 +8,7 @@ from reflex.components.component import Component, MemoizationLeaf, NoSSRCompone
 class Recharts(Component):
     """A component that wraps a recharts lib."""
 
-    library = "recharts@2.15.0"
+    library = "recharts@2.15.1"
 
     def _get_style(self) -> dict:
         return {"wrapperStyle": self.style}
@@ -17,7 +17,7 @@ class Recharts(Component):
 class RechartsCharts(NoSSRComponent, MemoizationLeaf):
     """A component that wraps a recharts lib."""
 
-    library = "recharts@2.15.0"
+    library = "recharts@2.15.1"
 
 
 LiteralAnimationEasing = Literal["ease", "ease-in", "ease-out", "ease-in-out", "linear"]

reflex/components/sonner/toast.py

@@ -172,7 +172,7 @@ class ToastProps(PropsBase, NoExtrasAllowedProps):
 class Toaster(Component):
     """A Toaster Component for displaying toast notifications."""
 
-    library: str | None = "sonner@1.7.2"
+    library: str | None = "sonner@2.0.1"
 
     tag = "Toaster"
 

reflex/config.py

@@ -30,7 +30,6 @@ from typing import (
 )
 
 import pydantic.v1 as pydantic
-from reflex_cli.constants.hosting import Hosting
 
 from reflex import constants
 from reflex.base import Base
@@ -596,13 +595,13 @@ class EnvironmentVariables:
         constants.CompileContext.UNDEFINED, internal=True
     )
 
-    # Whether to use npm over bun to install frontend packages.
+    # Whether to use npm over bun to install and run the frontend.
     REFLEX_USE_NPM: EnvVar[bool] = env_var(False)
 
     # The npm registry to use.
     NPM_CONFIG_REGISTRY: EnvVar[str | None] = env_var(None)
 
-    # Whether to use Granian for the backend. Otherwise, use Uvicorn.
+    # Whether to use Granian for the backend. By default, the backend uses Uvicorn if available.
     REFLEX_USE_GRANIAN: EnvVar[bool] = env_var(False)
 
     # The username to use for authentication on python package repository. Username and password must both be provided.
@@ -614,9 +613,6 @@ class EnvironmentVariables:
     # Whether to use the system installed bun. If set to false, bun will be bundled with the app.
     REFLEX_USE_SYSTEM_BUN: EnvVar[bool] = env_var(False)
 
-    # Whether to use the system installed node and npm. If set to false, node and npm will be bundled with the app.
-    REFLEX_USE_SYSTEM_NODE: EnvVar[bool] = env_var(False)
-
     # The working directory for the next.js commands.
     REFLEX_WEB_WORKDIR: EnvVar[Path] = env_var(Path(constants.Dirs.WEB))
 
@@ -810,8 +806,8 @@ class Config(Base):
     # Tailwind config.
     tailwind: dict[str, Any] | None = {"plugins": ["@tailwindcss/typography"]}
 
-    # Timeout when launching the gunicorn server. TODO(rename this to backend_timeout?)
-    timeout: int = 120
+    # DEPRECATED. Timeout when launching the gunicorn server.
+    timeout: int | None = None
 
     # Whether to enable or disable nextJS gzip compression.
     next_compression: bool = True
@@ -822,22 +818,17 @@ class Config(Base):
     # Additional frontend packages to install.
     frontend_packages: list[str] = []
 
-    # The hosting service backend URL.
-    cp_backend_url: str = Hosting.HOSTING_SERVICE
-    # The hosting service frontend URL.
-    cp_web_url: str = Hosting.HOSTING_SERVICE_UI
-
-    # The worker class used in production mode
+    # DEPRECATED. The worker class used in production mode
     gunicorn_worker_class: str = "uvicorn.workers.UvicornH11Worker"
 
-    # Number of gunicorn workers from user
+    # DEPRECATED. Number of gunicorn workers from user
     gunicorn_workers: int | None = None
 
-    # Number of requests before a worker is restarted; set to 0 to disable
-    gunicorn_max_requests: int = 100
+    # DEPRECATED. Number of requests before a worker is restarted; set to 0 to disable
+    gunicorn_max_requests: int | None = None
 
-    # Variance limit for max requests; gunicorn only
-    gunicorn_max_requests_jitter: int = 25
+    # DEPRECATED. Variance limit for max requests; gunicorn only
+    gunicorn_max_requests_jitter: int | None = None
 
     # Indicate which type of state manager to use
     state_manager_mode: constants.StateManagerMode = constants.StateManagerMode.DISK
@@ -941,8 +932,14 @@ class Config(Base):
                     """The `python-dotenv` package is required to load environment variables from a file. Run `pip install "python-dotenv>=1.0.1"`."""
                 )
             else:
-                # load env file if exists
-                load_dotenv(env_file, override=True)
+                # load env files in reverse order if they exist
+                for env_file_path in [
+                    Path(p)
+                    for s in reversed(env_file.split(os.pathsep))
+                    if (p := s.strip())
+                ]:
+                    if env_file_path.exists():
+                        load_dotenv(env_file_path, override=True)
 
         updated_values = {}
         # Iterate over the fields.
@@ -964,7 +961,7 @@ class Config(Base):
                     env_var = "***"
 
                 if value != getattr(self, key):
-                    console.info(
+                    console.debug(
                         f"Overriding config value {key} with env var {key.upper()}={env_var}",
                         dedupe=True,
                     )

reflex/constants/__init__.py

@@ -45,7 +45,7 @@ from .config import (
 )
 from .custom_components import CustomComponents
 from .event import Endpoint, EventTriggers, SocketEvent
-from .installer import Bun, Fnm, Node, PackageJson
+from .installer import Bun, Node, PackageJson
 from .route import (
     ROUTE_NOT_FOUND,
     ROUTER,
@@ -94,7 +94,6 @@ __all__ = [
     "EventTriggers",
     "Expiration",
     "Ext",
-    "Fnm",
     "GitIgnore",
     "Hooks",
     "Imports",

reflex/constants/base.py

@@ -88,6 +88,9 @@ class Reflex(SimpleNamespace):
 
     RELEASES_URL = "https://api.github.com/repos/reflex-dev/templates/releases"
 
+    # The reflex stylesheet language supported
+    STYLESHEETS_SUPPORTED = ["css", "sass", "scss"]
+
 
 class ReflexHostingCLI(SimpleNamespace):
     """Base constants concerning Reflex Hosting CLI."""