reflex 0.7.4a3__py3-none-any.whl → 0.7.5__py3-none-any.whl

reflex/reflex.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import atexit
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import typer
 import typer.core
@@ -429,7 +430,7 @@ def logout(
 
     loglevel = loglevel or get_config().loglevel
 
-    logout(loglevel)  # pyright: ignore [reportArgumentType]
+    logout(_convert_reflex_loglevel_to_reflex_cli_loglevel(loglevel))
 
 
 db_cli = typer.Typer()
@@ -581,7 +582,6 @@ def deploy(
     ),
 ):
     """Deploy the app to the Reflex hosting service."""
-    from reflex_cli.constants.base import LogLevel as HostingLogLevel
     from reflex_cli.utils import dependency
     from reflex_cli.v2 import cli as hosting_cli
     from reflex_cli.v2.deployments import check_version
@@ -604,21 +604,6 @@ def deploy(
     # Set the log level.
     console.set_log_level(loglevel)
 
-    def convert_reflex_loglevel_to_reflex_cli_loglevel(
-        loglevel: constants.LogLevel,
-    ) -> HostingLogLevel:
-        if loglevel == constants.LogLevel.DEBUG:
-            return HostingLogLevel.DEBUG
-        if loglevel == constants.LogLevel.INFO:
-            return HostingLogLevel.INFO
-        if loglevel == constants.LogLevel.WARNING:
-            return HostingLogLevel.WARNING
-        if loglevel == constants.LogLevel.ERROR:
-            return HostingLogLevel.ERROR
-        if loglevel == constants.LogLevel.CRITICAL:
-            return HostingLogLevel.CRITICAL
-        return HostingLogLevel.INFO
-
     # Only check requirements if interactive.
     # There is user interaction for requirements update.
     if interactive:
@@ -652,7 +637,7 @@ def deploy(
         envfile=envfile,
         hostname=hostname,
         interactive=interactive,
-        loglevel=convert_reflex_loglevel_to_reflex_cli_loglevel(loglevel),
+        loglevel=_convert_reflex_loglevel_to_reflex_cli_loglevel(loglevel),
         token=token,
         project=project,
         project_name=project_name,
@@ -676,6 +661,36 @@ def rename(
     prerequisites.rename_app(new_name, loglevel)
 
 
+if TYPE_CHECKING:
+    from reflex_cli.constants.base import LogLevel as HostingLogLevel
+
+
+def _convert_reflex_loglevel_to_reflex_cli_loglevel(
+    loglevel: constants.LogLevel,
+) -> HostingLogLevel:
+    """Convert a Reflex log level to a Reflex CLI log level.
+
+    Args:
+        loglevel: The Reflex log level to convert.
+
+    Returns:
+        The converted Reflex CLI log level.
+    """
+    from reflex_cli.constants.base import LogLevel as HostingLogLevel
+
+    if loglevel == constants.LogLevel.DEBUG:
+        return HostingLogLevel.DEBUG
+    if loglevel == constants.LogLevel.INFO:
+        return HostingLogLevel.INFO
+    if loglevel == constants.LogLevel.WARNING:
+        return HostingLogLevel.WARNING
+    if loglevel == constants.LogLevel.ERROR:
+        return HostingLogLevel.ERROR
+    if loglevel == constants.LogLevel.CRITICAL:
+        return HostingLogLevel.CRITICAL
+    return HostingLogLevel.INFO
+
+
 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.")
 cli.add_typer(

reflex/state.py

@@ -593,8 +593,8 @@ class BaseState(Base, ABC, extra=pydantic.Extra.allow):
             if cls._item_is_event_handler(name, fn)
         }
 
-        for mixin in cls._mixins():  # pyright: ignore [reportAssignmentType]
-            for name, value in mixin.__dict__.items():
+        for mixin_cls in cls._mixins():
+            for name, value in mixin_cls.__dict__.items():
                 if name in cls.inherited_vars:
                     continue
                 if is_computed_var(value):
@@ -605,7 +605,7 @@ class BaseState(Base, ABC, extra=pydantic.Extra.allow):
                     cls.computed_vars[newcv._js_expr] = newcv
                     cls.vars[newcv._js_expr] = newcv
                     continue
-                if types.is_backend_base_variable(name, mixin):  # pyright: ignore [reportArgumentType]
+                if types.is_backend_base_variable(name, mixin_cls):
                     cls.backend_vars[name] = copy.deepcopy(value)
                     continue
                 if events.get(name) is not None:

reflex/style.py

@@ -237,10 +237,10 @@ def format_style_key(key: str) -> tuple[str, ...]:
 EMPTY_VAR_DATA = VarData()
 
 
-class Style(dict):
+class Style(dict[str, Any]):
     """A style dictionary."""
 
-    def __init__(self, style_dict: dict | None = None, **kwargs):
+    def __init__(self, style_dict: dict[str, Any] | None = None, **kwargs):
         """Initialize the style.
 
         Args:

reflex/testing.py

@@ -27,6 +27,7 @@ from typing import (
     Callable,
     Coroutine,
     Optional,
+    Sequence,
     Type,
     TypeVar,
 )
@@ -268,6 +269,10 @@ class AppHarness:
                     loglevel=reflex.constants.LogLevel.INFO,
                 )
                 self.app_module_path.write_text(source_code)
+        else:
+            # Just initialize the web folder.
+            with chdir(self.app_path):
+                reflex.utils.prerequisites.initialize_frontend_dependencies()
         with chdir(self.app_path):
             # ensure config and app are reloaded when testing different app
             reflex.config.get_config(reload=True)
@@ -290,8 +295,10 @@ class AppHarness:
         if self.app_instance and isinstance(
             self.app_instance._state_manager, StateManagerRedis
         ):
+            if self.app_instance._state is None:
+                raise RuntimeError("State is not set.")
             # Create our own redis connection for testing.
-            self.state_manager = StateManagerRedis.create(self.app_instance._state)  # pyright: ignore [reportArgumentType]
+            self.state_manager = StateManagerRedis.create(self.app_instance._state)
         else:
             self.state_manager = (
                 self.app_instance._state_manager if self.app_instance else None
@@ -455,6 +462,10 @@ class AppHarness:
 
     def stop(self) -> None:
         """Stop the frontend and backend servers."""
+        # Quit browsers first to avoid any lingering events being sent during shutdown.
+        for driver in self._frontends:
+            driver.quit()
+
         self._reload_state_module()
 
         if self.backend is not None:
@@ -485,8 +496,6 @@ class AppHarness:
             self.backend_thread.join()
         if self.frontend_output_thread is not None:
             self.frontend_output_thread.join()
-        for driver in self._frontends:
-            driver.quit()
 
         # Cleanup decorated pages added during testing
         for page in self._decorated_pages:
@@ -764,7 +773,7 @@ class AppHarness:
         self,
         element: "WebElement",
         timeout: TimeoutType = None,
-        exp_not_equal: str = "",
+        exp_not_equal: str | Sequence[str] = "",
     ) -> str | None:
         """Poll element.get_attribute("value") for change.
 
@@ -779,8 +788,11 @@ class AppHarness:
         Raises:
             TimeoutError: when the timeout expires before value changes
         """
+        exp_not_equal = (
+            (exp_not_equal,) if isinstance(exp_not_equal, str) else exp_not_equal
+        )
         if not self._poll_for(
-            target=lambda: element.get_attribute("value") != exp_not_equal,
+            target=lambda: element.get_attribute("value") not in exp_not_equal,
             timeout=timeout,
         ):
             raise TimeoutError(

reflex/utils/console.py

@@ -201,10 +201,9 @@ def _get_first_non_framework_frame() -> FrameType | None:
     # Exclude utility modules that should never be the source of deprecated reflex usage.
     exclude_modules = [click, rx, typer, typing_extensions]
     exclude_roots = [
-        p.parent.resolve()
-        if (p := Path(m.__file__)).name == "__init__.py"  # pyright: ignore [reportArgumentType]
-        else p.resolve()
+        p.parent.resolve() if (p := Path(file)).name == "__init__.py" else p.resolve()
         for m in exclude_modules
+        if (file := m.__file__)
     ]
     # Specifically exclude the reflex cli module.
     if reflex_bin := shutil.which(b"reflex"):

reflex/utils/exec.py

@@ -330,6 +330,7 @@ def run_uvicorn_backend(host: str, port: int, loglevel: LogLevel):
         log_level=loglevel.value,
         reload=True,
         reload_dirs=list(map(str, get_reload_paths())),
+        reload_delay=0.1,
     )
 
 
@@ -356,6 +357,9 @@ def run_granian_backend(host: str, port: int, loglevel: LogLevel):
         log_level=LogLevels(loglevel.value),
         reload=True,
         reload_paths=get_reload_paths(),
+        reload_ignore_worker_failure=True,
+        reload_tick=100,
+        workers_kill_timeout=2,
     ).serve()
 
 

reflex/utils/imports.py

@@ -4,11 +4,11 @@ from __future__ import annotations
 
 import dataclasses
 from collections import defaultdict
-from typing import DefaultDict, Union
+from typing import DefaultDict, Mapping, Sequence, Union
 
 
 def merge_imports(
-    *imports: ImportDict | ParsedImportDict | ImmutableParsedImportDict,
+    *imports: ImportDict | ParsedImportDict | ParsedImportTuple,
 ) -> ParsedImportDict:
     """Merge multiple import dicts together.
 
@@ -43,7 +43,9 @@ def merge_imports(
     return all_imports
 
 
-def parse_imports(imports: ImportDict | ParsedImportDict) -> ParsedImportDict:
+def parse_imports(
+    imports: ImmutableImportDict | ImmutableParsedImportDict,
+) -> ParsedImportDict:
     """Parse the import dict into a standard format.
 
     Args:
@@ -53,10 +55,12 @@ def parse_imports(imports: ImportDict | ParsedImportDict) -> ParsedImportDict:
         The parsed import dict.
     """
 
-    def _make_list(value: ImportTypes) -> list[str | ImportVar] | list[ImportVar]:
+    def _make_list(
+        value: ImmutableImportTypes,
+    ) -> list[str | ImportVar] | list[ImportVar]:
         if isinstance(value, (str, ImportVar)):
             return [value]
-        return value
+        return list(value)
 
     return {
         package: [
@@ -68,7 +72,7 @@ def parse_imports(imports: ImportDict | ParsedImportDict) -> ParsedImportDict:
 
 
 def collapse_imports(
-    imports: ParsedImportDict | ImmutableParsedImportDict,
+    imports: ParsedImportDict | ParsedImportTuple,
 ) -> ParsedImportDict:
     """Remove all duplicate ImportVar within an ImportDict.
 
@@ -132,6 +136,9 @@ class ImportVar:
 
 
 ImportTypes = Union[str, ImportVar, list[str | ImportVar], list[ImportVar]]
+ImmutableImportTypes = Union[str, ImportVar, Sequence[str | ImportVar]]
 ImportDict = dict[str, ImportTypes]
+ImmutableImportDict = Mapping[str, ImmutableImportTypes]
 ParsedImportDict = dict[str, list[ImportVar]]
-ImmutableParsedImportDict = tuple[tuple[str, tuple[ImportVar, ...]], ...]
+ImmutableParsedImportDict = Mapping[str, Sequence[ImportVar]]
+ParsedImportTuple = tuple[tuple[str, tuple[ImportVar, ...]], ...]

reflex/utils/prerequisites.py

@@ -510,6 +510,9 @@ def compile_or_validate_app(compile: bool = False) -> bool:
         else:
             validate_app()
     except Exception as e:
+        if isinstance(e, typer.Exit):
+            return False
+
         import traceback
 
         sys_exception = sys.exception()
@@ -963,6 +966,9 @@ def initialize_web_directory():
     console.debug("Initializing the bun config file.")
     initialize_bun_config()
 
+    console.debug("Initializing the .npmrc file.")
+    initialize_npmrc()
+
     console.debug("Initializing the public directory.")
     path_ops.mkdir(get_web_dir() / constants.Dirs.PUBLIC)
 
@@ -1012,6 +1018,20 @@ def initialize_bun_config():
     bun_config_path.write_text(bunfig_content)
 
 
+def initialize_npmrc():
+    """Initialize the .npmrc file."""
+    npmrc_path = get_web_dir() / constants.Node.CONFIG_PATH
+
+    if (custom_npmrc := Path(constants.Node.CONFIG_PATH)).exists():
+        npmrc_content = custom_npmrc.read_text()
+        console.info(f"Copying custom .npmrc inside {get_web_dir()} folder")
+    else:
+        best_registry = get_npm_registry()
+        npmrc_content = constants.Node.DEFAULT_CONFIG.format(registry=best_registry)
+
+    npmrc_path.write_text(npmrc_content)
+
+
 def init_reflex_json(project_hash: int | None):
     """Write the hash of the Reflex project to a REFLEX_JSON.
 
@@ -1067,6 +1087,7 @@ def _update_next_config(
         "compress": config.next_compression,
         "trailingSlash": True,
         "staticPageGenerationTimeout": config.static_page_generation_timeout,
+        "devIndicators": config.next_dev_indicators,
     }
     if transpile_packages:
         next_config["transpilePackages"] = list(
@@ -1180,26 +1201,39 @@ def _clear_cached_procedure_file(cache_file: str | Path):
         cache_file.unlink()
 
 
-def cached_procedure(cache_file: str, payload_fn: Callable[..., str]):
+def cached_procedure(
+    cache_file: str | None,
+    payload_fn: Callable[..., str],
+    cache_file_fn: Callable[[], str] | None = None,
+):
     """Decorator to cache the runs of a procedure on disk. Procedures should not have
        a return value.
 
     Args:
         cache_file: The file to store the cache payload in.
-        payload_fn: Function that computes cache payload from function args
+        payload_fn: Function that computes cache payload from function args.
+        cache_file_fn: Function that computes the cache file name at runtime.
 
     Returns:
         The decorated function.
+
+    Raises:
+        ValueError: If both cache_file and cache_file_fn are provided.
     """
+    if cache_file and cache_file_fn is not None:
+        raise ValueError("cache_file and cache_file_fn cannot both be provided.")
 
     def _inner_decorator(func: Callable):
         def _inner(*args, **kwargs):
-            payload = _read_cached_procedure_file(cache_file)
+            _cache_file = cache_file_fn() if cache_file_fn is not None else cache_file
+            if not _cache_file:
+                raise ValueError("Unknown cache file, cannot cache result.")
+            payload = _read_cached_procedure_file(_cache_file)
             new_payload = payload_fn(*args, **kwargs)
             if payload != new_payload:
-                _clear_cached_procedure_file(cache_file)
+                _clear_cached_procedure_file(_cache_file)
                 func(*args, **kwargs)
-                _write_cached_procedure_file(new_payload, cache_file)
+                _write_cached_procedure_file(new_payload, _cache_file)
 
         return _inner
 
@@ -1207,8 +1241,11 @@ def cached_procedure(cache_file: str, payload_fn: Callable[..., str]):
 
 
 @cached_procedure(
-    cache_file=str(get_web_dir() / "reflex.install_frontend_packages.cached"),
+    cache_file_fn=lambda: str(
+        get_web_dir() / "reflex.install_frontend_packages.cached"
+    ),
     payload_fn=lambda p, c: f"{sorted(p)!r},{c.json()}",
+    cache_file=None,
 )
 def install_frontend_packages(packages: set[str], config: Config):
     """Installs the base and custom frontend packages.
@@ -1224,6 +1261,14 @@ def install_frontend_packages(packages: set[str], config: Config):
         raise_on_none=True
     )
 
+    env = (
+        {
+            "NODE_TLS_REJECT_UNAUTHORIZED": "0",
+        }
+        if environment.SSL_NO_VERIFY.get()
+        else {}
+    )
+
     primary_package_manager = install_package_managers[0]
     fallbacks = install_package_managers[1:]
 
@@ -1234,6 +1279,7 @@ def install_frontend_packages(packages: set[str], config: Config):
         show_status_message="Installing base frontend packages",
         cwd=get_web_dir(),
         shell=constants.IS_WINDOWS,
+        env=env,
     )
 
     if config.tailwind is not None:
@@ -1251,6 +1297,7 @@ def install_frontend_packages(packages: set[str], config: Config):
             show_status_message="Installing tailwind",
             cwd=get_web_dir(),
             shell=constants.IS_WINDOWS,
+            env=env,
         )
 
     # Install custom packages defined in frontend_packages
@@ -1262,6 +1309,7 @@ def install_frontend_packages(packages: set[str], config: Config):
             show_status_message="Installing frontend packages from config and components",
             cwd=get_web_dir(),
             shell=constants.IS_WINDOWS,
+            env=env,
         )
 
 
@@ -1510,6 +1558,9 @@ def prompt_for_template_options(templates: list[Template]) -> str:
 
     Returns:
         The template name the user selects.
+
+    Raises:
+        Exit: If the user does not select a template.
     """
     # Show the user the URLs of each template to preview.
     console.print("\nGet started with a template:")
@@ -1534,8 +1585,22 @@ def prompt_for_template_options(templates: list[Template]) -> str:
         default="0",
     )
 
+    if not template:
+        console.error("No template selected.")
+        raise typer.Exit(1)
+
+    try:
+        template_index = int(template)
+    except ValueError:
+        console.error("Invalid template selected.")
+        raise typer.Exit(1) from None
+
+    if template_index < 0 or template_index >= len(templates):
+        console.error("Invalid template selected.")
+        raise typer.Exit(1)
+
     # Return the template.
-    return templates[int(template)].name  # pyright: ignore [reportArgumentType]
+    return templates[template_index].name
 
 
 def fetch_app_templates(version: str) -> dict[str, Template]:

reflex/utils/processes.py

@@ -20,6 +20,7 @@ from rich.progress import Progress
 from reflex import constants
 from reflex.config import environment
 from reflex.utils import console, path_ops, prerequisites
+from reflex.utils.registry import get_npm_registry
 
 
 def kill(pid: int):
@@ -276,6 +277,7 @@ def stream_logs(
     progress: Progress | None = None,
     suppress_errors: bool = False,
     analytics_enabled: bool = False,
+    prior_logs: Tuple[tuple[str, ...], ...] = (),
 ):
     """Stream the logs for a process.
 
@@ -285,6 +287,7 @@ def stream_logs(
         progress: The ongoing progress bar if one is being used.
         suppress_errors: If True, do not exit if errors are encountered (for fallback).
         analytics_enabled: Whether analytics are enabled for this command.
+        prior_logs: The logs of the prior processes that have been run.
 
     Yields:
         The lines of the process output.
@@ -312,8 +315,31 @@ def stream_logs(
     accepted_return_codes = [0, -2, 15] if constants.IS_WINDOWS else [0, -2]
     if process.returncode not in accepted_return_codes and not suppress_errors:
         console.error(f"{message} failed with exit code {process.returncode}")
-        for line in logs:
-            console.error(line, end="")
+        if "".join(logs).count("CERT_HAS_EXPIRED") > 0:
+            bunfig = prerequisites.get_web_dir() / constants.Bun.CONFIG_PATH
+            npm_registry_line = next(
+                (
+                    line
+                    for line in bunfig.read_text().splitlines()
+                    if line.startswith("registry")
+                ),
+                None,
+            )
+            if not npm_registry_line or "=" not in npm_registry_line:
+                npm_registry = get_npm_registry()
+            else:
+                npm_registry = npm_registry_line.split("=")[1].strip()
+            console.error(
+                f"Failed to fetch securely from [bold]{npm_registry}[/bold]. Please check your network connection. "
+                "You can try running the command again or changing the registry by setting the "
+                "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 typer.Exit(1)
+        for set_of_logs in (*prior_logs, tuple(logs)):
+            for line in set_of_logs:
+                console.error(line, end="")
+            console.error("\n\n")
         if analytics_enabled:
             telemetry.send("error", context=message)
         console.error("Run with [bold]--loglevel debug [/bold] for the full log.")
@@ -336,8 +362,8 @@ def show_status(
     process: subprocess.Popen,
     suppress_errors: bool = False,
     analytics_enabled: bool = False,
-    prior_processes: Tuple[subprocess.Popen, ...] = (),
-):
+    prior_logs: Tuple[tuple[str, ...], ...] = (),
+) -> list[str]:
     """Show the status of a process.
 
     Args:
@@ -345,17 +371,24 @@ def show_status(
         process: The process.
         suppress_errors: If True, do not exit if errors are encountered (for fallback).
         analytics_enabled: Whether analytics are enabled for this command.
-        prior_processes: The prior processes that have been run.
+        prior_logs: The logs of the prior processes that have been run.
+
+    Returns:
+        The lines of the process output.
     """
-    for one_process in (*prior_processes, process):
-        with console.status(message) as status:
-            for line in stream_logs(
-                message,
-                one_process,
-                suppress_errors=suppress_errors,
-                analytics_enabled=analytics_enabled,
-            ):
-                status.update(f"{message} {line}")
+    lines = []
+
+    with console.status(message) as status:
+        for line in stream_logs(
+            message,
+            process,
+            suppress_errors=suppress_errors,
+            analytics_enabled=analytics_enabled,
+            prior_logs=prior_logs,
+        ):
+            status.update(f"{message} {line}")
+            lines.append(line)
+        return lines
 
 
 def show_progress(message: str, process: subprocess.Popen, checkpoints: list[str]):
@@ -409,7 +442,7 @@ def run_process_with_fallbacks(
     show_status_message: str,
     fallbacks: str | Sequence[str] | Sequence[Sequence[str]] | None = None,
     analytics_enabled: bool = False,
-    prior_processes: Tuple[subprocess.Popen, ...] = (),
+    prior_logs: Tuple[tuple[str, ...], ...] = (),
     **kwargs,
 ):
     """Run subprocess and retry using fallback command if initial command fails.
@@ -419,7 +452,7 @@ def run_process_with_fallbacks(
         show_status_message: The status message to be displayed in the console.
         fallbacks: The fallback command to run if the initial command fails.
         analytics_enabled: Whether analytics are enabled for this command.
-        prior_processes: The prior processes that have been run.
+        prior_logs: The logs of the prior processes that have been run.
         **kwargs: Kwargs to pass to new_process function.
     """
     process = new_process(get_command_with_loglevel(args), **kwargs)
@@ -429,11 +462,11 @@ def run_process_with_fallbacks(
             show_status_message,
             process,
             analytics_enabled=analytics_enabled,
-            prior_processes=prior_processes,
+            prior_logs=prior_logs,
         )
     else:
         # Suppress errors for initial command, because we will try to fallback
-        show_status(show_status_message, process, suppress_errors=True)
+        logs = show_status(show_status_message, process, suppress_errors=True)
 
         current_fallback = fallbacks[0] if not isinstance(fallbacks, str) else fallbacks
         next_fallbacks = fallbacks[1:] if not isinstance(fallbacks, str) else None
@@ -453,7 +486,7 @@ def run_process_with_fallbacks(
                 show_status_message=show_status_message,
                 fallbacks=next_fallbacks,
                 analytics_enabled=analytics_enabled,
-                prior_processes=(*prior_processes, process),
+                prior_logs=(*prior_logs, tuple(logs)),
                 **kwargs,
             )