reflex 0.4.8a1__tar.gz → 0.4.9__tar.gz

{reflex-0.4.8a1 → reflex-0.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reflex
-Version: 0.4.8a1
+Version: 0.4.9
 Summary: Web apps in pure Python.
 Home-page: https://reflex.dev
 License: Apache-2.0

{reflex-0.4.8a1 → reflex-0.4.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "reflex"
-version = "0.4.8a1"
+version = "0.4.9"
 description = "Web apps in pure Python."
 license = "Apache-2.0"
 authors = [

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/app.py

@@ -839,6 +839,9 @@ class App(Base):
         compile_results.append(
             compiler.compile_contexts(self.state, self.theme),
         )
+        # Fix #2992 by removing the top-level appearance prop
+        if self.theme is not None:
+            self.theme.appearance = None
 
         app_root = self._app_root(app_wrappers=app_wrappers)
 

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/components/component.py

@@ -662,9 +662,11 @@ class Component(BaseComponent, ABC):
             (
                 child
                 if isinstance(child, Component)
-                else Fragment.create(*child)
-                if isinstance(child, tuple)
-                else Bare.create(contents=Var.create(child, _var_is_string=True))
+                else (
+                    Fragment.create(*child)
+                    if isinstance(child, tuple)
+                    else Bare.create(contents=Var.create(child, _var_is_string=True))
+                )
             )
             for child in children
         ]
@@ -1053,6 +1055,11 @@ class Component(BaseComponent, ABC):
                     ImportVar(tag="useEffect"),
                 },
             )
+
+        user_hooks = self._get_hooks()
+        if user_hooks is not None and isinstance(user_hooks, Var):
+            _imports = imports.merge_imports(_imports, user_hooks._var_data.imports)  # type: ignore
+
         return _imports
 
     def _get_imports(self) -> imports.ImportDict:

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/components/core/debounce.py

@@ -79,7 +79,9 @@ class DebounceInput(Component):
             for p in cls.get_props()
             if getattr(child, p, None) is not None
         }
-        props_from_child.update(child.event_triggers)
+        props[EventTriggers.ON_CHANGE] = child.event_triggers.pop(
+            EventTriggers.ON_CHANGE
+        )
         props = {**props_from_child, **props}
 
         # Carry all other child props directly via custom_attrs
@@ -117,6 +119,7 @@ class DebounceInput(Component):
 
         component = super().create(**props)
         component._get_style = child._get_style
+        component.event_triggers.update(child.event_triggers)
         return component
 
     def get_event_triggers(self) -> dict[str, Any]:

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/constants/installer.py

@@ -112,6 +112,7 @@ class PackageJson(SimpleNamespace):
         "next-themes": "0.2.1",
         "react": "18.2.0",
         "react-dom": "18.2.0",
+        "react-focus-lock": "2.11.3",
         "socket.io-client": "4.6.1",
         "universal-cookie": "4.0.4",
     }

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/experimental/__init__.py

@@ -4,6 +4,7 @@ from types import SimpleNamespace
 
 from ..utils.console import warn
 from . import hooks as hooks
