reflex 0.8.13a1__py3-none-any.whl → 0.8.14__py3-none-any.whl

reflex/custom_components/custom_components.py

@@ -359,7 +359,7 @@ def _get_default_library_name_parts() -> list[str]:
     """Get the default library name. Based on the current directory name, remove any non-alphanumeric characters.
 
     Raises:
-        Exit: If the current directory name is not suitable for python projects, and we cannot find a valid library name based off it.
+        SystemExit: If the current directory name is not suitable for python projects, and we cannot find a valid library name based off it.
 
     Returns:
         The parts of default library name.
@@ -377,13 +377,13 @@ def _get_default_library_name_parts() -> list[str]:
             console.error(
                 f"Based on current directory name {current_dir_name}, the library name is {constants.Reflex.MODULE_NAME}. This package already exists. Please use --library-name to specify a different name."
             )
-            raise click.exceptions.Exit(code=1)
+            raise SystemExit(1)
     if not parts:
         # The folder likely has a name not suitable for python paths.
         console.error(
             f"Could not find a valid library name based on the current directory: got {current_dir_name}."
         )
-        raise click.exceptions.Exit(code=1)
+        raise SystemExit(1)
     return parts
 
 
@@ -408,7 +408,7 @@ def _validate_library_name(library_name: str | None) -> NameVariants:
         library_name: The name of the library if picked otherwise None.
 
     Raises:
-        Exit: If the library name is not suitable for python projects.
+        SystemExit: If the library name is not suitable for python projects.
 
     Returns:
         A tuple containing the various names such as package name, class name, etc., needed for the project.
@@ -419,7 +419,7 @@ def _validate_library_name(library_name: str | None) -> NameVariants:
         console.error(
             f"Please use only alphanumeric characters or dashes: got {library_name}"
         )
-        raise click.exceptions.Exit(code=1)
+        raise SystemExit(1)
 
     # If not specified, use the current directory name to form the module name.
     name_parts = (
@@ -513,13 +513,13 @@ def init(
         install: Whether to install package from this local custom component in editable mode.
 
     Raises:
-        Exit: If the pyproject.toml already exists.
+        SystemExit: If the pyproject.toml already exists.
     """
     from reflex.utils import exec
 
     if CustomComponents.PYPROJECT_TOML.exists():
         console.error(f"A {CustomComponents.PYPROJECT_TOML} already exists. Aborting.")
-        click.exceptions.Exit(code=1)
+        raise SystemExit(1)
 
     # Show system info.
     exec.output_system_info()
@@ -544,7 +544,7 @@ def init(
         if _pip_install_on_demand(package_name=".", install_args=["-e"]):
             console.info(f"Package {package_name} installed!")
         else:
-            raise click.exceptions.Exit(code=1)
+            raise SystemExit(1)
 
     console.print("[bold]Custom component initialized successfully!")
     console.rule("[bold]Project Summary")
@@ -627,7 +627,7 @@ def _run_build():
     """Run the build command.
 
     Raises:
-        Exit: If the build fails.
+        SystemExit: If the build fails.
     """
     console.print("Building custom component...")
 
@@ -637,7 +637,7 @@ def _run_build():
     if _run_commands_in_subprocess(cmds):
         console.info("Custom component built successfully!")
     else:
-        raise click.exceptions.Exit(code=1)
+        raise SystemExit(1)
 
 
 @custom_components_cli.command(name="build")
@@ -651,7 +651,7 @@ def _collect_details_for_gallery():
     """Helper to collect details on the custom component to be included in the gallery.
 
     Raises:
-        Exit: If pyproject.toml file is ill-formed or the request to the backend services fails.
+        SystemExit: If pyproject.toml file is ill-formed or the request to the backend services fails.
     """
     import httpx
     from reflex_cli.utils import hosting
@@ -664,7 +664,7 @@ def _collect_details_for_gallery():
         console.error(
             "Unable to authenticate with Reflex backend services. Make sure you are logged in."
         )
-        raise click.exceptions.Exit(code=1)
+        raise SystemExit(1)
 
     console.rule("[bold]Custom Component Information")
     params = {}
@@ -694,11 +694,11 @@ def _collect_details_for_gallery():
             console.error(
                 f"{package_name} is owned by another user. Unable to update the information for it."
             )
-            raise click.exceptions.Exit(code=1)
+            raise SystemExit(1)
         response.raise_for_status()
     except httpx.HTTPError as he:
         console.error(f"Unable to complete request due to {he}.")
-        raise click.exceptions.Exit(code=1) from he
+        raise SystemExit(1) from None
 
     files = []
     if (image_file_and_extension := _get_file_from_prompt_in_loop()) is not None:
@@ -733,7 +733,7 @@ def _collect_details_for_gallery():
 
     except httpx.HTTPError as he:
         console.error(f"Unable to complete request due to {he}.")
-        raise click.exceptions.Exit(code=1) from he
+        raise SystemExit(1) from None
 
     console.info("Custom component information successfully shared!")
 
@@ -769,7 +769,7 @@ def _get_file_from_prompt_in_loop() -> tuple[bytes, str] | None:
             image_file = image_file_path.read_bytes()
         except OSError as ose:
             console.error(f"Unable to read the {file_extension} file due to {ose}")
-            raise click.exceptions.Exit(code=1) from ose
+            raise SystemExit(1) from None
         else:
             return image_file, file_extension
 
@@ -790,9 +790,9 @@ def install():
     """Install package from this local custom component in editable mode.
 
     Raises:
-        Exit: If unable to install the current directory in editable mode.
+        SystemExit: If unable to install the current directory in editable mode.
     """
     if _pip_install_on_demand(package_name=".", install_args=["-e"]):
         console.info("Package installed successfully!")
     else:
-        raise click.exceptions.Exit(code=1)
+        raise SystemExit(1)

reflex/environment.py

@@ -660,6 +660,9 @@ class EnvironmentVariables:
     # Whether to enable SSR for the frontend.
     REFLEX_SSR: EnvVar[bool] = env_var(True)
 
+    # Whether to mount the compiled frontend app in the backend server in production.
+    REFLEX_MOUNT_FRONTEND_COMPILED_APP: EnvVar[bool] = env_var(False, internal=True)
+
 
 environment = EnvironmentVariables()
 

reflex/event.py

@@ -875,7 +875,7 @@ class FileUpload:
             upload_files_context_var_data,
         )
 
-        upload_id = self.upload_id or DEFAULT_UPLOAD_ID
+        upload_id = self.upload_id if self.upload_id is not None else DEFAULT_UPLOAD_ID
         spec_args = [
             (
                 Var(_js_expr="files"),

reflex/plugins/shared_tailwind.py

@@ -179,7 +179,7 @@ class TailwindPlugin(PluginBase):
     config: TailwindConfig = dataclasses.field(
         default_factory=lambda: TailwindConfig(
             plugins=[
-                "@tailwindcss/typography@0.5.18",
+                "@tailwindcss/typography@0.5.19",
             ],
         )
     )

reflex/reflex.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import atexit
 from importlib.util import find_spec
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -132,8 +131,11 @@ def _run(
     frontend_port: int | None = None,
     backend_port: int | None = None,
     backend_host: str | None = None,
+    single_port: bool = False,
 ):
     """Run the app in the given directory."""
+    import atexit
+
     from reflex.utils import build, exec, prerequisites, processes
 
     config = get_config()
@@ -173,7 +175,9 @@ def _run(
             auto_increment=auto_increment_frontend,
         )
 
-    if backend:
+    if single_port:
+        backend_port = frontend_port
+    elif backend:
         auto_increment_backend = not bool(backend_port or config.backend_port)
 
         backend_port = processes.handle_port(
@@ -223,23 +227,23 @@ def _run(
     if not return_result:
         raise SystemExit(1)
 
+    if env != constants.Env.PROD and env != constants.Env.DEV:
+        msg = f"Invalid env: {env}. Must be DEV or PROD."
+        raise ValueError(msg)
+
     # Get the frontend and backend commands, based on the environment.
-    setup_frontend = frontend_cmd = backend_cmd = None
     if env == constants.Env.DEV:
         setup_frontend, frontend_cmd, backend_cmd = (
             build.setup_frontend,
             exec.run_frontend,
             exec.run_backend,
         )
-    if env == constants.Env.PROD:
+    elif env == constants.Env.PROD:
         setup_frontend, frontend_cmd, backend_cmd = (
             build.setup_frontend_prod,
             exec.run_frontend_prod,
             exec.run_backend_prod,
         )
-    if not setup_frontend or not frontend_cmd or not backend_cmd:
-        msg = f"Invalid env: {env}. Must be DEV or PROD."
-        raise ValueError(msg)
 
     # Post a telemetry event.
     telemetry.send(f"run-{env.value}")
@@ -251,7 +255,7 @@ def _run(
     commands = []
 
     # Run the frontend on a separate thread.
-    if frontend:
+    if frontend and not single_port:
         setup_frontend(Path.cwd())
         commands.append((frontend_cmd, Path.cwd(), frontend_port, backend))
 
@@ -267,21 +271,30 @@ def _run(
             )
         )
 
-    # Start the frontend and backend.
-    with processes.run_concurrently_context(*commands):
-        # In dev mode, run the backend on the main thread.
-        if backend and backend_port and env == constants.Env.DEV:
-            backend_cmd(
-                backend_host,
-                int(backend_port),
-                config.loglevel.subprocess_level(),
-                frontend,
-            )
-            # 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)
+    if single_port:
+        setup_frontend(Path.cwd())
+        backend_function, *args = commands[0]
+        exec.notify_app_running()
+        exec.notify_frontend(
+            f"http://0.0.0.0:{get_config().frontend_port}", backend_present=True
+        )
+        backend_function(*args, mount_frontend_compiled_app=True)
+    else:
+        # Start the frontend and backend.
+        with processes.run_concurrently_context(*commands):
+            # In dev mode, run the backend on the main thread.
+            if backend and backend_port and env == constants.Env.DEV:
+                backend_cmd(
+                    backend_host,
+                    int(backend_port),
+                    config.loglevel.subprocess_level(),
+                    frontend,
+                )
+                # 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()
@@ -322,6 +335,12 @@ def _run(
     "--backend-host",
     help="Specify the backend host.",
 )
+@click.option(
+    "--single-port",
+    is_flag=True,
+    help="Run both frontend and backend on the same port.",
+    default=False,
+)
 def run(
     env: LITERAL_ENV,
     frontend_only: bool,
@@ -329,11 +348,29 @@ def run(
     frontend_port: int | None,
     backend_port: int | None,
     backend_host: str | None,
+    single_port: bool,
 ):
     """Run the app in the current directory."""
     if frontend_only and backend_only:
         console.error("Cannot use both --frontend-only and --backend-only options.")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
+
+    if single_port:
+        if env != constants.Env.PROD.value:
+            console.error("--single-port can only be used with --env=PROD.")
+            raise click.exceptions.Exit(1)
+        if frontend_only or backend_only:
+            console.error(
+                "Cannot use --single-port with --frontend-only or --backend-only options."
+            )
+            raise click.exceptions.Exit(1)
+        if backend_port and frontend_port and backend_port != frontend_port:
+            console.error(
+                "When using --single-port, --backend-port and --frontend-port must be the same."
+            )
+            raise click.exceptions.Exit(1)
+    elif frontend_port and backend_port and frontend_port == backend_port:
+        single_port = True
 
     config = get_config()
 
@@ -352,6 +389,7 @@ def run(
         frontend_port,
         backend_port,
         backend_host,
+        single_port,
     )
 
 

reflex/state.py

@@ -533,7 +533,7 @@ class BaseState(EvenMoreBasicBaseState):
         cls._check_overridden_computed_vars()
 
         new_backend_vars = {
-            name: value
+            name: value if not isinstance(value, Field) else value.default_value()
             for name, value in list(cls.__dict__.items())
             if types.is_backend_base_variable(name, cls)
         }
@@ -1207,7 +1207,8 @@ class BaseState(EvenMoreBasicBaseState):
             The default value of the var or None.
         """
         try:
-            return getattr(cls, name)
+            value = getattr(cls, name)
+            return value if not isinstance(value, Field) else value.default_value()
         except AttributeError:
             try:
                 return types.get_default_value_for_type(annotation_value)

reflex/utils/exec.py

@@ -145,6 +145,18 @@ def kill(proc_pid: int):
     process.kill()
 
 
+def notify_frontend(url: str, backend_present: bool):
+    """Output a string notifying where the frontend is running.
+
+    Args:
+        url: The URL where the frontend is running.
+        backend_present: Whether the backend is present.
+    """
+    console.print(
+        f"App running at: [bold green]{url.rstrip('/')}/[/bold green]{' (Frontend-only mode)' if not backend_present else ''}"
+    )
+
+
 def notify_backend():
     """Output a string notifying where the backend is running."""
     console.print(
@@ -210,9 +222,7 @@ def run_process_and_launch_url(
                         if get_config().frontend_path != "":
                             url = urljoin(url, get_config().frontend_path)
 
-                        console.print(
-                            f"App running at: [bold green]{url}[/bold green]{' (Frontend-only mode)' if not backend_present else ''}"
-                        )
+                        notify_frontend(url, backend_present)
                         if backend_present:
                             notify_backend()
                         first_run = False
@@ -249,6 +259,11 @@ def run_frontend(root: Path, port: str, backend_present: bool = True):
     )
 
 
+def notify_app_running():
+    """Notify that the app is running."""
+    console.rule("[bold green]App Running")
+
+
 def run_frontend_prod(root: Path, port: str, backend_present: bool = True):
     """Run the frontend.
 
@@ -264,7 +279,7 @@ def run_frontend_prod(root: Path, port: str, backend_present: bool = True):
     # validate dependencies before run
     js_runtimes.validate_frontend_dependencies(init=False)
     # Run the frontend in production mode.
-    console.rule("[bold green]App Running")
+    notify_app_running()
     run_process_and_launch_url(
         [*js_runtimes.get_js_package_executor(raise_on_none=True)[0], "run", "prod"],
         backend_present,
@@ -552,6 +567,7 @@ def run_backend_prod(
     port: int,
     loglevel: constants.LogLevel = constants.LogLevel.ERROR,
     frontend_present: bool = False,
+    mount_frontend_compiled_app: bool = False,
 ):
     """Run the backend.
 
@@ -560,10 +576,13 @@ def run_backend_prod(
         port: The app port
         loglevel: The log level.
         frontend_present: Whether the frontend is present.
+        mount_frontend_compiled_app: Whether to mount the compiled frontend app with the backend.
     """
     if not frontend_present:
         notify_backend()
 
+    environment.REFLEX_MOUNT_FRONTEND_COMPILED_APP.set(mount_frontend_compiled_app)
+
     if should_use_granian():
         run_granian_backend_prod(host, port, loglevel)
     else:

reflex/utils/frontend_skeleton.py

@@ -5,8 +5,6 @@ import random
 import re
 from pathlib import Path
 
-import click
-
 from reflex import constants
 from reflex.compiler import templates
 from reflex.config import Config, get_config
@@ -54,7 +52,7 @@ def initialize_requirements_txt() -> bool:
         True if the user has to update the requirements.txt file.
 
     Raises:
-        Exit: If the requirements.txt file cannot be read or written to.
+        SystemExit: If the requirements.txt file cannot be read or written to.
     """
     requirements_file_path = Path(constants.RequirementsTxt.FILE)
     if (
@@ -72,8 +70,8 @@ def initialize_requirements_txt() -> bool:
         except UnicodeDecodeError:
             continue
         except Exception as e:
-            console.error(f"Failed to read {requirements_file_path}.")
-            raise click.exceptions.Exit(1) from e
+            console.error(f"Failed to read {requirements_file_path} due to {e}.")
+            raise SystemExit(1) from None
     else:
         return True
 

reflex/utils/js_runtimes.py

@@ -6,7 +6,6 @@ import tempfile
 from collections.abc import Sequence
 from pathlib import Path
 
-import click
 from packaging import version
 
 from reflex import constants
@@ -30,22 +29,45 @@ def check_node_version() -> bool:
     )
 
 
-@once
-def get_node_version() -> version.Version | None:
-    """Get the version of node.
+def _get_version_of_executable(
+    executable_path: Path | None, version_arg: str = "--version"
+) -> version.Version | None:
+    """Get the version of an executable.
+
+    Args:
+        executable_path: The path to the executable.
+        version_arg: The argument to pass to the executable to get its version.
 
     Returns:
-        The version of node.
+        The version of the executable.
     """
-    node_path = path_ops.get_node_path()
-    if node_path is None:
+    if executable_path is None:
         return None
     try:
-        result = processes.new_process([node_path, "-v"], run=True)
-        # The output will be in the form "vX.Y.Z", but version.parse() can handle it
-        return version.parse(result.stdout)
+        result = processes.new_process([executable_path, version_arg], run=True)
+        if result.returncode != 0:
+            console.error(
+                f"Failed to run {executable_path} {version_arg} to get version. Return code: {result.returncode}. Standard error: {result.stderr!r}."
+            )
+            return None
+        return version.parse(result.stdout.strip())
     except (FileNotFoundError, TypeError):
         return None
+    except version.InvalidVersion as e:
+        console.warn(
+            f"The detected version of {executable_path} ({e.args[0]}) is not valid. Defaulting to None."
+        )
+        return None
+
+
+@once
+def get_node_version() -> version.Version | None:
+    """Get the version of node.
+
+    Returns:
+        The version of node.
+    """
+    return _get_version_of_executable(path_ops.get_node_path())
 
 
 def get_bun_version(bun_path: Path | None = None) -> version.Version | None:
@@ -57,20 +79,7 @@ def get_bun_version(bun_path: Path | None = None) -> version.Version | None:
     Returns:
         The version of bun.
     """
-    bun_path = bun_path or path_ops.get_bun_path()
-    if bun_path is None:
-        return None
-    try:
-        # Run the bun -v command and capture the output
-        result = processes.new_process([str(bun_path), "-v"], run=True)
-        return version.parse(str(result.stdout))
-    except FileNotFoundError:
-        return None
-    except version.InvalidVersion as e:
-        console.warn(
-            f"The detected bun version ({e.args[0]}) is not valid. Defaulting to None."
-        )
-        return None
+    return _get_version_of_executable(bun_path or path_ops.get_bun_path())
 
 
 def npm_escape_hatch() -> bool:
@@ -193,7 +202,7 @@ def download_and_run(url: str, *args, show_status: bool = False, **env):
         env: The environment variables to use.
 
     Raises:
-        Exit: If the script fails to download.
+        SystemExit: If the script fails to download.
     """
     import httpx
 
@@ -206,7 +215,7 @@ def download_and_run(url: str, *args, show_status: bool = False, **env):
         console.error(
             f"Failed to download bun install script. You can install or update bun manually from https://bun.com \n{e}"
         )
-        raise click.exceptions.Exit(1) from None
+        raise SystemExit(1) from None
 
     # Save the script to a temporary file.
     with tempfile.NamedTemporaryFile() as tempfile_file:
@@ -226,7 +235,7 @@ def install_bun():
 
     Raises:
         SystemPackageMissingError: If "unzip" is missing.
-        Exit: If REFLEX_USE_NPM is set but Node.js is not installed.
+        SystemExit: If REFLEX_USE_NPM is set but Node.js is not installed.
     """
     if npm_escape_hatch():
         if get_node_version() is not None:
@@ -237,7 +246,7 @@ def install_bun():
         console.error(
             "REFLEX_USE_NPM is set, but Node.js is not installed. Please install Node.js to use npm."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     bun_path = path_ops.get_bun_path()
 
@@ -290,7 +299,7 @@ def validate_bun(bun_path: Path | None = None):
         bun_path: The path to the bun executable. If None, the default bun path is used.
 
     Raises:
-        Exit: If custom specified bun does not exist or does not meet requirements.
+        SystemExit: If custom specified bun does not exist or does not meet requirements.
     """
     bun_path = bun_path or path_ops.get_bun_path()
 
@@ -304,7 +313,7 @@ def validate_bun(bun_path: Path | None = None):
             console.error(
                 "Failed to obtain bun version. Make sure the specified bun path in your config is correct."
             )
-            raise click.exceptions.Exit(1)
+            raise SystemExit(1)
         if bun_version < version.parse(constants.Bun.MIN_VERSION):
             console.warn(
                 f"Reflex requires bun version {constants.Bun.MIN_VERSION} or higher to run, but the detected version is "
@@ -320,20 +329,21 @@ def validate_frontend_dependencies(init: bool = True):
         init: whether running `reflex init`
 
     Raises:
-        Exit: If the package manager is invalid.
+        SystemExit: If the package manager is invalid.
     """
     if not init:
         try:
             get_js_package_executor(raise_on_none=True)
         except FileNotFoundError as e:
-            raise click.exceptions.Exit(1) from e
+            console.error(f"Failed to find a valid package manager due to {e}.")
+            raise SystemExit(1) from None
 
     if prefer_npm_over_bun() and not check_node_version():
         node_version = get_node_version()
         console.error(
             f"Reflex requires node version {constants.Node.MIN_VERSION} or higher to run, but the detected version is {node_version}",
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
 
 def remove_existing_bun_installation():

reflex/utils/prerequisites.py

@@ -15,7 +15,6 @@ from pathlib import Path
 from types import ModuleType
 from typing import NamedTuple
 
-import click
 from alembic.util.exc import CommandError
 from packaging import version
 from redis import Redis as RedisSync
@@ -444,7 +443,7 @@ def validate_app_name(app_name: str | None = None) -> str:
         The app name after validation.
 
     Raises:
-        Exit: if the app directory name is reflex or if the name is not standard for a python package name.
+        SystemExit: if the app directory name is reflex or if the name is not standard for a python package name.
     """
     app_name = app_name if app_name else Path.cwd().name.replace("-", "_")
     # Make sure the app is not named "reflex".
@@ -452,14 +451,14 @@ def validate_app_name(app_name: str | None = None) -> str:
         console.error(
             f"The app directory cannot be named [bold]{constants.Reflex.MODULE_NAME}[/bold]."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     # Make sure the app name is standard for a python package name.
     if not re.match(r"^[a-zA-Z][a-zA-Z0-9_]*$", app_name):
         console.error(
             "The app directory name must start with a letter and can contain letters, numbers, and underscores."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     return app_name
 
@@ -499,13 +498,13 @@ def assert_in_reflex_dir():
     """Assert that the current working directory is the reflex directory.
 
     Raises:
-        Exit: If the current working directory is not the reflex directory.
+        SystemExit: If the current working directory is not the reflex directory.
     """
     if not constants.Config.FILE.exists():
         console.error(
             f"[cyan]{constants.Config.FILE}[/cyan] not found. Move to the root folder of your project, or run [bold]{constants.Reflex.MODULE_NAME} init[/bold] to start a new project."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
 
 def needs_reinit() -> bool: