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

reflex/components/tags/tag.py

@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import dataclasses
-from typing import Any, Dict, List, Mapping, Optional, Sequence
+from typing import Any, List, Mapping, Sequence
 
 from reflex.event import EventChain
-from reflex.utils import format, types
+from reflex.utils import format
 from reflex.vars.base import LiteralVar, Var
 
 
@@ -38,16 +38,16 @@ class Tag:
     name: str = ""
 
     # The props of the tag.
-    props: Dict[str, Any] = dataclasses.field(default_factory=dict)
+    props: dict[str, Any] = dataclasses.field(default_factory=dict)
 
     # The inner contents of the tag.
     contents: str = ""
 
     # Special props that aren't key value pairs.
-    special_props: List[Var] = dataclasses.field(default_factory=list)
+    special_props: list[Var] = dataclasses.field(default_factory=list)
 
     # The children components.
-    children: List[Any] = dataclasses.field(default_factory=list)
+    children: list[Any] = dataclasses.field(default_factory=list)
 
     def __post_init__(self):
         """Post initialize the tag."""
@@ -83,14 +83,14 @@ class Tag:
         """Iterate over the tag's fields.
 
         Yields:
-            Tuple[str, Any]: The field name and value.
+            tuple[str, Any]: The field name and value.
         """
         for field in dataclasses.fields(self):
             rendered_value = render_prop(getattr(self, field.name))
             if rendered_value is not None:
                 yield field.name, rendered_value
 
-    def add_props(self, **kwargs: Optional[Any]) -> Tag:
+    def add_props(self, **kwargs: Any | None) -> Tag:
         """Add props to the tag.
 
         Args:
@@ -103,9 +103,9 @@ class Tag:
             {
                 format.to_camel_case(name, treat_hyphens_as_underscores=False): (
                     prop
-                    if types._isinstance(prop, (EventChain, Mapping))
+                    if isinstance(prop, (EventChain, Mapping))
                     else LiteralVar.create(prop)
-                )  # rx.color is always a string
+                )
                 for name, prop in kwargs.items()
                 if self.is_valid_prop(prop)
             }
@@ -128,7 +128,7 @@ class Tag:
         return self
 
     @staticmethod
-    def is_valid_prop(prop: Optional[Var]) -> bool:
+    def is_valid_prop(prop: Var | None) -> bool:
         """Check if the prop is valid.
 
         Args:

reflex/config.py

@@ -22,11 +22,7 @@ from typing import (
     Annotated,
     Any,
     Callable,
-    Dict,
     Generic,
-    List,
-    Optional,
-    Set,
     TypeVar,
     get_args,
     get_origin,
@@ -40,7 +36,12 @@ from reflex import constants
 from reflex.base import Base
 from reflex.utils import console
 from reflex.utils.exceptions import ConfigError, EnvironmentVarValueError
-from reflex.utils.types import GenericType, is_union, value_inside_optional
+from reflex.utils.types import (
+    GenericType,
+    is_union,
+    true_type_for_pydantic_field,
+    value_inside_optional,
+)
 
 try:
     from dotenv import load_dotenv  # pyright: ignore [reportMissingImports]
@@ -52,10 +53,10 @@ class DBConfig(Base):
     """Database config."""
 
     engine: str
-    username: Optional[str] = ""
-    password: Optional[str] = ""
-    host: Optional[str] = ""
-    port: Optional[int] = None
+    username: str | None = ""
+    password: str | None = ""
+    host: str | None = ""
+    port: int | None = None
     database: str
 
     @classmethod
@@ -361,7 +362,7 @@ class EnvVar(Generic[T]):
         """
         return interpret_env_var_value(value, self.type_, self.name)
 
-    def getenv(self) -> Optional[T]:
+    def getenv(self) -> T | None:
         """Get the interpreted environment variable value.
 
         Returns:
@@ -598,16 +599,16 @@ class EnvironmentVariables:
     REFLEX_USE_NPM: EnvVar[bool] = env_var(False)
 
     # The npm registry to use.
-    NPM_CONFIG_REGISTRY: EnvVar[Optional[str]] = env_var(None)
+    NPM_CONFIG_REGISTRY: EnvVar[str | None] = env_var(None)
 
     # Whether to use Granian for the backend. Otherwise, use Uvicorn.
     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[Optional[str]] = env_var(None)
+    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[Optional[str]] = env_var(None)
+    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)
@@ -632,13 +633,13 @@ class EnvironmentVariables:
         Path(constants.Dirs.UPLOADED_FILES)
     )
 
