reflex 0.4.6a4__py3-none-any.whl → 0.4.7__py3-none-any.whl

reflex/components/markdown/markdown.py

@@ -133,7 +133,7 @@ class Markdown(Component):
             **props,
         )
 
-    def get_custom_components(
+    def _get_all_custom_components(
         self, seen: set[str] | None = None
     ) -> set[CustomComponent]:
         """Get all the custom components used by the component.
@@ -144,11 +144,13 @@ class Markdown(Component):
         Returns:
             The set of custom components.
         """
-        custom_components = super().get_custom_components(seen=seen)
+        custom_components = super()._get_all_custom_components(seen=seen)
 
         # Get the custom components for each tag.
         for component in self.component_map.values():
-            custom_components |= component(_MOCK_ARG).get_custom_components(seen=seen)
+            custom_components |= component(_MOCK_ARG)._get_all_custom_components(
+                seen=seen
+            )
 
         return custom_components
 
@@ -183,7 +185,9 @@ class Markdown(Component):
 
         # Get the imports for each component.
         for component in self.component_map.values():
-            imports = utils.merge_imports(imports, component(_MOCK_ARG).get_imports())
+            imports = utils.merge_imports(
+                imports, component(_MOCK_ARG)._get_all_imports()
+            )
 
         # Get the imports for the code components.
         imports = utils.merge_imports(
@@ -293,8 +297,8 @@ class Markdown(Component):
         hooks = set()
         for _component in self.component_map.values():
             comp = _component(_MOCK_ARG)
-            hooks |= comp.get_hooks_internal()
-            hooks |= comp.get_hooks()
+            hooks.update(comp._get_all_hooks_internal())
+            hooks.update(comp._get_all_hooks())
         formatted_hooks = "\n".join(hooks)
         return f"""
         function {self._get_component_map_name()} () {{

reflex/components/markdown/markdown.pyi

@@ -123,9 +123,6 @@ class Markdown(Component):
             The markdown component.
         """
         ...
-    def get_custom_components(
-        self, seen: set[str] | None = None
-    ) -> set[CustomComponent]: ...
     def get_component(self, tag: str, **props) -> Component: ...
     def format_component(self, tag: str, **props) -> str: ...
     def format_component_map(self) -> dict[str, str]: ...

reflex/components/radix/themes/components/select.py

@@ -198,6 +198,15 @@ class HighLevelSelect(SelectRoot):
         Returns:
             The select component.
         """
+        trigger_prop_list = [
+            "placeholder",
+            "variant",
+            "radius",
+            "width",
+            "flex_shrink",
+            "custom_attrs",
+        ]
+
         content_props = {
             prop: props.pop(prop)
             for prop in ["high_contrast", "position"]
@@ -205,9 +214,7 @@ class HighLevelSelect(SelectRoot):
         }
 
         trigger_props = {
-            prop: props.pop(prop)
-            for prop in ["placeholder", "variant", "radius", "width", "flex_shrink"]
-            if prop in props
+            prop: props.pop(prop) for prop in trigger_prop_list if prop in props
         }
 
         color_scheme = props.pop("color_scheme", None)

reflex/config.py

@@ -299,7 +299,7 @@ class Config(Base):
 
         return updated_values
 
-    def get_event_namespace(self) -> str | None:
+    def get_event_namespace(self) -> str:
         """Get the websocket event namespace.
 
         Returns:

reflex/config.pyi

@@ -104,7 +104,7 @@ class Config(Base):
     @staticmethod
     def check_deprecated_values(**kwargs) -> None: ...
     def update_from_env(self) -> None: ...
-    def get_event_namespace(self) -> str | None: ...
+    def get_event_namespace(self) -> str: ...
     def _set_persistent(self, **kwargs) -> None: ...
 
 def get_config(reload: bool = ...) -> Config: ...

reflex/constants/base.py

@@ -88,12 +88,11 @@ class ReflexHostingCLI(SimpleNamespace):
 class Templates(SimpleNamespace):
     """Constants related to Templates."""
 
-    # Dynamically get the enum values from the .templates folder
-    template_dir = os.path.join(Reflex.ROOT_DIR, Reflex.MODULE_NAME, ".templates/apps")
-    template_dirs = next(os.walk(template_dir))[1]
+    # The route on Reflex backend to query which templates are available and their URLs.
+    APP_TEMPLATES_ROUTE = "/app-templates"
 
-    # Create an enum value for each directory in the .templates folder
-    Kind = Enum("Kind", {template.upper(): template for template in template_dirs})
+    # The default template
+    DEFAULT = "blank"
 
     class Dirs(SimpleNamespace):
         """Folders used by the template system of Reflex."""

reflex/constants/base.pyi

@@ -0,0 +1,94 @@
+"""Stub file for reflex/constants/base.py"""
+# ------------------- DO NOT EDIT ----------------------
+# This file was generated by `reflex/utils/pyi_generator.py`!
+# ------------------------------------------------------
+
+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
+import os
+import platform
+from enum import Enum
+from importlib import metadata
+from types import SimpleNamespace
+from platformdirs import PlatformDirs
+
+IS_WINDOWS = platform.system() == "Windows"
+
+class Dirs(SimpleNamespace):
+    WEB = ".web"
+    APP_ASSETS = "assets"
+    UTILS = "utils"
+    STATIC = "_static"
+    STATE_PATH = "/".join([UTILS, "state"])
+    COMPONENTS_PATH = "/".join([UTILS, "components"])
+    CONTEXTS_PATH = "/".join([UTILS, "context"])
+    WEB_PAGES = os.path.join(WEB, "pages")
+    WEB_STATIC = os.path.join(WEB, STATIC)
+    WEB_UTILS = os.path.join(WEB, UTILS)
+    WEB_ASSETS = os.path.join(WEB, "public")
+    ENV_JSON = os.path.join(WEB, "env.json")
+    REFLEX_JSON = os.path.join(WEB, "reflex.json")
+    POSTCSS_JS = os.path.join(WEB, "postcss.config.js")
+
+class Reflex(SimpleNamespace):
+    MODULE_NAME = "reflex"
+    VERSION = metadata.version(MODULE_NAME)
+    JSON = os.path.join(Dirs.WEB, "reflex.json")
+    _dir = os.environ.get("REFLEX_DIR", "")
+    DIR = _dir or PlatformDirs(MODULE_NAME, False).user_data_dir
+    ROOT_DIR = os.path.dirname(
+        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    )
+
+class ReflexHostingCLI(SimpleNamespace):
+    MODULE_NAME = "reflex-hosting-cli"
+
+class Templates(SimpleNamespace):
+    APP_TEMPLATES_ROUTE = "/app-templates"
+    DEFAULT = "blank"
+
+    class Dirs(SimpleNamespace):
+        BASE = os.path.join(Reflex.ROOT_DIR, Reflex.MODULE_NAME, ".templates")
+        WEB_TEMPLATE = os.path.join(BASE, "web")
+        JINJA_TEMPLATE = os.path.join(BASE, "jinja")
+        CODE = "code"
+
+class Next(SimpleNamespace):
+    CONFIG_FILE = "next.config.js"
+    SITEMAP_CONFIG_FILE = os.path.join(Dirs.WEB, "next-sitemap.config.js")
+    NODE_MODULES = "node_modules"
+    PACKAGE_LOCK = "package-lock.json"
+    FRONTEND_LISTENING_REGEX = "Local:[\\s]+(.*)"
+
+class ColorMode(SimpleNamespace):
+    NAME = "colorMode"
+    USE = "useColorMode"
+    TOGGLE = "toggleColorMode"
+
+class Env(str, Enum):
+    DEV = "dev"
+    PROD = "prod"
+
+class LogLevel(str, Enum):
+    DEBUG = "debug"
+    INFO = "info"
+    WARNING = "warning"
+    ERROR = "error"
+    CRITICAL = "critical"
+
+POLLING_MAX_HTTP_BUFFER_SIZE = 1000 * 1000
+
+class Ping(SimpleNamespace):
+    INTERVAL = 25
+    TIMEOUT = 120
+
+COOKIES = "cookies"
+LOCAL_STORAGE = "local_storage"
+SKIP_COMPILE_ENV_VAR = "__REFLEX_SKIP_COMPILE"
+ENV_MODE_ENV_VAR = "REFLEX_ENV_MODE"
+PYTEST_CURRENT_TEST = "PYTEST_CURRENT_TEST"
+RELOAD_CONFIG = "__REFLEX_RELOAD_CONFIG"
+REFLEX_VAR_OPENING_TAG = "<reflex.Var>"
+REFLEX_VAR_CLOSING_TAG = "</reflex.Var>"

reflex/constants/compiler.py

@@ -111,6 +111,14 @@ class Hooks(SimpleNamespace):
     """Common sets of hook declarations."""
 
     EVENTS = f"const [{CompileVars.ADD_EVENTS}, {CompileVars.CONNECT_ERROR}] = useContext(EventLoopContext);"
+    AUTOFOCUS = """
+                // Set focus to the specified element.
+                const focusRef = useRef(null)
+                useEffect(() => {
+                  if (focusRef.current) {
+                    focusRef.current.focus();
+                  }
+                })"""
 
 
 class MemoizationDisposition(enum.Enum):

reflex/custom_components/custom_components.py

@@ -71,6 +71,28 @@ def _create_package_config(module_name: str, package_name: str):
         )
 
 
+def _get_package_config(exit_on_fail: bool = True) -> dict:
+    """Get the package configuration from the pyproject.toml file.
+
+    Args:
+        exit_on_fail: Whether to exit if the pyproject.toml file is not found.
+
+    Returns:
+        The package configuration.
+
+    Raises:
+        Exit: If the pyproject.toml file is not found.
+    """
+    try:
+        with open(CustomComponents.PYPROJECT_TOML, "rb") as f:
+            return dict(tomlkit.load(f))
+    except (OSError, TOMLKitError) as ex:
+        console.error(f"Unable to read from pyproject.toml due to {ex}")
+        if exit_on_fail:
+            raise typer.Exit(code=1) from ex
+        raise
+
+
 def _create_readme(module_name: str, package_name: str):
     """Create a package README file.
 
@@ -145,7 +167,7 @@ def _populate_demo_app(name_variants: NameVariants):
 
     with set_directory(demo_app_dir):
         # We start with the blank template as basis.
-        _init(name=demo_app_name, template=constants.Templates.Kind.BLANK)
+        _init(name=demo_app_name, template=constants.Templates.DEFAULT)
         # Then overwrite the app source file with the one we want for testing custom components.
         # This source file is rendered using jinja template file.
         with open(f"{demo_app_name}/{demo_app_name}.py", "w") as f:
@@ -416,9 +438,7 @@ def _run_commands_in_subprocess(cmds: list[str]) -> bool:
 
 def _make_pyi_files():
     """Create pyi files for the custom component."""
-    from glob import glob
-
-    package_name = glob("custom_components/*.egg-info")[0].replace(".egg-info", "")
+    package_name = _get_package_config()["project"]["name"]
 
     for dir, _, _ in os.walk(f"./{package_name}"):
         if "__pycache__" in dir:
@@ -514,22 +534,10 @@ def _validate_credentials(
 def _get_version_to_publish() -> str:
     """Get the version to publish from the pyproject.toml.
 
-    Raises:
-        Exit: If the version is not found in the pyproject.toml.
-
     Returns:
         The version to publish.
     """
-    # Get the version from the pyproject.toml.
-    try:
-        with open(CustomComponents.PYPROJECT_TOML, "rb") as f:
-            project_toml = tomlkit.parse(f.read())
-            return project_toml.get("project", {})["version"]
-    except (OSError, KeyError, TOMLKitError) as ex:
-        console.error(
-            f"Cannot find the version in {CustomComponents.PYPROJECT_TOML} due to {ex}"
-        )
-        raise typer.Exit(code=1) from ex
+    return _get_package_config()["project"]["version"]
 
 
 def _ensure_dist_dir(version_to_publish: str, build: bool):
@@ -715,7 +723,7 @@ def publish(
     _collect_details_for_gallery()
 
 
-def _process_entered_list(input: str) -> list | None:
+def _process_entered_list(input: str | None) -> list | None:
     """Process the user entered comma separated list into a list if applicable.
 
     Args:
@@ -724,7 +732,7 @@ def _process_entered_list(input: str) -> list | None:
     Returns:
         The list of items or None.
     """
-    return [t.strip() for t in input.split(",") if t if input] or None
+    return [t.strip() for t in (input or "").split(",") if t if input] or None
 
 
 def _validate_project_info():
@@ -733,12 +741,7 @@ def _validate_project_info():
     Raises:
         Exit: If the pyproject.toml file is ill-formed.
     """
-    try:
-        with open(CustomComponents.PYPROJECT_TOML, "rb") as f:
-            pyproject_toml = tomlkit.parse(f.read())
-    except TOMLKitError as ex:
-        console.error(f"Unable to read from pyproject.toml due to {ex}")
-        raise typer.Exit(code=1) from ex
+    pyproject_toml = _get_package_config()
 
     try:
         project = pyproject_toml.get("project", {})
@@ -773,6 +776,7 @@ def _validate_project_info():
             )
             or []
         )
+        project["keywords"] = new_keywords
     elif keyword_action == "a":
         new_keywords = (
             _process_entered_list(
@@ -780,7 +784,7 @@ def _validate_project_info():
             )
             or []
         )
-    project["keywords"] = project.get("keywords", []) + new_keywords
+        project["keywords"] = project.get("keywords", []) + new_keywords
 
     if not project.get("urls"):
         project["urls"] = {}
@@ -795,7 +799,7 @@ def _validate_project_info():
         with open(CustomComponents.PYPROJECT_TOML, "w") as f:
             tomlkit.dump(pyproject_toml, f)
     except (OSError, TOMLKitError) as ex:
-        console.error(f"Unable to read from pyproject.toml due to {ex}")
+        console.error(f"Unable to write to pyproject.toml due to {ex}")
         raise typer.Exit(code=1) from ex
 
 
@@ -815,10 +819,8 @@ def _collect_details_for_gallery():
     params = {}
     package_name = None
     try:
-        with open(CustomComponents.PYPROJECT_TOML, "rb") as f:
-            project_toml = tomlkit.parse(f.read())
-        package_name = project_toml.get("project", {})["name"]
-    except (OSError, TOMLKitError, KeyError) as ex:
+        package_name = _get_package_config(exit_on_fail=False)["project"]["name"]
+    except (TOMLKitError, KeyError) as ex:
         console.debug(
             f"Unable to read from pyproject.toml in current directory due to {ex}"
         )
