reflex 0.3.7a1__py3-none-any.whl → 0.3.8__py3-none-any.whl

reflex/components/{libs → react_player}/react_player.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/libs/react_player.py"""
+"""Stub file for reflex/components/react_player/react_player.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------
@@ -10,7 +10,7 @@ from reflex.style import Style
 from reflex.components.component import NoSSRComponent
 from reflex.vars import Var
 
-class ReactPlayerComponent(NoSSRComponent):
+class ReactPlayer(NoSSRComponent):
     @overload
     @classmethod
     def create(  # type: ignore
@@ -77,7 +77,7 @@ class ReactPlayerComponent(NoSSRComponent):
             Union[EventHandler, EventSpec, list, function, BaseVar]
         ] = None,
         **props
-    ) -> "ReactPlayerComponent":
+    ) -> "ReactPlayer":
         """Create the component.
 
         Args:

reflex/components/react_player/video.py

@@ -0,0 +1,8 @@
+"""A video component."""
+from reflex.components.react_player.react_player import ReactPlayer
+
+
+class Video(ReactPlayer):
+    """Video component share with audio component."""
+
+    pass

reflex/components/{media → react_player}/video.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/media/video.py"""
+"""Stub file for reflex/components/react_player/video.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------
@@ -7,9 +7,9 @@ from typing import Any, Dict, Literal, Optional, Union, overload
 from reflex.vars import Var, BaseVar, ComputedVar
 from reflex.event import EventChain, EventHandler, EventSpec
 from reflex.style import Style
-from reflex.components.libs.react_player import ReactPlayerComponent
+from reflex.components.react_player.react_player import ReactPlayer
 
-class Video(ReactPlayerComponent):
+class Video(ReactPlayer):
     pass
 
     @overload

reflex/components/{graphing/recharts → recharts}/cartesian.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/graphing/recharts/cartesian.py"""
+"""Stub file for reflex/components/recharts/cartesian.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------

reflex/components/{graphing/recharts → recharts}/charts.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from typing import Any, Dict, List, Union
 
 from reflex.components.component import Component
-from reflex.components.graphing.recharts.general import ResponsiveContainer
+from reflex.components.recharts.general import ResponsiveContainer
 from reflex.constants import EventTriggers
 from reflex.vars import Var
 

reflex/components/{graphing/recharts → recharts}/charts.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/graphing/recharts/charts.py"""
+"""Stub file for reflex/components/recharts/charts.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------
@@ -9,7 +9,7 @@ from reflex.event import EventChain, EventHandler, EventSpec
 from reflex.style import Style
 from typing import Any, Dict, List, Union
 from reflex.components.component import Component
-from reflex.components.graphing.recharts.general import ResponsiveContainer
+from reflex.components.recharts.general import ResponsiveContainer
 from reflex.constants import EventTriggers
 from reflex.vars import Var
 from .recharts import (

reflex/components/{graphing/recharts → recharts}/general.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/graphing/recharts/general.py"""
+"""Stub file for reflex/components/recharts/general.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------

reflex/components/{graphing/recharts → recharts}/polar.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/graphing/recharts/polar.py"""
+"""Stub file for reflex/components/recharts/polar.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------

reflex/components/{graphing/recharts → recharts}/recharts.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/graphing/recharts/recharts.py"""
+"""Stub file for reflex/components/recharts/recharts.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------

reflex/components/suneditor/__init__.py

@@ -0,0 +1,5 @@
+"""Editor component."""
+
+from .editor import Editor, EditorButtonList, EditorOptions
+
+editor = Editor.create

reflex/components/{forms → suneditor}/editor.pyi

@@ -1,4 +1,4 @@
-"""Stub file for reflex/components/forms/editor.py"""
+"""Stub file for reflex/components/suneditor/editor.py"""
 # ------------------- DO NOT EDIT ----------------------
 # This file was generated by `scripts/pyi_generator.py`!
 # ------------------------------------------------------

reflex/components/tags/__init__.py

@@ -2,4 +2,5 @@
 
 from .cond_tag import CondTag
 from .iter_tag import IterTag
+from .match_tag import MatchTag
 from .tag import Tag

reflex/components/tags/iter_tag.py

@@ -102,9 +102,9 @@ class IterTag(Tag):
             The rendered component.
         """
         # Import here to avoid circular imports.
