reflex 0.7.1a4__py3-none-any.whl → 0.7.2a1__py3-none-any.whl

reflex/testing.py

@@ -26,11 +26,9 @@ from typing import (
     AsyncIterator,
     Callable,
     Coroutine,
-    List,
     Optional,
     Type,
     TypeVar,
-    Union,
 )
 
 import psutil
@@ -78,8 +76,7 @@ DEFAULT_TIMEOUT = 15
 POLL_INTERVAL = 0.25
 FRONTEND_POPEN_ARGS = {}
 T = TypeVar("T")
-TimeoutType = Optional[Union[int, float]]
-
+TimeoutType = int | float | None
 if platform.system() == "Windows":
     FRONTEND_POPEN_ARGS["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP  # pyright: ignore [reportAttributeAccessIssue]
     FRONTEND_POPEN_ARGS["shell"] = True
@@ -119,19 +116,19 @@ class AppHarness:
     """AppHarness executes a reflex app in-process for testing."""
 
     app_name: str
-    app_source: Optional[
-        Callable[[], None] | types.ModuleType | str | functools.partial[Any]
-    ]
+    app_source: (
+        Callable[[], None] | types.ModuleType | str | functools.partial[Any] | None
+    )
     app_path: Path
     app_module_path: Path
-    app_module: Optional[types.ModuleType] = None
-    app_instance: Optional[reflex.App] = None
-    frontend_process: Optional[subprocess.Popen] = None
-    frontend_url: Optional[str] = None
-    frontend_output_thread: Optional[threading.Thread] = None
-    backend_thread: Optional[threading.Thread] = None
-    backend: Optional[uvicorn.Server] = None
-    state_manager: Optional[StateManager] = None
+    app_module: types.ModuleType | None = None
+    app_instance: reflex.App | None = None
+    frontend_process: subprocess.Popen | None = None
+    frontend_url: str | None = None
+    frontend_output_thread: threading.Thread | None = None
+    backend_thread: threading.Thread | None = None
+    backend: uvicorn.Server | None = None
+    state_manager: StateManager | None = None
     _frontends: list["WebDriver"] = dataclasses.field(default_factory=list)
     _decorated_pages: list = dataclasses.field(default_factory=list)
 
@@ -139,10 +136,10 @@ class AppHarness:
     def create(
         cls,
         root: Path,
-        app_source: Optional[
-            Callable[[], None] | types.ModuleType | str | functools.partial[Any]
-        ] = None,
-        app_name: Optional[str] = None,
+        app_source: (
+            Callable[[], None] | types.ModuleType | str | functools.partial[Any] | None
+        ) = None,
+        app_name: str | None = None,
     ) -> "AppHarness":
         """Create an AppHarness instance at root.
 
@@ -198,7 +195,7 @@ class AppHarness:
             f"{self.app_name}___{self.app_name}___" + state_cls_name
         )
 
-    def get_full_state_name(self, path: List[str]) -> str:
+    def get_full_state_name(self, path: list[str]) -> str:
         """Get the full state name for the given state class name.
 
         Args:
@@ -596,7 +593,7 @@ class AppHarness:
         driver_clz: Optional[Type["WebDriver"]] = None,
         driver_kwargs: dict[str, Any] | None = None,
         driver_options: ArgOptions | None = None,
-        driver_option_args: List[str] | None = None,
+        driver_option_args: list[str] | None = None,
         driver_option_capabilities: dict[str, Any] | None = None,
     ) -> "WebDriver":
         """Get a selenium webdriver instance pointed at the app.
@@ -768,7 +765,7 @@ class AppHarness:
         element: "WebElement",
         timeout: TimeoutType = None,
         exp_not_equal: str = "",
-    ) -> Optional[str]:
+    ) -> str | None:
         """Poll element.get_attribute("value") for change.
 
         Args:
@@ -904,8 +901,8 @@ class AppHarnessProd(AppHarness):
     handling. Additionally, the backend runs in multi-worker mode.
     """
 
-    frontend_thread: Optional[threading.Thread] = None
-    frontend_server: Optional[Subdir404TCPServer] = None
+    frontend_thread: threading.Thread | None = None
+    frontend_server: Subdir404TCPServer | None = None
 
     def _run_frontend(self):
         web_root = (

reflex/utils/console.py

@@ -250,7 +250,7 @@ def deprecate(
 
     if dedupe_key not in _EMITTED_DEPRECATION_WARNINGS:
         msg = (
-            f"{feature_name} has been deprecated in version {deprecation_version} {reason.rstrip('.')}. It will be completely "
+            f"{feature_name} has been deprecated in version {deprecation_version}. {reason.rstrip('.').lstrip('. ')}. It will be completely "
             f"removed in {removal_version}. ({loc})"
         )
         if _LOG_LEVEL <= LogLevel.WARNING:

reflex/utils/decorator.py

@@ -1,6 +1,7 @@
 """Decorator utilities."""
 
-from typing import Callable, TypeVar
+import functools
+from typing import Callable, ParamSpec, TypeVar
 
 T = TypeVar("T")
 
@@ -23,3 +24,27 @@ def once(f: Callable[[], T]) -> Callable[[], T]:
         return value  # pyright: ignore[reportReturnType]
 
     return wrapper
+
+
+P = ParamSpec("P")
+
+
+def debug(f: Callable[P, T]) -> Callable[P, T]:
+    """A decorator that prints the function name, arguments, and result.
+
+    Args:
+        f: The function to call.
+
+    Returns:
+        A function that prints the function name, arguments, and result.
+    """
+
+    @functools.wraps(f)
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+        result = f(*args, **kwargs)
+        print(  # noqa: T201
+            f"Calling {f.__name__} with args: {args} and kwargs: {kwargs}, result: {result}"
+        )
+        return result
+
+    return wrapper

reflex/utils/exec.py

@@ -524,17 +524,12 @@ def output_system_info():
 
     fnm_info = f"[FNM {prerequisites.get_fnm_version()} (Expected: {constants.Fnm.VERSION}) (PATH: {constants.Fnm.EXE})]"
 
-    if system != "Windows" or (
-        system == "Windows" and prerequisites.is_windows_bun_supported()
-    ):
-        dependencies.extend(
-            [
-                fnm_info,
-                f"[Bun {prerequisites.get_bun_version()} (Expected: {constants.Bun.VERSION}) (PATH: {path_ops.get_bun_path()})]",
-            ],
-        )
-    else:
-        dependencies.append(fnm_info)
+    dependencies.extend(
+        [
+            fnm_info,
+            f"[Bun {prerequisites.get_bun_version()} (Expected: {constants.Bun.VERSION}) (PATH: {path_ops.get_bun_path()})]",
+        ],
+    )
 
     if system == "Linux":
         import distro  # pyright: ignore[reportMissingImports]

reflex/utils/export.py

@@ -1,7 +1,6 @@
 """Export utilities."""
 
 from pathlib import Path
-from typing import Optional
 
 from reflex import constants
 from reflex.config import environment, get_config
@@ -16,8 +15,8 @@ def export(
     backend: bool = True,
     zip_dest_dir: str = str(Path.cwd()),
     upload_db_file: bool = False,
-    api_url: Optional[str] = None,
-    deploy_url: Optional[str] = None,
+    api_url: str | None = None,
+    deploy_url: str | None = None,
     env: constants.Env = constants.Env.PROD,
     loglevel: constants.LogLevel = console._LOG_LEVEL,
 ):

reflex/utils/format.py

@@ -6,7 +6,7 @@ import inspect
 import json
 import os
 import re
-from typing import TYPE_CHECKING, Any, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Union
 
 from reflex import constants
 from reflex.constants.state import FRONTEND_EVENT_STATE
@@ -336,7 +336,7 @@ def format_route(route: str, format_case: bool = True) -> str:
 
 def format_match(
     cond: str | Var,
-    match_cases: List[List[Var]],
+    match_cases: list[list[Var]],
     default: Var,
 ) -> str:
     """Format a match expression whose return type is a Var.
@@ -370,7 +370,7 @@ def format_match(
 
 def format_prop(
     prop: Union[Var, EventChain, ComponentStyle, str],
-) -> Union[int, float, str]:
+) -> int | float | str:
     """Format a prop.
 
     Args:
@@ -532,7 +532,7 @@ if TYPE_CHECKING:
 
 def format_queue_events(
     events: EventType[Any] | None = None,
-    args_spec: Optional[ArgsSpec] = None,
+    args_spec: ArgsSpec | None = None,
 ) -> Var[EventChain]:
     """Format a list of event handler / event spec as a javascript callback.
 

reflex/utils/imports.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import dataclasses
 from collections import defaultdict
-from typing import DefaultDict, Dict, List, Optional, Tuple, Union
+from typing import DefaultDict, Union
 
 
 def merge_imports(
@@ -18,7 +18,7 @@ def merge_imports(
     Returns:
         The merged import dicts.
     """
-    all_imports: DefaultDict[str, List[ImportVar]] = defaultdict(list)
+    all_imports: DefaultDict[str, list[ImportVar]] = defaultdict(list)
     for import_dict in imports:
         for lib, fields in (
             import_dict if isinstance(import_dict, tuple) else import_dict.items()
@@ -95,26 +95,26 @@ class ImportVar:
     """An import var."""
 
     # The name of the import tag.
-    tag: Optional[str]
+    tag: str | None
 
     # whether the import is default or named.
-    is_default: Optional[bool] = False
+    is_default: bool | None = False
 
     # The tag alias.
-    alias: Optional[str] = None
+    alias: str | None = None
 
     # Whether this import need to install the associated lib
-    install: Optional[bool] = True
+    install: bool | None = True
 
     # whether this import should be rendered or not
-    render: Optional[bool] = True
+    render: bool | None = True
 
     # The path of the package to import from.
     package_path: str = "/"
 
     # whether this import package should be added to transpilePackages in next.config.js
     # https://nextjs.org/docs/app/api-reference/next-config-js/transpilePackages
-    transpile: Optional[bool] = False
+    transpile: bool | None = False
 
     @property
     def name(self) -> str:
@@ -131,7 +131,7 @@ class ImportVar:
             return self.tag or ""
 
 
-ImportTypes = Union[str, ImportVar, List[Union[str, ImportVar]], List[ImportVar]]
-ImportDict = Dict[str, ImportTypes]
-ParsedImportDict = Dict[str, List[ImportVar]]
-ImmutableParsedImportDict = Tuple[Tuple[str, Tuple[ImportVar, ...]], ...]
+ImportTypes = Union[str, ImportVar, list[str | ImportVar], list[ImportVar]]
+ImportDict = dict[str, ImportTypes]
+ParsedImportDict = dict[str, list[ImportVar]]
+ImmutableParsedImportDict = tuple[tuple[str, tuple[ImportVar, ...]], ...]

reflex/utils/prerequisites.py

@@ -23,7 +23,7 @@ import zipfile
 from datetime import datetime
 from pathlib import Path
 from types import ModuleType
-from typing import Any, Callable, List, NamedTuple, Optional
+from typing import Callable, NamedTuple
 from urllib.parse import urlparse
 
 import httpx
@@ -72,9 +72,9 @@ class Template:
 class CpuInfo:
     """Model to save cpu info."""
 
-    manufacturer_id: Optional[str]
-    model_name: Optional[str]
-    address_width: Optional[int]
+    manufacturer_id: str | None
+    model_name: str | None
+    address_width: int | None
 
 
 def get_web_dir() -> Path:
@@ -242,9 +242,7 @@ def get_install_package_manager(on_failure_return_none: bool = False) -> str | N
         The path to the package manager.
     """
     if constants.IS_WINDOWS and (
-        not is_windows_bun_supported()
-        or windows_check_onedrive_in_path()
-        or windows_npm_escape_hatch()
+        windows_check_onedrive_in_path() or windows_npm_escape_hatch()
     ):
         return get_package_manager(on_failure_return_none)
     return str(get_config().bun_path)
@@ -896,7 +894,7 @@ def init_reflex_json(project_hash: int | None):
 
 
 def update_next_config(
-    export: bool = False, transpile_packages: Optional[List[str]] = None
+    export: bool = False, transpile_packages: list[str] | None = None
 ):
     """Update Next.js config from Reflex config.
 
@@ -918,7 +916,7 @@ def update_next_config(
 
 
 def _update_next_config(
-    config: Config, export: bool = False, transpile_packages: Optional[List[str]] = None
+    config: Config, export: bool = False, transpile_packages: list[str] | None = None
 ):
     next_config = {
         "basePath": config.frontend_path or "",
@@ -1064,17 +1062,11 @@ def install_bun():
     Raises:
         SystemPackageMissingError: If "unzip" is missing.
     """
-    win_supported = is_windows_bun_supported()
     one_drive_in_path = windows_check_onedrive_in_path()
-    if constants.IS_WINDOWS and (not win_supported or one_drive_in_path):
-        if not win_supported:
-            console.warn(
-                "Bun for Windows is currently only available for x86 64-bit Windows. Installation will fall back on npm."
-            )
-        if one_drive_in_path:
-            console.warn(
-                "Creating project directories in OneDrive is not recommended for bun usage on windows. This will fallback to npm."
-            )
+    if constants.IS_WINDOWS and one_drive_in_path:
+        console.warn(
+            "Creating project directories in OneDrive is not recommended for bun usage on windows. This will fallback to npm."
+        )
 
     # Skip if bun is already installed.
     if get_bun_version() == version.parse(constants.Bun.VERSION):
@@ -1176,12 +1168,7 @@ def install_frontend_packages(packages: set[str], config: Config):
         get_package_manager(on_failure_return_none=True)
         if (
             not constants.IS_WINDOWS
-            or (
-                constants.IS_WINDOWS
-                and (
-                    is_windows_bun_supported() and not windows_check_onedrive_in_path()
-                )
-            )
+            or (constants.IS_WINDOWS and not windows_check_onedrive_in_path())
         )
         else None
     )
@@ -1200,7 +1187,7 @@ def install_frontend_packages(packages: set[str], config: Config):
     )
 
     processes.run_process_with_fallback(
-        [install_package_manager, "install"],
+        [install_package_manager, "install", "--legacy-peer-deps"],
         fallback=fallback_command,
         analytics_enabled=True,
         show_status_message="Installing base frontend packages",
@@ -1213,6 +1200,7 @@ def install_frontend_packages(packages: set[str], config: Config):
             [
                 install_package_manager,
                 "add",
+                "--legacy-peer-deps",
                 "-d",
                 constants.Tailwind.VERSION,
                 *((config.tailwind or {}).get("plugins", [])),
@@ -1227,7 +1215,7 @@ def install_frontend_packages(packages: set[str], config: Config):
     # Install custom packages defined in frontend_packages
     if len(packages) > 0:
         processes.run_process_with_fallback(
-            [install_package_manager, "add", *packages],
+            [install_package_manager, "add", "--legacy-peer-deps", *packages],
             fallback=fallback_command,
             analytics_enabled=True,
             show_status_message="Installing frontend packages from config and components",
@@ -1371,7 +1359,7 @@ def validate_frontend_dependencies(init: bool = True):
         validate_bun()
 
 
-def ensure_reflex_installation_id() -> Optional[int]:
+def ensure_reflex_installation_id() -> int | None:
     """Ensures that a reflex distinct id has been generated and stored in the reflex directory.
 
     Returns:
@@ -1925,24 +1913,23 @@ def format_address_width(address_width: str | None) -> int | None:
         return None
 
 
-@functools.lru_cache(maxsize=None)
-def get_cpu_info() -> CpuInfo | None:
-    """Get the CPU info of the underlining host.
+def _retrieve_cpu_info() -> CpuInfo | None:
+    """Retrieve the CPU info of the host.
 
     Returns:
-         The CPU info.
+        The CPU info.
     """
     platform_os = platform.system()
     cpuinfo = {}
     try:
         if platform_os == "Windows":
-            cmd = "wmic cpu get addresswidth,caption,manufacturer /FORMAT:csv"
+            cmd = 'powershell -Command "Get-CimInstance Win32_Processor | Select-Object -First 1 | Select-Object AddressWidth,Manufacturer,Name | ConvertTo-Json"'
             output = processes.execute_command_and_return_output(cmd)
             if output:
-                val = output.splitlines()[-1].split(",")[1:]
-                cpuinfo["manufacturer_id"] = val[2]
-                cpuinfo["model_name"] = val[1].split("Family")[0].strip()
-                cpuinfo["address_width"] = format_address_width(val[0])
+                cpu_data = json.loads(output)
+                cpuinfo["address_width"] = cpu_data["AddressWidth"]
+                cpuinfo["manufacturer_id"] = cpu_data["Manufacturer"]
+                cpuinfo["model_name"] = cpu_data["Name"]
         elif platform_os == "Linux":
             output = processes.execute_command_and_return_output("lscpu")
             if output:
@@ -1982,21 +1969,20 @@ def get_cpu_info() -> CpuInfo | None:
 
 
 @functools.lru_cache(maxsize=None)
-def is_windows_bun_supported() -> bool:
-    """Check whether the underlining host running windows qualifies to run bun.
-    We typically do not run bun on ARM or 32 bit devices that use windows.
+def get_cpu_info() -> CpuInfo | None:
+    """Get the CPU info of the underlining host.
 
     Returns:
-        Whether the host is qualified to use bun.
+        The CPU info.
     """
-    cpu_info = get_cpu_info()
-    return (
-        constants.IS_WINDOWS
-        and cpu_info is not None
-        and cpu_info.address_width == 64
-        and cpu_info.model_name is not None
-        and "ARM" not in cpu_info.model_name
-    )
+    cpu_info_file = environment.REFLEX_DIR.get() / "cpu_info.json"
+    if cpu_info_file.exists() and (cpu_info := json.loads(cpu_info_file.read_text())):
+        return CpuInfo(**cpu_info)
+    cpu_info = _retrieve_cpu_info()
+    if cpu_info:
+        cpu_info_file.parent.mkdir(parents=True, exist_ok=True)
+        cpu_info_file.write_text(json.dumps(dataclasses.asdict(cpu_info)))
+    return cpu_info
 
 
 def is_generation_hash(template: str) -> bool:
@@ -2025,38 +2011,3 @@ def get_user_tier():
         if authenticated_token[0]
         else "anonymous"
     )
-
-
-def check_config_option_in_tier(
-    option_name: str,
-    allowed_tiers: list[str],
-    fallback_value: Any,
-    help_link: str | None = None,
-):
-    """Check if a config option is allowed for the authenticated user's current tier.
-
-    Args:
-        option_name: The name of the option to check.
-        allowed_tiers: The tiers that are allowed to use the option.
-        fallback_value: The fallback value if the option is not allowed.
-        help_link: The help link to show to a user that is authenticated.
-    """
-    config = get_config()
-    current_tier = get_user_tier()
-
-    if current_tier == "anonymous":
-        the_remedy = (
-            "You are currently logged out. Run `reflex login` to access this option."
-        )
-    else:
-        the_remedy = (
-            f"Your current subscription tier is `{current_tier}`. "
-            f"Please upgrade to {allowed_tiers} to access this option. "
-        )
-        if help_link:
-            the_remedy += f"See {help_link} for more information."
-
-    if current_tier not in allowed_tiers:
-        console.warn(f"Config option `{option_name}` is restricted. {the_remedy}")
-        setattr(config, option_name, fallback_value)
-        config._set_persistent(**{option_name: fallback_value})

reflex/utils/processes.py

@@ -10,7 +10,7 @@ import signal
 import subprocess
 from concurrent import futures
 from pathlib import Path
-from typing import Callable, Generator, List, Optional, Tuple, Union
+from typing import Callable, Generator, Tuple
 
 import psutil
 import typer
@@ -50,7 +50,7 @@ def get_num_workers() -> int:
     return (os.cpu_count() or 1) * 2 + 1
 
 
-def get_process_on_port(port: int) -> Optional[psutil.Process]:
+def get_process_on_port(port: int) -> psutil.Process | None:
     """Get the process on the given port.
 
     Args:
@@ -202,7 +202,7 @@ def new_process(
 
 @contextlib.contextmanager
 def run_concurrently_context(
-    *fns: Union[Callable, Tuple],
+    *fns: Callable | Tuple,
 ) -> Generator[list[futures.Future], None, None]:
     """Run functions concurrently in a thread pool.
 
@@ -240,7 +240,7 @@ def run_concurrently_context(
             executor.shutdown(wait=False)
 
 
-def run_concurrently(*fns: Union[Callable, Tuple]) -> None:
+def run_concurrently(*fns: Callable | Tuple) -> None:
     """Run functions concurrently in a thread pool.
 
     Args:
@@ -335,7 +335,7 @@ def show_status(
             status.update(f"{message} {line}")
 
 
-def show_progress(message: str, process: subprocess.Popen, checkpoints: List[str]):
+def show_progress(message: str, process: subprocess.Popen, checkpoints: list[str]):
     """Show a progress bar for a process.
 
     Args: