reflex 0.7.14a5__py3-none-any.whl → 0.8.0a1__py3-none-any.whl

reflex/app.py

@@ -13,7 +13,7 @@ import io
 import json
 import sys
 import traceback
-from collections.abc import AsyncIterator, Callable, Coroutine, Sequence
+from collections.abc import AsyncIterator, Callable, Coroutine, Mapping, Sequence
 from datetime import datetime
 from pathlib import Path
 from timeit import default_timer as timer
@@ -32,7 +32,6 @@ from starlette.middleware import cors
 from starlette.requests import ClientDisconnect, Request
 from starlette.responses import JSONResponse, Response, StreamingResponse
 from starlette.staticfiles import StaticFiles
-from typing_extensions import deprecated
 
 from reflex import constants
 from reflex.admin import AdminDash
@@ -61,7 +60,7 @@ from reflex.components.core.banner import (
 )
 from reflex.components.core.breakpoints import set_breakpoints
 from reflex.components.core.client_side_routing import (
-    Default404Page,
+    default_404_page,
     wait_for_client_redirect,
 )
 from reflex.components.core.sticky import sticky
@@ -246,8 +245,6 @@ class UploadFile(StarletteUploadFile):
 
     path: Path | None = dataclasses.field(default=None)
 
-    _deprecated_filename: str | None = dataclasses.field(default=None)
-
     size: int | None = dataclasses.field(default=None)
 
     headers: Headers = dataclasses.field(default_factory=Headers)
@@ -263,21 +260,6 @@ class UploadFile(StarletteUploadFile):
             return self.path.name
         return None
 
-    @property
-    def filename(self) -> str | None:
-        """Get the filename of the uploaded file.
-
-        Returns:
-            The filename of the uploaded file.
-        """
-        console.deprecate(
-            feature_name="UploadFile.filename",
-            reason="Use UploadFile.name instead.",
-            deprecation_version="0.7.1",
-            removal_version="0.8.0",
-        )
-        return self._deprecated_filename
-
 
 @dataclasses.dataclass(
     frozen=True,
@@ -291,8 +273,8 @@ class UnevaluatedPage:
     description: Var | str | None
     image: str
     on_load: EventType[()] | None
-    meta: list[dict[str, str]]
-    context: dict[str, Any] | None
+    meta: Sequence[Mapping[str, str]]
+    context: Mapping[str, Any]
 
     def merged_with(self, other: UnevaluatedPage) -> UnevaluatedPage:
         """Merge the other page into this one.
@@ -355,9 +337,6 @@ class App(MiddlewareMixin, LifespanMixin):
         default=None
     )
 
-    # Error boundary component to wrap the app with.
-    error_boundary: ComponentCallable | None = dataclasses.field(default=None)
-
     # App wraps to be applied to the whole app. Expected to be a dictionary of (order, name) to a function that takes whether the state is enabled and optionally returns a component.
     app_wraps: dict[tuple[int, str], Callable[[bool], Component | None]] = (
         dataclasses.field(
@@ -443,24 +422,6 @@ class App(MiddlewareMixin, LifespanMixin):
     # FastAPI app for compatibility with FastAPI.
     _cached_fastapi_app: FastAPI | None = None
 
-    @property
-    @deprecated("Use `api_transformer=your_fastapi_app` instead.")
-    def api(self) -> FastAPI:
-        """Get the backend api.
-
-        Returns:
-            The backend api.
-        """
-        if self._cached_fastapi_app is None:
-            self._cached_fastapi_app = FastAPI()
-        console.deprecate(
-            feature_name="App.api",
-            reason="Set `api_transformer=your_fastapi_app` instead.",
-            deprecation_version="0.7.9",
-            removal_version="0.8.0",
-        )
-        return self._cached_fastapi_app
-
     @property
     def event_namespace(self) -> EventNamespace | None:
         """Get the event namespace.
@@ -619,7 +580,7 @@ class App(MiddlewareMixin, LifespanMixin):
         self._apply_decorated_pages()
 
         compile_future = concurrent.futures.ThreadPoolExecutor(max_workers=1).submit(
-            self._compile
+            self._compile, prerender_routes=is_prod_mode()
         )
 
         def callback(f: concurrent.futures.Future):
@@ -800,7 +761,7 @@ class App(MiddlewareMixin, LifespanMixin):
 
         if route == constants.Page404.SLUG:
             if component is None:
-                component = Default404Page.create()
+                component = default_404_page
             component = wait_for_client_redirect(self._generate_component(component))
             title = title or constants.Page404.TITLE
             description = description or constants.Page404.DESCRIPTION
@@ -821,7 +782,7 @@ class App(MiddlewareMixin, LifespanMixin):
             image=image,
             on_load=on_load,
             meta=meta,
-            context=context,
+            context=context or {},
         )
 
         if route in self._unevaluated_pages:
@@ -892,10 +853,39 @@ class App(MiddlewareMixin, LifespanMixin):
         Returns:
             The load events for the route.
         """
-        route = route.lstrip("/")
+        route = route.lstrip("/").rstrip("/")
         if route == "":
-            route = constants.PageNames.INDEX_ROUTE
-        return self._load_events.get(route, [])
+            return self._load_events.get(constants.PageNames.INDEX_ROUTE, [])
+
+        # Separate the pages by route type.
+        static_page_paths_to_page_route = {}
+        dynamic_page_paths_to_page_route = {}
+        for page_route in list(self._pages) + list(self._unevaluated_pages):
+            page_path = page_route.lstrip("/").rstrip("/")
+            if "[" in page_path and "]" in page_path:
+                dynamic_page_paths_to_page_route[page_path] = page_route
+            else:
+                static_page_paths_to_page_route[page_path] = page_route
+
+        # Check for static routes.
+        if (page_route := static_page_paths_to_page_route.get(route)) is not None:
+            return self._load_events.get(page_route, [])
+
+        # Check for dynamic routes.
+        parts = route.split("/")
+        for page_path, page_route in dynamic_page_paths_to_page_route.items():
+            page_parts = page_path.split("/")
+            if len(page_parts) != len(parts):
+                continue
+            if all(
+                part == page_part
+                or (page_part.startswith("[") and page_part.endswith("]"))
+                for part, page_part in zip(parts, page_parts, strict=False)
+            ):
+                return self._load_events.get(page_route, [])
+
+        # Default to 404 page load events if no match found.
+        return self._load_events.get("404", [])
 
     def _check_routes_conflict(self, new_route: str):
         """Verify if there is any conflict between the new route and any existing route.
@@ -938,44 +928,6 @@ class App(MiddlewareMixin, LifespanMixin):
                     # info1 will break away into its own tree.
                     break
 
-    def add_custom_404_page(
-        self,
-        component: Component | ComponentCallable | None = None,
-        title: str = constants.Page404.TITLE,
-        image: str = constants.Page404.IMAGE,
-        description: str = constants.Page404.DESCRIPTION,
-        on_load: EventType[()] | None = None,
-        meta: list[dict[str, str]] = constants.DefaultPage.META_LIST,
-    ):
-        """Define a custom 404 page for any url having no match.
-
-        If there is no page defined on 'index' route, add the 404 page to it.
-        If there is no global catchall defined, add the 404 page with a catchall.
-
-        Args:
-            component: The component to display at the page.
-            title: The title of the page.
-            image: The image to display on the page.
-            description: The description of the page.
-            on_load: The event handler(s) that will be called each time the page load.
-            meta: The metadata of the page.
-        """
-        console.deprecate(
-            feature_name="App.add_custom_404_page",
-            reason=f"Use app.add_page(component, route='/{constants.Page404.SLUG}') instead.",
-            deprecation_version="0.6.7",
-            removal_version="0.8.0",
-        )
-        self.add_page(
-            component=component,
-            route=constants.Page404.SLUG,
-            title=title or constants.Page404.TITLE,
-            image=image or constants.Page404.IMAGE,
-            description=description or constants.Page404.DESCRIPTION,
-            on_load=on_load,
-            meta=meta,
-        )
-
     def _setup_admin_dash(self):
         """Setup the admin dash."""
         try:
@@ -1024,7 +976,7 @@ class App(MiddlewareMixin, LifespanMixin):
             for i, tags in imports.items()
             if i not in dependencies
             and i not in dev_dependencies
-            and not any(i.startswith(prefix) for prefix in ["/", "$/", ".", "next/"])
+            and not any(i.startswith(prefix) for prefix in ["/", "$/", "."])
             and i != ""
             and any(tag.install for tag in tags)
         }
@@ -1148,17 +1100,17 @@ class App(MiddlewareMixin, LifespanMixin):
                 )
                 for dep in dep_set:
                     if dep not in state_cls.vars and dep not in state_cls.backend_vars:
-                        msg = f"ComputedVar {var._js_expr} on state {state.__name__} has an invalid dependency {state_name}.{dep}"
+                        msg = f"ComputedVar {var._name} on state {state.__name__} has an invalid dependency {state_name}.{dep}"
                         raise exceptions.VarDependencyError(msg)
 
         for substate in state.class_subclasses:
             self._validate_var_dependencies(substate)
 
-    def _compile(self, export: bool = False, dry_run: bool = False):
+    def _compile(self, prerender_routes: bool = False, dry_run: bool = False):
         """Compile the app and output it to the pages folder.
 
         Args:
-            export: Whether to compile the app for export.
+            prerender_routes: Whether to prerender the routes.
             dry_run: Whether to compile the app without saving it.
 
         Raises:
@@ -1293,15 +1245,6 @@ class App(MiddlewareMixin, LifespanMixin):
         # Track imports found.
         all_imports = {}
 
-        # This has to happen before compiling stateful components as that
-        # prevents recursive functions from reaching all components.
-        for component in self._pages.values():
-            # Add component._get_all_imports() to all_imports.
-            all_imports.update(component._get_all_imports())
-
-            # Add the app wrappers from this component.
-            app_wrappers.update(component._get_all_app_wrap_components())
-
         if (toaster := self.toaster) is not None:
             from reflex.components.component import memo
 
@@ -1319,16 +1262,24 @@ class App(MiddlewareMixin, LifespanMixin):
             if component is not None:
                 app_wrappers[key] = component
 
-        if self.error_boundary:
-            from reflex.compiler.compiler import into_component
+        # Compile custom components.
+        (
+            custom_components_output,
+            custom_components_result,
+            custom_components_imports,
+        ) = compiler.compile_components(dict.fromkeys(CUSTOM_COMPONENTS.values()))
+        compile_results.append((custom_components_output, custom_components_result))
+        all_imports.update(custom_components_imports)
+        progress.advance(task)
+
+        # This has to happen before compiling stateful components as that
+        # prevents recursive functions from reaching all components.
+        for component in self._pages.values():
+            # Add component._get_all_imports() to all_imports.
+            all_imports.update(component._get_all_imports())
 
-            console.deprecate(
-                feature_name="App.error_boundary",
-                reason="Use app_wraps instead.",
-                deprecation_version="0.7.1",
-                removal_version="0.8.0",
-            )
-            app_wrappers[(55, "ErrorBoundary")] = into_component(self.error_boundary)
+            # Add the app wrappers from this component.
+            app_wrappers.update(component._get_all_app_wrap_components())
 
         # Perform auto-memoization of stateful components.
         with console.timing("Auto-memoize StatefulComponents"):
@@ -1431,6 +1382,7 @@ class App(MiddlewareMixin, LifespanMixin):
                             )
                         )
                     ),
+                    unevaluated_pages=list(self._unevaluated_pages.values()),
                 )
 
             # Wait for all compilation tasks to complete.
@@ -1465,16 +1417,6 @@ class App(MiddlewareMixin, LifespanMixin):
         )
         progress.advance(task)
 
-        # Compile custom components.
-        (
-            custom_components_output,
-            custom_components_result,
-            custom_components_imports,
-        ) = compiler.compile_components(dict.fromkeys(CUSTOM_COMPONENTS.values()))
-        compile_results.append((custom_components_output, custom_components_result))
-        all_imports.update(custom_components_imports)
-
-        progress.advance(task)
         progress.stop()
 
         if dry_run:
@@ -1484,15 +1426,9 @@ class App(MiddlewareMixin, LifespanMixin):
         with console.timing("Install Frontend Packages"):
             self._get_frontend_packages(all_imports)
 
-        # Setup the next.config.js
-        transpile_packages = [
-            package
-            for package, import_vars in all_imports.items()
-            if any(import_var.transpile for import_var in import_vars)
-        ]
-        prerequisites.update_next_config(
-            export=export,
-            transpile_packages=transpile_packages,
+        # Setup the react-router.config.js
+        prerequisites.update_react_router_config(
+            prerender_routes=prerender_routes,
         )
 
         if is_prod_mode():
@@ -1501,9 +1437,11 @@ class App(MiddlewareMixin, LifespanMixin):
         else:
             # In dev mode, delete removed pages and update existing pages.
             keep_files = [Path(output_path) for output_path, _ in compile_results]
-            for p in Path(prerequisites.get_web_dir() / constants.Dirs.PAGES).rglob(
-                "*"
-            ):
+            for p in Path(
+                prerequisites.get_web_dir()
+                / constants.Dirs.PAGES
+                / constants.Dirs.ROUTES
+            ).rglob("*"):
                 if p.is_file() and p not in keep_files:
                     # Remove pages that are no longer in the app.
                     p.unlink()
@@ -1970,7 +1908,6 @@ def upload(app: App):
                 UploadFile(
                     file=content_copy,
                     path=Path(file.filename.lstrip("/")) if file.filename else None,
-                    _deprecated_filename=file.filename,
                     size=file.size,
                     headers=file.headers,
                 )

reflex/base.py

@@ -1,48 +1,6 @@
 """Define the base Reflex class."""
 
-from __future__ import annotations
-
-import os
-from typing import TYPE_CHECKING, Any
-
-import pydantic.v1.main as pydantic_main
 from pydantic.v1 import BaseModel
-from pydantic.v1.fields import ModelField
-
-
-def validate_field_name(bases: list[type[BaseModel]], field_name: str) -> None:
-    """Ensure that the field's name does not shadow an existing attribute of the model.
-
-    Args:
-        bases: List of base models to check for shadowed attrs.
-        field_name: name of attribute
-
-    Raises:
-        VarNameError: If state var field shadows another in its parent state
-    """
-    from reflex.utils.exceptions import VarNameError
-
-    # can't use reflex.config.environment here cause of circular import
-    reload = os.getenv("__RELOAD_CONFIG", "").lower() == "true"
-    base = None
-    try:
-        for base in bases:
-            if not reload and getattr(base, field_name, None):
-                pass
-    except TypeError as te:
-        msg = (
-            f'State var "{field_name}" in {base} has been shadowed by a substate var; '
-            f'use a different field name instead".'
-        )
-        raise VarNameError(msg) from te
-
-
-# monkeypatch pydantic validate_field_name method to skip validating
-# shadowed state vars when reloading app via utils.prerequisites.get_app(reload=True)
-pydantic_main.validate_field_name = validate_field_name  # pyright: ignore [reportPrivateImportUsage]
-
-if TYPE_CHECKING:
-    from reflex.vars import Var
 
 
 class Base(BaseModel):
@@ -75,7 +33,7 @@ class Base(BaseModel):
             default=serialize,
         )
 
-    def set(self, **kwargs: Any):
+    def set(self, **kwargs: object):
         """Set multiple fields and return the object.
 
         Args:
@@ -87,47 +45,3 @@ class Base(BaseModel):
         for key, value in kwargs.items():
             setattr(self, key, value)
         return self
-
-    @classmethod
-    def get_fields(cls) -> dict[str, ModelField]:
-        """Get the fields of the object.
-
-        Returns:
-            The fields of the object.
-        """
-        return cls.__fields__
-
-    @classmethod
-    def add_field(cls, var: Var, default_value: Any):
-        """Add a pydantic field after class definition.
-
-        Used by State.add_var() to correctly handle the new variable.
-
-        Args:
-            var: The variable to add a pydantic field for.
-            default_value: The default value of the field
-        """
-        var_name = var._var_field_name
-        new_field = ModelField.infer(
-            name=var_name,
-            value=default_value,
-            annotation=var._var_type,
-            class_validators=None,
-            config=cls.__config__,
-        )
-        cls.__fields__.update({var_name: new_field})
-
-    def get_value(self, key: str) -> Any:
-        """Get the value of a field.
-
-        Args:
-            key: The key of the field.
-
-        Returns:
-            The value of the field.
-        """
-        if isinstance(key, str):
-            # Seems like this function signature was wrong all along?
-            # If the user wants a field that we know of, get it and pass it off to _get_value
-            return getattr(self, key)
-        return key

reflex/compiler/compiler.py

@@ -21,12 +21,14 @@ from reflex.components.component import (
 )
 from reflex.config import get_config
 from reflex.constants.compiler import PageNames
+from reflex.constants.state import FIELD_MARKER
 from reflex.environment import environment
 from reflex.state import BaseState
 from reflex.style import SYSTEM_COLOR_MODE
 from reflex.utils import console, path_ops
 from reflex.utils.exceptions import ReflexError
 from reflex.utils.exec import is_prod_mode
+from reflex.utils.format import to_title_case
 from reflex.utils.imports import ImportVar
 from reflex.utils.prerequisites import get_web_dir
 from reflex.vars.base import LiteralVar, Var
@@ -469,7 +471,9 @@ def compile_document_root(
         The path and code of the compiled document root.
     """
     # Get the path for the output file.
-    output_path = utils.get_page_path(constants.PageNames.DOCUMENT_ROOT)
+    output_path = str(
+        get_web_dir() / constants.Dirs.PAGES / constants.PageNames.DOCUMENT_ROOT
+    )
 
     # Create the document root.
     document_root = utils.create_document_root(
@@ -491,7 +495,9 @@ def compile_app(app_root: Component) -> tuple[str, str]:
         The path and code of the compiled app wrapper.
     """
     # Get the path for the output file.
-    output_path = utils.get_page_path(constants.PageNames.APP_ROOT)
+    output_path = str(
+        get_web_dir() / constants.Dirs.PAGES / constants.PageNames.APP_ROOT
+    )
 
     # Compile the document root.
     code = _compile_app(app_root)
@@ -606,7 +612,7 @@ def purge_web_pages_dir():
         return
 
     # Empty out the web pages directory.
-    utils.empty_dir(get_web_dir() / constants.Dirs.PAGES, keep_files=["_app.js"])
+    utils.empty_dir(get_web_dir() / constants.Dirs.PAGES, keep_files=["routes.js"])
 
 
 if TYPE_CHECKING:
@@ -668,6 +674,32 @@ def readable_name_from_component(
     return None
 
 
+def _modify_exception(e: Exception) -> None:
+    """Modify the exception to make it more readable.
+
+    Args:
+        e: The exception to modify.
+    """
+    if len(e.args) == 1 and isinstance((msg := e.args[0]), str):
+        while (state_index := msg.find("reflex___")) != -1:
+            dot_index = msg.find(".", state_index)
+            if dot_index == -1:
+                break
+            state_name = msg[state_index:dot_index]
+            module_dot_state_name = state_name.replace("___", ".").rsplit("__", 1)[-1]
+            module_path, _, state_snake_case = module_dot_state_name.rpartition(".")
+            if not state_snake_case:
+                break
+            actual_state_name = to_title_case(state_snake_case)
+            msg = (
+                f"{msg[:state_index]}{module_path}.{actual_state_name}{msg[dot_index:]}"
+            )
+
+        msg = msg.replace(FIELD_MARKER, "")
+
+        e.args = (msg,)
+
+
 def into_component(component: Component | ComponentCallable) -> Component:
     """Convert a component to a Component.
 
@@ -692,6 +724,7 @@ def into_component(component: Component | ComponentCallable) -> Component:
         component_called = component()
     except KeyError as e:
         if isinstance(e, ReflexError):
+            _modify_exception(e)
             raise
         key = e.args[0] if e.args else None
         if key is not None and isinstance(key, Var):
@@ -701,6 +734,7 @@ def into_component(component: Component | ComponentCallable) -> Component:
         raise
     except TypeError as e:
         if isinstance(e, ReflexError):
+            _modify_exception(e)
             raise
         message = e.args[0] if e.args else None
         if message and isinstance(message, str):
@@ -726,6 +760,9 @@ def into_component(component: Component | ComponentCallable) -> Component:
                 "Cannot pass a Var to a built-in function. Consider moving the operation to the backend, using existing Var operations, or defining a custom Var operation."
             ).with_traceback(e.__traceback__) from None
         raise
+    except ReflexError as e:
+        _modify_exception(e)
+        raise
 
     if (converted := _into_component_once(component_called)) is not None:
         return converted