+from .layout import layout as layout
 from .misc import run_in_thread as run_in_thread
 
 warn(
@@ -12,5 +13,6 @@ warn(
 
 _x = SimpleNamespace(
     hooks=hooks,
+    layout=layout,
     run_in_thread=run_in_thread,
 )

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/experimental/hooks.py

@@ -12,7 +12,7 @@ def _add_react_import(v: Var | None, tags: str | list):
         tags = [tags]
 
     v._var_data = VarData(  # type: ignore
-        imports={"react": [ImportVar(tag=tag) for tag in tags]},
+        imports={"react": [ImportVar(tag=tag, install=False) for tag in tags]},
     )
 
 
@@ -26,6 +26,8 @@ def const(name, value) -> Var | None:
     Returns:
         The constant Var.
     """
+    if isinstance(name, list):
+        return Var.create(f"const [{', '.join(name)}] = {value}")
     return Var.create(f"const {name} = {value}")
 
 
@@ -73,3 +75,19 @@ def useRef(default) -> Var | None:
     v = Var.create(f"useRef({default})")
     _add_react_import(v, "useRef")
     return v
+
+
+def useState(var_name, default=None) -> Var | None:
+    """Create a useState hook with a variable name and setter name.
+
+    Args:
+        var_name: The name of the variable.
+        default: The default value of the variable.
+
+    Returns:
+        A useState hook.
+    """
+    setter_name = f"set{var_name.capitalize()}"
+    v = const([var_name, setter_name], f"useState({default})")
+    _add_react_import(v, "useState")
+    return v

reflex-0.4.9/reflex/experimental/layout.py

@@ -0,0 +1,223 @@
+"""To experiment with layout component, move them to reflex/components later."""
+
+from reflex import color, cond
+from reflex.components.base.fragment import Fragment
+from reflex.components.component import Component, ComponentNamespace, MemoizationLeaf
+from reflex.components.radix.primitives.drawer import DrawerRoot, drawer
+from reflex.components.radix.themes.components.icon_button import IconButton
+from reflex.components.radix.themes.layout import Box, Container, HStack
+from reflex.event import call_script
+from reflex.experimental import hooks
+from reflex.state import ComponentState
+from reflex.vars import Var
+
+
+class Sidebar(Box, MemoizationLeaf):
+    """A component that renders the sidebar."""
+
+    @classmethod
+    def create(cls, *children, **props):
+        """Create the sidebar component.
+
+        Args:
+            children: The children components.
+            props: The properties of the sidebar.
+
+        Returns:
+            The sidebar component.
+        """
+        props.setdefault("border_right", f"1px solid {color('accent', 12)}")
+        props.setdefault("background_color", color("accent", 1))
+        props.setdefault("width", "20vw")
+        props.setdefault("height", "100vh")
+        props.setdefault("position", "fixed")
+
+        return super().create(
+            Box.create(*children, **props),  # sidebar for content
+            Box.create(width=props.get("width")),  # spacer for layout
+        )
+
+    def _apply_theme(self, theme: Component | None):
+        sidebar: Component = self.children[-2]  # type: ignore
+        spacer: Component = self.children[-1]  # type: ignore
+        open = self.State.open if self.State else Var.create("open")  # type: ignore
+        sidebar.style["display"] = spacer.style["display"] = cond(open, "block", "none")
+
+    def _get_hooks(self) -> Var | None:
+        return hooks.useState("open", "true") if not self.State else None
+
+
+class StatefulSidebar(ComponentState):
+    """Bind a state to a sidebar component."""
+
+    open: bool = True
+
+    def toggle(self):
+        """Toggle the sidebar."""
+        self.open = not self.open
+
+    @classmethod
+    def get_component(cls, *children, **props):
+        """Get the stateful sidebar component.
+
+        Args:
+            children: The children components.
+            props: The properties of the sidebar.
+
+        Returns:
+            The stateful sidebar component.
+        """
+        return Sidebar.create(*children, **props)
+
+
+class DrawerSidebar(DrawerRoot):
+    """A component that renders a drawer sidebar."""
+
+    @classmethod
+    def create(cls, *children, **props):
+        """Create the sidebar component.
+
+        Args:
+            children: The children components.
+            props: The properties of the sidebar.
+
+        Returns:
+            The drawer sidebar component.
+        """
+        direction = props.pop("direction", "left")
+        props.setdefault("border_right", f"1px solid {color('accent', 12)}")
+        props.setdefault("background_color", color("accent", 1))
+        props.setdefault("width", "20vw")
+        props.setdefault("height", "100vh")
+        return super().create(
+            drawer.trigger(
+                IconButton.create(
+                    "arrow-right-from-line",
+                    background_color="transparent",
+                ),
+                position="absolute",
+                top="15",
+                left="15",
+            ),
+            drawer.portal(
+                drawer.content(
+                    *children,
+                    **props,
+                )
+            ),
+            direction=direction,
+        )
+
+
+sidebar_trigger_style = {
+    "position": "fixed",
+    "z_index": "15",
+    "color": color("accent", 12),
+    "background_color": "transparent",
+    "padding": "0",
+}
+
+
+class SidebarTrigger(Fragment):
+    """A component that renders the sidebar trigger."""
+
+    @classmethod
+    def create(cls, sidebar: Component, **props):
+        """Create the sidebar trigger component.
+
+        Args:
+            sidebar: The sidebar component.
+            props: The properties of the sidebar trigger.
+
+        Returns:
+            The sidebar trigger component.
+        """
+        trigger_props = {**props, **sidebar_trigger_style}
+
+        inner_sidebar: Component = sidebar.children[0]  # type: ignore
+        sidebar_width = inner_sidebar.style.get("width")
+
+        if sidebar.State:
+            open, toggle = sidebar.State.open, sidebar.State.toggle  # type: ignore
+        else:
+            open, toggle = Var.create("open"), call_script(Var.create("setOpen(!open)"))  # type: ignore
+
+        trigger_props["left"] = cond(open, f"calc({sidebar_width} - 32px)", "0")
+
+        trigger = cond(
+            open,
+            IconButton.create(
+                "arrow-left-from-line",
+                on_click=toggle,
+                **trigger_props,
+            ),
+            IconButton.create(
+                "arrow-right-from-line",
+                on_click=toggle,
+                **trigger_props,
+            ),
+        )
+        return super().create(trigger)
+
+
+class Layout(Box):
+    """A component that renders the layout."""
+
+    @classmethod
+    def create(
+        cls,
+        *content: Component,
+        sidebar: Component | None = None,
+        **props,
+    ):
+        """Create the layout component.
+
+        Args:
+            content: The content component.
+            sidebar: The sidebar component.
+            props: The properties of the layout.
+
+        Returns:
+            The layout component.
+        """
+        layout_root = HStack.create
+
+        if sidebar is None:
+            return Container.create(*content, **props)
+
+        if isinstance(sidebar, DrawerSidebar):
+            return super().create(
+                sidebar,
+                Container.create(*content, height="100%"),
+                **props,
+                width="100vw",
+                min_height="100vh",
+            )
+
+        if not isinstance(sidebar, Sidebar):
+            sidebar = Sidebar.create(sidebar)
+
+        # Add the sidebar trigger to the sidebar as first child to not mess up the rendering.
+        sidebar.children.insert(0, SidebarTrigger.create(sidebar))
+
+        return super().create(
+            layout_root(
+                sidebar,
+                Container.create(*content, height="100%"),
+                **props,
+                width="100vw",
+                min_height="100vh",
+            )
+        )
+
+
+class LayoutNamespace(ComponentNamespace):
+    """Namespace for layout components."""
+
+    drawer_sidebar = staticmethod(DrawerSidebar.create)
+    stateful_sidebar = staticmethod(StatefulSidebar.create)
+    sidebar = staticmethod(Sidebar.create)
+    __call__ = staticmethod(Layout.create)
+
+
+layout = LayoutNamespace()

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/testing.py

@@ -112,7 +112,9 @@ class AppHarness:
     """AppHarness executes a reflex app in-process for testing."""
 
     app_name: str
-    app_source: Optional[types.FunctionType | types.ModuleType] | str
+    app_source: Optional[
+        types.FunctionType | types.ModuleType | str | functools.partial
+    ]
     app_path: pathlib.Path
     app_module_path: pathlib.Path
     app_module: Optional[types.ModuleType] = None
@@ -124,6 +126,7 @@ class AppHarness:
     backend: Optional[uvicorn.Server] = None
     state_manager: Optional[StateManagerMemory | StateManagerRedis] = None
     _frontends: list["WebDriver"] = dataclasses.field(default_factory=list)
+    _decorated_pages: list = dataclasses.field(default_factory=list)
 
     @classmethod
     def create(
@@ -149,15 +152,21 @@ class AppHarness:
         """
         if app_name is None:
             if app_source is None:
-                app_name = root.name.lower()
+                app_name = root.name
             elif isinstance(app_source, functools.partial):
-                app_name = app_source.func.__name__.lower()
+                keywords = app_source.keywords
+                slug_suffix = "_".join([str(v) for v in keywords.values()])
+                func_name = app_source.func.__name__
+                app_name = f"{func_name}_{slug_suffix}"
+                app_name = re.sub(r"[^a-zA-Z0-9_]", "_", app_name)
             elif isinstance(app_source, str):
                 raise ValueError(
                     "app_name must be provided when app_source is a string."
                 )
             else:
-                app_name = app_source.__name__.lower()
+                app_name = app_source.__name__
+
+            app_name = app_name.lower()
         return cls(
             app_name=app_name,
             app_source=app_source,
@@ -230,11 +239,15 @@ class AppHarness:
         with chdir(self.app_path):
             # ensure config and app are reloaded when testing different app
             reflex.config.get_config(reload=True)
-            # Clean out any `rx.page` decorators from other tests.
-            reflex.app.DECORATED_PAGES.clear()
+            # Save decorated pages before importing the test app module
+            before_decorated_pages = reflex.app.DECORATED_PAGES.copy()
             # Ensure the AppHarness test does not skip State assignment due to running via pytest
             os.environ.pop(reflex.constants.PYTEST_CURRENT_TEST, None)
             self.app_module = reflex.utils.prerequisites.get_compiled_app(reload=True)
+            # Save the pages that were added during testing
+            self._decorated_pages = [
+                p for p in reflex.app.DECORATED_PAGES if p not in before_decorated_pages
+            ]
         self.app_instance = self.app_module.app
         if isinstance(self.app_instance._state_manager, StateManagerRedis):
             # Create our own redis connection for testing.
@@ -396,6 +409,10 @@ class AppHarness:
         for driver in self._frontends:
             driver.quit()
 
+        # Cleanup decorated pages added during testing
+        for page in self._decorated_pages:
+            reflex.app.DECORATED_PAGES.remove(page)
+
     def __exit__(self, *excinfo) -> None:
         """Contextmanager protocol for `stop()`.
 

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/utils/prerequisites.py

@@ -568,15 +568,17 @@ def update_next_config(export=False, transpile_packages: Optional[List[str]] = N
         export: if the method run during reflex export.
         transpile_packages: list of packages to transpile via next.config.js.
     """
-    next_config_file = os.path.join(constants.Dirs.WEB, constants.Next.CONFIG_FILE)
+    next_config_file = Path(constants.Dirs.WEB, constants.Next.CONFIG_FILE)
 
     next_config = _update_next_config(
         get_config(), export=export, transpile_packages=transpile_packages
     )
 
-    with open(next_config_file, "w") as file:
-        file.write(next_config)
-        file.write("\n")
+    # Overwriting the next.config.js triggers a full server reload, so make sure
+    # there is actually a diff.
+    orig_next_config = next_config_file.read_text() if next_config_file.exists() else ""
+    if orig_next_config != next_config:
+        next_config_file.write_text(next_config)
 
 
 def _update_next_config(
@@ -819,14 +821,16 @@ def install_frontend_packages(packages: set[str], config: Config):
     Example:
         >>> install_frontend_packages(["react", "react-dom"], get_config())
     """
-    # unsupported archs will use npm anyway. so we dont have to run npm twice
+    # unsupported archs(arm and 32bit machines) will use npm anyway. so we dont have to run npm twice
     fallback_command = (
         get_package_manager()
-        if constants.IS_WINDOWS and constants.IS_WINDOWS_BUN_SUPPORTED_MACHINE
+        if not constants.IS_WINDOWS
+        or constants.IS_WINDOWS
+        and constants.IS_WINDOWS_BUN_SUPPORTED_MACHINE
         else None
     )
     processes.run_process_with_fallback(
-        [get_install_package_manager(), "install", "--loglevel", "silly"],
+        [get_install_package_manager(), "install"],  # type: ignore
         fallback=fallback_command,
         show_status_message="Installing base frontend packages",
         cwd=constants.Dirs.WEB,

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/utils/processes.py

@@ -8,6 +8,7 @@ import os
 import signal
 import subprocess
 from concurrent import futures
+from pathlib import Path
 from typing import Callable, Generator, List, Optional, Tuple, Union
 
 import psutil
@@ -145,6 +146,7 @@ def new_process(args, run: bool = False, show_logs: bool = False, **kwargs):
         "stdout": None if show_logs else subprocess.PIPE,
         "universal_newlines": True,
         "encoding": "UTF-8",
+        "errors": "replace",  # Avoid UnicodeDecodeError in unknown command output
         **kwargs,
     }
     console.debug(f"Running command: {args}")
@@ -202,13 +204,19 @@ def run_concurrently(*fns: Union[Callable, Tuple]) -> None:
         pass
 
 
-def stream_logs(message: str, process: subprocess.Popen, progress=None):
+def stream_logs(
+    message: str,
+    process: subprocess.Popen,
+    progress=None,
+    suppress_errors: bool = False,
+):
     """Stream the logs for a process.
 
     Args:
         message: The message to display.
         process: The process.
         progress: The ongoing progress bar if one is being used.
+        suppress_errors: If True, do not exit if errors are encountered (for fallback).
 
     Yields:
         The lines of the process output.
@@ -232,7 +240,7 @@ def stream_logs(message: str, process: subprocess.Popen, progress=None):
     # Windows uvicorn bug
     # https://github.com/reflex-dev/reflex/issues/2335
     accepted_return_codes = [0, -2, 15] if constants.IS_WINDOWS else [0, -2]
-    if process.returncode not in accepted_return_codes:
+    if process.returncode not in accepted_return_codes and not suppress_errors:
         console.error(f"{message} failed with exit code {process.returncode}")
         for line in logs:
             console.error(line, end="")
@@ -251,15 +259,16 @@ def show_logs(message: str, process: subprocess.Popen):
         pass
 
 
-def show_status(message: str, process: subprocess.Popen):
+def show_status(message: str, process: subprocess.Popen, suppress_errors: bool = False):
     """Show the status of a process.
 
     Args:
         message: The initial message to display.
         process: The process.
+        suppress_errors: If True, do not exit if errors are encountered (for fallback).
     """
     with console.status(message) as status:
-        for line in stream_logs(message, process):
+        for line in stream_logs(message, process, suppress_errors=suppress_errors):
             status.update(f"{message} {line}")
 
 
@@ -289,6 +298,25 @@ def atexit_handler():
     console.log("Reflex app stopped.")
 
 
+def get_command_with_loglevel(command: list[str]) -> list[str]:
+    """Add the right loglevel flag to the designated command.
+     npm uses --loglevel <level>, Bun doesnt use the --loglevel flag and
+     runs in debug mode by default.
+
+    Args:
+        command:The command to add loglevel flag.
+
+    Returns:
+        The updated command list
+    """
+    npm_path = path_ops.get_npm_path()
+    npm_path = str(Path(npm_path).resolve()) if npm_path else npm_path
+
+    if command[0] == npm_path:
+        return command + ["--loglevel", "silly"]
+    return command
+
+
 def run_process_with_fallback(args, *, show_status_message, fallback=None, **kwargs):
     """Run subprocess and retry using fallback command if initial command fails.
 
@@ -298,29 +326,22 @@ def run_process_with_fallback(args, *, show_status_message, fallback=None, **kwa
         fallback: The fallback command to run.
         kwargs: Kwargs to pass to new_process function.
     """
-
-    def execute_process(process):
-        if not constants.IS_WINDOWS:
-            show_status(show_status_message, process)
-        else:
-            process.wait()
-            if process.returncode != 0:
-                error_output = process.stderr if process.stderr else process.stdout
-                error_message = f"Error occurred during subprocess execution: {' '.join(args)}\n{error_output.read() if error_output else ''}"
-                # Only show error in debug mode.
-                if console.is_debug():
-                    console.error(error_message)
-
-                # retry with fallback command.
-                fallback_args = [fallback, *args[1:]] if fallback else None
-                console.warn(
-                    f"There was an error running command: {args}. Falling back to: {fallback_args}."
-                )
-                if fallback_args:
-                    process = new_process(fallback_args, **kwargs)
-                    execute_process(process)
-            else:
-                show_status(show_status_message, process)
-
-    process = new_process(args, **kwargs)
-    execute_process(process)
+    process = new_process(get_command_with_loglevel(args), **kwargs)
+    if fallback is None:
+        # No fallback given, or this _is_ the fallback command.
+        show_status(show_status_message, process)
+    else:
+        # Suppress errors for initial command, because we will try to fallback
+        show_status(show_status_message, process, suppress_errors=True)
+        if process.returncode != 0:
+            # retry with fallback command.
+            fallback_args = [fallback, *args[1:]]
+            console.warn(
+                f"There was an error running command: {args}. Falling back to: {fallback_args}."
+            )
+            run_process_with_fallback(
+                fallback_args,
+                show_status_message=show_status_message,
+                fallback=None,
+                **kwargs,
+            )

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/utils/pyi_generator.py

@@ -34,6 +34,7 @@ PWD = Path(".").resolve()
 
 EXCLUDED_FILES = [
     "__init__.py",
+    "app.py",
     "component.py",
     "bare.py",
     "foreach.py",
@@ -795,7 +796,11 @@ class PyiGenerator:
         file_targets = []
         for target in targets:
             target_path = Path(target)
-            if target_path.is_file() and target_path.suffix == ".py":
+            if (
+                target_path.is_file()
+                and target_path.suffix == ".py"
+                and target_path.name not in EXCLUDED_FILES
+            ):
                 file_targets.append(target_path)
                 continue
             if not target_path.is_dir():

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/utils/serializers.py

@@ -7,6 +7,7 @@ import types as builtin_types
 import warnings
 from datetime import date, datetime, time, timedelta
 from enum import Enum
+from pathlib import Path
 from typing import Any, Callable, Dict, List, Set, Tuple, Type, Union, get_type_hints
 
 from reflex.base import Base
@@ -233,6 +234,19 @@ def serialize_datetime(dt: Union[date, datetime, time, timedelta]) -> str:
     return str(dt)
 
 
+@serializer
+def serialize_path(path: Path):
+    """Serialize a pathlib.Path to a JSON string.
+
+    Args:
+        path: The path to serialize.
+
+    Returns:
+        The serialized path.
+    """
+    return str(path.as_posix())
+
+
 @serializer
 def serialize_enum(en: Enum) -> str:
     """Serialize a enum to a JSON string.

{reflex-0.4.8a1 → reflex-0.4.9}/reflex/vars.py

@@ -1340,7 +1340,7 @@ class Var:
         Returns:
             A var representing the contain check.
         """
-        if not (types._issubclass(self._var_type, Union[dict, list, tuple, str])):
+        if not (types._issubclass(self._var_type, Union[dict, list, tuple, str, set])):
             raise TypeError(
                 f"Var {self._var_full_name} of type {self._var_type} does not support contains check."
             )