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

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
@@ -193,7 +192,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 +205,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 +225,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 +236,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 +289,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 +303,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 +319,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:

reflex/utils/processes.py

@@ -15,7 +15,6 @@ from contextlib import closing
 from pathlib import Path
 from typing import Any, Literal, overload
 
-import click
 import rich.markup
 from redis.exceptions import RedisError
 from rich.progress import Progress
@@ -39,7 +38,7 @@ def get_num_workers() -> int:
     """Get the number of backend worker processes.
 
     Raises:
-        Exit: If unable to connect to Redis.
+        SystemExit: If unable to connect to Redis.
 
     Returns:
         The number of backend worker processes.
@@ -50,7 +49,7 @@ def get_num_workers() -> int:
         redis_client.ping()
     except RedisError as re:
         console.error(f"Unable to connect to Redis: {re}")
-        raise click.exceptions.Exit(1) from re
+        raise SystemExit(1) from None
     return (os.cpu_count() or 1) * 2 + 1
 
 
@@ -131,7 +130,7 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
         The port to run the service on.
 
     Raises:
-        Exit:when the port is in use.
+        SystemExit:when the port is in use.
     """
     console.debug(f"Checking if {service_name.capitalize()} port: {port} is in use.")
 
@@ -146,7 +145,7 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
             f"Unable to bind to any port for {service_name}. "
             "Please check your network configuration."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     console.debug(
         f"Checking if {service_name.capitalize()} port: {port} is in use for families: {families}."
@@ -172,7 +171,7 @@ def handle_port(service_name: str, port: int, auto_increment: bool) -> int:
     else:
         console.error(f"{service_name.capitalize()} port: {port} is already in use.")
 
-    raise click.exceptions.Exit(1)
+    raise SystemExit(1)
 
 
 @overload
@@ -211,13 +210,13 @@ def new_process(
         Execute a child program in a new process.
 
     Raises:
-        Exit: When attempting to run a command with a None value.
+        SystemExit: When attempting to run a command with a None value.
     """
     # Check for invalid command first.
     non_empty_args = list(filter(None, args)) if isinstance(args, list) else [args]
     if isinstance(args, list) and len(non_empty_args) != len(args):
         console.error(f"Invalid command: {args}")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     path_env: str = os.environ.get("PATH", "")
 
@@ -325,7 +324,7 @@ def stream_logs(
         The lines of the process output.
 
     Raises:
-        Exit: If the process failed.
+        SystemExit: If the process failed.
         ValueError: If the process stdout pipe is closed, but the process remains running.
     """
     from reflex.utils import telemetry
@@ -376,7 +375,7 @@ def stream_logs(
                 "NPM_CONFIG_REGISTRY environment variable. If TLS is the issue, and you know what "
                 "you are doing, you can disable it by setting the SSL_NO_VERIFY environment variable."
             )
-            raise click.exceptions.Exit(1)
+            raise SystemExit(1)
         for set_of_logs in (*prior_logs, tuple(logs)):
             for line in set_of_logs:
                 console.error(line, end="")
@@ -384,7 +383,7 @@ def stream_logs(
         if analytics_enabled:
             telemetry.send("error", context=message)
         console.error("Run with [bold]--loglevel debug [/bold] for the full log.")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
 
 def show_logs(message: str, process: subprocess.Popen):

reflex/utils/rename.py

@@ -4,8 +4,6 @@ import re
 import sys
 from pathlib import Path
 
-import click
-
 from reflex import constants
 from reflex.config import get_config
 from reflex.utils import console
@@ -57,7 +55,7 @@ def rename_app(new_app_name: str, loglevel: constants.LogLevel):
         loglevel: The log level to use.
 
     Raises:
-        Exit: If the command is not ran in the root dir or the app module cannot be imported.
+        SystemExit: If the command is not ran in the root dir or the app module cannot be imported.
     """
     # Set the log level.
     console.set_log_level(loglevel)
@@ -66,7 +64,7 @@ def rename_app(new_app_name: str, loglevel: constants.LogLevel):
         console.error(
             "No rxconfig.py found. Make sure you are in the root directory of your app."
         )
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     sys.path.insert(0, str(Path.cwd()))
 
@@ -74,7 +72,7 @@ def rename_app(new_app_name: str, loglevel: constants.LogLevel):
     module_path = get_module_path(config.module)
     if module_path is None:
         console.error(f"Could not find module {config.module}.")
-        raise click.exceptions.Exit(1)
+        raise SystemExit(1)
 
     console.info(f"Renaming app directory to {new_app_name}.")
     process_directory(

reflex/utils/serializers.py

@@ -413,8 +413,8 @@ def serialize_decimal(value: decimal.Decimal) -> float:
     return float(value)
 
 
-@serializer(to=dict)
-def serialize_color(color: Color) -> dict:
+@serializer(to=str)
+def serialize_color(color: Color) -> str:
     """Serialize a color.
 
     Args:
@@ -423,11 +423,7 @@ def serialize_color(color: Color) -> dict:
     Returns:
         The serialized color.
     """
-    return {
-        "color": color.color,
-        "shade": color.shade,
-        "alpha": color.alpha,
-    }
+    return color.__format__("")
 
 
 with contextlib.suppress(ImportError):