reflex 0.7.5__tar.gz → 0.7.6a0__tar.gz

{reflex-0.7.5 → reflex-0.7.6a0}/.gitignore

@@ -18,4 +18,6 @@ reflex.db
 .codspeed
 .env
 .env.*
-node_modules
+node_modules
+package-lock.json
+*.pyi

{reflex-0.7.5 → reflex-0.7.6a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex
-Version: 0.7.5
+Version: 0.7.6a0
 Summary: Web apps in pure Python.
 Project-URL: homepage, https://reflex.dev
 Project-URL: repository, https://github.com/reflex-dev/reflex
@@ -19,34 +19,25 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <4.0,>=3.10
 Requires-Dist: alembic<2.0,>=1.11.1
-Requires-Dist: build<2.0,>=1.0.3
-Requires-Dist: charset-normalizer<4.0,>=3.3.2
 Requires-Dist: distro<2.0,>=1.8.0; platform_system == 'Linux'
 Requires-Dist: fastapi!=0.111.0,!=0.111.1,>=0.96.0
 Requires-Dist: granian[reload]>=2.2.0
 Requires-Dist: gunicorn<24.0.0,>=23.0.0
 Requires-Dist: httpx<1.0,>=0.25.1
 Requires-Dist: jinja2<4.0,>=3.1.2
-Requires-Dist: lazy-loader>=0.4
 Requires-Dist: packaging<25.0,>=23.1
 Requires-Dist: platformdirs<5.0,>=3.10.0
 Requires-Dist: psutil<8.0,>=5.9.4
 Requires-Dist: pydantic<3.0,>=1.10.21
-Requires-Dist: python-engineio!=4.6.0
-Requires-Dist: python-multipart<0.1,>=0.0.5
+Requires-Dist: python-multipart<1.0,>=0.0.20
 Requires-Dist: python-socketio<6.0,>=5.7.0
 Requires-Dist: redis<6.0,>=4.3.5
 Requires-Dist: reflex-hosting-cli>=0.1.29
 Requires-Dist: rich<14.0,>=13.0.0
-Requires-Dist: setuptools>=75.0
 Requires-Dist: sqlmodel<0.1,>=0.0.14
-Requires-Dist: starlette-admin<1.0,>=0.11.0
-Requires-Dist: tomlkit<1.0,>=0.12.4
-Requires-Dist: twine<7.0,>=4.0.0
 Requires-Dist: typer<1.0,>=0.15.1
 Requires-Dist: typing-extensions>=4.6.0
 Requires-Dist: uvicorn>=0.20.0
-Requires-Dist: wheel<1.0,>=0.42.0
 Requires-Dist: wrapt<2.0,>=1.17.0
 Description-Content-Type: text/markdown
 

reflex-0.7.6a0/hatch_build.py

@@ -0,0 +1,50 @@
+"""Custom build hook for Hatch."""
+
+import pathlib
+import subprocess
+import sys
+from typing import Any
+
+from hatchling.builders.hooks.plugin.interface import BuildHookInterface
+
+
+class CustomBuilder(BuildHookInterface):
+    """Custom build hook for Hatch."""
+
+    PLUGIN_NAME = "custom"
+
+    def marker(self) -> pathlib.Path:
+        """Get the marker file path.
+
+        Returns:
+            The marker file path.
+        """
+        return (
+            pathlib.Path(self.directory)
+            / f".reflex-{self.metadata.version}.pyi_generated"
+        )
+
+    def finalize(
+        self, version: str, build_data: dict[str, Any], artifact_path: str
+    ) -> None:
+        """Finalize the build process.
+
+        Args:
+            version: The version of the package.
+            build_data: The build data.
+            artifact_path: The path to the artifact.
+        """
+        if self.marker().exists():
+            return
+
+        if not (pathlib.Path(self.root) / "scripts").exists():
+            return
+
+        for file in (pathlib.Path(self.root) / "reflex").rglob("**/*.pyi"):
+            file.unlink(missing_ok=True)
+
+        subprocess.run(
+            [sys.executable, "-m", "reflex.utils.pyi_generator"],
+            check=True,
+        )
+        self.marker().touch()

{reflex-0.7.5 → reflex-0.7.6a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reflex"
-version = "0.7.5"
+version = "0.7.6a0"
 description = "Web apps in pure Python."
 license = { text = "Apache-2.0" }
 authors = [
@@ -21,34 +21,25 @@ keywords = ["web", "framework"]
 requires-python = ">=3.10,<4.0"
 dependencies = [
   "alembic >=1.11.1,<2.0",
-  "build >=1.0.3,<2.0",
-  "charset-normalizer >=3.3.2,<4.0",
   "distro >=1.8.0,<2.0; platform_system == 'Linux'",
   "fastapi >=0.96.0,!=0.111.0,!=0.111.1",
   "granian[reload] >=2.2.0",
   "gunicorn >=23.0.0,<24.0.0",
   "httpx >=0.25.1,<1.0",
   "jinja2 >=3.1.2,<4.0",
-  "lazy_loader >=0.4",
   "packaging >=23.1,<25.0",
   "platformdirs >=3.10.0,<5.0",
   "psutil >=5.9.4,<8.0",
   "pydantic >=1.10.21,<3.0",
-  "python-engineio !=4.6.0",
-  "python-multipart >=0.0.5,<0.1",
   "python-socketio >=5.7.0,<6.0",
+  "python-multipart >=0.0.20,<1.0",
   "redis >=4.3.5,<6.0",
   "reflex-hosting-cli >=0.1.29",
   "rich >=13.0.0,<14.0",
-  "setuptools >=75.0",
-  "starlette-admin >=0.11.0,<1.0",
   "sqlmodel >=0.0.14,<0.1",
-  "tomlkit >=0.12.4,<1.0",
-  "twine >=4.0.0,<7.0",
   "typer >=0.15.1,<1.0",
   "typing_extensions >=4.6.0",
   "uvicorn >=0.20.0",
-  "wheel >=0.42.0,<1.0",
   "wrapt >=1.17.0,<2.0",
 ]
 classifiers = [
@@ -77,6 +68,16 @@ build-backend = "hatchling.build"
 [tool.hatch.build]
 include = ["reflex"]
 
+[tool.hatch.build.targets.sdist]
+artifacts = ["*.pyi"]
+
+[tool.hatch.build.targets.wheel]
+artifacts = ["*.pyi"]
+
+[tool.hatch.build.hooks.custom]
+dependencies = ["plotly", "ruff"]
+require-runtime-dependencies = true
+
 [tool.pyright]
 reportIncompatibleMethodOverride = false
 
@@ -141,6 +142,7 @@ dev = [
   "asynctest >=0.13.0,<1.0",
   "darglint >=1.8.1,<2.0",
   "dill >=0.3.8",
+  "hatchling >=1.27.0",
   "libsass >=0.23.0,<1.0",
   "numpy >=2.2.3,<3.0",
   "pandas >=2.1.1,<3.0",
@@ -149,7 +151,7 @@ dev = [
   "plotly >=5.13.0,<7.0",
   "pre-commit >=4.1.0,<5.0",
   "psycopg[binary] >=3.2.6,<4.0",
-  "pyright >=1.1.397,<1.2",
+  "pyright >=1.1.398,<1.2",
   "pytest >=7.1.2,<9.0",
   "pytest-asyncio >=0.24.0",
   "pytest-benchmark >=4.0.0,<6.0",
@@ -162,5 +164,5 @@ dev = [
   "python-dotenv >=1,<2",
   "ruff >=0.11.2",
   "selenium >=4.11.0,<5.0",
-  "toml >=0.10.2,<1.0",
+  "starlette-admin >=0.11.0,<1.0",
 ]

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/.templates/jinja/web/pages/_app.js.jinja2

@@ -2,7 +2,7 @@
 {% from "web/pages/macros.js.jinja2" import renderHooks %}
 
 {% block early_imports %}
-import '$/styles/styles.css'
+import '$/styles/__reflex_global_styles.css'
 {% endblock %}
 
 {% block declaration %}

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/__init__.py

@@ -370,5 +370,5 @@ getattr, __dir__, __all__ = lazy_loader.attach(
 )
 
 
-def __getattr__(name: ModuleType | Any):
+def __getattr__(name: str):
     return getattr(name)

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/admin.py

@@ -1,8 +1,12 @@
 """The Reflex Admin Dashboard."""
 
+from __future__ import annotations
+
 from dataclasses import dataclass, field
+from typing import TYPE_CHECKING
 
-from starlette_admin.base import BaseAdmin as Admin
+if TYPE_CHECKING:
+    from starlette_admin.base import BaseAdmin as Admin
 
 
 @dataclass
@@ -11,4 +15,4 @@ class AdminDash:
 
     models: list = field(default_factory=list)
     view_overrides: dict = field(default_factory=dict)
-    admin: Admin | None = None
+    admin: "Admin | None" = None

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/app.py

@@ -40,8 +40,6 @@ from rich.progress import MofNCompleteColumn, Progress, TimeElapsedColumn
 from socketio import ASGIApp, AsyncNamespace, AsyncServer
 from starlette.datastructures import Headers
 from starlette.datastructures import UploadFile as StarletteUploadFile
-from starlette_admin.contrib.sqla.admin import Admin
-from starlette_admin.contrib.sqla.view import ModelView
 
 from reflex import constants
 from reflex.admin import AdminDash
@@ -445,6 +443,8 @@ class App(MiddlewareMixin, LifespanMixin):
                 "rx.BaseState cannot be subclassed directly. Use rx.State instead"
             )
 
+        get_config(reload=True)
+
         if "breakpoints" in self.style:
             set_breakpoints(self.style.pop("breakpoints"))
 
@@ -885,6 +885,12 @@ class App(MiddlewareMixin, LifespanMixin):
 
     def _setup_admin_dash(self):
         """Setup the admin dash."""
+        try:
+            from starlette_admin.contrib.sqla.admin import Admin
+            from starlette_admin.contrib.sqla.view import ModelView
+        except ImportError:
+            return
+
         # Get the admin dash.
         if not self.api:
             return
@@ -1427,7 +1433,7 @@ class App(MiddlewareMixin, LifespanMixin):
         async with self.state_manager.modify_state(token) as state:
             # No other event handler can modify the state while in this context.
             yield state
-            delta = state.get_delta()
+            delta = await state._get_resolved_delta()
             if delta:
                 # When the state is modified reset dirty status and emit the delta to the frontend.
                 state._clean()

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/compiler/compiler.py

@@ -17,6 +17,7 @@ from reflex.components.component import (
     StatefulComponent,
 )
 from reflex.config import environment, get_config
+from reflex.constants.compiler import PageNames
 from reflex.state import BaseState
 from reflex.style import SYSTEM_COLOR_MODE
 from reflex.utils import console, path_ops
@@ -174,6 +175,42 @@ def compile_root_stylesheet(stylesheets: list[str]) -> tuple[str, str]:
     return output_path, code
 
 
+def _validate_stylesheet(stylesheet_full_path: Path, assets_app_path: Path) -> None:
+    """Validate the stylesheet.
+
+    Args:
+        stylesheet_full_path: The stylesheet to validate.
+        assets_app_path: The path to the assets directory.
+
+    Raises:
+        ValueError: If the stylesheet is not supported.
+        FileNotFoundError: If the stylesheet is not found.
+    """
+    suffix = stylesheet_full_path.suffix[1:] if stylesheet_full_path.suffix else ""
+    if suffix not in constants.Reflex.STYLESHEETS_SUPPORTED:
+        raise ValueError(f"Stylesheet file {stylesheet_full_path} is not supported.")
+    if not stylesheet_full_path.absolute().is_relative_to(assets_app_path.absolute()):
+        raise FileNotFoundError(
+            f"Cannot include stylesheets from outside the assets directory: {stylesheet_full_path}"
+        )
+    if not stylesheet_full_path.name:
+        raise ValueError(
+            f"Stylesheet file name cannot be empty: {stylesheet_full_path}"
+        )
+    if (
+        len(
+            stylesheet_full_path.absolute()
+            .relative_to(assets_app_path.absolute())
+            .parts
+        )
+        == 1
+        and stylesheet_full_path.stem == PageNames.STYLESHEET_ROOT
+    ):
+        raise ValueError(
+            f"Stylesheet file name cannot be '{PageNames.STYLESHEET_ROOT}': {stylesheet_full_path}"
+        )
+
+
 def _compile_root_stylesheet(stylesheets: list[str]) -> str:
     """Compile the root stylesheet.
 
@@ -194,10 +231,14 @@ def _compile_root_stylesheet(stylesheets: list[str]) -> str:
     )
 
     failed_to_import_sass = False
+    assets_app_path = Path.cwd() / constants.Dirs.APP_ASSETS
+
+    stylesheets_files: list[Path] = []
+    stylesheets_urls = []
+
     for stylesheet in stylesheets:
         if not utils.is_valid_url(stylesheet):
             # check if stylesheet provided exists.
-            assets_app_path = Path.cwd() / constants.Dirs.APP_ASSETS
             stylesheet_full_path = assets_app_path / stylesheet.strip("/")
 
             if not stylesheet_full_path.exists():
@@ -206,53 +247,51 @@ def _compile_root_stylesheet(stylesheets: list[str]) -> str:
                 )
 
             if stylesheet_full_path.is_dir():
-                # NOTE: this can create an infinite loop, for example:
-                # assets/
-                #   | dir_a/
-                #   |   | dir_c/ (symlink to "assets/dir_a")
-                #   | dir_b/
-                # so to avoid the infinite loop, we don't include symbolic links
-                stylesheets += [
-                    str(p.relative_to(assets_app_path))
-                    for p in stylesheet_full_path.iterdir()
-                    if not (p.is_symlink() and p.is_dir())
-                ]
-                continue
-
-            if (
-                stylesheet_full_path.suffix[1:].lower()
-                in constants.Reflex.STYLESHEETS_SUPPORTED
-            ):
-                target = (
-                    get_web_dir()
-                    / constants.Dirs.STYLES
-                    / (stylesheet.rsplit(".", 1)[0].strip("/") + ".css")
+                all_files = (
+                    file
+                    for ext in constants.Reflex.STYLESHEETS_SUPPORTED
+                    for file in stylesheet_full_path.rglob("*." + ext)
                 )
-                target.parent.mkdir(parents=True, exist_ok=True)
-
-                if stylesheet_full_path.suffix == ".css":
-                    path_ops.cp(src=stylesheet_full_path, dest=target, overwrite=True)
-                else:
-                    try:
-                        from sass import compile as sass_compile
-
-                        target.write_text(
-                            data=sass_compile(
-                                filename=str(stylesheet_full_path),
-                                output_style="compressed",
-                            ),
-                            encoding="utf8",
-                        )
-                    except ImportError:
-                        failed_to_import_sass = True
+                for file in all_files:
+                    if file.is_dir():
+                        continue
+                    # Validate the stylesheet.
+                    _validate_stylesheet(file, assets_app_path)
+                    stylesheets_files.append(file)
+
             else:
-                raise FileNotFoundError(
-                    f'The stylesheet file "{stylesheet_full_path}" is not a valid file.'
-                )
+                # Validate the stylesheet.
+                _validate_stylesheet(stylesheet_full_path, assets_app_path)
+                stylesheets_files.append(stylesheet_full_path)
+        else:
+            stylesheets_urls.append(stylesheet)
 
-            stylesheet = f"./{stylesheet.rsplit('.', 1)[0].strip('/')}.css"
+    sheets.extend(dict.fromkeys(stylesheets_urls))
+
+    for stylesheet in stylesheets_files:
+        target_path = stylesheet.relative_to(assets_app_path).with_suffix(".css")
+        target = get_web_dir() / constants.Dirs.STYLES / target_path
+
+        target.parent.mkdir(parents=True, exist_ok=True)
+
+        if stylesheet.suffix == ".css":
+            path_ops.cp(src=stylesheet, dest=target, overwrite=True)
+        else:
+            try:
+                from sass import compile as sass_compile
+
+                target.write_text(
+                    data=sass_compile(
+                        filename=str(stylesheet),
+                        output_style="compressed",
+                    ),
+                    encoding="utf8",
+                )
+            except ImportError:
+                failed_to_import_sass = True
 
-        sheets.append(stylesheet) if stylesheet not in sheets else None
+        str_target_path = "./" + str(target_path)
+        sheets.append(str_target_path) if str_target_path not in sheets else None
 
     if failed_to_import_sass:
         console.error(

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/components/core/cond.py

@@ -151,7 +151,7 @@ def cond(condition: Any, c1: Any, c2: Any = types.Unset(), /) -> Component | Var
     c1_var = Var.create(c1)
     c2_var = Var.create(c2)
 
-    if condition is c1_var:
+    if c1_var is cond_var or c1_var.equals(cond_var):
         c1_var = c1_var.to(types.value_inside_optional(c1_var._var_type))
 
     # Create the conditional var.

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/components/core/foreach.py

@@ -55,6 +55,9 @@ class Foreach(Component):
             ForeachVarError: If the iterable is of type Any.
             TypeError: If the render function is a ComponentState.
             UntypedVarError: If the iterable is of type Any without a type annotation.
+
+        # noqa: DAR401 with_traceback
+        # noqa: DAR402 UntypedVarError
         """
         from reflex.vars import ArrayVar, ObjectVar, StringVar
 
@@ -107,7 +110,7 @@ class Foreach(Component):
                 iterable,
                 "foreach",
                 "https://reflex.dev/docs/library/dynamic-rendering/foreach/",
-            ) from e
+            ).with_traceback(e.__traceback__) from None
         return component
 
     def _render(self) -> IterTag:

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/config.py

@@ -604,12 +604,6 @@ class EnvironmentVariables:
     # Whether to use Granian for the backend. By default, the backend uses Uvicorn if available.
     REFLEX_USE_GRANIAN: EnvVar[bool] = env_var(False)
 
-    # The username to use for authentication on python package repository. Username and password must both be provided.
-    TWINE_USERNAME: EnvVar[str | None] = env_var(None)
-
-    # The password to use for authentication on python package repository. Username and password must both be provided.
-    TWINE_PASSWORD: EnvVar[str | None] = env_var(None)
-
     # Whether to use the system installed bun. If set to false, bun will be bundled with the app.
     REFLEX_USE_SYSTEM_BUN: EnvVar[bool] = env_var(False)
 

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/constants/base.py

@@ -61,6 +61,18 @@ class Dirs(SimpleNamespace):
     UPLOAD_IS_USED = "upload_is_used"
 
 
+def _reflex_version() -> str:
+    """Get the Reflex version.
+
+    Returns:
+        The Reflex version.
+    """
+    try:
+        return metadata.version("reflex")
+    except metadata.PackageNotFoundError:
+        return "unknown"
+
+
 class Reflex(SimpleNamespace):
     """Base constants concerning Reflex."""
 
@@ -68,7 +80,7 @@ class Reflex(SimpleNamespace):
     # The name of the Reflex package.
     MODULE_NAME = "reflex"
     # The current version of Reflex.
-    VERSION = metadata.version(MODULE_NAME)
+    VERSION = _reflex_version()
 
     # The reflex json file.
     JSON = "reflex.json"

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/constants/compiler.py

@@ -85,7 +85,7 @@ class PageNames(SimpleNamespace):
     # The name of the app root page.
     APP_ROOT = "_app"
     # The root stylesheet filename.
-    STYLESHEET_ROOT = "styles"
+    STYLESHEET_ROOT = "__reflex_global_styles"
     # The name of the document root page.
     DOCUMENT_ROOT = "_document"
     # The name of the theme page.

{reflex-0.7.5 → reflex-0.7.6a0}/reflex/constants/installer.py

@@ -14,10 +14,10 @@ class Bun(SimpleNamespace):
     """Bun constants."""
 
     # The Bun version.
-    VERSION = "1.2.4"
+    VERSION = "1.2.8"
 
     # Min Bun Version
-    MIN_VERSION = "1.2.4"
+    MIN_VERSION = "1.2.8"
 
     # URL to bun install script.
     INSTALL_URL = "https://raw.githubusercontent.com/reflex-dev/reflex/main/scripts/bun_install.sh"
@@ -62,8 +62,6 @@ registry = "{registry}"
 class Node(SimpleNamespace):
     """Node/ NPM constants."""
 
-    # The Node version.
-    VERSION = "22.11.0"
     # The minimum required node version.
     MIN_VERSION = "18.18.0"