-    REFLEX_COMPILE_EXECUTOR: EnvVar[Optional[ExecutorType]] = env_var(None)
+    REFLEX_COMPILE_EXECUTOR: EnvVar[ExecutorType | None] = env_var(None)
 
     # Whether to use separate processes to compile the frontend and how many. If not set, defaults to thread executor.
-    REFLEX_COMPILE_PROCESSES: EnvVar[Optional[int]] = env_var(None)
+    REFLEX_COMPILE_PROCESSES: EnvVar[int | None] = env_var(None)
 
     # Whether to use separate threads to compile the frontend and how many. Defaults to `min(32, os.cpu_count() + 4)`.
-    REFLEX_COMPILE_THREADS: EnvVar[Optional[int]] = env_var(None)
+    REFLEX_COMPILE_THREADS: EnvVar[int | None] = env_var(None)
 
     # The directory to store reflex dependencies.
     REFLEX_DIR: EnvVar[Path] = env_var(constants.Reflex.DIR)
@@ -708,10 +709,10 @@ class EnvironmentVariables:
     REFLEX_USE_TURBOPACK: EnvVar[bool] = env_var(True)
 
     # Additional paths to include in the hot reload. Separated by a colon.
-    REFLEX_HOT_RELOAD_INCLUDE_PATHS: EnvVar[List[Path]] = env_var([])
+    REFLEX_HOT_RELOAD_INCLUDE_PATHS: EnvVar[list[Path]] = env_var([])
 
     # Paths to exclude from the hot reload. Takes precedence over include paths. Separated by a colon.
-    REFLEX_HOT_RELOAD_EXCLUDE_PATHS: EnvVar[List[Path]] = env_var([])
+    REFLEX_HOT_RELOAD_EXCLUDE_PATHS: EnvVar[list[Path]] = env_var([])
 
     # Enables different behavior for when the backend would do a cold start if it was inactive.
     REFLEX_DOES_BACKEND_COLD_START: EnvVar[bool] = env_var(False)
@@ -761,7 +762,7 @@ class Config(Base):
     app_name: str
 
     # The path to the app module.
-    app_module_import: Optional[str] = None
+    app_module_import: str | None = None
 
     # The log level to use.
     loglevel: constants.LogLevel = constants.LogLevel.DEFAULT
@@ -779,21 +780,19 @@ class Config(Base):
     api_url: str = f"http://localhost:{constants.DefaultPorts.BACKEND_PORT}"
 
     # The url the frontend will be hosted on.
-    deploy_url: Optional[str] = (
-        f"http://localhost:{constants.DefaultPorts.FRONTEND_PORT}"
-    )
+    deploy_url: str | None = f"http://localhost:{constants.DefaultPorts.FRONTEND_PORT}"
 
     # The url the backend will be hosted on.
     backend_host: str = "0.0.0.0"
 
     # The database url used by rx.Model.
-    db_url: Optional[str] = "sqlite:///reflex.db"
+    db_url: str | None = "sqlite:///reflex.db"
 
     # The async database url used by rx.Model.
-    async_db_url: Optional[str] = None
+    async_db_url: str | None = None
 
     # The redis url
-    redis_url: Optional[str] = None
+    redis_url: str | None = None
 
     # Telemetry opt-in.
     telemetry_enabled: bool = True
@@ -805,10 +804,10 @@ class Config(Base):
     static_page_generation_timeout: int = 60
 
     # List of origins that are allowed to connect to the backend API.
-    cors_allowed_origins: List[str] = ["*"]
+    cors_allowed_origins: list[str] = ["*"]
 
     # Tailwind config.
-    tailwind: Optional[Dict[str, Any]] = {"plugins": ["@tailwindcss/typography"]}
+    tailwind: dict[str, Any] | None = {"plugins": ["@tailwindcss/typography"]}
 
     # Timeout when launching the gunicorn server. TODO(rename this to backend_timeout?)
     timeout: int = 120
@@ -820,7 +819,7 @@ class Config(Base):
     react_strict_mode: bool = True
 
     # Additional frontend packages to install.
-    frontend_packages: List[str] = []
+    frontend_packages: list[str] = []
 
     # The hosting service backend URL.
     cp_backend_url: str = Hosting.HOSTING_SERVICE
@@ -831,7 +830,7 @@ class Config(Base):
     gunicorn_worker_class: str = "uvicorn.workers.UvicornH11Worker"
 
     # Number of gunicorn workers from user
-    gunicorn_workers: Optional[int] = None
+    gunicorn_workers: int | None = None
 
     # Number of requests before a worker is restarted; set to 0 to disable
     gunicorn_max_requests: int = 100
@@ -852,19 +851,19 @@ class Config(Base):
     redis_token_expiration: int = constants.Expiration.TOKEN
 
     # Attributes that were explicitly set by the user.
-    _non_default_attributes: Set[str] = pydantic.PrivateAttr(set())
+    _non_default_attributes: set[str] = pydantic.PrivateAttr(set())
 
     # Path to file containing key-values pairs to override in the environment; Dotenv format.
-    env_file: Optional[str] = None
+    env_file: str | None = None
 
     # Whether to display the sticky "Built with Reflex" badge on all pages.
-    show_built_with_reflex: Optional[bool] = None
+    show_built_with_reflex: bool | None = None
 
     # Whether the app is running in the reflex cloud environment.
     is_reflex_cloud: bool = False
 
-    # Extra overlay function to run after the app is built. Formatted such that `from path_0.path_1... import path[-1]`, and calling it with no arguments would work. For example, "reflex.components.moment.momnet".
-    extra_overlay_function: Optional[str] = None
+    # Extra overlay function to run after the app is built. Formatted such that `from path_0.path_1... import path[-1]`, and calling it with no arguments would work. For example, "reflex.components.moment.moment".
+    extra_overlay_function: str | None = None
 
     def __init__(self, *args, **kwargs):
         """Initialize the config values.
@@ -949,7 +948,9 @@ class Config(Base):
             # If the env var is set, override the config value.
             if env_var is not None:
                 # Interpret the value.
-                value = interpret_env_var_value(env_var, field.outer_type_, field.name)
+                value = interpret_env_var_value(
+                    env_var, true_type_for_pydantic_field(field), field.name
+                )
 
                 # Set the value.
                 updated_values[key] = value

reflex/constants/__init__.py

@@ -60,57 +60,60 @@ from .route import (
 from .state import StateManagerMode
 from .style import Tailwind
 
-__ALL__ = [
-    ALEMBIC_CONFIG,
-    Bun,
-    ColorMode,
-    Config,
-    COOKIES,
-    CompileContext,
-    ComponentName,
-    CustomComponents,
-    DefaultPage,
-    DefaultPorts,
-    Dirs,
-    Endpoint,
-    Env,
-    EventTriggers,
-    Expiration,
-    Ext,
-    Fnm,
-    REFLEX_VAR_CLOSING_TAG,
-    REFLEX_VAR_OPENING_TAG,
-    GitIgnore,
-    Hooks,
-    Imports,
-    IS_WINDOWS,
-    LOCAL_STORAGE,
-    SESSION_STORAGE,
-    LogLevel,
-    MemoizationDisposition,
-    MemoizationMode,
-    Next,
-    Node,
-    NOCOMPILE_FILE,
-    PackageJson,
-    PageNames,
-    Page404,
-    Ping,
-    POLLING_MAX_HTTP_BUFFER_SIZE,
-    PYTEST_CURRENT_TEST,
-    Reflex,
-    RequirementsTxt,
-    RouteArgType,
-    RouteRegex,
-    RouteVar,
-    ROUTER,
-    ROUTER_DATA,
-    ROUTER_DATA_INCLUDE,
-    ROUTE_NOT_FOUND,
-    SETTER_PREFIX,
-    SocketEvent,
-    StateManagerMode,
-    Tailwind,
-    Templates,
-    CompileVars,
+__all__ = [
+    "ALEMBIC_CONFIG",
+    "APP_HARNESS_FLAG",
+    "COOKIES",
+    "IS_LINUX",
+    "IS_MACOS",
+    "IS_WINDOWS",
+    "LOCAL_STORAGE",
+    "NOCOMPILE_FILE",
+    "POLLING_MAX_HTTP_BUFFER_SIZE",
+    "PYTEST_CURRENT_TEST",
+    "REFLEX_VAR_CLOSING_TAG",
+    "REFLEX_VAR_OPENING_TAG",
+    "ROUTER",
+    "ROUTER_DATA",
+    "ROUTER_DATA_INCLUDE",
+    "ROUTE_NOT_FOUND",
+    "SESSION_STORAGE",
+    "SETTER_PREFIX",
+    "Bun",
+    "ColorMode",
+    "CompileContext",
+    "CompileVars",
+    "ComponentName",
+    "Config",
+    "CustomComponents",
+    "DefaultPage",
+    "DefaultPorts",
+    "Dirs",
+    "Endpoint",
+    "Env",
+    "EventTriggers",
+    "Expiration",
+    "Ext",
+    "Fnm",
+    "GitIgnore",
+    "Hooks",
+    "Imports",
+    "LogLevel",
+    "MemoizationDisposition",
+    "MemoizationMode",
+    "Next",
+    "Node",
+    "PackageJson",
+    "Page404",
+    "PageNames",
+    "Ping",
+    "Reflex",
+    "RequirementsTxt",
+    "RouteArgType",
+    "RouteRegex",
+    "RouteVar",
+    "SocketEvent",
+    "StateManagerMode",
+    "Tailwind",
+    "Templates",
 ]

reflex/custom_components/custom_components.py

@@ -9,7 +9,6 @@ import sys
 from collections import namedtuple
 from contextlib import contextmanager
 from pathlib import Path
-from typing import Optional, Tuple
 
 import httpx
 import tomlkit
@@ -311,7 +310,7 @@ def _populate_custom_component_project(name_variants: NameVariants):
 
 @custom_components_cli.command(name="init")
 def init(
-    library_name: Optional[str] = typer.Option(
+    library_name: str | None = typer.Option(
         None,
         help="The name of your library. On PyPI, package will be published as `reflex-{library-name}`.",
     ),
@@ -604,26 +603,26 @@ def _ensure_dist_dir(version_to_publish: str, build: bool):
 
 @custom_components_cli.command(name="publish")
 def publish(
-    repository: Optional[str] = typer.Option(
+    repository: str | None = typer.Option(
         None,
         "-r",
         "--repository",
         help="The name of the repository. Defaults to pypi. Only supports pypi and testpypi (Test PyPI) for now.",
     ),
-    token: Optional[str] = typer.Option(
+    token: str | None = typer.Option(
         None,
         "-t",
         "--token",
         help="The API token to use for authentication on python package repository. If token is provided, no username/password should be provided at the same time",
     ),
-    username: Optional[str] = typer.Option(
+    username: str | None = typer.Option(
         environment.TWINE_USERNAME.get(),
         "-u",
         "--username",
         show_default="TWINE_USERNAME environment variable value if set",
         help="The username to use for authentication on python package repository. Username and password must both be provided.",
     ),
-    password: Optional[str] = typer.Option(
+    password: str | None = typer.Option(
         environment.TWINE_PASSWORD.get(),
         "-p",
         "--password",
@@ -927,7 +926,7 @@ def _validate_url_with_protocol_prefix(url: str | None) -> bool:
     return not url or (url.startswith("http://") or url.startswith("https://"))
 
 
-def _get_file_from_prompt_in_loop() -> Tuple[bytes, str] | None:
+def _get_file_from_prompt_in_loop() -> tuple[bytes, str] | None:
     image_file = file_extension = None
     while image_file is None:
         image_filepath = Path(