@@ -849,13 +851,6 @@ def _collect_details_for_gallery():
         console.error(f"Unable to complete request due to {he}.")
         raise typer.Exit(code=1) from he
 
-    display_name = (
-        console.ask("[ Friendly display name for your component ] (enter to skip)")
-        or None
-    )
-    if display_name:
-        params["display_name"] = display_name
-
     files = []
     if (image_file_and_extension := _get_file_from_prompt_in_loop()) is not None:
         files.append(

reflex/experimental/__init__.py

@@ -0,0 +1,14 @@
+"""Namespace for experimental features."""
+
+from types import SimpleNamespace
+
+from ..utils.console import warn
+from . import hooks as hooks
+
+warn(
+    "`rx._x` contains experimental features and might be removed at any time in the future .",
+)
+
+_x = SimpleNamespace(
+    hooks=hooks,
+)

reflex/experimental/hooks.py

@@ -0,0 +1,75 @@
+"""Add standard Hooks wrapper for React."""
+
+from reflex.utils.imports import ImportVar
+from reflex.vars import Var, VarData
+
+
+def _add_react_import(v: Var | None, tags: str | list):
+    if v is None:
+        return
+
+    if isinstance(tags, str):
+        tags = [tags]
+
+    v._var_data = VarData(  # type: ignore
+        imports={"react": [ImportVar(tag=tag) for tag in tags]},
+    )
+
+
+def const(name, value) -> Var | None:
+    """Create a constant Var.
+
+    Args:
+        name: The name of the constant.
+        value: The value of the constant.
+
+    Returns:
+        The constant Var.
+    """
+    return Var.create(f"const {name} = {value}")
+
+
+def useCallback(func, deps) -> Var | None:
+    """Create a useCallback hook with a function and dependencies.
+
+    Args:
+        func: The function to wrap.
+        deps: The dependencies of the function.
+
+    Returns:
+        The useCallback hook.
+    """
+    if deps:
+        v = Var.create(f"useCallback({func}, {deps})")
+    else:
+        v = Var.create(f"useCallback({func})")
+    _add_react_import(v, "useCallback")
+    return v
+
+
+def useContext(context) -> Var | None:
+    """Create a useContext hook with a context.
+
+    Args:
+        context: The context to use.
+
+    Returns:
+        The useContext hook.
+    """
+    v = Var.create(f"useContext({context})")
+    _add_react_import(v, "useContext")
+    return v
+
+
+def useRef(default) -> Var | None:
+    """Create a useRef hook with a default value.
+
+    Args:
+        default: The default value of the ref.
+
+    Returns:
+        The useRef hook.
+    """
+    v = Var.create(f"useRef({default})")
+    _add_react_import(v, "useRef")
+    return v

reflex/page.py

@@ -30,7 +30,7 @@ def page(
         title: The title of the page.
         image: The favicon of the page.
         description: The description of the page.
-        meta: Additionnal meta to add to the page.
+        meta: Additional meta to add to the page.
         on_load: The event handler(s) called when the page load.
         script_tags: scripts to attach to the page
 

reflex/reflex.py

@@ -63,7 +63,7 @@ def main(
 
 def _init(
     name: str,
-    template: constants.Templates.Kind | None = constants.Templates.Kind.BLANK,
+    template: str | None = None,
     loglevel: constants.LogLevel = config.loglevel,
 ):
     """Initialize a new Reflex app in the given directory."""
@@ -79,31 +79,20 @@ def _init(
     app_name = prerequisites.validate_app_name(name)
     console.rule(f"[bold]Initializing {app_name}")
 
+    # Check prerequisites.
     prerequisites.check_latest_package_version(constants.Reflex.MODULE_NAME)
-
     prerequisites.initialize_reflex_user_directory()
-
     prerequisites.ensure_reflex_installation_id()
 
     # When upgrading to 0.4, show migration instructions.
     if prerequisites.should_show_rx_chakra_migration_instructions():
         prerequisites.show_rx_chakra_migration_instructions()
 
-    # Set up the app directory, only if the config doesn't exist.
-    if not os.path.exists(constants.Config.FILE):
-        if template is None:
-            template = prerequisites.prompt_for_template()
-        prerequisites.create_config(app_name)
-        prerequisites.initialize_app_directory(app_name, template)
-        telemetry_event = "init"
-    else:
-        telemetry_event = "reinit"
-
     # Set up the web project.
     prerequisites.initialize_frontend_dependencies()
 
-    # Send the telemetry event after the .web folder is initialized.
-    telemetry.send(telemetry_event)
+    # Initialize the app.
+    prerequisites.initialize_app(app_name, template)
 
     # Migrate Pynecone projects to Reflex.
     prerequisites.migrate_to_reflex()
@@ -123,7 +112,7 @@ def init(
     name: str = typer.Option(
         None, metavar="APP_NAME", help="The name of the app to initialize."
     ),
-    template: constants.Templates.Kind = typer.Option(
+    template: str = typer.Option(
         None,
         help="The template to initialize the app with.",
     ),
@@ -165,7 +154,8 @@ def _run(
         _skip_compile()
 
     # Check that the app is initialized.
-    prerequisites.check_initialized(frontend=frontend)
+    if prerequisites.needs_reinit(frontend=frontend):
+        _init(name=config.app_name, loglevel=loglevel)
 
     # If something is running on the ports, ask the user if they want to kill or change it.
     if frontend and processes.is_process_on_port(frontend_port):
@@ -234,6 +224,11 @@ def _run(
         # In dev mode, run the backend on the main thread.
         if backend and env == constants.Env.DEV:
             backend_cmd(backend_host, int(backend_port))
+            # The windows uvicorn bug workaround
+            # https://github.com/reflex-dev/reflex/issues/2335
+            if constants.IS_WINDOWS and exec.frontend_process:
+                # Sends SIGTERM in windows
+                exec.kill(exec.frontend_process.pid)
 
 
 @cli.command()
@@ -289,6 +284,10 @@ def export(
 ):
     """Export the app to a zip file."""
     from reflex.utils import export as export_utils
+    from reflex.utils import prerequisites
+
+    if prerequisites.needs_reinit(frontend=True):
+        _init(name=config.app_name, loglevel=loglevel)
 
     export_utils.export(
         zipping=zipping,
@@ -524,7 +523,8 @@ def deploy(
         dependency.check_requirements()
 
     # Check if we are set up.
-    prerequisites.check_initialized(frontend=True)
+    if prerequisites.needs_reinit(frontend=True):
+        _init(name=config.app_name, loglevel=loglevel)
     prerequisites.check_latest_package_version(constants.ReflexHostingCLI.MODULE_NAME)
 
     hosting_cli.deploy(
@@ -565,20 +565,6 @@ def demo(
     # Open the demo app in a terminal.
     webbrowser.open("https://demo.reflex.run")
 
-    # Later: open the demo app locally.
-    # with tempfile.TemporaryDirectory() as tmp_dir:
-    #     os.chdir(tmp_dir)
-    #     _init(
-    #         name="reflex_demo",
-    #         template=constants.Templates.Kind.DEMO,
-    #         loglevel=constants.LogLevel.DEBUG,
-    #     )
-    #     _run(
-    #         frontend_port=frontend_port,
-    #         backend_port=backend_port,
-    #         loglevel=constants.LogLevel.DEBUG,
-    #     )
-
 
 cli.add_typer(db_cli, name="db", help="Subcommands for managing the database schema.")
 cli.add_typer(script_cli, name="script", help="Subcommands running helper scripts.")

reflex/style.py

@@ -22,7 +22,7 @@ color_mode_var_data = VarData(  # type: ignore
         "react": {ImportVar(tag="useContext")},
     },
     hooks={
-        f"const [ {constants.ColorMode.NAME}, {constants.ColorMode.TOGGLE} ] = useContext(ColorModeContext)",
+        f"const [ {constants.ColorMode.NAME}, {constants.ColorMode.TOGGLE} ] = useContext(ColorModeContext)": None,
     },
 )
 # Var resolves to the current color mode for the app ("light" or "dark")
@@ -240,9 +240,9 @@ def format_as_emotion(style_dict: dict[str, Any]) -> Style | None:
         if isinstance(value, list):
             # Apply media queries from responsive value list.
             mbps = {
-                media_query(bp): bp_value
-                if isinstance(bp_value, dict)
-                else {key: bp_value}
+                media_query(bp): (
+                    bp_value if isinstance(bp_value, dict) else {key: bp_value}
+                )
                 for bp, bp_value in enumerate(value)
             }
             if key.startswith("&:"):

reflex/testing.py

@@ -223,7 +223,7 @@ class AppHarness:
             with chdir(self.app_path):
                 reflex.reflex._init(
                     name=self.app_name,
-                    template=reflex.constants.Templates.Kind.BLANK,
+                    template=reflex.constants.Templates.DEFAULT,
                     loglevel=reflex.constants.LogLevel.INFO,
                 )
                 self.app_module_path.write_text(source_code)

reflex/utils/console.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import List, Optional
-
 from rich.console import Console
 from rich.progress import MofNCompleteColumn, Progress, TimeElapsedColumn
 from rich.prompt import Prompt
@@ -150,7 +148,10 @@ def error(msg: str, **kwargs):
 
 
 def ask(
-    question: str, choices: Optional[List[str]] = None, default: Optional[str] = None
+    question: str,
+    choices: list[str] | None = None,
+    default: str | None = None,
+    show_choices: bool = True,
 ) -> str:
     """Takes a prompt question and optionally a list of choices
      and returns the user input.
@@ -159,11 +160,12 @@ def ask(
         question: The question to ask the user.
         choices: A list of choices to select from.
         default: The default option selected.
+        show_choices: Whether to show the choices.
 
     Returns:
         A string with the user input.
     """
-    return Prompt.ask(question, choices=choices, default=default)  # type: ignore
+    return Prompt.ask(question, choices=choices, default=default, show_choices=show_choices)  # type: ignore
 
 
 def progress():