-        from reflex.components.layout.cond import Cond
-        from reflex.components.layout.foreach import Foreach
-        from reflex.components.layout.fragment import Fragment
+        from reflex.components.base.fragment import Fragment
+        from reflex.components.core.cond import Cond
+        from reflex.components.core.foreach import Foreach
 
         # Get the render function arguments.
         args = inspect.getfullargspec(self.render_fn).args

reflex/components/tags/match_tag.py

@@ -0,0 +1,19 @@
+"""Tag to conditionally match cases."""
+
+from typing import Any, List
+
+from reflex.components.tags.tag import Tag
+from reflex.vars import Var
+
+
+class MatchTag(Tag):
+    """A match tag."""
+
+    # The condition to determine which case to match.
+    cond: Var[Any]
+
+    # The list of match cases to be matched.
+    match_cases: List[Any]
+
+    # The catchall case to match.
+    default: Any

reflex/constants/base.py

@@ -43,6 +43,8 @@ class Dirs(SimpleNamespace):
     ENV_JSON = os.path.join(WEB, "env.json")
     # The reflex json file.
     REFLEX_JSON = os.path.join(WEB, "reflex.json")
+    # The path to postcss.config.js
+    POSTCSS_JS = os.path.join(WEB, "postcss.config.js")
 
 
 class Reflex(SimpleNamespace):

reflex/constants/config.py

@@ -47,7 +47,7 @@ class RequirementsTxt(SimpleNamespace):
     # The requirements.txt file.
     FILE = "requirements.txt"
     # The partial text used to form requirement that pins a reflex version
-    DEFAULTS_STUB = f"{Reflex.MODULE_NAME}>="
+    DEFAULTS_STUB = f"{Reflex.MODULE_NAME}=="
 
 
 # The deployment URL.

reflex/constants/installer.py

@@ -102,6 +102,7 @@ class PackageJson(SimpleNamespace):
     PATH = os.path.join(Dirs.WEB, "package.json")
 
     DEPENDENCIES = {
+        "@emotion/react": "11.11.1",
         "axios": "1.4.0",
         "json5": "2.2.3",
         "next": "14.0.1",

reflex/constants/style.py

@@ -17,6 +17,6 @@ class Tailwind(SimpleNamespace):
     # The Tailwind config.
     CONFIG = os.path.join(Dirs.WEB, "tailwind.config.js")
     # Default Tailwind content paths
-    CONTENT = ["./pages/**/*.{js,ts,jsx,tsx}"]
+    CONTENT = ["./pages/**/*.{js,ts,jsx,tsx}", "./utils/**/*.{js,ts,jsx,tsx}"]
     # Relative tailwind style path to root stylesheet in STYLES_DIR.
     ROOT_STYLE_PATH = "./tailwind.css"

reflex/event.py

@@ -329,7 +329,7 @@ class FileUpload(Base):
         Raises:
             ValueError: If the on_upload_progress is not a valid event handler.
         """
-        from reflex.components.forms.upload import (
+        from reflex.components.core.upload import (
             DEFAULT_UPLOAD_ID,
             upload_files_context_var_data,
         )

reflex/reflex.py

@@ -74,18 +74,12 @@ def _init(
     # Show system info
     exec.output_system_info()
 
-    # Get the app name.
-    app_name = prerequisites.get_default_app_name() if name is None else name
+    # Validate the app name.
+    app_name = prerequisites.validate_app_name(name)
     console.rule(f"[bold]Initializing {app_name}")
 
     prerequisites.check_latest_package_version(constants.Reflex.MODULE_NAME)
 
-    # Set up the web project.
-    prerequisites.initialize_frontend_dependencies()
-
-    # Migrate Pynecone projects to Reflex.
-    prerequisites.migrate_to_reflex()
-
     # Set up the app directory, only if the config doesn't exist.
     if not os.path.exists(constants.Config.FILE):
         if template is None:
@@ -96,6 +90,12 @@ def _init(
     else:
         telemetry.send("reinit")
 
+    # Set up the web project.
+    prerequisites.initialize_frontend_dependencies()
+
+    # Migrate Pynecone projects to Reflex.
+    prerequisites.migrate_to_reflex()
+
     # Initialize the .gitignore.
     prerequisites.initialize_gitignore()
 
@@ -178,7 +178,7 @@ def _run(
     if frontend:
         prerequisites.update_next_config()
         # Get the app module.
-        prerequisites.get_app()
+        prerequisites.get_compiled_app()
 
     # Warn if schema is not up to date.
     prerequisites.check_schema_up_to_date()
@@ -362,7 +362,7 @@ def db_init():
 
     # Initialize the database.
     _skip_compile()
-    prerequisites.get_app()
+    prerequisites.get_compiled_app()
     model.Model.alembic_init()
     model.Model.migrate(autogenerate=True)
 
@@ -373,8 +373,9 @@ def migrate():
     from reflex import model
     from reflex.utils import prerequisites
 
+    # TODO see if we can use `get_app()` instead (no compile).  Would _skip_compile still be needed then?
     _skip_compile()
-    prerequisites.get_app()
+    prerequisites.get_compiled_app()
     if not prerequisites.check_db_initialized():
         return
     model.Model.migrate()
@@ -393,8 +394,9 @@ def makemigrations(
     from reflex import model
     from reflex.utils import prerequisites
 
+    # TODO see if we can use `get_app()` instead (no compile).  Would _skip_compile still be needed then?
     _skip_compile()
-    prerequisites.get_app()
+    prerequisites.get_compiled_app()
     if not prerequisites.check_db_initialized():
         return
     with model.Model.get_db_engine().connect() as connection:

reflex/state.py

@@ -1316,6 +1316,7 @@ class State(BaseState):
         Returns:
             The list of events to queue for on load handling.
         """
+        # Do not app.compile_()!  It should be already compiled by now.
         app = getattr(prerequisites.get_app(), constants.CompileVars.APP)
         load_events = app.get_load_events(self.router.page.path)
         if not load_events and self.is_hydrated:
@@ -1364,6 +1365,7 @@ class StateProxy(wrapt.ObjectProxy):
             state_instance: The state instance to proxy.
         """
         super().__init__(state_instance)
+        # compile is not relevant to backend logic
         self._self_app = getattr(prerequisites.get_app(), constants.CompileVars.APP)
         self._self_substate_path = state_instance.get_full_name().split(".")
         self._self_actx = None
@@ -2179,3 +2181,15 @@ class ImmutableMutableProxy(MutableProxy):
         return super()._mark_dirty(
             wrapped=wrapped, instance=instance, args=args, kwargs=kwargs
         )
+
+
+def code_uses_state_contexts(javascript_code: str) -> bool:
+    """Check if the rendered Javascript uses state contexts.
+
+    Args:
+        javascript_code: The Javascript code to check.
+
+    Returns:
+        True if the code attempts to access a member of StateContexts.
+    """
+    return bool("useContext(StateContexts" in javascript_code)

reflex/style.py

@@ -108,7 +108,7 @@ def convert(style_dict):
     var_data = None  # Track import/hook data from any Vars in the style dict.
     out = {}
     for key, value in style_dict.items():
-        key = format.to_camel_case(key)
+        key = format.to_camel_case(key, allow_hyphens=True)
         if isinstance(value, dict):
             # Recursively format nested style dictionaries.
             out[key], new_var_data = convert(value)

reflex/testing.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import dataclasses
+import functools
 import inspect
 import os
 import pathlib
@@ -20,6 +21,7 @@ import types
 from http.server import SimpleHTTPRequestHandler
 from typing import (
     TYPE_CHECKING,
+    Any,
     AsyncIterator,
     Callable,
     Coroutine,
@@ -135,6 +137,8 @@ class AppHarness:
         if app_name is None:
             if app_source is None:
                 app_name = root.name.lower()
+            elif isinstance(app_source, functools.partial):
+                app_name = app_source.func.__name__.lower()
             else:
                 app_name = app_source.__name__.lower()
         return cls(
@@ -144,13 +148,54 @@ class AppHarness:
             app_module_path=root / app_name / f"{app_name}.py",
         )
 
+    def _get_globals_from_signature(self, func: Any) -> dict[str, Any]:
+        """Get the globals from a function or module object.
+
+        Args:
+            func: function or module object
+
+        Returns:
+            dict of globals
+        """
+        overrides = {}
+        glbs = {}
+        if not callable(func):
+            return glbs
+        if isinstance(func, functools.partial):
+            overrides = func.keywords
+            func = func.func
+        for param in inspect.signature(func).parameters.values():
+            if param.default is not inspect.Parameter.empty:
+                glbs[param.name] = param.default
+        glbs.update(overrides)
+        return glbs
+
+    def _get_source_from_func(self, func: Any) -> str:
+        """Get the source from a function or module object.
+
+        Args:
+            func: function or module object
+
+        Returns:
+            source code
+        """
+        source = inspect.getsource(func)
+        source = re.sub(r"^\s*def\s+\w+\s*\(.*?\):", "", source, flags=re.DOTALL)
+        return textwrap.dedent(source)
+
     def _initialize_app(self):
         os.environ["TELEMETRY_ENABLED"] = ""  # disable telemetry reporting for tests
         self.app_path.mkdir(parents=True, exist_ok=True)
         if self.app_source is not None:
+            app_globals = self._get_globals_from_signature(self.app_source)
+            if isinstance(self.app_source, functools.partial):
+                self.app_source = self.app_source.func  # type: ignore
             # get the source from a function or module object
-            source_code = textwrap.dedent(
-                "".join(inspect.getsource(self.app_source).splitlines(True)[1:]),
+            source_code = "\n".join(
+                [
+                    "\n".join(f"{k} = {v!r}" for k, v in app_globals.items()),
+                    self._get_source_from_func(self.app_source),
+                ]
             )
             with chdir(self.app_path):
                 reflex.reflex._init(
@@ -164,14 +209,16 @@ class AppHarness:
             reflex.config.get_config(reload=True)
             # reset rx.State subclasses
             State.class_subclasses.clear()
+            # 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.app.
-            self.app_module = reflex.utils.prerequisites.get_app(reload=True)
+            self.app_module = reflex.utils.prerequisites.get_compiled_app(reload=True)
         self.app_instance = self.app_module.app
-        if isinstance(self.app_instance.state_manager, StateManagerRedis):
+        if isinstance(self.app_instance._state_manager, StateManagerRedis):
             # Create our own redis connection for testing.
             self.state_manager = StateManagerRedis.create(self.app_instance.state)
         else:
-            self.state_manager = self.app_instance.state_manager
+            self.state_manager = self.app_instance._state_manager
 
     def _get_backend_shutdown_handler(self):
         if self.backend is None:
@@ -181,10 +228,13 @@ class AppHarness:
 
         async def _shutdown_redis(*args, **kwargs) -> None:
             # ensure redis is closed before event loop
-            if self.app_instance is not None and isinstance(
-                self.app_instance.state_manager, StateManagerRedis
-            ):
-                await self.app_instance.state_manager.close()
+            try:
+                if self.app_instance is not None and isinstance(
+                    self.app_instance.state_manager, StateManagerRedis
+                ):
+                    await self.app_instance.state_manager.close()
+            except ValueError:
+                pass
             await original_shutdown(*args, **kwargs)
 
         return _shutdown_redis

reflex/utils/build.py

@@ -67,6 +67,7 @@ def _zip(
     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,
 ) -> None:
     """Zip utility function.
 
@@ -78,6 +79,7 @@ def _zip(
         upload_db_file: Whether to include local sqlite db files.
         dirs_to_exclude: The directories 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.
 
     """
     dirs_to_exclude = dirs_to_exclude or set()
@@ -97,6 +99,9 @@ def _zip(
                 not exclude_venv_dirs or not _looks_like_venv_dir(os.path.join(root, d))
             )
         ]
+        # 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
@@ -197,8 +202,9 @@ def export(
                     zip_dest_dir, constants.ComponentName.BACKEND.zip()
                 ),
                 root_dir=".",
-                dirs_to_exclude={"assets", "__pycache__"},
+                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,
             )

reflex/utils/exceptions.py

@@ -13,3 +13,9 @@ class ImmutableStateError(AttributeError):
 
 class LockExpiredError(Exception):
     """Raised when the state lock expires while an event is being processed."""
+
+
+class MatchTypeError(TypeError):
+    """Raised when the return types of match cases are different."""
+
+    pass

reflex/utils/exec.py

@@ -160,7 +160,7 @@ def run_backend(
     import uvicorn
 
     config = get_config()
-    app_module = f"{config.app_name}.{config.app_name}:{constants.CompileVars.APP}"
+    app_module = f"reflex.app_module_for_backend:{constants.CompileVars.APP}"
 
     # Create a .nocompile file to skip compile for backend.
     if os.path.exists(constants.Dirs.WEB):
@@ -196,7 +196,7 @@ def run_backend_prod(
     config = get_config()
     RUN_BACKEND_PROD = f"gunicorn --worker-class {config.gunicorn_worker_class} --preload --timeout {config.timeout} --log-level critical".split()
     RUN_BACKEND_PROD_WINDOWS = f"uvicorn --timeout-keep-alive {config.timeout}".split()
-    app_module = f"{config.app_name}.{config.app_name}:{constants.CompileVars.APP}"
+    app_module = f"reflex.app_module_for_backend:{constants.CompileVars.APP}"
     command = (
         [
             *RUN_BACKEND_PROD_WINDOWS,

reflex/utils/export.py

@@ -56,7 +56,7 @@ def export(
         # Update some parameters for export
         prerequisites.update_next_config(export=True)
         # Ensure module can be imported and app.compile() is called.
-        prerequisites.get_app()
+        prerequisites.get_compiled_app()
         # Set up .web directory and install frontend dependencies.
         build.setup_frontend(Path.cwd())
 

reflex/utils/format.py

@@ -7,7 +7,7 @@ import json
 import os
 import re
 import sys
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any, List, Union
 
 from reflex import constants
 from reflex.utils import exceptions, serializers, types
@@ -125,7 +125,7 @@ def to_snake_case(text: str) -> str:
     return re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1).lower().replace("-", "_")
 
 
-def to_camel_case(text: str) -> str:
+def to_camel_case(text: str, allow_hyphens: bool = False) -> str:
     """Convert a string to camel case.
 
     The first word in the text is converted to lowercase and
@@ -133,12 +133,14 @@ def to_camel_case(text: str) -> str:
 
     Args:
         text: The string to convert.
+        allow_hyphens: Whether to allow hyphens in the string.
 
     Returns:
         The camel case string.
     """
-    words = re.split("[_-]", text.lstrip("-_"))
-    leading_underscores_or_hyphens = "".join(re.findall(r"^[_-]+", text))
+    char = "_" if allow_hyphens else "-_"
+    words = re.split(f"[{char}]", text.lstrip(char))
+    leading_underscores_or_hyphens = "".join(re.findall(rf"^[{char}]+", text))
     # Capitalize the first letter of each word except the first one
     converted_word = words[0] + "".join(x.capitalize() for x in words[1:])
     return leading_underscores_or_hyphens + converted_word
@@ -270,6 +272,41 @@ def format_cond(
     return wrap(f"{cond} ? {true_value} : {false_value}", "{")
 
 
+def format_match(cond: str | Var, match_cases: List[BaseVar], default: Var) -> str:
+    """Format a match expression whose return type is a Var.
+
+    Args:
+        cond: The condition.
+        match_cases: The list of cases to match.
+        default: The default case.
+
+    Returns:
+        The formatted match expression
+
+    """
+    switch_code = f"(() => {{ switch (JSON.stringify({cond})) {{"
+
+    for case in match_cases:
+        conditions = case[:-1]
+        return_value = case[-1]
+
+        case_conditions = " ".join(
+            [
+                f"case JSON.stringify({condition._var_name_unwrapped}):"
+                for condition in conditions
+            ]
+        )
+        case_code = (
+            f"{case_conditions}  return ({return_value._var_name_unwrapped});  break;"
+        )
+        switch_code += case_code
+
+    switch_code += f"default:  return ({default._var_name_unwrapped});  break;"
+    switch_code += "};})()"
+
+    return switch_code
+
+
 def format_prop(
     prop: Union[Var, EventChain, ComponentStyle, str],
 ) -> Union[int, float, str]: